Spring/spring-data-rest
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAREST-887 - Polishing.

Browse Source 
Code formatting. Author tags. Assertions in Constructor. JavaDoc.

Original pull request: #224.
This commit is contained in:
Oliver Gierke
2016-09-12 10:47:50 +02:00
parent 987dec8c17
commit c2f88f26dd
4 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/JsonPatchHandler.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2015 the original author or authors.
* Copyright 2014-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -36,6 +36,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
* into
*
* @author Oliver Gierke
* @author Mathias Düsterhöft
* @see http://tools.ietf.org/html/rfc6902
* @see http://tools.ietf.org/html/draft-ietf-appsawg-json-merge-patch-02
*/

1
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/JsonLateObjectEvaluator.java
View File

@@ -22,7 +22,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
* {@link LateObjectEvaluator} implementation that assumes values represented as JSON objects.
*
* @author Craig Walls
* @author Mathias Düsterhöft
*/
class JsonLateObjectEvaluator implements LateObjectEvaluator {

22
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/patch/JsonPatchPatchConverter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014 the original author or authors.
* Copyright 2014-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import org.springframework.util.Assert;
import com.fasterxml.jackson.core.JsonPointer;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -30,16 +32,26 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
* Convert {@link JsonNode}s containing JSON Patch to/from {@link Patch} objects.
*
* @author Craig Walls
* @author Oliver Gierke
* @author Mathias Düsterhöft
*/
public class JsonPatchPatchConverter implements PatchConverter<JsonNode> {
private final ObjectMapper mapper;
public JsonPatchPatchConverter(ObjectMapper mapper) {
this.mapper = mapper;
}
/**
* Creates a new {@link JsonPatchPatchConverter} for the given {@link ObjectMapper}.
*
* @param mapper must not be {@literal null}.
*/
public JsonPatchPatchConverter(ObjectMapper mapper) {
/**
Assert.notNull(mapper, "ObjectMapper must not be null!");
this.mapper = mapper;
}
/**
* Constructs a {@link Patch} object given a JsonNode.
*
* @param jsonNode a JsonNode containing the JSON Patch

9
spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/json/patch/JsonPatchTest.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014 the original author or authors.
* Copyright 2014-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -29,6 +29,13 @@ import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
/**
* Unit tests for {@link JsonPatchPatchConverter}.
*
* @author Craig Walls
* @author Oliver Gierke
* @author Mathias Düsterhöft
*/
public class JsonPatchTest {
@Test