Merge pull request jooby-project#2468 from imeszaros/config-origin-fix

jknack · web-flow · commit 5138235b610b · 2021-12-10T09:14:17.000-03:00
Do not override config origins
diff --git a/jooby/src/main/java/io/jooby/Environment.java b/jooby/src/main/java/io/jooby/Environment.java
@@ -362,7 +362,7 @@ private static Config resolveConfig(@Nonnull EnvironmentOptions options, Path us
     }
 
     for (String name : names) {
-      Config it = fileConfig(userdir, rootdirs, name);
+      Config it = fileConfig(rootdirs, name);
       if (it == null) {
         // classpath
         it = classpathConfig(options.getClassLoader(), cpdirs, name);
@@ -410,15 +410,11 @@ private static Config resolveConfig(@Nonnull EnvironmentOptions options, Path us
     return pid;
   }
 
-  private static Config fileConfig(Path userdir, Path[] basedirs, String name) {
+  private static Config fileConfig(Path[] basedirs, String name) {
     for (Path basedir : basedirs) {
       Path file = basedir.resolve(name);
       if (Files.exists(file)) {
-        String origin = file.startsWith(userdir)
-            ? userdir.relativize(file).toString()
-            : file.toString();
-        return ConfigFactory.parseFile(file.toFile(),
-            ConfigParseOptions.defaults().setOriginDescription(origin));
+        return ConfigFactory.parseFile(file.toFile());
       }
     }
     return null;
@@ -430,8 +426,7 @@ private static Config classpathConfig(ClassLoader classLoader, String[] basedirs
           ? name
           : Stream.concat(Stream.of(basedir.split("/")), Stream.of(name))
           .collect(Collectors.joining("/"));
-      Config config = ConfigFactory.parseResources(classLoader, file,
-          ConfigParseOptions.defaults().setOriginDescription("classpath://" + file));
+      Config config = ConfigFactory.parseResources(classLoader, file);
       if (!config.isEmpty()) {
         return config;
       }
diff --git a/jooby/src/test/java/io/jooby/EnvironmentTest.java b/jooby/src/test/java/io/jooby/EnvironmentTest.java
@@ -13,46 +13,51 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.function.BiConsumer;
+import java.util.function.Predicate;
 
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class EnvironmentTest {
 
   @Test
   public void defaultEnv() {
 
     env("foo", (env, conf) -> {
-      assertEquals("[dev]\n"
-          + "└── system properties\n"
-          + " └── env variables\n"
-          + "  └── classpath://env/foo/application.conf\n"
-          + "   └── defaults", env.toString());
+      assertEnvMatches(env,
+          "[dev]"::equals,
+          "└── system properties"::equals,
+          " └── env variables"::equals,
+          pathEndsMatch("env/foo/application.conf"),
+          "   └── defaults"::equals);
       assertEquals("[dev]", env.getActiveNames().toString());
       assertEquals(System.getProperty("user.dir"), conf.getString("user.dir"));
       assertEquals("bar", conf.getString("foo"));
       assertEquals(asList("a", "b", "c"), conf.getStringList("letters"));
     });
 
     env("foo", mapOf("application.env", "PROD"), (env, conf) -> {
-      assertEquals("[prod]\n"
-          + "└── system properties\n"
-          + " └── env variables\n"
-          + "  └── classpath://env/foo/application.prod.conf\n"
-          + "   └── classpath://env/foo/application.conf\n"
-          + "    └── defaults", env.toString());
+      assertEnvMatches(env,
+          "[prod]"::equals,
+          "└── system properties"::equals,
+          " └── env variables"::equals,
+          pathEndsMatch("env/foo/application.prod.conf"),
+          pathEndsMatch("env/foo/application.conf"),
+          "    └── defaults"::equals);
       assertEquals("[prod]", env.getActiveNames().toString());
       assertEquals("bazz", conf.getString("foo"));
       assertEquals(asList("a", "b", "c"), conf.getStringList("letters"));
     });
 
     env("foo", mapOf("application.env", "Test, bar"), (env, conf) -> {
-      assertEquals("[test, bar]\n"
-          + "└── system properties\n"
-          + " └── env variables\n"
-          + "  └── classpath://env/foo/application.test.conf\n"
-          + "   └── classpath://env/foo/application.bar.conf\n"
-          + "    └── defaults", env.toString());
+      assertEnvMatches(env,
+          "[test, bar]"::equals,
+          "└── system properties"::equals,
+          " └── env variables"::equals,
+          pathEndsMatch("env/foo/application.test.conf"),
+          pathEndsMatch("env/foo/application.bar.conf"),
+          "    └── defaults"::equals);
       assertEquals("[test, bar]", env.getActiveNames().toString());
       assertEquals("test", conf.getString("foo"));
       assertEquals(asList("d"), conf.getStringList("letters"));
@@ -79,12 +84,13 @@ public void envfromfs() {
         .loadEnvironment(new EnvironmentOptions().setBasedir(basedir).setActiveNames("prod"));
     assertEquals("bazz", env.getConfig().getString("foo"));
     System.out.println(env.toString());
-    assertEquals("[prod]\n"
-        + "└── system properties\n"
-        + " └── env variables\n"
-        + "  └── "+ reldir.resolve("application.prod.conf")+"\n"
-        + "   └── "+ reldir.resolve("application.conf")+"\n"
-        + "    └── defaults", env.toString());
+    assertEnvMatches(env,
+        "[prod]"::equals,
+        "└── system properties"::equals,
+        " └── env variables"::equals,
+        pathEndsMatch(reldir.resolve("application.prod.conf").toString()),
+        pathEndsMatch(reldir.resolve("application.conf").toString()),
+        "    └── defaults"::equals);
   }
 
   @Test
@@ -147,4 +153,17 @@ private Map<String, Object> mapOf(Object... values) {
     }
     return hash;
   }
+
+  private static Predicate<String> pathEndsMatch(String path) {
+    return line -> line.replaceAll("\\\\", "/").endsWith(path.replaceAll("\\\\", "/"));
+  }
+
+  @SafeVarargs
+  private static void assertEnvMatches(Environment environment, Predicate<String>... predicates) {
+    final String[] lines = environment.toString().split("\n");
+    assertEquals(lines.length, predicates.length);
+    for (int i = 0; i < predicates.length; ++i) {
+      assertTrue(predicates[i].test(lines[i]), "Predicate for line nr. " + i + " should succeed.");
+    }
+  }
 }
