Merge pull request #141 from scalecube/feature/advanced-system-props

artem-v · web-flow · commit d5568aecfef0 · 2020-02-14T18:36:02.000+02:00
Enhanced SystemEnvironmentConfigSource config soucece
diff --git a/config-examples/pom.xml b/config-examples/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-config-parent</artifactId>
-    <version>0.3.15-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/config-examples/src/main/java/io/scalecube/config/examples/PredicateOrderingConfigExample.java b/config-examples/src/main/java/io/scalecube/config/examples/PredicateOrderingConfigExample.java
@@ -4,6 +4,7 @@
 import io.scalecube.config.ConfigRegistrySettings;
 import io.scalecube.config.StringConfigProperty;
 import io.scalecube.config.source.ClassPathConfigSource;
+import io.scalecube.config.source.SystemPropertiesConfigSource;
 import java.nio.file.Path;
 import java.util.function.Predicate;
 
@@ -17,19 +18,41 @@ public class PredicateOrderingConfigExample {
    */
   public static void main(String[] args) {
     Predicate<Path> propsPredicate = path -> path.toString().endsWith(".props");
+    Predicate<Path> rootPredicate =
+        propsPredicate.and(path -> path.toString().contains("config.props"));
     Predicate<Path> firstPredicate = propsPredicate.and(path -> path.toString().contains("order1"));
     Predicate<Path> secondPredicate =
         propsPredicate.and(path -> path.toString().contains("order2"));
+    Predicate<Path> customSysPredicate =
+        propsPredicate.and(path -> path.toString().contains("customSys"));
+
+    // Emulate scenario where sys.foo was also given from system properties
+    // System.setProperty("sys.foo", "sys foo from java system properties");
 
     ConfigRegistry configRegistry =
         ConfigRegistry.create(
             ConfigRegistrySettings.builder()
+                .addLastSource("sysProps", new SystemPropertiesConfigSource())
+                .addLastSource(
+                    "customSysProps",
+                    new SystemPropertiesConfigSource(new ClassPathConfigSource(customSysPredicate)))
                 .addLastSource(
-                    "classpath", new ClassPathConfigSource(firstPredicate, secondPredicate))
+                    "classpath",
+                    new ClassPathConfigSource(firstPredicate, secondPredicate, rootPredicate))
                 .build());
 
     StringConfigProperty orderedProp1 = configRegistry.stringProperty("orderedProp1");
+    String foo = configRegistry.stringValue("foo", null);
+    String bar = configRegistry.stringValue("bar", null);
+    String sysFoo = configRegistry.stringValue("sys.foo", null);
 
-    System.out.println("### Matched by first predicate orderedProp1=" + orderedProp1.value().get());
+    System.out.println(
+        "### Matched by first predicate: orderedProp1=" + orderedProp1.value().get());
+    System.out.println("### Regardeless of predicates: foo=" + foo + ", bar=" + bar);
+    System.out.println(
+        "### Custom system property: sysFoo="
+            + sysFoo
+            + ", System.getProperty(sysFoo)="
+            + System.getProperty("sys.foo"));
   }
 }
diff --git a/config-examples/src/main/resources/config.props b/config-examples/src/main/resources/config.props
@@ -1 +1,2 @@
-prop1=from_classpath
+foo=foo
+bar=bar
diff --git a/config-examples/src/main/resources/customSys.config.props b/config-examples/src/main/resources/customSys.config.props
@@ -0,0 +1 @@
+sys.foo=very cool custom system property
diff --git a/config-http-server/pom.xml b/config-http-server/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-config-parent</artifactId>
-    <version>0.3.15-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/config-mongo/pom.xml b/config-mongo/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-config-parent</artifactId>
-    <version>0.3.15-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/config-vault/pom.xml b/config-vault/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-config-parent</artifactId>
-    <version>0.3.15-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>config-vault</artifactId>
diff --git a/config/pom.xml b/config/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.scalecube</groupId>
     <artifactId>scalecube-config-parent</artifactId>
