Merge pull request #234 from SentryMan/yml

Fix Colon Yml List parsing

Author: SentryMan

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

@@ -120,8 +120,9 @@ private void processMultiLine(String line) {
     }
 
     private void multiLineEnd(String line) {
-      if (state == State.MultiLine) addKeyVal(multiLineValue());
-      else {
+      if (state == State.MultiLine) {
+        addKeyVal(multiLineValue());
+      } else {
         addKeyVal(listValue());
       }
       processNext(line);
@@ -170,9 +171,8 @@ private void multiLineTrimTrailing() {
       for (int i = multiLines.size(); i-- > 0; ) {
         if (!multiLines.get(i).trim().isEmpty()) {
           break;
-        } else {
-          multiLines.remove(i);
         }
+        multiLines.remove(i);
       }
     }
 
@@ -186,9 +186,10 @@ private void processNext(String line) {
       }
 
       final int pos = line.indexOf(':');
-      if (pos == -1) {
+      var list = line.stripLeading().charAt(0) == '-';
+      if (pos == -1 || list) {
         // value on another line
-        processNonKey(line);
+        processNonKey(line, list);
         return;
       }
       if (state == State.RequireTopKey && currentIndent > 0) {
@@ -241,7 +242,7 @@ private void addKeyVal(String value) {
       state = State.RequireKey;
     }
 
-    private void processNonKey(String line) {
+    private void processNonKey(String line, boolean list) {
       if (state == State.RequireKey) {
         state = State.RequireTopKey;
         // drop this value line
@@ -254,7 +255,7 @@ private void processNonKey(String line) {
       if (currentIndent <= keyIndent) {
         throw new IllegalStateException("Value not indented enough for key " + fullKey() + " at line: " + currentLine + " line[" + line + "]");
       }
-      if (line.stripLeading().charAt(0) == '-') {
+      if (list) {
         listStart(MultiLineTrim.Implicit);
       } else {
         multilineStart(MultiLineTrim.Implicit);
@@ -326,9 +327,8 @@ private void popKeys(int indent) {
       while (!keyStack.isEmpty()) {
         if (keyStack.peek().indent() < indent) {
           break;
-        } else {
-          keyStack.pop();
         }
+        keyStack.pop();
       }
     }
 

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

@@ -1,12 +1,12 @@
 package io.avaje.config;
 
-import org.junit.jupiter.api.Test;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.io.InputStream;
 import java.util.Map;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import org.junit.jupiter.api.Test;
 
 class YamlParserTest {
 
@@ -196,6 +196,17 @@ void parse_err_req_key2() {
       .hasMessageContaining("line:5");
   }
 
+  @Test
+  void parse_list() {
+    var list =
+        Map.of(
+            "keyValueList",
+            "apple:10,pear:15,cheese:10",
+            "keyValueList1",
+            "apple:10,pear:15,cheese:10");
+    assertThat(parseYaml2("/yaml/list.yaml")).isEqualTo(list);
+    assertThat(parseYaml("/yaml/list.yaml")).isEqualTo(list);
+  }
 
   private Map<String, String> parseYaml2(String s) {
     return load.load(res(s));

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

@@ -0,0 +1,5 @@
+keyValueList: apple:10,pear:15,cheese:10
+keyValueList1:
+  - apple:10
+  - pear:15
+  - cheese:10