Fix import for new spring boot version (#9144)

* Fix import for new spring boot version #8561 * Add new versions * Fix samples * Remove unused dependencies * Revert "Remove unused dependencies" This reverts commit bdac08b80a. * Add version * Fix version * Add hystrix note this depcreated * Migrate to Junit5 * Trigger build * Add junit5 * Upgrade to new hystrix starter * Try to enable hystrix * Remove hystrix and upgrade to boot 2.5.5 * Remove hystrix * Revert yaml * Remove hysterix * Trigger build * Update docu * use 4-space instead of tabs * remove HystrixCommand * add back spring-cloud test with oas 3.0 spec * update samples Co-authored-by: William Cheng <wing328hk@gmail.com>
2021-10-13 09:29:14 +02:00
parent 45336be847
commit 12d80bfbb5
49 changed files with 333 additions and 2580 deletions
--- a/bin/configs/spring-cloud-no-nullable.yaml
+++ b/bin/configs/spring-cloud-no-nullable.yaml
@@ -1,10 +0,0 @@
-generatorName: spring
-outputDir: samples/client/petstore/spring-cloud-no-nullable
-library: spring-cloud
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
-templateDir: modules/openapi-generator/src/main/resources/JavaSpring
-additionalProperties:
-  artifactId: petstore-spring-cloud-no-nullable
-  responseWrapper: HystrixCommand
-  hideGenerationTimestamp: "true"
-  openApiNullable: "false"
--- a/bin/configs/spring-cloud.yaml
+++ b/bin/configs/spring-cloud.yaml
@@ -1,9 +1,8 @@
 generatorName: spring
 outputDir: samples/client/petstore/spring-cloud
 library: spring-cloud
-inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
+inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
  artifactId: petstore-spring-cloud
-  responseWrapper: HystrixCommand
  hideGenerationTimestamp: "true"
--- a/docs/generators/spring.md
+++ b/docs/generators/spring.md
@@ -52,7 +52,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |performBeanValidation|Use Bean Validation Impl. to perform BeanValidation| |false|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |reactive|wrap responses in Mono/Flux Reactor types (spring-boot only)| |false|
-|responseWrapper|wrap the responses in given type (Future, Callable, CompletableFuture,ListenableFuture, DeferredResult, HystrixCommand, RxObservable, RxSingle or fully qualified type)| |null|
+|responseWrapper|wrap the responses in given type (Future, Callable, CompletableFuture,ListenableFuture, DeferredResult, RxObservable, RxSingle or fully qualified type)| |null|
 |returnSuccessCode|Generated server returns 2xx code| |false|
 |scmConnection|SCM connection in generated pom.xml| |scm:git:git@github.com:openapitools/openapi-generator.git|
 |scmDeveloperConnection|SCM developer connection in generated pom.xml| |scm:git:git@github.com:openapitools/openapi-generator.git|
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java
@@ -17,34 +17,55 @@

 package org.openapitools.codegen.languages;

-import com.samskivert.mustache.Mustache;
-import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.oas.models.Operation;
-import io.swagger.v3.oas.models.PathItem;
+import static org.apache.commons.lang3.StringUtils.isNotEmpty;
+import static org.openapitools.codegen.utils.StringUtils.camelize;
+
+import java.io.File;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.stream.Collectors;
+
 import org.apache.commons.lang3.tuple.Pair;
-import org.openapitools.codegen.*;
+import org.openapitools.codegen.CliOption;
+import org.openapitools.codegen.CodegenConstants;
+import org.openapitools.codegen.CodegenModel;
+import org.openapitools.codegen.CodegenOperation;
+import org.openapitools.codegen.CodegenParameter;
+import org.openapitools.codegen.CodegenProperty;
+import org.openapitools.codegen.CodegenResponse;
+import org.openapitools.codegen.CodegenSecurity;
+import org.openapitools.codegen.CodegenType;
+import org.openapitools.codegen.SupportingFile;
 import org.openapitools.codegen.languages.features.BeanValidationFeatures;
 import org.openapitools.codegen.languages.features.OptionalFeatures;
 import org.openapitools.codegen.languages.features.PerformBeanValidationFeatures;
-import org.openapitools.codegen.meta.features.*;
+import org.openapitools.codegen.meta.features.DocumentationFeature;
+import org.openapitools.codegen.meta.features.GlobalFeature;
+import org.openapitools.codegen.meta.features.ParameterFeature;
+import org.openapitools.codegen.meta.features.SchemaSupportFeature;
+import org.openapitools.codegen.meta.features.SecurityFeature;
+import org.openapitools.codegen.meta.features.WireFormatFeature;
 import org.openapitools.codegen.templating.mustache.SplitStringLambda;
 import org.openapitools.codegen.templating.mustache.TrimWhitespaceLambda;
 import org.openapitools.codegen.utils.URLPathUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

-import java.io.File;
-import java.net.URL;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.stream.Collectors;
+import com.samskivert.mustache.Mustache;

-import static org.apache.commons.lang3.StringUtils.isNotEmpty;
-import static org.openapitools.codegen.utils.StringUtils.camelize;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.Operation;
+import io.swagger.v3.oas.models.PathItem;

 public class SpringCodegen extends AbstractJavaCodegen
-        implements BeanValidationFeatures, PerformBeanValidationFeatures,
-        OptionalFeatures {
+        implements BeanValidationFeatures, PerformBeanValidationFeatures, OptionalFeatures {
    private final Logger LOGGER = LoggerFactory.getLogger(SpringCodegen.class);

    public static final String TITLE = "title";
@@ -102,32 +123,16 @@ public class SpringCodegen extends AbstractJavaCodegen
    public SpringCodegen() {
        super();

-        modifyFeatureSet(features -> features
-                .includeDocumentationFeatures(DocumentationFeature.Readme)
+        modifyFeatureSet(features -> features.includeDocumentationFeatures(DocumentationFeature.Readme)
                .wireFormatFeatures(EnumSet.of(WireFormatFeature.JSON, WireFormatFeature.XML, WireFormatFeature.Custom))
-                .securityFeatures(EnumSet.of(
-                        SecurityFeature.OAuth2_Implicit,
-                        SecurityFeature.OAuth2_AuthorizationCode,
-                        SecurityFeature.OAuth2_ClientCredentials,
-                        SecurityFeature.OAuth2_Password,
-                        SecurityFeature.ApiKey,
-                        SecurityFeature.BasicAuth
-                ))
-                .excludeGlobalFeatures(
-                        GlobalFeature.Callbacks,
-                        GlobalFeature.LinkObjects,
-                        GlobalFeature.ParameterStyling
-                )
-                .includeGlobalFeatures(
-                        GlobalFeature.XMLStructureDefinitions
-                )
-                .includeSchemaSupportFeatures(
-                        SchemaSupportFeature.Polymorphism
-                )
-                .excludeParameterFeatures(
-                        ParameterFeature.Cookie
-                )
-        );
+                .securityFeatures(EnumSet.of(SecurityFeature.OAuth2_Implicit, SecurityFeature.OAuth2_AuthorizationCode,
+                        SecurityFeature.OAuth2_ClientCredentials, SecurityFeature.OAuth2_Password,
+                        SecurityFeature.ApiKey, SecurityFeature.BasicAuth))
+                .excludeGlobalFeatures(GlobalFeature.Callbacks, GlobalFeature.LinkObjects,
+                        GlobalFeature.ParameterStyling)
+                .includeGlobalFeatures(GlobalFeature.XMLStructureDefinitions)
+                .includeSchemaSupportFeatures(SchemaSupportFeature.Polymorphism)
+                .excludeParameterFeatures(ParameterFeature.Cookie));

        outputFolder = "generated-code/javaSpring";
        embeddedTemplateDir = templateDir = "JavaSpring";
@@ -150,43 +155,67 @@ public class SpringCodegen extends AbstractJavaCodegen
        additionalProperties.put("closebrace", CLOSE_BRACE);

        cliOptions.add(new CliOption(TITLE, "server title name or client service name").defaultValue(title));
-        cliOptions.add(new CliOption(CONFIG_PACKAGE, "configuration package for generated code").defaultValue(this.getConfigPackage()));
-        cliOptions.add(new CliOption(BASE_PACKAGE, "base package (invokerPackage) for generated code").defaultValue(this.getBasePackage()));
-        cliOptions.add(CliOption.newBoolean(INTERFACE_ONLY, "Whether to generate only API interface stubs without the server files.", interfaceOnly));
-        cliOptions.add(CliOption.newBoolean(DELEGATE_PATTERN, "Whether to generate the server files using the delegate pattern", delegatePattern));
-        cliOptions.add(CliOption.newBoolean(SINGLE_CONTENT_TYPES, "Whether to select only one produces/consumes content-type by operation.", singleContentTypes));
+        cliOptions.add(new CliOption(CONFIG_PACKAGE, "configuration package for generated code")
+                .defaultValue(this.getConfigPackage()));
+        cliOptions.add(new CliOption(BASE_PACKAGE, "base package (invokerPackage) for generated code")
+                .defaultValue(this.getBasePackage()));
+        cliOptions.add(CliOption.newBoolean(INTERFACE_ONLY,
+                "Whether to generate only API interface stubs without the server files.", interfaceOnly));
+        cliOptions.add(CliOption.newBoolean(DELEGATE_PATTERN,
+                "Whether to generate the server files using the delegate pattern", delegatePattern));
+        cliOptions.add(CliOption.newBoolean(SINGLE_CONTENT_TYPES,
+                "Whether to select only one produces/consumes content-type by operation.", singleContentTypes));
        updateJava8CliOptions();
-        cliOptions.add(CliOption.newBoolean(SKIP_DEFAULT_INTERFACE, "Whether to generate default implementations for java8 interfaces", skipDefaultInterface));
+        cliOptions.add(CliOption.newBoolean(SKIP_DEFAULT_INTERFACE,
+                "Whether to generate default implementations for java8 interfaces", skipDefaultInterface));
        cliOptions.add(CliOption.newBoolean(ASYNC, "use async Callable controllers", async));
-        cliOptions.add(CliOption.newBoolean(REACTIVE, "wrap responses in Mono/Flux Reactor types (spring-boot only)", reactive));
-        cliOptions.add(new CliOption(RESPONSE_WRAPPER, "wrap the responses in given type (Future, Callable, CompletableFuture,ListenableFuture, DeferredResult, HystrixCommand, RxObservable, RxSingle or fully qualified type)"));
-        cliOptions.add(CliOption.newBoolean(VIRTUAL_SERVICE, "Generates the virtual service. For more details refer - https://github.com/virtualansoftware/virtualan/wiki"));
-        cliOptions.add(CliOption.newBoolean(USE_TAGS, "use tags for creating interface and controller classnames", useTags));
-        cliOptions.add(CliOption.newBoolean(USE_BEANVALIDATION, "Use BeanValidation API annotations", useBeanValidation));
-        cliOptions.add(CliOption.newBoolean(PERFORM_BEANVALIDATION, "Use Bean Validation Impl. to perform BeanValidation", performBeanValidation));
-        cliOptions.add(CliOption.newBoolean(IMPLICIT_HEADERS, "Skip header parameters in the generated API methods using @ApiImplicitParams annotation.", implicitHeaders));
-        cliOptions.add(CliOption.newBoolean(OPENAPI_DOCKET_CONFIG, "Generate Spring OpenAPI Docket configuration class.", openapiDocketConfig));
-        cliOptions.add(CliOption.newBoolean(API_FIRST, "Generate the API from the OAI spec at server compile time (API first approach)", apiFirst));
-        cliOptions.add(CliOption.newBoolean(USE_OPTIONAL, "Use Optional container for optional parameters", useOptional));
-        cliOptions.add(CliOption.newBoolean(HATEOAS, "Use Spring HATEOAS library to allow adding HATEOAS links", hateoas));
-        cliOptions.add(CliOption.newBoolean(RETURN_SUCCESS_CODE, "Generated server returns 2xx code", returnSuccessCode));
-        cliOptions.add(CliOption.newBoolean(UNHANDLED_EXCEPTION_HANDLING, "Declare operation methods to throw a generic exception and allow unhandled exceptions (useful for Spring `@ControllerAdvice` directives).", unhandledException));
+        cliOptions.add(CliOption.newBoolean(REACTIVE, "wrap responses in Mono/Flux Reactor types (spring-boot only)",
+                reactive));
+        cliOptions.add(new CliOption(RESPONSE_WRAPPER,
+                "wrap the responses in given type (Future, Callable, CompletableFuture,ListenableFuture, DeferredResult, RxObservable, RxSingle or fully qualified type)"));
+        cliOptions.add(CliOption.newBoolean(VIRTUAL_SERVICE,
+                "Generates the virtual service. For more details refer - https://github.com/virtualansoftware/virtualan/wiki"));
+        cliOptions.add(
+                CliOption.newBoolean(USE_TAGS, "use tags for creating interface and controller classnames", useTags));
+        cliOptions
+                .add(CliOption.newBoolean(USE_BEANVALIDATION, "Use BeanValidation API annotations", useBeanValidation));
+        cliOptions.add(CliOption.newBoolean(PERFORM_BEANVALIDATION,
+                "Use Bean Validation Impl. to perform BeanValidation", performBeanValidation));
+        cliOptions.add(CliOption.newBoolean(IMPLICIT_HEADERS,
+                "Skip header parameters in the generated API methods using @ApiImplicitParams annotation.",
+                implicitHeaders));
+        cliOptions.add(CliOption.newBoolean(OPENAPI_DOCKET_CONFIG,
+                "Generate Spring OpenAPI Docket configuration class.", openapiDocketConfig));
+        cliOptions.add(CliOption.newBoolean(API_FIRST,
+                "Generate the API from the OAI spec at server compile time (API first approach)", apiFirst));
+        cliOptions
+                .add(CliOption.newBoolean(USE_OPTIONAL, "Use Optional container for optional parameters", useOptional));
+        cliOptions.add(
+                CliOption.newBoolean(HATEOAS, "Use Spring HATEOAS library to allow adding HATEOAS links", hateoas));
+        cliOptions
+                .add(CliOption.newBoolean(RETURN_SUCCESS_CODE, "Generated server returns 2xx code", returnSuccessCode));
+        cliOptions.add(CliOption.newBoolean(UNHANDLED_EXCEPTION_HANDLING,
+                "Declare operation methods to throw a generic exception and allow unhandled exceptions (useful for Spring `@ControllerAdvice` directives).",
+                unhandledException));

        supportedLibraries.put(SPRING_BOOT, "Spring-boot Server application using the SpringFox integration.");
        supportedLibraries.put(SPRING_MVC_LIBRARY, "Spring-MVC Server application using the SpringFox integration.");
-        supportedLibraries.put(SPRING_CLOUD_LIBRARY, "Spring-Cloud-Feign client with Spring-Boot auto-configured settings.");
+        supportedLibraries.put(SPRING_CLOUD_LIBRARY,
+                "Spring-Cloud-Feign client with Spring-Boot auto-configured settings.");
        setLibrary(SPRING_BOOT);
-        CliOption library = new CliOption(CodegenConstants.LIBRARY, CodegenConstants.LIBRARY_DESC).defaultValue(SPRING_BOOT);
+        final CliOption library = new CliOption(CodegenConstants.LIBRARY, CodegenConstants.LIBRARY_DESC)
+                .defaultValue(SPRING_BOOT);
        library.setEnum(supportedLibraries);
        cliOptions.add(library);

    }

    private void updateJava8CliOptions() {
-        CliOption option = cliOptions.stream().filter(o -> JAVA_8.equals(o.getOpt())).findFirst()
+        final CliOption option = cliOptions.stream().filter(o -> JAVA_8.equals(o.getOpt())).findFirst()
                .orElseThrow(() -> new RuntimeException("Missing java8 option"));
-        Map<String, String> java8ModeOptions = option.getEnum();
-        java8ModeOptions.put("true", "Use Java 8 classes such as Base64. Use java8 default interface when a responseWrapper is used. IMPORTANT: This option has been deprecated as Java 8 is the default.");
+        final Map<String, String> java8ModeOptions = option.getEnum();
+        java8ModeOptions.put("true",
+                "Use Java 8 classes such as Base64. Use java8 default interface when a responseWrapper is used. IMPORTANT: This option has been deprecated as Java 8 is the default.");
    }

    @Override
@@ -207,25 +236,27 @@ public class SpringCodegen extends AbstractJavaCodegen
    @Override
    public void processOpts() {

-        List<Pair<String, String>> configOptions = additionalProperties.entrySet().stream()
+        final List<Pair<String, String>> configOptions = additionalProperties.entrySet().stream()
                .filter(e -> !Arrays.asList(API_FIRST, "hideGenerationTimestamp").contains(e.getKey()))
                .filter(e -> cliOptions.stream().map(CliOption::getOpt).anyMatch(opt -> opt.equals(e.getKey())))
-                .map(e -> Pair.of(e.getKey(), e.getValue().toString()))
-                .collect(Collectors.toList());
+                .map(e -> Pair.of(e.getKey(), e.getValue().toString())).collect(Collectors.toList());
        additionalProperties.put("configOptions", configOptions);

-        // Process java8 option before common java ones to change the default dateLibrary to java8.
+        // Process java8 option before common java ones to change the default
+        // dateLibrary to java8.
        LOGGER.info("----------------------------------");
        if (additionalProperties.containsKey(JAVA_8)) {
            this.setJava8(Boolean.parseBoolean(additionalProperties.get(JAVA_8).toString()));
            additionalProperties.put(JAVA_8, java8);
-            LOGGER.warn("java8 option has been deprecated as it's set to true by default (JDK7 support has been deprecated)");
+            LOGGER.warn(
+                    "java8 option has been deprecated as it's set to true by default (JDK7 support has been deprecated)");
        }
-        if (this.java8 && !additionalProperties.containsKey(DATE_LIBRARY)) {
+        if (java8 && !additionalProperties.containsKey(DATE_LIBRARY)) {
            setDateLibrary("java8");
        }

-        if (!additionalProperties.containsKey(BASE_PACKAGE) && additionalProperties.containsKey(CodegenConstants.INVOKER_PACKAGE)) {
+        if (!additionalProperties.containsKey(BASE_PACKAGE)
+                && additionalProperties.containsKey(CodegenConstants.INVOKER_PACKAGE)) {
            // set invokerPackage as basePackage:
            this.setBasePackage((String) additionalProperties.get(CodegenConstants.INVOKER_PACKAGE));
            additionalProperties.put(BASE_PACKAGE, basePackage);
@@ -236,7 +267,7 @@ public class SpringCodegen extends AbstractJavaCodegen

        // clear model and api doc template as this codegen
        // does not support auto-generated markdown doc at the moment
-        //TODO: add doc templates
+        // TODO: add doc templates
        modelDocTemplateFiles.remove("model_doc.mustache");
        apiDocTemplateFiles.remove("api_doc.mustache");

@@ -273,12 +304,13 @@ public class SpringCodegen extends AbstractJavaCodegen
        }

        if (additionalProperties.containsKey(SKIP_DEFAULT_INTERFACE)) {
-            this.setSkipDefaultInterface(Boolean.parseBoolean(additionalProperties.get(SKIP_DEFAULT_INTERFACE).toString()));
+            this.setSkipDefaultInterface(
+                    Boolean.parseBoolean(additionalProperties.get(SKIP_DEFAULT_INTERFACE).toString()));
        }

        if (additionalProperties.containsKey(ASYNC)) {
            this.setAsync(Boolean.parseBoolean(additionalProperties.get(ASYNC).toString()));
-            //fix for issue/1164
+            // fix for issue/1164
            convertPropertyToBooleanAndWriteBack(ASYNC);
        }

@@ -316,7 +348,8 @@ public class SpringCodegen extends AbstractJavaCodegen
        }

        if (additionalProperties.containsKey(OPENAPI_DOCKET_CONFIG)) {
-            this.setOpenapiDocketConfig(Boolean.parseBoolean(additionalProperties.get(OPENAPI_DOCKET_CONFIG).toString()));
+            this.setOpenapiDocketConfig(
+                    Boolean.parseBoolean(additionalProperties.get(OPENAPI_DOCKET_CONFIG).toString()));
        }

        if (additionalProperties.containsKey(API_FIRST)) {
@@ -332,7 +365,8 @@ public class SpringCodegen extends AbstractJavaCodegen
        }

        if (additionalProperties.containsKey(UNHANDLED_EXCEPTION_HANDLING)) {
-            this.setUnhandledException(Boolean.parseBoolean(additionalProperties.get(UNHANDLED_EXCEPTION_HANDLING).toString()));
+            this.setUnhandledException(
+                    Boolean.parseBoolean(additionalProperties.get(UNHANDLED_EXCEPTION_HANDLING).toString()));
        }
        additionalProperties.put(UNHANDLED_EXCEPTION_HANDLING, this.isUnhandledException());

@@ -343,9 +377,9 @@ public class SpringCodegen extends AbstractJavaCodegen
            writePropertyBack(USE_OPTIONAL, useOptional);
        }

-        if (this.interfaceOnly && this.delegatePattern) {
-            if (this.java8) {
-                this.delegateMethod = true;
+        if (interfaceOnly && delegatePattern) {
+            if (java8) {
+                delegateMethod = true;
                additionalProperties.put("delegate-method", true);
            } else {
                throw new IllegalArgumentException(
@@ -357,28 +391,36 @@ public class SpringCodegen extends AbstractJavaCodegen
        supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
        supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));

-        if (!this.interfaceOnly) {
+        if (!interfaceOnly) {
            if (SPRING_BOOT.equals(library)) {
                supportingFiles.add(new SupportingFile("openapi2SpringBoot.mustache",
-                        (sourceFolder + File.separator + basePackage).replace(".", java.io.File.separator), "OpenAPI2SpringBoot.java"));
+                        (sourceFolder + File.separator + basePackage).replace(".", java.io.File.separator),
+                        "OpenAPI2SpringBoot.java"));
                supportingFiles.add(new SupportingFile("RFC3339DateFormat.mustache",
-                        (sourceFolder + File.separator + basePackage).replace(".", java.io.File.separator), "RFC3339DateFormat.java"));
+                        (sourceFolder + File.separator + basePackage).replace(".", java.io.File.separator),
+                        "RFC3339DateFormat.java"));
            }
            if (SPRING_MVC_LIBRARY.equals(library)) {
                supportingFiles.add(new SupportingFile("webApplication.mustache",
-                        (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "WebApplication.java"));
+                        (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator),
+                        "WebApplication.java"));
                supportingFiles.add(new SupportingFile("webMvcConfiguration.mustache",
-                        (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "WebMvcConfiguration.java"));
+                        (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator),
+                        "WebMvcConfiguration.java"));
                supportingFiles.add(new SupportingFile("openapiUiConfiguration.mustache",
-                        (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "OpenAPIUiConfiguration.java"));
+                        (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator),
+                        "OpenAPIUiConfiguration.java"));
                supportingFiles.add(new SupportingFile("RFC3339DateFormat.mustache",
-                        (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "RFC3339DateFormat.java"));
+                        (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator),
+                        "RFC3339DateFormat.java"));
            }
            if (SPRING_CLOUD_LIBRARY.equals(library)) {
                supportingFiles.add(new SupportingFile("apiKeyRequestInterceptor.mustache",
-                        (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "ApiKeyRequestInterceptor.java"));
+                        (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator),
+                        "ApiKeyRequestInterceptor.java"));
                supportingFiles.add(new SupportingFile("clientConfiguration.mustache",
-                        (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "ClientConfiguration.java"));
+                        (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator),
+                        "ClientConfiguration.java"));
                apiTemplateFiles.put("apiClient.mustache", "Client.java");
                if (!additionalProperties.containsKey(SINGLE_CONTENT_TYPES)) {
                    additionalProperties.put(SINGLE_CONTENT_TYPES, "true");
@@ -389,18 +431,21 @@ public class SpringCodegen extends AbstractJavaCodegen
                supportingFiles.add(new SupportingFile("application.mustache",
                        ("src.main.resources").replace(".", java.io.File.separator), "application.properties"));
                supportingFiles.add(new SupportingFile("homeController.mustache",
-                        (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "HomeController.java"));
-                if (!this.reactive && !this.apiFirst) {
+                        (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator),
+                        "HomeController.java"));
+                if (!reactive && !apiFirst) {
                    supportingFiles.add(new SupportingFile("openapiDocumentationConfig.mustache",
-                            (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "OpenAPIDocumentationConfig.java"));
+                            (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator),
+                            "OpenAPIDocumentationConfig.java"));
                } else {
                    supportingFiles.add(new SupportingFile("openapi.mustache",
                            ("src/main/resources").replace("/", java.io.File.separator), "openapi.yaml"));
                }
            }
