fix automatic interpolation, move content-config to config

config/src/main/java/module-info.java

@@ -0,0 +1,12 @@
+import org.xbib.config.ConfigLogger;
+import org.xbib.config.SystemConfigLogger;
+import org.xbib.settings.SettingsLoader;
+
+module org.xbib.config {
+    exports org.xbib.config;
+    uses ConfigLogger;
+    uses SettingsLoader;
+    provides ConfigLogger with SystemConfigLogger;
+    requires org.xbib.settings.api;
+    requires transitive org.xbib.settings.datastructures;
+}

config/src/main/java/org/xbib/config/ConfigException.java

@@ -1,4 +1,4 @@
-package org.xbib.content.config;
+package org.xbib.config;
 
 @SuppressWarnings("serial")
 public class ConfigException extends RuntimeException {

config/src/main/java/org/xbib/config/ConfigFinder.java

@@ -1,4 +1,4 @@
-package org.xbib.content.config;
+package org.xbib.config;
 
 import java.io.IOException;
 import java.nio.file.FileSystem;

config/src/main/java/org/xbib/config/ConfigLoader.java

@@ -1,4 +1,4 @@
-package org.xbib.content.config;
+package org.xbib.config;
 
 import org.xbib.settings.Settings;
 import org.xbib.settings.SettingsBuilder;
@@ -57,7 +57,9 @@ public class ConfigLoader {
     }
 
     public synchronized Settings load(ConfigParams configParams) throws ConfigException {
-        map.computeIfAbsent(configParams, p -> internalLoad(p).build());
+        map.computeIfAbsent(configParams, p -> internalLoad(p)
+                .replacePropertyPlaceholders()
+                .build());
         return map.get(configParams);
     }
 
@@ -80,7 +82,7 @@ public class ConfigLoader {
                 if (readerSettings != null) {
                     settings.put(readerSettings.build());
                     if (!params.includeAll) {
-                        return settings;
+                        return overrideFromProperties(params, settings);
                     }
                 }
             }
@@ -90,7 +92,7 @@ public class ConfigLoader {
             if (argsSettings != null) {
                 settings.put(argsSettings.build());
                 if (!params.includeAll) {
-                    return settings;
+                    return overrideFromProperties(params, settings);
                 }
             }
         }
@@ -150,8 +152,11 @@ public class ConfigLoader {
         if (params.includeAll) {
             return overrideFromProperties(params, settings);
         }
+        if (params.failIfEmpty) {
             throw new ConfigException("no config found");
         }
+        return settings;
+    }
 
     private SettingsBuilder createSettingsFromArgs(ConfigParams params) throws ConfigException {
         if (!params.fileNamesWithoutSuffix.isEmpty() && params.args != null) {

config/src/main/java/org/xbib/config/ConfigLogger.java

@@ -1,4 +1,4 @@
-package org.xbib.content.config;
+package org.xbib.config;
 
 public interface ConfigLogger {
 

config/src/main/java/org/xbib/config/ConfigParams.java

@@ -1,5 +1,6 @@
-package org.xbib.content.config;
+package org.xbib.config;
 
+import org.xbib.settings.Settings;
 import org.xbib.settings.datastructures.DatastructureSettings;
 import java.io.IOException;
 import java.io.Reader;
@@ -18,6 +19,8 @@ public class ConfigParams implements Comparable<ConfigParams> {
 
     boolean withSystemProperties = false;
 
+    boolean failIfEmpty = false;
+
     boolean includeAll = false;
 
     boolean withStdin = false;
@@ -63,6 +66,11 @@ public class ConfigParams implements Comparable<ConfigParams> {
         return this;
     }
 
+    public ConfigParams failIfEmpty() {
+        this.failIfEmpty = true;
+        return this;
+    }
+
     public ConfigParams withStdin(boolean withStdin) {
         this.withStdin = withStdin;
         return this;
@@ -86,8 +94,8 @@ public class ConfigParams implements Comparable<ConfigParams> {
         return this;
     }
 
-    public ConfigParams withSettings(DatastructureSettings settings) {
+    public ConfigParams withSettings(Settings settings) {
-        this.settings.add(settings);
+        this.settings.add(DatastructureSettings.builder().put(settings.getAsMap()).build());
         return this;
     }
 

config/src/main/java/org/xbib/config/SystemConfigLogger.java

@@ -1,4 +1,4 @@
-package org.xbib.content.config;
+package org.xbib.config;
 
 public class SystemConfigLogger implements ConfigLogger {
 

config/src/main/java/org/xbib/config/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * Classes for configuration setup.
+ */
+package org.xbib.config;

config/src/main/resources/META-INF/services/org.xbib.config.ConfigLogger

@@ -0,0 +1 @@
+org.xbib.config.SystemConfigLogger

config/src/test/java/org/xbib/config/test/ConfigLoaderTest.java

@@ -1,10 +1,12 @@
-package org.xbib.content.config.test;
+package org.xbib.config.test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import org.junit.jupiter.api.Test;
 import org.xbib.settings.Settings;
-import org.xbib.content.config.ConfigLoader;
+import org.xbib.config.ConfigLoader;
-import org.xbib.content.config.ConfigParams;
+import org.xbib.config.ConfigParams;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
@@ -12,7 +14,37 @@ import java.io.StringReader;
 public class ConfigLoaderTest {
 
     @Test
-    public void configTest() {
+    public void configEmptyTest() {
+        Settings settings = ConfigLoader.getInstance()
+                .load(new ConfigParams());
+        assertTrue(settings.isEmpty());
+    }
+
+    @Test
+    public void configSettingsTest() {
+        Settings configSettings = Settings.settingsBuilder()
+                .put("hello", "world")
+                .build();
+        Settings settings = ConfigLoader.getInstance()
+                .load(new ConfigParams().withSettings(configSettings));
+        assertEquals("world", settings.get("hello"));
+    }
+
+    @Test
+    public void configArgsTest() {
+        String[] args = new String[] {
+                "--config.yaml",
+                "hello: world"
+        };
+        Settings settings = ConfigLoader.getInstance()
+                .load(new ConfigParams()
+                        .withArgs(args)
+                        .withFileNamesWithoutSuffix("config"));
+        assertEquals("world", settings.get("hello"));
+    }
+
+    @Test
+    public void configPropertiesTest() {
         Reader reader = new StringReader("a=b");
         Settings settings = ConfigLoader.getInstance()
                 .load(new ConfigParams()
@@ -30,7 +62,7 @@ public class ConfigLoaderTest {
     }
 
     @Test
-    public void testOverride() throws IOException {
+    public void testSystemPropertiesOverride() throws IOException {
         System.setProperty("hello", "override");
         Settings settings = ConfigLoader.getInstance()
                 .load(new ConfigParams()

config/src/test/java/org/xbib/config/test/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * Test classes for config.
+ */
+package org.xbib.config.test;

content-config/src/main/java/module-info.java

@@ -1,11 +0,0 @@
-import org.xbib.content.config.ConfigLogger;
-import org.xbib.settings.SettingsLoader;
-
-module org.xbib.content.config {
-    exports org.xbib.content.config;
-    uses ConfigLogger;
-    uses SettingsLoader;
-    provides ConfigLogger with org.xbib.content.config.SystemConfigLogger;
-    requires org.xbib.settings.api;
-    requires transitive org.xbib.settings.datastructures;
-}

content-config/src/main/java/org/xbib/content/config/package-info.java

@@ -1,4 +0,0 @@
-/**
- * Classes for configurations.
- */
-package org.xbib.content.config;

content-config/src/main/resources/META-INF/services/org.xbib.content.config.ConfigLogger

@@ -1 +0,0 @@
-org.xbib.content.config.SystemConfigLogger

content-config/src/test/java/org/xbib/content/config/test/package-info.java

@@ -1,4 +0,0 @@
-/**
- * Test classes for content config.
- */
-package org.xbib.content.config.test;

gradle/config/pmd/category/java/categories.properties

@@ -1,6 +1,3 @@
-#
-# BSD-style license; for more info see http://pmd.sourceforge.net/license.html
-#
 
 rulesets.filenames=\
     category/java/bestpractices.xml,\

gradle/quality/checkstyle.gradle

@@ -4,7 +4,7 @@ checkstyle {
     toolVersion '8.33'
     showViolations = true
     ignoreFailures = true
-    configFile rootProject.file("config/checkstyle/checkstyle.xml")
+    configFile rootProject.file("gradle/config/checkstyle/checkstyle.xml")
 }
 
 checkstyleMain {

gradle/quality/pmd.gradle

@@ -5,5 +5,5 @@ pmd {
     consoleOutput = false
     toolVersion = "6.24.0"
     rulePriority = 5
-    ruleSets = ["category/java/bestpractices.xml"]
+    ruleSetFiles = rootProject.files('gradle/config/pmd/category/java/bestpractices.xml')
 }

settings.gradle

@@ -1,5 +1,4 @@
 include 'content-api'
-include 'content-config'
 include 'content-core'
 include 'content-csv'
 include 'content-language'
@@ -16,3 +15,4 @@ include 'settings-content-yaml'
 include 'settings-datastructures'
 include 'settings-datastructures-json'
 include 'settings-datastructures-yaml'
+include 'config'