Merge branch 'master' into edengh/javascript

Author: HugoMario

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

@@ -1,8 +1,12 @@
 package io.swagger.codegen.v3.generators;
 
-import io.swagger.codegen.v3.*;
+import io.swagger.codegen.v3.CodegenModel;
+import io.swagger.codegen.v3.CodegenModelFactory;
+import io.swagger.codegen.v3.CodegenModelType;
+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;
 
@@ -28,12 +32,16 @@ public void createCodegenModel(ComposedSchema composedProperty, CodegenProperty
         final List<Schema> anyOf = composedProperty.getAnyOf();
 
         if (oneOf != null && !oneOf.isEmpty()) {
-             final CodegenModel oneOfModel = createFromOneOfSchemas(oneOf);
-            codegenProperty.vendorExtensions.put("oneOf-model", oneOfModel);
+            if (!hasNonObjectSchema(oneOf)) {
+                final CodegenModel oneOfModel = createFromOneOfSchemas(oneOf);
+                codegenProperty.vendorExtensions.put("oneOf-model", oneOfModel);
+            }
         }
         if (anyOf != null && !anyOf.isEmpty()) {
-            final CodegenModel anyOfModel = createFromOneOfSchemas(anyOf);
-            codegenProperty.vendorExtensions.put("anyOf-model", anyOfModel);
+            if (!hasNonObjectSchema(anyOf)) {
+                final CodegenModel anyOfModel = createFromOneOfSchemas(anyOf);
+                codegenProperty.vendorExtensions.put("anyOf-model", anyOfModel);
+            }
         }
 
     }
@@ -173,4 +181,14 @@ private void configureModel(CodegenModel codegenModel, String name) {
         codegenModel.classFilename = codegenConfig.toModelFilename(name);
         codegenModel.vendorExtensions.put("x-is-composed-model", Boolean.TRUE);
     }
+
+    private boolean hasNonObjectSchema(List<Schema> schemas) {
+        for  (Schema schema : schemas) {
+            boolean hasNonObjectSchema = (!(schema instanceof ObjectSchema)) ||  (schema.getProperties() != null && !schema.getProperties().isEmpty());
+            if (hasNonObjectSchema) {
+                return true;
+            }
+        }
+        return false;
+    }
 }

src/main/resources/handlebars/JavaJaxRS/cxf/pojo.mustache

@@ -78,7 +78,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#interfa
     return {{name}};
   }{{/is}}{{/is}}{{#is this 'enum'}}{{#is this 'map-container'}}public {{{datatypeWithEnum}}} {{#is this 'boolean'}}is{{/is}}{{getter}}() {
     return {{name}};
-  }{{/is}}{{/is}}{{#isNot this 'enum'}}public {{{datatypeWithEnum}}} {{#is this 'boolean'}}is{{/is}}{{getter}}() {
+  }{{/is}}{{/is}}{{#isNot this 'enum'}}public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};
   }{{/isNot}}
 

src/main/resources/handlebars/JavaSpring/libraries/spring-boot/pom.mustache

@@ -9,12 +9,12 @@
         <java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
-        <springfox-version>2.7.0</springfox-version>
+        <springfox-version>2.9.2</springfox-version>
     </properties>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.9.RELEASE</version>
+        <version>1.5.22.RELEASE</version>
     </parent>
     <build>
         <sourceDirectory>src/main/java</sourceDirectory>

src/main/resources/mustache/JavaSpring/libraries/spring-boot/pom.mustache

@@ -9,12 +9,12 @@
         <java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
-        <springfox-version>2.7.0</springfox-version>
+        <springfox-version>2.9.2</springfox-version>
     </properties>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.9.RELEASE</version>
+        <version>1.5.22.RELEASE</version>
     </parent>
     <build>
         <sourceDirectory>src/main/java</sourceDirectory>

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

@@ -1032,4 +1032,5 @@ public void generateModel() throws Exception {
         Assert.assertTrue(orderFile.exists());
         folder.delete();
     }
+
 }