Skip to content

Commit 7a12b2c

Browse files
committed
Use ccd-test-definition 7.23.0 and fix WARNING: PropertyNamingStrategy.SnakeCaseStrategy is used but it has been deprecated due to risk of deadlock. Consider using PropertyNamingStrategies.SnakeCaseStrategy instead. See FasterXML/jackson-databind#2715 for more details.
1 parent afd1854 commit 7a12b2c

File tree

9 files changed

+20
-18
lines changed

9 files changed

+20
-18
lines changed

build.gradle

+3-2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ def versions = [
3434
ext['spring-security.version'] = '5.7.11'
3535
ext['spring-framework.version'] = '5.3.27'
3636
ext['jackson.version'] = '2.16.0'
37+
ext['beftaFwVersion'] = '9.0.2'
3738

3839
configurations {
3940
compileClasspath {
@@ -337,8 +338,8 @@ dependencies {
337338
implementation 'org.jooq:jool-java-8:0.9.14'
338339
implementation 'com.github.hmcts:ccd-case-document-am-client:1.7.1'
339340

340-
testImplementation group: 'com.github.hmcts', name: 'ccd-test-definitions', version: '7.22.3'
341-
testImplementation group: 'com.github.hmcts', name: 'befta-fw', version: '9.0.2'
341+
testImplementation group: 'com.github.hmcts', name: 'ccd-test-definitions', version: '7.23.0'
342+
testImplementation group: 'com.github.hmcts', name: 'befta-fw', version: beftaFwVersion
342343

343344
contractTestImplementation "org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}"
344345
contractTestImplementation "org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}"

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package uk.gov.hmcts.ccd.data.documentdata;
22

3-
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
3+
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
44
import com.fasterxml.jackson.databind.annotation.JsonNaming;
55
import lombok.AllArgsConstructor;
66
import lombok.Data;
@@ -9,7 +9,7 @@
99
@NoArgsConstructor
1010
@AllArgsConstructor
1111
@Data
12-
@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
12+
@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
1313
public class DocumentDataRequest {
1414

1515
String attributePath;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package uk.gov.hmcts.ccd.domain.model.casefileview;
22

3-
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
3+
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
44
import com.fasterxml.jackson.databind.annotation.JsonNaming;
55
import lombok.Value;
66

77
import java.util.List;
88

99
@Value
10-
@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
10+
@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
1111
public class CategoriesAndDocuments {
1212
Integer caseVersion;
1313
List<Category> categories;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package uk.gov.hmcts.ccd.domain.model.casefileview;
22

3-
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
3+
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
44
import com.fasterxml.jackson.databind.annotation.JsonNaming;
55
import lombok.Value;
66

77
import java.util.List;
88

99
@Value
10-
@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
10+
@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
1111
public class Category {
1212
String categoryId;
1313
String categoryName;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package uk.gov.hmcts.ccd.domain.model.casefileview;
22

3-
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
3+
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
44
import com.fasterxml.jackson.databind.annotation.JsonNaming;
55
import io.swagger.annotations.ApiModel;
66
import lombok.Value;
77

88
import java.time.LocalDateTime;
99

1010
@Value
11-
@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
11+
@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
1212
@ApiModel(value = "Document definition")
1313
public class Document {
1414
String documentURL;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package uk.gov.hmcts.ccd.domain.model.refdata;
22

3-
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
3+
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
44
import com.fasterxml.jackson.databind.annotation.JsonNaming;
55
import lombok.Builder;
66
import lombok.Value;
@@ -12,7 +12,7 @@
1212
@Value
1313
@Builder
1414
@Jacksonized
15-
@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
15+
@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
1616
public class BuildingLocation implements Serializable {
1717
String buildingLocationId;
1818
String buildingLocationName;

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package uk.gov.hmcts.ccd.domain.model.refdata;
22

3-
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
3+
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
44
import com.fasterxml.jackson.databind.annotation.JsonNaming;
55
import lombok.Builder;
66
import lombok.Value;
@@ -9,10 +9,11 @@
99
import java.io.Serializable;
1010
import java.time.LocalDate;
1111

12+
1213
@Value
1314
@Builder
1415
@Jacksonized
15-
@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
16+
@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
1617
public class CourtVenue implements Serializable {
1718
String courtVenueId;
1819
String epimmsId;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package uk.gov.hmcts.ccd.domain.model.refdata;
22

3-
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
3+
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
44
import com.fasterxml.jackson.databind.annotation.JsonNaming;
55
import lombok.Builder;
66
import lombok.Value;
@@ -13,7 +13,7 @@
1313
@Value
1414
@Builder
1515
@Jacksonized
16-
@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
16+
@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
1717
public class ServiceReferenceData implements Serializable {
1818
long serviceId;
1919
String orgUnit;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
44
import com.fasterxml.jackson.databind.JsonNode;
5-
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
5+
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
66
import com.fasterxml.jackson.databind.annotation.JsonNaming;
77
import uk.gov.hmcts.ccd.data.casedetails.SecurityClassification;
88

99
import java.time.LocalDateTime;
1010
import java.util.Map;
1111

1212
@JsonIgnoreProperties(ignoreUnknown = true)
13-
@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
13+
@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
1414
public class ElasticSearchCaseDetailsDTO {
1515

1616
private String id;

0 commit comments

Comments
 (0)