Merge pull request #85 from avaje/feature/load-file

Fix where load by props or command line args or indirection does not load FILE if RESOURCE found
avaje · Jul 11, 2023 · a24dd98 · a24dd98
2 parents 9c1c6d2 + 64e2190
commit a24dd98
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/avaje-config/src/main/java/io/avaje/config/InitialLoader.java b/avaje-config/src/main/java/io/avaje/config/InitialLoader.java
@@ -268,9 +268,9 @@ private void loadViaSystemProperty() {
 
   boolean loadWithExtensionCheck(String fileName) {
     if (fileName.endsWith("yaml") || fileName.endsWith("yml")) {
-      return loadYamlPath(fileName, RESOURCE) || loadYamlPath(fileName, FILE);
+      return loadYamlPath(fileName, RESOURCE) | loadYamlPath(fileName, FILE);
     } else if (fileName.endsWith("properties")) {
-      return loadProperties(fileName, RESOURCE) || loadProperties(fileName, FILE);
+      return loadProperties(fileName, RESOURCE) | loadProperties(fileName, FILE);
     } else {
       throw new IllegalArgumentException("Expecting only yaml or properties file but got [" + fileName + "]");
     }

diff --git a/avaje-config/src/test/java/io/avaje/config/InitialLoaderTest.java b/avaje-config/src/test/java/io/avaje/config/InitialLoaderTest.java
@@ -48,6 +48,7 @@ void loadWithExtensionCheck() {
     assertThat(properties.get("dummy.yaml.bar").value()).isEqualTo("baz");
     assertThat(properties.get("dummy.yml.foo").value()).isEqualTo("bar");
     assertThat(properties.get("dummy.properties.foo").value()).isEqualTo("bar");
+    assertThat(properties.get("dummy.properties.a").value()).isEqualTo("fromResource");
   }
 
   @Test

diff --git a/avaje-config/src/test/resources/test-dummy.properties b/avaje-config/src/test/resources/test-dummy.properties
@@ -0,0 +1,2 @@
+dummy.properties.a=fromResource
+dummy.properties.foo=bazz