From 68d0a1aa6ab8b4c72d00bd3492588458a21cbb5e Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Tue, 1 Nov 2016 13:41:00 +0100 Subject: [PATCH] DATAREST-931 - Polishing. Switched to non-deprecated property naming strategy in test case. --- .../data/rest/webmvc/config/JsonPatchHandler.java | 2 +- .../data/rest/webmvc/json/DomainObjectReaderUnitTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/JsonPatchHandler.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/JsonPatchHandler.java index bd4d08ffe..f87ff8536 100644 --- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/JsonPatchHandler.java +++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/JsonPatchHandler.java @@ -85,8 +85,8 @@ class JsonPatchHandler { } } + @SuppressWarnings("unchecked") T applyPatch(InputStream source, T target) throws Exception { - return getPatchOperations(source).apply(target, (Class) target.getClass()); } diff --git a/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/json/DomainObjectReaderUnitTests.java b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/json/DomainObjectReaderUnitTests.java index 76297b471..9adbd23c4 100644 --- a/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/json/DomainObjectReaderUnitTests.java +++ b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/json/DomainObjectReaderUnitTests.java @@ -104,7 +104,7 @@ public class DomainObjectReaderUnitTests { public void considersMappedFieldNamesWhenApplyingNodeToDomainObject() throws Exception { ObjectMapper mapper = new ObjectMapper(); - mapper.setPropertyNamingStrategy(PropertyNamingStrategy.PASCAL_CASE_TO_CAMEL_CASE); + mapper.setPropertyNamingStrategy(PropertyNamingStrategy.UPPER_CAMEL_CASE); JsonNode node = new ObjectMapper().readTree("{\"FirstName\":\"Carter\",\"LastName\":\"Beauford\"}");