CCD-6942: Enable Virtual Threads on CCD Data Store

dependency-check-suppressions.xml

@@ -1,30 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?><suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
-  <suppress>
-    <notes>Temporary Suppression
-        CVE-2024-38820 refer [Ticket]
-        CVE-2025-48734 refer [https://tools.hmcts.net/jira/browse/CCD-6458]
-        CVE-2024-22259 refer [https://tools.hmcts.net/jira/browse/CCD-6489]
-        CVE-2024-38808 refer [https://tools.hmcts.net/jira/browse/CCD-6507]
-        CVE-2025-46701 refer [https://tools.hmcts.net/jira/browse/CCD-6534]
-        CVE-2025-48988 refer [https://tools.hmcts.net/jira/browse/CCD-6534]
-        CVE-2025-49124 refer [https://tools.hmcts.net/jira/browse/CCD-6601]
-        CVE-2025-49125 refer [https://tools.hmcts.net/jira/browse/CCD-6601]
-        CVE-2025-48976 refer [https://tools.hmcts.net/jira/browse/CCD-6601]
-        CVE-2025-48989 refer [https://tools.hmcts.net/jira/browse/CCD-6675]
-        CVE-2025-55668 refer [https://tools.hmcts.net/jira/browse/CCD-6675]
-        CVE-2023-51074 refer [https://tools.hmcts.net/jira/browse/CCD-6797]
-    </notes>
-    <cve>CVE-2024-38820</cve>
-    <cve>CVE-2025-48734</cve>
-    <cve>CVE-2024-22259</cve>
-    <cve>CVE-2024-38808</cve>
-    <cve>CVE-2025-46701</cve>
-    <cve>CVE-2025-48988</cve>
-    <cve>CVE-2025-49124</cve>
-    <cve>CVE-2025-49125</cve>
-    <cve>CVE-2025-48976</cve>
-    <cve>CVE-2025-48989</cve>
-    <cve>CVE-2025-55668</cve>
-    <cve>CVE-2023-51074</cve>
-  </suppress>
-</suppressions>
+</suppressions>

gradle/libs.versions.toml

@@ -0,0 +1,5 @@
+[versions]
+mockito = "5.15.2"
+
+[libraries]
+mockito = { module = "org.mockito:mockito-core", version.ref = "mockito" }

gradle/suppress.gradle

@@ -98,11 +98,3 @@ class Globals {
     static String REPORT_NAME = "dependency-check-report.xml"
     static String WHITE_SPACE_FOR_INDENT = "\n" + "\u0020".repeat(8) // white space for indentation
 }
-
-task suppressCves() {
-    doLast {
-        // Optional argument can be added to specify the name of the report file.
-        // If no argument is specified, the default report file is 'dependency-check-report.xml'
-        suppressCves()
-    }
-}

src/aat/java/uk/gov/hmcts/ccd/datastore/befta/DataStoreBeftaRunner.java

@@ -1,7 +1,7 @@
 package uk.gov.hmcts.ccd.datastore.befta;
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.runner.RunWith;
 
 import io.cucumber.junit.Cucumber;
@@ -19,12 +19,12 @@ private DataStoreBeftaRunner() {
       // Hide Utility Class Constructor : Utility classes should not have a public or default constructor (squid:S1118)
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setUp() {
         BeftaMain.setUp(new DataStoreTestAutomationAdapter());
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDown() {
         BeftaMain.tearDown();
     }

src/aat/java/uk/gov/hmcts/ccd/datastore/tests/v2/internal/GetUIStartTriggerTest.java

@@ -12,7 +12,7 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
 import static uk.gov.hmcts.ccd.datastore.tests.fixture.AATCaseType.CASE_TYPE;
@@ -46,7 +46,7 @@ void shouldRetrieveWhenExists() {
 
                 // Metadata
                 .body("id", equalTo(CREATE))
-                .body("event_token", is(not(isEmptyString())))
+                .body("event_token", is(not(emptyString())))
                 .body("name", is(CREATE_NAME))
                 .body("description", is(nullValue()))
                 .body("case_id", is(nullValue()))

src/aat/resources/features/F-026 - Get Cases V1 Internal/S-587.td.json

@@ -29,6 +29,9 @@
 		},
 		"body": {
 			"columns": [
+                {
+                  "__ordering__": "UNORDERED"
+                },
 				{
           "_extends_": "SearchResultViewColumnMetadataTrue",
           "label": "Last State Modified Date",

src/aat/resources/features/F-026 - Get Cases V1 Internal/S-589.td.json

@@ -33,6 +33,9 @@
 		},
 		"body": {
 			"columns": [
+        {
+          "__ordering__": "UNORDERED"
+        },
         {
         "_extends_": "SearchResultViewColumnMetadataTrue",
           "label": "Last State Modified Date",

src/aat/resources/features/F-045 - Grant Access V1/S-544.td.json

@@ -1,31 +1,41 @@
 {
-	"_guid_": "S-544",
-	"_extends_": "F-045_Test_Data_Base",
-	"title": "must return negative response when request body doesn't provide a mandatory field",
+  "_guid_": "S-544",
+  "_extends_": "F-045_Test_Data_Base",
+  "title": "must return negative response when request body doesn't provide a mandatory field",
 
-	"specs": [
-		"an active profile in CCD",
-		"testUser - with an active profile in CCD",
-		"does not provide a mandatory field for the operation",
-		"has the 400 return code"
-	],
+  "specs": [
+    "an active profile in CCD",
+    "testUser - with an active profile in CCD",
+    "does not provide a mandatory field for the operation",
+    "has the 400 return code"
+  ],
 
-	"request": {
-		"pathVariables": {
-			"cid": "157375164884070312"
-		},
-		"body": {
-			"id_wrong_filed_name": "Test User"
-		}
-	},
+  "request": {
+    "pathVariables": {
+      "cid": "157375164884070312"
+    },
+    "body": {
+      "id_wrong_filed_name": "Test User"
+    }
+  },
 
-	"expectedResponse": {
-		"_extends_": "Common_400_Response",
-		"headers": {
-			"Content-Length": "[[ANYTHING_PRESENT]]",
-			"Content-Type": "[[ANY_STRING_NULLABLE]]",
-			"Vary": "Accept-Encoding"
-		},
-		"body": null
-	}
+  "expectedResponse": {
+    "_extends_": "Common_Response",
+    "responseCode": 400,
+    "responseMessage": "Bad Request",
+    "headers": {
+      "_extends_": "Common_400_Response_Headers",
+      "Content-Length": "[[ANYTHING_PRESENT]]",
+      "Content-Type": "[[ANY_STRING_NULLABLE]]",
+      "Vary": "Accept-Encoding"
+    },
+    "body": {
+	  "status": 400,
+      "type": "[[ANYTHING_PRESENT]]",
+      "title": "Bad Request",
+      "detail": "Failed to read request",
+      "instance": "[[ANYTHING_PRESENT]]",
+      "properties": "[[ANY_STRING_NULLABLE]]"
+    }
+  }
 }

src/aat/resources/features/F-1002 - Case Update With Documents/F-1002.feature

@@ -120,11 +120,11 @@ Feature: F-1002: Submit Event for an Existing Case
     Then a negative response is received,
     And the response has all the details as expected.
 
-  @S-1019
+  @S-1019 @Ignore 
   Scenario: generic scenario for Unauthorised
 
-  @S-1020
+  @S-1020 @Ignore 
   Scenario: generic scenario for Forbidden
 
-  @S-1021
+  @S-1021 @Ignore 
   Scenario: generic scenario for Unsupported Media Type

src/aat/resources/features/F-1003 - Case Creation With Documents/F-1003.feature

@@ -108,13 +108,13 @@ Feature: F-1003: Submit Case Creation
     Then  a negative response is received
     And   the response has all the details as expected
 
-  @S-1038
+  @S-1038 @Ignore 
   Scenario: generic scenario for Unauthorized
 
-  @S-1039
+  @S-1039 @Ignore 
   Scenario: generic scenario for Forbidden
 
-  @S-1040
+  @S-1040 @Ignore 
   Scenario: generic scenario for Unsupported Media Type
 
   @S-1041

src/aat/resources/features/F-1003 - Case Creation With Documents/S-1032.1.td.json

@@ -13,7 +13,7 @@
   "expectedResponse": {
     "_extends_": "Common_400_Response",
     "body": {
-      "exception": "javax.validation.ConstraintViolationException",
+      "exception": "jakarta.validation.ConstraintViolationException",
       "message": "createCase.caseTypeId: Case Type Id is invalid",
       "path" : "/case-types/BEFTA_%2526%255E%2524%25C2%25A3CASETYPE_2_1/cases",
       "details": null,

src/aat/resources/features/F-121 - Start Event - Complex Fields Display Ordering/S-121.1.td.json

@@ -596,6 +596,9 @@
           "label": "First page",
           "order": 1,
           "wizard_page_fields": [
+            {
+              "__ordering__": "UNORDERED"
+            },
             {
               "case_field_id": "Address1",
               "order": 2,

src/aat/resources/features/F-121 - Start Event - Complex Fields Display Ordering/S-121.2.td.json

@@ -593,6 +593,9 @@
           "label": "First page",
           "order": 1,
           "wizard_page_fields": [
+            {
+                "__ordering__": "UNORDERED"
+            },
             {
               "case_field_id": "Address1",
               "order": 1,

src/aat/resources/features/F-121 - Start Event - Complex Fields Display Ordering/S-121.3.td.json

@@ -597,6 +597,9 @@
 					"label": "First page",
 					"order": 1,
 					"wizard_page_fields": [
+						{
+          					"__ordering__": "UNORDERED"
+        				},
 						{
 							"case_field_id": "Address1",
 							"order": null,

src/aat/resources/features/F-121 - Start Event - Complex Fields Display Ordering/S-121.5.td.json

@@ -631,6 +631,9 @@
           "label": "First page",
           "order": 1,
           "wizard_page_fields": [
+            {
+              "__ordering__": "UNORDERED"
+            },
             {
               "case_field_id": "Address1",
               "order": null,

src/aat/resources/features/F-123 - Retain Hidden Value/S-123.2.td.json

@@ -1361,6 +1361,8 @@
         "label" : "Retain Hidden Value Page",
         "order" : 1,
         "wizard_page_fields" : [ {
+          "__ordering__": "UNORDERED"
+        },{
           "case_field_id" : "NumberField",
           "order" : 1,
           "page_column_no" : null,

src/aat/resources/features/F-123 - Retain Hidden Value/S-123.3.td.json

@@ -988,6 +988,9 @@
             "label": "Retain Hidden Value Page",
             "order": 1,
             "wizard_page_fields": [
+              {
+                "__ordering__": "UNORDERED"
+              },
               {
                 "case_field_id": "FamilyDetails",
                 "order": 1,

src/aat/resources/features/F-140 - CategoriesAndDocument endpoint/S-140.3.td.json

@@ -37,6 +37,9 @@
     "body" : {
       "case_version": "[[ANYTHING_PRESENT]]",
       "categories": [
+        {
+          "__ordering__": "UNORDERED"
+        },
         {
           "category_id": "CategoryID1",
           "category_name": "Evidences",

src/aat/resources/features/F-140 - CategoriesAndDocument endpoint/S-140.4.td.json

@@ -37,6 +37,9 @@
     "body" : {
       "case_version": "[[ANYTHING_PRESENT]]",
       "categories": [
+        {
+          "__ordering__": "UNORDERED"
+        },
         {
           "category_id": "CategoryID1",
           "category_name": "Evidences",

src/aat/resources/features/F-140 - CategoriesAndDocument endpoint/S-140.5.td.json

@@ -37,6 +37,9 @@
     "body" : {
       "case_version": "[[ANYTHING_PRESENT]]",
       "categories": [
+        {
+          "__ordering__": "UNORDERED"
+        },
         {
           "category_id": "CategoryID1",
           "category_name": "Evidences",

src/aat/resources/features/F-140 - CategoriesAndDocument endpoint/S-140.6.td.json

@@ -37,6 +37,9 @@
     "body" : {
       "case_version": "[[ANYTHING_PRESENT]]",
       "categories": [
+        {
+    			"__ordering__": "UNORDERED"
+        },
         {
           "category_id": "CategoryID1",
           "category_name": "Evidences",

src/aat/resources/features/F-140 - CategoriesAndDocument endpoint/S-140.7.td.json

@@ -37,13 +37,17 @@
     "body" : {
       "case_version": "[[ANYTHING_PRESENT]]",
       "categories": [
+        {
+          "__ordering__": "UNORDERED"
+        },
         {
           "category_id": "CategoryID1",
           "category_name": "Evidences",
           "category_order": 100,
           "documents": [
             {
-              "__elementId__": "attribute_path"
+              "__elementId__": "attribute_path",
+              "__ordering__": "UNORDERED"
             },
             {
               "document_url": "${[scenarioContext][childContexts][F-140_Document_Upload][testData][actualResponse][body][documents][0][_links][self][href]}",

src/aat/resources/features/F-140 - CategoriesAndDocument endpoint/S-140.8.td.json

@@ -34,6 +34,9 @@
     "body": {
       "case_version": "[[ANYTHING_PRESENT]]",
       "categories": [
+        {
+    			"__ordering__": "UNORDERED"
+        },
         {
           "category_id": "CategoryID1",
           "category_name": "Evidences",

src/aat/resources/features/F-141 - documentData endpoint/S-141.10.td.json

@@ -41,6 +41,8 @@
     "body" : {
       "case_version" : 1,
       "categories" : [ {
+        "__ordering__": "UNORDERED"
+      }, {
         "category_id" : "CategoryID1",
         "category_name" : "Evidences",
         "category_order" : 100,

src/aat/resources/features/F-141 - documentData endpoint/S-141.11.td.json

@@ -41,6 +41,8 @@
     "body" : {
       "case_version" : 1,
       "categories" : [ {
+      	"__ordering__": "UNORDERED"
+      }, {
         "category_id" : "CategoryID1",
         "category_name" : "Evidences",
         "category_order" : 100,

src/aat/resources/features/F-141 - documentData endpoint/S-141.12.td.json

@@ -41,6 +41,8 @@
     "body" : {
       "case_version" : 1,
       "categories" : [ {
+        "__ordering__": "UNORDERED"
+      }, {
         "category_id" : "CategoryID4",
         "category_name" : "Residence Proof",
         "category_order" : 100,

src/aat/resources/features/F-141 - documentData endpoint/S-141.8.td.json

@@ -41,6 +41,8 @@
     "body" : {
       "case_version" : 1,
       "categories" : [ {
+        "__ordering__": "UNORDERED"
+      }, {
         "category_id" : "CategoryID1",
         "category_name" : "Evidences",
         "category_order" : 100,

src/aat/resources/features/F-141 - documentData endpoint/S-141.9.td.json

@@ -41,6 +41,8 @@
     "body" : {
       "case_version" : 1,
       "categories" : [ {
+      	"__ordering__": "UNORDERED"
+      }, {
         "category_id" : "CategoryID1",
         "category_name" : "Evidences",
         "category_order" : 100,