chore: fix load template with profile

Author: pipinet

dataflow-core/src/main/java/com/qwlabs/dataflow/Configs.java

@@ -32,9 +32,8 @@ public ParameterTool load(@Nullable String prefix) {
             .mergeWith(load(args.profile(), prefix));
     }
 
-    private ParameterTool load(@Nullable String profile, @Nullable String prefix) {
-        final var startPrefix = Joiner.on(".").skipNulls().join(Arrays.asList(profile, prefix));
-        return ptCache.computeIfAbsent(startPrefix, this::doLoad);
+    public ParameterTool load(@Nullable String profile, @Nullable String prefix) {
+        return ptCache.computeIfAbsent(startPrefix(profile, prefix), this::doLoad);
     }
 
     private ParameterTool doLoad(String prefix) {
@@ -61,7 +60,14 @@ private void doLoadTemplate(Map<String, String> parameters, ParameterTool pt, St
             return;
         }
         Splitter.on(",").split(configTemplate)
-            .forEach(template -> parameters.putAll(doLoad(template).toMap()));
+            .forEach(template -> {
+                parameters.putAll(doLoad(startPrefix(null, template)).toMap());
+                parameters.putAll(doLoad(startPrefix(args.profile(), template)).toMap());
+            });
+    }
+
+    private String startPrefix(@Nullable String profile, @Nullable String prefix) {
+        return Joiner.on(".").skipNulls().join(Arrays.asList(profile, prefix));
     }
 
     protected static Configs of() {

dataflow-core/src/test/java/com/qwlabs/dataflow/ConfigsTest.java

@@ -8,7 +8,7 @@ public class ConfigsTest {
     @Test
     void should_load_root() {
         var pt = Configs.of().load();
-        assertEquals(pt.toMap().size(), 32);
+        assertEquals(pt.toMap().size(), 33);
     }
 
     @Test
@@ -27,4 +27,11 @@ void should_load_by_prefix_sink() {
         assertEquals(pt.get("url"), "jdbc:postgresql://localhost:5432/comac_app");
         assertEquals(pt.get("connector"), "jdbc");
     }
+
+    @Test
+    void should_load_by_profile() {
+        var pt = Configs.of(new String[]{"--profile", "prod"}).load("comac.airline.source");
+        assertEquals(pt.toMap().size(), 13);
+        assertEquals(pt.get("hostname"), "192.168.3.16");
+    }
 }

dataflow-core/src/test/resources/application.properties

@@ -11,6 +11,7 @@ jdbc.buffer-flush.max-rows=1000
 
 comac.source.config-template=postgres-cdc
 comac.source.hostname=127.0.0.1
+prod.comac.source.hostname=192.168.3.16
 comac.source.port=5432
 comac.source.username=postgres
 comac.source.password=