From 6082b645b9278716292108289f1f4563a79ed166 Mon Sep 17 00:00:00 2001 From: liga-oz Date: Wed, 8 Nov 2023 16:06:22 +0100 Subject: [PATCH] bump spring boot parent version to 3.1.5 for samples Signed-off-by: liga-oz --- samples/spring-security-basic-auth/pom.xml | 2 +- .../xsuaa/config/SecurityConfiguration.java | 27 +++++++++---------- samples/spring-security-hybrid-usage/pom.xml | 2 +- .../security/SecurityConfiguration.java | 12 ++++----- samples/spring-security-xsuaa-usage/pom.xml | 2 +- .../spring/xsuaa/SecurityConfiguration.java | 11 ++++---- 6 files changed, 26 insertions(+), 30 deletions(-) diff --git a/samples/spring-security-basic-auth/pom.xml b/samples/spring-security-basic-auth/pom.xml index b7137d375..2ec8c3025 100644 --- a/samples/spring-security-basic-auth/pom.xml +++ b/samples/spring-security-basic-auth/pom.xml @@ -8,7 +8,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.4 + 3.1.5 diff --git a/samples/spring-security-basic-auth/src/main/java/sample/spring/xsuaa/config/SecurityConfiguration.java b/samples/spring-security-basic-auth/src/main/java/sample/spring/xsuaa/config/SecurityConfiguration.java index 06ad70b7f..badc5cfe1 100644 --- a/samples/spring-security-basic-auth/src/main/java/sample/spring/xsuaa/config/SecurityConfiguration.java +++ b/samples/spring-security-basic-auth/src/main/java/sample/spring/xsuaa/config/SecurityConfiguration.java @@ -36,21 +36,18 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { authEntryPoint.setRealmName("spring-security-basic-auth"); // @formatter:off - http.authorizeHttpRequests() - .requestMatchers("/fetchToken").hasAuthority("Display") - .requestMatchers("/health").permitAll() - .anyRequest().denyAll() - .and() - .sessionManagement() - .sessionCreationPolicy(SessionCreationPolicy.STATELESS) - .and() - .exceptionHandling() - .authenticationEntryPoint(authEntryPoint) - .and() - .oauth2ResourceServer() - .bearerTokenResolver(tokenBrokerResolver) - .jwt() - .jwtAuthenticationConverter(authConverter); + http + .httpBasic(basic -> basic.authenticationEntryPoint(authEntryPoint)) + .authorizeHttpRequests(authz -> + authz + .requestMatchers("/fetchToken").hasAuthority("Display") + .requestMatchers("/health").permitAll() + .anyRequest().denyAll()) + .sessionManagement(session -> session + .sessionCreationPolicy(SessionCreationPolicy.STATELESS)) + .oauth2ResourceServer(oauth2 -> oauth2 + .bearerTokenResolver(tokenBrokerResolver) + .jwt(jwt -> jwt.jwtAuthenticationConverter(authConverter))); // @formatter:on return http.build(); diff --git a/samples/spring-security-hybrid-usage/pom.xml b/samples/spring-security-hybrid-usage/pom.xml index 0db852dcc..02b17ee25 100644 --- a/samples/spring-security-hybrid-usage/pom.xml +++ b/samples/spring-security-hybrid-usage/pom.xml @@ -10,7 +10,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.4 + 3.1.5 diff --git a/samples/spring-security-hybrid-usage/src/main/java/sample/spring/security/SecurityConfiguration.java b/samples/spring-security-hybrid-usage/src/main/java/sample/spring/security/SecurityConfiguration.java index 9b53e1fd1..137c699fb 100644 --- a/samples/spring-security-hybrid-usage/src/main/java/sample/spring/security/SecurityConfiguration.java +++ b/samples/spring-security-hybrid-usage/src/main/java/sample/spring/security/SecurityConfiguration.java @@ -41,17 +41,17 @@ public class SecurityConfiguration { @Bean public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off - http.sessionManagement() - .sessionCreationPolicy(SessionCreationPolicy.STATELESS) - .and() + http + .sessionManagement(session -> session + .sessionCreationPolicy(SessionCreationPolicy.STATELESS)) .authorizeHttpRequests(authz -> authz.requestMatchers("/sayHello").hasAuthority("Read") .requestMatchers("/comp/sayHello").hasAuthority("Read") .requestMatchers("/*").authenticated() .anyRequest().denyAll()) - .oauth2ResourceServer() - .jwt() - .jwtAuthenticationConverter(new MyCustomHybridTokenAuthenticationConverter()); // Adjust the converter to represent your use case + .oauth2ResourceServer(oauth2 -> oauth2 + .jwt(jwt -> jwt + .jwtAuthenticationConverter(new MyCustomHybridTokenAuthenticationConverter()))); // Adjust the converter to represent your use case // Use MyCustomHybridTokenAuthenticationConverter when IAS and XSUAA is used // Use MyCustomIasTokenAuthenticationConverter when only IAS is used // @formatter:on diff --git a/samples/spring-security-xsuaa-usage/pom.xml b/samples/spring-security-xsuaa-usage/pom.xml index 386a56fea..4de8cf618 100644 --- a/samples/spring-security-xsuaa-usage/pom.xml +++ b/samples/spring-security-xsuaa-usage/pom.xml @@ -10,7 +10,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.4 + 3.1.5 diff --git a/samples/spring-security-xsuaa-usage/src/main/java/sample/spring/xsuaa/SecurityConfiguration.java b/samples/spring-security-xsuaa-usage/src/main/java/sample/spring/xsuaa/SecurityConfiguration.java index fddb34bb4..253b07ec2 100644 --- a/samples/spring-security-xsuaa-usage/src/main/java/sample/spring/xsuaa/SecurityConfiguration.java +++ b/samples/spring-security-xsuaa-usage/src/main/java/sample/spring/xsuaa/SecurityConfiguration.java @@ -31,9 +31,8 @@ public class SecurityConfiguration { public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { // @formatter:off http - .sessionManagement() - .sessionCreationPolicy(SessionCreationPolicy.STATELESS) // session is created by approuter - .and() + .sessionManagement(session -> session + .sessionCreationPolicy(SessionCreationPolicy.STATELESS)) .authorizeHttpRequests(authz -> authz.requestMatchers("/v1/sayHello").hasAuthority("Read") .requestMatchers("/v1/*").authenticated() @@ -43,9 +42,9 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { .requestMatchers("/health").permitAll() .anyRequest().denyAll() ) - .oauth2ResourceServer() - .jwt() - .jwtAuthenticationConverter(getJwtAuthenticationConverter()); + .oauth2ResourceServer(oauth2 -> oauth2 + .jwt(jwt -> jwt + .jwtAuthenticationConverter(getJwtAuthenticationConverter()))); // @formatter:on return http.build();