updated tests, added parentSchema

Author: fehguy

modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModel.java

@@ -5,7 +5,7 @@
 import java.util.*;
 
 public class CodegenModel {
-    public String parent;
+    public String parent, parentSchema;
     public String name, classname, description, classVarName, modelJson, dataType;
     public String unescapedDescription;
     public String defaultValue;

modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java

@@ -789,10 +789,11 @@ public CodegenModel fromModel(String name, Model model, Map<String, Model> allDe
             final RefModel parent = (RefModel) composed.getParent();
             if (parent != null) {
                 final String parentRef = parent.getSimpleRef();
-                m.parent = parentRef;
-                addImport(m, toModelName(parent.getSimpleRef()));
+                m.parentSchema = parentRef;
+                m.parent = toModelName(parent.getSimpleRef());
+                addImport(m, m.parent);
                 if (!supportsInheritance && allDefinitions != null) {
-                    final Model parentModel = allDefinitions.get(parentRef);
+                    final Model parentModel = allDefinitions.get(m.parentSchema);
                     if (parentModel instanceof ModelImpl) {
                         final ModelImpl _parent = (ModelImpl) parentModel;
                         if (_parent.getProperties() != null) {

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java

@@ -455,8 +455,8 @@ public String toOperationId(String operationId) {
     public CodegenModel fromModel(String name, Model model, Map<String, Model> allDefinitions) {
         CodegenModel codegenModel = super.fromModel(name, model, allDefinitions);
 
-        if (allDefinitions != null && codegenModel != null && codegenModel.parent != null && codegenModel.hasEnums) {
-            final Model parentModel = allDefinitions.get(codegenModel.parent);
+        if (allDefinitions != null && codegenModel != null && codegenModel.parentSchema != null && codegenModel.hasEnums) {
+            final Model parentModel = allDefinitions.get(codegenModel.parentSchema);
             final CodegenModel parentCodegenModel = super.fromModel(codegenModel.parent, parentModel);
             codegenModel = this.reconcileInlineEnums(codegenModel, parentCodegenModel);
         }

modules/swagger-codegen/src/test/java/io/swagger/codegen/java/JavaModelEnumTest.java

@@ -80,7 +80,7 @@ public void overrideEnumTest() {
 
         Assert.assertEquals(cm.name, "sample");
         Assert.assertEquals(cm.classname, "Sample");
-        Assert.assertEquals(cm.parent, "parentModel");
+        Assert.assertEquals(cm.parent, "ParentModel");
         Assert.assertTrue(cm.imports.contains("ParentModel"));
 
         // Assert that only the unshared/uninherited enum remains