Move interfaces back to Java to avoid -Xjvm-default compiler arg

ekino · Sep 11, 2019 · e282a13 · e282a13
1 parent ec246ba
commit e282a13
Show file tree

Hide file tree

Showing 19 changed files with 154 additions and 159 deletions.
diff --git a/jcv-assertj/build.gradle.kts b/jcv-assertj/build.gradle.kts
@@ -30,7 +30,6 @@ val javadocJar by tasks.registering(Jar::class) {
 tasks {
     withType<KotlinCompile> {
         kotlinOptions {
-            freeCompilerArgs = listOf("-Xjvm-default=compatibility")
             jvmTarget = JavaVersion.VERSION_1_8.toString()
         }
     }

diff --git a/jcv-core/build.gradle.kts b/jcv-core/build.gradle.kts
@@ -30,7 +30,6 @@ val javadocJar by tasks.registering(Jar::class) {
 tasks {
     withType<KotlinCompile> {
         kotlinOptions {
-            freeCompilerArgs = listOf("-Xjvm-default=compatibility")
             jvmTarget = JavaVersion.VERSION_1_8.toString()
         }
     }

diff --git a/jcv-core/src/main/java/com/ekino/oss/jcv/core/JsonContextMatcher.java b/jcv-core/src/main/java/com/ekino/oss/jcv/core/JsonContextMatcher.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2019 ekino (https://www.ekino.com/)
+ */
+package com.ekino.oss.jcv.core;
+
+/**
+ * Matcher used to identify a specific field.
+ *
+ * @author Leo Millon
+ */
+@FunctionalInterface
+public interface JsonContextMatcher {
+
+    /**
+     * Evaluates the current json parsing context.
+     *
+     * @param prefix        the current json field path
+     * @param expectedValue the expected field value
+     * @param actualValue   the actual field value
+     *
+     * @return {@code true} if the context matches, otherwise {@code false}
+     */
+    boolean matches(String prefix, Object expectedValue, Object actualValue);
+}
diff --git a/...n/com/ekino/oss/jcv/core/JsonValidator.kt → ...com/ekino/oss/jcv/core/JsonValidator.java b/...n/com/ekino/oss/jcv/core/JsonValidator.kt → ...com/ekino/oss/jcv/core/JsonValidator.java
@@ -1,9 +1,9 @@
 /*
  * Copyright (c) 2019 ekino (https://www.ekino.com/)
  */
-package com.ekino.oss.jcv.core
+package com.ekino.oss.jcv.core;
 
-import org.skyscreamer.jsonassert.ValueMatcher
+import org.skyscreamer.jsonassert.ValueMatcher;
 
 /**
  * A validator composed of a matcher and a value comparator.
@@ -12,19 +12,19 @@
  *
  * @author Leo Millon
  */
-interface JsonValidator<T> {
+public interface JsonValidator<T> {
 
     /**
      * The context matcher.
      *
      * @return the matcher
      */
-    val contextMatcher: JsonContextMatcher
+    JsonContextMatcher getContextMatcher();
 
     /**
      * The field value comparator.
      *
      * @return the comparator
      */
-    val valueComparator: ValueMatcher<T>
+    ValueMatcher<T> getValueComparator();
 }
diff --git a/jcv-core/src/main/java/com/ekino/oss/jcv/core/JsonValueComparator.java b/jcv-core/src/main/java/com/ekino/oss/jcv/core/JsonValueComparator.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2019 ekino (https://www.ekino.com/)
+ */
+package com.ekino.oss.jcv.core;
+
+import org.skyscreamer.jsonassert.ValueMatcher;
+
+/**
+ * A JSON value comparator.
+ *
+ * @param <T> the field value type
+ *
+ * @author Leo Millon
+ */
+@FunctionalInterface
+public interface JsonValueComparator<T> extends ValueMatcher<T> {
+
+    @Override
+    default boolean equal(T o1, T o2) {
+        return hasCorrectValue(o1, o2);
+    }
+
+    /**
+     * Evaluates actual field value against the expected one.
+     *
+     * @param actual   field actual value
+     * @param expected field expected value
+     *
+     * @return {@code true} if the actual is valid against the expected one, otherwise {@code false}
+     */
+    boolean hasCorrectValue(T actual, T expected);
+}
diff --git a/...re/src/main/java/com/ekino/oss/jcv/core/initializer/NoParameterComparatorInitializer.java b/...re/src/main/java/com/ekino/oss/jcv/core/initializer/NoParameterComparatorInitializer.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2019 ekino (https://www.ekino.com/)
+ */
+package com.ekino.oss.jcv.core.initializer;
+
+import org.skyscreamer.jsonassert.ValueMatcher;
+
+/**
+ * Comparator intializer.
+ *
+ * @param <T> the field value type
+ *
+ * @author Leo Millon
+ */
+@FunctionalInterface
+public interface NoParameterComparatorInitializer<T> {
+
+    /**
+     * Init a comparator without template parameter.
+     *
+     * @return the initalized comparator
+     */
+    ValueMatcher<T> initComparator();
+}
diff --git a/...e/src/main/java/com/ekino/oss/jcv/core/initializer/OneParameterComparatorInitializer.java b/...e/src/main/java/com/ekino/oss/jcv/core/initializer/OneParameterComparatorInitializer.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2019 ekino (https://www.ekino.com/)
+ */
+package com.ekino.oss.jcv.core.initializer;
+
+import org.skyscreamer.jsonassert.ValueMatcher;
+
+/**
+ * Comparator intializer given tempated validator with 1 parameter information.
+ *
+ * @param <T> the field value type
+ *
+ * @author Leo Millon
+ */
+@FunctionalInterface
+public interface OneParameterComparatorInitializer<T> {
+
+    /**
+     * Init a comparator using the current templated validator info.
+     *
+     * @param parameter the first parameter of the templated validator
+     *
+     * @return the initalized comparator
+     */
+    ValueMatcher<T> initComparator(String parameter);
+}
diff --git a/...ializer/TemplatedComparatorInitializer.kt → ...lizer/TemplatedComparatorInitializer.java b/...ializer/TemplatedComparatorInitializer.kt → ...lizer/TemplatedComparatorInitializer.java
@@ -1,10 +1,10 @@
 /*
  * Copyright (c) 2019 ekino (https://www.ekino.com/)
  */
-package com.ekino.oss.jcv.core.initializer
+package com.ekino.oss.jcv.core.initializer;
 
-import com.ekino.oss.jcv.core.validator.ValidatorTemplateManager
-import org.skyscreamer.jsonassert.ValueMatcher
+import com.ekino.oss.jcv.core.validator.ValidatorTemplateManager;
+import org.skyscreamer.jsonassert.ValueMatcher;
 
 /**
  * Comparator intializer given tempated validator information.
@@ -14,7 +14,7 @@
  * @author Leo Millon
  */
 @FunctionalInterface
-interface TemplatedComparatorInitializer<T> {
+public interface TemplatedComparatorInitializer<T> {
 
     /**
      * Init a comparator using the current templated validator info.
@@ -23,5 +23,5 @@ interface TemplatedComparatorInitializer<T> {
      *
      * @return the initalized comparator
      */
-    fun initComparator(validatorTemplateManager: ValidatorTemplateManager): ValueMatcher<T>
+    ValueMatcher<T> initComparator(ValidatorTemplateManager validatorTemplateManager);
 }
diff --git a/...zer/TwoParametersComparatorInitializer.kt → ...r/TwoParametersComparatorInitializer.java b/...zer/TwoParametersComparatorInitializer.kt → ...r/TwoParametersComparatorInitializer.java
@@ -1,9 +1,9 @@
 /*
  * Copyright (c) 2019 ekino (https://www.ekino.com/)
  */
-package com.ekino.oss.jcv.core.initializer
+package com.ekino.oss.jcv.core.initializer;
 
-import org.skyscreamer.jsonassert.ValueMatcher
+import org.skyscreamer.jsonassert.ValueMatcher;
 
 /**
  * Comparator intializer given tempated validator with 2 parameters information.
@@ -13,7 +13,7 @@
  * @author Leo Millon
  */
 @FunctionalInterface
-interface TwoParametersComparatorInitializer<T> {
+public interface TwoParametersComparatorInitializer<T> {
 
     /**
      * Init a comparator using the current templated validator info.
@@ -23,5 +23,5 @@ interface TwoParametersComparatorInitializer<T> {
      *
      * @return the initalized comparator
      */
-    fun initComparator(param1: String?, param2: String?): ValueMatcher<T>
+    ValueMatcher<T> initComparator(String param1, String param2);
 }
diff --git a/jcv-core/src/main/kotlin/com/ekino/oss/jcv/core/JsonContextMatcher.kt b/jcv-core/src/main/kotlin/com/ekino/oss/jcv/core/JsonContextMatcher.kt
diff --git a/jcv-core/src/main/kotlin/com/ekino/oss/jcv/core/JsonValueComparator.kt b/jcv-core/src/main/kotlin/com/ekino/oss/jcv/core/JsonValueComparator.kt
diff --git a/jcv-core/src/main/kotlin/com/ekino/oss/jcv/core/initializer/Initializers.kt b/jcv-core/src/main/kotlin/com/ekino/oss/jcv/core/initializer/Initializers.kt
@@ -28,22 +28,17 @@ object Initializers {
 
     @JvmStatic
     fun <T> comparatorWithoutParameter(initializer: NoParameterComparatorInitializer<T>): TemplatedComparatorInitializer<T> =
-        object : TemplatedComparatorInitializer<T> {
-            override fun initComparator(validatorTemplateManager: ValidatorTemplateManager): ValueMatcher<T> =
-                initializer.initComparator()
-        }
+        TemplatedComparatorInitializer<T> { initializer.initComparator() }
 
     @JvmStatic
     @JvmOverloads
     fun <T> comparatorWith1Parameter(
         required: Boolean = true,
         initializer: OneParameterComparatorInitializer<T>
     ): TemplatedComparatorInitializer<T> =
-        object : TemplatedComparatorInitializer<T> {
-            override fun initComparator(validatorTemplateManager: ValidatorTemplateManager): ValueMatcher<T> {
-                val parameter = getOrThrowParameter(0, required, validatorTemplateManager)
-                return initializer.initComparator(parameter)
-            }
+        TemplatedComparatorInitializer<T> { validatorTemplateManager ->
+            val parameter = getOrThrowParameter(0, required, validatorTemplateManager)
+            initializer.initComparator(parameter)
         }
 
     @JvmStatic
@@ -52,12 +47,10 @@ object Initializers {
         param2Required: Boolean = true,
         initializer: TwoParametersComparatorInitializer<T>
     ): TemplatedComparatorInitializer<T> {
-        return object : TemplatedComparatorInitializer<T> {
-            override fun initComparator(validatorTemplateManager: ValidatorTemplateManager): ValueMatcher<T> {
-                val parameter1 = getOrThrowParameter(0, param1Required, validatorTemplateManager)
-                val parameter2 = getOrThrowParameter(1, param2Required, validatorTemplateManager)
-                return initializer.initComparator(parameter1, parameter2)
-            }
+        return TemplatedComparatorInitializer<T> { validatorTemplateManager ->
+            val parameter1 = getOrThrowParameter(0, param1Required, validatorTemplateManager)
+            val parameter2 = getOrThrowParameter(1, param2Required, validatorTemplateManager)
+            initializer.initComparator(parameter1, parameter2)
         }
     }
 
@@ -76,26 +69,22 @@ object Initializers {
     @JvmStatic
     @SafeVarargs
     fun <T> allOf(vararg initializers: TemplatedComparatorInitializer<in T>): TemplatedComparatorInitializer<T> =
-        object : TemplatedComparatorInitializer<T> {
-            override fun initComparator(validatorTemplateManager: ValidatorTemplateManager): ValueMatcher<T> {
-                return ValueMatcher { actual, expected ->
-                    sequenceOf(*initializers)
-                        .map { it.initComparator(validatorTemplateManager) }
-                        .all { it.equal(actual, expected) }
-                }
+        TemplatedComparatorInitializer<T> { validatorTemplateManager ->
+            ValueMatcher { actual, expected ->
+                sequenceOf(*initializers)
+                    .map { it.initComparator(validatorTemplateManager) }
+                    .all { it.equal(actual, expected) }
             }
         }
 
     @JvmStatic
     @SafeVarargs
     fun <T> anyOf(vararg initializers: TemplatedComparatorInitializer<in T>): TemplatedComparatorInitializer<T> =
-        object : TemplatedComparatorInitializer<T> {
-            override fun initComparator(validatorTemplateManager: ValidatorTemplateManager): ValueMatcher<T> {
-                return ValueMatcher { actual, expected ->
-                    sequenceOf(*initializers)
-                        .map { it.initComparator(validatorTemplateManager) }
-                        .any { it.equal(actual, expected) }
-                }
+        TemplatedComparatorInitializer<T> { validatorTemplateManager ->
+            ValueMatcher { actual, expected ->
+                sequenceOf(*initializers)
+                    .map { it.initComparator(validatorTemplateManager) }
+                    .any { it.equal(actual, expected) }
             }
         }
 }
diff --git a/...re/src/main/kotlin/com/ekino/oss/jcv/core/initializer/NoParameterComparatorInitializer.kt b/...re/src/main/kotlin/com/ekino/oss/jcv/core/initializer/NoParameterComparatorInitializer.kt
@@ -5,27 +5,7 @@ package com.ekino.oss.jcv.core.initializer
 
 import org.skyscreamer.jsonassert.ValueMatcher
 
-/**
- * Comparator intializer.
- *
- * @param <T> the field value type
- *
- * @author Leo Millon
- */
-@FunctionalInterface
-interface NoParameterComparatorInitializer<T> {
-
-    /**
-     * Init a comparator without template parameter.
-     *
-     * @return the initalized comparator
-     */
-    fun initComparator(): ValueMatcher<T>
-}
-
 typealias KNoParameterComparatorInitializer<T> = () -> ValueMatcher<T>
 
 fun <T> asNoParameterComparatorInitializer(initializer: KNoParameterComparatorInitializer<T>) =
-    object : NoParameterComparatorInitializer<T> {
-        override fun initComparator(): ValueMatcher<T> = initializer()
-    }
+    NoParameterComparatorInitializer<T> { initializer() }