Fix and suppress warnings

We can use diamond syntax now that we are using Java 7.

Author: seanjreilly

src/main/java/uk/co/o2/json/schema/ArraySchema.java

@@ -21,7 +21,7 @@ class ArraySchema implements JsonSchema {
 
     @Override
     public List<ErrorMessage> validate(JsonNode jsonDocument) {
-        List<ErrorMessage> results = new ArrayList<ErrorMessage>();
+        List<ErrorMessage> results = new ArrayList<>();
         if (!jsonDocument.isArray()) {
             return singleError("", "Invalid type: must be an array");
         }
@@ -41,7 +41,7 @@ public List<ErrorMessage> validate(JsonNode jsonDocument) {
     }
 
     private List<ErrorMessage> generateNestedErrorMessages(int index, List<ErrorMessage> errorMessages) {
-        List<ErrorMessage> nestedResults = new ArrayList<ErrorMessage>();
+        List<ErrorMessage> nestedResults = new ArrayList<>();
         String pathPrefix = "[" + index + "]";
         for(ErrorMessage error: errorMessages) {
             nestedResults.add(new ErrorMessage(pathPrefix, error));

src/main/java/uk/co/o2/json/schema/ObjectSchema.java

@@ -22,7 +22,7 @@ public List<ErrorMessage> validate(JsonNode jsonDocumentToValidate) {
         }
     };
 
-    private List<Property> properties = new ArrayList<Property>();
+    private List<Property> properties = new ArrayList<>();
 
     List<Property> getProperties() {
         return properties;
@@ -40,11 +40,11 @@ JsonSchema getAdditionalProperties() {
 
     @Override
     public List<ErrorMessage> validate(JsonNode jsonDocumentToValidate) {
-        List<ErrorMessage> results = new ArrayList<ErrorMessage>();
+        List<ErrorMessage> results = new ArrayList<>();
         if (!jsonDocumentToValidate.isObject()) {
             return singleError("", "Invalid type: must be an object");
         }
-        Set<String> visitedPropertyNames = new HashSet<String>();
+        Set<String> visitedPropertyNames = new HashSet<>();
 
         for (Property property : properties) {
             if (!jsonDocumentToValidate.has(property.getName())) {

src/main/java/uk/co/o2/json/schema/SchemaCompiler.java

@@ -16,7 +16,7 @@
 class SchemaCompiler {
     private final SchemaPassThroughCache cache;
     private final JsonFactory jsonFactory;
-    private final Queue<ProcessingEntry> schemasToCompile = new LinkedList<ProcessingEntry>();
+    private final Queue<ProcessingEntry> schemasToCompile = new LinkedList<>();
 
     public SchemaCompiler(SchemaPassThroughCache cache, JsonFactory jsonFactory) {
         this.cache = cache;
@@ -25,7 +25,7 @@ public SchemaCompiler(SchemaPassThroughCache cache, JsonFactory jsonFactory) {
 
     public JsonSchema parse(URL schemaLocation) {
 
-        List<ProcessedSchemaEntry> compiledSchemasToRegister = new ArrayList<ProcessedSchemaEntry>();
+        List<ProcessedSchemaEntry> compiledSchemasToRegister = new ArrayList<>();
 
         scheduleSchemaForProcessing(schemaLocation);
 
@@ -157,7 +157,7 @@ private SimpleTypeSchema parseSimpleTypeSchema(JsonNode rawSchema) {
 
         JsonNode enumeration = rawSchema.get("enumeration");
         if (enumeration != null) {
-            List<JsonNode> enumerationValues = new ArrayList<JsonNode>();
+            List<JsonNode> enumerationValues = new ArrayList<>();
             for (JsonNode node : enumeration) {
                 enumerationValues.add(node);
             }

src/main/java/uk/co/o2/json/schema/SchemaPassThroughCache.java

@@ -8,7 +8,7 @@
 
 public class SchemaPassThroughCache {
 
-    final ConcurrentMap<String, JsonSchema> registeredSchemas = new ConcurrentHashMap<String, JsonSchema>();
+    final ConcurrentMap<String, JsonSchema> registeredSchemas = new ConcurrentHashMap<>();
     private SchemaCompilerFactory schemaCompilerFactory;
 
     public SchemaPassThroughCache(JsonFactory factory) {

src/test/java/uk/co/o2/json/schema/SchemaCompilerTest.java

@@ -21,7 +21,7 @@
 public class SchemaCompilerTest {
     private static JsonFactory jsonFactory = new JsonFactory(new ObjectMapper());
 
-    private final List<File> filesToDelete = new ArrayList<File>();
+    private final List<File> filesToDelete = new ArrayList<>();
 
     private SchemaPassThroughCache registry = new SchemaPassThroughCache(jsonFactory);
     private SchemaCompiler schemaFactory = new SchemaCompiler(registry, jsonFactory);