Throw only IOException from storage services

fyreplace · Aug 6, 2024 · 14ee5e4 · 14ee5e4
1 parent 0636da9
commit 14ee5e4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/src/main/java/app/fyreplace/api/services/storage/file/FileStorageService.java b/src/main/java/app/fyreplace/api/services/storage/file/FileStorageService.java
@@ -5,7 +5,6 @@
 import io.quarkus.arc.properties.IfBuildProperty;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
-import jakarta.ws.rs.NotFoundException;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -25,7 +24,7 @@ public byte[] fetch(final String path) throws IOException {
         try (final var reader = new FileInputStream(getFile(path))) {
             return reader.readAllBytes();
         } catch (final FileNotFoundException e) {
-            throw new NotFoundException();
+            throw new IOException();
         }
     }
 
@@ -42,15 +41,15 @@ public void store(final String path, final byte[] data) throws IOException {
 
     @SuppressWarnings("ResultOfMethodCallIgnored")
     @Override
-    public void remove(final String path) {
+    public void remove(final String path) throws IOException {
         getFile(path).delete();
     }
 
-    private File getFile(final String path) {
+    private File getFile(final String path) throws IOException {
         final var file = config.path().resolve(path).toFile();
 
         if (!file.toPath().normalize().startsWith(config.path().normalize())) {
-            throw new NotFoundException();
+            throw new IOException();
         }
 
         return file;

diff --git a/src/main/java/app/fyreplace/api/services/storage/memory/MemoryStorageService.java b/src/main/java/app/fyreplace/api/services/storage/memory/MemoryStorageService.java
@@ -4,6 +4,7 @@
 import io.quarkus.arc.Unremovable;
 import io.quarkus.arc.properties.IfBuildProperty;
 import jakarta.enterprise.context.ApplicationScoped;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -15,7 +16,11 @@ public final class MemoryStorageService extends LocalStorageServiceBase {
     private final Map<String, byte[]> storage = new HashMap<>();
 
     @Override
-    public byte[] fetch(final String path) {
+    public byte[] fetch(final String path) throws IOException {
+        if (!storage.containsKey(path)) {
+            throw new IOException();
+        }
+
         return storage.get(path);
     }
 

diff --git a/src/main/java/app/fyreplace/api/services/storage/s3/S3StorageService.java b/src/main/java/app/fyreplace/api/services/storage/s3/S3StorageService.java
@@ -10,7 +10,6 @@
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.event.Observes;
 import jakarta.inject.Inject;
-import jakarta.ws.rs.NotFoundException;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -55,7 +54,7 @@ public byte[] fetch(final String path) throws IOException {
         try {
             return client.getObject(b -> b.bucket(config.bucket()).key(path)).readAllBytes();
         } catch (final NoSuchKeyException e) {
-            throw new NotFoundException();
+            throw new IOException();
         }
     }