Allow to configure default properties values apache#250

lburgazzoli · Mar 4, 2020 · faf9549 · faf9549
1 parent 170fc99
commit faf9549
Show file tree

Hide file tree

Showing 27 changed files with 371 additions and 164 deletions.
diff --git a/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/LoaderTest.groovy b/camel-k-loader-groovy/src/test/groovy/org/apache/camel/k/loader/groovy/LoaderTest.groovy
@@ -100,5 +100,9 @@ class LoaderTest extends Specification {
         void addRoutes(RoutesBuilder builder) {
             this.builders.add(builder)
         }
+
+        @Override
+        void setPropertiesLocations(Collection<String> locations) {
+        }
     }
 }
diff --git a/camel-k-loader-java/src/test/java/org/apache/camel/k/loader/java/RoutesLoaderTest.java b/camel-k-loader-java/src/test/java/org/apache/camel/k/loader/java/RoutesLoaderTest.java
@@ -17,6 +17,7 @@
 package org.apache.camel.k.loader.java;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.stream.Stream;
 
@@ -166,6 +167,10 @@ public void addRoutes(RoutesBuilder builder) {
         public void addConfiguration(Object configuration) {
             this.configurations.add(configuration);
         }
+
+        @Override
+        public void setPropertiesLocations(Collection<String> locations) {
+        }
     }
 }
 
diff --git a/camel-k-loader-js/src/test/java/org/apache/camel/k/loader/js/RoutesLoaderTest.java b/camel-k-loader-js/src/test/java/org/apache/camel/k/loader/js/RoutesLoaderTest.java
@@ -17,6 +17,7 @@
 package org.apache.camel.k.loader.js;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.stream.Stream;
 
@@ -86,5 +87,9 @@ public CamelContext getCamelContext() {
         public void addRoutes(RoutesBuilder builder) {
             this.builders.add(builder);
         }
+
+        @Override
+        public void setPropertiesLocations(Collection<String> locations) {
+        }
     }
 }
diff --git a/camel-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/LoaderTest.kt b/camel-k-loader-kotlin/src/test/kotlin/org/apache/camel/k/loader/kotlin/LoaderTest.kt
@@ -90,5 +90,8 @@ class LoaderTest {
         override fun addRoutes(builder: RoutesBuilder) {
             this.builders.add(builder)
         }
+
+        override fun setPropertiesLocations(locations: MutableCollection<String>?) {
+        }
     }
 }
diff --git a/camel-k-loader-xml/src/test/java/org/apache/camel/k/loader/xml/RoutesLoaderTest.java b/camel-k-loader-xml/src/test/java/org/apache/camel/k/loader/xml/RoutesLoaderTest.java
@@ -17,6 +17,7 @@
 package org.apache.camel.k.loader.xml;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.stream.Stream;
 
@@ -84,6 +85,10 @@ public void addRoutes(RoutesBuilder builder) {
             this.builders.add(builder);
         }
 
