From 2a8cdca80cce7d72bae318d98c01915f3dba6528 Mon Sep 17 00:00:00 2001 From: extio-de Date: Sat, 27 Jun 2026 15:31:27 +0200 Subject: [PATCH] fix(StorageServiceImpl, StaticResourceServiceImpl): update path handling for jar resources and improve method signatures --- .../resource/StaticResourceServiceImpl.java | 4 ++-- .../game_engine/storage/StorageServiceImpl.java | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) 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 cde1ad4..dd0c817 100644 --- a/src/main/java/de/extio/game_engine/resource/StaticResourceServiceImpl.java +++ b/src/main/java/de/extio/game_engine/resource/StaticResourceServiceImpl.java @@ -33,9 +33,9 @@ public class StaticResourceServiceImpl implements StaticResourceService { parent = Paths.get(url.toString().substring("jar:nested:".length(), url.toString().indexOf("/!"))).getParent(); } else { - parent = Paths.get(url.toURI()).getParent(); + parent = url.toURI().toPath().getParent(); } - final Path jarPath = parent != null ? parent.toAbsolutePath().normalize() : Paths.get(url.toURI()).toAbsolutePath().normalize(); + final Path jarPath = parent != null ? parent.toAbsolutePath().normalize() : url.toURI().toPath().toAbsolutePath().normalize(); final String currentSubDir = jarPath.getFileName().toString(); if ("bin".equals(currentSubDir) || "target".equals(currentSubDir)) { diff --git a/src/main/java/de/extio/game_engine/storage/StorageServiceImpl.java b/src/main/java/de/extio/game_engine/storage/StorageServiceImpl.java index 3880073..e5d302e 100644 --- a/src/main/java/de/extio/game_engine/storage/StorageServiceImpl.java +++ b/src/main/java/de/extio/game_engine/storage/StorageServiceImpl.java @@ -13,12 +13,12 @@ import java.util.Objects; import java.util.Optional; import java.util.UUID; -import de.extio.game_engine.util.ObjectSerialization; -import de.extio.game_engine.util.rng.FastRandomUUID; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import de.extio.game_engine.util.ObjectSerialization; +import de.extio.game_engine.util.rng.FastRandomUUID; + public class StorageServiceImpl implements StorageService { private static final Logger LOGGER = LoggerFactory.getLogger(StorageServiceImpl.class); @@ -43,9 +43,9 @@ public class StorageServiceImpl implements StorageService { parent = Paths.get(url.toString().substring("jar:nested:".length(), url.toString().indexOf("/!"))).getParent(); } else { - parent = Paths.get(url.toURI()).getParent(); + parent = url.toURI().toPath().getParent(); } - final Path jarPath = parent != null ? parent.toAbsolutePath().normalize() : Paths.get(url.toURI()).toAbsolutePath().normalize(); + final Path jarPath = parent != null ? parent.toAbsolutePath().normalize() : url.toURI().toPath().toAbsolutePath().normalize(); final String currentSubDir = jarPath.getFileName().toString(); if ("bin".equals(currentSubDir) || "target".equals(currentSubDir)) { @@ -348,17 +348,17 @@ public class StorageServiceImpl implements StorageService { private boolean closed = false; @Override - public void write(int b) throws IOException { + public void write(final int b) throws IOException { outputStream.write(b); } @Override - public void write(byte[] b) throws IOException { + public void write(final byte[] b) throws IOException { outputStream.write(b); } @Override - public void write(byte[] b, int off, int len) throws IOException { + public void write(final byte[] b, final int off, final int len) throws IOException { outputStream.write(b, off, len); }