From e7d32a29c4a7452376a65933d3169c51d6f7a78d Mon Sep 17 00:00:00 2001 From: Dennis Melzer Date: Wed, 14 Feb 2024 08:48:51 +0100 Subject: [PATCH] Fix test --- .../clientPropertiesConfiguration.mustache | 2 +- .../.openapi-generator/FILES | 1 - .../configuration/ClientConfiguration.java | 1 - .../ClientPropertiesConfiguration.java | 17 ++++++++++++++--- .../spring-cloud/.openapi-generator/FILES | 1 - .../configuration/ClientConfiguration.java | 1 - .../ClientPropertiesConfiguration.java | 17 ++++++++++++++--- .../.openapi-generator/FILES | 1 - .../configuration/ClientConfiguration.java | 1 - .../ClientPropertiesConfiguration.java | 17 ++++++++++++++--- .../spring-cloud-3/.openapi-generator/FILES | 1 - .../configuration/ClientConfiguration.java | 1 - .../ClientPropertiesConfiguration.java | 17 ++++++++++++++--- .../spring-cloud-async/.openapi-generator/FILES | 1 - .../configuration/ClientConfiguration.java | 1 - .../ClientPropertiesConfiguration.java | 17 ++++++++++++++--- .../.openapi-generator/FILES | 1 - .../configuration/ClientConfiguration.java | 1 - .../ClientPropertiesConfiguration.java | 17 ++++++++++++++--- 19 files changed, 85 insertions(+), 31 deletions(-) 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 44f9e27c2c2f..2de12ae94640 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 @@ -32,7 +32,7 @@ public class ClientPropertiesConfiguration { 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 ); + final PropertiesPropertySource propertiesPropertySource = new PropertiesPropertySource("{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}", properties ); configurableEnvironment.getPropertySources().addLast( propertiesPropertySource ) } 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 553a884f54d0..84647501901b 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 e702587eb9d3..82c4c5b0c69d 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 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 bc26dc990a8e..f00d0dc18523 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 553a884f54d0..84647501901b 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 e702587eb9d3..82c4c5b0c69d 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 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 bc26dc990a8e..f00d0dc18523 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 553a884f54d0..84647501901b 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 e702587eb9d3..82c4c5b0c69d 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 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 bc26dc990a8e..f00d0dc18523 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 553a884f54d0..84647501901b 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 e702587eb9d3..82c4c5b0c69d 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 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 bc26dc990a8e..f00d0dc18523 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 553a884f54d0..84647501901b 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 e702587eb9d3..82c4c5b0c69d 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 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 bc26dc990a8e..f00d0dc18523 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 553a884f54d0..84647501901b 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 e702587eb9d3..82c4c5b0c69d 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 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 bc26dc990a8e..f00d0dc18523 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 ) + } + }