+        @Override
+        public void setPropertiesLocations(Collection<String> locations) {
+        }
+
         public SourceLoader load(Source source) throws Exception {
             SourceLoader loader = RuntimeSupport.loaderFor(camelContext, source);
             SourceLoader.Result result = loader.load(this, source);

diff --git a/...k-main/camel-k-runtime-main/src/main/java/org/apache/camel/k/main/ApplicationRuntime.java b/...k-main/camel-k-runtime-main/src/main/java/org/apache/camel/k/main/ApplicationRuntime.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.k.main;
 
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.LinkedHashSet;
@@ -59,12 +60,6 @@ public ApplicationRuntime() {
         this.main.configure().setXmlRests("false");
         this.main.setRoutesCollector(new NoRoutesCollector());
         this.main.addMainListener(new MainListenerAdapter());
-
-        this.main.setPropertyPlaceholderLocations(
-            PropertiesSupport.resolvePropertiesLocations().stream()
-                .map(location -> "file:" + location)
-                .collect(Collectors.joining(","))
-        );
     }
 
     @Override
@@ -91,11 +86,27 @@ public void addConfiguration(Object configuration) {
         this.main.addConfiguration(configuration);
     }
 
+    @Override
+    public void setInitialProperties(Properties properties) {
+        this.main.setInitialProperties(properties);
+    }
+
     @Override
     public void setProperties(Properties properties) {
         this.main.setOverrideProperties(properties);
     }
 
+    @Override
+    public void setPropertiesLocations(Collection<String> locations) {
+        this.main.setPropertyPlaceholderLocations(
+            locations.stream()
+                .map(location -> location.startsWith("file:") ? location : "file:" + location)
+                .distinct()
+                .sorted()
+                .collect(Collectors.joining(","))
+        );
+    }
+
     public void addListeners(Iterable<Runtime.Listener> listeners) {
         listeners.forEach(this::addListener);
     }

diff --git a/camel-k-main/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/PropertiesTest.java b/camel-k-main/camel-k-runtime-main/src/test/java/org/apache/camel/k/main/PropertiesTest.java
@@ -18,9 +18,12 @@
 
 import java.util.Properties;
 import java.util.concurrent.ThreadLocalRandom;
+import java.util.stream.Collectors;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.component.seda.SedaComponent;
+import org.apache.camel.component.properties.PropertiesComponent;
+import org.apache.camel.k.Constants;
 import org.apache.camel.k.ContextCustomizer;
 import org.apache.camel.k.Runtime;
 import org.apache.camel.k.listener.ContextConfigurer;
@@ -33,21 +36,42 @@ public class PropertiesTest {
 
     @Test
     public void testLoadProperties() throws Exception {
-        Properties properties = PropertiesSupport.loadProperties("src/test/resources/conf.properties", "src/test/resources/conf.d");
+        System.setProperty(Constants.PROPERTY_CAMEL_K_CONF, "src/test/resources/conf.properties");
+        System.setProperty(Constants.PROPERTY_CAMEL_K_CONF_D, "src/test/resources/conf.d");
 
-        ApplicationRuntime runtime = new ApplicationRuntime();
-        runtime.setProperties(properties);
-        runtime.addListener(new ContextConfigurer());
-        runtime.addListener(Runtime.Phase.Started, r -> {
-            CamelContext context = r.getCamelContext();
-            assertThat(context.resolvePropertyPlaceholders("{{root.key}}")).isEqualTo("root.value");
-            assertThat(context.resolvePropertyPlaceholders("{{001.key}}")).isEqualTo("001.value");
-            assertThat(context.resolvePropertyPlaceholders("{{002.key}}")).isEqualTo("002.value");
-            assertThat(context.resolvePropertyPlaceholders("{{a.key}}")).isEqualTo("a.002");
-            runtime.stop();
-        });
+        try {
+            ApplicationRuntime runtime = new ApplicationRuntime();
+            runtime.setInitialProperties(PropertiesSupport.loadApplicationProperties());
+            runtime.setPropertiesLocations(PropertiesSupport.resolveUserPropertiesLocations());
+            runtime.addListener(new ContextConfigurer());
+            runtime.addListener(Runtime.Phase.Started, r -> {
+                final CamelContext context = r.getCamelContext();
+                final PropertiesComponent pc = (PropertiesComponent)context.getPropertiesComponent();
+
+                assertThat(pc.getInitialProperties()).containsExactlyEntriesOf(PropertiesSupport.loadApplicationProperties());
+                assertThat(pc.getInitialProperties().getProperty("root.key")).isEqualTo("root.value");
+                assertThat(pc.getInitialProperties().getProperty("a.key")).isEqualTo("a.root");
+
+                assertThat(pc.getLocations()).hasSameElementsAs(
+                    PropertiesSupport.resolveUserPropertiesLocations().stream()
+                        .map(location -> "file:" + location)
+                        .distinct()
+                        .sorted()
+                        .collect(Collectors.toList())
+                );
+
+                assertThat(pc.resolveProperty("root.key")).get().isEqualTo("root.value");
+                assertThat(pc.resolveProperty("001.key")).get().isEqualTo("001.value");
+                assertThat(pc.resolveProperty("002.key")).get().isEqualTo("002.value");
+                assertThat(pc.resolveProperty("a.key")).get().isEqualTo("a.002");
+                runtime.stop();
+            });
 
-        runtime.run();
+            runtime.run();
+        } finally {
+            System.getProperties().remove(Constants.PROPERTY_CAMEL_K_CONF);
+            System.getProperties().remove(Constants.PROPERTY_CAMEL_K_CONF_D);
+        }
     }
 
     @Test

diff --git a/...us-core/runtime/src/main/java/org/apache/camel/k/core/quarkus/RuntimeListenerAdapter.java b/...us-core/runtime/src/main/java/org/apache/camel/k/core/quarkus/RuntimeListenerAdapter.java
@@ -17,8 +17,11 @@
 package org.apache.camel.k.core.quarkus;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Properties;
+import java.util.stream.Collectors;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.RoutesBuilder;
@@ -108,6 +111,27 @@ public void addRoutes(RoutesBuilder builder) {
             public void addConfiguration(Object configuration) {
                 main.addConfiguration(configuration);
             }
+
+            @Override
+            public void setInitialProperties(Properties properties) {
+                main.setInitialProperties(properties);
+            }
+
+            @Override
+            public void setProperties(Properties properties) {
+                main.setOverrideProperties(properties);
+            }
+
+            @Override
+            public void setPropertiesLocations(Collection<String> locations) {
+                main.setPropertyPlaceholderLocations(
+                    locations.stream()
+                        .map(location -> location.startsWith("file:") ? location : "file:" + location)
+                        .distinct()
+                        .sorted()
+                        .collect(Collectors.joining(","))
+                );
+            }
         };
     }
 }
