Merge pull request #520 from coder-hugo/feature/fix-parsing-of-entrie…

…s-with-colons #517 The key of an entry must be followed by a space
decorators-squad · Oct 29, 2022 · b612e8e · b612e8e
2 parents 5d01d13 + 2ca19da
commit b612e8e
Show file tree

Hide file tree

Showing 9 changed files with 113 additions and 43 deletions.
diff --git a/src/main/java/com/amihaiemil/eoyaml/ReadYamlMapping.java b/src/main/java/com/amihaiemil/eoyaml/ReadYamlMapping.java
@@ -27,12 +27,16 @@
  */
 package com.amihaiemil.eoyaml;
 
-import static com.amihaiemil.eoyaml.YamlLine.UNKNOWN_LINE_NUMBER;
-
 import com.amihaiemil.eoyaml.exceptions.YamlReadingException;
-import java.util.*;
+
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static com.amihaiemil.eoyaml.YamlLine.UNKNOWN_LINE_NUMBER;
+
 /**
  * YamlMapping read from somewhere. YAML directives and
  * document start/end markers are ignored. This is assumed
@@ -44,6 +48,8 @@
  */
 final class ReadYamlMapping extends BaseYamlMapping {
 
+    private static final Pattern KEY_PATTERN = Pattern.compile("^-?\\s*(?<key>.+):(|\\s.*)$");
+
     /**
      * Yaml line just previous to the one where this mapping starts. E.g.
      * <pre>
@@ -158,18 +164,12 @@ public Set<YamlNode> keys() {
                 if(!trimmed.contains(":")) {
                     continue;
                 }
-                final String key;
-                if(trimmed.startsWith("-")) {
-                    key = trimmed.substring(
-                        1, trimmed.lastIndexOf(":")
-                    ).trim();
-                } else {
-                    key = trimmed.substring(
-                        0, trimmed.lastIndexOf(":")
-                    ).trim();
-                }
-                if(!key.isEmpty()) {
-                    keys.add(new PlainStringScalar(key));
+                final Matcher matcher = KEY_PATTERN.matcher(trimmed);
+                if (matcher.matches()) {
+                    final String key = matcher.group("key");
+                    if (!key.isEmpty()) {
+                        keys.add(new PlainStringScalar(key));
+                    }
                 }
             }
             prev = line;

diff --git a/src/main/java/com/amihaiemil/eoyaml/ReadYamlSequence.java b/src/main/java/com/amihaiemil/eoyaml/ReadYamlSequence.java
@@ -237,8 +237,8 @@ public Comment comment() {
      */
     private boolean mappingStartsAtDash(final YamlLine dashLine) {
         final String trimmed = dashLine.trimmed();
-        final boolean escapedScalar = trimmed.matches("^[ ]*\\-[ ]*\".*\"$")
-            || trimmed.matches("^[ ]*\\-[ ]*\'.*\'$");
-        return trimmed.matches("^.*\\-.*\\:.*$") && !escapedScalar;
+        final boolean escapedScalar = trimmed.matches("^\\s*-\\s*\".*\"$")
+            || trimmed.matches("^\\s*-\\s*'.*'$");
+        return trimmed.matches("^.*-.+:(|\\s.*)$") && !escapedScalar;
     }
 }
diff --git a/src/main/java/com/amihaiemil/eoyaml/RtYamlInput.java b/src/main/java/com/amihaiemil/eoyaml/RtYamlInput.java
@@ -193,8 +193,8 @@ private AllYamlLines readInput() throws IOException {
     private boolean mappingStartsAtDash(final String line){
         //line without indentation.
         final String trimmed = line.trim();
-        final boolean escapedScalar = trimmed.matches("^[ ]*-[ ]*\".*\"$")
-            || trimmed.matches("^[ ]*-[ ]*'.*'$");
-        return trimmed.matches("^[ ]*-.*:.+$") && !escapedScalar;
+        final boolean escapedScalar = trimmed.matches("^\\s*-\\s*\".*\"$")
+            || trimmed.matches("^\\s*-\\s*'.*'$");
+        return trimmed.matches("^\\s*-.+:\\s.*$") && !escapedScalar;
     }
 }
