Skip to content

Java 25 / WildFly 40 / Jakarta EE 11 upgrade #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
allanmckenzie merged 1 commit into from
Jul 10, 2026
Merged

Java 25 / WildFly 40 / Jakarta EE 11 upgrade #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
181 changes: 181 additions & 0 deletions Java-25-Upgrade-README.md
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion azure-pipelines.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ resources:
pool:
name: "MDV-ADO-AGENT-AKS-01"
demands:
- identifier -equals centos8-j17
- identifier -equals ubuntu-j25

variables:
sonarqubeProject: "uk.gov.moj.cpp.listing:listing-parent" # update eg: uk.gov.moj.cpp.listing:listing-parent
Expand Down
14 changes: 7 additions & 7 deletions listing-command/listing-command-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>listing-command</artifactId>
<groupId>uk.gov.moj.cpp.listing</groupId>
<version>17.104.4-SNAPSHOT</version>
<version>25.104.0-M1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -23,8 +23,8 @@
<artifactId>messaging-client-generator-plugin</artifactId>
<dependencies>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<version>${javaee-api.version}</version>
</dependency>
<dependency>
Expand All @@ -46,8 +46,8 @@
<artifactId>rest-client-generator-plugin</artifactId>
<dependencies>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<version>${javaee-api.version}</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -143,8 +143,8 @@
<!-- End of Listing Dependencies -->

<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<scope>provided</scope>
</dependency>

Expand Down
10 changes: 5 additions & 5 deletions ...sting-command-api/src/main/java/uk/gov/moj/cpp/listing/command/api/ListingCommandApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@
import java.util.UUID;
import java.util.stream.Collectors;

import javax.inject.Inject;
import javax.json.JsonArray;
import javax.json.JsonArrayBuilder;
import javax.json.JsonObject;
import javax.json.JsonObjectBuilder;
import jakarta.inject.Inject;
import jakarta.json.JsonArray;
import jakarta.json.JsonArrayBuilder;
import jakarta.json.JsonObject;
import jakarta.json.JsonObjectBuilder;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
6 changes: 3 additions & 3 deletions ...-api/src/main/java/uk/gov/moj/cpp/listing/command/api/courtcentre/CourtCentreFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
import java.util.Set;
import java.util.UUID;

import javax.inject.Inject;
import javax.json.JsonArray;
import javax.json.JsonObject;
import jakarta.inject.Inject;
import jakarta.json.JsonArray;
import jakarta.json.JsonObject;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
6 changes: 3 additions & 3 deletions ...-api/src/main/java/uk/gov/moj/cpp/listing/command/api/courtcentre/HearingTypeFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
import java.util.HashMap;
import java.util.Map;

import javax.inject.Inject;
import javax.json.JsonArray;
import javax.json.JsonObject;
import jakarta.inject.Inject;
import jakarta.json.JsonArray;
import jakarta.json.JsonObject;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
10 changes: 5 additions & 5 deletions .../main/java/uk/gov/moj/cpp/listing/command/api/service/CourtScheduleEnrichmentService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@
import java.util.UUID;
import java.util.stream.Collectors;

import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import javax.json.JsonArray;
import javax.json.JsonObject;
import javax.ws.rs.core.Response;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import jakarta.json.JsonArray;
import jakarta.json.JsonObject;
import jakarta.ws.rs.core.Response;

import org.apache.http.HttpStatus;
import org.slf4j.Logger;
Expand Down
12 changes: 6 additions & 6 deletions ...d-api/src/main/java/uk/gov/moj/cpp/listing/command/api/service/CourtSchedulerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package uk.gov.moj.cpp.listing.command.api.service;

import static javax.ws.rs.core.HttpHeaders.ACCEPT;
import static jakarta.ws.rs.core.HttpHeaders.ACCEPT;

import uk.gov.justice.services.common.configuration.Value;
import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter;
Expand All @@ -21,11 +21,11 @@
import java.util.Objects;
import java.util.UUID;

import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import javax.json.JsonArray;
import javax.json.JsonObject;
import javax.ws.rs.core.Response;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import jakarta.json.JsonArray;
import jakarta.json.JsonObject;
import jakarta.ws.rs.core.Response;

import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
Expand Down
4 changes: 2 additions & 2 deletions ...rc/main/java/uk/gov/moj/cpp/listing/command/api/service/HearingDaysEnrichmentService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
import java.util.UUID;
import java.util.stream.Collectors;

import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
4 changes: 2 additions & 2 deletions ...ain/java/uk/gov/moj/cpp/listing/command/api/service/HearingDurationEnrichmentService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
import java.util.Map;
import java.util.function.Function;

import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;

import org.apache.commons.collections.CollectionUtils;
import org.slf4j.Logger;
Expand Down
4 changes: 2 additions & 2 deletions ...c/main/java/uk/gov/moj/cpp/listing/command/api/service/HearingEnrichmentOrchestrator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
import java.util.List;
import java.util.stream.Collectors;

import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
4 changes: 2 additions & 2 deletions ...nd-api/src/main/java/uk/gov/moj/cpp/listing/command/api/service/ReferenceDataService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
import java.util.UUID;
import java.util.stream.Collectors;

