Fixed bug in method createWithPAtter

Author: artem-v

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

@@ -20,31 +20,33 @@ public static void main(String[] args) {
     // Emulate scenario where sys.foo was also given from system properties
     // System.setProperty("sys.foo", "sys foo from java system properties");
 
-    String mask = ".*config\\.props";
+    String filename = "config.props";
 
     ConfigRegistry configRegistry =
         ConfigRegistry.create(
             ConfigRegistrySettings.builder()
-                .addLastSource("sysProps", new SystemPropertiesConfigSource())
+                .addLastSource("system", new SystemPropertiesConfigSource())
                 .addLastSource(
-                    "customSysProps",
+                    "system.from.file",
                     new SystemPropertiesConfigSource(
                         ClassPathConfigSource.createWithPattern(
-                            mask, Stream.of("customSys").collect(Collectors.toList()))))
+                            filename, Stream.of("system").collect(Collectors.toList()))))
                 .addLastSource(
                     "classpath",
                     ClassPathConfigSource.createWithPattern(
-                        mask, Stream.of("order1", "order2").collect(Collectors.toList())))
+                        filename, Stream.of("order1", "order2").collect(Collectors.toList())))
                 .build());
 
     StringConfigProperty orderedProp1 = configRegistry.stringProperty("orderedProp1");
     String foo = configRegistry.stringProperty("foo").valueOrThrow();
     String bar = configRegistry.stringProperty("bar").valueOrThrow();
+    String baz = configRegistry.stringProperty("baz").valueOrThrow();
     String sysFoo = configRegistry.stringProperty("sys.foo").valueOrThrow();
 
     System.out.println(
         "### Matched by first predicate: orderedProp1=" + orderedProp1.value().get());
-    System.out.println("### Regardeless of predicates: foo=" + foo + ", bar=" + bar);
+    System.out.println(
+        "### Regardeless of predicates: foo=" + foo + ", bar=" + bar + ", baz=" + baz);
     System.out.println(
         "### Custom system property: sysFoo="
             + sysFoo

config-examples/src/main/resources/config.props

@@ -1,2 +1,3 @@
 foo=foo
 bar=bar
+baz=baz

config-examples/src/main/resources/customSys.config.props renamed to config-examples/src/main/resources/system.config.props

@@ -1 +1,2 @@
 sys.foo=very cool custom system property
+baz=custom baz

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

@@ -54,17 +54,17 @@ public ClassPathConfigSource(List<Predicate<Path>> predicates) {
   }
 
   /**
-   * Factory method to create {@code ClassPathConfigSource} instance by configuration file mask plus
-   * its prefixes.
+   * Factory method to create {@code ClassPathConfigSource} instance using filename plus its
+   * prefixes.
    *
-   * @param mask mask for template of configuration property file
+   * @param filename filename 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");
+  public static ClassPathConfigSource createWithPattern(String filename, List<String> prefixes) {
+    Objects.requireNonNull(filename, "ClassPathConfigSource: filename is required");
     Objects.requireNonNull(prefixes, "ClassPathConfigSource: prefixes is required");
-    return new ClassPathConfigSource(preparePatternPredicates(mask, prefixes));
+    return new ClassPathConfigSource(preparePatternPredicates(filename, prefixes));
   }
 
   @Override

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

@@ -43,20 +43,20 @@ public FileDirectoryConfigSource(String directory, List<Predicate<Path>> predica
   }
 
   /**
-   * Factory method to create {@code FileDirectoryConfigSource} instance by configuration file mask
-   * plus its prefixes.
+   * Factory method to create {@code FileDirectoryConfigSource} instance using filename plus its
+   * prefixes.
    *
    * @param directory directory with configuration files
-   * @param mask mask for template of configuration property file
+   * @param filename filename for template of configuration property file
    * @param prefixes list of prefixes (comma separated list of strings)
    * @return new {@code FileDirectoryConfigSource} instance
    */
   public static FileDirectoryConfigSource createWithPattern(
-      String directory, String mask, List<String> prefixes) {
+      String directory, String filename, List<String> prefixes) {
     Objects.requireNonNull(directory, "FileDirectoryConfigSource: directory is required");
-    Objects.requireNonNull(mask, "FileDirectoryConfigSource: mask is required");
+    Objects.requireNonNull(filename, "FileDirectoryConfigSource: filename is required");
     Objects.requireNonNull(prefixes, "FileDirectoryConfigSource: prefixes is required");
-    return new FileDirectoryConfigSource(directory, preparePatternPredicates(mask, prefixes));
+    return new FileDirectoryConfigSource(directory, preparePatternPredicates(filename, prefixes));
   }
 
   @Override

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

@@ -3,6 +3,7 @@
 import io.scalecube.config.utils.ThrowableUtil;
 import java.io.InputStream;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -14,9 +15,7 @@
 import java.util.Properties;
 import java.util.function.BiConsumer;
 import java.util.function.Predicate;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 public abstract class FilteredPathConfigSource implements ConfigSource {
   protected final List<Predicate<Path>> predicates;
@@ -32,16 +31,18 @@ protected final Map<Path, Map<String, String>> loadConfigMap(Collection<Path> pa
         .collect(Collectors.toMap(path -> path, FilteredPathConfigSource::loadProperties));
   }
 
-  static List<Predicate<Path>> preparePatternPredicates(String mask, List<String> prefixes) {
-    Pattern pattern = Pattern.compile(mask);
-    Predicate<Path> patternPredicate = path -> pattern.matcher(path.toString()).matches();
+  static List<Predicate<Path>> preparePatternPredicates(String filename, List<String> prefixes) {
+    final List<String> finalPrefixes = new ArrayList<>(prefixes);
+    finalPrefixes.add(null); // add last one as null
 
-    Stream<Predicate<Path>> stream =
-        prefixes.stream()
-            .map(p -> (Predicate<Path>) path -> path.getFileName().toString().startsWith(p))
-            .map(p -> p.and(patternPredicate));
-
-    return Stream.concat(stream, Stream.of(patternPredicate)).collect(Collectors.toList());
+    return finalPrefixes.stream()
+        .<Predicate<Path>>map(
+            p ->
+                (Path path) -> {
+                  String name = path.getFileName().toString();
+                  return name.equals(p != null ? p + "." + filename : filename);
+                })
+        .collect(Collectors.toList());
   }
 
   static void filterAndCollectInOrder(