fixing Issue #1066 - added unit test to prove the failure and the code fix

Author: AttilaW-Keytiles

src/main/java/io/swagger/codegen/v3/generators/java/AbstractJavaCodegen.java

@@ -1033,10 +1033,11 @@ protected void fixUpParentAndInterfaces(CodegenModel codegenModel, Map<String, C
         if (codegenModel.vars == null || codegenModel.vars.isEmpty() || codegenModel.parentModel == null) {
             return;
         }
-        CodegenModel parentModel = codegenModel.parentModel;
 
         for (CodegenProperty codegenProperty : codegenModel.vars) {
-            while (parentModel != null) {
+            CodegenModel parentModel = codegenModel.parentModel;
+            
+			while (parentModel != null) {
                 if (parentModel.vars == null || parentModel.vars.isEmpty()) {
                     parentModel = parentModel.parentModel;
                     continue;
@@ -1049,6 +1050,7 @@ protected void fixUpParentAndInterfaces(CodegenModel codegenModel, Map<String, C
                         !parentProperty.datatype.equals(codegenProperty.datatype)));
                 if (hasConflict) {
                     codegenProperty.name = toVarName(codegenModel.name + "_" + codegenProperty.name);
+					codegenProperty.nameInCamelCase = camelize(codegenProperty.name, false);
                     codegenProperty.getter = toGetter(codegenProperty.name);
                     codegenProperty.setter = toSetter(codegenProperty.name);
                     break;

src/test/java/io/swagger/codegen/v3/generators/java/AbstractJavaCodegenTest.java

@@ -288,6 +288,74 @@ public void testFixUpParentAndInterfaces_propertyNameSame_getterSetterSame_typeD
         Assert.assertEquals(childModel.vars.get(1).getter, childValueProperty2.getter);
         Assert.assertEquals(childModel.vars.get(1).setter, childValueProperty2.setter);
     }
+	
+	/**
+	 * Issue #1066 - testing case when the conflicting property is actually not the first one but the
+	 * second
+	 */
+	@Test
+	public void testFixUpParentAndInterfaces_2ndproperty_propertyNameSame_getterSetterSame_typeDifferent() {
+		AbstractJavaCodegen codegen = new P_AbstractJavaCodegen();
+
+		CodegenModel parentModel = new CodegenModel();
+		parentModel.name = "parent_type";
+		CodegenModel childModel = new CodegenModel();
+		childModel.name = "child_type";
+		childModel.parentModel = parentModel;
+		parentModel.children = new ArrayList<>();
+
+		CodegenProperty parentValueProperty1 = new CodegenProperty();
+		parentValueProperty1.name = "value";
+		parentValueProperty1.baseName = "value";
+		parentValueProperty1.getter = "getValue";
+		parentValueProperty1.setter = "setValue";
+		parentValueProperty1.datatype = "value_type";
+		CodegenProperty parentValueProperty2 = new CodegenProperty();
+		parentValueProperty2.name = "other_value";
+		parentValueProperty2.baseName = "other_value";
+		parentValueProperty2.getter = "getOtherValue";
+		parentValueProperty2.setter = "setOtherValue";
+		parentValueProperty2.datatype = "other_type";
+		parentModel.vars = new ArrayList<>();
+		parentModel.vars.add(parentValueProperty1);
+		parentModel.vars.add(parentValueProperty2);
+
+		CodegenProperty childValueProperty1 = new CodegenProperty();
+		childValueProperty1.name = "third_value";
+		childValueProperty1.baseName = "third_value";
+		childValueProperty1.nameInCamelCase = "ThirdValue";
+		childValueProperty1.getter = "getThirdValue";
+		childValueProperty1.setter = "setThirdValue";
+		childValueProperty1.datatype = "other_type";
+		CodegenProperty childValueProperty2 = new CodegenProperty();
+		childValueProperty2.name = "value"; // same as parent "value"
+		childValueProperty2.baseName = "value";
+		childValueProperty2.getter = "getValue"; // same as parent "getValue"
+		childValueProperty2.setter = "setValue"; // same as parent "setValue"
+		childValueProperty2.datatype = "different_type"; // different to parent "value_type"
+
+		childModel.vars = new ArrayList<>();
+		childModel.vars.add(childValueProperty1);
+		childModel.vars.add(childValueProperty2);
+
+		Map<String, CodegenModel> allModels = new HashMap<>();
+		allModels.put(parentModel.name, parentModel);
+		allModels.put(childModel.name, childModel);
+
+		codegen.fixUpParentAndInterfaces(childModel, Collections.EMPTY_MAP);
+		Assert.assertEquals(childModel.vars.get(1).baseName, "value");
+		Assert.assertEquals(childModel.vars.get(1).name, "childTypeValue");
+		Assert.assertEquals(childModel.vars.get(1).nameInCamelCase, "ChildTypeValue");
+		Assert.assertEquals(childModel.vars.get(1).getter, "getChildTypeValue");
+		Assert.assertEquals(childModel.vars.get(1).setter, "setChildTypeValue");
+
+		// unchanged
+		Assert.assertEquals(childModel.vars.get(0).baseName, childValueProperty1.baseName);
+		Assert.assertEquals(childModel.vars.get(0).name, childValueProperty1.name);
+		Assert.assertEquals(childModel.vars.get(0).nameInCamelCase, childValueProperty1.nameInCamelCase);
+		Assert.assertEquals(childModel.vars.get(0).getter, childValueProperty1.getter);
+		Assert.assertEquals(childModel.vars.get(0).setter, childValueProperty1.setter);
+	}	
 
     public static class P_AbstractJavaCodegen extends AbstractJavaCodegen {
         @Override