413 Checkstyle updates

decorators-squad · Aug 17, 2022 · c4dace3 · c4dace3
1 parent 8b2e8c2
commit c4dace3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/src/main/java/com/amihaiemil/eoyaml/ReadYamlSequence.java b/src/main/java/com/amihaiemil/eoyaml/ReadYamlSequence.java
@@ -133,6 +133,10 @@ final class ReadYamlSequence extends BaseYamlSequence {
         this.guessIndentation = guessIndentation;
     }
 
+    /**
+     * Retrieve the values of this sequence.
+     * @checkstyle CyclomaticComplexity (200 lines)
+     */
     @Override
     public Collection<YamlNode> values() {
         final List<YamlNode> kids = new LinkedList<>();
@@ -166,13 +170,16 @@ public Collection<YamlNode> values() {
                     )));
                 } else {
                     if(this.mappingStartsAtDash(line)) {
-                        final YamlLine previous = line.number() == 0
-                                        ? new YamlLine.NullYamlLine()
-                                        : this.all.line(line.number() - 1);
+                        YamlLine dashMapPrevious;
+                        if (line.number() == 0) {
+                            dashMapPrevious = new YamlLine.NullYamlLine();
+                        } else {
+                            dashMapPrevious = this.all.line(line.number() - 1);
+                        }
                         kids.add(
                             new ReadYamlMapping(
                                 line.number() + 1,
-                                previous,
+                                dashMapPrevious,
                                 this.all,
                                 this.guessIndentation
                             )

diff --git a/src/main/java/com/amihaiemil/eoyaml/SameIndentationLevel.java b/src/main/java/com/amihaiemil/eoyaml/SameIndentationLevel.java
@@ -77,11 +77,11 @@ public Iterator<YamlLine> iterator() {
             final YamlLine first = iterator.next();
             sameIndentation.add(first);
             int firstIndentation = first.indentation();
-            boolean firstIsMappingStartsWithDash =
+            boolean firstIsDashMap =
                     this.mappingStartsAtDash(first);
             while (iterator.hasNext()) {
                 YamlLine current = iterator.next();
-                if (firstIsMappingStartsWithDash
+                if (firstIsDashMap
                         && this.mapping(current)
                         && current.indentation() == firstIndentation + 2) {
                     sameIndentation.add(current);

diff --git a/src/test/java/com/amihaiemil/eoyaml/ReadYamlSequenceTest.java b/src/test/java/com/amihaiemil/eoyaml/ReadYamlSequenceTest.java
@@ -139,7 +139,8 @@ public void returnsYamlMappingWithScalarValuesStartingAtDash(){
 
     /**
      * ReadYamlSequence can return the YamlMapping which starts right at the
-     * dash line and has only one entry
+     * dash line and has only one entry.
+     * @checkstyle ExecutableStatementCount (100 lines)
      */
     @Test
     public void returnsShortYamlMappingWithScalarValuesStartingAtDash(){