Fixed the properties issue: matteobaccan#226

jonn-smith · Apr 9, 2018 · 20f085a · 20f085a
1 parent 4d73daa
commit 20f085a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/owner/src/main/java/org/aeonbits/owner/ConfigURIFactory.java b/owner/src/main/java/org/aeonbits/owner/ConfigURIFactory.java
@@ -40,8 +40,15 @@ URI newURI(String spec) throws URISyntaxException {
                 return null;
             return url.toURI();
         } else if (fixed.startsWith(FILE_PROTOCOL)) {
-            String path = fixSpacesToPercentTwenty(fixed);
-            return new URI(path);
+            // This check fixes the case where an environment variable has been
+            // specified for the path to the config file, but that environment
+            // variable is blank / undefined.
+            if ( fixed.equals(FILE_PROTOCOL) ) {
+                return new URI("");
+            } else {
+                String path = fixSpacesToPercentTwenty(fixed);
+                return new URI(path);
+            }
         } else {
             return new URI(fixed);
         }

diff --git a/owner/src/test/java/org/aeonbits/owner/ConfigURIFactoryTest.java b/owner/src/test/java/org/aeonbits/owner/ConfigURIFactoryTest.java
@@ -26,4 +26,11 @@ public void shouldReturnAnURI() throws URISyntaxException {
         URI uri = h.newURI("classpath:test.properties");
         assertNotNull(uri);
     }
+
+    @Test
+    public void shouldReturnAUriWithEmptyFilePath() throws URISyntaxException {
+        ConfigURIFactory h = new ConfigURIFactory(this.getClass().getClassLoader(), new VariablesExpander(new Properties()));
+        URI uri = h.newURI("file:");
+        assertNotNull(uri);
+    }
 }