From d03fb7e217ff0e0ff3fc526ba9809a03f99d8be4 Mon Sep 17 00:00:00 2001
From: psevestre <phil@lighthouse.com.br>
Date: Tue, 23 Aug 2022 12:00:55 -0300
Subject: [PATCH] [BAEL-2765] Rename test & add module (#12639)

* [BAEL-2765] Rename test & add module

* [BAEL-2765] Fix java target

* [BAEL-2765] Fix java target
---
 spring-security-modules/pom.xml                          | 1 +
 .../pkce/authserver/conf/AuthServerConfiguration.java    | 9 ++++-----
 ...s.java => SpringSecurityPkceApplicationLiveTest.java} | 0
 .../pkce/client/config/OAuth2ClientConfiguration.java    | 2 +-
 spring-security-modules/spring-security-pkce/pom.xml     | 1 -
 5 files changed, 6 insertions(+), 7 deletions(-)
 rename spring-security-modules/spring-security-pkce/pkce-auth-server/src/test/java/com/baeldung/security/pkce/{SpringSecurityPkceApplicationTests.java => SpringSecurityPkceApplicationLiveTest.java} (100%)

diff --git a/spring-security-modules/pom.xml b/spring-security-modules/pom.xml
index 83412d2252..296825f23d 100644
--- a/spring-security-modules/pom.xml
+++ b/spring-security-modules/pom.xml
@@ -47,6 +47,7 @@
         <module>spring-security-web-thymeleaf</module>
         <module>spring-security-web-x509</module>        
         <module>spring-security-opa</module>
+        <module>spring-security-pkce</module>
     </modules>
 
 </project>
diff --git a/spring-security-modules/spring-security-pkce/pkce-auth-server/src/main/java/com/baeldung/security/pkce/authserver/conf/AuthServerConfiguration.java b/spring-security-modules/spring-security-pkce/pkce-auth-server/src/main/java/com/baeldung/security/pkce/authserver/conf/AuthServerConfiguration.java
index 1f6484478d..b599880f3c 100644
--- a/spring-security-modules/spring-security-pkce/pkce-auth-server/src/main/java/com/baeldung/security/pkce/authserver/conf/AuthServerConfiguration.java
+++ b/spring-security-modules/spring-security-pkce/pkce-auth-server/src/main/java/com/baeldung/security/pkce/authserver/conf/AuthServerConfiguration.java
@@ -31,12 +31,11 @@ public class AuthServerConfiguration {
     @Order(1)
     public SecurityFilterChain authorizationServerSecurityFilterChain(HttpSecurity http) throws Exception {
         
-        var authorizationServerConfigurer = new OAuth2AuthorizationServerConfigurer<HttpSecurity>();
-        var endpointsMatcher = authorizationServerConfigurer.getEndpointsMatcher();
+        OAuth2AuthorizationServerConfigurer<HttpSecurity> authorizationServerConfigurer = new OAuth2AuthorizationServerConfigurer<>();
 
         // @formatter:off
         http
-          .requestMatcher(endpointsMatcher)
+          .requestMatcher(authorizationServerConfigurer.getEndpointsMatcher())
             .authorizeRequests(authorize ->
                 authorize              
                   .anyRequest()
@@ -46,7 +45,7 @@ public class AuthServerConfiguration {
               exceptions.authenticationEntryPoint(new LoginUrlAuthenticationEntryPoint("/login")))
           .csrf( csrf -> 
               csrf
-                .ignoringRequestMatchers(endpointsMatcher))
+                .ignoringRequestMatchers(authorizationServerConfigurer.getEndpointsMatcher()))
           .apply(authorizationServerConfigurer);
          
         // Required by /userinfo endpoint
@@ -68,7 +67,7 @@ public class AuthServerConfiguration {
     @Bean 
     public RegisteredClientRepository registeredClientRepository() {
                 
-        var pkceClient = RegisteredClient
+        RegisteredClient pkceClient = RegisteredClient
             .withId(UUID.randomUUID().toString())
             .clientId("pkce-client")
             .clientSecret("{noop}obscura")
diff --git a/spring-security-modules/spring-security-pkce/pkce-auth-server/src/test/java/com/baeldung/security/pkce/SpringSecurityPkceApplicationTests.java b/spring-security-modules/spring-security-pkce/pkce-auth-server/src/test/java/com/baeldung/security/pkce/SpringSecurityPkceApplicationLiveTest.java
similarity index 100%
rename from spring-security-modules/spring-security-pkce/pkce-auth-server/src/test/java/com/baeldung/security/pkce/SpringSecurityPkceApplicationTests.java
rename to spring-security-modules/spring-security-pkce/pkce-auth-server/src/test/java/com/baeldung/security/pkce/SpringSecurityPkceApplicationLiveTest.java
diff --git a/spring-security-modules/spring-security-pkce/pkce-client/src/main/java/com/baeldung/security/pkce/client/config/OAuth2ClientConfiguration.java b/spring-security-modules/spring-security-pkce/pkce-client/src/main/java/com/baeldung/security/pkce/client/config/OAuth2ClientConfiguration.java
index 6863c13fa7..8868bccdb2 100644
--- a/spring-security-modules/spring-security-pkce/pkce-client/src/main/java/com/baeldung/security/pkce/client/config/OAuth2ClientConfiguration.java
+++ b/spring-security-modules/spring-security-pkce/pkce-client/src/main/java/com/baeldung/security/pkce/client/config/OAuth2ClientConfiguration.java
@@ -21,7 +21,7 @@ public class OAuth2ClientConfiguration {
 
     @Bean
     public ServerOAuth2AuthorizationRequestResolver pkceResolver(ReactiveClientRegistrationRepository repo) {
-        var resolver = new DefaultServerOAuth2AuthorizationRequestResolver(repo);
+        DefaultServerOAuth2AuthorizationRequestResolver resolver = new DefaultServerOAuth2AuthorizationRequestResolver(repo);
         resolver.setAuthorizationRequestCustomizer(OAuth2AuthorizationRequestCustomizers.withPkce());
         return resolver;
     }
diff --git a/spring-security-modules/spring-security-pkce/pom.xml b/spring-security-modules/spring-security-pkce/pom.xml
index a90a0d5c1d..d835c8a9e5 100644
--- a/spring-security-modules/spring-security-pkce/pom.xml
+++ b/spring-security-modules/spring-security-pkce/pom.xml
@@ -17,7 +17,6 @@
 	<properties>
 		<!-- Need 2.7.x to bring spring-security 5.7.x-->
 		<spring-boot.version>2.7.2</spring-boot.version>
-		<java.version>11</java.version>
 	</properties>
 	<dependencies>
 		<dependency>