Merge pull request #115 from avaje/feature/simpleYamlLoader

Allow access to parsers from configuration

Author: rbygrave

avaje-config/src/main/java/io/avaje/config/ConfigParser.java

@@ -1,6 +1,7 @@
 package io.avaje.config;
 
 import java.io.InputStream;
+import java.io.Reader;
 import java.util.Map;
 
 /**
@@ -14,9 +15,17 @@ public interface ConfigParser {
   String[] supportedExtensions();
 
   /**
-   * Loads a file into a flat map of key value pairs.
+   * Parse content into key value pairs.
    *
-   * @param is stream of file contents
+   * @param reader configuration contents
+   * @return Key-Value pairs of all the configs
+   */
+  Map<String, String> load(Reader reader);
+
+  /**
+   * Parse content into key value pairs.
+   *
+   * @param is configuration contents
    * @return Key-Value pairs of all the configs
    */
   Map<String, String> load(InputStream is);

avaje-config/src/main/java/io/avaje/config/Configuration.java

@@ -506,6 +506,24 @@ default boolean enabled(String key, boolean enabledDefault) {
    */
   void evalModify(Properties properties);
 
+  /**
+   * Return the parser for the given extension.
+   *
+   * <pre>{@code
+   *
+   *   // obtain a yaml parser
+   *   ConfigParser yamlParser = configuration.parser("yaml").orElseThrow();
+   *
+   *   // parse some yaml content
+   *   Map<String,String> keyValues = yamlParser.load(inputStream)
+   *
+   *   // put the keyValues into the configuration
+   *   configuration.putAll(keyValues);
+   *
+   * }</pre>
+   */
+  Optional<ConfigParser> parser(String extension);
+
   /**
    * Expression evaluation.
    */

avaje-config/src/main/java/io/avaje/config/CoreConfiguration.java

@@ -26,6 +26,7 @@
 @NonNullApi
 final class CoreConfiguration implements Configuration {
 
+  private final Parsers parsers;
   private final ConfigurationLog log;
   private final ModifyAwareProperties properties;
   private final ReentrantLock lock = new ReentrantLock();
@@ -40,24 +41,31 @@ final class CoreConfiguration implements Configuration {
   private Timer timer;
   private final String pathPrefix;
 
-  CoreConfiguration(ModificationEventRunner eventRunner, ConfigurationLog log, CoreEntry.CoreMap entries) {
-    this(eventRunner, log, entries, "");
-  }
-
-  CoreConfiguration(ModificationEventRunner eventRunner, ConfigurationLog log, CoreEntry.CoreMap entries, String prefix) {
+  CoreConfiguration(Parsers parsers, ModificationEventRunner eventRunner, ConfigurationLog log, CoreEntry.CoreMap entries) {
+    this.parsers = parsers;
     this.eventRunner = eventRunner;
     this.log = log;
     this.properties = new ModifyAwareProperties(entries);
     this.listValue = new CoreListValue(this);
     this.setValue = new CoreSetValue(this);
+    this.pathPrefix = "";
+  }
+
+  CoreConfiguration(CoreConfiguration parent, CoreEntry.CoreMap entries, String prefix) {
+    this.parsers = parent.parsers;
+    this.eventRunner = parent.eventRunner;
+    this.log = parent.log;
+    this.properties = new ModifyAwareProperties(entries);
+    this.listValue = new CoreListValue(this);
+    this.setValue = new CoreSetValue(this);
     this.pathPrefix = prefix;
   }
 
   /**
    * For testing purposes.
    */
   CoreConfiguration(CoreEntry.CoreMap entries) {
-    this(new ForegroundEventRunner(), new DefaultConfigurationLog(), entries, "");
+    this(new Parsers(), new ForegroundEventRunner(), new DefaultConfigurationLog(), entries);
   }
 
   /**
@@ -124,6 +132,11 @@ public void schedule(long delayMillis, long periodMillis, Runnable runnable) {
     }
   }
 
+  @Override
+  public Optional<ConfigParser> parser(String extension) {
+    return Optional.ofNullable(parsers.get(extension));
+  }
+
   String eval(String value) {
     return properties.eval(value);
   }
@@ -177,7 +190,7 @@ public Configuration forPath(String pathPrefix) {
         newEntryMap.put("", entry);
       }
     });
-    return new CoreConfiguration(eventRunner, log, newEntryMap, dotPrefix);
+    return new CoreConfiguration(this, newEntryMap, dotPrefix);
   }
 
   @Override

avaje-config/src/main/java/io/avaje/config/CoreConfigurationBuilder.java

@@ -75,11 +75,12 @@ public Configuration.Builder includeResourceLoading() {
   public Configuration build() {
     final var runner = initRunner();
     final var log = initLog();
+    final var parsers = new Parsers();
     if (includeResourceLoading) {
       log.preInitialisation();
-      initialLoader = new InitialLoader(log, initResourceLoader());
+      initialLoader = new InitialLoader(parsers, log, initResourceLoader());
     }
-    return new CoreConfiguration(runner, log, initEntries()).postLoad(initialLoader);
+    return new CoreConfiguration(parsers, runner, log, initEntries()).postLoad(initialLoader);
   }
 
   private CoreEntry.CoreMap initEntries() {

avaje-config/src/main/java/io/avaje/config/FileWatch.java

@@ -20,7 +20,7 @@ final class FileWatch {
     this.log = configuration.log();
     this.configuration = configuration;
     this.delay = configuration.getLong("config.watch.delay", 60);
-    this.period = configuration.getInt("config.watch.period", 10);
+    this.period = configuration.getLong("config.watch.period", 10);
     this.parsers = parsers;
     this.files = initFiles(loadedFiles);
     if (files.isEmpty()) {

avaje-config/src/main/java/io/avaje/config/InitialLoader.java

@@ -41,10 +41,10 @@ enum Source {
   private final Set<String> profileResourceLoaded = new HashSet<>();
   private final Parsers parsers;
 
-  InitialLoader(ConfigurationLog log, ResourceLoader resourceLoader) {
+  InitialLoader(Parsers parsers, ConfigurationLog log, ResourceLoader resourceLoader) {
+    this.parsers = parsers;
     this.log = log;
     this.loadContext = new InitialLoadContext(log, resourceLoader);
-    this.parsers = new Parsers();
   }
 
   Set<String> loadedFrom() {

avaje-config/src/main/java/io/avaje/config/YamlLoaderSimple.java

@@ -8,6 +8,11 @@
  */
 final class YamlLoaderSimple implements YamlLoader {
 
+  @Override
+  public Map<String, String> load(Reader reader) {
+    return new Load().load(reader);
+  }
+
   @Override
   public Map<String, String> load(InputStream is) {
     return new Load().load(is);
@@ -39,7 +44,11 @@ enum State {
     private int multiLineIndent;
 
     private Map<String, String> load(InputStream is) {
-      try (LineNumberReader lineReader = new LineNumberReader(new InputStreamReader(is))) {
+      return load(new InputStreamReader(is));
+    }
+
+    private Map<String, String> load(Reader reader) {
+      try (LineNumberReader lineReader = new LineNumberReader(reader)) {
         String line;
         do {
           line = lineReader.readLine();

avaje-config/src/main/java/io/avaje/config/YamlLoaderSnake.java

@@ -3,6 +3,7 @@
 import org.yaml.snakeyaml.Yaml;
 
 import java.io.InputStream;
+import java.io.Reader;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -20,11 +21,20 @@ final class YamlLoaderSnake implements YamlLoader {
     this.yaml = new Yaml();
   }
 
-  @SuppressWarnings("unchecked")
+  @Override
+  public Map<String, String> load(Reader reader) {
+    return load(yaml.loadAll(reader));
+  }
+
   @Override
   public Map<String, String> load(InputStream is) {
+    return load(yaml.loadAll(is));
+  }
+
+  @SuppressWarnings("unchecked")
+  private Map<String, String> load(Iterable<Object> source) {
     Load load = new Load();
-    for (Object map : yaml.loadAll(is)) {
+    for (Object map : source) {
       load.loadMap((Map<String, Object>) map, null);
     }
     return load.map();

avaje-config/src/test/java/io/avaje/config/CoreConfigurationTest.java

@@ -3,6 +3,7 @@
 import io.avaje.config.CoreEntry.CoreMap;
 import org.junit.jupiter.api.Test;
 
+import java.io.StringReader;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -43,6 +44,20 @@ private CoreConfiguration createConfig(CoreEntry.CoreMap entries) {
     return new CoreConfiguration(entries);
   }
 
+  @Test
+  void parser() {
+    Configuration base = createSample();
+
+    ConfigParser yamlParser = base.parser("yaml").orElseThrow();
+
+    var ris = new StringReader("my.key: \n  other: 42\n  more.again: 52");
+    Map<String, String> keyValues = yamlParser.load(ris);
+    base.putAll(keyValues);
+
+    assertThat(base.get("my.key.other")).isEqualTo("42");
+    assertThat(base.getLong("my.key.more.again")).isEqualTo(52);
+  }
+
   @Test
   void asProperties() {
     final var properties = basicProperties();

avaje-config/src/test/java/io/avaje/config/InitialLoaderTest.java

@@ -10,7 +10,7 @@
 class InitialLoaderTest {
 
   private static InitialLoader newInitialLoader() {
-    return new InitialLoader(new DefaultConfigurationLog(), new DefaultResourceLoader());
+    return new InitialLoader(new Parsers(), new DefaultConfigurationLog(), new DefaultResourceLoader());
   }
 
   @Test