only include imports which are actually required for spring-cloud Cli…

…entConfiguration generator (closes swagger-api#6683)
felhag · Jun 20, 2023 · 037bccc · 037bccc
1 parent a620537
commit 037bccc
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 17 deletions.
diff --git a/...codegen/src/main/resources/JavaSpring/libraries/spring-cloud/clientConfiguration.mustache b/...codegen/src/main/resources/JavaSpring/libraries/spring-cloud/clientConfiguration.mustache
@@ -1,22 +1,32 @@
 package {{configPackage}};
 
-import feign.Logger;
-import feign.auth.BasicAuthRequestInterceptor;
 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;
+{{#authMethods}}
+{{#isBasic}}
+import feign.auth.BasicAuthRequestInterceptor;
+{{/isBasic}}
+{{#isOAuth}}
 import org.springframework.cloud.security.oauth2.client.feign.OAuth2FeignRequestInterceptor;
 import org.springframework.security.oauth2.client.DefaultOAuth2ClientContext;
-import org.springframework.security.oauth2.client.resource.BaseOAuth2ProtectedResourceDetails;
+{{#isApplication}}
 import org.springframework.security.oauth2.client.token.grant.client.ClientCredentialsResourceDetails;
+{{/isApplication}}
+{{#isCode}}
 import org.springframework.security.oauth2.client.token.grant.code.AuthorizationCodeResourceDetails;
+{{/isCode}}
+{{#isImplicit}}
 import org.springframework.security.oauth2.client.token.grant.implicit.ImplicitResourceDetails;
+{{/isImplicit}}
+{{#isPassword}}
 import org.springframework.security.oauth2.client.token.grant.password.ResourceOwnerPasswordResourceDetails;
-import org.springframework.security.oauth2.common.exceptions.InvalidGrantException;
-import org.springframework.security.oauth2.common.exceptions.OAuth2Exception;
+{{/isPassword}}
+{{/isOAuth}}
+{{/authMethods}}
 
 @Configuration
 @EnableConfigurationProperties

diff --git a/samples/client/petstore/spring-cloud/.swagger-codegen/VERSION b/samples/client/petstore/spring-cloud/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.22-SNAPSHOT
+2.4.33-SNAPSHOT
diff --git a/samples/client/petstore/spring-cloud/src/main/java/io/swagger/api/PetApi.java b/samples/client/petstore/spring-cloud/src/main/java/io/swagger/api/PetApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.4.33-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/spring-cloud/src/main/java/io/swagger/api/StoreApi.java b/samples/client/petstore/spring-cloud/src/main/java/io/swagger/api/StoreApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.4.33-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */

diff --git a/samples/client/petstore/spring-cloud/src/main/java/io/swagger/api/UserApi.java b/samples/client/petstore/spring-cloud/src/main/java/io/swagger/api/UserApi.java
@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.4.22-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.4.33-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */

diff --git a/...ent/petstore/spring-cloud/src/main/java/io/swagger/configuration/ClientConfiguration.java b/...ent/petstore/spring-cloud/src/main/java/io/swagger/configuration/ClientConfiguration.java
@@ -1,7 +1,5 @@
 package io.swagger.configuration;
 
-import feign.Logger;
-import feign.auth.BasicAuthRequestInterceptor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -10,13 +8,7 @@
 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.resource.BaseOAuth2ProtectedResourceDetails;
-import org.springframework.security.oauth2.client.token.grant.client.ClientCredentialsResourceDetails;
-import org.springframework.security.oauth2.client.token.grant.code.AuthorizationCodeResourceDetails;
 import org.springframework.security.oauth2.client.token.grant.implicit.ImplicitResourceDetails;
-import org.springframework.security.oauth2.client.token.grant.password.ResourceOwnerPasswordResourceDetails;
-import org.springframework.security.oauth2.common.exceptions.InvalidGrantException;
-import org.springframework.security.oauth2.common.exceptions.OAuth2Exception;
 
 @Configuration
 @EnableConfigurationProperties