WIP

Author: artem-v

config-examples/src/main/java/io/scalecube/config/examples/ConfigRegistryExample.java

@@ -6,7 +6,7 @@
 import io.scalecube.config.audit.Slf4JConfigEventListener;
 import io.scalecube.config.http.server.ConfigRegistryHttpServer;
 import io.scalecube.config.source.ClassPathConfigSource;
-import io.scalecube.config.source.DirectoryConfigSource;
+import io.scalecube.config.source.FileDirectoryConfigSource;
 import java.nio.file.Path;
 import java.util.function.Predicate;
 
@@ -28,7 +28,7 @@ public static void main(String[] args) {
             ConfigRegistrySettings.builder()
                 .addLastSource("classpath", new ClassPathConfigSource(propsPredicate))
                 .addLastSource(
-                    "configDirectory", new DirectoryConfigSource(basePath, propsPredicate))
+                    "configDirectory", new FileDirectoryConfigSource(basePath, propsPredicate))
                 .addListener(new Slf4JConfigEventListener())
                 .jmxEnabled(true)
                 .jmxMBeanName("config.exporter:name=ConfigRegistry")

config-examples/src/main/java/io/scalecube/config/examples/DemoConfig.java

@@ -9,7 +9,7 @@
 import io.scalecube.config.mongo.MongoConfigConnector;
 import io.scalecube.config.mongo.MongoConfigEventListener;
 import io.scalecube.config.mongo.MongoConfigRepository;
-import io.scalecube.config.source.DirectoryConfigSource;
+import io.scalecube.config.source.FileDirectoryConfigSource;
 import java.nio.file.Path;
 import java.util.function.Predicate;
 
@@ -45,7 +45,7 @@ public static void main(String[] args) {
         ConfigRegistry.create(
             ConfigRegistrySettings.builder()
                 .addLastSource(
-                    "ConfigDirectory", new DirectoryConfigSource(basePath, propsPredicate))
+                    "ConfigDirectory", new FileDirectoryConfigSource(basePath, propsPredicate))
                 .addLastSource("MongoConfig", mongoConfigSource)
                 .addListener(new Slf4JConfigEventListener())
                 .addListener(new MongoConfigEventListener(connector, auditLogCollectionName))

config-examples/src/main/java/io/scalecube/config/examples/LocalResourceConfigExample.java

@@ -4,7 +4,7 @@
 import io.scalecube.config.ConfigRegistrySettings;
 import io.scalecube.config.StringConfigProperty;
 import io.scalecube.config.source.ClassPathConfigSource;
-import io.scalecube.config.source.DirectoryConfigSource;
+import io.scalecube.config.source.FileDirectoryConfigSource;
 import java.nio.file.Path;
 import java.util.function.Predicate;
 
@@ -26,7 +26,7 @@ public static void main(String[] args) {
             ConfigRegistrySettings.builder()
                 .addLastSource("classpath", new ClassPathConfigSource(propsPredicate))
                 .addLastSource(
-                    "configDirectory", new DirectoryConfigSource(basePath, propsPredicate))
+                    "configDirectory", new FileDirectoryConfigSource(basePath, propsPredicate))
                 .jmxEnabled(false)
                 .build());
 

config-examples/src/main/java/io/scalecube/config/examples/PredicateOrderingConfigExample.java

@@ -7,6 +7,8 @@
 import io.scalecube.config.source.SystemPropertiesConfigSource;
 import java.nio.file.Path;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @SuppressWarnings("OptionalGetWithoutIsPresent")
 public class PredicateOrderingConfigExample {
@@ -38,7 +40,9 @@ public static void main(String[] args) {
                     new SystemPropertiesConfigSource(new ClassPathConfigSource(customSysPredicate)))
                 .addLastSource(
                     "classpath",
-                    new ClassPathConfigSource(firstPredicate, secondPredicate, rootPredicate))
+                    new ClassPathConfigSource(
+                        Stream.of(firstPredicate, secondPredicate, rootPredicate)
+                            .collect(Collectors.toList())))
                 .build());
 
     StringConfigProperty orderedProp1 = configRegistry.stringProperty("orderedProp1");

config-examples/src/main/java/io/scalecube/config/examples/ReloadableLocalResourceConfigExample.java

@@ -7,7 +7,7 @@
 import io.scalecube.config.ObjectConfigProperty;
 import io.scalecube.config.StringConfigProperty;
 import io.scalecube.config.audit.Slf4JConfigEventListener;
-import io.scalecube.config.source.DirectoryConfigSource;
+import io.scalecube.config.source.FileDirectoryConfigSource;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
@@ -18,6 +18,8 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @SuppressWarnings("OptionalGetWithoutIsPresent")
 public class ReloadableLocalResourceConfigExample {
@@ -39,7 +41,10 @@ public static void main(String[] args) throws Exception {
             ConfigRegistrySettings.builder()
                 .addLastSource(
                     "configDirectory",
-                    new DirectoryConfigSource(basePath, reloadablePropsPredicate, propsPredicate))
+                    new FileDirectoryConfigSource(
+                        basePath,
+                        Stream.of(reloadablePropsPredicate, propsPredicate)
+                            .collect(Collectors.toList())))
                 .addListener(new Slf4JConfigEventListener())
                 .reloadIntervalSec(1)
                 .build());

config/src/main/java/io/scalecube/config/audit/Slf4JConfigEventListener.java

