Merge pull request #480 from babltiga/open-feign-support

HugoMario · web-flow · commit 219cb45ae09b · 2019-10-03T03:44:05.000-05:00
Open Feign Support
diff --git a/src/main/java/io/swagger/codegen/v3/generators/java/Spring2Codegen.java b/src/main/java/io/swagger/codegen/v3/generators/java/Spring2Codegen.java
@@ -42,6 +42,7 @@ public class Spring2Codegen extends AbstractJavaCodegen implements BeanValidatio
     public static final String SPRING_CLOUD_LIBRARY = "spring-cloud";
     public static final String IMPLICIT_HEADERS = "implicitHeaders";
     public static final String SWAGGER_DOCKET_CONFIG = "swaggerDocketConfig";
+    public static final String TARGET_OPENFEIGN = "generateForOpenFeign";
 
     protected String title = "swagger-petstore";
     protected String configPackage = "io.swagger.configuration";
@@ -58,6 +59,7 @@ public class Spring2Codegen extends AbstractJavaCodegen implements BeanValidatio
     protected boolean implicitHeaders = false;
     protected boolean swaggerDocketConfig = false;
     protected boolean useOptional = false;
+    protected boolean openFeign = false;
 
     public Spring2Codegen() {
         super();
@@ -88,6 +90,7 @@ public Spring2Codegen() {
         cliOptions.add(CliOption.newBoolean(SWAGGER_DOCKET_CONFIG, "Generate Spring Swagger Docket configuration class."));
         cliOptions.add(CliOption.newBoolean(USE_OPTIONAL,
                 "Use Optional container for optional parameters"));
+        cliOptions.add(CliOption.newBoolean(TARGET_OPENFEIGN,"Generate for usage with OpenFeign (instead of feign)"));
 
         supportedLibraries.put(DEFAULT_LIBRARY, "Spring-boot Server application using the SpringFox integration.");
         supportedLibraries.put(SPRING_MVC_LIBRARY, "Spring-MVC Server application using the SpringFox integration.");
@@ -200,6 +203,10 @@ public void processOpts() {
             this.setUseOptional(convertPropertyToBoolean(USE_OPTIONAL));
         }
 
+        if (additionalProperties.containsKey(TARGET_OPENFEIGN)) {
+            this.setOpenFeign(convertPropertyToBoolean(TARGET_OPENFEIGN));
+        }
+
         if (useBeanValidation) {
             writePropertyBack(USE_BEANVALIDATION, useBeanValidation);
         }
@@ -316,6 +323,10 @@ public void processOpts() {
             additionalProperties.put(RESPONSE_WRAPPER, "Callable");
         }
 
+        if(this.openFeign){
+            additionalProperties.put("isOpenFeign", "true");
+        }
+
         // Some well-known Spring or Spring-Cloud response wrappers
         switch (this.responseWrapper) {
             case "Future":
@@ -745,4 +756,8 @@ public void setUseBeanValidation(boolean useBeanValidation) {
     public void setUseOptional(boolean useOptional) {
         this.useOptional = useOptional;
     }
+
+    public void setOpenFeign(boolean openFeign) {
+        this.openFeign = openFeign;
+    }
 }
diff --git a/src/main/java/io/swagger/codegen/v3/generators/java/SpringCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/java/SpringCodegen.java
@@ -61,6 +61,7 @@ public class SpringCodegen extends AbstractJavaCodegen implements BeanValidation
     public static final String SPRING_CLOUD_LIBRARY = "spring-cloud";
     public static final String IMPLICIT_HEADERS = "implicitHeaders";
     public static final String SWAGGER_DOCKET_CONFIG = "swaggerDocketConfig";
+    public static final String TARGET_OPENFEIGN = "generateForOpenFeign";
 
     protected String title = "swagger-petstore";
     protected String configPackage = "io.swagger.configuration";
@@ -77,6 +78,7 @@ public class SpringCodegen extends AbstractJavaCodegen implements BeanValidation
     protected boolean implicitHeaders = false;
     protected boolean swaggerDocketConfig = false;
     protected boolean useOptional = false;
+    protected boolean openFeign = false;
 
     public SpringCodegen() {
         super();
@@ -107,6 +109,7 @@ public SpringCodegen() {
         cliOptions.add(CliOption.newBoolean(SWAGGER_DOCKET_CONFIG, "Generate Spring Swagger Docket configuration class."));
         cliOptions.add(CliOption.newBoolean(USE_OPTIONAL,
                 "Use Optional container for optional parameters"));
+        cliOptions.add(CliOption.newBoolean(TARGET_OPENFEIGN,"Generate for usage with OpenFeign (instead of feign)"));
 
         supportedLibraries.put(DEFAULT_LIBRARY, "Spring-boot Server application using the SpringFox integration.");
         supportedLibraries.put(SPRING_MVC_LIBRARY, "Spring-MVC Server application using the SpringFox integration.");
@@ -219,6 +222,10 @@ public void processOpts() {
             this.setUseOptional(convertPropertyToBoolean(USE_OPTIONAL));
         }
 
+        if (additionalProperties.containsKey(TARGET_OPENFEIGN)) {
+            this.setOpenFeign(convertPropertyToBoolean(TARGET_OPENFEIGN));
+        }
+
         if (useBeanValidation) {
             writePropertyBack(USE_BEANVALIDATION, useBeanValidation);
         }
@@ -335,6 +342,10 @@ public void processOpts() {
             additionalProperties.put(RESPONSE_WRAPPER, "Callable");
         }
 
+        if(this.openFeign){
+            additionalProperties.put("isOpenFeign", "true");
+        }
+
         // Some well-known Spring or Spring-Cloud response wrappers
         switch (this.responseWrapper) {
             case "Future":
@@ -764,4 +775,8 @@ public void setUseBeanValidation(boolean useBeanValidation) {
     public void setUseOptional(boolean useOptional) {
         this.useOptional = useOptional;
     }
+
+    public void setOpenFeign(boolean openFeign) {
+        this.openFeign = openFeign;
+    }
 }
diff --git a/src/main/resources/handlebars/JavaSpring/libraries/spring-cloud/Application.mustache b/src/main/resources/handlebars/JavaSpring/libraries/spring-cloud/Application.mustache
@@ -3,7 +3,12 @@ package io.swagger;
 import feign.Logger;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.cloud.netflix.feign.EnableFeignClients;
+{{^isOpenFeign}}
+    import org.springframework.cloud.netflix.feign.EnableFeignClients;
+{{/isOpenFeign}}
+{{#isOpenFeign}}
+    import org.springframework.cloud.openfeign.EnableFeignClients;
+{{/isOpenFeign}}
 import org.springframework.context.annotation.Bean;
 
 @SpringBootApplication
diff --git a/src/main/resources/handlebars/JavaSpring/libraries/spring-cloud/apiClient.mustache b/src/main/resources/handlebars/JavaSpring/libraries/spring-cloud/apiClient.mustache
@@ -1,10 +1,15 @@
 package {{package}};
 
-import org.springframework.cloud.netflix.feign.FeignClient;
+{{^isOpenFeign}}
+    import org.springframework.cloud.netflix.feign.FeignClient;
+{{/isOpenFeign}}
+{{#isOpenFeign}}
+    import org.springframework.cloud.openfeign.FeignClient;
+{{/isOpenFeign}}
 import {{configPackage}}.ClientConfiguration;
 
 {{=<% %>=}}
 @FeignClient(name="${<%title%>.name:<%title%>}", url="${<%title%>.url:<%basePath%>}", configuration = ClientConfiguration.class)
 <%={{ }}=%>
 public interface {{classname}}Client extends {{classname}} {
-}
+}
diff --git a/src/main/resources/handlebars/JavaSpring2/libraries/spring-cloud/Application.mustache b/src/main/resources/handlebars/JavaSpring2/libraries/spring-cloud/Application.mustache
@@ -3,7 +3,12 @@ package io.swagger;
 import feign.Logger;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.cloud.netflix.feign.EnableFeignClients;
+{{^isOpenFeign}}
+    import org.springframework.cloud.netflix.feign.EnableFeignClients;
+{{/isOpenFeign}}
+{{#isOpenFeign}}
+    import org.springframework.cloud.openfeign.EnableFeignClients;
+{{/isOpenFeign}}
 import org.springframework.context.annotation.Bean;
 
 @SpringBootApplication
diff --git a/src/main/resources/handlebars/JavaSpring2/libraries/spring-cloud/apiClient.mustache b/src/main/resources/handlebars/JavaSpring2/libraries/spring-cloud/apiClient.mustache
@@ -1,10 +1,15 @@
 package {{package}};
 
-import org.springframework.cloud.netflix.feign.FeignClient;
+{{^isOpenFeign}}
+    import org.springframework.cloud.netflix.feign.FeignClient;
+{{/isOpenFeign}}
+{{#isOpenFeign}}
+    import org.springframework.cloud.openfeign.FeignClient;
+{{/isOpenFeign}}
 import {{configPackage}}.ClientConfiguration;
 
 {{=<% %>=}}
 @FeignClient(name="${<%title%>.name:<%title%>}", url="${<%title%>.url:<%basePath%>}", configuration = ClientConfiguration.class)
 <%={{ }}=%>
 public interface {{classname}}Client extends {{classname}} {
-}
+}
diff --git a/src/main/resources/mustache/JavaSpring/libraries/spring-cloud/Application.mustache b/src/main/resources/mustache/JavaSpring/libraries/spring-cloud/Application.mustache
@@ -3,7 +3,12 @@ package io.swagger;
 import feign.Logger;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.cloud.netflix.feign.EnableFeignClients;
+{{^isOpenFeign}}
+    import org.springframework.cloud.netflix.feign.EnableFeignClients;
+{{/isOpenFeign}}
+{{#isOpenFeign}}
+    import org.springframework.cloud.openfeign.EnableFeignClients;
+{{/isOpenFeign}}
 import org.springframework.context.annotation.Bean;
 
 @SpringBootApplication
diff --git a/src/main/resources/mustache/JavaSpring/libraries/spring-cloud/apiClient.mustache b/src/main/resources/mustache/JavaSpring/libraries/spring-cloud/apiClient.mustache
@@ -1,10 +1,15 @@
 package {{package}};
 
-import org.springframework.cloud.netflix.feign.FeignClient;
+{{^isOpenFeign}}
+    import org.springframework.cloud.netflix.feign.FeignClient;
+{{/isOpenFeign}}
+{{#isOpenFeign}}
+    import org.springframework.cloud.openfeign.FeignClient;
+{{/isOpenFeign}}
 import {{configPackage}}.ClientConfiguration;
 
 {{=<% %>=}}
 @FeignClient(name="${<%title%>.name:<%title%>}", url="${<%title%>.url:<%basePath%>}", configuration = ClientConfiguration.class)
 <%={{ }}=%>
 public interface {{classname}}Client extends {{classname}} {
-}
+}
diff --git a/src/main/resources/mustache/JavaSpring2/libraries/spring-cloud/Application.mustache b/src/main/resources/mustache/JavaSpring2/libraries/spring-cloud/Application.mustache
@@ -3,7 +3,12 @@ package io.swagger;
 import feign.Logger;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.cloud.netflix.feign.EnableFeignClients;
+{{^isOpenFeign}}
+    import org.springframework.cloud.netflix.feign.EnableFeignClients;
+{{/isOpenFeign}}
+{{#isOpenFeign}}
+    import org.springframework.cloud.openfeign.EnableFeignClients;
+{{/isOpenFeign}}
 import org.springframework.context.annotation.Bean;
 
 @SpringBootApplication
diff --git a/src/main/resources/mustache/JavaSpring2/libraries/spring-cloud/apiClient.mustache b/src/main/resources/mustache/JavaSpring2/libraries/spring-cloud/apiClient.mustache
@@ -1,10 +1,15 @@
 package {{package}};
 
-import org.springframework.cloud.netflix.feign.FeignClient;
+{{^isOpenFeign}}
+    import org.springframework.cloud.netflix.feign.FeignClient;
+{{/isOpenFeign}}
+{{#isOpenFeign}}
+    import org.springframework.cloud.openfeign.FeignClient;
+{{/isOpenFeign}}
 import {{configPackage}}.ClientConfiguration;
 
 {{=<% %>=}}
 @FeignClient(name="${<%title%>.name:<%title%>}", url="${<%title%>.url:<%basePath%>}", configuration = ClientConfiguration.class)
 <%={{ }}=%>
 public interface {{classname}}Client extends {{classname}} {
-}
+}
