allow "." character in name of ResourceReader resources (#619)

NationalSecurityAgency · Nov 7, 2023 · b9dccda · b9dccda
1 parent 048495b
commit b9dccda
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/main/java/emissary/util/io/ResourceReader.java b/src/main/java/emissary/util/io/ResourceReader.java
@@ -106,7 +106,7 @@ public String getResourceName(Class<?> c) {
      * Get the resource name
      */
     public String getResourceName(Package pkg, String name) {
-        return (pkg.getName() + "/" + name).replace('.', '/');
+        return (pkg.getName().replace('.', '/') + "/" + name);
     }
 
     /**

diff --git a/src/test/java/emissary/util/io/ResourceReaderTest.java b/src/test/java/emissary/util/io/ResourceReaderTest.java
@@ -73,6 +73,7 @@ void testNaming() {
         assertEquals("emissary/util/Version.cfg", rr.getConfigDataName(Version.class), "Resource config naming");
         assertEquals("emissary/util/io/foo", rr.getResourceName(this.getClass().getPackage(), "foo"), "Resource package naming");
         assertEquals("emissary/util/io/foo.xml", rr.getXmlName(this.getClass().getPackage(), "foo"), "Resource package naming");
+        assertEquals("emissary/util/io/sample.dat", rr.getResourceName(this.thisPackage, "sample.dat"), "Sample file with extension naming");
     }
 
 }