-        } else if (this.openapiDocketConfig && !SPRING_CLOUD_LIBRARY.equals(library) && !this.reactive && !this.apiFirst) {
+        } else if (openapiDocketConfig && !SPRING_CLOUD_LIBRARY.equals(library) && !reactive && !apiFirst) {
            supportingFiles.add(new SupportingFile("openapiDocumentationConfig.mustache",
-                    (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "OpenAPIDocumentationConfig.java"));
+                    (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator),
+                    "OpenAPIDocumentationConfig.java"));
        }

        if (!SPRING_CLOUD_LIBRARY.equals(library)) {
@@ -408,90 +453,86 @@ public class SpringCodegen extends AbstractJavaCodegen
                    (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "ApiUtil.java"));
        }

-        if (this.apiFirst) {
+        if (apiFirst) {
            apiTemplateFiles.clear();
            modelTemplateFiles.clear();
        }

        if ("threetenbp".equals(dateLibrary)) {
            supportingFiles.add(new SupportingFile("customInstantDeserializer.mustache",
-                    (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "CustomInstantDeserializer.java"));
+                    (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator),
+                    "CustomInstantDeserializer.java"));
            if (SPRING_BOOT.equals(library) || SPRING_CLOUD_LIBRARY.equals(library)) {
                supportingFiles.add(new SupportingFile("jacksonConfiguration.mustache",
-                        (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "JacksonConfiguration.java"));
+                        (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator),
+                        "JacksonConfiguration.java"));
            }
        }

