Fix test

MelleD · Feb 14, 2024 · e7d32a2 · e7d32a2
1 parent cb3c331
commit e7d32a2
Show file tree

Hide file tree

Showing 19 changed files with 85 additions and 31 deletions.
diff --git a/...c/main/resources/JavaSpring/libraries/spring-cloud/clientPropertiesConfiguration.mustache b/...c/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
@@ -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/...d-feign-without-url/src/main/java/org/openapitools/configuration/ClientConfiguration.java b/...d-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/...thout-url/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java b/...thout-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
@@ -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/...tstore/spring-cloud/src/main/java/org/openapitools/configuration/ClientConfiguration.java b/...tstore/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/...ing-cloud/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java b/...ing-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
@@ -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/...oud-3-with-optional/src/main/java/org/openapitools/configuration/ClientConfiguration.java b/...oud-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/...-optional/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java b/...-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
@@ -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/...tore/spring-cloud-3/src/main/java/org/openapitools/configuration/ClientConfiguration.java b/...tore/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/...g-cloud-3/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java b/...g-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
@@ -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/.../spring-cloud-async/src/main/java/org/openapitools/configuration/ClientConfiguration.java b/.../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/...oud-async/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java b/...oud-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
@@ -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/...oud-spring-pageable/src/main/java/org/openapitools/configuration/ClientConfiguration.java b/...oud-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/...-pageable/src/main/java/org/openapitools/configuration/ClientPropertiesConfiguration.java b/...-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 )
+    }
+
 }