From c05b8e92e8ffeb104d14e6aaa96ccce3b25c798a Mon Sep 17 00:00:00 2001
From: Lukas Cardot <lukas.cardot@ekino.com>
Date: Wed, 18 Oct 2023 11:07:07 +0200
Subject: [PATCH] chore: some clean up in assertj-db module

---
 .../com/ekino/oss/jcv/db/assertj/util/DbComparatorBuilder.kt  | 2 --
 .../test/kotlin/com/ekino/oss/jcv/db/assertj/MSSQLTypeTest.kt | 4 ++--
 .../test/kotlin/com/ekino/oss/jcv/db/assertj/MySQLTypeTest.kt | 4 ++--
 .../kotlin/com/ekino/oss/jcv/db/assertj/PostgresTypeTest.kt   | 4 ++--
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/jcv-db-assertj-db/src/main/kotlin/com/ekino/oss/jcv/db/assertj/util/DbComparatorBuilder.kt b/jcv-db-assertj-db/src/main/kotlin/com/ekino/oss/jcv/db/assertj/util/DbComparatorBuilder.kt
index 3358489..811ab87 100644
--- a/jcv-db-assertj-db/src/main/kotlin/com/ekino/oss/jcv/db/assertj/util/DbComparatorBuilder.kt
+++ b/jcv-db-assertj-db/src/main/kotlin/com/ekino/oss/jcv/db/assertj/util/DbComparatorBuilder.kt
@@ -10,8 +10,6 @@ import org.skyscreamer.jsonassert.JSONCompareMode
 
 class DbComparatorBuilder {
 
-    constructor()
-
     constructor(
         mode: JSONCompareMode,
         validators: List<JsonValidator<*>>
diff --git a/jcv-db-assertj-db/src/test/kotlin/com/ekino/oss/jcv/db/assertj/MSSQLTypeTest.kt b/jcv-db-assertj-db/src/test/kotlin/com/ekino/oss/jcv/db/assertj/MSSQLTypeTest.kt
index 260d11d..57c58bc 100644
--- a/jcv-db-assertj-db/src/test/kotlin/com/ekino/oss/jcv/db/assertj/MSSQLTypeTest.kt
+++ b/jcv-db-assertj-db/src/test/kotlin/com/ekino/oss/jcv/db/assertj/MSSQLTypeTest.kt
@@ -246,10 +246,10 @@ class MSSQLTypeTest {
 
     private fun customValidator(): JsonValidator<String> {
         return validator {
-            templatedValidator<String>(
+            templatedValidator(
                 "custom_notempty",
                 comparator { actual, expected ->
-                    if (actual == null || actual.isEmpty()) {
+                    if (actual.isNullOrEmpty()) {
                         throw ValueMatcherException("Value is null or empty", expected, actual)
                     }
                     true
diff --git a/jcv-db-assertj-db/src/test/kotlin/com/ekino/oss/jcv/db/assertj/MySQLTypeTest.kt b/jcv-db-assertj-db/src/test/kotlin/com/ekino/oss/jcv/db/assertj/MySQLTypeTest.kt
index 2dc967e..b657801 100644
--- a/jcv-db-assertj-db/src/test/kotlin/com/ekino/oss/jcv/db/assertj/MySQLTypeTest.kt
+++ b/jcv-db-assertj-db/src/test/kotlin/com/ekino/oss/jcv/db/assertj/MySQLTypeTest.kt
@@ -250,10 +250,10 @@ class MySQLTypeTest {
 
     private fun customValidator(): JsonValidator<String> {
         return validator {
-            templatedValidator<String>(
+            templatedValidator(
                 "custom_notempty",
                 comparator { actual, expected ->
-                    if (actual == null || actual.isEmpty()) {
+                    if (actual.isNullOrEmpty()) {
                         throw ValueMatcherException("Value is null or empty", expected, actual)
                     }
                     true
diff --git a/jcv-db-assertj-db/src/test/kotlin/com/ekino/oss/jcv/db/assertj/PostgresTypeTest.kt b/jcv-db-assertj-db/src/test/kotlin/com/ekino/oss/jcv/db/assertj/PostgresTypeTest.kt
index b14ecb9..5cec39e 100644
--- a/jcv-db-assertj-db/src/test/kotlin/com/ekino/oss/jcv/db/assertj/PostgresTypeTest.kt
+++ b/jcv-db-assertj-db/src/test/kotlin/com/ekino/oss/jcv/db/assertj/PostgresTypeTest.kt
@@ -231,10 +231,10 @@ class PostgresTypeTest {
 
     private fun customValidator(): JsonValidator<String> {
         return validator {
-            templatedValidator<String>(
+            templatedValidator(
                 "custom_notempty",
                 comparator { actual, expected ->
-                    if (actual == null || actual.isEmpty()) {
+                    if (actual.isNullOrEmpty()) {
                         throw ValueMatcherException("Value is null or empty", expected, actual)
                     }
                     true