Rebase with original

CHANGELOG.md

@@ -1,8 +1,17 @@
 # Changelog
 
+## 1.0.1
+* Check schema required array before is required flag ([#964](https://github.com/joelittlejohn/jsonschema2pojo/pull/964))
+* Features/builders as inner classes ([#953](https://github.com/joelittlejohn/jsonschema2pojo/pull/953))
+
+## 1.0.0
+* Don't register output directory as a set of files, since this breaks Gradle 5.0+ ([#940](https://github.com/joelittlejohn/jsonschema2pojo/pull/940))
+* **Builder method should be named consistently with getter/setter ([#905](https://github.com/joelittlejohn/jsonschema2pojo/issues/905))**
+* Objects inside array with name ending with "List" are generated as "SomeNameList" ([#780](https://github.com/joelittlejohn/jsonschema2pojo/issues/780))
+
 ## 1.0.0-beta1
 * Add 'formatTypeMapping' config option to allow overriding types used for formats ([#923](https://github.com/joelittlejohn/jsonschema2pojo/pull/923))
-* **Enable development of context-aware rules. ([#917](https://github.com/joelittlejohn/jsonschema2pojo/pull/917))**
+* **Modify Rule#apply signature to include parent node (allows context-aware rules) ([#917](https://github.com/joelittlejohn/jsonschema2pojo/pull/917))**
 * Add 'javaOptional' extension rule to allow individual fields to use Java Optional on getter ([#913](https://github.com/joelittlejohn/jsonschema2pojo/pull/913))
 * Allow schema title to be used as class name (new useTitleAsClassname config option) ([#908](https://github.com/joelittlejohn/jsonschema2pojo/issues/908))
 * Incorrect @Nullable JSR305 annotations generated when using 'required' array ([#906](https://github.com/joelittlejohn/jsonschema2pojo/issues/906))

CONTRIBUTORS.md

@@ -94,3 +94,6 @@
 * Klevis Ramo
 * Martin Bramwell
 * Jan Oopkaup
+* Michał Szymborski
+* Duane Zamrok
+* Gleb Averchuk

README.md

@@ -1,10 +1,9 @@
 # jsonschema2pojo [![Build Status](https://travis-ci.org/joelittlejohn/jsonschema2pojo.svg?branch=master)](https://travis-ci.org/joelittlejohn/jsonschema2pojo) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.jsonschema2pojo/jsonschema2pojo/badge.svg)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.jsonschema2pojo%22)
 
-Current stable: **0.5.1**<br>
-Current unstable: **1.0.0-beta1**<br>
-
 _jsonschema2pojo_ generates Java types from JSON Schema (or example JSON) and can annotate those types for data-binding with Jackson 1.x, Jackson 2.x or Gson.
 
+**_*Note:*_ there are breaking changes between 0.5.1 and 1.0.0. Check the [change log](https://github.com/joelittlejohn/jsonschema2pojo/blob/master/CHANGELOG.md). Anything marked in bold in the 1.0.0 alpha, beta and final release is a breaking change.**
+
 ### [Try jsonschema2pojo online](http://jsonschema2pojo.org/)<br>or `brew install jsonschema2pojo`
 
 You can use jsonschema2pojo as a Maven plugin, an Ant task, a command line utility, a Gradle plugin or embedded within your own Java app. The [Getting Started](https://github.com/joelittlejohn/jsonschema2pojo/wiki/Getting-Started) guide will show you how.
@@ -14,7 +13,7 @@ A very simple Maven example:
 <plugin>
     <groupId>org.jsonschema2pojo</groupId>
     <artifactId>jsonschema2pojo-maven-plugin</artifactId>
-    <version>0.5.1</version>
+    <version>1.0.1</version>
     <configuration>
         <sourceDirectory>${basedir}/src/main/resources/schema</sourceDirectory>
         <targetPackage>com.example.types</targetPackage>
@@ -33,9 +32,9 @@ Useful pages:
   * **[Getting started](https://github.com/joelittlejohn/jsonschema2pojo/wiki/Getting-Started)**
   * **[How to contribute](https://github.com/joelittlejohn/jsonschema2pojo/blob/master/CONTRIBUTING.md)**
   * [Reference](https://github.com/joelittlejohn/jsonschema2pojo/wiki/Reference)
-  * [Latest Javadocs](https://joelittlejohn.github.io/jsonschema2pojo/javadocs/0.5.1/)
-  * [Documentation for the Maven plugin](https://joelittlejohn.github.io/jsonschema2pojo/site/0.5.1/generate-mojo.html)
-  * [Documentation for the Ant task](https://joelittlejohn.github.io/jsonschema2pojo/site/0.5.1/Jsonschema2PojoTask.html)
+  * [Latest Javadocs](https://joelittlejohn.github.io/jsonschema2pojo/javadocs/1.0.1/)
+  * [Documentation for the Maven plugin](https://joelittlejohn.github.io/jsonschema2pojo/site/1.0.1/generate-mojo.html)
+  * [Documentation for the Ant task](https://joelittlejohn.github.io/jsonschema2pojo/site/1.0.1/Jsonschema2PojoTask.html)
 
 Project resources:
   * [Downloads](https://github.com/joelittlejohn/jsonschema2pojo/releases)

jsonschema2pojo-ant/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jsonschema2pojo</artifactId>
         <groupId>org.jsonschema2pojo</groupId>
-        <version>1.0.0-beta2-SNAPSHOT</version>
+        <version>1.0.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>jsonschema2pojo-ant</artifactId>

jsonschema2pojo-ant/src/main/java/org/jsonschema2pojo/ant/Jsonschema2PojoTask.java

@@ -69,6 +69,10 @@ public class Jsonschema2PojoTask extends Task implements GenerationConfig {
 
     private boolean generateBuilders;
 
+    private boolean includeTypeInfo = false;
+
+    private boolean useInnerClassBuilders = false;
+
     private boolean includeConstructors = false;
 
     private boolean usePrimitives;
@@ -300,6 +304,22 @@ public void setGenerateBuilders(boolean generateBuilders) {
         this.generateBuilders = generateBuilders;
     }
 
+    /**
+     * Sets the 'includeTypeInfo' property of this class.
+     *
+     * @param includeTypeInfo
+     *            Whether to use include json type info information to class. Often required to support polymorphic type deserialization.
+     *            <p>
+     *            By default the type information is stored in the @class property, this can be overridden in the deserializationClassProperty of the schema.
+     *            <p>
+     *            Default: <code>false</code>.
+     *
+     * @see <a href="Jackson Polymorphic Deserialization">https://github.com/FasterXML/jackson-docs/wiki/JacksonPolymorphicDeserialization</a>
+     */
+    public void setIncludeTypeInfo(boolean includeTypeInfo) {
+        this.includeTypeInfo = includeTypeInfo;
+    }
+
     /**
      * Sets the 'usePrimitives' property of this class.
      *
@@ -890,6 +910,12 @@ public boolean isGenerateBuilders() {
         return generateBuilders;
     }
 
+    @Override
+    public boolean isIncludeTypeInfo()
+    {
+        return includeTypeInfo;
+    }
+
     @Override
     public boolean isUsePrimitives() {
         return usePrimitives;
@@ -1201,5 +1227,18 @@ public Language getTargetLanguage() {
     public Map<String, String> getFormatTypeMapping() {
         return formatTypeMapping;
     }
-
+
+    @Override
+    public boolean isUseInnerClassBuilders() {
+        return useInnerClassBuilders;
+    }
+
+    /**
+     * Sets the 'useInnerClassBuilders' property of this class
+     *
+     * @param useInnerClassBuilders determines whether builders will be chainable setters or embedded classes when {@link #isGenerateBuilders()} used
+     */
+    public void setUseInnerClassBuilders(boolean useInnerClassBuilders) {
+        this.useInnerClassBuilders = useInnerClassBuilders;
+    }
 }

jsonschema2pojo-ant/src/site/Jsonschema2PojoTask.html

@@ -156,6 +156,19 @@ <h3>Parameters</h3>
         </td>
         <td align="center" valign="top">No (default <code>false</code>)</td>
     </tr>
+    <tr>
+        <td valign="top">includeTypeInfo</td>
+        <td valign="top">
+            <p>Whether to include json type information; often required to support polymorphic type handling.</p>
+            <p>By default the type information is stored in the @class property, this can be overridden in the deserializationClassProperty of the schema.</p>
+        </td>
+        <td align="center" valign="top">No (default <code>false</code>)</td>
+    </tr>
+    <tr>
+        <td valign="top">useInnerClassBuilders</td>
+        <td valign="top">Determines whether builders will be chainable setters or embedded classes when generateBuilders is used.</td>
+        <td align="center" valign="top">No (default <code>false</code>)</td>
+    </tr>
     <tr>
         <td valign="top">includeGetters</td>
         <td valign="top">Whether to include getters or to omit these accessor methods and create public fields instead.</td>

jsonschema2pojo-cli/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jsonschema2pojo</artifactId>
         <groupId>org.jsonschema2pojo</groupId>
-        <version>1.0.0-beta2-SNAPSHOT</version>
+        <version>1.0.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>jsonschema2pojo-cli</artifactId>

jsonschema2pojo-cli/src/main/java/org/jsonschema2pojo/cli/Arguments.java

@@ -63,6 +63,12 @@ public class Arguments implements GenerationConfig {
     @Parameter(names = { "-b", "--generate-builders" }, description = "Generate builder-style methods as well as setters")
     private boolean generateBuilderMethods = false;
 
+    @Parameter(names = { "--include-type-info" }, description = "Include json type info; required to support polymorphic type handling. https://github.com/FasterXML/jackson-docs/wiki/JacksonPolymorphicDeserialization")
+    private boolean includeTypeInfo = false;
+
+    @Parameter(names = { "--use-inner-class-builders" }, description = "Generate an inner class with builder-style methods")
+    private boolean useInnerClassBuilders = false;
+
     @Parameter(names = { "-c", "--generate-constructors" }, description = "Generate constructors")
     private boolean generateConstructors = false;
 
@@ -278,6 +284,17 @@ public boolean isGenerateBuilders() {
         return generateBuilderMethods;
     }
 
+    @Override
+    public boolean isIncludeTypeInfo()
+    {
+        return includeTypeInfo;
+    }
+
+    @Override
+    public boolean isUseInnerClassBuilders() {
+        return useInnerClassBuilders;
+    }
+
     @Override
     public boolean isUsePrimitives() {
         return usePrimitives;

jsonschema2pojo-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jsonschema2pojo</artifactId>
         <groupId>org.jsonschema2pojo</groupId>
-        <version>1.0.0-beta2-SNAPSHOT</version>
+        <version>1.0.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>jsonschema2pojo-core</artifactId>

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

@@ -41,6 +41,11 @@ public AbstractAnnotator(GenerationConfig generationConfig) {
         this.generationConfig = generationConfig;
     }
 
+    @Override
+    public void typeInfo(JDefinedClass clazz, JsonNode schema) {
+
+    }
+
     @Override
     public void propertyOrder(JDefinedClass clazz, JsonNode propertiesNode) {
     }
@@ -91,6 +96,11 @@ public boolean isAdditionalPropertiesSupported() {
     public void additionalPropertiesField(JFieldVar field, JDefinedClass clazz, String propertyName) {
     }
 
+    @Override
+    public boolean isPolymorphicDeserializationSupported(JsonNode node) {
+        return false;
+    }
+
     public GenerationConfig getGenerationConfig() {
         return generationConfig;
     }

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

@@ -0,0 +1,53 @@
+/**
+ * Copyright © 2010-2017 Nokia
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jsonschema2pojo;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.sun.codemodel.JDefinedClass;
+
+public abstract class AbstractTypeInfoAwareAnnotator extends AbstractAnnotator
+{
+	public AbstractTypeInfoAwareAnnotator(GenerationConfig generationConfig) {
+		super(generationConfig);
+	}
+
+	@Override
+	public void typeInfo(JDefinedClass clazz, JsonNode node) {
+		if(getGenerationConfig().isIncludeTypeInfo()) {
+			// Have per-schema JavaTypeInfo configuration override what is defined in generation config; backward comparability
+			if (node.has("deserializationClassProperty")) {
+				String annotationName = node.get("deserializationClassProperty").asText();
+				addJsonTypeInfoAnnotation(clazz, annotationName);
+			} else {
+				addJsonTypeInfoAnnotation(clazz, "@class");
+			}
+		} else {
+			// per-schema JsonTypeInfo configuration
+			if (node.has("deserializationClassProperty")) {
+				String annotationName = node.get("deserializationClassProperty").asText();
+				addJsonTypeInfoAnnotation(clazz, annotationName);
+			}
+		}
+	}
+
+	@Override
+	public boolean isPolymorphicDeserializationSupported(JsonNode node) {
+		return getGenerationConfig().isIncludeTypeInfo() || node.has("deserializationClassProperty");
+	}
+
+	abstract protected void addJsonTypeInfoAnnotation(JDefinedClass clazz, String propertyName);
+}

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

@@ -32,6 +32,20 @@
  */
 public interface Annotator {
 
+    /**
+     * Add the necessary annotation to dictate correct type information during
+     * serialization and deserialization; often required with polymorphic types.
+     *
+     * @see <a
+      *      href="https://github.com/FasterXML/jackson-docs/wiki/JacksonPolymorphicDeserialization">Jackson Docs - Polymorphic Type Handling</a>
+     *
+     * @param clazz
+     *            a generated pojo class, that is serialized to JSON
+     * @param schema
+     *            the object schema associated with this clazz
+     */
+    void typeInfo(JDefinedClass clazz, JsonNode schema);
+
     /**
      * Add the necessary annotation to dictate correct property order during
      * serialization
@@ -195,4 +209,6 @@ public interface Annotator {
     void timeField(JFieldVar field, JDefinedClass clazz, JsonNode propertyNode);
 
     void additionalPropertiesField(JFieldVar field, JDefinedClass clazz, String propertyName);
+
+	boolean isPolymorphicDeserializationSupported(JsonNode node);
 }

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

@@ -43,6 +43,13 @@ public CompositeAnnotator(Annotator... annotators) {
         this.annotators = annotators;
     }
 
+    @Override
+    public void typeInfo(JDefinedClass clazz, JsonNode node) {
+        for (Annotator annotator : annotators) {
+            annotator.typeInfo(clazz, node);
+        }
+    }
+
     @Override
     public void propertyOrder(JDefinedClass clazz, JsonNode propertiesNode) {
         for (Annotator annotator : annotators) {
@@ -130,7 +137,17 @@ public void additionalPropertiesField(JFieldVar field, JDefinedClass clazz, Stri
         }
     }
 
-   @Override
+    @Override
+    public boolean isPolymorphicDeserializationSupported(JsonNode node) {
+        for (Annotator annotator : annotators) {
+            if (!annotator.isPolymorphicDeserializationSupported(node)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
    public void dateTimeField(JFieldVar field, JDefinedClass clazz, JsonNode propertyNode) {
       for (Annotator annotator : annotators) {
             annotator.dateTimeField(field, clazz, propertyNode);

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

@@ -38,6 +38,15 @@ public boolean isGenerateBuilders() {
         return false;
     }
 
+    /**
+     * @return <code>false</code>
+     */
+    @Override
+    public boolean isIncludeTypeInfo()
+    {
+        return false;
+    }
+
     /**
      * @return <code>false</code>
      */
@@ -444,5 +453,7 @@ public Language getTargetLanguage() {
     public Map<String, String> getFormatTypeMapping() {
         return Collections.emptyMap();
     }
-
+
+    @Override
+    public boolean isUseInnerClassBuilders() { return false; }
 }