diff --git a/src/main/java/com/amihaiemil/eoyaml/SameIndentationLevel.java b/src/main/java/com/amihaiemil/eoyaml/SameIndentationLevel.java
@@ -116,9 +116,9 @@ public YamlNode toYamlNode(
      */
     private boolean mappingStartsAtDash(final YamlLine dashLine) {
         final String trimmed = dashLine.trimmed();
-        final boolean escapedScalar = trimmed.matches("^[ ]*\\-[ ]*\".*\"$")
-            || trimmed.matches("^[ ]*\\-[ ]*\'.*\'$");
-        return trimmed.matches("^[ ]*\\-.*\\:.+$") && !escapedScalar;
+        final boolean escapedScalar = trimmed.matches("^\\s*-\\s*\".*\"$")
+            || trimmed.matches("^\\s*-\\s*'.*'$");
+        return trimmed.matches("^\\s*-.*:\\s.+$") && !escapedScalar;
     }
 
     /**
@@ -128,9 +128,9 @@ private boolean mappingStartsAtDash(final YamlLine dashLine) {
      */
     private boolean mapping(final YamlLine dashLine) {
         final String trimmed = dashLine.trimmed();
-        final boolean escapedScalar = trimmed.matches("^[ ]*\".*\"$")
-                || trimmed.matches("^[ ]*\'.*\'$");
-        return trimmed.matches("^[ ]*.*\\:.+$") && !escapedScalar;
+        final boolean escapedScalar = trimmed.matches("^\\s*\".*\"$")
+                || trimmed.matches("^\\s*'.*'$");
+        return trimmed.matches("^.*:\\s.+$") && !escapedScalar;
     }
 
 }
