Extract json patching from parser into separate module

.editorconfig

@@ -11,5 +11,5 @@ insert_final_newline = true
 indent_style = space
 indent_size = 4
 
-[*.{yml,yaml,sh,json}]
+[*.{yml,yaml,sh,json,md}]
 indent_size = 2

json-utils/pom.xml

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>de.sonallux.spotify</groupId>
+        <artifactId>spotify-web-api-parent</artifactId>
+        <version>2021.10.17</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>json-utils</artifactId>
+    <version>2021.10.17</version>
+    <packaging>jar</packaging>
+
+    <name>json-utils</name>
+    <description>Utility functions for working with JSON and YAML</description>
+    <url>https://github.com/sonallux/spotify-web-api</url>
+
+    <properties>
+        <jsonpath.version>2.6.0</jsonpath.version>
+
+        <moditect.module.name>de.sonallux.spotify.json</moditect.module.name>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.jayway.jsonpath</groupId>
+            <artifactId>json-path</artifactId>
+            <version>${jsonpath.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <version>${mockito-junit-jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

spotify-web-api-parser/src/main/java/de/sonallux/spotify/parser/patching/AddOperation.java → json-utils/src/main/java/de/sonallux/json/patching/AddOperation.java

@@ -1,4 +1,4 @@
-package de.sonallux.spotify.parser.patching;
+package de.sonallux.json.patching;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

spotify-web-api-parser/src/main/java/de/sonallux/spotify/parser/patching/DeleteOperation.java → json-utils/src/main/java/de/sonallux/json/patching/DeleteOperation.java

@@ -1,4 +1,4 @@
-package de.sonallux.spotify.parser.patching;
+package de.sonallux.json.patching;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

spotify-web-api-parser/src/main/java/de/sonallux/spotify/parser/patching/Patch.java → json-utils/src/main/java/de/sonallux/json/patching/Patch.java

@@ -1,4 +1,4 @@
-package de.sonallux.spotify.parser.patching;
+package de.sonallux.json.patching;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

spotify-web-api-parser/src/main/java/de/sonallux/spotify/parser/patching/PatchException.java → json-utils/src/main/java/de/sonallux/json/patching/PatchException.java

@@ -1,4 +1,4 @@
-package de.sonallux.spotify.parser.patching;
+package de.sonallux.json.patching;
 
 public class PatchException extends Exception {
     public PatchException(String message) {

spotify-web-api-parser/src/main/java/de/sonallux/spotify/parser/patching/PatchOperation.java → json-utils/src/main/java/de/sonallux/json/patching/PatchOperation.java

@@ -1,4 +1,4 @@
-package de.sonallux.spotify.parser.patching;
+package de.sonallux.json.patching;
 
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -22,7 +22,7 @@
     @JsonSubTypes.Type(name = "test", value = TestOperation.class)
 })
 @AllArgsConstructor(access = AccessLevel.PROTECTED)
-abstract class PatchOperation {
+public abstract class PatchOperation {
 
     protected static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 

spotify-web-api-parser/src/main/java/de/sonallux/spotify/parser/patching/PutOperation.java → json-utils/src/main/java/de/sonallux/json/patching/PutOperation.java

@@ -1,4 +1,4 @@
-package de.sonallux.spotify.parser.patching;
+package de.sonallux.json.patching;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

spotify-web-api-parser/src/main/java/de/sonallux/spotify/parser/patching/RenameOperation.java → json-utils/src/main/java/de/sonallux/json/patching/RenameOperation.java

@@ -1,4 +1,4 @@
-package de.sonallux.spotify.parser.patching;
+package de.sonallux.json.patching;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

spotify-web-api-parser/src/main/java/de/sonallux/spotify/parser/patching/SetOperation.java → json-utils/src/main/java/de/sonallux/json/patching/SetOperation.java

@@ -1,4 +1,4 @@
-package de.sonallux.spotify.parser.patching;
+package de.sonallux.json.patching;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

spotify-web-api-parser/src/main/java/de/sonallux/spotify/parser/patching/TestOperation.java → json-utils/src/main/java/de/sonallux/json/patching/TestOperation.java

@@ -1,4 +1,4 @@
-package de.sonallux.spotify.parser.patching;
+package de.sonallux.json.patching;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

json-utils/src/moditect/module-info.java

@@ -0,0 +1,8 @@
+module de.sonallux.json {
+    requires com.fasterxml.jackson.core;
+    requires com.fasterxml.jackson.databind;
+    requires com.jayway.jsonpath;
+    requires static lombok;
+
+    exports de.sonallux.json;
+}

spotify-web-api-parser/src/test/java/de/sonallux/spotify/parser/patching/AddOperationTest.java → json-utils/src/test/java/de/sonallux/json/patching/AddOperationTest.java

@@ -1,4 +1,4 @@
-package de.sonallux.spotify.parser.patching;
+package de.sonallux.json.patching;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import org.junit.jupiter.api.BeforeAll;
@@ -38,7 +38,7 @@ static Stream<Arguments> testOperationThrowsError() {
 
     @ParameterizedTest
     @MethodSource
-    void testOperationThrowsError(OperationTestData.FailureTestCase<AddOperation> testCase) throws Exception {
+    void testOperationThrowsError(OperationTestData.FailureTestCase<AddOperation> testCase) {
         assertPatchThrowsError(testCase);
     }
 

spotify-web-api-parser/src/test/java/de/sonallux/spotify/parser/patching/DeleteOperationTest.java → json-utils/src/test/java/de/sonallux/json/patching/DeleteOperationTest.java

@@ -1,4 +1,4 @@
-package de.sonallux.spotify.parser.patching;
+package de.sonallux.json.patching;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import org.junit.jupiter.api.BeforeAll;

spotify-web-api-parser/src/test/java/de/sonallux/spotify/parser/patching/OperationTestData.java → json-utils/src/test/java/de/sonallux/json/patching/OperationTestData.java

@@ -1,4 +1,4 @@
-package de.sonallux.spotify.parser.patching;
+package de.sonallux.json.patching;
 
 import com.fasterxml.jackson.databind.JsonNode;
 

spotify-web-api-parser/src/test/java/de/sonallux/spotify/parser/patching/PatchOperationTest.java → json-utils/src/test/java/de/sonallux/json/patching/PatchOperationTest.java

@@ -1,4 +1,4 @@
-package de.sonallux.spotify.parser.patching;
+package de.sonallux.json.patching;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;

spotify-web-api-parser/src/test/java/de/sonallux/spotify/parser/patching/PatchTest.java → json-utils/src/test/java/de/sonallux/json/patching/PatchTest.java

@@ -1,4 +1,4 @@
-package de.sonallux.spotify.parser.patching;
+package de.sonallux.json.patching;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;

spotify-web-api-parser/src/test/java/de/sonallux/spotify/parser/patching/PutOperationTest.java → json-utils/src/test/java/de/sonallux/json/patching/PutOperationTest.java

@@ -1,4 +1,4 @@
-package de.sonallux.spotify.parser.patching;
+package de.sonallux.json.patching;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import org.junit.jupiter.api.BeforeAll;
@@ -38,7 +38,7 @@ static Stream<Arguments> testOperationThrowsError() {
 
     @ParameterizedTest
     @MethodSource
-    void testOperationThrowsError(OperationTestData.FailureTestCase<PutOperation> testCase) throws Exception {
+    void testOperationThrowsError(OperationTestData.FailureTestCase<PutOperation> testCase) {
         assertPatchThrowsError(testCase);
     }
 

spotify-web-api-parser/src/test/java/de/sonallux/spotify/parser/patching/RenameOperationTest.java → json-utils/src/test/java/de/sonallux/json/patching/RenameOperationTest.java

@@ -1,4 +1,4 @@
-package de.sonallux.spotify.parser.patching;
+package de.sonallux.json.patching;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import org.junit.jupiter.api.BeforeAll;
@@ -37,7 +37,7 @@ static Stream<Arguments> testOperationThrowsError() {
 
     @ParameterizedTest
     @MethodSource
-    void testOperationThrowsError(OperationTestData.FailureTestCase<RenameOperation> testCase) throws Exception {
+    void testOperationThrowsError(OperationTestData.FailureTestCase<RenameOperation> testCase) {
         assertPatchThrowsError(testCase);
     }
 

spotify-web-api-parser/src/test/java/de/sonallux/spotify/parser/patching/SetOperationTest.java → json-utils/src/test/java/de/sonallux/json/patching/SetOperationTest.java

@@ -1,4 +1,4 @@
-package de.sonallux.spotify.parser.patching;
+package de.sonallux.json.patching;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import org.junit.jupiter.api.BeforeAll;
@@ -38,7 +38,7 @@ static Stream<Arguments> testOperationThrowsError() {
 
     @ParameterizedTest
     @MethodSource
-    void testOperationThrowsError(OperationTestData.FailureTestCase<SetOperation> testCase) throws Exception {
+    void testOperationThrowsError(OperationTestData.FailureTestCase<SetOperation> testCase) {
         assertPatchThrowsError(testCase);
     }
 

spotify-web-api-parser/src/test/java/de/sonallux/spotify/parser/patching/TestOperationTest.java → json-utils/src/test/java/de/sonallux/json/patching/TestOperationTest.java

@@ -1,4 +1,4 @@
-package de.sonallux.spotify.parser.patching;
+package de.sonallux.json.patching;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import org.junit.jupiter.api.BeforeAll;
@@ -38,7 +38,7 @@ static Stream<Arguments> testOperationThrowsError() {
 
     @ParameterizedTest
     @MethodSource
-    void testOperationThrowsError(OperationTestData.FailureTestCase<TestOperation> testCase) throws Exception {
+    void testOperationThrowsError(OperationTestData.FailureTestCase<TestOperation> testCase) {
         assertPatchThrowsError(testCase);
     }
 

pom.xml

@@ -17,6 +17,7 @@
         <module>spotify-web-api-core</module>
         <module>spotify-web-api-generator-open-api</module>
         <module>spotify-web-api-parser</module>
+        <module>json-utils</module>
     </modules>
 
     <licenses>

spotify-web-api-parser/pom.xml

@@ -21,7 +21,6 @@
 
     <properties>
         <jsoup.version>1.14.3</jsoup.version>
-        <jsonpath.version>2.6.0</jsonpath.version>
 
         <moditect.module.name>de.sonallux.spotify.parser</moditect.module.name>
     </properties>
@@ -32,6 +31,11 @@
             <artifactId>spotify-web-api-core</artifactId>
             <version>2021.10.17</version>
         </dependency>
+        <dependency>
+            <groupId>de.sonallux.spotify</groupId>
+            <artifactId>json-utils</artifactId>
+            <version>2021.10.17</version>
+        </dependency>
         <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
@@ -41,15 +45,6 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-yaml</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.jayway.jsonpath</groupId>
-            <artifactId>json-path</artifactId>
-            <version>${jsonpath.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

spotify-web-api-parser/src/main/java/de/sonallux/spotify/parser/ApiPatches.java

@@ -5,8 +5,8 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import de.sonallux.spotify.core.Yaml;
 import de.sonallux.spotify.core.model.SpotifyWebApi;
-import de.sonallux.spotify.parser.patching.Patch;
-import de.sonallux.spotify.parser.patching.PatchException;
+import de.sonallux.json.patching.Patch;
+import de.sonallux.json.patching.PatchException;
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.IOException;

spotify-web-api-parser/src/moditect/module-info.java

@@ -8,6 +8,7 @@
     requires org.slf4j;
     requires org.jsoup;
     requires de.sonallux.spotify.core;
+    requires de.sonallux.json;
     requires static lombok;
 
     exports de.sonallux.spotify.parser;