Merge branch 'master' into 9845

Author: sanjeevgiri

modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java

@@ -50,7 +50,7 @@
 /**
  * Goal which generates client/server code from a swagger json/yaml definition.
  */
-@Mojo(name = "generate", defaultPhase = LifecyclePhase.GENERATE_SOURCES)
+@Mojo(name = "generate", defaultPhase = LifecyclePhase.GENERATE_SOURCES, threadSafe = true)
 public class CodeGenMojo extends AbstractMojo {
 
     @Parameter(name = "verbose", required = false, defaultValue = "false")
@@ -315,6 +315,13 @@ public class CodeGenMojo extends AbstractMojo {
 
     @Override
     public void execute() throws MojoExecutionException {
+        // Using the naive approach for achieving thread safety
+        synchronized (CodeGenMojo.class) {
+            execute_();
+        }
+    }
+
+    protected void execute_() throws MojoExecutionException {
 
         if (skip) {
             getLog().info("Code generation is skipped.");

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

@@ -1477,7 +1477,7 @@ public CodegenModel fromModel(String name, Model model, Map<String, Model> allDe
 
                 if(parentName != null) {
                     m.parentSchema = parentName;
-                    m.parent = toModelName(parentName);
+                    m.parent = typeMapping.containsKey(parentName) ? typeMapping.get(parentName): toModelName(parentName);
                     addImport(m, m.parent);
                     if (allDefinitions != null) {
                         final Model parentModel = allDefinitions.get(m.parentSchema);