Only add override builder if the class does not already define one

Closes #507
joelittlejohn · Feb 21, 2016 · 7305278 · 7305278
1 parent 86f3f44
commit 7305278
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/PropertiesRule.java b/jsonschema2pojo-core/src/main/java/org/jsonschema2pojo/rules/PropertiesRule.java
@@ -83,15 +83,18 @@ private void addOverrideBuilders(JDefinedClass jclass, JDefinedClass parentJclas
         }
     }
 
-    private JMethod addOverrideBuilder(JDefinedClass thisJDefinedClass, JMethod parentBuilder, JVar parentParam) {
-        JMethod builder = thisJDefinedClass.method(parentBuilder.mods().getValue(), thisJDefinedClass, parentBuilder.name());
-        builder.annotate(Override.class);
-
-        JVar param = builder.param(parentParam.type(), parentParam.name());
-        JBlock body = builder.body();
-        body.invoke(JExpr._super(), parentBuilder).arg(param);
-        body._return(JExpr._this());
-
-        return builder;
+    private void addOverrideBuilder(JDefinedClass thisJDefinedClass, JMethod parentBuilder, JVar parentParam) {
+
+        if (thisJDefinedClass.getMethod(parentBuilder.name(), new JType[] {parentParam.type()}) == null) {
+
+            JMethod builder = thisJDefinedClass.method(parentBuilder.mods().getValue(), thisJDefinedClass, parentBuilder.name());
+            builder.annotate(Override.class);
+
+            JVar param = builder.param(parentParam.type(), parentParam.name());
+            JBlock body = builder.body();
+            body.invoke(JExpr._super(), parentBuilder).arg(param);
+            body._return(JExpr._this());
+
+        }
     }
 }
diff --git a/...jo-integration-tests/src/test/java/org/jsonschema2pojo/integration/CompilerWarningIT.java b/...jo-integration-tests/src/test/java/org/jsonschema2pojo/integration/CompilerWarningIT.java
@@ -105,7 +105,7 @@ public void checkWarnings() {
   }
 
   public static List<Diagnostic<? extends JavaFileObject>> warnings(List<Diagnostic<? extends JavaFileObject>> all) {
-    List<Diagnostic<? extends JavaFileObject>> warnings = new ArrayList<>();
+    List<Diagnostic<? extends JavaFileObject>> warnings = new ArrayList<Diagnostic<? extends JavaFileObject>>();
     for( Diagnostic<? extends JavaFileObject> entry : all ) {
       if( entry.getKind() == Kind.WARNING ) {
         warnings.add(entry);

diff --git a/jsonschema2pojo-integration-tests/src/test/resources/schema/extends/subtypeOfSubtypeOfA.json b/jsonschema2pojo-integration-tests/src/test/resources/schema/extends/subtypeOfSubtypeOfA.json
@@ -4,6 +4,9 @@
         "$ref": "subtypeOfA.json"
     },
     "properties": {
+        "parent" : {
+            "type": "string"
+        },
         "child": {
             "type": "string"
         }