Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: flipkart-incubator/zjsonpatch
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.4.14
Choose a base ref
...
head repository: flipkart-incubator/zjsonpatch
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0.4.16
Choose a head ref
  • 13 commits
  • 6 files changed
  • 6 contributors

Commits on Jan 11, 2023

  1. Update pom.xml

    vishwakarma authored Jan 11, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    f80882c View commit details

Commits on Feb 6, 2023

  1. Copy the full SHA
    93a6b40 View commit details
  2. Merge pull request #168 from elisaherold/master

    Add get methods for fields in `JsonPatchApplicationException`
    holograph authored Feb 6, 2023
    Copy the full SHA
    0c9d7d4 View commit details
  3. Upgrade to CodeQL v2 (#169)

    * Upgrade to CodeQL v2
    
    * Upgrade to latest (Node 16) action
    holograph authored Feb 6, 2023
    Copy the full SHA
    49ab75c View commit details

Commits on Feb 7, 2023

  1. Copy the full SHA
    cc0f0bf View commit details

Commits on Dec 10, 2023

  1. releasing 0.4.15

    vishwakarma committed Dec 10, 2023
    Copy the full SHA
    bd4ad76 View commit details
  2. updating readme.md with 0.4.15

    vishwakarma committed Dec 10, 2023
    Copy the full SHA
    2df8d86 View commit details
  3. Bump junit.version from 5.9.1 to 5.9.2 (#165)

    Bumps `junit.version` from 5.9.1 to 5.9.2.
    
    Updates `junit-jupiter-engine` from 5.9.1 to 5.9.2
    - [Release notes](https://github.com/junit-team/junit5/releases)
    - [Commits](junit-team/junit5@r5.9.1...r5.9.2)
    
    Updates `junit-jupiter-params` from 5.9.1 to 5.9.2
    - [Release notes](https://github.com/junit-team/junit5/releases)
    - [Commits](junit-team/junit5@r5.9.1...r5.9.2)
    
    Updates `junit-vintage-engine` from 5.9.1 to 5.9.2
    - [Release notes](https://github.com/junit-team/junit5/releases)
    - [Commits](junit-team/junit5@r5.9.1...r5.9.2)
    
    ---
    updated-dependencies:
    - dependency-name: org.junit.jupiter:junit-jupiter-engine
      dependency-type: direct:development
      update-type: version-update:semver-patch
    - dependency-name: org.junit.jupiter:junit-jupiter-params
      dependency-type: direct:development
      update-type: version-update:semver-patch
    - dependency-name: org.junit.vintage:junit-vintage-engine
      dependency-type: direct:development
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Dec 10, 2023
    Copy the full SHA
    3d125e7 View commit details
  4. Bump maven-javadoc-plugin from 3.4.1 to 3.5.0 (#171)

    Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.4.1 to 3.5.0.
    - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases)
    - [Commits](apache/maven-javadoc-plugin@maven-javadoc-plugin-3.4.1...maven-javadoc-plugin-3.5.0)
    
    ---
    updated-dependencies:
    - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Dec 10, 2023
    Copy the full SHA
    65d4a68 View commit details
  5. Bump maven-compiler-plugin from 3.10.1 to 3.11.0 (#172)

    Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.10.1 to 3.11.0.
    - [Release notes](https://github.com/apache/maven-compiler-plugin/releases)
    - [Commits](apache/maven-compiler-plugin@maven-compiler-plugin-3.10.1...maven-compiler-plugin-3.11.0)
    
    ---
    updated-dependencies:
    - dependency-name: org.apache.maven.plugins:maven-compiler-plugin
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Dec 10, 2023
    Copy the full SHA
    1e43697 View commit details
  6. Bump maven-surefire-plugin from 2.22.2 to 3.0.0 (#174)

    Bumps [maven-surefire-plugin](https://github.com/apache/maven-surefire) from 2.22.2 to 3.0.0.
    - [Release notes](https://github.com/apache/maven-surefire/releases)
    - [Commits](apache/maven-surefire@surefire-2.22.2...surefire-3.0.0)
    
    ---
    updated-dependencies:
    - dependency-name: org.apache.maven.plugins:maven-surefire-plugin
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Dec 10, 2023
    Copy the full SHA
    3e4a920 View commit details
  7. commenting out maven-surefire-plugin configuration

    vishwakarma committed Dec 10, 2023
    Copy the full SHA
    08a8052 View commit details
  8. releasing 0.4.16

    vishwakarma committed Dec 10, 2023
    Copy the full SHA
    d3ea5b2 View commit details
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -38,11 +38,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v2
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ all classes | 100% (6/ 6) | 93.6% (44/ 47) | 96.2% (332/ 345) |

### How to use:

### Current Version : 0.4.14
### Current Version : 0.4.16

Add following to `<dependencies/>` section of your pom.xml -

20 changes: 10 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

<groupId>com.flipkart.zjsonpatch</groupId>
<artifactId>zjsonpatch</artifactId>
<version>0.4.14</version>
<version>0.4.16</version>
<packaging>jar</packaging>

<name>zjsonpatch</name>
@@ -41,15 +41,15 @@
<testCompileSource>1.8</testCompileSource>

<jackson.version>2.14.0</jackson.version>
<junit.version>5.9.1</junit.version>
<junit.version>5.9.2</junit.version>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<version>3.11.0</version>
<configuration>
<source>${compileSource}</source>
<target>${compileSource}</target>
@@ -62,12 +62,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
<configuration>
<forkCount>3</forkCount>
<reuseForks>true</reuseForks>
<argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
</configuration>
<version>3.0.0</version>
<!-- <configuration>-->
<!-- <forkCount>3</forkCount>-->
<!-- <reuseForks>true</reuseForks>-->
<!-- <argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>-->
<!-- </configuration>-->
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -85,7 +85,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.4.1</version>
<version>3.5.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
Original file line number Diff line number Diff line change
@@ -21,15 +21,23 @@
* Date: 03/08/16
*/
public class JsonPatchApplicationException extends RuntimeException {
Operation operation;
JsonPointer path;
final Operation operation;
final JsonPointer path;

public JsonPatchApplicationException(String message, Operation operation, JsonPointer path) {
super(message);
this.operation = operation;
this.path = path;
}

public Operation getOperation() {
return operation;
}

public JsonPointer getPath() {
return path;
}

@Override
public String toString() {
StringBuilder sb = new StringBuilder();
@@ -38,4 +46,5 @@ public String toString() {
if (path != null) sb.append(" at ").append(path.isRoot() ? "root" : path);
return sb.toString();
}

}
2 changes: 1 addition & 1 deletion src/main/java/com/flipkart/zjsonpatch/JsonPointer.java
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@
*
* @since 0.4.8
*/
class JsonPointer {
public class JsonPointer {
private final RefToken[] tokens;

/** A JSON pointer representing the root node of a JSON document */
2 changes: 1 addition & 1 deletion src/main/java/com/flipkart/zjsonpatch/Operation.java
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@
* User: gopi.vishwakarma
* Date: 30/07/14
*/
enum Operation {
public enum Operation {
ADD("add"),
REMOVE("remove"),
REPLACE("replace"),