Merge branch 'master' into spring-resource

Author: frantuma

.gitignore

@@ -14,14 +14,6 @@
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
 
-# Package Files #
-*.jar
-*.war
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 

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

@@ -1324,7 +1324,7 @@ else if (schema instanceof ComposedSchema) {
                 if(composed.getAllOf() != null) {
                     for (Schema innerModel : composed.getAllOf()) {
                         if (codegenModel.discriminator == null) {
-                            codegenModel.discriminator = schema
+                            codegenModel.discriminator = innerModel
                                     .getDiscriminator();
                         }
                         if (innerModel.getXml() != null) {
@@ -1387,9 +1387,11 @@ else if (schema instanceof ComposedSchema) {
                 }
             }
             if (oneOf != null && !oneOf.isEmpty()) {
+                codegenModel.dataType = getSchemaType(composed);
                 this.schemaHandler.configureOneOfModel(codegenModel, oneOf);
             }
             if (anyOf != null && !anyOf.isEmpty()) {
+                codegenModel.dataType = getSchemaType(composed);
                 this.schemaHandler.configureAnyOfModel(codegenModel, anyOf);
             }
             if (parent != null) {

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

@@ -6,7 +6,6 @@
 import io.swagger.codegen.v3.CodegenProperty;
 import io.swagger.codegen.v3.generators.util.OpenAPIUtil;
 import io.swagger.v3.oas.models.media.ComposedSchema;
-import io.swagger.v3.oas.models.media.ObjectSchema;
 import io.swagger.v3.oas.models.media.Schema;
 import org.apache.commons.lang3.StringUtils;
 
@@ -15,7 +14,7 @@
 
 public class SchemaHandler {
 
-    private DefaultCodegenConfig codegenConfig;
+    protected DefaultCodegenConfig codegenConfig;
 
     public SchemaHandler(DefaultCodegenConfig codegenConfig) {
         this.codegenConfig = codegenConfig;

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

@@ -92,6 +92,7 @@ public void processOpts() {
     @Override
     public void preprocessOpenAPI(OpenAPI openAPI) {
         //this.openAPIUtil = new OpenAPIUtil(openAPI);
+        this.openAPI = openAPI;
         if (!this.additionalProperties.containsKey("serverPort")) {
             final URL urlInfo = URLPathUtil.getServerURL(openAPI);
             String port = "8080"; // Default value for a JEE Server

src/main/java/io/swagger/codegen/v3/generators/openapi/OpenAPIYamlGenerator.java

@@ -36,7 +36,7 @@ public void setOutputFile(String outputFile) {
 
     @Override
     public void preprocessOpenAPI(OpenAPI openAPI) {
-        super.preprocessOpenAPI(openAPI);
+        this.openAPI = openAPI;
         try {
             final String outputString;
             if (flattenSpec) {