multiple prefixes support, prefix stripping

Author: todvora

src/main/java/com/github/joschi/jadconfig/AggregatedParameter.java

@@ -17,5 +17,10 @@
      * as defined. So if you want to match opensearch.path.repo and opensearch.node.roles, your prefix should be
      * {@code opensearch.}
      */
-    String prefix();
+    String[] prefix();
+
+    /**
+     * Should the prefix be removed from collected property names?
+     */
+    boolean stripPrefix() default false;
 }

src/main/java/com/github/joschi/jadconfig/JadConfig.java

@@ -20,6 +20,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -211,7 +212,7 @@ private void processPrefixParameter(Object configurationBean, Field field) {
         AggregatedParameter parameter = field.getAnnotation(AggregatedParameter.class);
         if (parameter != null) {
             LOG.debug("Processing prefixed field {}", field);
-            final Map<String, String> params = repositories.stream().flatMap(r -> collectPrefixedParams(r, parameter.prefix()).entrySet().stream()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+            final Map<String, String> params = repositories.stream().flatMap(r -> collectPrefixedParams(r, parameter.prefix()).entrySet().stream()).collect(Collectors.toMap(entry -> stripPrefix(entry.getKey(), parameter), Map.Entry::getValue));
             try {
                 field.setAccessible(true);
                 field.set(configurationBean, params);
@@ -221,8 +222,20 @@ private void processPrefixParameter(Object configurationBean, Field field) {
         }
     }
 
-    private Map<String, String> collectPrefixedParams(Repository repository, String prefix) {
-        final Collection<String> names = repository.readNames(prefix);
+    private String stripPrefix(String key, AggregatedParameter parameter) {
+        if (parameter.stripPrefix()) {
+            return Arrays.stream(parameter.prefix())
+                    .filter(key::startsWith)
+                    .map(prefix -> key.replaceFirst(prefix, ""))
+                    .findFirst()
+                    .orElse(key);
+        } else {
+            return key;
+        }
+    }
+
+    private Map<String, String> collectPrefixedParams(Repository repository, String[] prefixes) {
+        final Set<String> names = Arrays.stream(prefixes).flatMap(prefix -> repository.readNames(prefix).stream()).collect(Collectors.toSet());
         return names.stream().collect(Collectors.toMap(Function.identity(), repository::read));
     }
 

src/test/java/com/github/joschi/jadconfig/AggregatedPropertiesTest.java

@@ -18,10 +18,11 @@ public void testPrefixProperties() throws ValidationException, RepositoryExcepti
         jadConfig.process();
 
         Assert.assertNotNull(configurationBean.getOpensearchProperties());
-        Assert.assertEquals(3, configurationBean.getOpensearchProperties().size());
+        Assert.assertEquals(4, configurationBean.getOpensearchProperties().size());
 
-        Assert.assertEquals("search,cluster_manager", configurationBean.getOpensearchProperties().get("opensearch.node.roles"));
-        Assert.assertEquals("10gb", configurationBean.getOpensearchProperties().get("opensearch.node.search.cache.size"));
-        Assert.assertEquals("/tmp", configurationBean.getOpensearchProperties().get("opensearch.path.repo"));
+        Assert.assertEquals("search,cluster_manager", configurationBean.getOpensearchProperties().get("node.roles"));
+        Assert.assertEquals("10gb", configurationBean.getOpensearchProperties().get("node.search.cache.size"));
+        Assert.assertEquals("/tmp", configurationBean.getOpensearchProperties().get("path.repo"));
+        Assert.assertEquals("debug", configurationBean.getOpensearchProperties().get("logger.reindex.level"));
     }
 }

src/test/java/com/github/joschi/jadconfig/repositories/EnvironmentRepositoryTest.java

@@ -5,6 +5,8 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import java.util.Collection;
+
 /**
  * Unit tests for {@link EnvironmentRepository}
  *
@@ -40,6 +42,13 @@ public void testRead() throws RepositoryException {
         Assert.assertEquals(System.getenv("JAVA_HOME"), repository.read("JAVA_HOME"));
     }
 
+    @Test
+    public void testReadPrefixNames() {
+        final Collection<String> names = repository.readNames("LC_");
+        Assert.assertNotNull(names);
+        Assert.assertTrue(names.contains("LC_NAME"));
+    }
+
     @Test
     public void testUpperCaseEnabledRead() throws RepositoryException {
         final EnvironmentRepository testRepository = new EnvironmentRepository(true);

src/test/java/com/github/joschi/jadconfig/testbeans/SimpleConfigurationBean.java

@@ -60,7 +60,7 @@ public class SimpleConfigurationBean {
     @Parameter(value = "test.Nonexistent3", fallbackPropertyName = "test.fallback.secondary")
     private String myHardcodedDefaultString = "foobar";
 
-    @AggregatedParameter(prefix = "opensearch.")
+    @AggregatedParameter(prefix = {"opensearch.", "opensearch_"}, stripPrefix = true)
     private Map<String, String> opensearchProperties;
 
     public String getMyString() {

src/test/resources/testConfiguration.properties

@@ -18,4 +18,5 @@ test.fallback.primary=prim
 test.fallback.secondary=sec
 opensearch.node.roles=search,cluster_manager
 opensearch.node.search.cache.size=10gb
-opensearch.path.repo=/tmp
+opensearch.path.repo=/tmp
+opensearch_logger.reindex.level=debug