methods in ReadYamlMapping and unit tests

decorators-squad · Feb 27, 2017 · 391a70c · 391a70c
1 parent 05099b5
commit 391a70c
Show file tree

Hide file tree

Showing 6 changed files with 145 additions and 12 deletions.
diff --git a/checkstyle.xml b/checkstyle.xml
@@ -178,7 +178,9 @@
         <module name="SimplifyBooleanReturn"/>
         <module name="StringLiteralEquality"/>
         <module name="NestedForDepth"/>
-        <module name="NestedIfDepth"/>
+        <module name="NestedIfDepth">
+            <property name="max" value="3"/>
+        </module>
         <module name="NestedTryDepth"/>
         <module name="NoClone"/>
         <module name="NoFinalizer"/>

diff --git a/src/main/java/com/amihaiemil/camel/AbstractYamlLines.java b/src/main/java/com/amihaiemil/camel/AbstractYamlLines.java
@@ -43,6 +43,12 @@ abstract class AbstractYamlLines implements Iterable<YamlLine> {
      */
     abstract AbstractYamlLines nested(final int after);
 
+    /**
+     * Number of lines.
+     * @return Integer.
+     */
+    abstract int count();
+
     /**
      * Turn these lines into a YamlNode.
      * @return YamlNode

diff --git a/src/main/java/com/amihaiemil/camel/ReadYamlMapping.java b/src/main/java/com/amihaiemil/camel/ReadYamlMapping.java
@@ -28,7 +28,7 @@
 package com.amihaiemil.camel;
 
 import java.util.Collection;
-import java.util.Collections;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
@@ -61,7 +61,7 @@ public Collection<YamlNode> children() {
         final List<YamlNode> kids = new LinkedList<>();
         for (final YamlLine line : this.lines) {
             final String trimmed = line.trimmed();
-            if("?".equals(trimmed)) {
+            if("?".equals(trimmed) || ":".equals(trimmed)) {
                 continue;
             } else {
                 if(trimmed.endsWith(":")) {
@@ -84,7 +84,6 @@ public Collection<YamlNode> children() {
                 }
             }
         }
-        Collections.sort(kids);
         return kids;
     }
 
@@ -95,7 +94,7 @@ public YamlMapping yamlMapping(final String key) {
 
     @Override
     public YamlMapping yamlMapping(final YamlNode key) {
-        return null;
+        return (YamlMapping) this.nodeValue(key, true);
     }
 
     @Override
@@ -105,7 +104,7 @@ public YamlSequence yamlSequence(final String key) {
 
     @Override
     public YamlSequence yamlSequence(final YamlNode key) {
-        return null;
+        return (YamlSequence) this.nodeValue(key, false);
     }
 
     @Override
@@ -122,7 +121,24 @@ public String string(final String key) {
 
     @Override
     public String string(final YamlNode key) {
-        return null;
+        String value = null;
+        boolean found = false;
+        for (final YamlLine line : this.lines) {
+            final String trimmed = line.trimmed();
+            if("?".equals(trimmed)) {
+                YamlNode keyNode = this.lines.nested(line.number())
+                    .toYamlNode();
+                if(keyNode.equals(key)) {
+                    found = true;
+                    continue;
+                }
+            }
+            if(found && trimmed.startsWith(":")) {
+                value = trimmed.substring(trimmed.indexOf(":") + 1).trim();
+                break;
+            }
+        }
+        return value;
     }
 
     @Override
@@ -160,9 +176,60 @@ private YamlNode nodeValue(final String key, final boolean map) {
         return value;
     }
 
+    /**
+     * The YamlNode value associated with a String key.
+     * @param key YamlNode key.
+     * @param map Is the value a map or a sequence?
+     * @return YamlNode.
+     */
+    private YamlNode nodeValue(final YamlNode key, final boolean map) {
+        YamlNode value = null;
+        for (final YamlLine line : this.lines) {
+            final String trimmed = line.trimmed();
+            if("?".equals(trimmed)) {
+                AbstractYamlLines keyLines = this.lines.nested(line.number());
+                YamlNode keyNode = keyLines.toYamlNode();
+                if(keyNode.equals(key)) {
+                    int colonLine = line.number() + keyLines.count() + 1;
+                    if (map) {
+                        value = new ReadYamlMapping(
+                            this.lines.nested(colonLine)
+                        );
+                    } else {
+                        value = new ReadYamlSequence(
+                            this.lines.nested(colonLine)
+                        );
+                    }    
+                }
+            }
+        }
+        return value;
+    }
+
     @Override
     Set<YamlNode> keys() {
-        // TODO Auto-generated method stub
-        return null;
+        final Set<YamlNode> keys = new HashSet<>();
+        for (final YamlLine line : this.lines) {
+            final String trimmed = line.trimmed();
+            if(":".equals(trimmed)) {
+                continue;
+            } else if ("?".equals(trimmed)) {
+                keys.add(this.lines.nested(line.number()).toYamlNode());
+            } else {
+                final String[] parts = trimmed.split(":");
+                if(parts.length < 2) {
+                    throw new IllegalStateException(
+                        "Expected ':' on line " + line.number()
+                    );
+                } else {
+                    keys.add(
+                        new Scalar(
+                            trimmed.substring(0, trimmed.indexOf(":")).trim()
+                        )
+                    );
+                }
+            }
+        }
+        return keys;
     }
 }
