Add toString #2515 (#2516)

Signed-off-by: Arjan Tijms <[email protected]>
piranhacloud · Mar 11, 2022 · a89dedb · a89dedb
1 parent 73f2c7c
commit a89dedb
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 12 deletions.
diff --git a/resource/impl/src/main/java/cloud/piranha/resource/impl/AliasedNamedResource.java b/resource/impl/src/main/java/cloud/piranha/resource/impl/AliasedNamedResource.java
@@ -27,12 +27,12 @@
  */
 package cloud.piranha.resource.impl;
 
-import cloud.piranha.resource.api.Resource;
-
 import java.io.InputStream;
 import java.net.URL;
 import java.util.stream.Stream;
 
+import cloud.piranha.resource.api.Resource;
+
 /**
  * A {@link Resource} wrapper with a custom name
  */
@@ -78,4 +78,9 @@ public String getName() {
         return resourceName;
     }
 
+    @Override
+    public String toString() {
+        return getName() + " " + super.toString();
+    }
+
 }
diff --git a/resource/impl/src/main/java/cloud/piranha/resource/impl/ByteArrayResource.java b/resource/impl/src/main/java/cloud/piranha/resource/impl/ByteArrayResource.java
@@ -27,13 +27,14 @@
  */
 package cloud.piranha.resource.impl;
 
-import cloud.piranha.resource.api.Resource;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.stream.Stream;
 
+import cloud.piranha.resource.api.Resource;
+
 /**
  * The byte-array resource.
  *
@@ -163,4 +164,14 @@ private String getLocationFromUrl(String url) {
 
     }
 
+    @Override
+    public String getName() {
+        return location;
+    }
+
+    @Override
+    public String toString() {
+        return getName() + " " + super.toString();
+    }
+
 }
diff --git a/resource/impl/src/main/java/cloud/piranha/resource/impl/ClassResource.java b/resource/impl/src/main/java/cloud/piranha/resource/impl/ClassResource.java
@@ -27,12 +27,13 @@
  */
 package cloud.piranha.resource.impl;
 
-import cloud.piranha.resource.api.Resource;
 import java.io.InputStream;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.stream.Stream;
 
+import cloud.piranha.resource.api.Resource;
+
 /**
  * A resource backed by a class.
  *
@@ -84,4 +85,14 @@ public Stream<String> getAllLocations() {
         }
         return result.stream();
     }
+
+    @Override
+    public String getName() {
+        return location;
+    }
+
+    @Override
+    public String toString() {
+        return getName() + " " + super.toString();
+    }
 }
diff --git a/resource/impl/src/main/java/cloud/piranha/resource/impl/DirectoryResource.java b/resource/impl/src/main/java/cloud/piranha/resource/impl/DirectoryResource.java
@@ -30,8 +30,8 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.file.Files;
@@ -59,7 +59,7 @@ public class DirectoryResource implements Resource {
      */
     public DirectoryResource() {
     }
-    
+
     /**
      * Constructor.
      *
@@ -115,7 +115,7 @@ public InputStream getResourceAsStream(String location) {
 
         return result;
     }
-    
+
     @Override
     public Stream<String> getAllLocations() {
         try {
@@ -152,4 +152,9 @@ public String getName() {
         return rootDirectory.getName();
     }
 
+    @Override
+    public String toString() {
+        return getName() + " " + super.toString();
+    }
+
 }
diff --git a/resource/impl/src/main/java/cloud/piranha/resource/impl/JarResource.java b/resource/impl/src/main/java/cloud/piranha/resource/impl/JarResource.java
@@ -27,7 +27,6 @@
  */
 package cloud.piranha.resource.impl;
 
-import cloud.piranha.resource.api.Resource;
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -41,6 +40,8 @@
 import java.util.stream.Stream;
 import java.util.zip.ZipEntry;
 
+import cloud.piranha.resource.api.Resource;
+
 /**
  * The default JarResource.
  *
@@ -155,4 +156,9 @@ public void setJarFile(File jarFile) {
     public String getName() {
         return jarFile.getName();
     }
+
+    @Override
+    public String toString() {
+        return getName() + " " + super.toString();
+    }
 }
diff --git a/resource/impl/src/main/java/cloud/piranha/resource/impl/MultiReleaseResource.java b/resource/impl/src/main/java/cloud/piranha/resource/impl/MultiReleaseResource.java
@@ -27,8 +27,6 @@
  */
 package cloud.piranha.resource.impl;
 
-import cloud.piranha.resource.api.Resource;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -38,6 +36,8 @@
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
+import cloud.piranha.resource.api.Resource;
+
 /**
  * A resource wrapper that loads the versioned entries from META-INF/versions if
  * the resource contains a main attribute named "Multi-Release" in the META-INF/MANIFEST.MF
@@ -148,4 +148,9 @@ public Stream<String> getAllLocations() {
     public String getName() {
         return resource.getName();
     }
+
+    @Override
+    public String toString() {
+        return getName() + " " + super.toString();
+    }
 }
diff --git a/resource/impl/src/main/java/cloud/piranha/resource/impl/PrefixJarResource.java b/resource/impl/src/main/java/cloud/piranha/resource/impl/PrefixJarResource.java
@@ -27,7 +27,6 @@
  */
 package cloud.piranha.resource.impl;
 
-import cloud.piranha.resource.api.Resource;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
@@ -36,6 +35,8 @@
 import java.util.jar.JarFile;
 import java.util.stream.Stream;
 
+import cloud.piranha.resource.api.Resource;
+
 /**
  * The default PrefixJarResource.
  *
@@ -113,7 +114,7 @@ public InputStream getResourceAsStream(String location) {
         }
         return result;
     }
-    
+
     @Override
     public Stream<String> getAllLocations() {
         return Stream.empty();
@@ -159,4 +160,9 @@ public String getName() {
         return jarFile.getName();
     }
 
+    @Override
+    public String toString() {
+        return getName() + " " + super.toString();
+    }
+
 }