Upgrade Spring Boot 4/JDK 25 - build authentication-service, build person-service, build user-service

Author: rodrigorodrigues

authentication-service/pom.xml

@@ -21,16 +21,6 @@
 	</properties>
 
 	<dependencies>
-        <dependency>
-            <groupId>org.springframework.integration</groupId>
-            <artifactId>spring-integration-ip</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-integration</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>net.logstash.logback</groupId>
             <artifactId>logstash-logback-encoder</artifactId>
@@ -89,7 +79,12 @@
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-oauth2-authorization-server</artifactId>
+            <artifactId>spring-boot-starter-security-oauth2-authorization-server</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-oauth2-authorization-server</artifactId>
         </dependency>
 
         <dependency>
@@ -261,6 +256,10 @@
             <artifactId>mongodb</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-security-oauth2-client</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

authentication-service/src/main/java/com/microservice/authentication/AuthenticationRuntimeHints.java

@@ -22,7 +22,6 @@
 
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
-import org.springframework.integration.ip.tcp.connection.TcpNetClientConnectionFactory;
 
 public class AuthenticationRuntimeHints implements RuntimeHintsRegistrar {
 

authentication-service/src/main/java/com/microservice/authentication/AuthenticationServiceApplication.java

@@ -59,10 +59,6 @@
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.mapping.event.ValidatingMongoEventListener;
 import org.springframework.http.HttpStatus;
-import org.springframework.integration.dsl.IntegrationFlow;
-import org.springframework.integration.dsl.Transformers;
-import org.springframework.integration.ip.dsl.Tcp;
-import org.springframework.integration.ip.tcp.serializer.TcpCodecs;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.security.crypto.factory.PasswordEncoderFactories;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -97,27 +93,6 @@ public static void main(String[] args) {
 		SpringApplication.run(AuthenticationServiceApplication.class, args);
 	}
 
-    @Bean
-    public IntegrationFlow client() {
-        return f -> f.handle(Tcp.outboundGateway(Tcp.netClient("localhost", 1234)
-            .deserializer(TcpCodecs.lengthHeader1())
-            .serializer(TcpCodecs.lengthHeader1())))
-            .transform(Transformers.objectToString())
-            .handle(msg -> log.info("Transforming message: {}", msg));
-    }
-
-    /*@Bean
-    public IntegrationFlow server() {
-        return IntegrationFlow.from(Tcp.inboundAdapter(Tcp.netClient("localhost",8081)
-                    .deserializer(TcpCodecs.lengthHeader1()))
-//                .errorChannel("tcpIn.errorChannel")
-                .id("tcpIn"))
-            .transform(Transformers.objectToString())
-            .handle(msg -> log.info("Transforming message: {}", msg))
-//            .channel("tcpInbound")
-            .get();
-    }*/
-
     @Bean
     @ConditionalOnMissingBean
     public SessionRepository defaultSessionRepository() {

authentication-service/src/main/java/com/microservice/authentication/config/ClientRegistrationRepositoryConfiguration.java

@@ -0,0 +1,29 @@
+package com.microservice.authentication.config;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.security.oauth2.client.autoconfigure.ConditionalOnOAuth2ClientRegistrationProperties;
+import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientProperties;
+import org.springframework.boot.security.oauth2.client.autoconfigure.OAuth2ClientPropertiesMapper;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.oauth2.client.registration.ClientRegistration;
+import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
+import org.springframework.security.oauth2.client.registration.InMemoryClientRegistrationRepository;
+
+@Configuration(
+    proxyBeanMethods = false
+)
+@ConditionalOnOAuth2ClientRegistrationProperties
+@EnableConfigurationProperties({OAuth2ClientProperties.class})
+@ConditionalOnMissingBean({ClientRegistrationRepository.class})
+public class ClientRegistrationRepositoryConfiguration {
+    @Bean
+    InMemoryClientRegistrationRepository clientRegistrationRepository(OAuth2ClientProperties properties) {
+        List<ClientRegistration> registrations = new ArrayList<>((new OAuth2ClientPropertiesMapper(properties)).asClientRegistrations().values());
+        return new InMemoryClientRegistrationRepository(registrations);
+    }
+}

authentication-service/src/main/java/com/microservice/authentication/config/SpringSecurityConfiguration.java

@@ -19,7 +19,6 @@
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.security.oauth2.server.authorization.autoconfigure.servlet.OAuth2AuthorizationServerAutoConfiguration;
 import org.springframework.boot.web.error.ErrorAttributeOptions;
 import org.springframework.boot.webmvc.error.DefaultErrorAttributes;
 import org.springframework.context.annotation.Bean;
@@ -42,6 +41,8 @@
 import org.springframework.security.config.annotation.web.configurers.ott.OneTimeTokenLoginConfigurer;
 import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
+import org.springframework.security.oauth2.client.registration.InMemoryClientRegistrationRepository;
 import org.springframework.security.oauth2.core.AuthorizationGrantType;
 import org.springframework.security.oauth2.core.ClientAuthenticationMethod;
 import org.springframework.security.oauth2.core.OAuth2AccessToken;
@@ -148,7 +149,7 @@ public SecurityFilterChain oauth2ServerSecurityFilterChain(HttpSecurity http) th
             .oauth2ResourceServer(resourceServer -> resourceServer.jwt(withDefaults()))
             .build();
 
-        //OAuth2AuthorizationServerConfiguration.applyDefaultSecurity(http);
+//        OAuth2AuthorizationServerConfiguration.applyDefaultSecurity(http);
         /*http.with(OAuth2AuthorizationServerConfigurer.authorizationServer(), Customizer.withDefaults());
 
         http.getConfigurer(OAuth2AuthorizationServerConfigurer.class)

docker/docker-compose.yml

@@ -68,7 +68,7 @@ services:
       - 8080:8080
     volumes:
       - ./docker-entrypoint.sh:/docker-entrypoint.sh
-      - ./opentelemetry-javaagent.jar:/opt/opentelemetry-javaagent.jar
+#      - ./opentelemetry-javaagent.jar:/opt/opentelemetry-javaagent.jar
 #      - /Users/rodrigo/Downloads/ssl/old/www.spendingbetter.com.jks:/www.spendingbetter.com.jks
 #    command: sh ./docker-entrypoint.sh service-discovery:8500
     networks:
@@ -373,19 +373,23 @@ services:
     # Using docker local jib maven
     #image: authentication-service:latest #fielcapao/microservices-design-patterns-authentication-service
     # Using docker raspberry pi image
-    #image: fielcapao/microservices-design-patterns-authentication-service
+#    image: fielcapao/microservices-design-patterns-authentication-service
     container_name: authentication-api
     environment:
       - SPRING_PROFILES_ACTIVE=consul,dev,auth
       - SPRING_DATA_REDIS_HOST=redisdb
       - CONSUL_URL=service-discovery:8500
+      - SPRING_CLOUD_CONSUL_HOST=service-discovery
       - SERVER_PORT=9999
       - SPRING_DATA_MONGODB_URI=mongodb://mongodb-datasource:27017/docker
+      - SPRING_MONGODB_HOST=mongodb-datasource
+      - SPRING_MONGODB_DATABASE=docker
       - SPRING_DATA_MONGODB_DATABASE=docker
       - SPRING_MAIN_ALLOW_CIRCULAR_REFERENCES=true
       - COM_MICROSERVICE_AUTHENTICATION_REDIS_ENABLED=true
       - DEBUG=true
       - MANAGEMENT_ENDPOINTS_WEB_CORS_ALLOW_CREDENTIALS=false
+      - MANAGEMENT_HEALTH_MAIL_ENABLED=false
 #      - LOGGING_LEVEL_ORG_SPRINGFRAMEWORK=trace
 #      - LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_WEB=trace
       - LOGGING_LEVEL_COM_MICROSERVICE=debug
@@ -397,18 +401,20 @@ services:
       - SPRING_CONFIG_IMPORT=consul:service-discovery:8500
       - SPRING_CLOUD_CONSUL_DISCOVERY_PREFER_IP_ADDRESS=true
       - JAVA_OPTS=--enable-preview -Xss256K -Xms1M -XX:+UseSerialGC -Djava.compiler=none -XX:ReservedCodeCacheSize=2496k -XX:MaxDirectMemorySize=1M
-      - JAVA_TOOL_OPTIONS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005
+#      - JAVA_TOOL_OPTIONS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005
       #      - MANAGEMENT_HEALTH_REDIS_ENABLED=false
 #      - COM_MICROSERVICE_AUTHENTICATION_JWT_KEY_VALUE=
 #      - COM_MICROSERVICE_AUTHENTICATION_JWT_KEY_STORE=file:/www.spendingbetter.com.jks
 #      - COM_MICROSERVICE_AUTHENTICATION_JWT_KEY_STORE_PASSWORD=${CERT_PASSWORD}
 #      - COM_MICROSERVICE_AUTHENTICATION_JWT_KEY_ALIAS=spendingbetter
       - SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI=http://localhost:9999/.well-known/jwks.json
+      - OTEL_SDK_DISABLED=true
+      - SPRING_AUTOCONFIGURE_EXCLUDE_0=org.springdoc.core.configuration.SpringDocConfiguration
 #      - LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_SECURITY=debug
-      - OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4318
-      - OTEL_JAVAAGENT_DEBUG=false
-      - OTEL_PROPAGATORS=tracecontext,b3
-      - OTEL_PROPAGATORS_ENABLED=true
+#      - OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4318
+#      - OTEL_JAVAAGENT_DEBUG=false
+#      - OTEL_PROPAGATORS=tracecontext,b3
+#      - OTEL_PROPAGATORS_ENABLED=true
     depends_on:
       - service-discovery
       - mongodb-datasource
@@ -417,6 +423,7 @@ services:
       - redisdb
 #      - jaeger
       - service-discovery-load-configuration
+      - otel-collector
     ports:
       - 9999:9999
       - 5005:5005

pom.xml

@@ -28,7 +28,7 @@
 		<docker.image.from.fabric8>openjdk:25-jdk</docker.image.from.fabric8>
 		<code-coverage>0.8</code-coverage>
 		<dockerfile-maven-plugin.version>1.3.4</dockerfile-maven-plugin.version>
-		<docker.env.JAVA_OPTS>--enable-preview -javaagent:/opt/opentelemetry-javaagent.jar -Xmx512m -Dfile.encoding=UTF-8 -XX:+UseG1GC -verbose:gc -XX:+PrintGCDetails -Xloggc:/var/log/gc.log -Djava.security.egd=file:/dev/./urandom</docker.env.JAVA_OPTS>
+		<docker.env.JAVA_OPTS>--enable-preview -Xmx512m -Dfile.encoding=UTF-8 -XX:+UseG1GC -verbose:gc -XX:+PrintGCDetails -Xloggc:/var/log/gc.log -Djava.security.egd=file:/dev/./urandom</docker.env.JAVA_OPTS>
 		<repackage.classifier/>
 	</properties>