-    <version>0.3.15-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/config/src/main/java/io/scalecube/config/source/ClassPathConfigSource.java b/config/src/main/java/io/scalecube/config/source/ClassPathConfigSource.java
@@ -28,7 +28,7 @@
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
-public class ClassPathConfigSource extends FilteredPathConfigSource {
+public final class ClassPathConfigSource extends FilteredPathConfigSource {
   private final ClassLoader classLoader;
 
   private Map<String, ConfigProperty> loadedConfig;
@@ -67,8 +67,7 @@ public Map<String, ConfigProperty> loadConfig() {
     }
 
     Collection<Path> pathCollection = new ArrayList<>();
-    getClassPathEntries(classLoader)
-        .stream()
+    getClassPathEntries(classLoader).stream()
         .filter(uri -> uri.getScheme().equals("file"))
         .forEach(
             uri -> {
diff --git a/config/src/main/java/io/scalecube/config/source/DirectoryConfigSource.java b/config/src/main/java/io/scalecube/config/source/DirectoryConfigSource.java
@@ -19,7 +19,7 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-public class DirectoryConfigSource extends FilteredPathConfigSource {
+public final class DirectoryConfigSource extends FilteredPathConfigSource {
   private final Path basePath;
 
   /**
diff --git a/config/src/main/java/io/scalecube/config/source/SystemEnvironmentConfigSource.java b/config/src/main/java/io/scalecube/config/source/SystemEnvironmentConfigSource.java
@@ -1,31 +1,13 @@
 package io.scalecube.config.source;
 
 import io.scalecube.config.ConfigProperty;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
-import java.util.stream.Stream;
 
-public class SystemEnvironmentConfigSource implements ConfigSource {
-  private final List<String> namespaces;
+public final class SystemEnvironmentConfigSource implements ConfigSource {
 
   private Map<String, ConfigProperty> loadedConfig;
 
-  public SystemEnvironmentConfigSource() {
-    this.namespaces = Collections.emptyList();
-  }
-
-  public SystemEnvironmentConfigSource(List<String> namespaces) {
-    this.namespaces = new ArrayList<>(namespaces);
-  }
-
-  public SystemEnvironmentConfigSource(String... namespaces) {
-    this.namespaces = Arrays.asList(namespaces);
-  }
-
   @Override
   public Map<String, ConfigProperty> loadConfig() {
     if (loadedConfig != null) {
@@ -34,13 +16,10 @@ public Map<String, ConfigProperty> loadConfig() {
 
     Map<String, String> env = System.getenv();
     Map<String, ConfigProperty> result = new TreeMap<>();
-    Stream<String> namespaces1 = namespaces.stream();
 
     for (Map.Entry<String, String> entry : env.entrySet()) {
       String propName = entry.getKey();
-      if (namespaces.isEmpty() || namespaces1.anyMatch(propName::startsWith)) {
-        result.put(propName, LoadedConfigProperty.forNameAndValue(propName, entry.getValue()));
-      }
+      result.put(propName, LoadedConfigProperty.forNameAndValue(propName, entry.getValue()));
     }
 
     return loadedConfig = result;
diff --git a/config/src/main/java/io/scalecube/config/source/SystemPropertiesConfigSource.java b/config/src/main/java/io/scalecube/config/source/SystemPropertiesConfigSource.java
@@ -1,31 +1,22 @@
 package io.scalecube.config.source;
 
 import io.scalecube.config.ConfigProperty;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.Enumeration;
-import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.TreeMap;
-import java.util.stream.Stream;
-
-public class SystemPropertiesConfigSource implements ConfigSource {
-  private final List<String> namespaces;
 
+public final class SystemPropertiesConfigSource implements ConfigSource {
   private Map<String, ConfigProperty> loadedConfig;
 
-  public SystemPropertiesConfigSource() {
-    this.namespaces = Collections.emptyList();
-  }
+  private final ConfigSource configSource;
 
-  public SystemPropertiesConfigSource(List<String> namespaces) {
-    this.namespaces = new ArrayList<>(namespaces);
+  public SystemPropertiesConfigSource() {
+    this(null);
   }
 
-  public SystemPropertiesConfigSource(String... namespaces) {
-    this.namespaces = Arrays.asList(namespaces);
+  public SystemPropertiesConfigSource(ConfigSource configSource) {
+    this.configSource = configSource;
   }
 
   @Override
@@ -35,18 +26,35 @@ public Map<String, ConfigProperty> loadConfig() {
     }
 
     Properties properties = System.getProperties();
+    if (configSource != null) {
+      properties = mergeSystemProperties(configSource.loadConfig(), properties);
+    }
+
     Map<String, ConfigProperty> result = new TreeMap<>();
-    Stream<String> namespaces1 = namespaces.stream();
 
     for (Enumeration<?> e = properties.propertyNames(); e.hasMoreElements(); ) {
       String propName = (String) e.nextElement();
-      if (namespaces.isEmpty() || namespaces1.anyMatch(propName::startsWith)) {
-        result.put(
-            propName,
-            LoadedConfigProperty.forNameAndValue(propName, properties.getProperty(propName)));
-      }
+      result.put(
+          propName,
+          LoadedConfigProperty.forNameAndValue(propName, properties.getProperty(propName)));
     }
 
     return loadedConfig = result;
   }
+
+  private static Properties mergeSystemProperties(
+      Map<String, ConfigProperty> overrideConfig, Properties properties) {
+
+    final Properties finalProperties = new Properties();
+
+    overrideConfig.values().stream()
+        .filter(p -> p.valueAsString().isPresent())
+        .forEach(p -> finalProperties.put(p.name(), p.valueAsString(null)));
+
+    finalProperties.putAll(properties);
+
+    finalProperties.forEach((key, value) -> System.setProperty((String) key, (String) value));
+
+    return finalProperties;
+  }
 }
diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
   </parent>
 
   <artifactId>scalecube-config-parent</artifactId>
-  <version>0.3.15-SNAPSHOT</version>
+  <version>0.4.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ScaleCube Config</name>

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-prop1=from_classpath`
	`1`	`+foo=foo`
	`2`	`+bar=bar`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+sys.foo=very cool custom system property`