Use new Jackson api

saasquatch · Jan 5, 2024 · b023776 · b023776
1 parent e00d8cc
commit b023776
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/src/main/java/com/saasquatch/jsonschemainferrer/ExamplesPolicies.java b/src/main/java/com/saasquatch/jsonschemainferrer/ExamplesPolicies.java
@@ -58,7 +58,7 @@ public static ExamplesPolicy useFirstSamples(@Nonnegative int limit,
       }
       final ArrayNode result = newArray();
       input.getSamples().stream().distinct().limit(limit).forEach(result::add);
-      return result.size() == 0 ? null : result;
+      return result.isEmpty() ? null : result;
     };
   }
 

diff --git a/src/main/java/com/saasquatch/jsonschemainferrer/JsonSchemaInferrer.java b/src/main/java/com/saasquatch/jsonschemainferrer/JsonSchemaInferrer.java
@@ -176,7 +176,7 @@ private ObjectNode processObjects(@Nonnull Collection<ObjectNode> objectNodes,
       properties.set(fieldName, newProperty);
     }
     final ObjectNode schema = newObject().put(Consts.Fields.TYPE, Consts.Types.OBJECT);
-    if (properties.size() > 0) {
+    if (!properties.isEmpty()) {
       schema.set(Consts.Fields.PROPERTIES, properties);
     }
     processGenericSchemaFeature(schema, objectNodes, Consts.Types.OBJECT, path);
@@ -214,7 +214,7 @@ private ObjectNode processArrays(@Nonnull Collection<ArrayNode> arrayNodes,
         break;
     }
     final ObjectNode schema = newObject().put(Consts.Fields.TYPE, Consts.Types.ARRAY);
-    if (items.size() > 0) {
+    if (!items.isEmpty()) {
       schema.set(Consts.Fields.ITEMS, items);
     }
     processGenericSchemaFeature(schema, arrayNodes, Consts.Types.ARRAY, path);

diff --git a/src/test/java/com/saasquatch/jsonschemainferrer/JsonSchemaInferrerExamplesTest.java b/src/test/java/com/saasquatch/jsonschemainferrer/JsonSchemaInferrerExamplesTest.java
@@ -152,7 +152,7 @@ private static Collection<JsonSchemaInferrer> getTestInferrers() {
                     final Set<? extends JsonNode> primitives = input.getSamples().stream()
                         .filter(JsonNode::isValueNode)
                         .collect(ImmutableSet.toImmutableSet());
-                    if (primitives.size() <= 3 && primitives.size() > 0) {
+                    if (primitives.size() <= 3 && !primitives.isEmpty()) {
                       return Collections.singleton(primitives);
                     }
                     return Collections.emptySet();

diff --git a/src/test/java/com/saasquatch/jsonschemainferrer/TestJunkDrawer.java b/src/test/java/com/saasquatch/jsonschemainferrer/TestJunkDrawer.java
@@ -37,6 +37,7 @@ public static JsonNode loadJson(String resourceName) {
     } catch (IOException e) {
       System.out.printf(Locale.ROOT, "Exception encountered loading JSON from resource[%s]. "
           + "Error message: [%s].%n", resourceName, e.getMessage());
+      //noinspection CallToPrintStackTrace
       e.printStackTrace();
       throw new UncheckedIOException(e);
     }

diff --git a/src/test/java/com/saasquatch/jsonschemainferrer/examples/Example2.java b/src/test/java/com/saasquatch/jsonschemainferrer/examples/Example2.java
@@ -47,7 +47,7 @@ public class Example2 {
             final Set<? extends JsonNode> primitives = input.getSamples().stream()
                 .filter(JsonNode::isValueNode)
                 .collect(Collectors.toSet());
-            if (primitives.size() <= 100 && primitives.size() > 0) {
+            if (primitives.size() <= 100 && !primitives.isEmpty()) {
               return Collections.singleton(primitives);
             }
             return Collections.emptySet();