incorporate changes from other PR

loop using Iterable interface of JsonNode instead of using explicit iterator check for textual members inside "required" array.
joelittlejohn · Jul 26, 2016 · 611142a · 611142a
1 parent b125085
commit 611142a
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/ObjectRule.java b/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/ObjectRule.java
@@ -24,10 +24,12 @@
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import javax.annotation.Generated;
 
@@ -182,13 +184,17 @@ private LinkedHashSet<String> getConstructorProperties(JsonNode node, Schema sch
         }
 
         LinkedHashSet<String> rtn = new LinkedHashSet<String>();
-        LinkedHashSet<String> draft4RequiredProperties = new LinkedHashSet<String>();
+        Set<String> draft4RequiredProperties = new HashSet<String>();
 
         // setup the set of required properties for draft4 style "required"
-        if (onlyRequired && node.has("required") && node.get("required").isArray()) {
-            for (Iterator<JsonNode> ri = node.get("required").elements(); ri.hasNext();) {
-                JsonNode required = ri.next();
-                draft4RequiredProperties.add(required.asText());
+        if (onlyRequired && node.has("required")) {
+            JsonNode requiredArray =  node.get("required");
+            if (requiredArray.isArray()) {
+                for (JsonNode requiredEntry: requiredArray) {
+                    if (requiredEntry.isTextual()) {
+                        draft4RequiredProperties.add(requiredEntry.asText());
+                    }
+                }
             }
         }
 
@@ -208,7 +214,7 @@ private LinkedHashSet<String> getConstructorProperties(JsonNode node, Schema sch
                     rtn.add(nameHelper.getPropertyName(property.getKey(), property.getValue()));
                 }
             } else {
-                rtn.add((nameHelper.getPropertyName(property.getKey(), property.getValue())));
+                rtn.add(nameHelper.getPropertyName(property.getKey(), property.getValue()));
             }
         }
         return rtn;