From b6a00e3aa2462e6c8b643954d78cc849f3a449f8 Mon Sep 17 00:00:00 2001 From: Gavin Fenton Date: Thu, 23 Jul 2020 16:40:34 +0100 Subject: [PATCH 1/2] Added getters for JsonPatch and Operations --- .../java/com/github/fge/jsonpatch/DualPathOperation.java | 4 ++++ src/main/java/com/github/fge/jsonpatch/JsonPatch.java | 4 ++++ .../java/com/github/fge/jsonpatch/JsonPatchOperation.java | 8 ++++++++ .../java/com/github/fge/jsonpatch/PathValueOperation.java | 4 ++++ 4 files changed, 20 insertions(+) diff --git a/src/main/java/com/github/fge/jsonpatch/DualPathOperation.java b/src/main/java/com/github/fge/jsonpatch/DualPathOperation.java index 60eb34b9..82d901a4 100644 --- a/src/main/java/com/github/fge/jsonpatch/DualPathOperation.java +++ b/src/main/java/com/github/fge/jsonpatch/DualPathOperation.java @@ -72,6 +72,10 @@ public final void serializeWithType(final JsonGenerator jgen, serialize(jgen, provider); } + public JsonPointer getFrom() { + return from; + } + @Override public final String toString() { diff --git a/src/main/java/com/github/fge/jsonpatch/JsonPatch.java b/src/main/java/com/github/fge/jsonpatch/JsonPatch.java index e3f5a6fc..2b68790a 100644 --- a/src/main/java/com/github/fge/jsonpatch/JsonPatch.java +++ b/src/main/java/com/github/fge/jsonpatch/JsonPatch.java @@ -151,6 +151,10 @@ public JsonNode apply(final JsonNode node) return ret; } + public List getOperations() { + return operations; + } + @Override public String toString() { diff --git a/src/main/java/com/github/fge/jsonpatch/JsonPatchOperation.java b/src/main/java/com/github/fge/jsonpatch/JsonPatchOperation.java index a5ad5bd9..d2c8f544 100644 --- a/src/main/java/com/github/fge/jsonpatch/JsonPatchOperation.java +++ b/src/main/java/com/github/fge/jsonpatch/JsonPatchOperation.java @@ -94,6 +94,14 @@ protected JsonPatchOperation(final String op, final JsonPointer path) public abstract JsonNode apply(final JsonNode node) throws JsonPatchException; + public String getOp() { + return op; + } + + public JsonPointer getPath() { + return path; + } + @Override public abstract String toString(); } diff --git a/src/main/java/com/github/fge/jsonpatch/PathValueOperation.java b/src/main/java/com/github/fge/jsonpatch/PathValueOperation.java index f9e1c86f..2147e3cb 100644 --- a/src/main/java/com/github/fge/jsonpatch/PathValueOperation.java +++ b/src/main/java/com/github/fge/jsonpatch/PathValueOperation.java @@ -73,6 +73,10 @@ public final void serializeWithType(final JsonGenerator jgen, serialize(jgen, provider); } + public JsonNode getValue() { + return value; + } + @Override public final String toString() { From 882395b3befda083693d138352c72220cda2ef40 Mon Sep 17 00:00:00 2001 From: Gavin Fenton Date: Wed, 5 Aug 2020 02:50:17 +0100 Subject: [PATCH 2/2] Made getters final; added deepCopy() to PathValueOperation.getValue() --- src/main/java/com/github/fge/jsonpatch/DualPathOperation.java | 2 +- src/main/java/com/github/fge/jsonpatch/JsonPatch.java | 2 +- .../java/com/github/fge/jsonpatch/JsonPatchOperation.java | 4 ++-- .../java/com/github/fge/jsonpatch/PathValueOperation.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/github/fge/jsonpatch/DualPathOperation.java b/src/main/java/com/github/fge/jsonpatch/DualPathOperation.java index 82d901a4..91455bb4 100644 --- a/src/main/java/com/github/fge/jsonpatch/DualPathOperation.java +++ b/src/main/java/com/github/fge/jsonpatch/DualPathOperation.java @@ -72,7 +72,7 @@ public final void serializeWithType(final JsonGenerator jgen, serialize(jgen, provider); } - public JsonPointer getFrom() { + public final JsonPointer getFrom() { return from; } diff --git a/src/main/java/com/github/fge/jsonpatch/JsonPatch.java b/src/main/java/com/github/fge/jsonpatch/JsonPatch.java index 2b68790a..b41ed6bb 100644 --- a/src/main/java/com/github/fge/jsonpatch/JsonPatch.java +++ b/src/main/java/com/github/fge/jsonpatch/JsonPatch.java @@ -151,7 +151,7 @@ public JsonNode apply(final JsonNode node) return ret; } - public List getOperations() { + public final List getOperations() { return operations; } diff --git a/src/main/java/com/github/fge/jsonpatch/JsonPatchOperation.java b/src/main/java/com/github/fge/jsonpatch/JsonPatchOperation.java index d2c8f544..06a6a62d 100644 --- a/src/main/java/com/github/fge/jsonpatch/JsonPatchOperation.java +++ b/src/main/java/com/github/fge/jsonpatch/JsonPatchOperation.java @@ -94,11 +94,11 @@ protected JsonPatchOperation(final String op, final JsonPointer path) public abstract JsonNode apply(final JsonNode node) throws JsonPatchException; - public String getOp() { + public final String getOp() { return op; } - public JsonPointer getPath() { + public final JsonPointer getPath() { return path; } diff --git a/src/main/java/com/github/fge/jsonpatch/PathValueOperation.java b/src/main/java/com/github/fge/jsonpatch/PathValueOperation.java index 2147e3cb..523ea662 100644 --- a/src/main/java/com/github/fge/jsonpatch/PathValueOperation.java +++ b/src/main/java/com/github/fge/jsonpatch/PathValueOperation.java @@ -73,8 +73,8 @@ public final void serializeWithType(final JsonGenerator jgen, serialize(jgen, provider); } - public JsonNode getValue() { - return value; + public final JsonNode getValue() { + return value.deepCopy(); } @Override