diff --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 index 513cc2b7bfe..fedf18da115 100644 --- 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 @@ -68,6 +68,7 @@ import org.openapitools.codegen.model.OperationsMap; import org.openapitools.codegen.templating.mustache.SplitStringLambda; import org.openapitools.codegen.templating.mustache.SpringHttpStatusLambda; import org.openapitools.codegen.templating.mustache.TrimWhitespaceLambda; +import org.openapitools.codegen.utils.ProcessUtils; import org.openapitools.codegen.utils.URLPathUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -594,16 +595,16 @@ public class SpringCodegen extends AbstractJavaCodegen (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "ApiKeyRequestInterceptor.java")); - supportingFiles.add(new SupportingFile("oauth2ClientProperties.mustache", - resourceFolder, "oauth2-client.properties")); - - supportingFiles.add(new SupportingFile("clientPropertiesConfiguration.mustache", - (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), - "ClientPropertiesConfiguration.java")); + if (ProcessUtils.hasOAuthMethods(openAPI)) { + supportingFiles.add(new SupportingFile("clientPropertiesConfiguration.mustache", + (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), + "ClientPropertiesConfiguration.java")); + } supportingFiles.add(new SupportingFile("clientConfiguration.mustache", (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"); diff --git 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 index 82966fd9d13..2c1e87bf176 100644 --- 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 @@ -35,7 +35,6 @@ import feign.RequestTemplate; import org.springframework.context.annotation.Configuration; -@Configuration public class ClientConfiguration { {{#authMethods}} diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/clientPropertiesConfiguration.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/clientPropertiesConfiguration.mustache index 5e8a06ccce0..a84aebfe0c1 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/clientPropertiesConfiguration.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/clientPropertiesConfiguration.mustache @@ -2,17 +2,40 @@ package {{configPackage}}; {{#authMethods}} {{#isOAuth}} -import org.springframework.context.annotation.PropertySource; - {{/isOAuth}} -{{/authMethods}} +import java.util.Properties; import org.springframework.context.annotation.Configuration; +import org.springframework.core.env.ConfigurableEnvironment; +import org.springframework.core.env.PropertiesPropertySource; -{{#hasAuthMethods}} - {{#hasOAuthMethods}} -@PropertySource( "classpath:/oauth2-client.properties" ) - {{/hasOAuthMethods}} -{{/hasAuthMethods}} -@Configuration +@Configuration(value = "{{configPackage}}.clientPropertiesConfiguration") public class ClientPropertiesConfiguration { + public ClientPropertiesConfiguration( final ConfigurableEnvironment configurableEnvironment ) { + final Properties properties = new Properties(); + properties.put("spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.client-id", "set-{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}-client-id" ); + properties.put("{{#scopes}}{{#-first}}spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.scope", "{{/-first}}{{scope}}{{^-last}},{{/-last}}{{/scopes}}" ); + {{#isCode}} + properties.put("spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.authorization-grant-type", "authorization_code" ); + properties.put("spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.redirect-uri", "set-{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}-redirect-uri" ); + properties.put("spring.security.oauth2.client.provider.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.token-uri", {{{tokenUrl}}}" ); + properties.put("spring.security.oauth2.client.provider.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.authorization-uri", "{{{authorizationUrl}}}" ); + {{/isCode}} + {{#isPassword}} + properties.put("spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.authorization-grant-type", "password" ); + properties.put("spring.security.oauth2.client.provider.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.token-uri", "{{{tokenUrl}}}" ); + {{/isPassword}} + {{#isApplication}} + properties.put("spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.authorization-grant-type", "client_credentials" ); + properties.put("spring.security.oauth2.client.provider.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.token-uri", "{{{tokenUrl}}}" ); + {{/isApplication}} + {{#isImplicit}} + properties.put("spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.authorization-grant-type", "implicit" ); + properties.put("spring.security.oauth2.client.provider.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.authorization-uri", "{{{authorizationUrl}}}" ); + {{/isImplicit}} + final PropertiesPropertySource propertiesPropertySource = new PropertiesPropertySource("{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}", properties ); + configurableEnvironment.getPropertySources().addLast( propertiesPropertySource ); + } + } + {{/isOAuth}} +{{/authMethods}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/oauth2ClientProperties.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/oauth2ClientProperties.mustache deleted file mode 100644 index 792b3b279fe..00000000000 --- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/oauth2ClientProperties.mustache +++ /dev/null @@ -1,25 +0,0 @@ -{{#authMethods}} -{{#isOAuth}} -spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.enabled=false -spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.client-id=set-{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}-client-id -{{#scopes}}{{#-first}}spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.scope={{/-first}}{{scope}}{{^-last}},{{/-last}}{{/scopes}} - {{#isCode}} -spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.authorization-grant-type=authorization_code -spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.redirect-uri=set-{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}-redirect-uri -spring.security.oauth2.client.provider.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.token-uri={{{tokenUrl}}} -spring.security.oauth2.client.provider.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.authorization-uri={{{authorizationUrl}}} - {{/isCode}} - {{#isPassword}} -spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.authorization-grant-type=password -spring.security.oauth2.client.provider.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.token-uri={{{tokenUrl}}} - {{/isPassword}} - {{#isApplication}} -spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.authorization-grant-type=client_credentials -spring.security.oauth2.client.provider.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.token-uri={{{tokenUrl}}} - {{/isApplication}} - {{#isImplicit}} -spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.authorization-grant-type=implicit -spring.security.oauth2.client.provider.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}.authorization-uri={{{authorizationUrl}}} - {{/isImplicit}} -{{/isOAuth}} -{{/authMethods}} \ No newline at end of file diff --git a/samples/client/petstore/spring-cloud-feign-without-url/.openapi-generator/FILES b/samples/client/petstore/spring-cloud-feign-without-url/.openapi-generator/FILES index 553a884f54d..84647501901 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/.openapi-generator/FILES +++ b/samples/client/petstore/spring-cloud-feign-without-url/.openapi-generator/FILES @@ -15,4 +15,3 @@ 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 -src/main/resources/oauth2-client.properties diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/configuration/ClientConfiguration.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/configuration/ClientConfiguration.java index e702587eb9d..82c4c5b0c69 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/configuration/ClientConfiguration.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/configuration/ClientConfiguration.java @@ -21,7 +21,6 @@ import feign.RequestTemplate; import org.springframework.context.annotation.Configuration; -@Configuration public class ClientConfiguration { private static final String CLIENT_PRINCIPAL_IMPLICIT = "oauth2FeignClient"; diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java index bc26dc990a8..ce9f10507e8 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java +++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java @@ -1,10 +1,21 @@ package org.openapitools.configuration; -import org.springframework.context.annotation.PropertySource; +import java.util.Properties; import org.springframework.context.annotation.Configuration; +import org.springframework.core.env.ConfigurableEnvironment; +import org.springframework.core.env.PropertiesPropertySource; -@PropertySource( "classpath:/oauth2-client.properties" ) -@Configuration +@Configuration(value = "org.openapitools.configuration.clientPropertiesConfiguration") public class ClientPropertiesConfiguration { + public ClientPropertiesConfiguration( final ConfigurableEnvironment configurableEnvironment ) { + final Properties properties = new Properties(); + properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.client-id", "set-petstoreAuthImplicit-client-id" ); + properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.scope", "write:pets,read:pets" ); + properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.authorization-grant-type", "implicit" ); + properties.put("spring.security.oauth2.client.provider.petstoreAuthImplicit.authorization-uri", "http://petstore.swagger.io/api/oauth/dialog" ); + final PropertiesPropertySource propertiesPropertySource = new PropertiesPropertySource("petstoreAuthImplicit", properties ); + configurableEnvironment.getPropertySources().addLast( propertiesPropertySource ); + } + } diff --git a/samples/client/petstore/spring-cloud/.openapi-generator/FILES b/samples/client/petstore/spring-cloud/.openapi-generator/FILES index 553a884f54d..84647501901 100644 --- a/samples/client/petstore/spring-cloud/.openapi-generator/FILES +++ b/samples/client/petstore/spring-cloud/.openapi-generator/FILES @@ -15,4 +15,3 @@ 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 -src/main/resources/oauth2-client.properties diff --git 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 index e702587eb9d..82c4c5b0c69 100644 --- 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 @@ -21,7 +21,6 @@ import feign.RequestTemplate; import org.springframework.context.annotation.Configuration; -@Configuration public class ClientConfiguration { private static final String CLIENT_PRINCIPAL_IMPLICIT = "oauth2FeignClient"; diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java index bc26dc990a8..ce9f10507e8 100644 --- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java +++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java @@ -1,10 +1,21 @@ package org.openapitools.configuration; -import org.springframework.context.annotation.PropertySource; +import java.util.Properties; import org.springframework.context.annotation.Configuration; +import org.springframework.core.env.ConfigurableEnvironment; +import org.springframework.core.env.PropertiesPropertySource; -@PropertySource( "classpath:/oauth2-client.properties" ) -@Configuration +@Configuration(value = "org.openapitools.configuration.clientPropertiesConfiguration") public class ClientPropertiesConfiguration { + public ClientPropertiesConfiguration( final ConfigurableEnvironment configurableEnvironment ) { + final Properties properties = new Properties(); + properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.client-id", "set-petstoreAuthImplicit-client-id" ); + properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.scope", "write:pets,read:pets" ); + properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.authorization-grant-type", "implicit" ); + properties.put("spring.security.oauth2.client.provider.petstoreAuthImplicit.authorization-uri", "http://petstore.swagger.io/api/oauth/dialog" ); + final PropertiesPropertySource propertiesPropertySource = new PropertiesPropertySource("petstoreAuthImplicit", properties ); + configurableEnvironment.getPropertySources().addLast( propertiesPropertySource ); + } + } diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/.openapi-generator/FILES b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/.openapi-generator/FILES index 553a884f54d..84647501901 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/.openapi-generator/FILES +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/.openapi-generator/FILES @@ -15,4 +15,3 @@ 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 -src/main/resources/oauth2-client.properties diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/configuration/ClientConfiguration.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/configuration/ClientConfiguration.java index e702587eb9d..82c4c5b0c69 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/configuration/ClientConfiguration.java +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/configuration/ClientConfiguration.java @@ -21,7 +21,6 @@ import feign.RequestTemplate; import org.springframework.context.annotation.Configuration; -@Configuration public class ClientConfiguration { private static final String CLIENT_PRINCIPAL_IMPLICIT = "oauth2FeignClient"; diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java index bc26dc990a8..ce9f10507e8 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java @@ -1,10 +1,21 @@ package org.openapitools.configuration; -import org.springframework.context.annotation.PropertySource; +import java.util.Properties; import org.springframework.context.annotation.Configuration; +import org.springframework.core.env.ConfigurableEnvironment; +import org.springframework.core.env.PropertiesPropertySource; -@PropertySource( "classpath:/oauth2-client.properties" ) -@Configuration +@Configuration(value = "org.openapitools.configuration.clientPropertiesConfiguration") public class ClientPropertiesConfiguration { + public ClientPropertiesConfiguration( final ConfigurableEnvironment configurableEnvironment ) { + final Properties properties = new Properties(); + properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.client-id", "set-petstoreAuthImplicit-client-id" ); + properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.scope", "write:pets,read:pets" ); + properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.authorization-grant-type", "implicit" ); + properties.put("spring.security.oauth2.client.provider.petstoreAuthImplicit.authorization-uri", "http://petstore.swagger.io/api/oauth/dialog" ); + final PropertiesPropertySource propertiesPropertySource = new PropertiesPropertySource("petstoreAuthImplicit", properties ); + configurableEnvironment.getPropertySources().addLast( propertiesPropertySource ); + } + } diff --git a/samples/openapi3/client/petstore/spring-cloud-3/.openapi-generator/FILES b/samples/openapi3/client/petstore/spring-cloud-3/.openapi-generator/FILES index 553a884f54d..84647501901 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/.openapi-generator/FILES +++ b/samples/openapi3/client/petstore/spring-cloud-3/.openapi-generator/FILES @@ -15,4 +15,3 @@ 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 -src/main/resources/oauth2-client.properties diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/configuration/ClientConfiguration.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/configuration/ClientConfiguration.java index e702587eb9d..82c4c5b0c69 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/configuration/ClientConfiguration.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/configuration/ClientConfiguration.java @@ -21,7 +21,6 @@ import feign.RequestTemplate; import org.springframework.context.annotation.Configuration; -@Configuration public class ClientConfiguration { private static final String CLIENT_PRINCIPAL_IMPLICIT = "oauth2FeignClient"; diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java index bc26dc990a8..ce9f10507e8 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java +++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java @@ -1,10 +1,21 @@ package org.openapitools.configuration; -import org.springframework.context.annotation.PropertySource; +import java.util.Properties; import org.springframework.context.annotation.Configuration; +import org.springframework.core.env.ConfigurableEnvironment; +import org.springframework.core.env.PropertiesPropertySource; -@PropertySource( "classpath:/oauth2-client.properties" ) -@Configuration +@Configuration(value = "org.openapitools.configuration.clientPropertiesConfiguration") public class ClientPropertiesConfiguration { + public ClientPropertiesConfiguration( final ConfigurableEnvironment configurableEnvironment ) { + final Properties properties = new Properties(); + properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.client-id", "set-petstoreAuthImplicit-client-id" ); + properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.scope", "write:pets,read:pets" ); + properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.authorization-grant-type", "implicit" ); + properties.put("spring.security.oauth2.client.provider.petstoreAuthImplicit.authorization-uri", "http://petstore.swagger.io/api/oauth/dialog" ); + final PropertiesPropertySource propertiesPropertySource = new PropertiesPropertySource("petstoreAuthImplicit", properties ); + configurableEnvironment.getPropertySources().addLast( propertiesPropertySource ); + } + } diff --git a/samples/openapi3/client/petstore/spring-cloud-async/.openapi-generator/FILES b/samples/openapi3/client/petstore/spring-cloud-async/.openapi-generator/FILES index 553a884f54d..84647501901 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/.openapi-generator/FILES +++ b/samples/openapi3/client/petstore/spring-cloud-async/.openapi-generator/FILES @@ -15,4 +15,3 @@ 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 -src/main/resources/oauth2-client.properties diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/configuration/ClientConfiguration.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/configuration/ClientConfiguration.java index e702587eb9d..82c4c5b0c69 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/configuration/ClientConfiguration.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/configuration/ClientConfiguration.java @@ -21,7 +21,6 @@ import feign.RequestTemplate; import org.springframework.context.annotation.Configuration; -@Configuration public class ClientConfiguration { private static final String CLIENT_PRINCIPAL_IMPLICIT = "oauth2FeignClient"; diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java index bc26dc990a8..ce9f10507e8 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java +++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java @@ -1,10 +1,21 @@ package org.openapitools.configuration; -import org.springframework.context.annotation.PropertySource; +import java.util.Properties; import org.springframework.context.annotation.Configuration; +import org.springframework.core.env.ConfigurableEnvironment; +import org.springframework.core.env.PropertiesPropertySource; -@PropertySource( "classpath:/oauth2-client.properties" ) -@Configuration +@Configuration(value = "org.openapitools.configuration.clientPropertiesConfiguration") public class ClientPropertiesConfiguration { + public ClientPropertiesConfiguration( final ConfigurableEnvironment configurableEnvironment ) { + final Properties properties = new Properties(); + properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.client-id", "set-petstoreAuthImplicit-client-id" ); + properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.scope", "write:pets,read:pets" ); + properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.authorization-grant-type", "implicit" ); + properties.put("spring.security.oauth2.client.provider.petstoreAuthImplicit.authorization-uri", "http://petstore.swagger.io/api/oauth/dialog" ); + final PropertiesPropertySource propertiesPropertySource = new PropertiesPropertySource("petstoreAuthImplicit", properties ); + configurableEnvironment.getPropertySources().addLast( propertiesPropertySource ); + } + } diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/.openapi-generator/FILES b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/.openapi-generator/FILES index 553a884f54d..84647501901 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/.openapi-generator/FILES +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/.openapi-generator/FILES @@ -15,4 +15,3 @@ 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 -src/main/resources/oauth2-client.properties diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/configuration/ClientConfiguration.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/configuration/ClientConfiguration.java index e702587eb9d..82c4c5b0c69 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/configuration/ClientConfiguration.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/configuration/ClientConfiguration.java @@ -21,7 +21,6 @@ import feign.RequestTemplate; import org.springframework.context.annotation.Configuration; -@Configuration public class ClientConfiguration { private static final String CLIENT_PRINCIPAL_IMPLICIT = "oauth2FeignClient"; diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java index bc26dc990a8..ce9f10507e8 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java @@ -1,10 +1,21 @@ package org.openapitools.configuration; -import org.springframework.context.annotation.PropertySource; +import java.util.Properties; import org.springframework.context.annotation.Configuration; +import org.springframework.core.env.ConfigurableEnvironment; +import org.springframework.core.env.PropertiesPropertySource; -@PropertySource( "classpath:/oauth2-client.properties" ) -@Configuration +@Configuration(value = "org.openapitools.configuration.clientPropertiesConfiguration") public class ClientPropertiesConfiguration { + public ClientPropertiesConfiguration( final ConfigurableEnvironment configurableEnvironment ) { + final Properties properties = new Properties(); + properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.client-id", "set-petstoreAuthImplicit-client-id" ); + properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.scope", "write:pets,read:pets" ); + properties.put("spring.security.oauth2.client.registration.petstoreAuthImplicit.authorization-grant-type", "implicit" ); + properties.put("spring.security.oauth2.client.provider.petstoreAuthImplicit.authorization-uri", "http://petstore.swagger.io/api/oauth/dialog" ); + final PropertiesPropertySource propertiesPropertySource = new PropertiesPropertySource("petstoreAuthImplicit", properties ); + configurableEnvironment.getPropertySources().addLast( propertiesPropertySource ); + } + }