-        if ((!this.delegatePattern && this.java8) || this.delegateMethod) {
+        if ((!delegatePattern && java8) || delegateMethod) {
            additionalProperties.put("jdk8-no-delegate", true);
        }

-
-        if (this.delegatePattern && !this.delegateMethod) {
+        if (delegatePattern && !delegateMethod) {
            additionalProperties.put("isDelegate", "true");
            apiTemplateFiles.put("apiDelegate.mustache", "Delegate.java");
        }

-
-        if (this.java8) {
+        if (java8) {
            additionalProperties.put("javaVersion", "1.8");
            if (SPRING_CLOUD_LIBRARY.equals(library)) {
                additionalProperties.put("jdk8-default-interface", false);
            } else {
-                additionalProperties.put("jdk8-default-interface", !this.skipDefaultInterface);
+                additionalProperties.put("jdk8-default-interface", !skipDefaultInterface);
            }
            additionalProperties.put("jdk8", true);
-            if (this.async) {
+            if (async) {
                additionalProperties.put(RESPONSE_WRAPPER, "CompletableFuture");
            }
-            if (this.reactive) {
+            if (reactive) {
                additionalProperties.put(RESPONSE_WRAPPER, "Mono");
            }
-        } else if (this.async) {
+        } else if (async) {
            additionalProperties.put(RESPONSE_WRAPPER, "Callable");
        }

-
-        if (!this.apiFirst && !this.reactive) {
+        if (!apiFirst && !reactive) {
            additionalProperties.put("useSpringfox", true);
        }

-
        // Some well-known Spring or Spring-Cloud response wrappers
-        if (isNotEmpty(this.responseWrapper)) {
+        if (isNotEmpty(responseWrapper)) {
            additionalProperties.put("jdk8", false);
            additionalProperties.put("jdk8-default-interface", false);
-            switch (this.responseWrapper) {
-                case "Future":
-                case "Callable":
-                case "CompletableFuture":
-                    additionalProperties.put(RESPONSE_WRAPPER, "java.util.concurrent." + this.responseWrapper);
-                    break;
-                case "ListenableFuture":
-                    additionalProperties.put(RESPONSE_WRAPPER, "org.springframework.util.concurrent.ListenableFuture");
-                    break;
-                case "DeferredResult":
-                    additionalProperties.put(RESPONSE_WRAPPER, "org.springframework.web.context.request.async.DeferredResult");
-                    break;
-                case "HystrixCommand":
-                    additionalProperties.put(RESPONSE_WRAPPER, "com.netflix.hystrix.HystrixCommand");
-                    break;
-                case "RxObservable":
-                    additionalProperties.put(RESPONSE_WRAPPER, "rx.Observable");
-                    break;
-                case "RxSingle":
-                    additionalProperties.put(RESPONSE_WRAPPER, "rx.Single");
-                    break;
-                default:
-                    break;
+            switch (responseWrapper) {
+            case "Future":
+            case "Callable":
+            case "CompletableFuture":
+                additionalProperties.put(RESPONSE_WRAPPER, "java.util.concurrent." + responseWrapper);
+                break;
+            case "ListenableFuture":
+                additionalProperties.put(RESPONSE_WRAPPER, "org.springframework.util.concurrent.ListenableFuture");
+                break;
+            case "DeferredResult":
+                additionalProperties.put(RESPONSE_WRAPPER,
+                        "org.springframework.web.context.request.async.DeferredResult");
+                break;
+            case "RxObservable":
+                additionalProperties.put(RESPONSE_WRAPPER, "rx.Observable");
+                break;
+            case "RxSingle":
+                additionalProperties.put(RESPONSE_WRAPPER, "rx.Single");
+                break;
+            default:
+                break;
            }
        }

        // add lambda for mustache templates
-        additionalProperties.put("lambdaRemoveDoubleQuote",
-                (Mustache.Lambda) (fragment, writer) -> writer.write(fragment.execute().replaceAll("\"", Matcher.quoteReplacement(""))));
-        additionalProperties.put("lambdaEscapeDoubleQuote",
-                (Mustache.Lambda) (fragment, writer) -> writer.write(fragment.execute().replaceAll("\"", Matcher.quoteReplacement("\\\""))));
+        additionalProperties.put("lambdaRemoveDoubleQuote", (Mustache.Lambda) (fragment, writer) -> writer
+                .write(fragment.execute().replaceAll("\"", Matcher.quoteReplacement(""))));
+        additionalProperties.put("lambdaEscapeDoubleQuote", (Mustache.Lambda) (fragment, writer) -> writer
+                .write(fragment.execute().replaceAll("\"", Matcher.quoteReplacement("\\\""))));
        additionalProperties.put("lambdaRemoveLineBreak",
                (Mustache.Lambda) (fragment, writer) -> writer.write(fragment.execute().replaceAll("\\r|\\n", "")));

@@ -501,13 +542,14 @@ public class SpringCodegen extends AbstractJavaCodegen
    }

    @Override
-    public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map<String, List<CodegenOperation>> operations) {
+    public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co,
+            Map<String, List<CodegenOperation>> operations) {
        if ((SPRING_BOOT.equals(library) || SPRING_MVC_LIBRARY.equals(library)) && !useTags) {
            String basePath = resourcePath;
            if (basePath.startsWith("/")) {
                basePath = basePath.substring(1);
            }
-            int pos = basePath.indexOf("/");
+            final int pos = basePath.indexOf("/");
            if (pos > 0) {
                basePath = basePath.substring(0, pos);
            }
@@ -517,7 +559,7 @@ public class SpringCodegen extends AbstractJavaCodegen
            } else {
                co.subresourceOperation = !co.path.isEmpty();
            }
-            List<CodegenOperation> opList = operations.computeIfAbsent(basePath, k -> new ArrayList<>());
+            final List<CodegenOperation> opList = operations.computeIfAbsent(basePath, k -> new ArrayList<>());
            opList.add(co);
            co.baseName = basePath;
        } else {
@@ -528,11 +570,10 @@ public class SpringCodegen extends AbstractJavaCodegen
    @Override
    public void preprocessOpenAPI(OpenAPI openAPI) {
        super.preprocessOpenAPI(openAPI);
-        /* TODO the following logic should not need anymore in OAS 3.0
-        if ("/".equals(swagger.getBasePath())) {
-            swagger.setBasePath("");
-        }
-        */
+        /*
+         * TODO the following logic should not need anymore in OAS 3.0 if
+         * ("/".equals(swagger.getBasePath())) { swagger.setBasePath(""); }
+         */

        if (!additionalProperties.containsKey(TITLE)) {
            // From the title, compute a reasonable name for the package and the API
@@ -550,26 +591,26 @@ public class SpringCodegen extends AbstractJavaCodegen
            additionalProperties.put(TITLE, this.title);
        }

-        if(!additionalProperties.containsKey(SERVER_PORT)) {
-            URL url = URLPathUtils.getServerURL(openAPI, serverVariableOverrides());
-            this.additionalProperties.put(SERVER_PORT, URLPathUtils.getPort(url, 8080));
+        if (!additionalProperties.containsKey(SERVER_PORT)) {
+            final URL url = URLPathUtils.getServerURL(openAPI, serverVariableOverrides());
+            additionalProperties.put(SERVER_PORT, URLPathUtils.getPort(url, 8080));
        }

        if (openAPI.getPaths() != null) {
-            for (Map.Entry<String, PathItem> openAPIGetPathsEntry : openAPI.getPaths().entrySet()) {
-                String pathname = openAPIGetPathsEntry.getKey();
-                PathItem path = openAPIGetPathsEntry.getValue();
+            for (final Map.Entry<String, PathItem> openAPIGetPathsEntry : openAPI.getPaths().entrySet()) {
+                final String pathname = openAPIGetPathsEntry.getKey();
+                final PathItem path = openAPIGetPathsEntry.getValue();
                if (path.readOperations() != null) {
-                    for (Operation operation : path.readOperations()) {
+                    for (final Operation operation : path.readOperations()) {
                        if (operation.getTags() != null) {
-                            List<Map<String, String>> tags = new ArrayList<Map<String, String>>();
-                            for (String tag : operation.getTags()) {
-                                Map<String, String> value = new HashMap<String, String>();
+                            final List<Map<String, String>> tags = new ArrayList<>();
+                            for (final String tag : operation.getTags()) {
+                                final Map<String, String> value = new HashMap<>();
                                value.put("tag", tag);
                                tags.add(value);
                            }
                            if (operation.getTags().size() > 0) {
-                                String tag = operation.getTags().get(0);
+                                final String tag = operation.getTags().get(0);
                                operation.setTags(Arrays.asList(tag));
                            }
                            operation.addExtension("x-tags", tags);
@@ -582,11 +623,11 @@ public class SpringCodegen extends AbstractJavaCodegen

    @Override
    public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> objs, List<Object> allModels) {
-        Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
+        final Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
        if (operations != null) {
-            List<CodegenOperation> ops = (List<CodegenOperation>) operations.get("operation");
+            final List<CodegenOperation> ops = (List<CodegenOperation>) operations.get("operation");
            for (final CodegenOperation operation : ops) {
-                List<CodegenResponse> responses = operation.responses;
+                final List<CodegenResponse> responses = operation.responses;
                if (responses != null) {
                    for (final CodegenResponse resp : responses) {
                        if ("0".equals(resp.code)) {
@@ -636,26 +677,27 @@ public class SpringCodegen extends AbstractJavaCodegen

    /**
     * @param returnType       The return type that needs to be converted
-     * @param dataTypeAssigner An object that will assign the data to the respective fields in the model.
+     * @param dataTypeAssigner An object that will assign the data to the respective
+     *                         fields in the model.
     */
    private void doDataTypeAssignment(String returnType, DataTypeAssigner dataTypeAssigner) {
        final String rt = returnType;
        if (rt == null) {
            dataTypeAssigner.setReturnType("Void");
        } else if (rt.startsWith("List")) {
-            int end = rt.lastIndexOf(">");
+            final int end = rt.lastIndexOf(">");
            if (end > 0) {
                dataTypeAssigner.setReturnType(rt.substring("List<".length(), end).trim());
                dataTypeAssigner.setReturnContainer("List");
            }
        } else if (rt.startsWith("Map")) {
-            int end = rt.lastIndexOf(">");
+            final int end = rt.lastIndexOf(">");
            if (end > 0) {
                dataTypeAssigner.setReturnType(rt.substring("Map<".length(), end).split(",", 2)[1].trim());
                dataTypeAssigner.setReturnContainer("Map");
            }
        } else if (rt.startsWith("Set")) {
-            int end = rt.lastIndexOf(">");
+            final int end = rt.lastIndexOf(">");
            if (end > 0) {
                dataTypeAssigner.setReturnType(rt.substring("Set<".length(), end).trim());
                dataTypeAssigner.setReturnContainer("Set");
@@ -675,7 +717,7 @@ public class SpringCodegen extends AbstractJavaCodegen
        final ArrayList<CodegenParameter> copy = new ArrayList<>(allParams);
        allParams.clear();

-        for (CodegenParameter p : copy) {
+        for (final CodegenParameter p : copy) {
            if (!p.isHeaderParam) {
                allParams.add(p);
            }
@@ -686,9 +728,9 @@ public class SpringCodegen extends AbstractJavaCodegen
    public Map<String, Object> postProcessSupportingFileData(Map<String, Object> objs) {
        generateYAMLSpecFile(objs);
        if (SPRING_CLOUD_LIBRARY.equals(library)) {
-            List<CodegenSecurity> authMethods = (List<CodegenSecurity>) objs.get("authMethods");
+            final List<CodegenSecurity> authMethods = (List<CodegenSecurity>) objs.get("authMethods");
            if (authMethods != null) {
-                for (CodegenSecurity authMethod : authMethods) {
+                for (final CodegenSecurity authMethod : authMethods) {
                    authMethod.name = camelize(sanitizeName(authMethod.name), true);
                }
            }
@@ -724,7 +766,8 @@ public class SpringCodegen extends AbstractJavaCodegen
            if (example == null) {
                example = "/path/to/file";
            }
-            example = "new org.springframework.core.io.FileSystemResource(new java.io.File(\"" + escapeText(example) + "\"))";
+            example = "new org.springframework.core.io.FileSystemResource(new java.io.File(\"" + escapeText(example)
+                    + "\"))";
            p.example = example;
        } else {
            super.setParameterExampleValue(p);
@@ -740,7 +783,7 @@ public class SpringCodegen extends AbstractJavaCodegen
    }

    public String getConfigPackage() {
-        return this.configPackage;
+        return configPackage;
    }

    public boolean isUnhandledException() {
@@ -752,7 +795,7 @@ public class SpringCodegen extends AbstractJavaCodegen
    }

    public String getBasePackage() {
-        return this.basePackage;
+        return basePackage;
    }

    public void setInterfaceOnly(boolean interfaceOnly) {
@@ -767,9 +810,13 @@ public class SpringCodegen extends AbstractJavaCodegen
        this.singleContentTypes = singleContentTypes;
    }

-    public void setSkipDefaultInterface(boolean skipDefaultInterface) { this.skipDefaultInterface = skipDefaultInterface; }
+    public void setSkipDefaultInterface(boolean skipDefaultInterface) {
+        this.skipDefaultInterface = skipDefaultInterface;
+    }

-    public void setJava8(boolean java8) { this.java8 = java8; }
+    public void setJava8(boolean java8) {
+        this.java8 = java8;
+    }

    public void setVirtualService(boolean virtualService) {
        this.virtualService = virtualService;
@@ -823,7 +870,7 @@ public class SpringCodegen extends AbstractJavaCodegen
            property.example = null;
        }

-        //Add imports for Jackson
+        // Add imports for Jackson
        if (!Boolean.TRUE.equals(model.isEnum)) {
            model.imports.add("JsonProperty");

@@ -831,7 +878,7 @@ public class SpringCodegen extends AbstractJavaCodegen
                model.imports.add("JsonValue");
            }
        } else { // enum class
-            //Needed imports for Jackson's JsonCreator
+            // Needed imports for Jackson's JsonCreator
            if (additionalProperties.containsKey(JACKSON)) {
                model.imports.add("JsonCreator");
            }
@@ -851,16 +898,16 @@ public class SpringCodegen extends AbstractJavaCodegen
    public Map<String, Object> postProcessModelsEnum(Map<String, Object> objs) {
        objs = super.postProcessModelsEnum(objs);

-        //Add imports for Jackson
-        List<Map<String, String>> imports = (List<Map<String, String>>) objs.get("imports");
-        List<Object> models = (List<Object>) objs.get("models");
-        for (Object _mo : models) {
-            Map<String, Object> mo = (Map<String, Object>) _mo;
-            CodegenModel cm = (CodegenModel) mo.get("model");
+        // Add imports for Jackson
+        final List<Map<String, String>> imports = (List<Map<String, String>>) objs.get("imports");
+        final List<Object> models = (List<Object>) objs.get("models");
+        for (final Object _mo : models) {
+            final Map<String, Object> mo = (Map<String, Object>) _mo;
+            final CodegenModel cm = (CodegenModel) mo.get("model");
            // for enum model
            if (Boolean.TRUE.equals(cm.isEnum) && cm.allowableValues != null) {
                cm.imports.add(importMapping.get("JsonValue"));
-                Map<String, String> item = new HashMap<String, String>();
+                final Map<String, String> item = new HashMap<>();
                item.put("import", importMapping.get("JsonValue"));
                imports.add(item);
            }
@@ -869,10 +916,12 @@ public class SpringCodegen extends AbstractJavaCodegen
        return objs;
    }

+    @Override
    public void setUseBeanValidation(boolean useBeanValidation) {
        this.useBeanValidation = useBeanValidation;
    }

+    @Override
    public void setPerformBeanValidation(boolean performBeanValidation) {
        this.performBeanValidation = performBeanValidation;
    }
--- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/clientConfiguration.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/clientConfiguration.mustache
@@ -21,7 +21,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 {{#authMethods}}
 {{#isOAuth}}
-import org.springframework.cloud.security.oauth2.client.feign.OAuth2FeignRequestInterceptor;
+import org.springframework.cloud.openfeign.security.OAuth2FeignRequestInterceptor;
 import org.springframework.security.oauth2.client.DefaultOAuth2ClientContext;
 import org.springframework.security.oauth2.client.OAuth2ClientContext;
 {{#isApplication}}
--- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache
@@ -22,7 +22,7 @@
    <parent>
        <groupId>org.springframework.boot</groupId>
        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.5.RELEASE</version>
+        <version>2.5.5</version>
    </parent>
 {{/parentOverridden}}
    <build>
@@ -35,7 +35,7 @@
            <dependency>
                <groupId>org.springframework.cloud</groupId>
                <artifactId>spring-cloud-starter-parent</artifactId>
-                <version>Finchley.SR1</version>
+                <version>2020.0.4</version>
                <type>pom</type>
                <scope>import</scope>
            </dependency>
@@ -64,6 +64,7 @@
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-oauth2</artifactId>
+            <version>2.2.5.RELEASE</version>
        </dependency>
        {{#withXml}}
        <!-- XML processing: Jackson -->
@@ -98,7 +99,7 @@
            <groupId>org.openapitools</groupId>
            <artifactId>jackson-databind-nullable</artifactId>
            {{^parentOverridden}}
-            <version>0.1.0</version>
+            <version>0.2.1</version>
            {{/parentOverridden}}
        </dependency>
        {{/openApiNullable}}
@@ -126,7 +127,7 @@
        <dependency>
            <groupId>io.springfox</groupId>
            <artifactId>springfox-swagger2</artifactId>
-            <version>2.8.0</version>
+            <version>3.0.0</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.data</groupId>
--- a/modules/openapi-generator/src/main/resources/java-pkmst/SpringBootApplication.mustache
+++ b/modules/openapi-generator/src/main/resources/java-pkmst/SpringBootApplication.mustache
@@ -4,11 +4,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
 {{#eurekaUri}}
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 {{/eurekaUri}}
-import org.springframework.cloud.netflix.hystrix.dashboard.EnableHystrixDashboard;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;

 /**
@@ -22,8 +20,6 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 {{#eurekaUri}}
@EnableEurekaClient
 {{/eurekaUri}}
-@EnableCircuitBreaker
-@EnableHystrixDashboard
 public class {{serviceName}}Application {

  private static final Logger LOGGER = LoggerFactory.getLogger({{serviceName}}Application.class);
--- a/modules/openapi-generator/src/main/resources/java-pkmst/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/java-pkmst/pom.mustache
@@ -113,18 +113,11 @@
        <groupId>org.springframework.boot</groupId>
        <artifactId>spring-boot-starter-jetty</artifactId>
      </dependency>
-      <!--<dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-netflix-hystrix-stream</artifactId>
-        </dependency>
+      <!--
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-bus-amqp</artifactId>
        </dependency>-->
-      <dependency>
-         <groupId>org.springframework.cloud</groupId>
-         <artifactId>spring-cloud-starter-hystrix-dashboard</artifactId>
-      </dependency>
      <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-jdbc</artifactId>
--- a/modules/openapi-generator/src/main/resources/java-pkmst/resources/application-dev.mustache
+++ b/modules/openapi-generator/src/main/resources/java-pkmst/resources/application-dev.mustache
@@ -38,10 +38,6 @@ info:
    description: Microservice developed by PKMST
    version: {{artifactVersion}}

-health:
-  hystrix:
-    enabled: true
-
 security:
  basic:
    enabled: false
--- a/modules/openapi-generator/src/main/resources/java-pkmst/resources/application-local.mustache
+++ b/modules/openapi-generator/src/main/resources/java-pkmst/resources/application-local.mustache
@@ -37,14 +37,11 @@ info:
    name: {{serviceName}}
    description: Microservice developed by PKMST
    version: {{artifactVersion}}
-
-health:
-  hystrix:
-    enabled: true
-
+    
 security:
  basic:
    enabled: false
+
 # provide rabbitmq configuration
 spring:
  rabbitmq:
--- a/pom.xml
+++ b/pom.xml
@@ -1085,18 +1085,6 @@
                <module>samples/server/petstore/springboot-virtualan</module>
            </modules>
        </profile>
-        <profile>
-            <id>spring-cloud</id>
-            <activation>
-                <property>
-                    <name>env</name>
-                    <value>java</value>
-                </property>
-            </activation>
-            <modules>
-                <module>samples/client/petstore/spring-cloud</module>
-            </modules>
-        </profile>
        <profile>
            <id>scalatra-server</id>
            <activation>
--- a/samples/client/petstore/spring-cloud-async/pom.xml
+++ b/samples/client/petstore/spring-cloud-async/pom.xml
@@ -14,7 +14,7 @@
    <parent>
        <groupId>org.springframework.boot</groupId>
        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.5.RELEASE</version>
+        <version>2.5.5</version>
    </parent>
    <build>
        <sourceDirectory>src/main/java</sourceDirectory>
@@ -25,7 +25,7 @@
            <dependency>
                <groupId>org.springframework.cloud</groupId>
                <artifactId>spring-cloud-starter-parent</artifactId>
-                <version>Finchley.SR1</version>
+                <version>2020.0.4</version>
                <type>pom</type>
                <scope>import</scope>
            </dependency>
@@ -51,6 +51,7 @@
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-oauth2</artifactId>
+            <version>2.2.5.RELEASE</version>
        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.datatype</groupId>
@@ -59,7 +60,7 @@
        <dependency>
            <groupId>org.openapitools</groupId>
            <artifactId>jackson-databind-nullable</artifactId>
-            <version>0.1.0</version>
+            <version>0.2.1</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
@@ -74,7 +75,7 @@
        <dependency>
            <groupId>io.springfox</groupId>
            <artifactId>springfox-swagger2</artifactId>
-            <version>2.8.0</version>
+            <version>3.0.0</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.data</groupId>
--- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/configuration/ClientConfiguration.java
+++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/configuration/ClientConfiguration.java
@@ -6,7 +6,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.cloud.security.oauth2.client.feign.OAuth2FeignRequestInterceptor;
+import org.springframework.cloud.openfeign.security.OAuth2FeignRequestInterceptor;
 import org.springframework.security.oauth2.client.DefaultOAuth2ClientContext;
 import org.springframework.security.oauth2.client.OAuth2ClientContext;
 import org.springframework.security.oauth2.client.token.grant.implicit.ImplicitResourceDetails;
--- a/samples/client/petstore/spring-cloud-no-nullable/.openapi-generator-ignore
+++ b/samples/client/petstore/spring-cloud-no-nullable/.openapi-generator-ignore
@@ -1,23 +0,0 @@
-# OpenAPI Generator Ignore
-# Generated by openapi-generator https://github.com/openapitools/openapi-generator
-
-# Use this file to prevent files from being overwritten by the generator.
-# The patterns follow closely to .gitignore or .dockerignore.
-
-# As an example, the C# client generator defines ApiClient.cs.
-# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
-#ApiClient.cs
-
-# You can match any string of characters against a directory, file or extension with a single asterisk (*):
-#foo/*/qux
-# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
-
-# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
-#foo/**/qux
-# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
-
-# You can also negate patterns with an exclamation (!).
-# For example, you can ignore all files in a docs folder with the file extension .md:
-#docs/*.md
-# Then explicitly reverse the ignore rule for a single file:
-#!docs/README.md
--- a/samples/client/petstore/spring-cloud-no-nullable/.openapi-generator/FILES
+++ b/samples/client/petstore/spring-cloud-no-nullable/.openapi-generator/FILES
@@ -1,16 +0,0 @@
-README.md
-pom.xml
-src/main/java/org/openapitools/api/PetApi.java
-src/main/java/org/openapitools/api/PetApiClient.java
-src/main/java/org/openapitools/api/StoreApi.java
-src/main/java/org/openapitools/api/StoreApiClient.java
-src/main/java/org/openapitools/api/UserApi.java
-src/main/java/org/openapitools/api/UserApiClient.java
-src/main/java/org/openapitools/configuration/ApiKeyRequestInterceptor.java
-src/main/java/org/openapitools/configuration/ClientConfiguration.java
-src/main/java/org/openapitools/model/Category.java
-src/main/java/org/openapitools/model/ModelApiResponse.java
-src/main/java/org/openapitools/model/Order.java
-src/main/java/org/openapitools/model/Pet.java
-src/main/java/org/openapitools/model/Tag.java
-src/main/java/org/openapitools/model/User.java
--- a/samples/client/petstore/spring-cloud-no-nullable/.openapi-generator/VERSION
+++ b/samples/client/petstore/spring-cloud-no-nullable/.openapi-generator/VERSION
@@ -1 +0,0 @@
-5.3.0-SNAPSHOT
--- a/samples/client/petstore/spring-cloud-no-nullable/README.md
+++ b/samples/client/petstore/spring-cloud-no-nullable/README.md
@@ -1,53 +0,0 @@
-# petstore-spring-cloud-no-nullable
-
-## Requirements
-
-Building the API client library requires [Maven](https://maven.apache.org/) to be installed.
-
-## Installation
-
-To install the API client library to your local Maven repository, simply execute:
-
-```shell
-mvn install
-```
-
-To deploy it to a remote Maven repository instead, configure the settings of the repository and execute:
-
-```shell
-mvn deploy
-```
-
-Refer to the [official documentation](https://maven.apache.org/plugins/maven-deploy-plugin/usage.html) for more information.
-
-### Maven users
-
-Add this dependency to your project's POM:
-
-```xml
-<dependency>
-    <groupId>org.openapitools</groupId>
-    <artifactId>petstore-spring-cloud-no-nullable</artifactId>
-    <version>1.0.0</version>
-    <scope>compile</scope>
-</dependency>
-```
-
-### Gradle users
-
-Add this dependency to your project's build file:
-
-```groovy
-compile "org.openapitools:petstore-spring-cloud-no-nullable:1.0.0"
-```
-
-### Others
-
-At first generate the JAR by executing:
-
-mvn package
-
-Then manually install the following JARs:
-
-* target/petstore-spring-cloud-no-nullable-1.0.0.jar
-* target/lib/*.jar
--- a/samples/client/petstore/spring-cloud-no-nullable/pom.xml
+++ b/samples/client/petstore/spring-cloud-no-nullable/pom.xml
@@ -1,79 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.openapitools</groupId>
-    <artifactId>petstore-spring-cloud-no-nullable</artifactId>
-    <packaging>jar</packaging>
-    <name>petstore-spring-cloud-no-nullable</name>
-    <version>1.0.0</version>
-    <properties>
-        <java.version>1.8</java.version>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
-        <swagger-core-version>1.5.18</swagger-core-version>
-    </properties>
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.5.RELEASE</version>
-    </parent>
-    <build>
-        <sourceDirectory>src/main/java</sourceDirectory>
-    </build>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-starter-parent</artifactId>
-                <version>Finchley.SR1</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-core-version}</version>
-        </dependency>
-        <!-- @Nullable annotation -->
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <version>3.0.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-oauth2</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate.validator</groupId>
-            <artifactId>hibernate-validator</artifactId>
-            <version>6.0.16.Final</version>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>2.8.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-commons</artifactId>
-        </dependency>
-    </dependencies>
-</project>
--- a/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/PetApi.java
@@ -1,216 +0,0 @@
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-package org.openapitools.api;
-
-import org.openapitools.model.ModelApiResponse;
-import org.openapitools.model.Pet;
-import io.swagger.annotations.*;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.context.request.NativeWebRequest;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.validation.Valid;
-import javax.validation.constraints.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-@Validated
-@Api(value = "Pet", description = "the Pet API")
-public interface PetApi {
-
-    /**
-     * POST /pet : Add a new pet to the store
-     *
-     * @param body Pet object that needs to be added to the store (required)
-     * @return Invalid input (status code 405)
-     */
-    @ApiOperation(value = "Add a new pet to the store", nickname = "addPet", notes = "", authorizations = {
-        @Authorization(value = "petstore_auth", scopes = {
-            @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-            @AuthorizationScope(scope = "read:pets", description = "read your pets") })
-         }, tags={ "pet", })
-    @ApiResponses(value = { 
-        @ApiResponse(code = 405, message = "Invalid input") })
-    @RequestMapping(
-        method = RequestMethod.POST,
-        value = "/pet",
-        consumes = "application/json"
-    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> addPet(@ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body);
-
-
-    /**
-     * DELETE /pet/{petId} : Deletes a pet
-     *
-     * @param petId Pet id to delete (required)
-     * @param apiKey  (optional)
-     * @return Invalid pet value (status code 400)
-     */
-    @ApiOperation(value = "Deletes a pet", nickname = "deletePet", notes = "", authorizations = {
-        @Authorization(value = "petstore_auth", scopes = {
-            @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-            @AuthorizationScope(scope = "read:pets", description = "read your pets") })
-         }, tags={ "pet", })
-    @ApiResponses(value = { 
-        @ApiResponse(code = 400, message = "Invalid pet value") })
-    @RequestMapping(
-        method = RequestMethod.DELETE,
-        value = "/pet/{petId}"
-    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> deletePet(@ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId,@ApiParam(value = "") @RequestHeader(value = "api_key", required = false) String apiKey);
-
-
-    /**
-     * GET /pet/findByStatus : Finds Pets by status
-     * Multiple status values can be provided with comma separated strings
-     *
-     * @param status Status values that need to be considered for filter (required)
-     * @return successful operation (status code 200)
-     *         or Invalid status value (status code 400)
-     */
-    @ApiOperation(value = "Finds Pets by status", nickname = "findPetsByStatus", notes = "Multiple status values can be provided with comma separated strings", response = Pet.class, responseContainer = "List", authorizations = {
-        @Authorization(value = "petstore_auth", scopes = {
-            @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-            @AuthorizationScope(scope = "read:pets", description = "read your pets") })
-         }, tags={ "pet", })
-    @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
-        @ApiResponse(code = 400, message = "Invalid status value") })
-    @RequestMapping(
-        method = RequestMethod.GET,
-        value = "/pet/findByStatus",
-        produces = "application/json"
-    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<List<Pet>>> findPetsByStatus(@NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List<String> status);
-
-
-    /**
-     * GET /pet/findByTags : Finds Pets by tags
-     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-     *
-     * @param tags Tags to filter by (required)
-     * @return successful operation (status code 200)
-     *         or Invalid tag value (status code 400)
-     * @deprecated
-     */
-    @ApiOperation(value = "Finds Pets by tags", nickname = "findPetsByTags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List", authorizations = {
-        @Authorization(value = "petstore_auth", scopes = {
-            @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-            @AuthorizationScope(scope = "read:pets", description = "read your pets") })
-         }, tags={ "pet", })
-    @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "successful operation", response = Pet.class, responseContainer = "List"),
-        @ApiResponse(code = 400, message = "Invalid tag value") })
-    @RequestMapping(
-        method = RequestMethod.GET,
-        value = "/pet/findByTags",
-        produces = "application/json"
-    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<List<Pet>>> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List<String> tags);
-
-
-    /**
-     * GET /pet/{petId} : Find pet by ID
-     * Returns a single pet
-     *
-     * @param petId ID of pet to return (required)
-     * @return successful operation (status code 200)
-     *         or Invalid ID supplied (status code 400)
-     *         or Pet not found (status code 404)
-     */
-    @ApiOperation(value = "Find pet by ID", nickname = "getPetById", notes = "Returns a single pet", response = Pet.class, authorizations = {
-        
-        @Authorization(value = "api_key")
-         }, tags={ "pet", })
-    @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "successful operation", response = Pet.class),
-        @ApiResponse(code = 400, message = "Invalid ID supplied"),
-        @ApiResponse(code = 404, message = "Pet not found") })
-    @RequestMapping(
-        method = RequestMethod.GET,
-        value = "/pet/{petId}",
-        produces = "application/json"
-    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<Pet>> getPetById(@ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId);
-
-
-    /**
-     * PUT /pet : Update an existing pet
-     *
-     * @param body Pet object that needs to be added to the store (required)
-     * @return Invalid ID supplied (status code 400)
-     *         or Pet not found (status code 404)
-     *         or Validation exception (status code 405)
-     */
-    @ApiOperation(value = "Update an existing pet", nickname = "updatePet", notes = "", authorizations = {
-        @Authorization(value = "petstore_auth", scopes = {
-            @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-            @AuthorizationScope(scope = "read:pets", description = "read your pets") })
-         }, tags={ "pet", })
-    @ApiResponses(value = { 
-        @ApiResponse(code = 400, message = "Invalid ID supplied"),
-        @ApiResponse(code = 404, message = "Pet not found"),
-        @ApiResponse(code = 405, message = "Validation exception") })
-    @RequestMapping(
-        method = RequestMethod.PUT,
-        value = "/pet",
-        consumes = "application/json"
-    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> updatePet(@ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body);
-
-
-    /**
-     * POST /pet/{petId} : Updates a pet in the store with form data
-     *
-     * @param petId ID of pet that needs to be updated (required)
-     * @param name Updated name of the pet (optional)
-     * @param status Updated status of the pet (optional)
-     * @return Invalid input (status code 405)
-     */
-    @ApiOperation(value = "Updates a pet in the store with form data", nickname = "updatePetWithForm", notes = "", authorizations = {
-        @Authorization(value = "petstore_auth", scopes = {
-            @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-            @AuthorizationScope(scope = "read:pets", description = "read your pets") })
-         }, tags={ "pet", })
-    @ApiResponses(value = { 
-        @ApiResponse(code = 405, message = "Invalid input") })
-    @RequestMapping(
-        method = RequestMethod.POST,
-        value = "/pet/{petId}",
-        consumes = "application/x-www-form-urlencoded"
-    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> updatePetWithForm(@ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId,@ApiParam(value = "Updated name of the pet" ) @RequestParam(value="name", required=false)  String name,@ApiParam(value = "Updated status of the pet" ) @RequestParam(value="status", required=false)  String status);
-
-
-    /**
-     * POST /pet/{petId}/uploadImage : uploads an image
-     *
-     * @param petId ID of pet to update (required)
-     * @param additionalMetadata Additional data to pass to server (optional)
-     * @param file file to upload (optional)
-     * @return successful operation (status code 200)
-     */
-    @ApiOperation(value = "uploads an image", nickname = "uploadFile", notes = "", response = ModelApiResponse.class, authorizations = {
-        @Authorization(value = "petstore_auth", scopes = {
-            @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
-            @AuthorizationScope(scope = "read:pets", description = "read your pets") })
-         }, tags={ "pet", })
-    @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "successful operation", response = ModelApiResponse.class) })
-    @RequestMapping(
-        method = RequestMethod.POST,
-        value = "/pet/{petId}/uploadImage",
-        produces = "application/json",
-        consumes = "multipart/form-data"
-    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<ModelApiResponse>> uploadFile(@ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId,@ApiParam(value = "Additional data to pass to server" ) @RequestParam(value="additionalMetadata", required=false)  String additionalMetadata,@ApiParam(value = "file to upload") @RequestParam("file") MultipartFile file);
-
-}
--- a/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/PetApiClient.java
+++ b/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/PetApiClient.java
@@ -1,8 +0,0 @@
-package org.openapitools.api;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.openapitools.configuration.ClientConfiguration;
-
-@FeignClient(name="${pet.name:pet}", url="${pet.url:http://petstore.swagger.io/v2}", configuration = ClientConfiguration.class)
-public interface PetApiClient extends PetApi {
-}
--- a/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/StoreApi.java
@@ -1,108 +0,0 @@
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-package org.openapitools.api;
-
-import java.util.Map;
-import org.openapitools.model.Order;
-import io.swagger.annotations.*;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.context.request.NativeWebRequest;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.validation.Valid;
-import javax.validation.constraints.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-@Validated
-@Api(value = "Store", description = "the Store API")
-public interface StoreApi {
-
-    /**
-     * DELETE /store/order/{orderId} : Delete purchase order by ID
-     * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
-     *
-     * @param orderId ID of the order that needs to be deleted (required)
-     * @return Invalid ID supplied (status code 400)
-     *         or Order not found (status code 404)
-     */
-    @ApiOperation(value = "Delete purchase order by ID", nickname = "deleteOrder", notes = "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors", tags={ "store", })
-    @ApiResponses(value = { 
-        @ApiResponse(code = 400, message = "Invalid ID supplied"),
-        @ApiResponse(code = 404, message = "Order not found") })
-    @RequestMapping(
-        method = RequestMethod.DELETE,
-        value = "/store/order/{orderId}"
-    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") String orderId);
-
-
-    /**
-     * GET /store/inventory : Returns pet inventories by status
-     * Returns a map of status codes to quantities
-     *
-     * @return successful operation (status code 200)
-     */
-    @ApiOperation(value = "Returns pet inventories by status", nickname = "getInventory", notes = "Returns a map of status codes to quantities", response = Integer.class, responseContainer = "Map", authorizations = {
-        
-        @Authorization(value = "api_key")
-         }, tags={ "store", })
-    @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "successful operation", response = Map.class, responseContainer = "Map") })
-    @RequestMapping(
-        method = RequestMethod.GET,
-        value = "/store/inventory",
-        produces = "application/json"
-    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<Map<String, Integer>>> getInventory();
-
-
-    /**
-     * GET /store/order/{orderId} : Find purchase order by ID
-     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
-     *
-     * @param orderId ID of pet that needs to be fetched (required)
-     * @return successful operation (status code 200)
-     *         or Invalid ID supplied (status code 400)
-     *         or Order not found (status code 404)
-     */
-    @ApiOperation(value = "Find purchase order by ID", nickname = "getOrderById", notes = "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions", response = Order.class, tags={ "store", })
-    @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "successful operation", response = Order.class),
-        @ApiResponse(code = 400, message = "Invalid ID supplied"),
-        @ApiResponse(code = 404, message = "Order not found") })
-    @RequestMapping(
-        method = RequestMethod.GET,
-        value = "/store/order/{orderId}",
-        produces = "application/json"
-    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<Order>> getOrderById(@Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") Long orderId);
-
-
-    /**
-     * POST /store/order : Place an order for a pet
-     *
-     * @param body order placed for purchasing the pet (required)
-     * @return successful operation (status code 200)
-     *         or Invalid Order (status code 400)
-     */
-    @ApiOperation(value = "Place an order for a pet", nickname = "placeOrder", notes = "", response = Order.class, tags={ "store", })
-    @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "successful operation", response = Order.class),
-        @ApiResponse(code = 400, message = "Invalid Order") })
-    @RequestMapping(
-        method = RequestMethod.POST,
-        value = "/store/order",
-        produces = "application/json"
-    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<Order>> placeOrder(@ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body);
-
-}
--- a/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/StoreApiClient.java
+++ b/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/StoreApiClient.java
@@ -1,8 +0,0 @@
-package org.openapitools.api;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.openapitools.configuration.ClientConfiguration;
-
-@FeignClient(name="${store.name:store}", url="${store.url:http://petstore.swagger.io/v2}", configuration = ClientConfiguration.class)
-public interface StoreApiClient extends StoreApi {
-}
--- a/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/UserApi.java
@@ -1,172 +0,0 @@
-/**
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (5.3.0-SNAPSHOT).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-package org.openapitools.api;
-
-import java.util.List;
-import org.openapitools.model.User;
-import io.swagger.annotations.*;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.context.request.NativeWebRequest;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.validation.Valid;
-import javax.validation.constraints.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-@Validated
-@Api(value = "User", description = "the User API")
-public interface UserApi {
-
-    /**
-     * POST /user : Create user
-     * This can only be done by the logged in user.
-     *
-     * @param body Created user object (required)
-     * @return successful operation (status code 200)
-     */
-    @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", })
-    @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "successful operation") })
-    @RequestMapping(
-        method = RequestMethod.POST,
-        value = "/user"
-    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> createUser(@ApiParam(value = "Created user object", required = true) @Valid @RequestBody User body);
-
-
-    /**
-     * POST /user/createWithArray : Creates list of users with given input array
-     *
-     * @param body List of user object (required)
-     * @return successful operation (status code 200)
-     */
-    @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", })
-    @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "successful operation") })
-    @RequestMapping(
-        method = RequestMethod.POST,
-        value = "/user/createWithArray"
-    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> createUsersWithArrayInput(@ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<User> body);
-
-
-    /**
-     * POST /user/createWithList : Creates list of users with given input array
-     *
-     * @param body List of user object (required)
-     * @return successful operation (status code 200)
-     */
-    @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", })
-    @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "successful operation") })
-    @RequestMapping(
-        method = RequestMethod.POST,
-        value = "/user/createWithList"
-    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> createUsersWithListInput(@ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<User> body);
-
-
-    /**
-     * DELETE /user/{username} : Delete user
-     * This can only be done by the logged in user.
-     *
-     * @param username The name that needs to be deleted (required)
-     * @return Invalid username supplied (status code 400)
-     *         or User not found (status code 404)
-     */
-    @ApiOperation(value = "Delete user", nickname = "deleteUser", notes = "This can only be done by the logged in user.", tags={ "user", })
-    @ApiResponses(value = { 
-        @ApiResponse(code = 400, message = "Invalid username supplied"),
-        @ApiResponse(code = 404, message = "User not found") })
-    @RequestMapping(
-        method = RequestMethod.DELETE,
-        value = "/user/{username}"
-    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> deleteUser(@ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username);
-
-
-    /**
-     * GET /user/{username} : Get user by user name
-     *
-     * @param username The name that needs to be fetched. Use user1 for testing. (required)
-     * @return successful operation (status code 200)
-     *         or Invalid username supplied (status code 400)
-     *         or User not found (status code 404)
-     */
-    @ApiOperation(value = "Get user by user name", nickname = "getUserByName", notes = "", response = User.class, tags={ "user", })
-    @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "successful operation", response = User.class),
-        @ApiResponse(code = 400, message = "Invalid username supplied"),
-        @ApiResponse(code = 404, message = "User not found") })
-    @RequestMapping(
-        method = RequestMethod.GET,
-        value = "/user/{username}",
-        produces = "application/json"
-    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<User>> getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username);
-
-
-    /**
-     * GET /user/login : Logs user into the system
-     *
-     * @param username The user name for login (required)
-     * @param password The password for login in clear text (required)
-     * @return successful operation (status code 200)
-     *         or Invalid username/password supplied (status code 400)
-     */
-    @ApiOperation(value = "Logs user into the system", nickname = "loginUser", notes = "", response = String.class, tags={ "user", })
-    @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "successful operation", response = String.class),
-        @ApiResponse(code = 400, message = "Invalid username/password supplied") })
-    @RequestMapping(
-        method = RequestMethod.GET,
-        value = "/user/login",
-        produces = "application/json"
-    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<String>> loginUser(@NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username,@NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password);
-
-
-    /**
-     * GET /user/logout : Logs out current logged in user session
-     *
-     * @return successful operation (status code 200)
-     */
-    @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", })
-    @ApiResponses(value = { 
-        @ApiResponse(code = 200, message = "successful operation") })
-    @RequestMapping(
-        method = RequestMethod.GET,
-        value = "/user/logout"
-    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> logoutUser();
-
-
-    /**
-     * PUT /user/{username} : Updated user
-     * This can only be done by the logged in user.
-     *
-     * @param username name that need to be deleted (required)
-     * @param body Updated user object (required)
-     * @return Invalid user supplied (status code 400)
-     *         or User not found (status code 404)
-     */
-    @ApiOperation(value = "Updated user", nickname = "updateUser", notes = "This can only be done by the logged in user.", tags={ "user", })
-    @ApiResponses(value = { 
-        @ApiResponse(code = 400, message = "Invalid user supplied"),
-        @ApiResponse(code = 404, message = "User not found") })
-    @RequestMapping(
-        method = RequestMethod.PUT,
-        value = "/user/{username}"
-    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> updateUser(@ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username,@ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User body);
-
-}
--- a/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/UserApiClient.java
+++ b/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/api/UserApiClient.java
@@ -1,8 +0,0 @@
-package org.openapitools.api;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.openapitools.configuration.ClientConfiguration;
-
-@FeignClient(name="${user.name:user}", url="${user.url:http://petstore.swagger.io/v2}", configuration = ClientConfiguration.class)
-public interface UserApiClient extends UserApi {
-}
--- a/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/configuration/ApiKeyRequestInterceptor.java
+++ b/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/configuration/ApiKeyRequestInterceptor.java
@@ -1,31 +0,0 @@
-package org.openapitools.configuration;
-
-import feign.RequestInterceptor;
-import feign.RequestTemplate;
-import feign.Util;
-
-
-public class ApiKeyRequestInterceptor implements RequestInterceptor {
-  private final String location;
-  private final String name;
-  private String value;
-
-  public ApiKeyRequestInterceptor(String location, String name, String value) {
-    Util.checkNotNull(location, "location", new Object[0]);
-    Util.checkNotNull(name, "name", new Object[0]);
-    Util.checkNotNull(value, "value", new Object[0]);
-    this.location = location;
-    this.name = name;
-    this.value = value;
-  }
-
-  @Override
-  public void apply(RequestTemplate requestTemplate) {
-    if(location.equals("header")) {
-      requestTemplate.header(name, value);
-    } else if(location.equals("query")) {
-      requestTemplate.query(name, value);
-    }
-  }
-
-}
--- a/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/configuration/ClientConfiguration.java
+++ b/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/configuration/ClientConfiguration.java
@@ -1,48 +0,0 @@
-package org.openapitools.configuration;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.cloud.security.oauth2.client.feign.OAuth2FeignRequestInterceptor;
-import org.springframework.security.oauth2.client.DefaultOAuth2ClientContext;
-import org.springframework.security.oauth2.client.OAuth2ClientContext;
-import org.springframework.security.oauth2.client.token.grant.implicit.ImplicitResourceDetails;
-
-@Configuration
-@EnableConfigurationProperties
-public class ClientConfiguration {
-
-  @Value("${openapipetstore.security.apiKey.key:}")
-  private String apiKeyKey;
-
-  @Bean
-  @ConditionalOnProperty(name = "openapipetstore.security.apiKey.key")
-  public ApiKeyRequestInterceptor apiKeyRequestInterceptor() {
-    return new ApiKeyRequestInterceptor("header", "api_key", this.apiKeyKey);
-  }
-
-  @Bean
-  @ConditionalOnProperty("openapipetstore.security.petstoreAuth.client-id")
-  public OAuth2FeignRequestInterceptor petstoreAuthRequestInterceptor(OAuth2ClientContext oAuth2ClientContext) {
-    return new OAuth2FeignRequestInterceptor(oAuth2ClientContext, petstoreAuthResourceDetails());
-  }
-
-  @Bean
-  @ConditionalOnProperty("openapipetstore.security.petstoreAuth.client-id")
-  public OAuth2ClientContext oAuth2ClientContext() {
-    return new DefaultOAuth2ClientContext();
-  }
-
-  @Bean
-  @ConditionalOnProperty("openapipetstore.security.petstoreAuth.client-id")
-  @ConfigurationProperties("openapipetstore.security.petstoreAuth")
-  public ImplicitResourceDetails petstoreAuthResourceDetails() {
-    ImplicitResourceDetails details = new ImplicitResourceDetails();
-    details.setUserAuthorizationUri("http://petstore.swagger.io/api/oauth/dialog");
-    return details;
-  }
-
-}
--- a/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/model/Category.java
+++ b/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/model/Category.java
@@ -1,104 +0,0 @@
-package org.openapitools.model;
-
-import java.util.Objects;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import javax.validation.Valid;
-import javax.validation.constraints.*;
-
-/**
- * A category for a pet
- */
-@ApiModel(description = "A category for a pet")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Category   {
-  @JsonProperty("id")
-  private Long id;
-
-  @JsonProperty("name")
-  private String name;
-
-  public Category id(Long id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Get id
-   * @return id
-  */
-  @ApiModelProperty(value = "")
-
-
-  public Long getId() {
-    return id;
-  }
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  public Category name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Get name
-   * @return name
-  */
-  @ApiModelProperty(value = "")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Category category = (Category) o;
-    return Objects.equals(this.id, category.id) &&
-        Objects.equals(this.name, category.name);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, name);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Category {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
--- a/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -1,129 +0,0 @@
-package org.openapitools.model;
-
-import java.util.Objects;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import javax.validation.Valid;
-import javax.validation.constraints.*;
-
-/**
- * Describes the result of uploading an image resource
- */
-@ApiModel(description = "Describes the result of uploading an image resource")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class ModelApiResponse   {
-  @JsonProperty("code")
-  private Integer code;
-
-  @JsonProperty("type")
-  private String type;
-
-  @JsonProperty("message")
-  private String message;
-
-  public ModelApiResponse code(Integer code) {
-    this.code = code;
-    return this;
-  }
-
-  /**
-   * Get code
-   * @return code
-  */
-  @ApiModelProperty(value = "")
-
-
-  public Integer getCode() {
-    return code;
-  }
-
-  public void setCode(Integer code) {
-    this.code = code;
-  }
-
-  public ModelApiResponse type(String type) {
-    this.type = type;
-    return this;
-  }
-
-  /**
-   * Get type
-   * @return type
-  */
-  @ApiModelProperty(value = "")
-
-
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-  public ModelApiResponse message(String message) {
-    this.message = message;
-    return this;
-  }
-
-  /**
-   * Get message
-   * @return message
-  */
-  @ApiModelProperty(value = "")
-
-
-  public String getMessage() {
-    return message;
-  }
-
-  public void setMessage(String message) {
-    this.message = message;
-  }
-
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ModelApiResponse _apiResponse = (ModelApiResponse) o;
-    return Objects.equals(this.code, _apiResponse.code) &&
-        Objects.equals(this.type, _apiResponse.type) &&
-        Objects.equals(this.message, _apiResponse.message);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(code, type, message);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ModelApiResponse {\n");
-    
-    sb.append("    code: ").append(toIndentedString(code)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    message: ").append(toIndentedString(message)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
--- a/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/model/Order.java
+++ b/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/model/Order.java
@@ -1,245 +0,0 @@
-package org.openapitools.model;
-
-import java.util.Objects;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.time.OffsetDateTime;
-import javax.validation.Valid;
-import javax.validation.constraints.*;
-
-/**
- * An order for a pets from the pet store
- */
-@ApiModel(description = "An order for a pets from the pet store")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Order   {
-  @JsonProperty("id")
-  private Long id;
-
-  @JsonProperty("petId")
-  private Long petId;
-
-  @JsonProperty("quantity")
-  private Integer quantity;
-
-  @JsonProperty("shipDate")
-  @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime shipDate;
-
-  /**
-   * Order Status
-   */
-  public enum StatusEnum {
-    PLACED("placed"),
-    
-    APPROVED("approved"),
-    
-    DELIVERED("delivered");
-
-    private String value;
-
-    StatusEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static StatusEnum fromValue(String value) {
-      for (StatusEnum b : StatusEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  @JsonProperty("status")
-  private StatusEnum status;
-
-  @JsonProperty("complete")
-  private Boolean complete = false;
-
-  public Order id(Long id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Get id
-   * @return id
-  */
-  @ApiModelProperty(value = "")
-
-
-  public Long getId() {
-    return id;
-  }
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  public Order petId(Long petId) {
-    this.petId = petId;
-    return this;
-  }
-
-  /**
-   * Get petId
-   * @return petId
-  */
-  @ApiModelProperty(value = "")
-
-
-  public Long getPetId() {
-    return petId;
-  }
-
-  public void setPetId(Long petId) {
-    this.petId = petId;
-  }
-
-  public Order quantity(Integer quantity) {
-    this.quantity = quantity;
-    return this;
-  }
-
-  /**
-   * Get quantity
-   * @return quantity
-  */
-  @ApiModelProperty(value = "")
-
-
-  public Integer getQuantity() {
-    return quantity;
-  }
-
-  public void setQuantity(Integer quantity) {
-    this.quantity = quantity;
-  }
-
-  public Order shipDate(OffsetDateTime shipDate) {
-    this.shipDate = shipDate;
-    return this;
-  }
-
-  /**
-   * Get shipDate
-   * @return shipDate
-  */
-  @ApiModelProperty(value = "")
-
-  @Valid
-
-  public OffsetDateTime getShipDate() {
-    return shipDate;
-  }
-
-  public void setShipDate(OffsetDateTime shipDate) {
-    this.shipDate = shipDate;
-  }
-
-  public Order status(StatusEnum status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * Order Status
-   * @return status
-  */
-  @ApiModelProperty(value = "Order Status")
-
-
-  public StatusEnum getStatus() {
-    return status;
-  }
-
-  public void setStatus(StatusEnum status) {
-    this.status = status;
-  }
-
-  public Order complete(Boolean complete) {
-    this.complete = complete;
-    return this;
-  }
-
-  /**
-   * Get complete
-   * @return complete
-  */
-  @ApiModelProperty(value = "")
-
-
-  public Boolean getComplete() {
-    return complete;
-  }
-
-  public void setComplete(Boolean complete) {
-    this.complete = complete;
-  }
-
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Order order = (Order) o;
-    return Objects.equals(this.id, order.id) &&
-        Objects.equals(this.petId, order.petId) &&
-        Objects.equals(this.quantity, order.quantity) &&
-        Objects.equals(this.shipDate, order.shipDate) &&
-        Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Order {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    petId: ").append(toIndentedString(petId)).append("\n");
-    sb.append("    quantity: ").append(toIndentedString(quantity)).append("\n");
-    sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
--- a/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/model/Pet.java
@@ -1,268 +0,0 @@
-package org.openapitools.model;
-
-import java.util.Objects;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.ArrayList;
-import java.util.List;
-import org.openapitools.model.Category;
-import org.openapitools.model.Tag;
-import javax.validation.Valid;
-import javax.validation.constraints.*;
-
-/**
- * A pet for sale in the pet store
- */
-@ApiModel(description = "A pet for sale in the pet store")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Pet   {
-  @JsonProperty("id")
-  private Long id;
-
-  @JsonProperty("category")
-  private Category category;
-
-  @JsonProperty("name")
-  private String name;
-
-  @JsonProperty("photoUrls")
-  @Valid
-  private List<String> photoUrls = new ArrayList<>();
-
-  @JsonProperty("tags")
-  @Valid
-  private List<Tag> tags = null;
-
-  /**
-   * pet status in the store
-   */
-  public enum StatusEnum {
-    AVAILABLE("available"),
-    
-    PENDING("pending"),
-    
-    SOLD("sold");
-
-    private String value;
-
-    StatusEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static StatusEnum fromValue(String value) {
-      for (StatusEnum b : StatusEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  @JsonProperty("status")
-  private StatusEnum status;
-
-  public Pet id(Long id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Get id
-   * @return id
-  */
-  @ApiModelProperty(value = "")
-
-
-  public Long getId() {
-    return id;
-  }
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  public Pet category(Category category) {
-    this.category = category;
-    return this;
-  }
-
-  /**
-   * Get category
-   * @return category
-  */
-  @ApiModelProperty(value = "")
-
-  @Valid
-
-  public Category getCategory() {
-    return category;
-  }
-
-  public void setCategory(Category category) {
-    this.category = category;
-  }
-
-  public Pet name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Get name
-   * @return name
-  */
-  @ApiModelProperty(example = "doggie", required = true, value = "")
-  @NotNull
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  public Pet photoUrls(List<String> photoUrls) {
-    this.photoUrls = photoUrls;
-    return this;
-  }
-
-  public Pet addPhotoUrlsItem(String photoUrlsItem) {
-    if (this.photoUrls == null) {
-      this.photoUrls = new ArrayList<>();
-    }
-    this.photoUrls.add(photoUrlsItem);
-    return this;
-  }
-
-  /**
-   * Get photoUrls
-   * @return photoUrls
-  */
-  @ApiModelProperty(required = true, value = "")
-  @NotNull
-
-
-  public List<String> getPhotoUrls() {
-    return photoUrls;
-  }
-
-  public void setPhotoUrls(List<String> photoUrls) {
-    this.photoUrls = photoUrls;
-  }
-
-  public Pet tags(List<Tag> tags) {
-    this.tags = tags;
-    return this;
-  }
-
-  public Pet addTagsItem(Tag tagsItem) {
-    if (this.tags == null) {
-      this.tags = new ArrayList<>();
-    }
-    this.tags.add(tagsItem);
-    return this;
-  }
-
-  /**
-   * Get tags
-   * @return tags
-  */
-  @ApiModelProperty(value = "")
-
-  @Valid
-
-  public List<Tag> getTags() {
-    return tags;
-  }
-
-  public void setTags(List<Tag> tags) {
-    this.tags = tags;
-  }
-
-  public Pet status(StatusEnum status) {
-    this.status = status;
-    return this;
-  }
-
-  /**
-   * pet status in the store
-   * @return status
-  */
-  @ApiModelProperty(value = "pet status in the store")
-
-
-  public StatusEnum getStatus() {
-    return status;
-  }
-
-  public void setStatus(StatusEnum status) {
-    this.status = status;
-  }
-
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Pet pet = (Pet) o;
-    return Objects.equals(this.id, pet.id) &&
-        Objects.equals(this.category, pet.category) &&
-        Objects.equals(this.name, pet.name) &&
-        Objects.equals(this.photoUrls, pet.photoUrls) &&
-        Objects.equals(this.tags, pet.tags) &&
-        Objects.equals(this.status, pet.status);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, category, name, photoUrls, tags, status);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Pet {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
-    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
--- a/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/model/Tag.java
@@ -1,104 +0,0 @@
-package org.openapitools.model;
-
-import java.util.Objects;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import javax.validation.Valid;
-import javax.validation.constraints.*;
-
-/**
- * A tag for a pet
- */
-@ApiModel(description = "A tag for a pet")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class Tag   {
-  @JsonProperty("id")
-  private Long id;
-
-  @JsonProperty("name")
-  private String name;
-
-  public Tag id(Long id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Get id
-   * @return id
-  */
-  @ApiModelProperty(value = "")
-
-
-  public Long getId() {
-    return id;
-  }
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  public Tag name(String name) {
-    this.name = name;
-    return this;
-  }
-
-  /**
-   * Get name
-   * @return name
-  */
-  @ApiModelProperty(value = "")
-
-
-  public String getName() {
-    return name;
-  }
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Tag tag = (Tag) o;
-    return Objects.equals(this.id, tag.id) &&
-        Objects.equals(this.name, tag.name);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, name);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Tag {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
--- a/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/model/User.java
+++ b/samples/client/petstore/spring-cloud-no-nullable/src/main/java/org/openapitools/model/User.java
@@ -1,254 +0,0 @@
-package org.openapitools.model;
-
-import java.util.Objects;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import javax.validation.Valid;
-import javax.validation.constraints.*;
-
-/**
- * A User who is purchasing from the pet store
- */
-@ApiModel(description = "A User who is purchasing from the pet store")
-@javax.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
-public class User   {
-  @JsonProperty("id")
-  private Long id;
-
-  @JsonProperty("username")
-  private String username;
-
-  @JsonProperty("firstName")
-  private String firstName;
-
-  @JsonProperty("lastName")
-  private String lastName;
-
-  @JsonProperty("email")
-  private String email;
-
-  @JsonProperty("password")
-  private String password;
-
-  @JsonProperty("phone")
-  private String phone;
-
-  @JsonProperty("userStatus")
-  private Integer userStatus;
-
-  public User id(Long id) {
-    this.id = id;
-    return this;
-  }
-
-  /**
-   * Get id
-   * @return id
-  */
-  @ApiModelProperty(value = "")
-
-
-  public Long getId() {
-    return id;
-  }
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  public User username(String username) {
-    this.username = username;
-    return this;
-  }
-
-  /**
-   * Get username
-   * @return username
-  */
-  @ApiModelProperty(value = "")
-
-
-  public String getUsername() {
-    return username;
-  }
-
-  public void setUsername(String username) {
-    this.username = username;
-  }
-
-  public User firstName(String firstName) {
-    this.firstName = firstName;
-    return this;
-  }
-
-  /**
-   * Get firstName
-   * @return firstName
-  */
-  @ApiModelProperty(value = "")
-
-
-  public String getFirstName() {
-    return firstName;
-  }
-
-  public void setFirstName(String firstName) {
-    this.firstName = firstName;
-  }
-
-  public User lastName(String lastName) {
-    this.lastName = lastName;
-    return this;
-  }
-
-  /**
-   * Get lastName
-   * @return lastName
-  */
-  @ApiModelProperty(value = "")
-
-
-  public String getLastName() {
-    return lastName;
-  }
-
-  public void setLastName(String lastName) {
-    this.lastName = lastName;
-  }
-
-  public User email(String email) {
-    this.email = email;
-    return this;
-  }
-
-  /**
-   * Get email
-   * @return email
-  */
-  @ApiModelProperty(value = "")
-
-
-  public String getEmail() {
-    return email;
-  }
-
-  public void setEmail(String email) {
-    this.email = email;
-  }
-
-  public User password(String password) {
-    this.password = password;
-    return this;
-  }
-
-  /**
-   * Get password
-   * @return password
-  */
-  @ApiModelProperty(value = "")
-
-
-  public String getPassword() {
-    return password;
-  }
-
-  public void setPassword(String password) {
-    this.password = password;
-  }
-
-  public User phone(String phone) {
-    this.phone = phone;
-    return this;
-  }
-
-  /**
-   * Get phone
-   * @return phone
-  */
-  @ApiModelProperty(value = "")
-
-
-  public String getPhone() {
-    return phone;
-  }
-
-  public void setPhone(String phone) {
-    this.phone = phone;
-  }
-
-  public User userStatus(Integer userStatus) {
-    this.userStatus = userStatus;
-    return this;
-  }
-
-  /**
-   * User Status
-   * @return userStatus
-  */
-  @ApiModelProperty(value = "User Status")
-
-
-  public Integer getUserStatus() {
-    return userStatus;
-  }
-
-  public void setUserStatus(Integer userStatus) {
-    this.userStatus = userStatus;
-  }
-
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    User user = (User) o;
-    return Objects.equals(this.id, user.id) &&
-        Objects.equals(this.username, user.username) &&
-        Objects.equals(this.firstName, user.firstName) &&
-        Objects.equals(this.lastName, user.lastName) &&
-        Objects.equals(this.email, user.email) &&
-        Objects.equals(this.password, user.password) &&
-        Objects.equals(this.phone, user.phone) &&
-        Objects.equals(this.userStatus, user.userStatus);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, username, firstName, lastName, email, password, phone, userStatus);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class User {\n");
-    
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    username: ").append(toIndentedString(username)).append("\n");
-    sb.append("    firstName: ").append(toIndentedString(firstName)).append("\n");
-    sb.append("    lastName: ").append(toIndentedString(lastName)).append("\n");
-    sb.append("    email: ").append(toIndentedString(email)).append("\n");
-    sb.append("    password: ").append(toIndentedString(password)).append("\n");
-    sb.append("    phone: ").append(toIndentedString(phone)).append("\n");
-    sb.append("    userStatus: ").append(toIndentedString(userStatus)).append("\n");
-    sb.append("}");
-    return sb.toString();
-  }
-
-  /**
-   * Convert the given object to string with each line indented by 4 spaces
-   * (except the first line).
-   */
-  private String toIndentedString(Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-}
-
--- a/samples/client/petstore/spring-cloud-spring-pageable/pom.xml
+++ b/samples/client/petstore/spring-cloud-spring-pageable/pom.xml
@@ -14,7 +14,7 @@
    <parent>
        <groupId>org.springframework.boot</groupId>
        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.5.RELEASE</version>
+        <version>2.5.5</version>
    </parent>
    <build>
        <sourceDirectory>src/main/java</sourceDirectory>
@@ -25,7 +25,7 @@
            <dependency>
                <groupId>org.springframework.cloud</groupId>
                <artifactId>spring-cloud-starter-parent</artifactId>
-                <version>Finchley.SR1</version>
+                <version>2020.0.4</version>
                <type>pom</type>
                <scope>import</scope>
            </dependency>
@@ -51,6 +51,7 @@
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-oauth2</artifactId>
+            <version>2.2.5.RELEASE</version>
        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.datatype</groupId>
@@ -59,7 +60,7 @@
        <dependency>
            <groupId>org.openapitools</groupId>
            <artifactId>jackson-databind-nullable</artifactId>
-            <version>0.1.0</version>
+            <version>0.2.1</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
@@ -74,7 +75,7 @@
        <dependency>
            <groupId>io.springfox</groupId>
            <artifactId>springfox-swagger2</artifactId>
-            <version>2.8.0</version>
+            <version>3.0.0</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.data</groupId>
--- a/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/configuration/ClientConfiguration.java
+++ b/samples/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/configuration/ClientConfiguration.java
@@ -6,7 +6,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.cloud.security.oauth2.client.feign.OAuth2FeignRequestInterceptor;
+import org.springframework.cloud.openfeign.security.OAuth2FeignRequestInterceptor;
 import org.springframework.security.oauth2.client.DefaultOAuth2ClientContext;
 import org.springframework.security.oauth2.client.OAuth2ClientContext;
 import org.springframework.security.oauth2.client.token.grant.implicit.ImplicitResourceDetails;
--- a/samples/client/petstore/spring-cloud/pom.xml
+++ b/samples/client/petstore/spring-cloud/pom.xml
@@ -14,7 +14,7 @@
    <parent>
        <groupId>org.springframework.boot</groupId>
        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.5.RELEASE</version>
+        <version>2.5.5</version>
    </parent>
    <build>
        <sourceDirectory>src/main/java</sourceDirectory>
@@ -25,7 +25,7 @@
            <dependency>
                <groupId>org.springframework.cloud</groupId>
                <artifactId>spring-cloud-starter-parent</artifactId>
-                <version>Finchley.SR1</version>
+                <version>2020.0.4</version>
                <type>pom</type>
                <scope>import</scope>
            </dependency>
@@ -51,6 +51,7 @@
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-oauth2</artifactId>
+            <version>2.2.5.RELEASE</version>
        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.datatype</groupId>
@@ -59,7 +60,7 @@
        <dependency>
            <groupId>org.openapitools</groupId>
            <artifactId>jackson-databind-nullable</artifactId>
-            <version>0.1.0</version>
+            <version>0.2.1</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
@@ -74,7 +75,7 @@
        <dependency>
            <groupId>io.springfox</groupId>
            <artifactId>springfox-swagger2</artifactId>
-            <version>2.8.0</version>
+            <version>3.0.0</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.data</groupId>
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApi.java
@@ -29,22 +29,25 @@ public interface PetApi {
    /**
     * POST /pet : Add a new pet to the store
     *
-     * @param body Pet object that needs to be added to the store (required)
-     * @return Invalid input (status code 405)
+     * @param pet Pet object that needs to be added to the store (required)
+     * @return successful operation (status code 200)
+     *         or Invalid input (status code 405)
     */
-    @ApiOperation(value = "Add a new pet to the store", nickname = "addPet", notes = "", authorizations = {
+    @ApiOperation(value = "Add a new pet to the store", nickname = "addPet", notes = "", response = Pet.class, authorizations = {
        @Authorization(value = "petstore_auth", scopes = {
            @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
            @AuthorizationScope(scope = "read:pets", description = "read your pets") })
         }, tags={ "pet", })
    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "successful operation", response = Pet.class),
        @ApiResponse(code = 405, message = "Invalid input") })
    @RequestMapping(
        method = RequestMethod.POST,
        value = "/pet",
+        produces = "application/json",
        consumes = "application/json"
    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> addPet(@ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body);
+    ResponseEntity<Pet> addPet(@ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet);


    /**
@@ -65,7 +68,7 @@ public interface PetApi {
        method = RequestMethod.DELETE,
        value = "/pet/{petId}"
    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> deletePet(@ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId,@ApiParam(value = "") @RequestHeader(value = "api_key", required = false) String apiKey);
+    ResponseEntity<Void> deletePet(@ApiParam(value = "Pet id to delete", required = true) @PathVariable("petId") Long petId,@ApiParam(value = "") @RequestHeader(value = "api_key", required = false) String apiKey);


    /**
@@ -78,7 +81,6 @@ public interface PetApi {
     */
    @ApiOperation(value = "Finds Pets by status", nickname = "findPetsByStatus", notes = "Multiple status values can be provided with comma separated strings", response = Pet.class, responseContainer = "List", authorizations = {
        @Authorization(value = "petstore_auth", scopes = {
-            @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
            @AuthorizationScope(scope = "read:pets", description = "read your pets") })
         }, tags={ "pet", })
    @ApiResponses(value = { 
@@ -89,7 +91,7 @@ public interface PetApi {
        value = "/pet/findByStatus",
        produces = "application/json"
    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<List<Pet>>> findPetsByStatus(@NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List<String> status);
+    ResponseEntity<List<Pet>> findPetsByStatus(@NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) List<String> status);


    /**
@@ -103,7 +105,6 @@ public interface PetApi {
     */
    @ApiOperation(value = "Finds Pets by tags", nickname = "findPetsByTags", notes = "Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.", response = Pet.class, responseContainer = "List", authorizations = {
        @Authorization(value = "petstore_auth", scopes = {
-            @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
            @AuthorizationScope(scope = "read:pets", description = "read your pets") })
         }, tags={ "pet", })
    @ApiResponses(value = { 
@@ -114,7 +115,7 @@ public interface PetApi {
        value = "/pet/findByTags",
        produces = "application/json"
    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<List<Pet>>> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List<String> tags);
+    ResponseEntity<List<Pet>> findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) List<String> tags);


    /**
@@ -139,32 +140,35 @@ public interface PetApi {
        value = "/pet/{petId}",
        produces = "application/json"
    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<Pet>> getPetById(@ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId);
+    ResponseEntity<Pet> getPetById(@ApiParam(value = "ID of pet to return", required = true) @PathVariable("petId") Long petId);


    /**
     * PUT /pet : Update an existing pet
     *
-     * @param body Pet object that needs to be added to the store (required)
-     * @return Invalid ID supplied (status code 400)
+     * @param pet Pet object that needs to be added to the store (required)
+     * @return successful operation (status code 200)
+     *         or Invalid ID supplied (status code 400)
     *         or Pet not found (status code 404)
     *         or Validation exception (status code 405)
     */
-    @ApiOperation(value = "Update an existing pet", nickname = "updatePet", notes = "", authorizations = {
+    @ApiOperation(value = "Update an existing pet", nickname = "updatePet", notes = "", response = Pet.class, authorizations = {
        @Authorization(value = "petstore_auth", scopes = {
            @AuthorizationScope(scope = "write:pets", description = "modify pets in your account"),
            @AuthorizationScope(scope = "read:pets", description = "read your pets") })
         }, tags={ "pet", })
    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "successful operation", response = Pet.class),
        @ApiResponse(code = 400, message = "Invalid ID supplied"),
        @ApiResponse(code = 404, message = "Pet not found"),
        @ApiResponse(code = 405, message = "Validation exception") })
    @RequestMapping(
        method = RequestMethod.PUT,
        value = "/pet",
+        produces = "application/json",
        consumes = "application/json"
    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> updatePet(@ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet body);
+    ResponseEntity<Pet> updatePet(@ApiParam(value = "Pet object that needs to be added to the store", required = true) @Valid @RequestBody Pet pet);


    /**
@@ -187,7 +191,7 @@ public interface PetApi {
        value = "/pet/{petId}",
        consumes = "application/x-www-form-urlencoded"
    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> updatePetWithForm(@ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId,@ApiParam(value = "Updated name of the pet" ) @RequestParam(value="name", required=false)  String name,@ApiParam(value = "Updated status of the pet" ) @RequestParam(value="status", required=false)  String status);
+    ResponseEntity<Void> updatePetWithForm(@ApiParam(value = "ID of pet that needs to be updated", required = true) @PathVariable("petId") Long petId,@ApiParam(value = "Updated name of the pet" ) @RequestParam(value="name", required=false)  String name,@ApiParam(value = "Updated status of the pet" ) @RequestParam(value="status", required=false)  String status);


    /**
@@ -211,6 +215,6 @@ public interface PetApi {
        produces = "application/json",
        consumes = "multipart/form-data"
    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<ModelApiResponse>> uploadFile(@ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId,@ApiParam(value = "Additional data to pass to server" ) @RequestParam(value="additionalMetadata", required=false)  String additionalMetadata,@ApiParam(value = "file to upload") @RequestParam("file") MultipartFile file);
+    ResponseEntity<ModelApiResponse> uploadFile(@ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId,@ApiParam(value = "Additional data to pass to server" ) @RequestParam(value="additionalMetadata", required=false)  String additionalMetadata,@ApiParam(value = "file to upload") @RequestParam("file") MultipartFile file);

 }
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApi.java
@@ -42,7 +42,7 @@ public interface StoreApi {
        method = RequestMethod.DELETE,
        value = "/store/order/{orderId}"
    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") String orderId);
+    ResponseEntity<Void> deleteOrder(@ApiParam(value = "ID of the order that needs to be deleted", required = true) @PathVariable("orderId") String orderId);


    /**
@@ -62,7 +62,7 @@ public interface StoreApi {
        value = "/store/inventory",
        produces = "application/json"
    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<Map<String, Integer>>> getInventory();
+    ResponseEntity<Map<String, Integer>> getInventory();


    /**
@@ -84,13 +84,13 @@ public interface StoreApi {
        value = "/store/order/{orderId}",
        produces = "application/json"
    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<Order>> getOrderById(@Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") Long orderId);
+    ResponseEntity<Order> getOrderById(@Min(1L) @Max(5L) @ApiParam(value = "ID of pet that needs to be fetched", required = true) @PathVariable("orderId") Long orderId);


    /**
     * POST /store/order : Place an order for a pet
     *
-     * @param body order placed for purchasing the pet (required)
+     * @param order order placed for purchasing the pet (required)
     * @return successful operation (status code 200)
     *         or Invalid Order (status code 400)
     */
@@ -101,8 +101,9 @@ public interface StoreApi {
    @RequestMapping(
        method = RequestMethod.POST,
        value = "/store/order",
-        produces = "application/json"
+        produces = "application/json",
+        consumes = "application/json"
    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<Order>> placeOrder(@ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order body);
+    ResponseEntity<Order> placeOrder(@ApiParam(value = "order placed for purchasing the pet", required = true) @Valid @RequestBody Order order);

 }
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApi.java
@@ -30,49 +30,61 @@ public interface UserApi {
     * POST /user : Create user
     * This can only be done by the logged in user.
     *
-     * @param body Created user object (required)
+     * @param user Created user object (required)
     * @return successful operation (status code 200)
     */
-    @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", tags={ "user", })
+    @ApiOperation(value = "Create user", nickname = "createUser", notes = "This can only be done by the logged in user.", authorizations = {
+        
+        @Authorization(value = "api_key")
+         }, tags={ "user", })
    @ApiResponses(value = { 
        @ApiResponse(code = 200, message = "successful operation") })
    @RequestMapping(
        method = RequestMethod.POST,
-        value = "/user"
+        value = "/user",
+        consumes = "application/json"
    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> createUser(@ApiParam(value = "Created user object", required = true) @Valid @RequestBody User body);
+    ResponseEntity<Void> createUser(@ApiParam(value = "Created user object", required = true) @Valid @RequestBody User user);


    /**
     * POST /user/createWithArray : Creates list of users with given input array
     *
-     * @param body List of user object (required)
+     * @param user List of user object (required)
     * @return successful operation (status code 200)
     */
-    @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", tags={ "user", })
+    @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithArrayInput", notes = "", authorizations = {
+        
+        @Authorization(value = "api_key")
+         }, tags={ "user", })
    @ApiResponses(value = { 
        @ApiResponse(code = 200, message = "successful operation") })
    @RequestMapping(
        method = RequestMethod.POST,
-        value = "/user/createWithArray"
+        value = "/user/createWithArray",
+        consumes = "application/json"
    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> createUsersWithArrayInput(@ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<User> body);
+    ResponseEntity<Void> createUsersWithArrayInput(@ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<User> user);


    /**
     * POST /user/createWithList : Creates list of users with given input array
     *
-     * @param body List of user object (required)
+     * @param user List of user object (required)
     * @return successful operation (status code 200)
     */
-    @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", tags={ "user", })
+    @ApiOperation(value = "Creates list of users with given input array", nickname = "createUsersWithListInput", notes = "", authorizations = {
+        
+        @Authorization(value = "api_key")
+         }, tags={ "user", })
    @ApiResponses(value = { 
        @ApiResponse(code = 200, message = "successful operation") })
    @RequestMapping(
        method = RequestMethod.POST,
-        value = "/user/createWithList"
+        value = "/user/createWithList",
+        consumes = "application/json"
    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> createUsersWithListInput(@ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<User> body);
+    ResponseEntity<Void> createUsersWithListInput(@ApiParam(value = "List of user object", required = true) @Valid @RequestBody List<User> user);


    /**
@@ -83,7 +95,10 @@ public interface UserApi {
     * @return Invalid username supplied (status code 400)
     *         or User not found (status code 404)
     */
-    @ApiOperation(value = "Delete user", nickname = "deleteUser", notes = "This can only be done by the logged in user.", tags={ "user", })
+    @ApiOperation(value = "Delete user", nickname = "deleteUser", notes = "This can only be done by the logged in user.", authorizations = {
+        
+        @Authorization(value = "api_key")
+         }, tags={ "user", })
    @ApiResponses(value = { 
        @ApiResponse(code = 400, message = "Invalid username supplied"),
        @ApiResponse(code = 404, message = "User not found") })
@@ -91,7 +106,7 @@ public interface UserApi {
        method = RequestMethod.DELETE,
        value = "/user/{username}"
    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> deleteUser(@ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username);
+    ResponseEntity<Void> deleteUser(@ApiParam(value = "The name that needs to be deleted", required = true) @PathVariable("username") String username);


    /**
@@ -112,7 +127,7 @@ public interface UserApi {
        value = "/user/{username}",
        produces = "application/json"
    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<User>> getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username);
+    ResponseEntity<User> getUserByName(@ApiParam(value = "The name that needs to be fetched. Use user1 for testing.", required = true) @PathVariable("username") String username);


    /**
@@ -132,7 +147,7 @@ public interface UserApi {
        value = "/user/login",
        produces = "application/json"
    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<String>> loginUser(@NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username,@NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password);
+    ResponseEntity<String> loginUser(@NotNull @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) String username,@NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) String password);


    /**
@@ -140,14 +155,17 @@ public interface UserApi {
     *
     * @return successful operation (status code 200)
     */
-    @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", tags={ "user", })
+    @ApiOperation(value = "Logs out current logged in user session", nickname = "logoutUser", notes = "", authorizations = {
+        
+        @Authorization(value = "api_key")
+         }, tags={ "user", })
    @ApiResponses(value = { 
        @ApiResponse(code = 200, message = "successful operation") })
    @RequestMapping(
        method = RequestMethod.GET,
        value = "/user/logout"
    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> logoutUser();
+    ResponseEntity<Void> logoutUser();


    /**
@@ -155,18 +173,22 @@ public interface UserApi {
     * This can only be done by the logged in user.
     *
     * @param username name that need to be deleted (required)
-     * @param body Updated user object (required)
+     * @param user Updated user object (required)
     * @return Invalid user supplied (status code 400)
     *         or User not found (status code 404)
     */
-    @ApiOperation(value = "Updated user", nickname = "updateUser", notes = "This can only be done by the logged in user.", tags={ "user", })
+    @ApiOperation(value = "Updated user", nickname = "updateUser", notes = "This can only be done by the logged in user.", authorizations = {
+        
+        @Authorization(value = "api_key")
+         }, tags={ "user", })
    @ApiResponses(value = { 
        @ApiResponse(code = 400, message = "Invalid user supplied"),
        @ApiResponse(code = 404, message = "User not found") })
    @RequestMapping(
        method = RequestMethod.PUT,
-        value = "/user/{username}"
+        value = "/user/{username}",
+        consumes = "application/json"
    )
-    com.netflix.hystrix.HystrixCommand<ResponseEntity<Void>> updateUser(@ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username,@ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User body);
+    ResponseEntity<Void> updateUser(@ApiParam(value = "name that need to be deleted", required = true) @PathVariable("username") String username,@ApiParam(value = "Updated user object", required = true) @Valid @RequestBody User user);

 }
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/configuration/ClientConfiguration.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/configuration/ClientConfiguration.java
@@ -6,7 +6,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.cloud.security.oauth2.client.feign.OAuth2FeignRequestInterceptor;
+import org.springframework.cloud.openfeign.security.OAuth2FeignRequestInterceptor;
 import org.springframework.security.oauth2.client.DefaultOAuth2ClientContext;
 import org.springframework.security.oauth2.client.OAuth2ClientContext;
 import org.springframework.security.oauth2.client.token.grant.implicit.ImplicitResourceDetails;
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java
@@ -52,7 +52,7 @@ public class Category   {
  */
  @ApiModelProperty(value = "")

-
+@Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
  public String getName() {
    return name;
  }
--- a/samples/client/petstore/spring-cloud/src/test/java/org/openapitools/Application.java
+++ b/samples/client/petstore/spring-cloud/src/test/java/org/openapitools/Application.java
@@ -1,20 +0,0 @@
-package org.openapitools;
-
-import feign.Logger;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.annotation.Bean;
-
-@SpringBootApplication
-@EnableFeignClients
-public class Application {
-    public static void main(String[] args) {
-        new SpringApplicationBuilder(Application.class).run(args);
-    }
-
-    @Bean
-    Logger.Level feignLoggerLevel() {
-        return Logger.Level.FULL;
-    }
-}
--- a/samples/client/petstore/spring-cloud/src/test/java/org/openapitools/TestUtils.java
+++ b/samples/client/petstore/spring-cloud/src/test/java/org/openapitools/TestUtils.java
@@ -1,17 +0,0 @@
-package org.openapitools;
-
-import java.util.Random;
-import java.util.concurrent.atomic.AtomicLong;
-
-public class TestUtils {
-    private static final AtomicLong atomicId = createAtomicId();
-
-    public static long nextId() {
-        return atomicId.getAndIncrement();
-    }
-
-    private static AtomicLong createAtomicId() {
-        int baseId = new Random(System.currentTimeMillis()).nextInt(1000000) + 20000;
-        return new AtomicLong((long) baseId);
-    }
-}
--- a/samples/client/petstore/spring-cloud/src/test/java/org/openapitools/api/PetApiTest.java
+++ b/samples/client/petstore/spring-cloud/src/test/java/org/openapitools/api/PetApiTest.java
@@ -1,190 +0,0 @@
-package org.openapitools.api;
-
-import com.netflix.hystrix.exception.HystrixRuntimeException;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.openapitools.Application;
-import org.openapitools.TestUtils;
-import org.openapitools.model.Category;
-import org.openapitools.model.Pet;
-import org.openapitools.model.Tag;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.mock.web.MockMultipartFile;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import static org.junit.Assert.*;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = Application.class)
-public class PetApiTest {
-
-    @Autowired
-    private PetApiClient client;
-
-    @Test
-    public void testCreateAndGetPet() {
-        Pet pet = createRandomPet();
-        client.addPet(pet).execute();
-        Pet fetched = client.getPetById(pet.getId()).execute().getBody();
-        assertNotNull(fetched);
-        assertEquals(pet.getId(), fetched.getId());
-        assertNotNull(fetched.getCategory());
-        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
-    }
-
-    @Test
-    public void testUpdatePet() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("programmer");
-
-        client.updatePet(pet).execute();
-
-        Pet fetched = client.getPetById(pet.getId()).execute().getBody();
-        assertNotNull(fetched);
-        assertEquals(pet.getId(), fetched.getId());
-        assertNotNull(fetched.getCategory());
-        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
-    }
-
-    @Ignore
-    @Test
-    public void testFindPetsByStatus() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("programmer");
-        pet.setStatus(Pet.StatusEnum.AVAILABLE);
-
-        client.updatePet(pet).execute();
-
-        List<Pet> pets = client.findPetsByStatus(Collections.singletonList("available")).execute().getBody();
-        assertNotNull(pets);
-
-        boolean found = false;
-        for (Pet fetched : pets) {
-            if (fetched.getId().equals(pet.getId())) {
-                found = true;
-                break;
-            }
-        }
-
-        assertTrue(found);
-    }
-
-    @Ignore
-    @Test
-    public void testFindPetsByTags() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("monster");
-        pet.setStatus(Pet.StatusEnum.AVAILABLE);
-
-        List<Tag> tags = new ArrayList<>();
-        Tag tag1 = new Tag();
-        tag1.setName("friendly");
-        tags.add(tag1);
-        pet.setTags(tags);
-
-        client.updatePet(pet).execute();
-
-        List<Pet> pets = client.findPetsByTags(Collections.singletonList("friendly")).execute().getBody();
-        assertNotNull(pets);
-
-        boolean found = false;
-        for (Pet fetched : pets) {
-            if (fetched.getId().equals(pet.getId())) {
-                found = true;
-                break;
-            }
-        }
-        assertTrue(found);
-    }
-
-    @Test
-    public void testUpdatePetWithForm() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("frank");
-        client.addPet(pet).execute();
-
-        Pet fetched = client.getPetById(pet.getId()).execute().getBody();
-
-        client.updatePetWithForm(fetched.getId(), "furt", null).execute();
-        Pet updated = client.getPetById(fetched.getId()).execute().getBody();
-
-        assertEquals(updated.getName(), "furt");
-    }
-
-    @Test
-    public void testDeletePet() throws Exception {
-        Pet pet = createRandomPet();
-        client.addPet(pet).execute();
-
-        Pet fetched = client.getPetById(pet.getId()).execute().getBody();
-        client.deletePet(fetched.getId(), null).execute();
-
-        try {
-            client.getPetById(fetched.getId()).execute();
-            fail("expected an error");
-        } catch (HystrixRuntimeException e) {
-            assertTrue(e.getCause().getMessage().startsWith("status 404 "));
-        }
-    }
-
-    @Ignore("Multipart form is not supported by spring-cloud yet.")
-    @Test
-    public void testUploadFile() throws Exception {
-        Pet pet = createRandomPet();
-        client.addPet(pet).execute();
-
-        MockMultipartFile filePart = new MockMultipartFile("file", "bar".getBytes());
-        client.uploadFile(pet.getId(), "a test file", filePart).execute();
-    }
-
-    @Test
-    public void testEqualsAndHashCode() {
-        Pet pet1 = new Pet();
-        Pet pet2 = new Pet();
-        assertTrue(pet1.equals(pet2));
-        assertTrue(pet2.equals(pet1));
-        assertTrue(pet1.hashCode() == pet2.hashCode());
-        assertTrue(pet1.equals(pet1));
-        assertTrue(pet1.hashCode() == pet1.hashCode());
-
-        pet2.setName("really-happy");
-        pet2.setPhotoUrls(Arrays.asList("http://foo.bar.com/1", "http://foo.bar.com/2"));
-        assertFalse(pet1.equals(pet2));
-        assertFalse(pet2.equals(pet1));
-        assertFalse(pet1.hashCode() == (pet2.hashCode()));
-        assertTrue(pet2.equals(pet2));
-        assertTrue(pet2.hashCode() == pet2.hashCode());
-
-        pet1.setName("really-happy");
-        pet1.setPhotoUrls(Arrays.asList("http://foo.bar.com/1", "http://foo.bar.com/2"));
-        assertTrue(pet1.equals(pet2));
-        assertTrue(pet2.equals(pet1));
-        assertTrue(pet1.hashCode() == pet2.hashCode());
-        assertTrue(pet1.equals(pet1));
-        assertTrue(pet1.hashCode() == pet1.hashCode());
-    }
-
-    private Pet createRandomPet() {
-        Pet pet = new Pet();
-        pet.setId(TestUtils.nextId());
-        pet.setName("gorilla");
-
-        Category category = new Category();
-        category.setName("really-happy");
-
-        pet.setCategory(category);
-        pet.setStatus(Pet.StatusEnum.AVAILABLE);
-        List<String> photos = Arrays.asList("http://foo.bar.com/1", "http://foo.bar.com/2");
-        pet.setPhotoUrls(photos);
-
-        return pet;
-    }
-
-}
--- a/samples/client/petstore/spring-cloud/src/test/java/org/openapitools/api/StoreApiTest.java
+++ b/samples/client/petstore/spring-cloud/src/test/java/org/openapitools/api/StoreApiTest.java
@@ -1,77 +0,0 @@
-package org.openapitools.api;
-
-import com.netflix.hystrix.exception.HystrixRuntimeException;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.openapitools.Application;
-import org.openapitools.model.Order;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import java.time.OffsetDateTime;
-import java.util.Map;
-
-import static org.junit.Assert.*;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = Application.class)
-public class StoreApiTest {
-
-    @Autowired
-    private StoreApiClient client;
-
-    @Test
-    public void testGetInventory() {
-        Map<String, Integer> inventory = client.getInventory().execute().getBody();
-        assertTrue(inventory.keySet().size() > 0);
-    }
-
-    @Test
-    public void testPlaceOrder() {
-        Order order = createOrder();
-        try {
-            client.deleteOrder(order.getId().toString()).execute();
-        } catch (HystrixRuntimeException e) {
-            // noop
-        }
-        client.placeOrder(order).execute();
-
-        Order fetched = client.getOrderById(order.getId()).execute().getBody();
-        assertEquals(order.getId(), fetched.getId());
-        assertEquals(order.getPetId(), fetched.getPetId());
-        assertEquals(order.getQuantity(), fetched.getQuantity());
-        assertEquals(order.getShipDate().toInstant(), fetched.getShipDate().toInstant());
-    }
-
-    @Test
-    public void testDeleteOrder() {
-        Order order = createOrder();
-        client.deleteOrder(order.getId().toString());
-        client.placeOrder(order).execute();
-
-        Order fetched = client.getOrderById(order.getId()).execute().getBody();
-        assertEquals(fetched.getId(), order.getId());
-
-        client.deleteOrder(String.valueOf(order.getId())).execute();
-
-        try {
-            client.getOrderById(order.getId()).execute();
-            fail("expected an error");
-        } catch (HystrixRuntimeException e) {
-            assertTrue(e.getCause().getMessage().startsWith("status 404 "));
-        }
-    }
-
-    private Order createOrder() {
-        return new Order()
-                .id(1L)
-                .petId(200L)
-                .quantity(13)
-                //Ensure 3 fractional digits because of a bug in the petstore server
-                .shipDate(OffsetDateTime.now().withNano(123000000))
-                .status(Order.StatusEnum.PLACED)
-                .complete(true);
-    }
-
-}
--- a/samples/client/petstore/spring-cloud/src/test/java/org/openapitools/api/UserApiTest.java
+++ b/samples/client/petstore/spring-cloud/src/test/java/org/openapitools/api/UserApiTest.java
@@ -1,88 +0,0 @@
-package org.openapitools.api;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.openapitools.Application;
-import org.openapitools.TestUtils;
-import org.openapitools.model.User;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import java.util.Arrays;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = Application.class)
-public class UserApiTest {
-
-    @Autowired
-    private UserApiClient client;
-
-    @Test
-    public void testCreateUser() {
-        User user = createUser();
-
-        client.createUser(user).execute();
-
-        User fetched = client.getUserByName(user.getUsername()).execute().getBody();
-        assertEquals(user.getUsername(), fetched.getUsername());
-    }
-
-    @Test
-    public void testCreateUsersWithArray() {
-        User user1 = createUser();
-        user1.setUsername("user" + user1.getId());
-        User user2 = createUser();
-        user2.setUsername("user" + user2.getId());
-
-        client.createUsersWithArrayInput(Arrays.asList(user1, user2)).execute();
-
-        User fetched = client.getUserByName(user1.getUsername()).execute().getBody();
-        assertEquals(user1.getId(), fetched.getId());
-    }
-
-    @Test
-    public void testCreateUsersWithList() {
-        User user1 = createUser();
-        user1.setUsername("user" + user1.getId());
-        User user2 = createUser();
-        user2.setUsername("user" + user2.getId());
-
-        client.createUsersWithListInput(Arrays.asList(user1, user2)).execute();
-
-        User fetched = client.getUserByName(user1.getUsername()).execute().getBody();
-        assertEquals(user1.getId(), fetched.getId());
-    }
-
-    @Test
-    public void testLoginUser() {
-        User user = createUser();
-        client.createUser(user).execute();
-
-        String token = client.loginUser(user.getUsername(), user.getPassword()).execute().getBody();
-        assertTrue(token.contains("logged in user session:"));
-    }
-
-    @Test
-    public void logoutUser() {
-        client.logoutUser().execute();
-    }
-
-    private User createUser() {
-        User user = new User();
-        user.setId(TestUtils.nextId());
-        user.setUsername("fred");
-        user.setFirstName("Fred");
-        user.setLastName("Meyer");
-        user.setEmail("fred@fredmeyer.com");
-        user.setPassword("xxXXxx");
-        user.setPhone("408-867-5309");
-        user.setUserStatus(123);
-
-        return user;
-    }
-
-}
--- a/samples/client/petstore/spring-cloud/src/test/resources/application.yml
+++ b/samples/client/petstore/spring-cloud/src/test/resources/application.yml
@@ -1,11 +0,0 @@
-spring:
-    application:
-        name: petstore-test
-    jackson:
-      serialization.WRITE_DATES_AS_TIMESTAMPS: false
-
-hystrix.command.default.execution.timeout.enabled: false
-
-logging.level.io.swagger.api: DEBUG
-
-feign.hystrix.enabled: true
--- a/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/PkmstApplication.java
+++ b/samples/server/petstore/java-pkmst/src/main/java/com/prokarma/pkmst/PkmstApplication.java
@@ -16,8 +16,6 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
@SpringBootApplication
@EnableSwagger2
-@EnableCircuitBreaker
-@EnableHystrixDashboard
 public class PkmstApplication {

  private static final Logger LOGGER = LoggerFactory.getLogger(PkmstApplication.class);
--- a/samples/server/petstore/java-pkmst/src/main/resources/application-dev.yml
+++ b/samples/server/petstore/java-pkmst/src/main/resources/application-dev.yml
@@ -20,14 +20,11 @@ info:
    name: Pkmst
    description: Microservice developed by PKMST
    version: 1.0.0
-
-health:
-  hystrix:
-    enabled: true
-
+    
 security:
  basic:
    enabled: false
+
 # provide rabbitmq configuration
 spring:
  rabbitmq:
--- a/samples/server/petstore/java-pkmst/src/main/resources/application-local.yml
+++ b/samples/server/petstore/java-pkmst/src/main/resources/application-local.yml
@@ -20,14 +20,11 @@ info:
    name: Pkmst
    description: Microservice developed by PKMST
    version: 1.0.0
-
-health:
-  hystrix:
-    enabled: true
-
+    
 security:
  basic:
    enabled: false
+
 # provide rabbitmq configuration
 spring:
  rabbitmq: