diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom-sb3.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom-sb3.mustache index 66056bed0d6b..846798687959 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom-sb3.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom-sb3.mustache @@ -58,7 +58,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.0 + 2023.0.6 pom import diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradle-sb3-Kts.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradle-sb3-Kts.mustache index c1fb61e35c18..d889428fca20 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradle-sb3-Kts.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradle-sb3-Kts.mustache @@ -24,8 +24,8 @@ plugins { id("org.jetbrains.kotlin.jvm") version kotlinVersion id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion - id("org.springframework.boot") version "3.0.2" - id("io.spring.dependency-management") version "1.0.14.RELEASE" + id("org.springframework.boot") version "3.3.13" + id("io.spring.dependency-management") version "1.1.7" } dependencies { diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom-sb3.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom-sb3.mustache index ea1ac4523871..bc729d19610c 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom-sb3.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom-sb3.mustache @@ -21,7 +21,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.3.13 diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradle-sb3-Kts.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradle-sb3-Kts.mustache index 7f3116417091..17625708d986 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradle-sb3-Kts.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradle-sb3-Kts.mustache @@ -18,8 +18,8 @@ plugins { id("org.jetbrains.kotlin.jvm") version kotlinVersion id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion - id("org.springframework.boot") version "3.0.2" - id("io.spring.dependency-management") version "1.0.14.RELEASE" + id("org.springframework.boot") version "3.3.13" + id("io.spring.dependency-management") version "1.1.7" } tasks.getByName("bootJar") { @@ -32,7 +32,7 @@ tasks.getByName("jar") { dependencyManagement { imports { - mavenBom("org.springframework.cloud:spring-cloud-dependencies:2021.0.5") + mavenBom("org.springframework.cloud:spring-cloud-dependencies:2023.0.6") } } @@ -58,7 +58,7 @@ dependencies { implementation("com.fasterxml.jackson.module:jackson-module-kotlin") implementation("org.springframework.cloud:spring-cloud-starter-openfeign"){{#hasAuthMethods}} - implementation("org.springframework.cloud:spring-cloud-starter-oauth2:2.2.5.RELEASE"){{/hasAuthMethods}} + implementation("org.springframework.boot:spring-boot-starter-oauth2-client"){{/hasAuthMethods}} {{#useBeanValidation}} implementation("jakarta.validation:jakarta.validation-api"){{/useBeanValidation}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/clientConfiguration.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/clientConfiguration.mustache index 3bc7c2bfcd64..cd74b3b01cca 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/clientConfiguration.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/clientConfiguration.mustache @@ -8,20 +8,14 @@ import feign.auth.BasicAuthRequestInterceptor import org.springframework.beans.factory.annotation.Value import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty {{/-first}} -{{^useSpringBoot4}} -{{#isOAuth}} -import org.springframework.boot.context.properties.ConfigurationProperties -{{/isOAuth}} -{{/useSpringBoot4}} +{{^useSpringBoot4}}{{^useSpringBoot3}}{{#isOAuth}}import org.springframework.boot.context.properties.ConfigurationProperties{{/isOAuth}}{{/useSpringBoot3}}{{/useSpringBoot4}} {{/authMethods}} -{{^useSpringBoot4}} -import org.springframework.boot.context.properties.EnableConfigurationProperties -{{/useSpringBoot4}} +{{^useSpringBoot4}}{{^useSpringBoot3}}import org.springframework.boot.context.properties.EnableConfigurationProperties{{/useSpringBoot3}}{{/useSpringBoot4}} {{#hasAuthMethods}} import org.springframework.context.annotation.Bean {{/hasAuthMethods}} import org.springframework.context.annotation.Configuration -{{^useSpringBoot4}} +{{^useSpringBoot4}}{{^useSpringBoot3}} {{#authMethods}} {{#isOAuth}} import org.springframework.cloud.openfeign.security.OAuth2FeignRequestInterceptor @@ -41,7 +35,24 @@ import org.springframework.security.oauth2.client.token.grant.password.ResourceO {{/isPassword}} {{/isOAuth}} {{/authMethods}} -{{/useSpringBoot4}} +{{/useSpringBoot3}}{{/useSpringBoot4}} +{{#useSpringBoot3}} +{{#hasOAuthMethods}} +import org.springframework.security.authentication.AnonymousAuthenticationToken +import org.springframework.security.oauth2.client.AuthorizedClientServiceOAuth2AuthorizedClientManager +import org.springframework.security.oauth2.client.OAuth2AuthorizeRequest +import org.springframework.security.oauth2.client.OAuth2AuthorizedClientManager +import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService +import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository +import org.springframework.security.oauth2.core.OAuth2AuthenticationException +import org.springframework.security.oauth2.core.OAuth2AccessToken +import org.springframework.security.core.authority.AuthorityUtils +import org.springframework.http.HttpHeaders + +import feign.RequestInterceptor +import feign.RequestTemplate +{{/hasOAuthMethods}} +{{/useSpringBoot3}} {{#useSpringBoot4}} {{#hasOAuthMethods}} import org.springframework.security.authentication.AnonymousAuthenticationToken @@ -60,10 +71,8 @@ import feign.RequestTemplate {{/hasOAuthMethods}} {{/useSpringBoot4}} -@Configuration -{{^useSpringBoot4}} -@EnableConfigurationProperties -{{/useSpringBoot4}} +@Configuration{{^useSpringBoot4}}{{^useSpringBoot3}} +@EnableConfigurationProperties{{/useSpringBoot3}}{{/useSpringBoot4}} class ClientConfiguration { {{#authMethods}} @@ -93,7 +102,7 @@ class ClientConfiguration { {{/isApiKey}} {{#isOAuth}} -{{^useSpringBoot4}} +{{^useSpringBoot4}}{{^useSpringBoot3}} @Bean @ConditionalOnProperty("{{#lambda.lowercase}}{{{title}}}{{/lambda.lowercase}}.security.{{{name}}}.client-id") fun {{#lambda.camelcase}}{{{name}}}{{/lambda.camelcase}}RequestInterceptor(oAuth2ClientContext: OAuth2ClientContext): OAuth2FeignRequestInterceptor { @@ -151,7 +160,29 @@ class ClientConfiguration { } {{/isImplicit}} -{{/useSpringBoot4}} +{{/useSpringBoot3}}{{/useSpringBoot4}} +{{#useSpringBoot3}} + @Bean + @ConditionalOnProperty(prefix = "spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}", name = ["enabled"], havingValue = "true") + fun {{{flow}}}OAuth2RequestInterceptor({{{flow}}}AuthorizedClientManager: OAuth2AuthorizedClientManager): OAuth2RequestInterceptor { + return OAuth2RequestInterceptor( + OAuth2AuthorizeRequest.withClientRegistrationId("{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}") + .principal(AnonymousAuthenticationToken(CLIENT_PRINCIPAL_{{#lambda.uppercase}}{{{flow}}}{{/lambda.uppercase}}, CLIENT_PRINCIPAL_{{#lambda.uppercase}}{{{flow}}}{{/lambda.uppercase}}, AuthorityUtils.createAuthorityList("ROLE_ANONYMOUS"))) + .build(), + {{{flow}}}AuthorizedClientManager + ) + } + + @Bean + @ConditionalOnProperty(prefix = "spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}", name = ["enabled"], havingValue = "true") + fun {{{flow}}}AuthorizedClientManager( + clientRegistrationRepository: ClientRegistrationRepository, + authorizedClientService: OAuth2AuthorizedClientService + ): OAuth2AuthorizedClientManager { + return AuthorizedClientServiceOAuth2AuthorizedClientManager(clientRegistrationRepository, authorizedClientService) + } + +{{/useSpringBoot3}} {{#useSpringBoot4}} @Bean @ConditionalOnProperty(prefix = "spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}", name = ["enabled"], havingValue = "true") @@ -176,6 +207,38 @@ class ClientConfiguration { {{/useSpringBoot4}} {{/isOAuth}} {{/authMethods}} +{{#useSpringBoot3}} + {{#hasOAuthMethods}} + class OAuth2RequestInterceptor( + private val oAuth2AuthorizeRequest: OAuth2AuthorizeRequest, + private val oAuth2AuthorizedClientManager: OAuth2AuthorizedClientManager + ) : RequestInterceptor { + + override fun apply(template: RequestTemplate) { + template.header(HttpHeaders.AUTHORIZATION, getBearerToken()) + } + + fun getAccessToken(): OAuth2AccessToken { + val authorizedClient = oAuth2AuthorizedClientManager.authorize(oAuth2AuthorizeRequest) + ?: throw OAuth2AuthenticationException("Client failed to authenticate") + return authorizedClient.accessToken + } + + fun getBearerToken(): String { + val accessToken = getAccessToken() + return String.format(java.util.Locale.ROOT, "%s %s", accessToken.tokenType?.value, accessToken.tokenValue) + } + } + + companion object { + {{#authMethods}} + {{#isOAuth}} + private const val CLIENT_PRINCIPAL_{{#lambda.uppercase}}{{{flow}}}{{/lambda.uppercase}} = "oauth2FeignClient" + {{/isOAuth}} + {{/authMethods}} + } + {{/hasOAuthMethods}} +{{/useSpringBoot3}} {{#useSpringBoot4}} {{#hasOAuthMethods}} class OAuth2RequestInterceptor( diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom-sb3.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom-sb3.mustache index 80e639d71a8c..3ab6582ac525 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom-sb3.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom-sb3.mustache @@ -27,14 +27,14 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.3.13 org.springframework.cloud spring-cloud-starter-parent - 2021.0.5 + 2023.0.6 pom import @@ -192,11 +192,8 @@ {{#hasAuthMethods}} - org.springframework.cloud - spring-cloud-starter-oauth2 - {{^parentOverridden}} - 2.2.5.RELEASE - {{/parentOverridden}} + org.springframework.boot + spring-boot-starter-oauth2-client {{/hasAuthMethods}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/buildGradle-sb3-Kts.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/buildGradle-sb3-Kts.mustache index 714f6e6a0b90..7149f522e5bc 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/buildGradle-sb3-Kts.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/buildGradle-sb3-Kts.mustache @@ -18,8 +18,8 @@ plugins { id("org.jetbrains.kotlin.jvm") version kotlinVersion id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion - id("org.springframework.boot") version "3.0.2" - id("io.spring.dependency-management") version "1.0.14.RELEASE" + id("org.springframework.boot") version "3.3.13" + id("io.spring.dependency-management") version "1.1.7" } tasks.getByName("bootJar") { @@ -32,7 +32,7 @@ tasks.getByName("jar") { dependencyManagement { imports { - mavenBom("org.springframework.cloud:spring-cloud-dependencies:2021.0.5") + mavenBom("org.springframework.cloud:spring-cloud-dependencies:2023.0.6") } } @@ -58,7 +58,7 @@ dependencies { implementation("com.fasterxml.jackson.module:jackson-module-kotlin") {{#hasAuthMethods}} - implementation("org.springframework.cloud:spring-cloud-starter-oauth2:2.2.5.RELEASE"){{/hasAuthMethods}} + implementation("org.springframework.boot:spring-boot-starter-oauth2-client"){{/hasAuthMethods}} {{#useBeanValidation}} implementation("jakarta.validation:jakarta.validation-api"){{/useBeanValidation}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/pom-sb3.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/pom-sb3.mustache index 17677535be5b..f4a6053d110f 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/pom-sb3.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/pom-sb3.mustache @@ -27,14 +27,14 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.3.13 org.springframework.cloud spring-cloud-starter-parent - 2021.0.5 + 2023.0.6 pom import @@ -188,11 +188,8 @@ {{#hasAuthMethods}} - org.springframework.cloud - spring-cloud-starter-oauth2 - {{^parentOverridden}} - 2.2.5.RELEASE - {{/parentOverridden}} + org.springframework.boot + spring-boot-starter-oauth2-client {{/hasAuthMethods}} diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java index 504583c759dd..1cc51f226049 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java @@ -5042,6 +5042,7 @@ public void shouldAddParameterWithInHeaderWhenImplicitHeadersIsTrue() throws IOE String methodPattern = "fun test\\s*\\(.*?\\)"; Pattern pattern = Pattern.compile(methodPattern); + Matcher matcher = pattern.matcher(content); Assert.assertTrue(matcher.find(), "Method 'test' should be found in generated file"); diff --git a/samples/client/petstore/spring-cloud-auth/pom.xml b/samples/client/petstore/spring-cloud-auth/pom.xml index 498f314d0a63..29cc443d753a 100644 --- a/samples/client/petstore/spring-cloud-auth/pom.xml +++ b/samples/client/petstore/spring-cloud-auth/pom.xml @@ -27,7 +27,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.0 + 2023.0.6 pom import diff --git a/samples/client/petstore/spring-cloud-date-time/pom.xml b/samples/client/petstore/spring-cloud-date-time/pom.xml index 50553ca5c373..e7316a08bf57 100644 --- a/samples/client/petstore/spring-cloud-date-time/pom.xml +++ b/samples/client/petstore/spring-cloud-date-time/pom.xml @@ -41,7 +41,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.0 + 2023.0.6 pom import diff --git a/samples/client/petstore/spring-cloud-deprecated/pom.xml b/samples/client/petstore/spring-cloud-deprecated/pom.xml index 78f24663772d..7673b10b716a 100644 --- a/samples/client/petstore/spring-cloud-deprecated/pom.xml +++ b/samples/client/petstore/spring-cloud-deprecated/pom.xml @@ -41,7 +41,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.0 + 2023.0.6 pom import diff --git a/samples/client/petstore/spring-cloud-feign-without-url/pom.xml b/samples/client/petstore/spring-cloud-feign-without-url/pom.xml index dd8748ea994c..56f778732749 100644 --- a/samples/client/petstore/spring-cloud-feign-without-url/pom.xml +++ b/samples/client/petstore/spring-cloud-feign-without-url/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.0 + 2023.0.6 pom import diff --git a/samples/client/petstore/spring-cloud-tags/pom.xml b/samples/client/petstore/spring-cloud-tags/pom.xml index 97da2d0d7427..57deabfa8bf9 100644 --- a/samples/client/petstore/spring-cloud-tags/pom.xml +++ b/samples/client/petstore/spring-cloud-tags/pom.xml @@ -41,7 +41,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.0 + 2023.0.6 pom import diff --git a/samples/client/petstore/spring-cloud/pom.xml b/samples/client/petstore/spring-cloud/pom.xml index dd8748ea994c..56f778732749 100644 --- a/samples/client/petstore/spring-cloud/pom.xml +++ b/samples/client/petstore/spring-cloud/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.0 + 2023.0.6 pom import diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/pom.xml b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/pom.xml index d1e0d3e4405d..0323d7d2dc9d 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/pom.xml @@ -27,7 +27,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.0 + 2023.0.6 pom import diff --git a/samples/openapi3/client/petstore/spring-cloud-3/pom.xml b/samples/openapi3/client/petstore/spring-cloud-3/pom.xml index d461f1ea1c80..02400f0c97c3 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud-3/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.0 + 2023.0.6 pom import diff --git a/samples/openapi3/client/petstore/spring-cloud-async/pom.xml b/samples/openapi3/client/petstore/spring-cloud-async/pom.xml index 296a33eeabb4..095b5f666ab4 100644 --- a/samples/openapi3/client/petstore/spring-cloud-async/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud-async/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.0 + 2023.0.6 pom import diff --git a/samples/openapi3/client/petstore/spring-cloud-date-time/pom.xml b/samples/openapi3/client/petstore/spring-cloud-date-time/pom.xml index 854f21b34444..4241ab48b361 100644 --- a/samples/openapi3/client/petstore/spring-cloud-date-time/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud-date-time/pom.xml @@ -41,7 +41,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.0 + 2023.0.6 pom import diff --git a/samples/openapi3/client/petstore/spring-cloud-http-basic/pom.xml b/samples/openapi3/client/petstore/spring-cloud-http-basic/pom.xml index 949bfd133a27..f43a20e94da8 100644 --- a/samples/openapi3/client/petstore/spring-cloud-http-basic/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud-http-basic/pom.xml @@ -41,7 +41,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.0 + 2023.0.6 pom import diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/pom.xml b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/pom.xml index 48297b27b007..7acd0b88c845 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/pom.xml @@ -41,7 +41,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.0 + 2023.0.6 pom import diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/pom.xml b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/pom.xml index c87e404bb14e..262b67ff6480 100644 --- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.0 + 2023.0.6 pom import diff --git a/samples/openapi3/client/petstore/spring-cloud/pom.xml b/samples/openapi3/client/petstore/spring-cloud/pom.xml index 48297b27b007..7acd0b88c845 100644 --- a/samples/openapi3/client/petstore/spring-cloud/pom.xml +++ b/samples/openapi3/client/petstore/spring-cloud/pom.xml @@ -41,7 +41,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.0 + 2023.0.6 pom import diff --git a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/configuration/ClientConfiguration.kt b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/configuration/ClientConfiguration.kt index 8a2e2b4b7270..b233903787d1 100644 --- a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/configuration/ClientConfiguration.kt +++ b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/configuration/ClientConfiguration.kt @@ -3,18 +3,22 @@ package org.openapitools.configuration 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 + import org.springframework.cloud.openfeign.security.OAuth2FeignRequestInterceptor import org.springframework.security.oauth2.client.DefaultOAuth2ClientContext import org.springframework.security.oauth2.client.OAuth2ClientContext import org.springframework.security.oauth2.client.token.grant.implicit.ImplicitResourceDetails + @Configuration @EnableConfigurationProperties class ClientConfiguration { + @Bean @ConditionalOnProperty("openapipetstore.security.petstore_auth.client-id") fun petstoreAuthRequestInterceptor(oAuth2ClientContext: OAuth2ClientContext): OAuth2FeignRequestInterceptor { @@ -36,6 +40,7 @@ class ClientConfiguration { return details } + @Value("\${openapipetstore.security.api_key.key:}") private lateinit var apiKeyKey: String diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/build.gradle.kts b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/build.gradle.kts index b99582491505..3683f5a46308 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/build.gradle.kts +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/build.gradle.kts @@ -18,8 +18,8 @@ plugins { id("org.jetbrains.kotlin.jvm") version kotlinVersion id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion - id("org.springframework.boot") version "3.0.2" - id("io.spring.dependency-management") version "1.0.14.RELEASE" + id("org.springframework.boot") version "3.3.13" + id("io.spring.dependency-management") version "1.1.7" } tasks.getByName("bootJar") { @@ -32,7 +32,7 @@ tasks.getByName("jar") { dependencyManagement { imports { - mavenBom("org.springframework.cloud:spring-cloud-dependencies:2021.0.5") + mavenBom("org.springframework.cloud:spring-cloud-dependencies:2023.0.6") } } @@ -51,7 +51,7 @@ dependencies { implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310") implementation("com.fasterxml.jackson.module:jackson-module-kotlin") - implementation("org.springframework.cloud:spring-cloud-starter-oauth2:2.2.5.RELEASE") + implementation("org.springframework.boot:spring-boot-starter-oauth2-client") implementation("jakarta.validation:jakarta.validation-api") implementation("jakarta.annotation:jakarta.annotation-api:2.1.0") diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/pom.xml b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/pom.xml index ef82a5722863..8d80f1de11dc 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/pom.xml +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-coroutines/pom.xml @@ -19,14 +19,14 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.3.13 org.springframework.cloud spring-cloud-starter-parent - 2021.0.5 + 2023.0.6 pom import @@ -137,9 +137,8 @@ ${findbugs-jsr305.version} - org.springframework.cloud - spring-cloud-starter-oauth2 - 2.2.5.RELEASE + org.springframework.boot + spring-boot-starter-oauth2-client com.fasterxml.jackson.dataformat diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/build.gradle.kts b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/build.gradle.kts index b99582491505..3683f5a46308 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/build.gradle.kts +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/build.gradle.kts @@ -18,8 +18,8 @@ plugins { id("org.jetbrains.kotlin.jvm") version kotlinVersion id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion - id("org.springframework.boot") version "3.0.2" - id("io.spring.dependency-management") version "1.0.14.RELEASE" + id("org.springframework.boot") version "3.3.13" + id("io.spring.dependency-management") version "1.1.7" } tasks.getByName("bootJar") { @@ -32,7 +32,7 @@ tasks.getByName("jar") { dependencyManagement { imports { - mavenBom("org.springframework.cloud:spring-cloud-dependencies:2021.0.5") + mavenBom("org.springframework.cloud:spring-cloud-dependencies:2023.0.6") } } @@ -51,7 +51,7 @@ dependencies { implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310") implementation("com.fasterxml.jackson.module:jackson-module-kotlin") - implementation("org.springframework.cloud:spring-cloud-starter-oauth2:2.2.5.RELEASE") + implementation("org.springframework.boot:spring-boot-starter-oauth2-client") implementation("jakarta.validation:jakarta.validation-api") implementation("jakarta.annotation:jakarta.annotation-api:2.1.0") diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/pom.xml b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/pom.xml index ef82a5722863..8d80f1de11dc 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/pom.xml +++ b/samples/server/petstore/kotlin-spring-declarative-interface-reactive-reactor-wrapped/pom.xml @@ -19,14 +19,14 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.3.13 org.springframework.cloud spring-cloud-starter-parent - 2021.0.5 + 2023.0.6 pom import @@ -137,9 +137,8 @@ ${findbugs-jsr305.version} - org.springframework.cloud - spring-cloud-starter-oauth2 - 2.2.5.RELEASE + org.springframework.boot + spring-boot-starter-oauth2-client com.fasterxml.jackson.dataformat diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/build.gradle.kts b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/build.gradle.kts index 5eaa823f4fd4..84ac69c7c6f1 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/build.gradle.kts +++ b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/build.gradle.kts @@ -18,8 +18,8 @@ plugins { id("org.jetbrains.kotlin.jvm") version kotlinVersion id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion - id("org.springframework.boot") version "3.0.2" - id("io.spring.dependency-management") version "1.0.14.RELEASE" + id("org.springframework.boot") version "3.3.13" + id("io.spring.dependency-management") version "1.1.7" } tasks.getByName("bootJar") { @@ -32,7 +32,7 @@ tasks.getByName("jar") { dependencyManagement { imports { - mavenBom("org.springframework.cloud:spring-cloud-dependencies:2021.0.5") + mavenBom("org.springframework.cloud:spring-cloud-dependencies:2023.0.6") } } @@ -48,7 +48,7 @@ dependencies { implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310") implementation("com.fasterxml.jackson.module:jackson-module-kotlin") - implementation("org.springframework.cloud:spring-cloud-starter-oauth2:2.2.5.RELEASE") + implementation("org.springframework.boot:spring-boot-starter-oauth2-client") implementation("jakarta.validation:jakarta.validation-api") implementation("jakarta.annotation:jakarta.annotation-api:2.1.0") diff --git a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/pom.xml b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/pom.xml index f9cb971649a0..15416bbf0ea7 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/pom.xml +++ b/samples/server/petstore/kotlin-spring-declarative-interface-wrapped/pom.xml @@ -17,14 +17,14 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.3.13 org.springframework.cloud spring-cloud-starter-parent - 2021.0.5 + 2023.0.6 pom import @@ -125,9 +125,8 @@ ${findbugs-jsr305.version} - org.springframework.cloud - spring-cloud-starter-oauth2 - 2.2.5.RELEASE + org.springframework.boot + spring-boot-starter-oauth2-client com.fasterxml.jackson.dataformat diff --git a/samples/server/petstore/kotlin-spring-declarative-interface/build.gradle.kts b/samples/server/petstore/kotlin-spring-declarative-interface/build.gradle.kts index 5eaa823f4fd4..84ac69c7c6f1 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface/build.gradle.kts +++ b/samples/server/petstore/kotlin-spring-declarative-interface/build.gradle.kts @@ -18,8 +18,8 @@ plugins { id("org.jetbrains.kotlin.jvm") version kotlinVersion id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion - id("org.springframework.boot") version "3.0.2" - id("io.spring.dependency-management") version "1.0.14.RELEASE" + id("org.springframework.boot") version "3.3.13" + id("io.spring.dependency-management") version "1.1.7" } tasks.getByName("bootJar") { @@ -32,7 +32,7 @@ tasks.getByName("jar") { dependencyManagement { imports { - mavenBom("org.springframework.cloud:spring-cloud-dependencies:2021.0.5") + mavenBom("org.springframework.cloud:spring-cloud-dependencies:2023.0.6") } } @@ -48,7 +48,7 @@ dependencies { implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310") implementation("com.fasterxml.jackson.module:jackson-module-kotlin") - implementation("org.springframework.cloud:spring-cloud-starter-oauth2:2.2.5.RELEASE") + implementation("org.springframework.boot:spring-boot-starter-oauth2-client") implementation("jakarta.validation:jakarta.validation-api") implementation("jakarta.annotation:jakarta.annotation-api:2.1.0") diff --git a/samples/server/petstore/kotlin-spring-declarative-interface/pom.xml b/samples/server/petstore/kotlin-spring-declarative-interface/pom.xml index f9cb971649a0..15416bbf0ea7 100644 --- a/samples/server/petstore/kotlin-spring-declarative-interface/pom.xml +++ b/samples/server/petstore/kotlin-spring-declarative-interface/pom.xml @@ -17,14 +17,14 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.3.13 org.springframework.cloud spring-cloud-starter-parent - 2021.0.5 + 2023.0.6 pom import @@ -125,9 +125,8 @@ ${findbugs-jsr305.version} - org.springframework.cloud - spring-cloud-starter-oauth2 - 2.2.5.RELEASE + org.springframework.boot + spring-boot-starter-oauth2-client com.fasterxml.jackson.dataformat diff --git a/samples/server/petstore/kotlin-spring-sealed-interfaces/build.gradle.kts b/samples/server/petstore/kotlin-spring-sealed-interfaces/build.gradle.kts index 559b1f327bec..a55213af225e 100644 --- a/samples/server/petstore/kotlin-spring-sealed-interfaces/build.gradle.kts +++ b/samples/server/petstore/kotlin-spring-sealed-interfaces/build.gradle.kts @@ -22,8 +22,8 @@ plugins { id("org.jetbrains.kotlin.jvm") version kotlinVersion id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion - id("org.springframework.boot") version "3.0.2" - id("io.spring.dependency-management") version "1.0.14.RELEASE" + id("org.springframework.boot") version "3.3.13" + id("io.spring.dependency-management") version "1.1.7" } dependencies { diff --git a/samples/server/petstore/kotlin-spring-sealed-interfaces/pom.xml b/samples/server/petstore/kotlin-spring-sealed-interfaces/pom.xml index 67af2523dcb8..8e222362b0e8 100644 --- a/samples/server/petstore/kotlin-spring-sealed-interfaces/pom.xml +++ b/samples/server/petstore/kotlin-spring-sealed-interfaces/pom.xml @@ -16,7 +16,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.3.13 diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/build.gradle.kts b/samples/server/petstore/kotlin-springboot-3-no-response-entity/build.gradle.kts index db73c5e21693..c0f3dbae8c3a 100644 --- a/samples/server/petstore/kotlin-springboot-3-no-response-entity/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/build.gradle.kts @@ -18,8 +18,8 @@ plugins { id("org.jetbrains.kotlin.jvm") version kotlinVersion id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion - id("org.springframework.boot") version "3.0.2" - id("io.spring.dependency-management") version "1.0.14.RELEASE" + id("org.springframework.boot") version "3.3.13" + id("io.spring.dependency-management") version "1.1.7" } dependencies { diff --git a/samples/server/petstore/kotlin-springboot-3-no-response-entity/pom.xml b/samples/server/petstore/kotlin-springboot-3-no-response-entity/pom.xml index 3844d9e01f44..d1243e9d74e2 100644 --- a/samples/server/petstore/kotlin-springboot-3-no-response-entity/pom.xml +++ b/samples/server/petstore/kotlin-springboot-3-no-response-entity/pom.xml @@ -16,7 +16,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.3.13 diff --git a/samples/server/petstore/kotlin-springboot-3/build.gradle.kts b/samples/server/petstore/kotlin-springboot-3/build.gradle.kts index db73c5e21693..c0f3dbae8c3a 100644 --- a/samples/server/petstore/kotlin-springboot-3/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-3/build.gradle.kts @@ -18,8 +18,8 @@ plugins { id("org.jetbrains.kotlin.jvm") version kotlinVersion id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion - id("org.springframework.boot") version "3.0.2" - id("io.spring.dependency-management") version "1.0.14.RELEASE" + id("org.springframework.boot") version "3.3.13" + id("io.spring.dependency-management") version "1.1.7" } dependencies { diff --git a/samples/server/petstore/kotlin-springboot-3/pom.xml b/samples/server/petstore/kotlin-springboot-3/pom.xml index 3844d9e01f44..d1243e9d74e2 100644 --- a/samples/server/petstore/kotlin-springboot-3/pom.xml +++ b/samples/server/petstore/kotlin-springboot-3/pom.xml @@ -16,7 +16,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.3.13 diff --git a/samples/server/petstore/kotlin-springboot-additionalproperties/build.gradle.kts b/samples/server/petstore/kotlin-springboot-additionalproperties/build.gradle.kts index db73c5e21693..c0f3dbae8c3a 100644 --- a/samples/server/petstore/kotlin-springboot-additionalproperties/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-additionalproperties/build.gradle.kts @@ -18,8 +18,8 @@ plugins { id("org.jetbrains.kotlin.jvm") version kotlinVersion id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion - id("org.springframework.boot") version "3.0.2" - id("io.spring.dependency-management") version "1.0.14.RELEASE" + id("org.springframework.boot") version "3.3.13" + id("io.spring.dependency-management") version "1.1.7" } dependencies { diff --git a/samples/server/petstore/kotlin-springboot-additionalproperties/pom.xml b/samples/server/petstore/kotlin-springboot-additionalproperties/pom.xml index 3844d9e01f44..d1243e9d74e2 100644 --- a/samples/server/petstore/kotlin-springboot-additionalproperties/pom.xml +++ b/samples/server/petstore/kotlin-springboot-additionalproperties/pom.xml @@ -16,7 +16,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.3.13 diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/build.gradle.kts b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/build.gradle.kts index 6122df330e69..af76af1bc768 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/build.gradle.kts @@ -18,8 +18,8 @@ plugins { id("org.jetbrains.kotlin.jvm") version kotlinVersion id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion - id("org.springframework.boot") version "3.0.2" - id("io.spring.dependency-management") version "1.0.14.RELEASE" + id("org.springframework.boot") version "3.3.13" + id("io.spring.dependency-management") version "1.1.7" } dependencies { diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/pom.xml b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/pom.xml index c7a557207ccc..d077ad869328 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/pom.xml +++ b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/pom.xml @@ -17,7 +17,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.3.13 diff --git a/samples/server/petstore/kotlin-springboot-integer-enum/build.gradle.kts b/samples/server/petstore/kotlin-springboot-integer-enum/build.gradle.kts index 559b1f327bec..a55213af225e 100644 --- a/samples/server/petstore/kotlin-springboot-integer-enum/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-integer-enum/build.gradle.kts @@ -22,8 +22,8 @@ plugins { id("org.jetbrains.kotlin.jvm") version kotlinVersion id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion - id("org.springframework.boot") version "3.0.2" - id("io.spring.dependency-management") version "1.0.14.RELEASE" + id("org.springframework.boot") version "3.3.13" + id("io.spring.dependency-management") version "1.1.7" } dependencies { diff --git a/samples/server/petstore/kotlin-springboot-integer-enum/pom.xml b/samples/server/petstore/kotlin-springboot-integer-enum/pom.xml index 67af2523dcb8..8e222362b0e8 100644 --- a/samples/server/petstore/kotlin-springboot-integer-enum/pom.xml +++ b/samples/server/petstore/kotlin-springboot-integer-enum/pom.xml @@ -16,7 +16,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.3.13 diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/build.gradle.kts b/samples/server/petstore/kotlin-springboot-request-cookie/build.gradle.kts index fa644c9b144c..33899c980eec 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/build.gradle.kts +++ b/samples/server/petstore/kotlin-springboot-request-cookie/build.gradle.kts @@ -22,8 +22,8 @@ plugins { id("org.jetbrains.kotlin.jvm") version kotlinVersion id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion - id("org.springframework.boot") version "3.0.2" - id("io.spring.dependency-management") version "1.0.14.RELEASE" + id("org.springframework.boot") version "3.3.13" + id("io.spring.dependency-management") version "1.1.7" } dependencies { diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/pom.xml b/samples/server/petstore/kotlin-springboot-request-cookie/pom.xml index 797865c697a9..de45a8450db0 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/pom.xml +++ b/samples/server/petstore/kotlin-springboot-request-cookie/pom.xml @@ -17,7 +17,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.3.13