Use asString

Author: slisaasquatch

src/main/java/com/saasquatch/jsonschemainferrer/EnumExtractors.java

@@ -1,7 +1,6 @@
 package com.saasquatch.jsonschemainferrer;
 
 import static com.saasquatch.jsonschemainferrer.JunkDrawer.isValidEnum;
-import static com.saasquatch.jsonschemainferrer.JunkDrawer.textValue;
 
 import com.saasquatch.jsonschemainferrer.annotations.Beta;
 import java.util.Arrays;
@@ -37,7 +36,7 @@ public static <E extends Enum<E>> EnumExtractor validEnum(@Nonnull Class<E> enum
     Objects.requireNonNull(enumClass);
     return input -> {
       final Set<? extends JsonNode> enumNodes = input.getSamples().stream()
-          .filter(j -> isValidEnum(enumClass, textValue(j)))
+          .filter(j -> isValidEnum(enumClass, j.asString(null)))
           .collect(Collectors.toSet());
       return enumNodes.isEmpty() ? Collections.emptySet() : Collections.singleton(enumNodes);
     };

src/main/java/com/saasquatch/jsonschemainferrer/JsonSchemaInferrer.java

@@ -10,7 +10,6 @@
 import static com.saasquatch.jsonschemainferrer.JunkDrawer.newArray;
 import static com.saasquatch.jsonschemainferrer.JunkDrawer.newObject;
 import static com.saasquatch.jsonschemainferrer.JunkDrawer.stringColToArrayDistinct;
-import static com.saasquatch.jsonschemainferrer.JunkDrawer.textValue;
 
 import com.saasquatch.jsonschemainferrer.annotations.VisibleForTesting;
 import java.util.ArrayList;
@@ -252,8 +251,8 @@ private Set<ObjectNode> processPrimitives(@Nonnull Collection<ValueNode> valueNo
     }
     // Put the combined examples and default back into the result schema
     for (ObjectNode anyOf : anyOfs) {
-      final String type = textValue(anyOf.path(Consts.Fields.TYPE));
-      final String format = textValue(anyOf.path(Consts.Fields.FORMAT));
+      final String type = anyOf.path(Consts.Fields.TYPE).asString(null);
+      final String format = anyOf.path(Consts.Fields.FORMAT).asString(null);
       @Nonnull final PrimitivesSummary primitivesSummary =
           Objects.requireNonNull(primitivesSummaryMap.getPrimitivesSummary(type, format));
       processGenericSchemaFeature(anyOf, primitivesSummary.getSamples(), type, path);
@@ -326,7 +325,7 @@ private void postProcessAnyOfs(@Nonnull Collection<ObjectNode> anyOfs) {
       final Set<String> anyOfSchemaFieldNames = new LinkedHashSet<>(anyOf.propertyNames());
       if (anyOfSchemaFieldNames.equals(Consts.Fields.SINGLETON_TYPE)) {
         simpleAnyOfs.add(anyOf);
-        simpleTypes.add(textValue(anyOf.path(Consts.Fields.TYPE)));
+        simpleTypes.add(anyOf.path(Consts.Fields.TYPE).asString(null));
       }
     }
     // Combine all the simple types into an array

src/main/java/com/saasquatch/jsonschemainferrer/JunkDrawer.java

@@ -20,7 +20,6 @@
 import javax.annotation.Nullable;
 import tools.jackson.databind.JsonNode;
 import tools.jackson.databind.node.ArrayNode;
-import tools.jackson.databind.node.BinaryNode;
 import tools.jackson.databind.node.JsonNodeFactory;
 import tools.jackson.databind.node.NumericNode;
 import tools.jackson.databind.node.ObjectNode;
@@ -206,8 +205,8 @@ static int getBase64Length(int bytesLength) {
    * Get the serialized text length, or -1 if the input cannot be serialized as text.
    */
   static int getSerializedTextLength(@Nonnull JsonNode jsonNode) {
-    if (jsonNode instanceof BinaryNode) {
-      final byte[] binaryValue = ((BinaryNode) jsonNode).binaryValue();
+    if (jsonNode.isBinary()) {
+      final byte[] binaryValue = jsonNode.binaryValue();
       return getBase64Length(binaryValue.length);
     } else if (isTextualFloat(jsonNode)) {
       // Handle NaN and infinity
@@ -279,13 +278,6 @@ static boolean nonNull(@Nullable JsonNode j) {
     return !isNull(j);
   }
 
-  static String textValue(JsonNode j) {
-    if (j != null && j.isString()) {
-      return j.stringValue();
-    }
-    return null;
-  }
-
   /**
    * The list of characters that need to be escaped are found <a
    * href="https://www.freeformatter.com/json-escape.html">here</a>.