Skip to content

Ensure JsonNodes are ContainerNodes in AddOperation #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 4, 2014
Merged

Ensure JsonNodes are ContainerNodes in AddOperation #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/main/java/com/github/fge/jsonpatch/AddOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,13 @@ public JsonNode apply(final JsonNode node)
if (parentNode.isMissingNode())
throw new JsonPatchException(BUNDLE.getMessage(
"jsonPatch.noSuchParent"));
return parentNode.isArray()
? addToArray(path, node)
: addToObject(path, node);
if (parentNode.isArray())
return addToArray(path, node);
else if (parentNode.isObject())
return addToObject(path, node);
else
throw new JsonPatchException(BUNDLE.getMessage(
"jsonPatch.noSuchPath"));
}

private JsonNode addToArray(final JsonPointer path, final JsonNode node)
Expand Down
19 changes: 19 additions & 0 deletions src/test/java/com/github/fge/jsonpatch/AddOperationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@

package com.github.fge.jsonpatch;

import com.fasterxml.jackson.databind.node.ObjectNode;
import com.fasterxml.jackson.databind.node.TextNode;
import com.github.fge.jackson.JacksonUtils;
import com.github.fge.jackson.jsonpointer.JsonPointer;
import com.github.fge.jackson.jsonpointer.JsonPointerException;
import org.testng.annotations.Test;

import java.io.IOException;

public final class AddOperationTest
Expand All @@ -28,4 +35,16 @@ public AddOperationTest()
{
super("add");
}

@Test(expectedExceptions = JsonPatchException.class, expectedExceptionsMessageRegExp = "no such path in target JSON document")
public void addingToANonContainerNodeThrowsException()
throws JsonPatchException, JsonPointerException
{
final ObjectNode node = JacksonUtils.nodeFactory().objectNode();
final TextNode textNode = JacksonUtils.nodeFactory().textNode("bar");
node.put("foo", textNode);
final JsonPointer p = new JsonPointer("/foo/f");
final JsonPatchOperation op = new AddOperation(p, JacksonUtils.nodeFactory().nullNode());
op.apply(node);
}
}