Merge pull request #743 from yomik/fix/duplicate_ctor_742

Fix for #742 : Generating 2 constructors
joelittlejohn · Jun 13, 2017 · ae1ba5a · ae1ba5a
2 parents 9d51e8c + 9056d5a
commit ae1ba5a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 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
@@ -159,8 +159,11 @@ private void addParcelSupport(JDefinedClass jclass) {
         parcelableHelper.addDescribeContents(jclass);
         parcelableHelper.addCreator(jclass);
         parcelableHelper.addConstructorFromParcel(jclass);
-        // Add empty constructor
-        jclass.constructor(JMod.PUBLIC);
+        // #742 : includeConstructors will include the default constructor
+        if (!ruleFactory.getGenerationConfig().isIncludeConstructors()) {
+            // Add empty constructor
+            jclass.constructor(JMod.PUBLIC);
+        }
     }
 
     /**

diff --git a/...-integration-tests/src/test/java/org/jsonschema2pojo/integration/config/ParcelableIT.java b/...-integration-tests/src/test/java/org/jsonschema2pojo/integration/config/ParcelableIT.java
@@ -57,8 +57,22 @@ public void parcelableTreeIsParcelable() throws ClassNotFoundException, IOExcept
 
     @Test
     public void parcelableSuperclassIsUnparceled() throws ClassNotFoundException, IOException {
+        // Explicitely set includeConstructors to false if default value changes in the future
         Class<?> parcelableType = schemaRule.generateAndCompile("/schema/parcelable/parcelable-superclass-schema.json", "com.example", 
-                config("parcelable", true))
+                config("parcelable", true, "includeConstructors", false))
+                .loadClass("com.example.ParcelableSuperclassSchema");
+
+        Parcelable instance = (Parcelable) new ObjectMapper().readValue(ParcelableIT.class.getResourceAsStream("/schema/parcelable/parcelable-superclass-data.json"), parcelableType);
+        Parcel parcel = parcelableWriteToParcel(instance);
+        Parcelable unparceledInstance = parcelableReadFromParcel(parcel, parcelableType, instance);
+
+        assertThat(instance, is(equalTo(unparceledInstance)));
+    }
+
+    @Test
+    public void parcelableDefaultConstructorDoesNotConflict() throws ClassNotFoundException, IOException {
+        Class<?> parcelableType = schemaRule.generateAndCompile("/schema/parcelable/parcelable-superclass-schema.json", "com.example", 
+                config("parcelable", true, "includeConstructors", true))
                 .loadClass("com.example.ParcelableSuperclassSchema");
 
         Parcelable instance = (Parcelable) new ObjectMapper().readValue(ParcelableIT.class.getResourceAsStream("/schema/parcelable/parcelable-superclass-data.json"), parcelableType);