diff --git a/build.gradle b/build.gradle index dea1f5d72a..f4d83808a1 100644 --- a/build.gradle +++ b/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}" diff --git a/src/main/java/uk/gov/hmcts/ccd/data/documentdata/DocumentDataRequest.java b/src/main/java/uk/gov/hmcts/ccd/data/documentdata/DocumentDataRequest.java index 9fb9e6fe04..356be951be 100644 --- a/src/main/java/uk/gov/hmcts/ccd/data/documentdata/DocumentDataRequest.java +++ b/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; diff --git a/src/main/java/uk/gov/hmcts/ccd/domain/model/casefileview/CategoriesAndDocuments.java b/src/main/java/uk/gov/hmcts/ccd/domain/model/casefileview/CategoriesAndDocuments.java index 5b19a09748..933d6e8307 100644 --- a/src/main/java/uk/gov/hmcts/ccd/domain/model/casefileview/CategoriesAndDocuments.java +++ b/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 categories; diff --git a/src/main/java/uk/gov/hmcts/ccd/domain/model/casefileview/Category.java b/src/main/java/uk/gov/hmcts/ccd/domain/model/casefileview/Category.java index a71879e7c0..c9ae741f60 100644 --- a/src/main/java/uk/gov/hmcts/ccd/domain/model/casefileview/Category.java +++ b/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; diff --git a/src/main/java/uk/gov/hmcts/ccd/domain/model/casefileview/Document.java b/src/main/java/uk/gov/hmcts/ccd/domain/model/casefileview/Document.java index 85c470403f..0dc7fc94e9 100644 --- a/src/main/java/uk/gov/hmcts/ccd/domain/model/casefileview/Document.java +++ b/src/main/java/uk/gov/hmcts/ccd/domain/model/casefileview/Document.java @@ -1,6 +1,6 @@ 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; @@ -8,7 +8,7 @@ import java.time.LocalDateTime; @Value -@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) +@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class) @ApiModel(value = "Document definition") public class Document { String documentURL; diff --git a/src/main/java/uk/gov/hmcts/ccd/domain/model/refdata/BuildingLocation.java b/src/main/java/uk/gov/hmcts/ccd/domain/model/refdata/BuildingLocation.java index c2e39cb1d5..f2bf94882e 100644 --- a/src/main/java/uk/gov/hmcts/ccd/domain/model/refdata/BuildingLocation.java +++ b/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; diff --git a/src/main/java/uk/gov/hmcts/ccd/domain/model/refdata/CourtVenue.java b/src/main/java/uk/gov/hmcts/ccd/domain/model/refdata/CourtVenue.java index 94ae0c41f4..682df73c30 100644 --- a/src/main/java/uk/gov/hmcts/ccd/domain/model/refdata/CourtVenue.java +++ b/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; diff --git a/src/main/java/uk/gov/hmcts/ccd/domain/model/refdata/ServiceReferenceData.java b/src/main/java/uk/gov/hmcts/ccd/domain/model/refdata/ServiceReferenceData.java index 78ced0946f..6a001b5fc0 100644 --- a/src/main/java/uk/gov/hmcts/ccd/domain/model/refdata/ServiceReferenceData.java +++ b/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; diff --git a/src/main/java/uk/gov/hmcts/ccd/domain/service/search/elasticsearch/dto/ElasticSearchCaseDetailsDTO.java b/src/main/java/uk/gov/hmcts/ccd/domain/service/search/elasticsearch/dto/ElasticSearchCaseDetailsDTO.java index 60590579fd..2726deb76f 100644 --- a/src/main/java/uk/gov/hmcts/ccd/domain/service/search/elasticsearch/dto/ElasticSearchCaseDetailsDTO.java +++ b/src/main/java/uk/gov/hmcts/ccd/domain/service/search/elasticsearch/dto/ElasticSearchCaseDetailsDTO.java @@ -2,7 +2,7 @@ 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; @@ -10,7 +10,7 @@ import java.util.Map; @JsonIgnoreProperties(ignoreUnknown = true) -@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) +@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class) public class ElasticSearchCaseDetailsDTO { private String id;