Merge branch 'main' into PRM-668-2

Author: chrisbloe

.github/workflows/full-deployment.yml

@@ -101,6 +101,7 @@ jobs:
       service: pds-adaptor
       environment: ${{ inputs.environment }}
       is_deployment: ${{ inputs.is_deployment }}
+      # TODO PRM-713 REMOVE THIS LINE SO IT TAKES THE DEFAULT
       java_version: "11"
       ecr_alias: deductions/pds-adaptor
     secrets: inherit

.github/workflows/service-ci.yml

@@ -109,6 +109,8 @@ jobs:
       environment: dev
       is_deployment: ${{ github.ref == 'refs/heads/main' }}
       requires_localstack: true
+      # PRM-711: Remove the hardcoded java_versions once all services are compatible with Java 25
+      java_version: "25"
       ecr_alias: deductions/nems-event-processor
     secrets: inherit
 

services/ehr-transfer-service/docker-compose.localstack-local.yaml

@@ -25,15 +25,14 @@ services:
 
   localstack:
     container_name: "localstack-ehr-transfer-service"
-    image: localstack/localstack
+    image: localstack/localstack:4.14.0
     ports:
       - "4566:4566"
     network_mode: bridge
     environment:
       - DOCKER_HOST=unix:///var/run/docker.sock
       - SERVICES=sqs,sns,dynamodb,s3
       - GATEWAY_LISTEN=4566
-      - LOCALSTACK_ACKNOWLEDGE_ACCOUNT_REQUIREMENT=1
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock"
       - "${LOCALSTACK_VOLUME_DIR:-./volume}:/var/lib/localstack"

services/nems-event-processor/Dockerfile

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

services/nems-event-processor/README.md

@@ -1,3 +1,22 @@
 # prm-deductions-nems-event-processor
 
-This component is a Java service that receives NEMS events when there is a change of GP for a patient in PDS (Personal Demographics Service). It processes each event to filter for relevant use cases and extracts important information from each, and forwards this information to another queue for further use.
+This component is a Java service that receives NEMS events when there is a change of GP for a patient in PDS (Personal Demographics Service). It processes each event to filter for relevant use cases and extracts important information from each, and forwards this information to another queue for further use.
+
+## Prerequisites
+
+- Java 25 LTS
+- Gradle 9.3
+
+### Running the tests
+
+#### All tests
+To run all Unit and Integration tests and produce a coverage report, in your terminal, run `./tasks test_all`
+
+#### Unit testing
+These are easiest to run from your IDE, however, you can also run them from your terminal with: `./tasks test_unit`
+
+#### Integration testing
+The integration tests can be run from your terminal with: `./tasks test_integration` which will start and stop LocalStack for you.
+
+If you want to run these from your IDE, you must first start LocalStack with: `./tasks start_localstack`
+It is recommended that you stop LocalStack after running the tests with: `./tasks stop_localstack`

services/nems-event-processor/build.gradle

