Skip to content

Commit 7b2c750

Browse files
AndyFlintAnswerDigitalAndyFlintAnswerDigital
authored
[PRM-712] Upgraded re-registration-service to Java 25, Spring Boot 4 and Gradle 9.3 (#294)
1 parent 4751179 commit 7b2c750

24 files changed

+263
-365
lines changed

‎.github/workflows/service-ci.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ jobs:
152152
is_deployment: ${{ github.ref == 'refs/heads/main' }}
153153
requires_localstack: true
154154
image_prefix: repo/
155+
java_version: "25"
155156
ecr_alias: repo/re-registration-service
156157
secrets: inherit
157158

‎services/re-registration-service/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eclipse-temurin:21-jre-alpine-3.23
1+
FROM eclipse-temurin:25-jre-alpine-3.23
22

33
RUN apk update && \
44
apk -u list && \

‎services/re-registration-service/build.gradle‎

Lines changed: 30 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
plugins {
2-
id 'org.springframework.boot' version '3.2.1'
3-
id 'io.spring.dependency-management' version '1.1.4'
2+
id 'org.springframework.boot' version '4.0.3'
3+
id 'io.spring.dependency-management' version '1.1.7'
44
id 'java'
55
id 'jacoco'
6-
id 'com.github.spotbugs' version '6.0.6'
76
id "org.sonarqube" version "4.4.1.3373"
87
}
98

109
group = 'uk.nhs.prm.repo'
1110
version = '0.0.1-SNAPSHOT'
12-
sourceCompatibility = '21'
1311

1412
configurations {
1513
compileOnly {
@@ -21,57 +19,58 @@ repositories {
2119
mavenCentral()
2220
}
2321

22+
java {
23+
toolchain {
24+
languageVersion = JavaLanguageVersion.of(25)
25+
}
26+
}
27+
2428
//Without this task two jars are built, the additional "-plain.jar" is not needed
2529
// for more details refer to: https://docs.spring.io/spring-boot/docs/current/gradle-plugin/reference/htmlsingle/#packaging-executable.and-plain-archives
2630
jar {
2731
enabled = false
2832
}
2933

3034
dependencies {
31-
implementation('com.google.guava:guava') { version { strictly '32.1.3-jre' } }
32-
33-
implementation('org.yaml:snakeyaml') { version { strictly '2.2' } }
34-
3535
implementation 'org.springframework.boot:spring-boot-starter'
3636
implementation 'org.springframework.boot:spring-boot-starter-web'
3737

38-
implementation('io.netty:netty-buffer') { version { strictly '4.1.104.Final' } }
39-
implementation('io.netty:netty-codec') { version { strictly '4.1.104.Final' } }
40-
implementation('io.netty:netty-codec-http') { version { strictly '4.1.104.Final' } }
41-
implementation('io.netty:netty-codec-http2') { version { strictly '4.1.104.Final' } }
42-
implementation('io.netty:netty-common') { version { strictly '4.1.104.Final' } }
43-
implementation('io.netty:netty-handler') { version { strictly '4.1.104.Final' } }
44-
implementation('io.netty:netty-resolver') { version { strictly '4.1.104.Final' } }
45-
implementation('io.netty:netty-transport') { version { strictly '4.1.104.Final' } }
46-
implementation('io.netty:netty-transport-classes-epoll') { version { strictly '4.1.104.Final' } }
47-
implementation('io.netty:netty-transport-native-unix-common') { version { strictly '4.1.104.Final' } }
38+
implementation 'org.yaml:snakeyaml:2.5'
39+
40+
implementation('io.netty:netty-buffer') { version { strictly '4.2.9.Final' } }
41+
implementation('io.netty:netty-codec') { version { strictly '4.2.9.Final' } }
42+
implementation('io.netty:netty-codec-http') { version { strictly '4.2.9.Final' } }
43+
implementation('io.netty:netty-codec-http2') { version { strictly '4.2.9.Final' } }
44+
implementation('io.netty:netty-common') { version { strictly '4.2.9.Final' } }
45+
implementation('io.netty:netty-handler') { version { strictly '4.2.9.Final' } }
46+
implementation('io.netty:netty-resolver') { version { strictly '4.2.9.Final' } }
47+
implementation('io.netty:netty-transport') { version { strictly '4.2.9.Final' } }
48+
implementation('io.netty:netty-transport-classes-epoll') { version { strictly '4.2.9.Final' } }
49+
implementation('io.netty:netty-transport-native-unix-common') { version { strictly '4.2.9.Final' } }
4850

49-
implementation 'com.amazonaws:amazon-sqs-java-messaging-lib:1.1.2'
51+
implementation 'com.fasterxml.jackson.core:jackson-databind'
5052

51-
implementation platform('software.amazon.awssdk:bom:2.18.41')
53+
implementation 'com.amazonaws:amazon-sqs-java-messaging-lib:2.1.4'
54+
55+
implementation platform('software.amazon.awssdk:bom:2.41.14')
5256
implementation 'software.amazon.awssdk:cloudwatch'
5357
implementation 'software.amazon.awssdk:sqs'
5458
implementation 'software.amazon.awssdk:sns'
5559
implementation 'software.amazon.awssdk:dynamodb'
5660

57-
implementation group: 'javax.inject', name: 'javax.inject', version: '1'
58-
implementation 'org.springframework:spring-jms:5.3.19'
59-
implementation 'com.google.code.gson:gson:2.10.1'
60-
implementation 'io.github.resilience4j:resilience4j-retry:1.7.1'
61+
implementation 'com.google.code.gson:gson:2.13.2'
62+
implementation 'io.github.resilience4j:resilience4j-retry:2.3.0'
6163

62-
implementation 'net.logstash.logback:logstash-logback-encoder:7.2'
64+
implementation 'net.logstash.logback:logstash-logback-encoder:9.0'
6365

64-
compileOnly 'org.projectlombok:lombok:1.18.24'
66+
compileOnly 'org.projectlombok:lombok:1.18.42'
6567
annotationProcessor 'org.projectlombok:lombok'
6668

67-
implementation 'com.github.spotbugs:spotbugs-annotations:4.8.3'
68-
6969
testImplementation 'org.springframework.boot:spring-boot-starter-test'
7070
testImplementation 'org.springframework.boot:spring-boot-test'
7171

72-
testImplementation "org.mockito:mockito-core:3.+"
73-
testImplementation 'org.wiremock:wiremock-standalone:3.3.1'
74-
testImplementation 'org.awaitility:awaitility:4.2.0'
72+
testImplementation 'org.wiremock:wiremock-standalone:3.13.2'
73+
testImplementation 'org.awaitility:awaitility:4.3.0'
7574
}
7675

7776
test {
@@ -129,43 +128,6 @@ jacocoTestCoverageVerification {
129128
}
130129
}
131130

132-
spotbugs {
133-
toolVersion = '4.8.3'
134-
}
135-
136-
spotbugsMain {
137-
ignoreFailures = true
138-
reports {
139-
html {
140-
enabled = true
141-
destination = file("$buildDir/reports/spotbugs/main/spotbugs.html")
142-
stylesheet = 'fancy-hist.xsl'
143-
}
144-
}
145-
}
146-
147-
spotbugsTest {
148-
ignoreFailures = true
149-
reports {
150-
html {
151-
enabled = true
152-
destination = file("$buildDir/reports/spotbugs/test/spotbugs.html")
153-
stylesheet = 'fancy-hist.xsl'
154-
}
155-
}
156-
}
157-
158-
spotbugsIntegration {
159-
ignoreFailures = true
160-
reports {
161-
html {
162-
enabled = true
163-
destination = file("$buildDir/reports/spotbugs/integration/spotbugs.html")
164-
stylesheet = 'fancy-hist.xsl'
165-
}
166-
}
167-
}
168-
169131
sonar {
170132
properties {
171133
property "sonar.projectKey", "NHSDigital_orphaned-record-continuity"

‎services/re-registration-service/docker-compose.localstack-local.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
services:
22
localstack:
33
container_name: "localstack-re-registration-service"
4-
image: localstack/localstack
4+
image: localstack/localstack:4.14.0
55
ports:
66
- "4566:4566"
77
network_mode: bridge

‎services/re-registration-service/docker-compose.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
version: "2.2"
21
services:
32
default:
43
links:
54
- localstack:localstack
65
localstack:
7-
image: localstack/localstack
6+
image: localstack/localstack:4.14.0
87
ports:
98
- "4566:4566"
109
environment:

‎services/re-registration-service/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎services/re-registration-service/src/integration/java/uk/nhs/prm/repo/re_registration/ActiveSuspensionsIntegrationTest.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package uk.nhs.prm.repo.re_registration;
22

3-
import com.amazonaws.services.sqs.AmazonSQSAsync;
43
import org.junit.jupiter.api.Test;
54
import org.junit.jupiter.api.extension.ExtendWith;
65
import org.springframework.beans.factory.annotation.Autowired;
@@ -9,6 +8,7 @@
98
import org.springframework.test.context.ActiveProfiles;
109
import org.springframework.test.context.ContextConfiguration;
1110
import org.springframework.test.context.junit.jupiter.SpringExtension;
11+
import software.amazon.awssdk.services.sqs.SqsClient;
1212
import uk.nhs.prm.repo.re_registration.data.ActiveSuspensionsDb;
1313
import uk.nhs.prm.repo.re_registration.infra.LocalStackAwsConfig;
1414
import uk.nhs.prm.repo.re_registration.model.ActiveSuspensionsMessage;
@@ -27,7 +27,7 @@
2727
@ContextConfiguration(classes = LocalStackAwsConfig.class)
2828
public class ActiveSuspensionsIntegrationTest {
2929
@Autowired
30-
private AmazonSQSAsync amazonSQSAsync;
30+
private SqsClient sqs;
3131

3232
@Autowired
3333
ActiveSuspensionsDb activeSuspensionsDb;
@@ -38,9 +38,6 @@ public class ActiveSuspensionsIntegrationTest {
3838
@Value("${aws.reRegistrationsQueueName}")
3939
private String reRegistrationsQueueName;
4040

41-
@Autowired
42-
private AmazonSQSAsync sqs;
43-
4441
private static final String NHS_NUMBER = "0987654321";
4542
private static final String PREVIOUS_ODS_CODE = "OLD001";
4643
private static final String NEWLY_REGISTERED_ODS_CODE = "NEW001";
@@ -77,8 +74,8 @@ void shouldDeleteRecordFromActiveSuspensionsDbWhenRecordFoundByNhsNumber() {
7774
}
7875

7976
private void sendMessage(String queueName, String messageBody) {
80-
var queueUrl = amazonSQSAsync.getQueueUrl(queueName).getQueueUrl();
81-
amazonSQSAsync.sendMessage(queueUrl, messageBody);
77+
var queueUrl = sqs.getQueueUrl(builder -> builder.queueName(queueName)).queueUrl();
78+
sqs.sendMessage(builder -> builder.queueUrl(queueUrl).messageBody(messageBody));
8279
}
8380

8481
private String getActiveSuspensionsMessage() {

‎services/re-registration-service/src/integration/java/uk/nhs/prm/repo/re_registration/ReRegistrationsIntegrationTest.java‎

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
package uk.nhs.prm.repo.re_registration;
22

3-
import com.amazonaws.services.sqs.AmazonSQSAsync;
4-
import com.amazonaws.services.sqs.model.CreateQueueRequest;
5-
import com.amazonaws.services.sqs.model.Message;
6-
import com.amazonaws.services.sqs.model.ReceiveMessageRequest;
73
import org.junit.jupiter.api.Test;
84
import org.junit.jupiter.api.extension.ExtendWith;
95
import org.springframework.beans.factory.annotation.Autowired;
@@ -12,13 +8,18 @@
128
import org.springframework.test.context.ActiveProfiles;
139
import org.springframework.test.context.ContextConfiguration;
1410
import org.springframework.test.context.junit.jupiter.SpringExtension;
11+
import software.amazon.awssdk.services.sqs.SqsClient;
12+
import software.amazon.awssdk.services.sqs.model.CreateQueueRequest;
13+
import software.amazon.awssdk.services.sqs.model.Message;
14+
import software.amazon.awssdk.services.sqs.model.ReceiveMessageRequest;
1515
import uk.nhs.prm.repo.re_registration.infra.LocalStackAwsConfig;
1616
import uk.nhs.prm.repo.re_registration.logging.TestLogAppender;
1717
import uk.nhs.prm.repo.re_registration.message_publishers.ReRegistrationAuditPublisher;
1818
import uk.nhs.prm.repo.re_registration.model.ReRegistrationEvent;
1919

2020
import java.util.HashMap;
2121
import java.util.List;
22+
import java.util.Map;
2223
import java.util.UUID;
2324
import java.util.concurrent.TimeUnit;
2425

@@ -32,26 +33,22 @@
3233
public class ReRegistrationsIntegrationTest {
3334

3435
@Autowired
35-
private AmazonSQSAsync amazonSQSAsync;
36+
private SqsClient sqs;
3637

3738
@Autowired
3839
ReRegistrationAuditPublisher publisher;
3940

4041
@Value("${aws.reRegistrationsQueueName}")
4142
private String reRegistrationsQueueName;
4243

43-
4444
private String getReRegistrationsEvent() {
4545
return new ReRegistrationEvent("1234567890", "ABC123", UUID.randomUUID().toString(), "2017-11-01T15:00:33+00:00").toJsonString();
4646
}
4747

4848
private void createQueue(String queueName) {
49-
CreateQueueRequest createQueueRequest = new CreateQueueRequest();
50-
createQueueRequest.setQueueName(queueName);
51-
HashMap<String, String> attributes = new HashMap<>();
52-
createQueueRequest.withAttributes(attributes);
53-
amazonSQSAsync.createQueue(reRegistrationsQueueName);
54-
49+
sqs.createQueue(CreateQueueRequest.builder()
50+
.queueName(queueName)
51+
.build());
5552
}
5653

5754
@Test
@@ -68,29 +65,24 @@ void shouldReceiveAndLogAndAcknowledgeReRegistrationsEvent() {
6865
assertThat(receiveLog).isNotNull();
6966
});
7067

71-
7268
var messages = receiveMessages(reRegistrationsQueueName);
73-
7469
assertThat(messages).isEmpty();
7570
}
7671

77-
7872
private void sendMessage(String queueName, String messageBody) {
7973
var queueUrl = getQueueUrl(queueName);
80-
amazonSQSAsync.sendMessage(queueUrl, messageBody);
74+
sqs.sendMessage(builder -> builder.queueUrl(queueUrl).messageBody(messageBody));
8175
}
8276

8377
private String getQueueUrl(String queueName) {
84-
return amazonSQSAsync.getQueueUrl(queueName).getQueueUrl();
78+
return sqs.getQueueUrl(builder -> builder.queueName(queueName)).queueUrl();
8579
}
8680

87-
@Test
8881
private List<Message> receiveMessages(String queueName) {
89-
String queueUrl = amazonSQSAsync.getQueueUrl(queueName).getQueueUrl();
90-
91-
var receiveMessageRequest = new ReceiveMessageRequest().withQueueUrl(queueUrl);
92-
return amazonSQSAsync.receiveMessage(receiveMessageRequest).getMessages();
82+
String queueUrl = getQueueUrl(queueName);
83+
var receiveMessageRequest = ReceiveMessageRequest.builder()
84+
.queueUrl(queueUrl)
85+
.build();
86+
return sqs.receiveMessage(receiveMessageRequest).messages();
9387
}
94-
9588
}
96-

0 commit comments

Comments
 (0)