[camel] 01/02: chore(main): filter properties by prefix

[lb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit b65e62fea7d21a3f1bb313b6157378d70c99a3fb
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Wed Oct 2 14:58:57 2019 +0200

    chore(main): filter properties by prefix
    
    This is to avoid properties sources that need to perform
    some i/o operation to load every property
---
 .../component/properties/AbstractLocationPropertiesSource.java |  2 +-
 .../src/main/java/org/apache/camel/main/MainSupport.java       | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/camel-base/src/main/java/org/apache/camel/component/properties/AbstractLocationPropertiesSource.java b/core/camel-base/src/main/java/org/apache/camel/component/properties/AbstractLocationPropertiesSource.java
index a019ac9..1e08cb5 100644
--- a/core/camel-base/src/main/java/org/apache/camel/component/properties/AbstractLocationPropertiesSource.java
+++ b/core/camel-base/src/main/java/org/apache/camel/component/properties/AbstractLocationPropertiesSource.java
@@ -54,7 +54,7 @@ public abstract class AbstractLocationPropertiesSource extends ServiceSupport im
     public Properties loadProperties(Predicate<String> filter) {
         Properties answer = new Properties();
 
-        for (String name: answer.stringPropertyNames()) {
+        for (String name: properties.stringPropertyNames()) {
             if (filter.test(name)) {
                 answer.put(name, properties.get(name));
             }
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java b/core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java
index 9c77827..e8289b1 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java
@@ -836,7 +836,7 @@ public abstract class MainSupport extends ServiceSupport {
 
     protected void autoConfigurationFailFast(CamelContext camelContext, Map<String, String> autoConfiguredProperties) throws Exception {
         // load properties
-        Properties prop = camelContext.getPropertiesComponent().loadProperties();
+        Properties prop = camelContext.getPropertiesComponent().loadProperties(name -> name.startsWith("camel."));
         LOG.debug("Properties from Camel properties component:");
         for (String key : prop.stringPropertyNames()) {
             LOG.debug("    {}={}", key, prop.getProperty(key));
@@ -921,7 +921,7 @@ public abstract class MainSupport extends ServiceSupport {
         DefaultConfigurationConfigurer.afterPropertiesSet(camelContext);
 
         // now configure context/hystrix/rest with additional properties
-        Properties prop = camelContext.getPropertiesComponent().loadProperties();
+        Properties prop = camelContext.getPropertiesComponent().loadProperties(name -> name.startsWith("camel."));
 
         // load properties from ENV (override existing)
         if (mainConfigurationProperties.isAutoConfigurationEnvironmentVariablesEnabled()) {
@@ -1011,7 +1011,7 @@ public abstract class MainSupport extends ServiceSupport {
 
     protected void autoConfigurationPropertiesComponent(CamelContext camelContext, Map<String, String> autoConfiguredProperties) throws Exception {
         // load properties
-        Properties prop = camelContext.getPropertiesComponent().loadProperties();
+        Properties prop = camelContext.getPropertiesComponent().loadProperties(name -> name.startsWith("camel."));
 
         // load properties from ENV (override existing)
         if (mainConfigurationProperties.isAutoConfigurationEnvironmentVariablesEnabled()) {
@@ -1050,7 +1050,7 @@ public abstract class MainSupport extends ServiceSupport {
 
     protected void autoConfigurationMainConfiguration(CamelContext camelContext, MainConfigurationProperties config, Map<String, String> autoConfiguredProperties) throws Exception {
         // load properties
-        Properties prop = camelContext.getPropertiesComponent().loadProperties();
+        Properties prop = camelContext.getPropertiesComponent().loadProperties(name -> name.startsWith("camel."));
 
         // load properties from ENV (override existing)
         if (mainConfigurationProperties.isAutoConfigurationEnvironmentVariablesEnabled()) {
@@ -1109,7 +1109,7 @@ public abstract class MainSupport extends ServiceSupport {
         }
 
         // load properties from properties component (override existing)
-        Properties propPC = camelContext.getPropertiesComponent().loadProperties();
+        Properties propPC = camelContext.getPropertiesComponent().loadProperties(name -> name.startsWith("camel."));
         prop.putAll(propPC);
 
         // load properties from ENV (override existing)