CCD-5322 synching - Use ccd-test-definition 7.23.0 and fix WARNING: PropertyNamingStrateg…

Jenkinsfile_CNP

@@ -20,9 +20,9 @@ def branchesToSync = ['demo', 'ithc', 'perftest', 'develop']
 
 // Variables to switch pipeline logic and wiring per type of build
 
-def definitionStoreDevelopPr = "PR-575"  // This doesn't change frequently, but when it does, only change this value.
-def dataStoreApiDevelopPr    = "PR-1260" // This doesn't change frequently, but when it does, only change this value.
-def prsToUseAat              = "PR-1793,PR-1888" // Set this value to a PR number, or add it as a comma-separated value, if it's to follow CI/CD.
+def definitionStoreDevelopPr = "PR-1468"  // This doesn't change frequently, but when it does, only change this value.
+def dataStoreApiDevelopPr    = "PR-2462" // This doesn't change frequently, but when it does, only change this value.
+def prsToUseAat              = "" // Set this value to a PR number, or add it as a comma-separated value, if it's to follow CI/CD.
 
 def secrets = [
     'ccd-${env}': [
@@ -140,6 +140,8 @@ withPipeline(type, product, component) {
     }
 
     echo "ES FTA Enabled = ${env.ELASTIC_SEARCH_FTA_ENABLED} on branch ${env.BRANCH_NAME}"
+    echo "env.DEFINITION_STORE_URL_BASE = ${env.DEFINITION_STORE_URL_BASE}"
+    echo "env.DATA_STORE_DB_HOST = ${env.DATA_STORE_DB_HOST}"
 
     syncBranchesWithMaster(branchesToSync)
     overrideVaultEnvironments(vaultOverrides)
@@ -158,6 +160,10 @@ withPipeline(type, product, component) {
         steps.archiveArtifacts allowEmptyArchive: true, artifacts: '**/BEFTA Report for Smoke Tests/**/*'
     }
 
+    before('smoketest:aat') {
+        env.DEFINITION_STORE_URL_BASE = "https://ccd-definition-store-api-staging.aat.platform.hmcts.net"
+    }
+
     afterAlways('smoketest:aat') {
         steps.archiveArtifacts allowEmptyArchive: true, artifacts: '**/BEFTA Report for Smoke Tests/**/*'
     }

build.gradle

@@ -34,6 +34,7 @@ def versions = [
 ext['spring-security.version'] = '5.7.11'
 ext['spring-framework.version'] = '5.3.27'
 ext['jackson.version'] = '2.16.0'
+ext['beftaFwVersion'] = '9.0.2'
 
 configurations {
     compileClasspath {
@@ -337,8 +338,8 @@ dependencies {
     implementation 'org.jooq:jool-java-8:0.9.14'
     implementation 'com.github.hmcts:ccd-case-document-am-client:1.7.1'
 
-    testImplementation group: 'com.github.hmcts', name: 'ccd-test-definitions', version:  '7.22.3'
-    testImplementation group: 'com.github.hmcts', name: 'befta-fw', version: '9.0.2'
+    testImplementation group: 'com.github.hmcts', name: 'ccd-test-definitions', version:  '7.23.0'
+    testImplementation group: 'com.github.hmcts', name: 'befta-fw', version: beftaFwVersion
 
     contractTestImplementation "org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}"
     contractTestImplementation "org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}"

charts/ccd-data-store-api/values.preview.template.yaml

@@ -27,7 +27,7 @@ java:
     DATA_STORE_DB_PASSWORD: "{{ .Values.postgresql.auth.password}}"
     DATA_STORE_DB_OPTIONS: "?stringtype=unspecified"
     DATA_STORE_DB_MAX_POOL_SIZE: 10
-    DEFINITION_STORE_HOST: http://ccd-definition-store-api-pr-575-java/
+    DEFINITION_STORE_HOST: http://ccd-definition-store-api-pr-1468-java/
     USER_PROFILE_HOST: http://ccd-user-profile-api-pr-399-java/
     ELASTIC_SEARCH_ENABLED: true # enable whenever ES required on a particular PR
     ELASTIC_SEARCH_NODES_DISCOVERY_ENABLED: true
@@ -38,6 +38,8 @@ java:
     LOGGING_LEVEL_UK_GOV_HMCTS_CCD_SECURITY_IDAM: DEBUG
     LOG_CALLBACK_DETAILS:
     DEFAULT_CACHE_TTL_SEC: 1
+    DATA_STORE_DEFAULT_LOG_LEVEL: DEBUG
+
   postgresql:
     enabled: true
 

src/main/java/uk/gov/hmcts/ccd/data/documentdata/DocumentDataRequest.java

@@ -1,6 +1,6 @@
 package uk.gov.hmcts.ccd.data.documentdata;
 
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -9,7 +9,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Data
-@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 public class DocumentDataRequest {
 
     String attributePath;

src/main/java/uk/gov/hmcts/ccd/domain/model/casefileview/CategoriesAndDocuments.java

@@ -1,13 +1,13 @@
 package uk.gov.hmcts.ccd.domain.model.casefileview;
 
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import lombok.Value;
 
 import java.util.List;
 
 @Value
-@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 public class CategoriesAndDocuments {
     Integer caseVersion;
     List<Category> categories;

src/main/java/uk/gov/hmcts/ccd/domain/model/casefileview/Category.java

@@ -1,13 +1,13 @@
 package uk.gov.hmcts.ccd.domain.model.casefileview;
 
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import lombok.Value;
 
 import java.util.List;
 
 @Value
-@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 public class Category {
     String categoryId;
     String categoryName;

src/main/java/uk/gov/hmcts/ccd/domain/model/casefileview/Document.java

@@ -1,14 +1,14 @@
 package uk.gov.hmcts.ccd.domain.model.casefileview;
 
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import io.swagger.annotations.ApiModel;
 import lombok.Value;
 
 import java.time.LocalDateTime;
 
 @Value
-@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 @ApiModel(value = "Document definition")
 public class Document {
     String documentURL;

src/main/java/uk/gov/hmcts/ccd/domain/model/refdata/BuildingLocation.java

@@ -1,6 +1,6 @@
 package uk.gov.hmcts.ccd.domain.model.refdata;
 
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import lombok.Builder;
 import lombok.Value;
@@ -12,7 +12,7 @@
 @Value
 @Builder
 @Jacksonized
-@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 public class BuildingLocation implements Serializable {
     String buildingLocationId;
     String buildingLocationName;

src/main/java/uk/gov/hmcts/ccd/domain/model/refdata/CourtVenue.java

@@ -1,6 +1,6 @@
 package uk.gov.hmcts.ccd.domain.model.refdata;
 
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import lombok.Builder;
 import lombok.Value;
@@ -9,10 +9,11 @@
 import java.io.Serializable;
 import java.time.LocalDate;
 
+
 @Value
 @Builder
 @Jacksonized
-@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 public class CourtVenue implements Serializable {
     String courtVenueId;
     String epimmsId;

src/main/java/uk/gov/hmcts/ccd/domain/model/refdata/ServiceReferenceData.java

@@ -1,6 +1,6 @@
 package uk.gov.hmcts.ccd.domain.model.refdata;
 
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import lombok.Builder;
 import lombok.Value;
@@ -13,7 +13,7 @@
 @Value
 @Builder
 @Jacksonized
-@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 public class ServiceReferenceData implements Serializable {
     long serviceId;
     String orgUnit;

src/main/java/uk/gov/hmcts/ccd/domain/service/aggregated/AuthorisedGetEventTriggerOperation.java

@@ -166,16 +166,22 @@ private void verifyRequiredAccessExistsForCaseType(String eventId,
                                                        Set<AccessProfile> accessProfiles) {
         if (!accessControlService.canAccessCaseTypeWithCriteria(caseTypeDefinition,
             accessProfiles, CAN_READ)) {
-            throw new ResourceNotFoundException(NO_CASE_TYPE_FOUND);
+            ResourceNotFoundException resourceNotFoundException = new ResourceNotFoundException(NO_CASE_TYPE_FOUND);
+            resourceNotFoundException.withDetails("No READ Access");
+            throw resourceNotFoundException;
         }
         if (!accessControlService.canAccessCaseTypeWithCriteria(caseTypeDefinition,
             accessProfiles, CAN_CREATE)) {
-            throw new ResourceNotFoundException(NO_CASE_TYPE_FOUND);
+            ResourceNotFoundException resourceNotFoundException = new ResourceNotFoundException(NO_CASE_TYPE_FOUND);
+            resourceNotFoundException.withDetails("No Create Access");
+            throw resourceNotFoundException;
         }
         if (!accessControlService.canAccessCaseEventWithCriteria(eventId,
                                                                  caseTypeDefinition.getEvents(),
             accessProfiles, CAN_CREATE)) {
-            throw new ResourceNotFoundException(NO_EVENT_FOUND);
+            ResourceNotFoundException resourceNotFoundException = new ResourceNotFoundException(NO_EVENT_FOUND);
+            resourceNotFoundException.withDetails("No Create Access");
+            throw resourceNotFoundException;
         }
     }
 
@@ -185,12 +191,16 @@ private void verifyMandatoryAccessForCase(String eventId, CaseDetails caseDetail
         if (!accessControlService.canAccessCaseTypeWithCriteria(caseTypeDefinition,
             accessProfiles,
                                                                 CAN_READ)) {
-            throw new ResourceNotFoundException(NO_CASE_TYPE_FOUND);
+            ResourceNotFoundException resourceNotFoundException = new ResourceNotFoundException(NO_CASE_TYPE_FOUND);
+            resourceNotFoundException.withDetails("No READ Access");
+            throw resourceNotFoundException;
         }
         if (!accessControlService.canAccessCaseTypeWithCriteria(caseTypeDefinition,
             accessProfiles,
                                                                 CAN_UPDATE)) {
-            throw new ResourceNotFoundException(NO_CASE_TYPE_FOUND);
+            ResourceNotFoundException resourceNotFoundException = new ResourceNotFoundException(NO_CASE_TYPE_FOUND);
+            resourceNotFoundException.withDetails("No Update Access");
+            throw resourceNotFoundException;
         }
         if (!accessControlService.canAccessCaseEventWithCriteria(eventId,
                                                                  caseTypeDefinition.getEvents(),

src/main/java/uk/gov/hmcts/ccd/domain/service/search/elasticsearch/dto/ElasticSearchCaseDetailsDTO.java

@@ -2,15 +2,15 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import uk.gov.hmcts.ccd.data.casedetails.SecurityClassification;
 
 import java.time.LocalDateTime;
 import java.util.Map;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
-@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 public class ElasticSearchCaseDetailsDTO {
 
     private String id;