Skip to content

Commit e6c830e

Browse files
PicazsooPicazsoo
authored
[KOTLIN-SPRING;JAVA-SPRING] chore: upgrade spring boot 3 to 3.3.13 version (#23591)
* upgrade spring 3 to 3.3.13 version * upgrade spring cloud to 2023.0.9 * update samples * update samples * update samples * update samples * update samples * revert changes * fix samples * add whitespace to retrigger tests
1 parent cc9cf08 commit e6c830e

File tree

46 files changed

+172
-113
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+172
-113
lines changed

‎modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom-sb3.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<dependency>
5959
<groupId>org.springframework.cloud</groupId>
6060
<artifactId>spring-cloud-starter-parent</artifactId>
61-
<version>2023.0.0</version>
61+
<version>2023.0.6</version>
6262
<type>pom</type>
6363
<scope>import</scope>
6464
</dependency>

‎modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/buildGradle-sb3-Kts.mustache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ plugins {
2424
id("org.jetbrains.kotlin.jvm") version kotlinVersion
2525
id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion
2626
id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
27-
id("org.springframework.boot") version "3.0.2"
28-
id("io.spring.dependency-management") version "1.0.14.RELEASE"
27+
id("org.springframework.boot") version "3.3.13"
28+
id("io.spring.dependency-management") version "1.1.7"
2929
}
3030

3131
dependencies {

‎modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom-sb3.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.springframework.boot</groupId>
2323
<artifactId>spring-boot-starter-parent</artifactId>
24-
<version>3.1.3</version>
24+
<version>3.3.13</version>
2525
</parent>
2626
<repositories>
2727
<repository>

‎modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/buildGradle-sb3-Kts.mustache‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ plugins {
1818
id("org.jetbrains.kotlin.jvm") version kotlinVersion
1919
id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion
2020
id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
21-
id("org.springframework.boot") version "3.0.2"
22-
id("io.spring.dependency-management") version "1.0.14.RELEASE"
21+
id("org.springframework.boot") version "3.3.13"
22+
id("io.spring.dependency-management") version "1.1.7"
2323
}
2424

2525
tasks.getByName("bootJar") {
@@ -32,7 +32,7 @@ tasks.getByName("jar") {
3232

3333
dependencyManagement {
3434
imports {
35-
mavenBom("org.springframework.cloud:spring-cloud-dependencies:2021.0.5")
35+
mavenBom("org.springframework.cloud:spring-cloud-dependencies:2023.0.6")
3636
}
3737
}
3838

@@ -58,7 +58,7 @@ dependencies {
5858
implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
5959

6060
implementation("org.springframework.cloud:spring-cloud-starter-openfeign"){{#hasAuthMethods}}
61-
implementation("org.springframework.cloud:spring-cloud-starter-oauth2:2.2.5.RELEASE"){{/hasAuthMethods}}
61+
implementation("org.springframework.boot:spring-boot-starter-oauth2-client"){{/hasAuthMethods}}
6262

6363
{{#useBeanValidation}}
6464
implementation("jakarta.validation:jakarta.validation-api"){{/useBeanValidation}}

‎modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/clientConfiguration.mustache‎

Lines changed: 79 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,14 @@ import feign.auth.BasicAuthRequestInterceptor
88
import org.springframework.beans.factory.annotation.Value
99
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
1010
{{/-first}}
11-
{{^useSpringBoot4}}
12-
{{#isOAuth}}
13-
import org.springframework.boot.context.properties.ConfigurationProperties
14-
{{/isOAuth}}
15-
{{/useSpringBoot4}}
11+
{{^useSpringBoot4}}{{^useSpringBoot3}}{{#isOAuth}}import org.springframework.boot.context.properties.ConfigurationProperties{{/isOAuth}}{{/useSpringBoot3}}{{/useSpringBoot4}}
1612
{{/authMethods}}
17-
{{^useSpringBoot4}}
18-
import org.springframework.boot.context.properties.EnableConfigurationProperties
19-
{{/useSpringBoot4}}
13+
{{^useSpringBoot4}}{{^useSpringBoot3}}import org.springframework.boot.context.properties.EnableConfigurationProperties{{/useSpringBoot3}}{{/useSpringBoot4}}
2014
{{#hasAuthMethods}}
2115
import org.springframework.context.annotation.Bean
2216
{{/hasAuthMethods}}
2317
import org.springframework.context.annotation.Configuration
24-
{{^useSpringBoot4}}
18+
{{^useSpringBoot4}}{{^useSpringBoot3}}
2519
{{#authMethods}}
2620
{{#isOAuth}}
2721
import org.springframework.cloud.openfeign.security.OAuth2FeignRequestInterceptor
@@ -41,7 +35,24 @@ import org.springframework.security.oauth2.client.token.grant.password.ResourceO
4135
{{/isPassword}}
4236
{{/isOAuth}}
4337
{{/authMethods}}
44-
{{/useSpringBoot4}}
38+
{{/useSpringBoot3}}{{/useSpringBoot4}}
39+
{{#useSpringBoot3}}
40+
{{#hasOAuthMethods}}
41+
import org.springframework.security.authentication.AnonymousAuthenticationToken
42+
import org.springframework.security.oauth2.client.AuthorizedClientServiceOAuth2AuthorizedClientManager
43+
import org.springframework.security.oauth2.client.OAuth2AuthorizeRequest
44+
import org.springframework.security.oauth2.client.OAuth2AuthorizedClientManager
45+
import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService
46+
import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository
47+
import org.springframework.security.oauth2.core.OAuth2AuthenticationException
48+
import org.springframework.security.oauth2.core.OAuth2AccessToken
49+
import org.springframework.security.core.authority.AuthorityUtils
50+
import org.springframework.http.HttpHeaders
51+
52+
import feign.RequestInterceptor
53+
import feign.RequestTemplate
54+
{{/hasOAuthMethods}}
55+
{{/useSpringBoot3}}
4556
{{#useSpringBoot4}}
4657
{{#hasOAuthMethods}}
4758
import org.springframework.security.authentication.AnonymousAuthenticationToken
@@ -60,10 +71,8 @@ import feign.RequestTemplate
6071
{{/hasOAuthMethods}}
6172
{{/useSpringBoot4}}
6273

63-
@Configuration
64-
{{^useSpringBoot4}}
65-
@EnableConfigurationProperties
66-
{{/useSpringBoot4}}
74+
@Configuration{{^useSpringBoot4}}{{^useSpringBoot3}}
75+
@EnableConfigurationProperties{{/useSpringBoot3}}{{/useSpringBoot4}}
6776
class ClientConfiguration {
6877
6978
{{#authMethods}}
@@ -93,7 +102,7 @@ class ClientConfiguration {
93102

94103
{{/isApiKey}}
95104
{{#isOAuth}}
96-
{{^useSpringBoot4}}
105+
{{^useSpringBoot4}}{{^useSpringBoot3}}
97106
@Bean
98107
@ConditionalOnProperty("{{#lambda.lowercase}}{{{title}}}{{/lambda.lowercase}}.security.{{{name}}}.client-id")
99108
fun {{#lambda.camelcase}}{{{name}}}{{/lambda.camelcase}}RequestInterceptor(oAuth2ClientContext: OAuth2ClientContext): OAuth2FeignRequestInterceptor {
@@ -151,7 +160,29 @@ class ClientConfiguration {
151160
}
152161

153162
{{/isImplicit}}
154-
{{/useSpringBoot4}}
163+
{{/useSpringBoot3}}{{/useSpringBoot4}}
164+
{{#useSpringBoot3}}
165+
@Bean
166+
@ConditionalOnProperty(prefix = "spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}", name = ["enabled"], havingValue = "true")
167+
fun {{{flow}}}OAuth2RequestInterceptor({{{flow}}}AuthorizedClientManager: OAuth2AuthorizedClientManager): OAuth2RequestInterceptor {
168+
return OAuth2RequestInterceptor(
169+
OAuth2AuthorizeRequest.withClientRegistrationId("{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}")
170+
.principal(AnonymousAuthenticationToken(CLIENT_PRINCIPAL_{{#lambda.uppercase}}{{{flow}}}{{/lambda.uppercase}}, CLIENT_PRINCIPAL_{{#lambda.uppercase}}{{{flow}}}{{/lambda.uppercase}}, AuthorityUtils.createAuthorityList("ROLE_ANONYMOUS")))
171+
.build(),
172+
{{{flow}}}AuthorizedClientManager
173+
)
174+
}
175+
176+
@Bean
177+
@ConditionalOnProperty(prefix = "spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}", name = ["enabled"], havingValue = "true")
178+
fun {{{flow}}}AuthorizedClientManager(
179+
clientRegistrationRepository: ClientRegistrationRepository,
180+
authorizedClientService: OAuth2AuthorizedClientService
181+
): OAuth2AuthorizedClientManager {
182+
return AuthorizedClientServiceOAuth2AuthorizedClientManager(clientRegistrationRepository, authorizedClientService)
183+
}
184+
185+
{{/useSpringBoot3}}
155186
{{#useSpringBoot4}}
156187
@Bean
157188
@ConditionalOnProperty(prefix = "spring.security.oauth2.client.registration.{{{name}}}{{#lambda.pascalcase}}{{{flow}}}{{/lambda.pascalcase}}", name = ["enabled"], havingValue = "true")
@@ -176,6 +207,38 @@ class ClientConfiguration {
176207
{{/useSpringBoot4}}
177208
{{/isOAuth}}
178209
{{/authMethods}}
210+
{{#useSpringBoot3}}
211+
{{#hasOAuthMethods}}
212+
class OAuth2RequestInterceptor(
213+
private val oAuth2AuthorizeRequest: OAuth2AuthorizeRequest,
214+
private val oAuth2AuthorizedClientManager: OAuth2AuthorizedClientManager
215+
) : RequestInterceptor {
216+
217+
override fun apply(template: RequestTemplate) {
218+
template.header(HttpHeaders.AUTHORIZATION, getBearerToken())
219+
}
220+
221+
fun getAccessToken(): OAuth2AccessToken {
222+
val authorizedClient = oAuth2AuthorizedClientManager.authorize(oAuth2AuthorizeRequest)
223+
?: throw OAuth2AuthenticationException("Client failed to authenticate")
224+
return authorizedClient.accessToken
225+
}
226+
227+
fun getBearerToken(): String {
228+
val accessToken = getAccessToken()
229+
return String.format(java.util.Locale.ROOT, "%s %s", accessToken.tokenType?.value, accessToken.tokenValue)
230+
}
231+
}
232+
233+
companion object {
234+
{{#authMethods}}
235+
{{#isOAuth}}
236+
private const val CLIENT_PRINCIPAL_{{#lambda.uppercase}}{{{flow}}}{{/lambda.uppercase}} = "oauth2FeignClient"
237+
{{/isOAuth}}
238+
{{/authMethods}}
239+
}
240+
{{/hasOAuthMethods}}
241+
{{/useSpringBoot3}}
179242
{{#useSpringBoot4}}
180243
{{#hasOAuthMethods}}
181244
class OAuth2RequestInterceptor(

‎modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom-sb3.mustache‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@
2727
<parent>
2828
<groupId>org.springframework.boot</groupId>
2929
<artifactId>spring-boot-starter-parent</artifactId>
30-
<version>3.1.3</version>
30+
<version>3.3.13</version>
3131
</parent>
3232
<dependencyManagement>
3333
<dependencies>
3434
<dependency>
3535
<groupId>org.springframework.cloud</groupId>
3636
<artifactId>spring-cloud-starter-parent</artifactId>
37-
<version>2021.0.5</version>
37+
<version>2023.0.6</version>
3838
<type>pom</type>
3939
<scope>import</scope>
4040
</dependency>
@@ -192,11 +192,8 @@
192192
</dependency>
193193
{{#hasAuthMethods}}
194194
<dependency>
195-
<groupId>org.springframework.cloud</groupId>
196-
<artifactId>spring-cloud-starter-oauth2</artifactId>
197-
{{^parentOverridden}}
198-
<version>2.2.5.RELEASE</version>
199-
{{/parentOverridden}}
195+
<groupId>org.springframework.boot</groupId>
196+
<artifactId>spring-boot-starter-oauth2-client</artifactId>
200197
</dependency>
201198
{{/hasAuthMethods}}
202199
<dependency>

‎modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/buildGradle-sb3-Kts.mustache‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ plugins {
1818
id("org.jetbrains.kotlin.jvm") version kotlinVersion
1919
id("org.jetbrains.kotlin.plugin.jpa") version kotlinVersion
2020
id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
21-
id("org.springframework.boot") version "3.0.2"
22-
id("io.spring.dependency-management") version "1.0.14.RELEASE"
21+
id("org.springframework.boot") version "3.3.13"
22+
id("io.spring.dependency-management") version "1.1.7"
2323
}
2424

2525
tasks.getByName("bootJar") {
@@ -32,7 +32,7 @@ tasks.getByName("jar") {
3232

3333
dependencyManagement {
3434
imports {
35-
mavenBom("org.springframework.cloud:spring-cloud-dependencies:2021.0.5")
35+
mavenBom("org.springframework.cloud:spring-cloud-dependencies:2023.0.6")
3636
}
3737
}
3838

@@ -58,7 +58,7 @@ dependencies {
5858
implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
5959

6060
{{#hasAuthMethods}}
61-
implementation("org.springframework.cloud:spring-cloud-starter-oauth2:2.2.5.RELEASE"){{/hasAuthMethods}}
61+
implementation("org.springframework.boot:spring-boot-starter-oauth2-client"){{/hasAuthMethods}}
6262

6363
{{#useBeanValidation}}
6464
implementation("jakarta.validation:jakarta.validation-api"){{/useBeanValidation}}

‎modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/pom-sb3.mustache‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@
2727
<parent>
2828
<groupId>org.springframework.boot</groupId>
2929
<artifactId>spring-boot-starter-parent</artifactId>
30-
<version>3.1.3</version>
30+
<version>3.3.13</version>
3131
</parent>
3232
<dependencyManagement>
3333
<dependencies>
3434
<dependency>
3535
<groupId>org.springframework.cloud</groupId>
3636
<artifactId>spring-cloud-starter-parent</artifactId>
37-
<version>2021.0.5</version>
37+
<version>2023.0.6</version>
3838
<type>pom</type>
3939
<scope>import</scope>
4040
</dependency>
@@ -188,11 +188,8 @@
188188
</dependency>
189189
{{#hasAuthMethods}}
190190
<dependency>
191-
<groupId>org.springframework.cloud</groupId>
192-
<artifactId>spring-cloud-starter-oauth2</artifactId>
193-
{{^parentOverridden}}
194-
<version>2.2.5.RELEASE</version>
195-
{{/parentOverridden}}
191+
<groupId>org.springframework.boot</groupId>
192+
<artifactId>spring-boot-starter-oauth2-client</artifactId>
196193
</dependency>
197194
{{/hasAuthMethods}}
198195
<dependency>

‎modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5042,6 +5042,7 @@ public void shouldAddParameterWithInHeaderWhenImplicitHeadersIsTrue() throws IOE
50425042
String methodPattern = "fun test\\s*\\(.*?\\)";
50435043
Pattern pattern = Pattern.compile(methodPattern);
50445044

5045+
50455046
Matcher matcher = pattern.matcher(content);
50465047
Assert.assertTrue(matcher.find(), "Method 'test' should be found in generated file");
50475048

‎samples/client/petstore/spring-cloud-auth/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<dependency>
2828
<groupId>org.springframework.cloud</groupId>
2929
<artifactId>spring-cloud-starter-parent</artifactId>
30-
<version>2023.0.0</version>
30+
<version>2023.0.6</version>
3131
<type>pom</type>
3232
<scope>import</scope>
3333
</dependency>

0 commit comments

Comments
 (0)