#587 fix hashCode NPE for null scalars

decorators-squad · Dec 20, 2023 · f44267a · f44267a
1 parent b5450a7
commit f44267a
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 18 deletions.
diff --git a/src/main/java/com/amihaiemil/eoyaml/BaseScalar.java b/src/main/java/com/amihaiemil/eoyaml/BaseScalar.java
@@ -69,7 +69,14 @@ public boolean equals(final Object other) {
      */
     @Override
     public int hashCode() {
-        return this.value().hashCode();
+        final int hashCode;
+        final String value = this.value();
+        if(value == null) {
+            hashCode = 0;
+        } else {
+            hashCode = value.hashCode();
+        }
+        return hashCode;
     }
 
     /**
@@ -98,10 +105,10 @@ public int compareTo(final YamlNode other) {
                 result = 0;
             } else if(value != null && otherVal == null) {
                 result = 1;
-            } else if (value == null && otherVal != null) {
+            } else if (value == null) {
                 result = -1;
             } else {
-                result = this.value().compareTo(otherVal);
+                result = value.compareTo(otherVal);
             }
         }
         return result;

diff --git a/src/main/java/com/amihaiemil/eoyaml/JsonYamlMapping.java b/src/main/java/com/amihaiemil/eoyaml/JsonYamlMapping.java
@@ -1,7 +1,6 @@
 package com.amihaiemil.eoyaml;
 
 import javax.json.JsonObject;
-import javax.json.JsonValue;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
@@ -36,8 +35,14 @@ public Set<YamlNode> keys() {
 
     @Override
     public YamlNode value(final YamlNode key) {
-        final JsonValue jsonValue = this.object.get(key.asScalar().value());
-        return new JsonYamlDump(jsonValue).dump();
+        final String scalar = key.asScalar().value();
+        final YamlNode value;
+        if(scalar == null) {
+            value = null;
+        } else {
+            value = new JsonYamlDump(this.object.get(scalar)).dump();
+        }
+        return value;
     }
 
     @Override

diff --git a/src/main/java/com/amihaiemil/eoyaml/RtYamlPrinter.java b/src/main/java/com/amihaiemil/eoyaml/RtYamlPrinter.java
@@ -350,7 +350,12 @@ private String indent(final String value, final int indentation) {
             alignment.append(" ");
             spaces--;
         }
-        String[] lines = value.split(System.lineSeparator());
+        String[] lines;
+        if(value == null) {
+            lines = new String[]{"null"};
+        } else {
+            lines = value.split(System.lineSeparator());
+        }
         StringBuilder printed = new StringBuilder();
         for(int idx = 0; idx < lines.length; idx++) {
             printed.append(alignment);
@@ -367,6 +372,7 @@ private String indent(final String value, final int indentation) {
      * @author Mihai Andronache ([email protected])
      * @version $Id$
      * @since 4.3.1
+     * @checkstyle LineLength (100 lines)
      */
     static class Escaped extends BaseScalar {
 
@@ -384,22 +390,25 @@ static class Escaped extends BaseScalar {
         }
 
         @Override
-
-
         public String value() {
             final String value = this.original.value();
-            String escaped = value;
-            boolean quoted = (value.startsWith("'") && value.endsWith("'"))
-                    || (value.startsWith("\"") && value.endsWith("\""));
-            final String regex = ".*[?\\-#:>|$%&{}\\[\\]@`!*,'\"]+.*|[ ]+";
-            if (!quoted && value.matches(regex)) {
-                if(value.contains("\"")) {
-                    escaped = "'" + value + "'";
+            String toEscape;
+            if(value == null) {
+                toEscape = "null";
+            } else {
+                toEscape = value;
+            }
+            boolean alreadyEscaped = (toEscape.startsWith("'") && toEscape.endsWith("'"))
+                    || (toEscape.startsWith("\"") && toEscape.endsWith("\""));
+            final String needsEscaping = ".*[?\\-#:>|$%&{}\\[\\]@`!*,'\"]+.*|[ ]+|null";
+            if (!alreadyEscaped && toEscape.matches(needsEscaping)) {
+                if(toEscape.contains("\"")) {
+                    toEscape = "'" + toEscape + "'";
                 } else {
-                    escaped = "\"" + value + "\"";
+                    toEscape = "\"" + toEscape + "\"";
                 }
             }
-            return escaped;
+            return toEscape;
         }
 
         @Override