Merge pull request #38 from basinilya/basin

Don't leave out 50% of your audience who still use older java

Author: stevehu

pom.xml

@@ -63,7 +63,8 @@
     </distributionManagement>
 
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>1.6</java.version>
+        <java.testversion>1.7</java.testversion>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <version.jackson>2.8.7</version.jackson>
         <version.slf4j>1.7.25</version.slf4j>
@@ -206,6 +207,19 @@
                     <source>${java.version}</source>
                     <target>${java.version}</target>
                 </configuration>
+                <executions>
+                    <execution>
+                        <id>test-compile</id>
+                        <phase>process-test-sources</phase>
+                        <goals>
+                            <goal>testCompile</goal>
+                        </goals>
+                        <configuration>
+                            <source>${java.testversion}</source>
+                            <target>${java.testversion}</target>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
 
             <plugin>

src/main/java/com/networknt/schema/OneOfValidator.java

@@ -18,14 +18,15 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 public class OneOfValidator extends BaseJsonValidator implements JsonValidator {
     private static final Logger logger = LoggerFactory.getLogger(RequiredValidator.class);
@@ -46,13 +47,13 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
         debug(logger, node, rootNode, at);
 
         int numberOfValidSchema = 0;
-        Set<ValidationMessage> errors = new HashSet<>();
+        Set<ValidationMessage> errors = new HashSet<ValidationMessage>();
 
         for (JsonSchema schema : schemas) {
         	Set<ValidationMessage> schemaErrors = schema.validate(node, rootNode, at);
             if (schemaErrors.isEmpty()) {
                 numberOfValidSchema++;
-                errors = new HashSet<>();
+                errors = new HashSet<ValidationMessage>();
             }
             if(numberOfValidSchema == 0){
         		errors.addAll(schemaErrors);
@@ -63,13 +64,17 @@ public Set<ValidationMessage> validate(JsonNode node, JsonNode rootNode, String
         }
 
         if (numberOfValidSchema == 0) {
-        	errors = errors.stream()
-        		.filter(msg -> !ValidatorTypeCode.ADDITIONAL_PROPERTIES
-        							.equals(ValidatorTypeCode.fromValue(msg.getType())))
-        		.collect(Collectors.toSet());
+            for (Iterator<ValidationMessage> it = errors.iterator(); it.hasNext();) {
+                ValidationMessage msg = it.next();
+                
+                if (ValidatorTypeCode.ADDITIONAL_PROPERTIES.equals(ValidatorTypeCode.fromValue(msg
+                        .getType()))) {
+                    it.remove();
+                }
+            }
         }
         if (numberOfValidSchema > 1) {
-        	errors = new HashSet<>();
+        	errors = new HashSet<ValidationMessage>();
         	errors.add(buildValidationMessage(at, ""));
         }