You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@johnzon.apache.org by st...@apache.org on 2016/11/23 13:58:10 UTC
johnzon git commit: JOHNZON-95 fix PatchBuilder API and invocation
Repository: johnzon
Updated Branches:
refs/heads/JSONP-1.1 f34deb609 -> d04e01ef1
JOHNZON-95 fix PatchBuilder API and invocation
Project: http://git-wip-us.apache.org/repos/asf/johnzon/repo
Commit: http://git-wip-us.apache.org/repos/asf/johnzon/commit/d04e01ef
Tree: http://git-wip-us.apache.org/repos/asf/johnzon/tree/d04e01ef
Diff: http://git-wip-us.apache.org/repos/asf/johnzon/diff/d04e01ef
Branch: refs/heads/JSONP-1.1
Commit: d04e01ef103e4198a9fce159151ece1e93cd80c0
Parents: f34deb6
Author: Mark Struberg <st...@apache.org>
Authored: Wed Nov 23 14:57:43 2016 +0100
Committer: Mark Struberg <st...@apache.org>
Committed: Wed Nov 23 14:57:43 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/johnzon/core/JsonPatchBuilderImpl.java | 9 ++++++++-
.../main/java/org/apache/johnzon/core/JsonProviderImpl.java | 4 ++--
2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/johnzon/blob/d04e01ef/johnzon-core/src/main/java/org/apache/johnzon/core/JsonPatchBuilderImpl.java
----------------------------------------------------------------------
diff --git a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonPatchBuilderImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonPatchBuilderImpl.java
index f2e6a0d..a6e7c8a 100644
--- a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonPatchBuilderImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonPatchBuilderImpl.java
@@ -18,6 +18,7 @@ package org.apache.johnzon.core;
import javax.json.JsonArray;
import javax.json.JsonObject;
+import javax.json.JsonPatch;
import javax.json.JsonPatchBuilder;
import javax.json.JsonStructure;
import javax.json.JsonValue;
@@ -27,6 +28,12 @@ public class JsonPatchBuilderImpl implements JsonPatchBuilder {
super();
}
+ public JsonPatchBuilderImpl(JsonArray initialData) {
+ super();
+ }
+
+
+
@Override
public JsonStructure apply(JsonStructure target) {
throw new UnsupportedOperationException("JSON-P 1.1");
@@ -118,7 +125,7 @@ public class JsonPatchBuilderImpl implements JsonPatchBuilder {
}
@Override
- public JsonArray build() {
+ public JsonPatch build() {
throw new UnsupportedOperationException("JSON-P 1.1");
}
}
http://git-wip-us.apache.org/repos/asf/johnzon/blob/d04e01ef/johnzon-core/src/main/java/org/apache/johnzon/core/JsonProviderImpl.java
----------------------------------------------------------------------
diff --git a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonProviderImpl.java b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonProviderImpl.java
index e9926f9..4b011a7 100644
--- a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonProviderImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonProviderImpl.java
@@ -246,12 +246,12 @@ public class JsonProviderImpl extends JsonProvider implements Serializable {
@Override
public JsonPatchBuilder createPatchBuilder() {
- throw new UnsupportedOperationException("TODO JSON-P 1.1");
+ return new JsonPatchBuilderImpl();
}
@Override
public JsonPatchBuilder createPatchBuilder(JsonArray initialData) {
- throw new UnsupportedOperationException("TODO JSON-P 1.1");
+ return new JsonPatchBuilderImpl(initialData);
}
@Override