-
Notifications
You must be signed in to change notification settings - Fork 121
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.
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
Expose JSON Patch operations as public API #1089
Open
ikhoon
wants to merge
7
commits into
line:main
Choose a base branch
from
ikhoon:json-patch-api
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
fa878be
Expose JSON Patch operations as public API
ikhoon 820316f
polish
ikhoon c709af4
fix tests
ikhoon 7c28e78
lint
ikhoon f50f492
copyright
ikhoon 1d2c74e
add shortcut factory methods
ikhoon 5630ad2
Address comments
ikhoon File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 40 additions & 0 deletions
40
common/src/main/java/com/linecorp/centraldogma/common/TextPatchConflictException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
/* | ||
* Copyright 2025 LINE Corporation | ||
* | ||
* LINE Corporation licenses this file to you under the Apache License, | ||
* version 2.0 (the "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at: | ||
* | ||
* https://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
* License for the specific language governing permissions and limitations | ||
* under the License. | ||
* | ||
*/ | ||
|
||
package com.linecorp.centraldogma.common; | ||
|
||
/** | ||
* A {@link CentralDogmaException} that is raised when attempted to apply a text patch which cannot be applied | ||
* without a conflict. | ||
*/ | ||
public final class TextPatchConflictException extends ChangeConflictException { | ||
private static final long serialVersionUID = -6150468151945332532L; | ||
|
||
/** | ||
* Creates a new instance. | ||
*/ | ||
public TextPatchConflictException(String message) { | ||
super(message); | ||
} | ||
|
||
/** | ||
* Creates a new instance with the specified {@code cause}. | ||
*/ | ||
public TextPatchConflictException(String message, Throwable cause) { | ||
super(message, cause); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -32,9 +32,12 @@ | |||||
* - ASL 2.0: https://www.apache.org/licenses/LICENSE-2.0.txt | ||||||
*/ | ||||||
|
||||||
package com.linecorp.centraldogma.internal.jsonpatch; | ||||||
package com.linecorp.centraldogma.common.jsonpatch; | ||||||
|
||||||
import static java.util.Objects.requireNonNull; | ||||||
|
||||||
import java.io.IOException; | ||||||
import java.util.Objects; | ||||||
|
||||||
import com.fasterxml.jackson.core.JsonGenerator; | ||||||
import com.fasterxml.jackson.core.JsonPointer; | ||||||
|
@@ -49,7 +52,7 @@ | |||||
abstract class DualPathOperation extends JsonPatchOperation { | ||||||
|
||||||
@JsonSerialize(using = ToStringSerializer.class) | ||||||
final JsonPointer from; | ||||||
private final JsonPointer from; | ||||||
|
||||||
/** | ||||||
* Creates a new instance. | ||||||
|
@@ -60,15 +63,23 @@ abstract class DualPathOperation extends JsonPatchOperation { | |||||
*/ | ||||||
DualPathOperation(final String op, final JsonPointer from, final JsonPointer path) { | ||||||
super(op, path); | ||||||
this.from = from; | ||||||
this.from = requireNonNull(from, "from"); | ||||||
} | ||||||
|
||||||
/** | ||||||
* Returns the source path. | ||||||
*/ | ||||||
public JsonPointer from() { | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
because DualPathOperation is package-private There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I intentionally made it public so users can read the value from subclasses. |
||||||
return from; | ||||||
} | ||||||
|
||||||
@Override | ||||||
public final void serialize(final JsonGenerator jgen, | ||||||
final SerializerProvider provider) throws IOException { | ||||||
requireNonNull(jgen, "jgen"); | ||||||
jgen.writeStartObject(); | ||||||
jgen.writeStringField("op", op); | ||||||
jgen.writeStringField("path", path.toString()); | ||||||
jgen.writeStringField("op", op()); | ||||||
jgen.writeStringField("path", path().toString()); | ||||||
jgen.writeStringField("from", from.toString()); | ||||||
jgen.writeEndObject(); | ||||||
} | ||||||
|
@@ -80,8 +91,25 @@ public final void serializeWithType(final JsonGenerator jgen, | |||||
serialize(jgen, provider); | ||||||
} | ||||||
|
||||||
@Override | ||||||
public boolean equals(Object o) { | ||||||
if (!(o instanceof DualPathOperation)) { | ||||||
return false; | ||||||
} | ||||||
if (!super.equals(o)) { | ||||||
return false; | ||||||
} | ||||||
final DualPathOperation that = (DualPathOperation) o; | ||||||
return from.equals(that.from); | ||||||
} | ||||||
|
||||||
@Override | ||||||
public int hashCode() { | ||||||
return Objects.hash(super.hashCode(), from); | ||||||
} | ||||||
|
||||||
@Override | ||||||
public final String toString() { | ||||||
return "op: " + op + "; from: \"" + from + "\"; path: \"" + path + '"'; | ||||||
return "op: " + op() + "; from: \"" + from + "\"; path: \"" + path() + '"'; | ||||||
} | ||||||
} |
42 changes: 42 additions & 0 deletions
42
.../src/main/java/com/linecorp/centraldogma/common/jsonpatch/JsonPatchConflictException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
/* | ||
* Copyright 2025 LINE Corporation | ||
* | ||
* LINE Corporation licenses this file to you under the Apache License, | ||
* version 2.0 (the "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at: | ||
* | ||
* https://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
* License for the specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
|
||
package com.linecorp.centraldogma.common.jsonpatch; | ||
|
||
import com.linecorp.centraldogma.common.CentralDogmaException; | ||
import com.linecorp.centraldogma.common.ChangeConflictException; | ||
|
||
/** | ||
* A {@link CentralDogmaException} raised when a JSON Patch operation fails. | ||
*/ | ||
public final class JsonPatchConflictException extends ChangeConflictException { | ||
|
||
private static final long serialVersionUID = 4746173383862473527L; | ||
|
||
/** | ||
* Creates a new instance. | ||
*/ | ||
public JsonPatchConflictException(String message) { | ||
super(message); | ||
} | ||
|
||
/** | ||
* Creates a new instance with the specified {@code cause}. | ||
*/ | ||
public JsonPatchConflictException(String message, Throwable cause) { | ||
super(message, cause); | ||
} | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The getters will be useful when logging.