Merge pull request #12 from saasquatch/dev

Dev

Author: slisaasquatch

README.md

@@ -176,14 +176,14 @@ Maven
 <dependency>
   <groupId>com.github.saasquatch</groupId>
   <artifactId>json-schema-inferrer</artifactId>
-  <version>0.1.3</version>
+  <version>0.1.4</version>
 </dependency>
 ```
 
 Gradle
 
 ```gradle
-compile 'com.github.saasquatch:json-schema-inferrer:0.1.3'
+implementation 'com.github.saasquatch:json-schema-inferrer:0.1.4'
 ```
 
 ### Transitive Dependencies

pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>com.saasquatch</groupId>
   <artifactId>json-schema-inferrer</artifactId>
-  <version>0.1.3</version>
+  <version>0.1.4</version>
   <packaging>jar</packaging>
 
   <name>json-schema-inferrer</name>
@@ -20,7 +20,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <junit.version>5.6.2</junit.version>
+    <junit.version>5.7.2</junit.version>
   </properties>
 
   <repositories>
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.11.2</version>
+      <version>2.12.3</version>
     </dependency>
     <dependency>
       <groupId>commons-validator</groupId>
@@ -86,13 +86,13 @@
     <dependency>
       <groupId>org.apache.httpcomponents.client5</groupId>
       <artifactId>httpclient5</artifactId>
-      <version>5.0.1</version>
+      <version>5.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>29.0-jre</version>
+      <version>30.1.1-jre</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -124,7 +124,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.2.0</version>
+        <version>3.3.0</version>
         <configuration>
           <doclint>none</doclint>
           <source>8</source>
@@ -165,12 +165,4 @@
     </plugins>
   </build>
 
-  <distributionManagement>
-    <repository>
-      <id>bintray-saasquatch-java-libs</id>
-      <name>saasquatch-java-libs</name>
-      <url>https://api.bintray.com/maven/saasquatch/java-libs/json-schema-inferrer/;publish=1</url>
-    </repository>
-  </distributionManagement>
-
 </project>

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

@@ -41,6 +41,7 @@ public static ExamplesPolicy useFirstSamples(@Nonnegative int limit) {
   public static ExamplesPolicy useFirstSamples(@Nonnegative int limit,
       @Nonnull Predicate<String> typePredicate) {
     Objects.requireNonNull(typePredicate);
+    //noinspection ConstantConditions
     if (limit < 0) {
       throw new IllegalArgumentException("Invalid limit");
     }

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

@@ -244,7 +244,7 @@ private Set<ObjectNode> processPrimitives(@Nonnull Collection<ValueNode> valueNo
       final String format = anyOf.path(Consts.Fields.FORMAT).textValue();
       @Nonnull
       final PrimitivesSummary primitivesSummary =
-          primitivesSummaryMap.getPrimitivesSummary(type, format);
+          Objects.requireNonNull(primitivesSummaryMap.getPrimitivesSummary(type, format));
       processGenericSchemaFeature(anyOf, primitivesSummary.getSamples(), type);
     }
     return anyOfs;

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

@@ -60,7 +60,7 @@ public JsonSchemaInferrerBuilder setIntegerTypePreference(
   }
 
   /**
-   * Set the {@link IntegerTypeCriterionL}. The default is
+   * Set the {@link IntegerTypeCriterion}. The default is
    * {@link IntegerTypeCriteria#nonFloatingPoint()}.
    *
    * @see IntegerTypeCriterion

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

@@ -6,8 +6,8 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
@@ -71,7 +71,7 @@ static <K, V> Map.Entry<K, V> entryOf(K k, V v) {
    */
   @SafeVarargs
   static <E> Set<E> unmodifiableSetOf(E... elements) {
-    return Collections.unmodifiableSet(new HashSet<>(Arrays.asList(elements)));
+    return Collections.unmodifiableSet(new LinkedHashSet<>(Arrays.asList(elements)));
   }
 
   static <E extends Enum<E>, R> R unrecognizedEnumError(E enumVal) {
@@ -162,7 +162,7 @@ static Set<String> getAllFieldNames(@Nonnull Iterable<? extends JsonNode> object
     return stream(objectNodes)
         .flatMap(j -> stream(j.fieldNames()))
         .filter(Objects::nonNull)
-        .collect(Collectors.toSet());
+        .collect(Collectors.toCollection(LinkedHashSet::new));
   }
 
   /**
@@ -176,9 +176,7 @@ static Stream<JsonNode> getAllValuesForFieldName(
   }
 
   /**
-   *
    * @param samples Assumed to be {@link ObjectNode}s
-   * @param requireNonNull
    * @return The field names common to the given samples
    */
   @Nonnull
@@ -191,9 +189,9 @@ static Set<String> getCommonFieldNames(@Nonnull Iterable<? extends JsonNode> sam
           .filter(requireNonNull
               ? fieldName -> nonNull(sample.get(fieldName))
               : fieldName -> true)
-          .collect(Collectors.toSet());
+          .collect(Collectors.toCollection(LinkedHashSet::new));
       if (commonFieldNames == null) {
-        commonFieldNames = new HashSet<>(fieldNames);
+        commonFieldNames = new LinkedHashSet<>(fieldNames);
       } else {
         commonFieldNames.retainAll(fieldNames);
       }
@@ -205,7 +203,7 @@ static Set<String> getCommonFieldNames(@Nonnull Iterable<? extends JsonNode> sam
   /**
    * Get the length of the Base64 String for the given number of bytes
    */
-  static int getBase64Length(@Nonnull int bytesLength) {
+  static int getBase64Length(int bytesLength) {
     return (bytesLength + 2) / 3 * 4;
   }
 

src/test/java/com/saasquatch/jsonschemainferrer/JsonSchemaInferrerExamplesTest.java

@@ -4,6 +4,7 @@
 import static com.saasquatch.jsonschemainferrer.TestJunkDrawer.mapper;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.fail;
+
 import java.io.IOException;
 import java.time.DayOfWeek;
 import java.time.Month;
@@ -299,8 +300,10 @@ public String generateComment(TitleDescriptionGeneratorInput input) {
   @Nullable
   private static JsonNode loadJsonFromUrl(String jsonUrl) throws IOException {
     final HttpGet request = new HttpGet(jsonUrl);
-    request.setConfig(RequestConfig.custom().setConnectTimeout(1, TimeUnit.SECONDS)
-        .setConnectionRequestTimeout(1, TimeUnit.SECONDS).setResponseTimeout(5, TimeUnit.SECONDS)
+    request.setConfig(RequestConfig.custom()
+        .setConnectTimeout(1, TimeUnit.SECONDS)
+        .setConnectionRequestTimeout(1, TimeUnit.SECONDS)
+        .setResponseTimeout(5, TimeUnit.SECONDS)
         .build());
     return httpClient.execute(request, new AbstractHttpClientResponseHandler<JsonNode>() {
       @Override

src/test/java/com/saasquatch/jsonschemainferrer/JsonSchemaInferrerOptionsTest.java

@@ -34,6 +34,7 @@
 
 public class JsonSchemaInferrerOptionsTest {
 
+  @SuppressWarnings("ConstantConditions")
   @Test
   public void testNoOp() {
     assertNull(RequiredPolicies.noOp().getRequired(null));

src/test/java/com/saasquatch/jsonschemainferrer/JsonSchemaInferrerTest.java

@@ -49,7 +49,7 @@ public void testBasic() {
   }
 
   @Test
-  public void testSimpleExample() throws Exception {
+  public void testSimpleExample() {
     final JsonNode simple = loadJson("simple.json");
     {
       final ObjectNode schema = JsonSchemaInferrer.newBuilder().build().inferForSample(simple);
@@ -91,7 +91,7 @@ public void testSimpleExample() throws Exception {
   }
 
   @Test
-  public void testAdvancedExample() throws Exception {
+  public void testAdvancedExample() {
     final JsonNode advanced = loadJson("advanced.json");
     {
       final ObjectNode schema = JsonSchemaInferrer.newBuilder().build().inferForSample(advanced);