import javax.inject.Inject;
import jakarta.inject.Inject;
import uk.gov.justice.services.messaging.JsonObjects;
import javax.json.JsonObject;
import jakarta.json.JsonObject;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
8 changes: 4 additions & 4 deletions ...api/src/main/java/uk/gov/moj/cpp/listing/command/api/util/SlotsToJsonStringConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
import java.util.List;
import java.util.UUID;

import javax.inject.Inject;
import javax.json.JsonArray;
import javax.json.JsonArrayBuilder;
import javax.json.JsonObjectBuilder;
import jakarta.inject.Inject;
import jakarta.json.JsonArray;
import jakarta.json.JsonArrayBuilder;
import jakarta.json.JsonObjectBuilder;

@SuppressWarnings({"squid:S3655"})
public class SlotsToJsonStringConverter {
Expand Down
8 changes: 4 additions & 4 deletions listing-command/listing-command-api/src/main/resources/META-INF/beans.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
version="1.1" bean-discovery-mode="all">
<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
version="4.0" bean-discovery-mode="all">
</beans>
8 changes: 4 additions & 4 deletions ...g-command-api/src/test/java/uk/gov/moj/cpp/listing/command/api/ListingCommandApiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,10 @@
import java.util.concurrent.atomic.AtomicInteger;

import uk.gov.justice.services.messaging.JsonObjects;
import javax.json.JsonArray;
import javax.json.JsonObject;
import javax.json.JsonReader;
import javax.json.JsonValue;
import jakarta.json.JsonArray;
import jakarta.json.JsonObject;
import jakarta.json.JsonReader;
import jakarta.json.JsonValue;

import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
Expand Down
4 changes: 2 additions & 2 deletions .../src/test/java/uk/gov/moj/cpp/listing/command/api/courtcentre/CourtCentreFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
import java.time.LocalTime;
import java.util.UUID;

import javax.json.JsonObject;
import javax.json.JsonReader;
import jakarta.json.JsonObject;
import jakarta.json.JsonReader;

import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
Expand Down
26 changes: 13 additions & 13 deletions ...t/java/uk/gov/moj/cpp/listing/command/api/service/CourtScheduleEnrichmentServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
import java.time.LocalDate;
import java.util.UUID;

import javax.inject.Inject;
import javax.json.JsonObject;
import javax.ws.rs.core.Response;
import jakarta.inject.Inject;
import jakarta.json.JsonObject;
import jakarta.ws.rs.core.Response;

import org.apache.http.HttpStatus;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -112,7 +112,7 @@ void enrichShouldAddMultiDayParamsOnSearch() {

// Mock search response (first available slot). Shape must match getFirstAvailableSlot()
final String bookedCourtScheduleId = java.util.UUID.randomUUID().toString();
final javax.json.JsonObject searchJson =
final jakarta.json.JsonObject searchJson =
JsonObjects.createObjectBuilder()
.add("hearingSlots", JsonObjects.createArrayBuilder()
.add(JsonObjects.createObjectBuilder()
Expand All @@ -134,7 +134,7 @@ void enrichShouldAddMultiDayParamsOnSearch() {
.build());

// Mock list response used by combineSearchAndBookResponseAndListResponse()
final javax.json.JsonObject listJson =
final jakarta.json.JsonObject listJson =
JsonObjects.createObjectBuilder()
.add("hearings", JsonObjects.createArrayBuilder()
.add(JsonObjects.createObjectBuilder()
Expand All @@ -146,15 +146,15 @@ void enrichShouldAddMultiDayParamsOnSearch() {
final Response listResponse = org.mockito.Mockito.mock(Response.class);
when(listResponse.getStatus()).thenReturn(org.apache.http.HttpStatus.SC_OK);
when(listResponse.getEntity()).thenReturn(listJson);
when(hearingSlotsService.listHearingInCourtSessions(any(javax.json.JsonObject.class))).thenReturn(listResponse);
when(hearingSlotsService.listHearingInCourtSessions(any(jakarta.json.JsonObject.class))).thenReturn(listResponse);
when(objectToJsonObjectConverter.convert(listJson)).thenReturn(listJson);

// jsonObjectConverter must translate each "hearings" item to ListUpdateHearing (POJO with setters)
when(jsonObjectConverter.convert(
org.mockito.ArgumentMatchers.any(javax.json.JsonObject.class),
org.mockito.ArgumentMatchers.any(jakarta.json.JsonObject.class),
org.mockito.ArgumentMatchers.eq(uk.gov.moj.cpp.listing.domain.ListUpdateHearing.class)))
.thenAnswer(inv -> {
javax.json.JsonObject jo = inv.getArgument(0);
jakarta.json.JsonObject jo = inv.getArgument(0);
uk.gov.moj.cpp.listing.domain.ListUpdateHearing luh = new uk.gov.moj.cpp.listing.domain.ListUpdateHearing();
luh.setCourtScheduleId(jo.getString("courtScheduleId"));
luh.setHearingStartTime(jo.getString("hearingStartTime"));
Expand Down Expand Up @@ -221,7 +221,7 @@ void enrichShouldNotIncludeStartTimeForMultiDaySearch() {

// Mock search response (first available slot)
final String bookedCourtScheduleId = java.util.UUID.randomUUID().toString();
final javax.json.JsonObject searchJson =
final jakarta.json.JsonObject searchJson =
JsonObjects.createObjectBuilder()
.add("hearingSlots", JsonObjects.createArrayBuilder()
.add(JsonObjects.createObjectBuilder()
Expand All @@ -241,7 +241,7 @@ void enrichShouldNotIncludeStartTimeForMultiDaySearch() {
.thenReturn(JsonObjects.createArrayBuilder().add(bookedCourtScheduleId).build());

// Mock list response used by combineSearchAndBookResponseAndListResponse()
final javax.json.JsonObject listJson =
final jakarta.json.JsonObject listJson =
JsonObjects.createObjectBuilder()
.add("hearings", JsonObjects.createArrayBuilder()
.add(JsonObjects.createObjectBuilder()
Expand All @@ -253,15 +253,15 @@ void enrichShouldNotIncludeStartTimeForMultiDaySearch() {
final Response listResponse = org.mockito.Mockito.mock(Response.class);
when(listResponse.getStatus()).thenReturn(org.apache.http.HttpStatus.SC_OK);
when(listResponse.getEntity()).thenReturn(listJson);
when(hearingSlotsService.listHearingInCourtSessions(any(javax.json.JsonObject.class))).thenReturn(listResponse);
when(hearingSlotsService.listHearingInCourtSessions(any(jakarta.json.JsonObject.class))).thenReturn(listResponse);
when(objectToJsonObjectConverter.convert(listJson)).thenReturn(listJson);

// Map each "hearings" item to ListUpdateHearing
when(jsonObjectConverter.convert(
org.mockito.ArgumentMatchers.any(javax.json.JsonObject.class),
org.mockito.ArgumentMatchers.any(jakarta.json.JsonObject.class),
org.mockito.ArgumentMatchers.eq(uk.gov.moj.cpp.listing.domain.ListUpdateHearing.class)))
.thenAnswer(inv -> {
javax.json.JsonObject jo = inv.getArgument(0);
jakarta.json.JsonObject jo = inv.getArgument(0);
uk.gov.moj.cpp.listing.domain.ListUpdateHearing luh = new uk.gov.moj.cpp.listing.domain.ListUpdateHearing();
luh.setCourtScheduleId(jo.getString("courtScheduleId"));
luh.setHearingStartTime(jo.getString("hearingStartTime"));
Expand Down
6 changes: 3 additions & 3 deletions ...i/src/test/java/uk/gov/moj/cpp/listing/command/api/service/CourtSchedulerServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import java.util.Map;
import java.util.UUID;

import javax.ws.rs.core.Response;
import jakarta.ws.rs.core.Response;

import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.http.StatusLine;
Expand Down Expand Up @@ -85,7 +85,7 @@ public void shouldGetCourtSchedulesByIdSuccessfully() throws Exception {
org.apache.http.HttpEntity entity = mock(org.apache.http.HttpEntity.class);
when(httpResponse.getEntity()).thenReturn(entity);
entityUtilsMockedStatic.when(() -> EntityUtils.toString(entity)).thenReturn("test response");
when(stringToJsonObjectConverter.convert(any())).thenReturn(mock(javax.json.JsonObject.class));
when(stringToJsonObjectConverter.convert(any())).thenReturn(mock(jakarta.json.JsonObject.class));

// When
Response response = courtSchedulerService.getCourtSchedulesById(params);
Expand Down Expand Up @@ -220,7 +220,7 @@ public void shouldHandleMultipleQueryParameters() throws Exception {
org.apache.http.HttpEntity entity = mock(org.apache.http.HttpEntity.class);
when(httpResponse.getEntity()).thenReturn(entity);
entityUtilsMockedStatic.when(() -> EntityUtils.toString(entity)).thenReturn("test response");
when(stringToJsonObjectConverter.convert(any())).thenReturn(mock(javax.json.JsonObject.class));
when(stringToJsonObjectConverter.convert(any())).thenReturn(mock(jakarta.json.JsonObject.class));

// When
Response response = courtSchedulerService.getCourtSchedulesById(params);
Expand Down
4 changes: 2 additions & 2 deletions ...d/listing-command-api/src/test/java/uk/gov/moj/cpp/listing/command/api/util/FileUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import java.io.InputStream;

import uk.gov.justice.services.messaging.JsonObjects;
import javax.json.JsonObject;
import javax.json.JsonReader;
import jakarta.json.JsonObject;
import jakarta.json.JsonReader;

import com.google.common.io.Resources;
import org.slf4j.Logger;
Expand Down
4 changes: 2 additions & 2 deletions ...src/test/java/uk/gov/moj/cpp/listing/command/api/util/SlotsToJsonStringConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
import java.util.Optional;
import java.util.UUID;

import javax.json.JsonArrayBuilder;
import javax.json.JsonObjectBuilder;
import jakarta.json.JsonArrayBuilder;
import jakarta.json.JsonObjectBuilder;

import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
Expand Down
Loading
Loading