Merge pull request #38 from orangain/java-modules

Introduce Java modules

Author: orangain

.idea/compiler.xml

@@ -27,14 +27,14 @@ dependencies {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(8))
+        languageVersion.set(JavaLanguageVersion.of(11))
     }
     withSourcesJar()
     withJavadocJar()
 }
 tasks.withType<KotlinCompile> {
     compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_1_8)
+        jvmTarget.set(JvmTarget.JVM_11)
     }
 }
 

.idea/misc.xml

@@ -3,6 +3,9 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import io.github.orangain.jsonmatch.json.JsonPath;
+import io.github.orangain.jsonmatch.json.JsonUtil;
+import io.github.orangain.jsonmatch.parser.JsonMatchPatternParser;
 import io.github.orangain.jsonmatch.pattern.JsonPatternNode;
 
 import java.util.Optional;

build.gradle.kts

@@ -1,4 +1,4 @@
-package io.github.orangain.jsonmatch;
+package io.github.orangain.jsonmatch.json;
 
 import org.jetbrains.annotations.NotNull;
 

src/main/java/io/github/orangain/jsonmatch/JsonMatch.java

@@ -1,4 +1,4 @@
-package io.github.orangain.jsonmatch;
+package io.github.orangain.jsonmatch.json;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -13,7 +13,7 @@ public class JsonUtil {
      * Get the singleton instance of the Jackson {@link ObjectMapper}.
      * @return The singleton instance of the Jackson {@link ObjectMapper}.
      */
-    static ObjectMapper getObjectMapper() {
+    public static ObjectMapper getObjectMapper() {
         if (objectMapper == null) {
             objectMapper = new ObjectMapper();
         }

src/main/java/io/github/orangain/jsonmatch/JsonPath.java src/main/java/io/github/orangain/jsonmatch/json/JsonPath.java

@@ -1,6 +1,7 @@
-package io.github.orangain.jsonmatch;
+package io.github.orangain.jsonmatch.parser;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import io.github.orangain.jsonmatch.json.JsonUtil;
 import io.github.orangain.jsonmatch.pattern.*;
 import io.github.orangain.jsonmatch.pattern.valuemarker.*;
 import org.jetbrains.annotations.NotNull;

src/main/java/io/github/orangain/jsonmatch/JsonUtil.java src/main/java/io/github/orangain/jsonmatch/json/JsonUtil.java

@@ -1,8 +1,7 @@
 package io.github.orangain.jsonmatch.pattern;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import io.github.orangain.jsonmatch.JsonMatchErrorDetail;
-import io.github.orangain.jsonmatch.JsonPath;
+import io.github.orangain.jsonmatch.json.JsonPath;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;

src/main/java/io/github/orangain/jsonmatch/JsonMatchPatternParser.java src/main/java/io/github/orangain/jsonmatch/parser/JsonMatchPatternParser.java

@@ -1,8 +1,7 @@
 package io.github.orangain.jsonmatch.pattern;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import io.github.orangain.jsonmatch.JsonMatchErrorDetail;
-import io.github.orangain.jsonmatch.JsonPath;
+import io.github.orangain.jsonmatch.json.JsonPath;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

src/main/java/io/github/orangain/jsonmatch/pattern/ArrayLiteralPatternNode.java

@@ -1,8 +1,7 @@
 package io.github.orangain.jsonmatch.pattern;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import io.github.orangain.jsonmatch.JsonMatchErrorDetail;
-import io.github.orangain.jsonmatch.JsonPath;
+import io.github.orangain.jsonmatch.json.JsonPath;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;

src/main/java/io/github/orangain/jsonmatch/pattern/ArrayMarkerPatternNode.java

@@ -1,5 +1,6 @@
-package io.github.orangain.jsonmatch;
+package io.github.orangain.jsonmatch.pattern;
 
+import io.github.orangain.jsonmatch.json.JsonPath;
 import org.jetbrains.annotations.NotNull;
 
 /**

src/main/java/io/github/orangain/jsonmatch/pattern/ArrayPatternNode.java

@@ -1,8 +1,7 @@
 package io.github.orangain.jsonmatch.pattern;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import io.github.orangain.jsonmatch.JsonMatchErrorDetail;
-import io.github.orangain.jsonmatch.JsonPath;
+import io.github.orangain.jsonmatch.json.JsonPath;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;

src/main/java/io/github/orangain/jsonmatch/JsonMatchErrorDetail.java src/main/java/io/github/orangain/jsonmatch/pattern/JsonMatchErrorDetail.java

@@ -1,9 +1,8 @@
 package io.github.orangain.jsonmatch.pattern;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import io.github.orangain.jsonmatch.JsonMatchErrorDetail;
-import io.github.orangain.jsonmatch.JsonPath;
-import io.github.orangain.jsonmatch.JsonUtil;
+import io.github.orangain.jsonmatch.json.JsonPath;
+import io.github.orangain.jsonmatch.json.JsonUtil;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashSet;

src/main/java/io/github/orangain/jsonmatch/pattern/JsonPatternNode.java

@@ -1,8 +1,7 @@
 package io.github.orangain.jsonmatch.pattern;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import io.github.orangain.jsonmatch.JsonMatchErrorDetail;
-import io.github.orangain.jsonmatch.JsonPath;
+import io.github.orangain.jsonmatch.json.JsonPath;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;

src/main/java/io/github/orangain/jsonmatch/pattern/ObjectLiteralPatternNode.java

@@ -1,8 +1,7 @@
 package io.github.orangain.jsonmatch.pattern;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import io.github.orangain.jsonmatch.JsonMatchErrorDetail;
-import io.github.orangain.jsonmatch.JsonPath;
+import io.github.orangain.jsonmatch.json.JsonPath;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Optional;

src/main/java/io/github/orangain/jsonmatch/pattern/ObjectMarkerPatternNode.java

@@ -1,9 +1,9 @@
 package io.github.orangain.jsonmatch.pattern.valuemarker;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import io.github.orangain.jsonmatch.JsonMatchErrorDetail;
-import io.github.orangain.jsonmatch.JsonPath;
-import io.github.orangain.jsonmatch.JsonUtil;
+import io.github.orangain.jsonmatch.pattern.JsonMatchErrorDetail;
+import io.github.orangain.jsonmatch.json.JsonPath;
+import io.github.orangain.jsonmatch.json.JsonUtil;
 import io.github.orangain.jsonmatch.pattern.ValuePatternNode;
 import org.jetbrains.annotations.NotNull;
 

src/main/java/io/github/orangain/jsonmatch/pattern/ValueLiteralPatternNode.java

@@ -1,9 +1,9 @@
 package io.github.orangain.jsonmatch.pattern.valuemarker;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import io.github.orangain.jsonmatch.JsonMatchErrorDetail;
-import io.github.orangain.jsonmatch.JsonPath;
-import io.github.orangain.jsonmatch.JsonUtil;
+import io.github.orangain.jsonmatch.pattern.JsonMatchErrorDetail;
+import io.github.orangain.jsonmatch.json.JsonPath;
+import io.github.orangain.jsonmatch.json.JsonUtil;
 import io.github.orangain.jsonmatch.pattern.ValuePatternNode;
 import org.jetbrains.annotations.NotNull;
 

src/main/java/io/github/orangain/jsonmatch/pattern/valuemarker/DateMarkerPatternNode.java

@@ -1,9 +1,9 @@
 package io.github.orangain.jsonmatch.pattern.valuemarker;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import io.github.orangain.jsonmatch.JsonMatchErrorDetail;
-import io.github.orangain.jsonmatch.JsonPath;
-import io.github.orangain.jsonmatch.JsonUtil;
+import io.github.orangain.jsonmatch.pattern.JsonMatchErrorDetail;
+import io.github.orangain.jsonmatch.json.JsonPath;
+import io.github.orangain.jsonmatch.json.JsonUtil;
 import io.github.orangain.jsonmatch.pattern.JsonPatternNode;
 import io.github.orangain.jsonmatch.pattern.ValuePatternNode;
 import org.jetbrains.annotations.NotNull;

src/main/java/io/github/orangain/jsonmatch/pattern/valuemarker/DateTimeMarkerPatternNode.java

@@ -1,9 +1,9 @@
 package io.github.orangain.jsonmatch.pattern.valuemarker;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import io.github.orangain.jsonmatch.JsonMatchErrorDetail;
-import io.github.orangain.jsonmatch.JsonPath;
-import io.github.orangain.jsonmatch.JsonUtil;
+import io.github.orangain.jsonmatch.pattern.JsonMatchErrorDetail;
+import io.github.orangain.jsonmatch.json.JsonPath;
+import io.github.orangain.jsonmatch.json.JsonUtil;
 import io.github.orangain.jsonmatch.pattern.ValuePatternNode;
 import org.jetbrains.annotations.NotNull;
 

src/main/java/io/github/orangain/jsonmatch/pattern/valuemarker/IgnoreMarkerPatternNode.java

@@ -1,9 +1,9 @@
 package io.github.orangain.jsonmatch.pattern.valuemarker;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import io.github.orangain.jsonmatch.JsonMatchErrorDetail;
-import io.github.orangain.jsonmatch.JsonPath;
-import io.github.orangain.jsonmatch.JsonUtil;
+import io.github.orangain.jsonmatch.pattern.JsonMatchErrorDetail;
+import io.github.orangain.jsonmatch.json.JsonPath;
+import io.github.orangain.jsonmatch.json.JsonUtil;
 import io.github.orangain.jsonmatch.pattern.ValuePatternNode;
 import org.jetbrains.annotations.NotNull;
 

src/main/java/io/github/orangain/jsonmatch/pattern/valuemarker/NotNullMarkerPatternNode.java

@@ -1,9 +1,9 @@
 package io.github.orangain.jsonmatch.pattern.valuemarker;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import io.github.orangain.jsonmatch.JsonMatchErrorDetail;
-import io.github.orangain.jsonmatch.JsonPath;
-import io.github.orangain.jsonmatch.JsonUtil;
+import io.github.orangain.jsonmatch.pattern.JsonMatchErrorDetail;
+import io.github.orangain.jsonmatch.json.JsonPath;
+import io.github.orangain.jsonmatch.json.JsonUtil;
 import io.github.orangain.jsonmatch.pattern.ValuePatternNode;
 import org.jetbrains.annotations.NotNull;
 

src/main/java/io/github/orangain/jsonmatch/pattern/valuemarker/NotPresentMarkerPatternNode.java

@@ -1,8 +1,8 @@
 package io.github.orangain.jsonmatch.pattern.valuemarker;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import io.github.orangain.jsonmatch.JsonMatchErrorDetail;
-import io.github.orangain.jsonmatch.JsonPath;
+import io.github.orangain.jsonmatch.pattern.JsonMatchErrorDetail;
+import io.github.orangain.jsonmatch.json.JsonPath;
 import io.github.orangain.jsonmatch.pattern.ValuePatternNode;
 import org.jetbrains.annotations.NotNull;
 

src/main/java/io/github/orangain/jsonmatch/pattern/valuemarker/PresentMarkerPatternNode.java

@@ -2,9 +2,9 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.JsonNodeType;
-import io.github.orangain.jsonmatch.JsonMatchErrorDetail;
-import io.github.orangain.jsonmatch.JsonPath;
-import io.github.orangain.jsonmatch.JsonUtil;
+import io.github.orangain.jsonmatch.pattern.JsonMatchErrorDetail;
+import io.github.orangain.jsonmatch.json.JsonPath;
+import io.github.orangain.jsonmatch.json.JsonUtil;
 import io.github.orangain.jsonmatch.pattern.ValuePatternNode;
 import org.jetbrains.annotations.NotNull;
 

src/main/java/io/github/orangain/jsonmatch/pattern/valuemarker/RegexMarkerPatternNode.java

@@ -1,9 +1,9 @@
 package io.github.orangain.jsonmatch.pattern.valuemarker;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import io.github.orangain.jsonmatch.JsonMatchErrorDetail;
-import io.github.orangain.jsonmatch.JsonPath;
-import io.github.orangain.jsonmatch.JsonUtil;
+import io.github.orangain.jsonmatch.pattern.JsonMatchErrorDetail;
+import io.github.orangain.jsonmatch.json.JsonPath;
+import io.github.orangain.jsonmatch.json.JsonUtil;
 import io.github.orangain.jsonmatch.pattern.ValuePatternNode;
 import org.jetbrains.annotations.NotNull;
 

src/main/java/io/github/orangain/jsonmatch/pattern/valuemarker/TypeMarkerPatternNode.java

@@ -0,0 +1,6 @@
+module io.github.orangain.jsonmatch {
+    requires com.fasterxml.jackson.databind;
+    requires org.assertj.core;
+    requires org.jetbrains.annotations;
+    exports io.github.orangain.jsonmatch;
+}