diff --git a/...time/src/main/java/org/apache/camel/k/quarkus/ApplicationRuntimeConfigSourceProvider.java b/...time/src/main/java/org/apache/camel/k/quarkus/ApplicationRuntimeConfigSourceProvider.java
diff --git a/...main/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSourceProvider b/...main/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSourceProvider
diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/Runtime.java b/camel-k-runtime-core/src/main/java/org/apache/camel/k/Runtime.java
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.k;
 
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
@@ -37,6 +39,23 @@ default Registry getRegistry() {
         return getCamelContext().getRegistry();
     }
 
+    default void setInitialProperties(Properties properties) {
+        getCamelContext().getPropertiesComponent().setInitialProperties(properties);
+    }
+
+    default void setInitialProperties(Map<String, String> properties) {
+        Properties p = new Properties();
+        p.putAll(properties);
+
+        setInitialProperties(p);
+    }
+
+    default void setInitialProperties(String key, String value, String... keyVals) {
+        setInitialProperties(
+            mapOf(HashMap::new, key, value, keyVals)
+        );
+    }
+
     default void setProperties(Properties properties) {
         getCamelContext().getPropertiesComponent().setOverrideProperties(properties);
     }
@@ -66,6 +85,12 @@ default void addConfiguration(Object configuration) {
         throw new UnsupportedOperationException();
     }
 
+    void setPropertiesLocations(Collection<String> locations);
+
+    default void setPropertiesLocations(String... locations) {
+        setPropertiesLocations(Arrays.asList(locations));
+    }
+
     /**
      * Lifecycle method used to stops the entire integration.
      */
@@ -100,7 +125,16 @@ default int getOrder() {
      * @return the runtime
      */
     static Runtime on(CamelContext camelContext) {
-        return () -> camelContext;
+        return new Runtime() {
+            @Override
+            public void setPropertiesLocations(Collection<String> locations) {
+            }
+
+            @Override
+            public CamelContext getCamelContext() {
+                return camelContext;
+            }
+        };
     }
 
     /**
@@ -110,6 +144,15 @@ static Runtime on(CamelContext camelContext) {
      * @return the runtime
      */
     static Runtime on(HasCamelContext provider) {
-        return () -> provider.getCamelContext();
+        return new Runtime() {
+            @Override
+            public void setPropertiesLocations(Collection<String> locations) {
+            }
+
+            @Override
+            public CamelContext getCamelContext() {
+                return provider.getCamelContext();
+            }
+        };
     }
 }