Fix imports order and a couple of unnecessary statements

Author: Lionel Montrieux

core/src/main/java/org/everit/json/schema/ArraySchema.java

@@ -1,7 +1,7 @@
 package org.everit.json.schema;
 
-import org.everit.json.schema.internal.JSONPrinter;
-import org.json.JSONArray;
+import static java.lang.String.format;
+import static java.util.Objects.requireNonNull;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -12,8 +12,8 @@
 import java.util.function.IntFunction;
 import java.util.stream.IntStream;
 
-import static java.lang.String.format;
-import static java.util.Objects.requireNonNull;
+import org.everit.json.schema.internal.JSONPrinter;
+import org.json.JSONArray;
 
 /**
  * Array schema validator.

core/src/main/java/org/everit/json/schema/CombinedSchema.java

@@ -1,14 +1,14 @@
 package org.everit.json.schema;
 
-import org.everit.json.schema.internal.JSONPrinter;
+import static java.lang.String.format;
+import static java.util.Objects.requireNonNull;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
 
-import static java.lang.String.format;
-import static java.util.Objects.requireNonNull;
+import org.everit.json.schema.internal.JSONPrinter;
 
 /**
  * Validator for {@code allOf}, {@code oneOf}, {@code anyOf} schemas.

core/src/main/java/org/everit/json/schema/EnumSchema.java

@@ -1,16 +1,16 @@
 package org.everit.json.schema;
 
-import org.everit.json.schema.internal.JSONPrinter;
-import org.json.JSONArray;
-import org.json.JSONObject;
+import static java.lang.String.format;
+import static java.util.stream.Collectors.toSet;
 
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 
-import static java.lang.String.format;
-import static java.util.stream.Collectors.toSet;
+import org.everit.json.schema.internal.JSONPrinter;
+import org.json.JSONArray;
+import org.json.JSONObject;
 
 /**
  * Enum schema validator.

core/src/main/java/org/everit/json/schema/ObjectSchema.java

@@ -3,16 +3,8 @@
 import org.everit.json.schema.internal.JSONPrinter;
 import org.json.JSONObject;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
 import java.util.regex.Pattern;
 
 import static java.lang.String.format;
@@ -283,7 +275,6 @@ private void testAdditionalProperties(final JSONObject subject, List<ValidationE
                 validationExceptions.add(new ValidationException(this,
                         format("extraneous key [%s] is not permitted", additionalProperty), "additionalProperties"));
             }
-            return;
         } else if (schemaOfAdditionalProperties != null) {
             List<String> additionalPropNames = getAdditionalProperties(subject);
             for (String propName : additionalPropNames) {
@@ -390,9 +381,7 @@ public void validate(final Object subject) {
             testSchemaDependencies(objSubject, validationExceptions);
             testPatternProperties(objSubject, validationExceptions);
             testPropertyNames(objSubject, validationExceptions);
-            if (null != validationExceptions) {
-                ValidationException.throwFor(this, validationExceptions);
-            }
+            ValidationException.throwFor(this, validationExceptions);
         }
     }
 

core/src/main/java/org/everit/json/schema/ValidationException.java

@@ -1,14 +1,14 @@
 package org.everit.json.schema;
 
-import org.json.JSONArray;
-import org.json.JSONObject;
+import static java.util.Objects.requireNonNull;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static java.util.Objects.requireNonNull;
+import org.json.JSONArray;
+import org.json.JSONObject;
 
 /**
  * Thrown by {@link Schema} subclasses on validation failure.

core/src/main/java/org/everit/json/schema/internal/DateTimeFormatValidator.java

@@ -1,15 +1,16 @@
 package org.everit.json.schema.internal;
 
-import com.google.common.collect.ImmutableList;
-import org.everit.json.schema.FormatValidator;
-
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
 import java.time.format.DateTimeParseException;
 import java.time.temporal.ChronoField;
 import java.util.List;
 import java.util.Optional;
 
+import org.everit.json.schema.FormatValidator;
+
+import com.google.common.collect.ImmutableList;
+
 /**
  * Implementation of the "date-time" format value.
  */

core/src/test/java/org/everit/json/schema/EnumSchemaTest.java

@@ -15,13 +15,8 @@
  */
 package org.everit.json.schema;
 
-import nl.jqno.equalsverifier.EqualsVerifier;
-import nl.jqno.equalsverifier.Warning;
-import org.everit.json.schema.internal.JSONPrinter;
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.junit.Before;
-import org.junit.Test;
+import static java.util.Arrays.asList;
+import static org.junit.Assert.assertEquals;
 
 import java.io.StringWriter;
 import java.util.HashMap;
@@ -32,8 +27,14 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import static java.util.Arrays.asList;
-import static org.junit.Assert.assertEquals;
+import org.everit.json.schema.internal.JSONPrinter;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.junit.Before;
+import org.junit.Test;
+
+import nl.jqno.equalsverifier.EqualsVerifier;
+import nl.jqno.equalsverifier.Warning;
 
 public class EnumSchemaTest {
 

core/src/test/java/org/everit/json/schema/TestSupport.java

@@ -15,16 +15,16 @@
  */
 package org.everit.json.schema;
 
-import org.everit.json.schema.loader.SchemaLoader;
-import org.junit.Assert;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.util.List;
 
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import org.everit.json.schema.loader.SchemaLoader;
+import org.junit.Assert;
 
 public class TestSupport {