[PRM-713] Upgraded PDS Adaptor to Spring Boot 4, Java 25 and Gradle 9.3 (#292)

Author: AndyFlintAnswerDigital

.github/workflows/service-ci.yml

@@ -137,7 +137,7 @@ jobs:
       service: pds-adaptor
       environment: dev
       is_deployment: ${{ github.ref == 'refs/heads/main' }}
-      java_version: "11"
+      java_version: "25"
       ecr_alias: deductions/pds-adaptor
     secrets: inherit
 

services/pds-adaptor/Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:11-jre-alpine-3.23
+FROM eclipse-temurin:25-jre-alpine-3.23
 
 RUN apk update && \
     apk -u list && \

services/pds-adaptor/build.gradle

@@ -1,9 +1,8 @@
 plugins {
-    id 'org.springframework.boot' version '2.7.18'
-    id 'io.spring.dependency-management' version '1.1.4'
+    id 'org.springframework.boot' version '4.0.3'
+    id 'io.spring.dependency-management' version '1.1.7'
     id 'java'
     id 'jacoco'
-    id 'com.github.spotbugs' version '6.0.6'
 }
 
 group = 'uk.nhs.prm.deductions'
@@ -13,54 +12,63 @@ configurations {
     compileOnly {
         extendsFrom annotationProcessor
     }
+    mockitoAgent
 }
 
 repositories {
     mavenCentral()
 }
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(25)
+    }
+}
+
 //Without this task two jars are built, the additional "-plain.jar" is not needed
 // for more details refer to: https://docs.spring.io/spring-boot/docs/current/gradle-plugin/reference/htmlsingle/#packaging-executable.and-plain-archives
 jar {
     enabled = false
 }
 
 dependencies {
-    implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.boot:spring-boot-starter-webmvc'
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation 'org.springframework.boot:spring-boot-starter-security'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
-    testImplementation 'org.springframework.boot:spring-boot-starter-aop'
-
-    implementation 'org.yaml:snakeyaml:2.2'
-    implementation 'org.springdoc:springdoc-openapi-ui:1.6.15'
-    implementation 'net.logstash.logback:logstash-logback-encoder:6.6'
-    implementation 'org.bouncycastle:bcpkix-jdk15on:1.70'
-    implementation 'com.nimbusds:nimbus-jose-jwt:9.37.3'
-    implementation 'org.jetbrains:annotations:20.1.0'
-    implementation 'org.json:json:20231013'
-    implementation 'org.apache.httpcomponents:httpclient:4.5.14'
-
-    implementation('io.netty:netty-buffer') { version { strictly '4.1.104.Final' } }
-    implementation('io.netty:netty-codec') { version { strictly '4.1.104.Final' } }
-    implementation('io.netty:netty-codec-http') { version { strictly '4.1.104.Final' } }
-    implementation('io.netty:netty-codec-http2') { version { strictly '4.1.104.Final' } }
-    implementation('io.netty:netty-common') { version { strictly '4.1.104.Final' } }
-    implementation('io.netty:netty-handler') { version { strictly '4.1.104.Final' } }
-    implementation('io.netty:netty-resolver') { version { strictly '4.1.104.Final' } }
-    implementation('io.netty:netty-transport') { version { strictly '4.1.104.Final' } }
-    implementation('io.netty:netty-transport-classes-epoll') { version { strictly '4.1.104.Final' } }
-    implementation('io.netty:netty-transport-native-unix-common') { version { strictly '4.1.104.Final' } }
-
-    implementation platform('software.amazon.awssdk:bom:2.18.41')
+    testImplementation 'org.springframework.boot:spring-boot-starter-webmvc-test'
+    testImplementation 'org.springframework.boot:spring-boot-starter-restclient-test'
+
+    implementation 'org.yaml:snakeyaml:2.5'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:3.0.2'
+    implementation 'net.logstash.logback:logstash-logback-encoder:9.0'
+    implementation 'org.bouncycastle:bcpkix-jdk18on:1.83'
+    implementation 'com.nimbusds:nimbus-jose-jwt:10.8'
+    implementation 'org.json:json:20251224'
+
+    implementation('io.netty:netty-buffer') { version { strictly '4.2.9.Final' } }
+    implementation('io.netty:netty-codec') { version { strictly '4.2.9.Final' } }
+    implementation('io.netty:netty-codec-http') { version { strictly '4.2.9.Final' } }
+    implementation('io.netty:netty-codec-http2') { version { strictly '4.2.9.Final' } }
+    implementation('io.netty:netty-common') { version { strictly '4.2.9.Final' } }
+    implementation('io.netty:netty-handler') { version { strictly '4.2.9.Final' } }
+    implementation('io.netty:netty-resolver') { version { strictly '4.2.9.Final' } }
+    implementation('io.netty:netty-transport') { version { strictly '4.2.9.Final' } }
+    implementation('io.netty:netty-transport-classes-epoll') { version { strictly '4.2.9.Final' } }
+    implementation('io.netty:netty-transport-native-unix-common') { version { strictly '4.2.9.Final' } }
+
+    implementation platform('software.amazon.awssdk:bom:2.41.14')
     implementation 'software.amazon.awssdk:ssm'
 
-    compileOnly 'org.projectlombok:lombok:1.18.30'
+    compileOnly 'org.projectlombok:lombok:1.18.42'
 
     annotationProcessor 'org.projectlombok:lombok'
 
-    testImplementation 'com.github.tomakehurst:wiremock-jre8:2.35.1'
+    testImplementation 'org.wiremock:wiremock-standalone:3.13.2'
+    implementation 'org.apache.httpcomponents.client5:httpclient5'
+    mockitoAgent('org.mockito:mockito-core') { transitive = false }
 }
 
 springBoot {
@@ -87,6 +95,7 @@ test {
 
 tasks.withType(Test) {
     useJUnitPlatform()
+    jvmArgs "-javaagent:${configurations.mockitoAgent.asPath}"
 }
 
 task integration(type: Test) {
@@ -118,33 +127,5 @@ jacocoTestCoverageVerification {
     }
 }
 
-spotbugsMain {
-    ignoreFailures = true
-    reports {
-        html {
-            enabled = true
-            destination = file("$buildDir/reports/spotbugs/main/spotbugs.html")
-            stylesheet = 'fancy-hist.xsl'
-        }
-    }
-}
-
-spotbugsTest {
-    enabled = false
-}
-
-spotbugsIntegration {
-    ignoreFailures = true
-    reports {
-        html {
-            enabled = true
-            destination = file("$buildDir/reports/spotbugs/integration/spotbugs.html")
-            stylesheet = 'fancy-hist.xsl'
-        }
-    }
-}
-
-check.dependsOn integration
-
 test.outputs.upToDateWhen {false}
 integration.outputs.upToDateWhen {false}

services/pds-adaptor/gradle.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

services/pds-adaptor/gradle/wrapper/gradle-wrapper.properties

@@ -3,14 +3,20 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.resttestclient.TestRestTemplate;
+import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.http.*;
+import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+@AutoConfigureTestRestTemplate
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 public class AuthIntegrationTest {

services/pds-adaptor/src/integration/java/uk/nhs/prm/deductions/pdsadaptor/ApplicationHealthIntegrationTest.java

@@ -8,9 +8,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.resttestclient.TestRestTemplate;
+import org.springframework.boot.resttestclient.autoconfigure.AutoConfigureTestRestTemplate;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.http.*;
 import org.springframework.test.context.ContextConfiguration;
 import uk.nhs.prm.deductions.pdsadaptor.model.SuspendedPatientStatus;
@@ -23,6 +24,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static uk.nhs.prm.deductions.pdsadaptor.testing.MapBuilder.json;
 
+@AutoConfigureTestRestTemplate
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @ContextConfiguration(initializers = {WireMockInitializer.class})
 public class PdsAdaptorIntegrationTest {
@@ -244,7 +246,7 @@ public void shouldRetryWhen503ErrorsFromPdsFhir() {
                 .withRequestBody(equalToJson(fhirPatchJsonToUpdateMofTo("A1235")))
                 .whenScenarioStateIs(STARTED)
                 .willReturn(aResponse()
-                        .withStatus(503) // request unsuccessful with status code 500
+                        .withStatus(503) // request unsuccessful with status code 503
                         .withHeader("Content-Type", "text/xml")
                         .withBody("<response>Some content</response>"))
                 .willSetStateTo("TRIED_ONCE"));

services/pds-adaptor/src/integration/java/uk/nhs/prm/deductions/pdsadaptor/AuthIntegrationTest.java

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="CONSOLE" />
+    </root>
+
+    <!-- Set specific log levels for debugging -->
+    <logger name="uk.nhs.prm.deductions.pdsadaptor" level="DEBUG" />
+    <logger name="org.springframework" level="INFO" />
+    <logger name="com.amazonaws" level="WARN" />
+</configuration>

services/pds-adaptor/src/integration/java/uk/nhs/prm/deductions/pdsadaptor/PdsAdaptorIntegrationTest.java

@@ -2,7 +2,6 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.jetbrains.annotations.NotNull;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -52,12 +51,10 @@ private boolean isUnauthorized(HttpStatusCodeException e) {
         return e.getStatusCode() == HttpStatus.UNAUTHORIZED;
     }
 
-    @NotNull
     private HttpHeaders withRefreshedAuthHeader(HttpHeaders headers) {
         return withAuthHeader(headers, authService.getNewAccessToken());
     }
 
-    @NotNull
     private HttpHeaders withCurrentAuthHeader(HttpHeaders headers) {
         return withAuthHeader(headers, authService.getAccessToken());
     }