chore: some clean up in assertj-db module

ekino · Oct 18, 2023 · c05b8e9 · c05b8e9
1 parent 93a95ec
commit c05b8e9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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