diff --git a/src/main/java/com/amihaiemil/eoyaml/WellIndented.java b/src/main/java/com/amihaiemil/eoyaml/WellIndented.java
@@ -118,7 +118,7 @@ public Iterator<YamlLine> iterator() {
                 YamlLine line = iterator.next();
                 if(!(previous instanceof YamlLine.NullYamlLine)) {
                     int prevIndent = previous.indentation();
-                    if(previous.trimmed().matches("^[ ]*\\-.*\\:.*$")) {
+                    if(previous.trimmed().matches("^\\s*-.*:(|\\s.*)$")) {
                         prevIndent += 2;
                     }
                     int lineIndent = line.indentation();

diff --git a/src/test/java/com/amihaiemil/eoyaml/ReadYamlMappingTest.java b/src/test/java/com/amihaiemil/eoyaml/ReadYamlMappingTest.java
@@ -27,18 +27,18 @@
  */
 package com.amihaiemil.eoyaml;
 
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+import org.junit.Ignore;
+import org.junit.Test;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import org.hamcrest.MatcherAssert;
-import org.hamcrest.Matchers;
-import org.junit.Ignore;
-import org.junit.Test;
-
 /**
  * Unit tests for {@link ReadYamlMapping}.
  * @checkstyle MethodName (1500 lines)
@@ -1170,4 +1170,14 @@ public void shouldReadFromAnotherFromYamlMapping()
         MatcherAssert.assertThat(copy.string("key2"), Matchers
             .equalTo("Some other value."));
     }
+
+    @Test
+    public void shouldReadKeyProperlyIfValueContainsColon() {
+        final List<YamlLine> lines = new ArrayList<>();
+        lines.add(new RtYamlLine("key: value:with-colon", 0));
+        ReadYamlMapping mapping = new ReadYamlMapping(new AllYamlLines(lines));
+
+        MatcherAssert.assertThat(mapping.keys(), Matchers.hasSize(1));
+        MatcherAssert.assertThat(mapping.keys().iterator().next().asScalar().value(), Matchers.equalTo("key"));
+    }
 }
diff --git a/src/test/java/com/amihaiemil/eoyaml/ReadYamlSequenceTest.java b/src/test/java/com/amihaiemil/eoyaml/ReadYamlSequenceTest.java
@@ -27,16 +27,16 @@
  */
 package com.amihaiemil.eoyaml;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.Ignore;
 import org.junit.Test;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
 /**
  * Unit tests for {@link ReadYamlSequence}.
  * @author Mihai Andronache ([email protected])
@@ -484,4 +484,18 @@ public void printsEmptyYaml() throws Exception {
         );
         MatcherAssert.assertThat(sequence.toString(), Matchers.isEmptyString());
     }
+
+    @Test
+    public void dontReturnMappingForScalarWithColon() {
+        final List<YamlLine> lines = new ArrayList<>();
+        lines.add(new RtYamlLine("- scalar:with-colon", 0));
+        final YamlSequence sequence = new ReadYamlSequence(
+                new AllYamlLines(lines)
+        );
+
+        MatcherAssert.assertThat(sequence.values(), Matchers.hasSize(1));
+        YamlNode sequenceItem = sequence.values().iterator().next();
+        MatcherAssert.assertThat(sequenceItem.type(), Matchers.equalTo(Node.SCALAR));
+        MatcherAssert.assertThat(sequenceItem.asScalar().value(), Matchers.equalTo("scalar:with-colon"));
+    }
 }
diff --git a/src/test/java/com/amihaiemil/eoyaml/RtYamlInputTest.java b/src/test/java/com/amihaiemil/eoyaml/RtYamlInputTest.java
@@ -27,17 +27,21 @@
  */
 package com.amihaiemil.eoyaml;
 
-import java.io.*;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Set;
-
 import org.apache.commons.io.IOUtils;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.Ignore;
 import org.junit.Test;
 
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Set;
+
 /**
  * Unit tests for {@link RtYamlInput}.
  * @author Mihai Andronache ([email protected])
@@ -977,6 +981,43 @@ public void supportsSpringPropertyRef() throws IOException {
         MatcherAssert.assertThat(pretty, Matchers.equalTo(fileContents));
     }
 
+    @Test
+    public void shouldReadKeysProperly() throws IOException {
+        final String filename = "issue_517_values_with_colons.yml";
+
+        final YamlMapping read = new RtYamlInput(
+                new FileInputStream("src/test/resources/" + filename)
+        ).readYamlMapping();
+
+        MatcherAssert.assertThat(read.type(), Matchers.equalTo(Node.MAPPING));
+        MatcherAssert.assertThat(
+                read.asMapping().keys(),
+                Matchers.hasSize(2));
+
+        final YamlNode topLevelMapping = read.asMapping().value("a_mapping");
+        MatcherAssert.assertThat(
+                topLevelMapping.type(),
+                Matchers.equalTo(Node.MAPPING));
+        MatcherAssert.assertThat(
+                topLevelMapping.asMapping().value("a_scalar").type(),
+                Matchers.equalTo(Node.SCALAR));
+        MatcherAssert.assertThat(
+                topLevelMapping.asMapping().value("a_scalar").asScalar().value(),
+                Matchers.equalTo("value:with-colon"));
+
+        YamlNode topLevelSequence = read.asMapping().value("a_sequence");
+        MatcherAssert.assertThat(
+                topLevelSequence.type(),
+                Matchers.equalTo(Node.SEQUENCE));
+        MatcherAssert.assertThat(topLevelSequence.asSequence().values(),
+                                 Matchers.hasSize(1));
+        YamlNode sequenceItem = topLevelSequence.asSequence().values().iterator().next();
+        MatcherAssert.assertThat(sequenceItem.type(),
+                                 Matchers.equalTo(Node.SCALAR));
+        MatcherAssert.assertThat(sequenceItem.asScalar().value(),
+                                 Matchers.equalTo("value:with-colon"));
+    }
+
     /**
      * Read a test resource file's contents.
      * @param fileName File to read.

diff --git a/src/test/resources/issue_517_values_with_colons.yml b/src/test/resources/issue_517_values_with_colons.yml
@@ -0,0 +1,5 @@
+a_mapping:
+  a_scalar: value:with-colon
+
+a_sequence:
+  - value:with-colon