diff --git a/src/main/java/de/extio/game_engine/resource/StaticResourceService.java b/src/main/java/de/extio/game_engine/resource/StaticResourceService.java index 5cc263d..251c95a 100644 --- a/src/main/java/de/extio/game_engine/resource/StaticResourceService.java +++ b/src/main/java/de/extio/game_engine/resource/StaticResourceService.java @@ -2,21 +2,32 @@ package de.extio.game_engine.resource; import java.io.InputStream; import java.util.List; +import java.util.Objects; import java.util.Optional; public interface StaticResourceService { Optional loadByPath(Class clazz, List path, String name); - Optional loadByPath(Class clazz, StaticResource resource); + default Optional loadByPath(final Class clazz, final StaticResource resource) { + Objects.requireNonNull(clazz, "clazz"); + Objects.requireNonNull(resource, "resource"); + return this.loadByPath(clazz, resource.pathSegments(), resource.resourceName()); + } Optional loadStreamByPath(List path, String name); - Optional loadStreamByPath(StaticResource resource); + default Optional loadStreamByPath(final StaticResource resource) { + Objects.requireNonNull(resource, "resource"); + return this.loadStreamByPath(resource.pathSegments(), resource.resourceName()); + } boolean exists(List path, String name); - boolean exists(StaticResource resource); + default boolean exists(final StaticResource resource) { + Objects.requireNonNull(resource, "resource"); + return this.exists(resource.pathSegments(), resource.resourceName()); + } List listPath(List path); diff --git a/src/main/java/de/extio/game_engine/resource/StaticResourceServiceImpl.java b/src/main/java/de/extio/game_engine/resource/StaticResourceServiceImpl.java index eb38378..186e7bd 100644 --- a/src/main/java/de/extio/game_engine/resource/StaticResourceServiceImpl.java +++ b/src/main/java/de/extio/game_engine/resource/StaticResourceServiceImpl.java @@ -99,13 +99,6 @@ public class StaticResourceServiceImpl implements StaticResourceService { } } - @Override - public Optional loadByPath(final Class clazz, final StaticResource resource) { - Objects.requireNonNull(clazz, "clazz"); - Objects.requireNonNull(resource, "resource"); - return this.loadByPath(clazz, resource.pathSegments(), resource.resourceName()); - } - @Override public Optional loadStreamByPath(final List path, final String name) { Objects.requireNonNull(name, "name"); @@ -133,12 +126,6 @@ public class StaticResourceServiceImpl implements StaticResourceService { } } - @Override - public Optional loadStreamByPath(final StaticResource resource) { - Objects.requireNonNull(resource, "resource"); - return this.loadStreamByPath(resource.pathSegments(), resource.resourceName()); - } - @Override public boolean exists(final List path, final String name) { Objects.requireNonNull(name, "name"); @@ -148,12 +135,6 @@ public class StaticResourceServiceImpl implements StaticResourceService { return Files.exists(filePath) && Files.isRegularFile(filePath); } - @Override - public boolean exists(final StaticResource resource) { - Objects.requireNonNull(resource, "resource"); - return this.exists(resource.pathSegments(), resource.resourceName()); - } - @Override public List listPath(final List path) { final Path dirPath = resolvePath(path, null);