Resource.resolve is now abstract

jetty · Sep 22, 2022 · 7f86ec1 · 7f86ec1
1 parent 74acb62
commit 7f86ec1
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/resource/MemoryResource.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/resource/MemoryResource.java
@@ -106,6 +106,12 @@ public long length()
         return _bytes.length;
     }
 
+    @Override
+    public Resource resolve(String subUriPath)
+    {
+        return null;
+    }
+
     @Override
     public InputStream newInputStream() throws IOException
     {

diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java
@@ -292,11 +292,7 @@ public List<Resource> list()
      * @return a Resource representing the subUriPath
      * @throws IllegalArgumentException if subUriPath is invalid
      */
-    public Resource resolve(String subUriPath)
-    {
-        // abstract returns null always.
-        return null;
-    }
+    public abstract Resource resolve(String subUriPath);
 
     /**
      * @return true if this Resource is an alias to another real Resource

diff --git a/...-maven-plugin/src/main/java/org/eclipse/jetty/ee10/maven/plugin/SelectiveJarResource.java b/...-maven-plugin/src/main/java/org/eclipse/jetty/ee10/maven/plugin/SelectiveJarResource.java
@@ -39,6 +39,8 @@
  * SelectiveJarResource
  *
  * Selectively copies resources from a jar file based on includes/excludes.
+ * TODO: investigate if copyTo() can instead have an IncludeExcludeSet as a parameter?
+ * TODO: or have a smaller ResourceWrapper jetty-core class that can be overridden for specific behavior like in this class
  */
 public class SelectiveJarResource extends Resource
 {
@@ -134,6 +136,12 @@ public String getFileName()
         return _delegate.getFileName();
     }
 
+    @Override
+    public Resource resolve(String subUriPath)
+    {
+        return _delegate.resolve(subUriPath);
+    }
+
     @Override
     public void copyTo(Path directory) throws IOException
     {

diff --git a/...9-maven-plugin/src/main/java/org/eclipse/jetty/ee9/maven/plugin/SelectiveJarResource.java b/...9-maven-plugin/src/main/java/org/eclipse/jetty/ee9/maven/plugin/SelectiveJarResource.java
@@ -39,6 +39,8 @@
  * SelectiveJarResource
  *
  * Selectively copies resources from a jar file based on includes/excludes.
+ * TODO: investigate if copyTo() can instead have an IncludeExcludeSet as a parameter?
+ * TODO: or have a smaller ResourceWrapper jetty-core class that can be overridden for specific behavior like in this class
  */
 public class SelectiveJarResource extends Resource
 {
@@ -134,6 +136,12 @@ public String getFileName()
         return _delegate.getFileName();
     }
 
+    @Override
+    public Resource resolve(String subUriPath)
+    {
+        return _delegate.resolve(subUriPath);
+    }
+
     @Override
     public void copyTo(Path directory) throws IOException
     {