feat:java 21 modernisation

README.md

@@ -2,7 +2,7 @@
 This library consists of helper methods that call the VOL backend API and is to be used as a toolkit of support libraries in the [VOL Functional test suite.](https://github.com/dvsa/vol-functional-tests)
 
 ## Requirements
-- Java 17
+- Java 21
 - Maven 3.6.3 or greater
 
 

pom.xml

@@ -36,8 +36,8 @@
         <jjwt.version>0.13.0</jjwt.version>
 
         <!-- Logging - Updated to fix security vulnerability -->
-        <log4j-api.version>2.25.3</log4j-api.version>
-        <log4j-core.version>2.25.3</log4j-core.version>
+        <log4j-api.version>2.25.4</log4j-api.version>
+        <log4j-core.version>2.25.4</log4j-core.version>
 
         <!-- AWS Maven Extension -->
         <aws-maven.version>5.0.0.RELEASE</aws-maven.version>

src/main/java/apiCalls/actions/GrantLicence.java

@@ -8,6 +8,7 @@
 import apiCalls.Utils.generic.BaseAPI;
 import apiCalls.Utils.generic.Headers;
 import apiCalls.Utils.generic.Utils;
+import apiCalls.enums.TrackingStatus;
 import io.restassured.response.ValidatableResponse;
 import org.apache.hc.core5.http.HttpException;
 import org.apache.hc.core5.http.HttpStatus;
@@ -73,7 +74,7 @@ public synchronized ValidatableResponse grantLicence() throws HttpException {
 
     public synchronized void createOverview() throws HttpException {
         var overviewResource = ApiUrl.build(env, "application/%s/overview/".formatted(application.getApplicationId())).toString();
-        var status = "1";
+        var status = TrackingStatus.ACCEPTED.asString();
         var overrideOption = "Y";
         var transportArea = "D";
         var trackingId = fetchApplicationInformation(application.getApplicationId(), "applicationTracking.id", null);
@@ -86,33 +87,7 @@ public synchronized void createOverview() throws HttpException {
         var tracking = new TrackingBuilder()
                 .withId(trackingId)
                 .withVersion(applicationTrackingVersion)
-                .withAddressesStatus(status)
-                .withBusinessDetailsStatus(status)
-                .withBusinessTypeStatus(status)
-                .withCommunityLicencesStatus(status)
-                .withConditionsUndertakingsStatus(status)
-                .withConvictionsPenaltiesStatus(status)
-                .withFinancialEvidenceStatus(status)
-                .withFinancialHistoryStatus(status)
-                .withLicenceHistoryStatus(status)
-                .withOperatingCentresStatus(status)
-                .withPeopleStatus(status)
-                .withSafetyStatus(status)
-                .withTransportManagersStatus(status)
-                .withTypeOfLicenceStatus(status)
-                .withDeclarationsInternalStatus(status)
-                .withVehiclesStatus(status)
-                .withVehiclesPsvStatus(status)
-                .withTaxiPhvStatus(status)
-                .withVehiclesSizeStatus(status)
-                .withPsvOperateSmallStatus(status)
-                .withPsvOperateLargeStatus(status)
-                .withPsvSmallConditionsStatus(status)
-                .withPsvOperateNoveltyStatus(status)
-                .withPsvSmallPartWrittenStatus(status)
-                .withPsvDocumentaryEvidenceSmallStatus(status)
-                .withPsvDocumentaryEvidenceLargeStatus(status)
-                .withPsvMainOccupationUndertakingsStatus(status);
+                .withAllStatuses(status);
 
 
         var overview = new OverviewBuilder()

src/main/java/apiCalls/enums/BusinessType.java

@@ -7,13 +7,13 @@ public enum BusinessType {
     LIMITED_PARTNERSHIP("org_t_llp"),
     OTHER(" org_t_pa");
 
-    private final String businessTypes;
+    private final String value;
 
-    private BusinessType(String businessTypes){
-        this.businessTypes = businessTypes;
+    BusinessType(String value) {
+        this.value = value;
     }
 
     public String asString() {
-        return businessTypes;
+        return value;
     }
 }

src/main/java/apiCalls/enums/EnforcementArea.java

@@ -1,8 +1,5 @@
 package apiCalls.enums;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public enum EnforcementArea {
     NORTH_EAST("EA-B"),
     NORTH_WEST("EA-C"),
@@ -14,19 +11,21 @@ public enum EnforcementArea {
     SCOTLAND("EA-A"),
     NORTHERN_IRELAND("EA-N");
 
-    private final String codes;
+    private final String code;
 
-    private EnforcementArea(String codes) {
-        this.codes = codes.toUpperCase();
+    EnforcementArea(String code) {
+        this.code = code.toUpperCase();
     }
 
     public String value() {
-        return codes;
+        return code;
     }
 
+    /**
+     * @deprecated Use {@link #values()} instead.
+     */
+    @Deprecated(forRemoval = true)
     public static EnforcementArea[] enforcementAreaList() {
-        return new EnforcementArea[]{EnforcementArea.NORTH_EAST, EnforcementArea.NORTH_WEST, EnforcementArea.MIDLANDS,
-                EnforcementArea.EAST, EnforcementArea.WALES, EnforcementArea.WEST, EnforcementArea.LONDON,
-                EnforcementArea.SCOTLAND, EnforcementArea.NORTHERN_IRELAND};
+        return values();
     }
 }

src/main/java/apiCalls/enums/FinancialStandingRateVehicleType.java

@@ -1,26 +1,26 @@
 package apiCalls.enums;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.util.Arrays;
 
 public enum FinancialStandingRateVehicleType {
     NA("fin_sta_veh_typ_na"),
     HGV("fin_sta_veh_typ_hgv"),
     LGV("fin_sta_veh_typ_lgv");
 
-    private final String vehicleTypes;
+    private final String value;
 
-    FinancialStandingRateVehicleType(String vehicleTypes){
-        this.vehicleTypes = vehicleTypes;
+    FinancialStandingRateVehicleType(String value) {
+        this.value = value;
     }
 
     public String asString() {
-        return vehicleTypes;
+        return value;
     }
 
-    public static FinancialStandingRateVehicleType getEnum(@NotNull String name) {
-        return Arrays.stream(FinancialStandingRateVehicleType.values()).filter(status -> status.asString().equalsIgnoreCase(name))
-                .findFirst().orElseThrow(() -> new IllegalArgumentException("Unable to convert to enum, name: ".concat(name)));
+    public static FinancialStandingRateVehicleType getEnum(String name) {
+        return Arrays.stream(values())
+                .filter(type -> type.asString().equalsIgnoreCase(name))
+                .findFirst()
+                .orElseThrow(() -> new IllegalArgumentException("Unable to convert to enum, name: " + name));
     }
 }

src/main/java/apiCalls/enums/LicenceType.java

@@ -1,7 +1,5 @@
 package apiCalls.enums;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.util.Arrays;
 
 public enum LicenceType {
@@ -10,18 +8,20 @@ public enum LicenceType {
     STANDARD_INTERNATIONAL("ltyp_si"),
     SPECIAL_RESTRICTED("ltyp_sr");
 
-    private final String licenceTypes;
+    private final String value;
 
-    private LicenceType(String licenceTypes){
-        this.licenceTypes = licenceTypes;
+    LicenceType(String value) {
+        this.value = value;
     }
 
     public String asString() {
-        return licenceTypes;
+        return value;
     }
 
-    public static LicenceType getEnum(@NotNull String name) {
-        return Arrays.stream(LicenceType.values()).filter(status -> status.asString().equalsIgnoreCase(name))
-                .findFirst().orElseThrow(() -> new IllegalArgumentException("Unable to convert to enum, name: ".concat(name)));
+    public static LicenceType getEnum(String name) {
+        return Arrays.stream(values())
+                .filter(type -> type.asString().equalsIgnoreCase(name))
+                .findFirst()
+                .orElseThrow(() -> new IllegalArgumentException("Unable to convert to enum, name: " + name));
     }
 }

src/main/java/apiCalls/enums/OperatorType.java

@@ -1,25 +1,25 @@
 package apiCalls.enums;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.util.Arrays;
 
 public enum OperatorType {
     GOODS("lcat_gv"),
     PUBLIC("lcat_psv");
 
-    private final String operatorTypes;
+    private final String value;
 
-    private OperatorType(String operatorType) {
-        this.operatorTypes = operatorType;
+    OperatorType(String value) {
+        this.value = value;
     }
 
     public String asString() {
-        return operatorTypes;
+        return value;
     }
 
-    public static OperatorType getEnum(@NotNull String name) {
-        return Arrays.stream(OperatorType.values()).filter(status -> status.asString().equalsIgnoreCase(name))
-                .findFirst().orElseThrow(() -> new IllegalArgumentException("Unable to convert to enum, name: ".concat(name)));
+    public static OperatorType getEnum(String name) {
+        return Arrays.stream(values())
+                .filter(type -> type.asString().equalsIgnoreCase(name))
+                .findFirst()
+                .orElseThrow(() -> new IllegalArgumentException("Unable to convert to enum, name: " + name));
     }
 }

src/main/java/apiCalls/enums/Realm.java

@@ -4,13 +4,13 @@ public enum Realm {
     SELF_SERVE("selfserve"),
     INTERNAL("internal");
 
-    private final String serviceType;
+    private final String value;
 
-    private Realm(String serviceType){
-        this.serviceType = serviceType;
+    Realm(String value) {
+        this.value = value;
     }
 
     public String asString() {
-        return serviceType;
+        return value;
     }
 }

src/main/java/apiCalls/enums/TrackingStatus.java

@@ -0,0 +1,23 @@
+package apiCalls.enums;
+
+/**
+ * Tracking status values for application section completion.
+ * Matches the valid values defined in olcs-transfer ApplicationTracking partial
+ * (InArray validator with haystack: "0", "1", "2", "3").
+ */
+public enum TrackingStatus {
+    NOT_STARTED("0"),
+    ACCEPTED("1"),
+    IN_PROGRESS("2"),
+    UPDATED("3");
+
+    private final String value;
+
+    TrackingStatus(String value) {
+        this.value = value;
+    }
+
+    public String asString() {
+        return value;
+    }
+}