Merge pull request #1018 from swagger-api/swos-556

fixed map property issue

Author: HugoMario

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

@@ -60,6 +60,8 @@ public abstract class AbstractJavaCodegen extends DefaultCodegenConfig {
     public static final String ERROR_ON_UNKNOWN_ENUM = "errorOnUnknownEnum";
     public static final String CHECK_DUPLICATED_MODEL_NAME = "checkDuplicatedModelName";
 
+    public static final String WIREMOCK_OPTION = "wiremock";
+
     protected String dateLibrary = "threetenbp";
     protected boolean java8Mode = false;
     protected boolean java11Mode = false;
@@ -190,6 +192,8 @@ public AbstractJavaCodegen() {
         cliOptions.add(java11Mode);
 
         cliOptions.add(CliOption.newBoolean(CHECK_DUPLICATED_MODEL_NAME, "Check if there are duplicated model names (ignoring case)"));
+
+        cliOptions.add(CliOption.newBoolean(WIREMOCK_OPTION, "Use wiremock to generate endpoint calls to mock on generated tests."));
     }
 
     @Override
@@ -356,6 +360,11 @@ public void processOpts() {
             additionalProperties.put(ERROR_ON_UNKNOWN_ENUM, errorOnUnknownEnum);
         }
 
+        if (additionalProperties.containsKey(WIREMOCK_OPTION)) {
+            final boolean useWireMock = additionalProperties.get(WIREMOCK_OPTION) != null && Boolean.parseBoolean(additionalProperties.get(WIREMOCK_OPTION).toString());
+            additionalProperties.put(WIREMOCK_OPTION, useWireMock);
+        }
+
         if (this instanceof NotNullAnnotationFeatures) {
             notNullOption = (NotNullAnnotationFeatures)this;
             if (additionalProperties.containsKey(NOT_NULL_JACKSON_ANNOTATION)) {

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

@@ -53,8 +53,6 @@ public class JavaClientCodegen extends AbstractJavaCodegen implements BeanValida
     public static final String RETROFIT_1 = "retrofit";
     public static final String RETROFIT_2 = "retrofit2";
 
-    public static final String WIREMOCK_OPTION = "wiremock";
-
     protected String gradleWrapperPackage = "gradle.wrapper";
     protected boolean useRxJava = false;
     protected boolean useRxJava2 = false;
@@ -89,8 +87,6 @@ public JavaClientCodegen() {
         cliOptions.add(CliOption.newBoolean(USE_GZIP_FEATURE, "Send gzip-encoded requests"));
         cliOptions.add(CliOption.newBoolean(USE_RUNTIME_EXCEPTION, "Use RuntimeException instead of Exception"));
 
-        cliOptions.add(CliOption.newBoolean(WIREMOCK_OPTION, "Use wiremock to generate endpoint calls to mock on generated tests."));
-
         supportedLibraries.put("jersey1", "HTTP client: Jersey client 1.19.4. JSON processing: Jackson 2.10.1. Enable gzip request encoding using '-DuseGzipFeature=true'.");
         supportedLibraries.put("feign", "HTTP client: OpenFeign 9.4.0. JSON processing: Jackson 2.10.1");
         supportedLibraries.put("jersey2", "HTTP client: Jersey client 2.26. JSON processing: Jackson 2.10.1");
@@ -177,11 +173,6 @@ public void processOpts() {
             this.setUseRuntimeException(convertPropertyToBooleanAndWriteBack(USE_RUNTIME_EXCEPTION));
         }
 
-        if (additionalProperties.containsKey(WIREMOCK_OPTION)) {
-            final boolean useWireMock = additionalProperties.get(WIREMOCK_OPTION) != null && Boolean.parseBoolean(additionalProperties.get(WIREMOCK_OPTION).toString());
-            additionalProperties.put(WIREMOCK_OPTION, useWireMock);
-        }
-
         final String invokerFolder = (sourceFolder + File.separator + invokerPackage).replace(".", File.separator);
         final String authFolder = (sourceFolder + File.separator + invokerPackage + ".auth").replace(".", File.separator);
         final String apiFolder = (sourceFolder + File.separator + apiPackage).replace(".", File.separator);

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

@@ -22,16 +22,22 @@
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.PathItem;
 import io.swagger.v3.oas.models.media.ArraySchema;
+import io.swagger.v3.oas.models.media.MapSchema;
 import io.swagger.v3.oas.models.media.Schema;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.Writer;
 import java.net.URL;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.stream.Collectors;
 
@@ -475,7 +481,7 @@ public CodegenProperty fromProperty(String name, Schema propertySchema) {
         CodegenProperty codegenProperty = super.fromProperty(name, propertySchema);
         if (propertySchema != null && propertySchema.get$ref() != null) {
             Schema refSchema = OpenAPIUtil.getSchemaFromRefSchema(propertySchema, this.openAPI);
-            if (refSchema != null  && !isObjectSchema(refSchema) && !(refSchema instanceof ArraySchema) && refSchema.getEnum() == null) {
+            if (refSchema != null  && !isObjectSchema(refSchema) && !(refSchema instanceof ArraySchema) && !(refSchema instanceof MapSchema) && refSchema.getEnum() == null) {
                 setSchemaProperties(name, codegenProperty, refSchema);
                 processPropertySchemaTypes(name, codegenProperty, refSchema);
             }

src/main/resources/handlebars/JavaSpring/libraries/spring-cloud/apiClient.mustache

@@ -8,8 +8,6 @@ import org.springframework.cloud.openfeign.FeignClient;
 {{/isOpenFeign}}
 import {{configPackage}}.ClientConfiguration;
 
-{{=<% %>=}}
-@FeignClient(<%#isOpenFeign%>contextId="<%classname%>Client", <%/isOpenFeign%>name="${<%title%>.name:<%title%>}", url="${<%title%>.url:<%basePath%>}", configuration = ClientConfiguration.class)
-<%={{ }}=%>
+@FeignClient({{#isOpenFeign}}contextId="{{classname}}Client", {{/isOpenFeign}}name="${{braces "left"}}{{title}}.name:{{title}}{{braces "right"}}", url="${{braces "left"}}{{title}}.url:{{^wiremock}}{{basePath}}{{/wiremock}}{{#wiremock}}wiremock.base.path{{/wiremock}}{{braces "right"}}", configuration = ClientConfiguration.class)
 public interface {{classname}}Client extends {{classname}} {
 }

src/main/resources/handlebars/JavaSpring/libraries/spring-cloud/application-test.mustache

@@ -9,3 +9,7 @@ hystrix.command.default.execution.timeout.enabled: false
 logging.level.{{apiPackage}}: DEBUG
 
 feign.hystrix.enabled: true
+
+{{#wiremock}}
+wiremock.base.path: http://localhost:33333
+{{/wiremock}}

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

@@ -138,5 +138,13 @@
             <artifactId>javax.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
+        {{#wiremock}}
+        <dependency>
+            <groupId>com.github.tomakehurst</groupId>
+            <artifactId>wiremock</artifactId>
+            <version>2.27.2</version>
+            <scope>test</scope>
+        </dependency>
+        {{/wiremock}}
     </dependencies>
 </project>

src/test/java/io/swagger/codegen/v3/generators/options/JavaOptionsProvider.java

@@ -77,6 +77,7 @@ public JavaOptionsProvider() {
                 .put(CodegenConstants.ALLOW_UNICODE_IDENTIFIERS, ALLOW_UNICODE_IDENTIFIERS_VALUE)
                 .put(CodegenConstants.USE_OAS2, "true")
                 .put(JavaClientCodegen.CHECK_DUPLICATED_MODEL_NAME, "false")
+                .put(JavaClientCodegen.WIREMOCK_OPTION, "false")
                 //.put("supportJava6", "true")
                 .build();
     }