@@ -1,10 +1,9 @@
 plugins {
-    id 'org.springframework.boot' version '3.2.1'
-    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'
-    id 'org.sonarqube' version '4.4.1.3373'
+    id 'org.sonarqube' version '7.2.2.6593'
 }
 
 sonar {
@@ -17,74 +16,73 @@ sonar {
 
 group = 'uk.nhs.prm.deductions'
 version = '0.0.1-SNAPSHOT'
-sourceCompatibility = '21'
 
-configurations {
-    compileOnly {
-        extendsFrom annotationProcessor
+repositories {
+    mavenCentral()
+}
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(25)
     }
 }
 
-repositories {
-    mavenCentral()
+sourceSets {
+    integration {
+        compileClasspath += sourceSets.main.output
+        runtimeClasspath += sourceSets.main.output
+    }
 }
 
-//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
+configurations {
+    compileOnly {
+        extendsFrom annotationProcessor
+    }
+
+    integrationImplementation.extendsFrom testImplementation
+    integrationRuntime.extendsFrom testRuntime
 }
 
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter'
 
-    implementation 'net.logstash.logback:logstash-logback-encoder:6.6'
-    implementation 'org.jetbrains:annotations:20.1.0'
-
-    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')
+    implementation 'net.logstash.logback:logstash-logback-encoder:9.0'
+
+    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:cloudwatch'
     implementation 'software.amazon.awssdk:sns'
     implementation 'software.amazon.awssdk:sqs'
-    implementation 'com.amazonaws:amazon-sqs-java-messaging-lib:2.0.1'
 
-    implementation 'com.jcabi:jcabi-xml:0.23.1'
-    implementation 'com.google.code.gson:gson:2.10.1'
+    implementation 'com.amazonaws:amazon-sqs-java-messaging-lib:2.1.4'
 
-    implementation 'com.github.spotbugs:spotbugs-annotations:4.8.3'
+    // TODO PRM-714 a discussion is needed about whether this is removed. It'll require complicated logic changes,
+    //  but is a dependency managed by a small team.
+    implementation 'com.jcabi:jcabi-xml:0.35.0'
+    implementation 'com.google.code.gson:gson:2.13.2'
 
-    compileOnly 'org.projectlombok:lombok:1.18.30'
+    compileOnly 'org.projectlombok:lombok:1.18.42'
     annotationProcessor 'org.projectlombok:lombok'
 
     testImplementation 'org.springframework.boot:spring-boot-test'
     testImplementation 'org.springframework.boot:spring-boot-test-autoconfigure'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
-    testImplementation 'org.springframework.boot:spring-boot-starter-aop'
+    testImplementation 'org.springframework.boot:spring-boot-starter-json'
 
-    testImplementation "org.mockito:mockito-core:3.+"
-    testImplementation 'org.awaitility:awaitility:4.2.0'
-}
+    integrationImplementation 'com.fasterxml.jackson.core:jackson-databind'
 
-sourceSets {
-    integration {
-        compileClasspath += sourceSets.main.output
-        runtimeClasspath += sourceSets.main.output
-    }
-}
-
-configurations {
-    integrationImplementation.extendsFrom testImplementation
-    integrationRuntime.extendsFrom testRuntime
+    testImplementation 'org.mockito:mockito-core:5.22.0'
+    testImplementation 'org.awaitility:awaitility:4.3.0'
 }
 
 tasks.withType(Test) {
@@ -119,42 +117,3 @@ jacocoTestCoverageVerification {
         }))
     }
 }
-
-spotbugs {
-    toolVersion = '4.8.3'
-}
-
-spotbugsMain {
-    ignoreFailures = true
-    reports {
-        html {
-            enabled = true
-            destination = file("$buildDir/reports/spotbugs/main/spotbugs.html")
-            stylesheet = 'fancy-hist.xsl'
-        }
-    }
-}
-
-spotbugsTest {
-    ignoreFailures = true
-    reports {
-        html {
-            enabled = true
-            destination = file("$buildDir/reports/spotbugs/test/spotbugs.html")
-            stylesheet = 'fancy-hist.xsl'
-        }
-    }
-}
-
-spotbugsIntegration {
-    ignoreFailures = true
-    reports {
-        html {
-            enabled = true
-            destination = file("$buildDir/reports/spotbugs/integration/spotbugs.html")
-            stylesheet = 'fancy-hist.xsl'
-        }
-    }
-}
-
-check.dependsOn integration

services/nems-event-processor/docker-compose.localstack-local.yaml

@@ -1,7 +1,7 @@
 services:
   localstack:
     container_name: "localstack-nems-event-processor"
-    image: localstack/localstack
+    image: localstack/localstack:4.14.0
     network_mode: bridge
     ports:
       - "127.0.0.1:4566:4566"

services/nems-event-processor/gradle/wrapper/gradle-wrapper.properties

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