clean(core): Remove BaseResource's (now) no longer required weird #ha…

…cked constructor with #fake fixedMediaType parameter
enola-dev · Dec 14, 2024 · 35cdf0b · 35cdf0b
1 parent 09c8cc8
commit 35cdf0b
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 14 deletions.
diff --git a/java/dev/enola/common/io/resource/BaseResource.java b/java/dev/enola/common/io/resource/BaseResource.java
@@ -48,13 +48,6 @@ protected BaseResource(URI uri, MediaType mediaType) {
         this.mediaType = mtd.adjustCharset(uri, requireNonNull(mediaType, "mediaType"));
     }
 
-    // TODO Remove this weird "hacked" constructor with "fake" fixedMediaType parameter...
-    protected BaseResource(URI uri, MediaType mediaType, boolean fixedMediaType) {
-        this.uri = requireNonNull(uri, "uri");
-        this.mediaType = requireNonNull(mediaType, "mediaType");
-        if (!fixedMediaType) throw new IllegalArgumentException();
-    }
-
     // No need for: protected BaseResource(URI uri, MediaType mediaType, ByteSource byteSource) {
 
     @Override

diff --git a/java/dev/enola/common/io/resource/ErrorResource.java b/java/dev/enola/common/io/resource/ErrorResource.java
@@ -46,7 +46,7 @@ public Resource getResource(URI uri) {
     public static final ErrorResource INSTANCE = new ErrorResource();
 
     private ErrorResource() {
-        super(ERROR_URI, MEDIA_TYPE, true);
+        super(ERROR_URI, MEDIA_TYPE);
     }
 
     @Override

diff --git a/java/dev/enola/common/io/resource/MemoryResource.java b/java/dev/enola/common/io/resource/MemoryResource.java
@@ -44,10 +44,6 @@ private static URI nextURI(String querySuffix) {
 
     private final MemoryByteSink memoryByteSink = new MemoryByteSink();
 
-    protected MemoryResource(URI uri, MediaType mediaType, boolean fixedMediaType) {
-        super(uri, mediaType, fixedMediaType);
-    }
-
     public MemoryResource(URI uri, MediaType mediaType) {
         super(uri, mediaType);
     }

diff --git a/java/dev/enola/common/io/resource/NullResource.java b/java/dev/enola/common/io/resource/NullResource.java
@@ -52,7 +52,7 @@ public Resource getResource(URI uri) {
     static final String SCHEME = "null";
 
     public NullResource(MediaType mediaType) {
-        super(uri(mediaType), mediaType, true);
+        super(uri(mediaType), mediaType);
     }
 
     private static URI uri(MediaType mediaType) {

diff --git a/java/dev/enola/common/io/resource/TestResource.java b/java/dev/enola/common/io/resource/TestResource.java
@@ -36,7 +36,7 @@ public class TestResource extends MemoryResource implements CloseableResource {
     private final long id;
 
     private TestResource(MediaType mediaType, URI uri, long id) {
-        super(uri, mediaType, true);
+        super(uri, mediaType);
         this.id = id;
     }