diff --git a/src/main/java/com/amihaiemil/camel/RtYamlLines.java b/src/main/java/com/amihaiemil/camel/RtYamlLines.java
@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
@@ -45,13 +46,14 @@ public Iterator<YamlLine> iterator() {
                     sameIndentation.add(current);
                 }
             }
+            Collections.sort(sameIndentation);
             iterator = sameIndentation.iterator();
         }
         return iterator;
     }
 
     @Override
-    public AbstractYamlLines nested(final int after) {
+    AbstractYamlLines nested(final int after) {
         final List<YamlLine> nestedLines = new ArrayList<YamlLine>();
         YamlLine start = null;
         for(final YamlLine line: this.lines) {
@@ -78,5 +80,10 @@ public String toString() {
         return builder.toString();
     }
 
+    @Override
+    int count() {
+        return this.lines.size();
+    }
+
 
 }
diff --git a/src/test/java/com/amihaiemil/camel/ReadYamlMappingTest.java b/src/test/java/com/amihaiemil/camel/ReadYamlMappingTest.java
@@ -61,6 +61,36 @@ public void returnsYamlMappingWithStringKey(){
         MatcherAssert.assertThat(
             second, Matchers.instanceOf(YamlMapping.class)
         );
+        MatcherAssert.assertThat(
+            second.string("fifth"), Matchers.equalTo("values")
+        );
+    }
+
+    /**
+     * ReadYamlMapping can return the YamlMapping mapped to a
+     * YamlMapping key.
+     */
+    @Test
+    public void returnsYamlMappingWithYamlMappingKey(){
+        final YamlMapping key = new RtYamlMappingBuilder()
+            .add("complex1", "mapping1").add("complex2", "mapping2").build();
+        final List<YamlLine> lines = new ArrayList<>();
+        lines.add(new RtYamlLine("first: something", 0));
+        lines.add(new RtYamlLine("? ", 1));
+        lines.add(new RtYamlLine("  complex1: mapping1", 2));
+        lines.add(new RtYamlLine("  complex2: mapping2", 3));
+        lines.add(new RtYamlLine(": ", 4));
+        lines.add(new RtYamlLine("  map: value", 5));
+        lines.add(new RtYamlLine("second: something", 6));
+        final YamlMapping map = new ReadYamlMapping(new RtYamlLines(lines));
+        final YamlMapping value = map.yamlMapping(key);
+        MatcherAssert.assertThat(value, Matchers.notNullValue());
+        MatcherAssert.assertThat(
+            value, Matchers.instanceOf(YamlMapping.class)
+        );
+        MatcherAssert.assertThat(
+            value.string("map"), Matchers.equalTo("value")
+        );
     }
 
     /**
@@ -82,7 +112,28 @@ public void returnsYamlSequenceWithStringKey(){
             second, Matchers.instanceOf(YamlSequence.class)
         );
     }
-
+
+    /**
+     * ReadYamlMapping can return the YamlMapping mapped to a
+     * YamlMapping key.
+     */
+    @Test
+    public void returnsStringWithYamlMappingKey(){
+        final YamlMapping key = new RtYamlMappingBuilder()
+            .add("complex1", "mapping1").add("complex2", "mapping2").build();
+        final List<YamlLine> lines = new ArrayList<>();
+        lines.add(new RtYamlLine("first: something", 0));
+        lines.add(new RtYamlLine("? ", 1));
+        lines.add(new RtYamlLine("  complex1: mapping1", 2));
+        lines.add(new RtYamlLine("  complex2: mapping2", 3));
+        lines.add(new RtYamlLine(": value", 4));
+        lines.add(new RtYamlLine("second: something", 6));
+        final YamlMapping map = new ReadYamlMapping(new RtYamlLines(lines));
+        final String value = map.string(key);
+        MatcherAssert.assertThat(value, Matchers.notNullValue());
+        MatcherAssert.assertThat(value, Matchers.equalTo("value"));
+    }
+
     /**
      * ReadYamlMapping can return the String mapped to a
      * String key.

diff --git a/src/test/java/com/amihaiemil/camel/RtYamlLinesTest.java b/src/test/java/com/amihaiemil/camel/RtYamlLinesTest.java
@@ -79,8 +79,8 @@ public void returnsNestedLinesRight() {
         AbstractYamlLines yamlLines = new RtYamlLines(lines);
 
         Iterator<YamlLine> iterator = yamlLines.nested(0).iterator();
-        MatcherAssert.assertThat(iterator.next().number(), Matchers.is(1));
         MatcherAssert.assertThat(iterator.next().number(), Matchers.is(2));
+        MatcherAssert.assertThat(iterator.next().number(), Matchers.is(1));
         MatcherAssert.assertThat(iterator.hasNext(), Matchers.is(false));
 
         iterator = yamlLines.nested(1).iterator();