@@ -14,8 +14,7 @@ public void onEvents(Collection<ConfigEvent> events) {
     if (!events.isEmpty()) {
       StringBuilder sb = new StringBuilder();
       sb.append("[");
-      events
-          .stream()
+      events.stream()
           .sorted(Comparator.comparing(ConfigEvent::getName))
           .forEach(
               event -> {
@@ -30,7 +29,7 @@ public void onEvents(Collection<ConfigEvent> events) {
                 sb.append(originAsString(event));
               });
       sb.append("\n").append("]");
-      LOGGER.info("Config property changed: {}", sb);
+      LOGGER.info("Config properties: {}", sb);
     }
   }
 

config/src/main/java/io/scalecube/config/source/ClassPathConfigSource.java

@@ -1,7 +1,6 @@
 package io.scalecube.config.source;
 
 import io.scalecube.config.ConfigProperty;
-import io.scalecube.config.utils.ConfigCollectorUtil;
 import io.scalecube.config.utils.ThrowableUtil;
 import java.io.File;
 import java.io.IOException;
@@ -13,7 +12,6 @@
 import java.nio.file.FileSystems;
 import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -23,41 +21,59 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.StringJoiner;
 import java.util.TreeMap;
 import java.util.function.Predicate;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 public final class ClassPathConfigSource extends FilteredPathConfigSource {
-  private final ClassLoader classLoader;
-
   private Map<String, ConfigProperty> loadedConfig;
 
   /**
-   * Creates provider of configuration properties with classpath as source.
+   * Constructor.
    *
-   * @param classLoader class loader
-   * @param predicates list of predicates to filter
+   * @param predicate predicate to match configuration files
    */
-  public ClassPathConfigSource(ClassLoader classLoader, List<Predicate<Path>> predicates) {
-    super(predicates);
-    this.classLoader =
-        Objects.requireNonNull(classLoader, "ClassPathConfigSource: classloader is required");
+  public ClassPathConfigSource(Predicate<Path> predicate) {
+    this(Collections.singletonList(predicate));
   }
 
+  /**
+   * Constructor.
+   *
+   * @param predicates list of predicates to match configuration files
+   */
   public ClassPathConfigSource(List<Predicate<Path>> predicates) {
-    this(ClassPathConfigSource.class.getClassLoader(), predicates);
+    super(predicates);
   }
 
-  @SafeVarargs
-  public ClassPathConfigSource(ClassLoader classLoader, Predicate<Path>... predicates) {
-    super(Arrays.asList(predicates));
-    this.classLoader = classLoader;
-  }
+  /**
+   * Factory method to create {@code ClassPathConfigSource} instance by configuration file mask plus
+   * its prefixes.
+   *
+   * @param mask mask for template of configuration property file
+   * @param prefixes list of prefixes (comma separated list of strings)
+   * @return new {@code ClassPathConfigSource} instance
+   */
+  public static ClassPathConfigSource createWithPattern(String mask, List<String> prefixes) {
+    Objects.requireNonNull(mask, "ClassPathConfigSource: mask is required");
+    Objects.requireNonNull(prefixes, "ClassPathConfigSource: prefixes is required");
+
+    Pattern pattern = Pattern.compile(mask);
+
+    Predicate<Path> patternPredicate =
+        path -> pattern.matcher(path.getFileName().toString()).matches();
 
-  @SafeVarargs
-  public ClassPathConfigSource(Predicate<Path>... predicates) {
-    this(ClassPathConfigSource.class.getClassLoader(), Arrays.asList(predicates));
+    List<Predicate<Path>> predicates =
+        prefixes.stream()
+            .map(p -> (Predicate<Path>) path -> path.getFileName().startsWith(p))
+            .map(patternPredicate::and)
+            .collect(Collectors.toList());
+
+    return new ClassPathConfigSource(predicates);
   }
 
   @Override
@@ -67,7 +83,7 @@ public Map<String, ConfigProperty> loadConfig() {
     }
 
     Collection<Path> pathCollection = new ArrayList<>();
-    getClassPathEntries(classLoader).stream()
+    getClassPathEntries(getClass().getClassLoader()).stream()
         .filter(uri -> uri.getScheme().equals("file"))
         .forEach(
             uri -> {
@@ -85,12 +101,11 @@ public Map<String, ConfigProperty> loadConfig() {
               }
             });
 
-    Map<Path, Map<String, String>> configMap = loadConfigMap(pathCollection);
-
     Map<String, ConfigProperty> result = new TreeMap<>();
-    ConfigCollectorUtil.filterAndCollectInOrder(
+
+    filterAndCollectInOrder(
         predicates.iterator(),
-        configMap,
+        loadConfigMap(pathCollection),
         (path, map) ->
             map.entrySet()
                 .forEach(
@@ -174,6 +189,8 @@ private void scanJar(File file, Collection<Path> collector) throws IOException {
 
   @Override
   public String toString() {
-    return "ClassPathConfigSource{" + "classLoader=" + classLoader + '}';
+    return new StringJoiner(", ", ClassPathConfigSource.class.getSimpleName() + "[", "]")
+        .add("classLoader=" + getClass().getClassLoader())
+        .toString();
   }
 }

config/src/main/java/io/scalecube/config/source/ConfigSourceInfo.java

@@ -1,6 +1,6 @@
 package io.scalecube.config.source;
 
-public class ConfigSourceInfo {
+public final class ConfigSourceInfo {
   private String sourceName;
   private int priorityOrder;
   private String configSourceString;