Merge pull request #1780 from joelittlejohn/remove-readtree-url

Remove use of deprecated ObjectMapper::readTree(URL)

Author: joelittlejohn

jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/ContentResolver.java

@@ -73,8 +73,8 @@ public JsonNode resolve(URI uri) {
             return resolveFromClasspath(uri);
         }
 
-        try {
-            return objectMapper.readTree(uri.toURL());
+        try (InputStream in = uri.toURL().openStream()){
+            return objectMapper.readTree(in);
         } catch (JsonProcessingException e) {
             throw new IllegalArgumentException("Error parsing document: " + uri, e);
         } catch (IOException e) {

jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/SchemaGenerator.java

@@ -17,6 +17,7 @@
 package org.jsonschema2pojo;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
 import java.util.Iterator;
 
@@ -46,8 +47,8 @@ public SchemaGenerator(JsonFactory jsonFactory) {
 
     public ObjectNode schemaFromExample(URL example) {
 
-        try {
-            JsonNode content = this.objectMapper.readTree(example);
+        try (InputStream in = example.openStream()) {
+            JsonNode content = this.objectMapper.readTree(in);
             return schemaFromExample(content);
         } catch (IOException e) {
             throw new GenerationException("Could not process JSON in source file", e);

jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/DynamicPropertiesRule.java

@@ -36,7 +36,6 @@
 import com.sun.codemodel.JType;
 import com.sun.codemodel.JTypeVar;
 import com.sun.codemodel.JVar;
-import java.util.Iterator;
 import java.util.Map;
 
 /**
@@ -169,8 +168,7 @@ private JMethod addInternalGetMethodJava6(JDefinedClass jclass, JsonNode propert
         JConditional propertyConditional = null;
 
         if (propertiesNode != null) {
-            for (Iterator<Map.Entry<String, JsonNode>> properties = propertiesNode.fields(); properties.hasNext();) {
-                Map.Entry<String, JsonNode> property = properties.next();
+            for (Map.Entry<String, JsonNode> property : propertiesNode.properties()) {
                 String propertyName = property.getKey();
                 JsonNode node = property.getValue();
                 String fieldName = ruleFactory.getNameHelper().getPropertyName(propertyName, node);
@@ -269,8 +267,7 @@ private JMethod addInternalSetMethodJava6(JDefinedClass jclass, JsonNode propert
         JBlock body = method.body();
         JConditional propertyConditional = null;
         if (propertiesNode != null) {
-            for (Iterator<Map.Entry<String, JsonNode>> properties = propertiesNode.fields(); properties.hasNext();) {
-                Map.Entry<String, JsonNode> property = properties.next();
+            for (Map.Entry<String, JsonNode> property : propertiesNode.properties()) {
                 String propertyName = property.getKey();
                 JsonNode node = property.getValue();
                 String fieldName = ruleFactory.getNameHelper().getPropertyName(propertyName, node);

jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/PropertyRule.java

@@ -216,14 +216,6 @@ private JsonNode resolveRefs(JsonNode node, Schema parent) {
         }
     }
 
-    private boolean isObject(JsonNode node) {
-        return node.path("type").asText().equals("object");
-    }
-
-    private boolean isArray(JsonNode node) {
-        return node.path("type").asText().equals("array");
-    }
-
     private JType getReturnType(final JDefinedClass c, final JFieldVar field, final boolean required, final boolean usesOptional) {
         JType returnType = field.type();
         if (ruleFactory.getGenerationConfig().isUseOptionalForGetters() || usesOptional) {

jsonschema2pojo-integration-tests/src/test/java/org/jsonschema2pojo/integration/MediaIT.java

@@ -293,6 +293,7 @@ private static boolean isQuotedPrintable( JsonNode mediaNode ) {
     public static class QuotedPrintableSerializer
     extends StdSerializer<byte[]>
     {
+        private static final long serialVersionUID = 1L;
         private static final QuotedPrintableCodec codec = new QuotedPrintableCodec();
 
         public QuotedPrintableSerializer() {
@@ -309,6 +310,7 @@ public void serialize(byte[] value, JsonGenerator jgen, SerializerProvider provi
     public static class QuotedPrintableDeserializer
     extends StdDeserializer<byte[]>
     {
+        private static final long serialVersionUID = 1L;
         private static final QuotedPrintableCodec codec = new QuotedPrintableCodec();
 
         public QuotedPrintableDeserializer() {

jsonschema2pojo-integration-tests/src/test/java/org/jsonschema2pojo/integration/config/FormatTypeMappingIT.java

@@ -72,7 +72,7 @@ public void canOverrideNonStandardTypes() throws Exception {
         ClassLoader resultsClassLoader = schemaRule.generateAndCompile("/schema/format/nonStandard.json", "com.example",
                 config("formatTypeMapping", mapping("non-standard", URL.class)));
 
-        Class generatedType = resultsClassLoader.loadClass("com.example.NonStandard");
+        Class<?> generatedType = resultsClassLoader.loadClass("com.example.NonStandard");
 
         Method getter = generatedType.getMethod("getStringAsNonStandard");
         assertThat(getter.getReturnType(), typeCompatibleWith(URL.class));
@@ -83,7 +83,7 @@ public void canOverrideArrayTypes() throws Exception {
         ClassLoader resultsClassLoader = schemaRule.generateAndCompile("/schema/format/arrayFormat.json", "com.example",
                 config("formatTypeMapping", mapping("base64", byte[].class)));
 
-        Class generatedType = resultsClassLoader.loadClass("com.example.ArrayFormat");
+        Class<?> generatedType = resultsClassLoader.loadClass("com.example.ArrayFormat");
 
         Method getter = generatedType.getMethod("getArrayFormat");
         assertThat(getter.getReturnType(), typeCompatibleWith(byte[].class));