Fix Yaml lists (#216)

* fix yaml lists

* unsychronize

Author: SentryMan

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

@@ -1,16 +1,20 @@
 package io.avaje.config;
 
+import static java.util.stream.Collectors.joining;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.LineNumberReader;
 import java.io.Reader;
 import java.io.UncheckedIOException;
+import java.util.ArrayDeque;
 import java.util.ArrayList;
+import java.util.Deque;
+import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Stack;
 import java.util.StringJoiner;
 
 import org.jspecify.annotations.NullMarked;
@@ -42,12 +46,13 @@ enum MultiLineTrim {
     enum State {
       RequireKey,
       MultiLine,
+      List,
       KeyOrValue,
       RequireTopKey
     }
 
     private final Map<String, String> keyValues = new LinkedHashMap<>();
-    private final Stack<Key> keyStack = new Stack<>();
+    private final Deque<Key> keyStack = new ArrayDeque<>();
     private final List<String> multiLines = new ArrayList<>();
 
     private State state = State.RequireKey;
@@ -80,7 +85,7 @@ private void processLine(String line) {
       } else {
         currentLine++;
         readIndent(line);
-        if (state == State.MultiLine) {
+        if (state == State.MultiLine || state == State.List) {
           processMultiLine(line);
         } else {
           processNext(line);
@@ -92,6 +97,9 @@ private void checkFinalMultiLine() {
       if (state == State.MultiLine) {
         addKeyVal(multiLineValue());
       }
+      if (state == State.List) {
+        addKeyVal(listValue());
+      }
     }
 
     private void processMultiLine(String line) {
@@ -112,18 +120,32 @@ private void processMultiLine(String line) {
     }
 
     private void multiLineEnd(String line) {
-      addKeyVal(multiLineValue());
+      if (state == State.MultiLine) addKeyVal(multiLineValue());
+      else {
+        addKeyVal(listValue());
+      }
       processNext(line);
     }
 
+    private String listValue() {
+      if (multiLines.isEmpty()) {
+        return "";
+      }
+      multiLineTrimTrailing();
+      var result =
+          multiLines.stream().map(s -> s.trim().substring(1).stripLeading()).collect(joining(","));
+      multiLineEnd();
+      return result;
+    }
+
     private String multiLineValue() {
       if (multiLines.isEmpty()) {
         return "";
       }
       if (multiLineTrim != MultiLineTrim.Keep) {
         multiLineTrimTrailing();
       }
-      String join = (multiLineTrim == MultiLineTrim.Implicit) ? " " : "\n";
+      String join = multiLineTrim == MultiLineTrim.Implicit ? " " : "\n";
       StringBuilder sb = new StringBuilder();
       int lastIndex = multiLines.size() - 1;
       for (int i = 0; i <= lastIndex; i++) {
@@ -184,6 +206,8 @@ private void processNext(String line) {
       if (trimmedValue.startsWith("|")) {
         multilineStart(multiLineTrimMode(trimmedValue));
 
+      } else if (trimmedValue.startsWith("-")) {
+        listStart(multiLineTrimMode(trimmedValue));
       } else if (trimmedValue.isEmpty() || trimmedValue.startsWith("#")) {
         // empty or comment
         state = State.KeyOrValue;
@@ -230,7 +254,11 @@ private void processNonKey(String line) {
       if (currentIndent <= keyIndent) {
         throw new IllegalStateException("Value not indented enough for key " + fullKey() + " at line: " + currentLine + " line[" + line + "]");
       }
-      multilineStart(MultiLineTrim.Implicit);
+      if (line.stripLeading().charAt(0) == '-') {
+        listStart(MultiLineTrim.Implicit);
+      } else {
+        multilineStart(MultiLineTrim.Implicit);
+      }
       multiLineIndent = currentIndent;
       multiLines.add(line);
     }
@@ -241,6 +269,12 @@ private void multilineStart(MultiLineTrim trim) {
       multiLineTrim = trim;
     }
 
+    private void listStart(MultiLineTrim trim) {
+      state = State.List;
+      multiLineIndent = 0;
+      multiLineTrim = trim;
+    }
+
     private void multiLineEnd() {
       state = State.RequireKey;
       multiLineIndent = 0;
@@ -281,8 +315,9 @@ private String unquoteValue(char quoteChar, String value) {
 
     private String fullKey() {
       StringJoiner fullKey = new StringJoiner(".");
-      for (Key next : keyStack) {
-        fullKey.add(next.key());
+      Iterator<Key> it = keyStack.descendingIterator();
+      while (it.hasNext()) {
+        fullKey.add(it.next().key());
       }
       return fullKey.toString();
     }
@@ -302,10 +337,7 @@ private String trimKey(String indentKey) {
     }
 
     private String unquoteKey(String value) {
-      if (value.startsWith("'") && value.endsWith("'")) {
-        return value.substring(1, value.length() - 1);
-      }
-      if (value.startsWith("\"") && value.endsWith("\"")) {
+      if (value.startsWith("'") && value.endsWith("'") || value.startsWith("\"") && value.endsWith("\"")) {
         return value.substring(1, value.length() - 1);
       }
       return value;

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

@@ -2,6 +2,7 @@
 
 import java.io.InputStream;
 import java.io.Reader;
+import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -70,6 +71,8 @@ private void addScalar(String key, Object val) {
         add(key, (String) val);
       } else if (val instanceof Number || val instanceof Boolean) {
         add(key, val.toString());
+      } else if (val instanceof Collection<?>) {
+        add(key, String.join(",", (Iterable<String>) val));
       }
     }
 

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

@@ -1,7 +1,7 @@
 package io.avaje.config;
 
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.net.URI;
 import java.time.Duration;
@@ -11,8 +11,8 @@
 import java.util.Properties;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 class ConfigTest {
 
@@ -48,6 +48,11 @@ void getNullable() {
     assertThat(entry).isEmpty();
   }
 
+  @Test
+  void getSnakeList() {
+    assertThat(Config.list().of("metal.gear")).contains("snake?", "Snake!?", "SNAAAAKE!!");
+  }
+
   @Test
   void getNullableExists() {
     assertThat(Config.getNullable("IDoNotExist1", "SomeVal")).isEqualTo("SomeVal");
@@ -104,7 +109,7 @@ void eventBuilderPublish() {
   void onChangeEventListener() {
     assertThat(Config.getOptional("MySystemProp5")).isEmpty();
     AtomicReference<ModificationEvent> capturedEvent = new AtomicReference<>();
-    Config.onChange((capturedEvent::set));
+    Config.onChange(capturedEvent::set);
     Config.setProperty("MySystemProp5", "hi5");
 
     ModificationEvent event = capturedEvent.get();
@@ -141,7 +146,7 @@ void asProperties() {
     assertThat(System.getProperty("myapp.bar.barDouble")).isEqualTo("33.3");
 
     assertThat(properties).containsKeys("config.load.systemProperties", "config.watch.enabled", "myExternalLoader", "myapp.activateFoo", "myapp.bar.barDouble", "myapp.bar.barRules", "myapp.fooHome", "myapp.fooName", "system.excluded.properties");
-    assertThat(properties).hasSize(12);
+    assertThat(properties).hasSize(13);
   }
 
   @Test

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

@@ -16,7 +16,7 @@ class YamlParserTest {
   void simpleYamlParserMultiLoad() {
     YamlLoaderSimple parser = new YamlLoaderSimple();
     Map<String, String> load1 = parser.load(res("/yaml/basic.yaml"));
-    assertThat(load1).hasSize(5);
+    assertThat(load1).hasSize(6);
     basic(load1);
 
     Map<String, String> load2 = parser.load(res("/yaml/key-comment.yaml"));
@@ -31,11 +31,19 @@ void basic() {
   }
 
   void basic(final Map<String, String> map) {
-    assertThat(map).containsOnlyKeys("name", "properties.key1", "properties.key2", "sorted.1", "sorted.2");
+    assertThat(map)
+        .containsOnlyKeys(
+            "name",
+            "properties.key1",
+            "properties.key2",
+            "sorted.1",
+            "sorted.2",
+            "root.directories");
     assertThat(map.get("name")).isEqualTo("Name123");
     assertThat(map.get("properties.key1")).isEqualTo("value1");
     assertThat(map.get("properties.key2")).isEqualTo("value2");
     assertThat(map.get("sorted.1")).isEqualTo("one");
+    assertThat(map.get("root.directories")).isEqualTo("/one/two/three,/four/five/six");
   }
 
   @Test

avaje-config/src/test/resources/application-test.yaml

@@ -10,3 +10,8 @@ myapp:
 config.load.systemProperties: true
 system.excluded.properties: myapp.bar.barRules,myapp.fooName
 
+metal:
+  gear:
+    - snake?
+    - Snake!?
+    - SNAAAAKE!!

avaje-config/src/test/resources/yaml/basic.yaml

@@ -4,4 +4,8 @@ properties:
   key1: value1
 sorted:
   '1': one
-  '2': two
+  '2': two
+root:
+  directories:
+    - /one/two/three
+    - /four/five/six