diff --git a/src/common/pom.xml b/src/common/pom.xml deleted file mode 100644 index 61cfe2f..0000000 --- a/src/common/pom.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - 4.0.0 - - solutions.bitbadger.documents - common - 4.0.0-alpha1-SNAPSHOT - jar - - - solutions.bitbadger - documents - 4.0.0-alpha1-SNAPSHOT - - - ${project.groupId}:${project.artifactId} - Expose a document store interface for PostgreSQL and SQLite (Common Library) - https://bitbadger.solutions/open-source/relational-documents/jvm/ - - - scm:git:https://git.bitbadger.solutions/bit-badger/solutions.bitbadger.documents.git - scm:git:https://git.bitbadger.solutions/bit-badger/solutions.bitbadger.documents.git - https://git.bitbadger.solutions/bit-badger/solutions.bitbadger.documents - - - - src/main/kotlin - src/test/kotlin - - - org.jetbrains.kotlin - kotlin-maven-plugin - ${kotlin.version} - - - compile - process-sources - - compile - - - - ${project.basedir}/src/main/kotlin - - - - - test-compile - test-compile - - test-compile - - - - ${project.basedir}/src/test/java - ${project.basedir}/src/test/kotlin - - - - - - - maven-surefire-plugin - 2.22.2 - - - maven-failsafe-plugin - 2.22.2 - - - - integration-test - verify - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${java.version} - ${java.version} - - - - - diff --git a/src/jvm/src/main/kotlin/extensions/Connection.kt b/src/jvm/src/main/kotlin/extensions/Connection.kt index 71f7ecc..97c44ab 100644 --- a/src/jvm/src/main/kotlin/extensions/Connection.kt +++ b/src/jvm/src/main/kotlin/extensions/Connection.kt @@ -23,7 +23,8 @@ fun Connection.customList( parameters: Collection> = listOf(), clazz: Class, mapFunc: (ResultSet, Class) -> TDoc -) = Custom.list(query, parameters, clazz, this, mapFunc) +) = + solutions.bitbadger.documents.jvm.Custom.list(query, parameters, clazz, this, mapFunc) /** * Execute a query that returns one or no results @@ -39,7 +40,8 @@ fun Connection.customSingle( parameters: Collection> = listOf(), clazz: Class, mapFunc: (ResultSet, Class) -> TDoc -) = Custom.single(query, parameters, clazz, this, mapFunc) +) = + solutions.bitbadger.documents.jvm.Custom.single(query, parameters, clazz, this, mapFunc) /** * Execute a query that returns no results @@ -48,7 +50,7 @@ fun Connection.customSingle( * @param parameters Parameters to use for the query */ fun Connection.customNonQuery(query: String, parameters: Collection> = listOf()) = - Custom.nonQuery(query, parameters, this) + solutions.bitbadger.documents.jvm.Custom.nonQuery(query, parameters, this) /** * Execute a query that returns a scalar result @@ -64,7 +66,8 @@ fun Connection.customScalar( parameters: Collection> = listOf(), clazz: Class, mapFunc: (ResultSet, Class) -> T -) = Custom.scalar(query, parameters, clazz, this, mapFunc) +) = + solutions.bitbadger.documents.jvm.Custom.scalar(query, parameters, clazz, this, mapFunc) // ~~~ DEFINITION QUERIES ~~~ diff --git a/src/common/src/test/java/solutions/bitbadger/documents/common/java/AutoIdTest.java b/src/jvm/src/test/java/solutions/bitbadger/documents/java/AutoIdTest.java similarity index 98% rename from src/common/src/test/java/solutions/bitbadger/documents/common/java/AutoIdTest.java rename to src/jvm/src/test/java/solutions/bitbadger/documents/java/AutoIdTest.java index 9ff6314..511d621 100644 --- a/src/common/src/test/java/solutions/bitbadger/documents/common/java/AutoIdTest.java +++ b/src/jvm/src/test/java/solutions/bitbadger/documents/java/AutoIdTest.java @@ -1,10 +1,10 @@ -package solutions.bitbadger.documents.common.java; +package solutions.bitbadger.documents.java; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import AutoId; +import solutions.bitbadger.documents.AutoId; import solutions.bitbadger.documents.DocumentException; -import solutions.bitbadger.documents.java.java.testDocs.*; +import solutions.bitbadger.documents.java.support.*; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/common/src/test/java/solutions/bitbadger/documents/common/java/DocumentIndexTest.java b/src/jvm/src/test/java/solutions/bitbadger/documents/java/DocumentIndexTest.java similarity index 93% rename from src/common/src/test/java/solutions/bitbadger/documents/common/java/DocumentIndexTest.java rename to src/jvm/src/test/java/solutions/bitbadger/documents/java/DocumentIndexTest.java index 9440d16..47b9543 100644 --- a/src/common/src/test/java/solutions/bitbadger/documents/common/java/DocumentIndexTest.java +++ b/src/jvm/src/test/java/solutions/bitbadger/documents/java/DocumentIndexTest.java @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.common.java; +package solutions.bitbadger.documents.java; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/common/src/test/java/solutions/bitbadger/documents/common/java/FieldMatchTest.java b/src/jvm/src/test/java/solutions/bitbadger/documents/java/FieldMatchTest.java similarity index 92% rename from src/common/src/test/java/solutions/bitbadger/documents/common/java/FieldMatchTest.java rename to src/jvm/src/test/java/solutions/bitbadger/documents/java/FieldMatchTest.java index 3335d6e..6854747 100644 --- a/src/common/src/test/java/solutions/bitbadger/documents/common/java/FieldMatchTest.java +++ b/src/jvm/src/test/java/solutions/bitbadger/documents/java/FieldMatchTest.java @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.common.java; +package solutions.bitbadger.documents.java; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/common/src/test/java/solutions/bitbadger/documents/common/java/FieldTest.java b/src/jvm/src/test/java/solutions/bitbadger/documents/java/FieldTest.java similarity index 99% rename from src/common/src/test/java/solutions/bitbadger/documents/common/java/FieldTest.java rename to src/jvm/src/test/java/solutions/bitbadger/documents/java/FieldTest.java index 22192ec..9af8b6d 100644 --- a/src/common/src/test/java/solutions/bitbadger/documents/common/java/FieldTest.java +++ b/src/jvm/src/test/java/solutions/bitbadger/documents/java/FieldTest.java @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.common.java; +package solutions.bitbadger.documents.java; import kotlin.Pair; import org.junit.jupiter.api.AfterEach; diff --git a/src/common/src/test/java/solutions/bitbadger/documents/common/java/OpTest.java b/src/jvm/src/test/java/solutions/bitbadger/documents/java/OpTest.java similarity index 97% rename from src/common/src/test/java/solutions/bitbadger/documents/common/java/OpTest.java rename to src/jvm/src/test/java/solutions/bitbadger/documents/java/OpTest.java index d26ffbe..3f800c8 100644 --- a/src/common/src/test/java/solutions/bitbadger/documents/common/java/OpTest.java +++ b/src/jvm/src/test/java/solutions/bitbadger/documents/java/OpTest.java @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.common.java; +package solutions.bitbadger.documents.java; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/common/src/test/java/solutions/bitbadger/documents/common/java/ParameterNameTest.java b/src/jvm/src/test/java/solutions/bitbadger/documents/java/ParameterNameTest.java similarity index 96% rename from src/common/src/test/java/solutions/bitbadger/documents/common/java/ParameterNameTest.java rename to src/jvm/src/test/java/solutions/bitbadger/documents/java/ParameterNameTest.java index 910289d..4a38121 100644 --- a/src/common/src/test/java/solutions/bitbadger/documents/common/java/ParameterNameTest.java +++ b/src/jvm/src/test/java/solutions/bitbadger/documents/java/ParameterNameTest.java @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.common.java; +package solutions.bitbadger.documents.java; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/common/src/test/java/solutions/bitbadger/documents/common/java/ParameterTest.java b/src/jvm/src/test/java/solutions/bitbadger/documents/java/ParameterTest.java similarity index 96% rename from src/common/src/test/java/solutions/bitbadger/documents/common/java/ParameterTest.java rename to src/jvm/src/test/java/solutions/bitbadger/documents/java/ParameterTest.java index 2bce5ed..acbf0cf 100644 --- a/src/common/src/test/java/solutions/bitbadger/documents/common/java/ParameterTest.java +++ b/src/jvm/src/test/java/solutions/bitbadger/documents/java/ParameterTest.java @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.common.java; +package solutions.bitbadger.documents.java; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/ParametersTest.java b/src/jvm/src/test/java/solutions/bitbadger/documents/java/jvm/ParametersTest.java similarity index 98% rename from src/jvm/src/test/java/solutions/bitbadger/documents/java/java/ParametersTest.java rename to src/jvm/src/test/java/solutions/bitbadger/documents/java/jvm/ParametersTest.java index a0f48d0..59902e7 100644 --- a/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/ParametersTest.java +++ b/src/jvm/src/test/java/solutions/bitbadger/documents/java/jvm/ParametersTest.java @@ -1,10 +1,10 @@ -package solutions.bitbadger.documents.java.java; +package solutions.bitbadger.documents.java.jvm; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import solutions.bitbadger.documents.*; -import solutions.bitbadger.documents.java.jvm.Parameters; +import solutions.bitbadger.documents.jvm.Parameters; import java.util.List; diff --git a/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/integration/common/CountFunctions.java b/src/jvm/src/test/java/solutions/bitbadger/documents/java/jvm/integration/common/CountFunctions.java similarity index 85% rename from src/jvm/src/test/java/solutions/bitbadger/documents/java/java/integration/common/CountFunctions.java rename to src/jvm/src/test/java/solutions/bitbadger/documents/java/jvm/integration/common/CountFunctions.java index 912dc4e..f3dfd47 100644 --- a/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/integration/common/CountFunctions.java +++ b/src/jvm/src/test/java/solutions/bitbadger/documents/java/jvm/integration/common/CountFunctions.java @@ -1,15 +1,15 @@ -package solutions.bitbadger.documents.java.java.integration.common; +package solutions.bitbadger.documents.java.jvm.integration.common; import solutions.bitbadger.documents.Field; -import solutions.bitbadger.documents.java.jvm.Count; -import solutions.bitbadger.documents.java.integration.ThrowawayDatabase; -import solutions.bitbadger.documents.java.java.testDocs.JsonDocument; +import solutions.bitbadger.documents.jvm.Count; +import solutions.bitbadger.documents.support.ThrowawayDatabase; +import solutions.bitbadger.documents.java.support.JsonDocument; import java.util.List; import java.util.Map; import static org.junit.jupiter.api.Assertions.assertEquals; -import static solutions.bitbadger.documents.java.integration.TypesKt.TEST_TABLE; +import static solutions.bitbadger.documents.support.TypesKt.TEST_TABLE; /** * Integration tests for the `Count` object diff --git a/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/integration/postgresql/CountIT.java b/src/jvm/src/test/java/solutions/bitbadger/documents/java/jvm/integration/postgresql/CountIT.java similarity index 88% rename from src/jvm/src/test/java/solutions/bitbadger/documents/java/java/integration/postgresql/CountIT.java rename to src/jvm/src/test/java/solutions/bitbadger/documents/java/jvm/integration/postgresql/CountIT.java index 54871dc..eb07bec 100644 --- a/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/integration/postgresql/CountIT.java +++ b/src/jvm/src/test/java/solutions/bitbadger/documents/java/jvm/integration/postgresql/CountIT.java @@ -1,9 +1,9 @@ -package solutions.bitbadger.documents.java.java.integration.postgresql; +package solutions.bitbadger.documents.java.jvm.integration.postgresql; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import solutions.bitbadger.documents.java.integration.postgresql.PgDB; -import solutions.bitbadger.documents.java.java.integration.common.CountFunctions; +import solutions.bitbadger.documents.java.jvm.integration.common.CountFunctions; +import solutions.bitbadger.documents.jvm.integration.postgresql.PgDB; /** * PostgreSQL integration tests for the `Count` object / `count*` connection extension functions diff --git a/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/integration/sqlite/CountIT.java b/src/jvm/src/test/java/solutions/bitbadger/documents/java/jvm/integration/sqlite/CountIT.java similarity index 86% rename from src/jvm/src/test/java/solutions/bitbadger/documents/java/java/integration/sqlite/CountIT.java rename to src/jvm/src/test/java/solutions/bitbadger/documents/java/jvm/integration/sqlite/CountIT.java index 3c7338e..18a4d70 100644 --- a/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/integration/sqlite/CountIT.java +++ b/src/jvm/src/test/java/solutions/bitbadger/documents/java/jvm/integration/sqlite/CountIT.java @@ -1,10 +1,10 @@ -package solutions.bitbadger.documents.java.java.integration.sqlite; +package solutions.bitbadger.documents.java.jvm.integration.sqlite; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import solutions.bitbadger.documents.DocumentException; -import solutions.bitbadger.documents.java.integration.sqlite.SQLiteDB; -import solutions.bitbadger.documents.java.java.integration.common.CountFunctions; +import solutions.bitbadger.documents.java.jvm.integration.common.CountFunctions; +import solutions.bitbadger.documents.jvm.integration.sqlite.SQLiteDB; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/ByteIdClass.java b/src/jvm/src/test/java/solutions/bitbadger/documents/java/support/ByteIdClass.java similarity index 79% rename from src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/ByteIdClass.java rename to src/jvm/src/test/java/solutions/bitbadger/documents/java/support/ByteIdClass.java index 4ffdf15..bf2be5d 100644 --- a/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/ByteIdClass.java +++ b/src/jvm/src/test/java/solutions/bitbadger/documents/java/support/ByteIdClass.java @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.java.java.testDocs; +package solutions.bitbadger.documents.java.support; public class ByteIdClass { diff --git a/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/IntIdClass.java b/src/jvm/src/test/java/solutions/bitbadger/documents/java/support/IntIdClass.java similarity index 79% rename from src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/IntIdClass.java rename to src/jvm/src/test/java/solutions/bitbadger/documents/java/support/IntIdClass.java index 25a5613..2db8732 100644 --- a/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/IntIdClass.java +++ b/src/jvm/src/test/java/solutions/bitbadger/documents/java/support/IntIdClass.java @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.java.java.testDocs; +package solutions.bitbadger.documents.java.support; public class IntIdClass { diff --git a/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/JsonDocument.java b/src/jvm/src/test/java/solutions/bitbadger/documents/java/support/JsonDocument.java similarity index 87% rename from src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/JsonDocument.java rename to src/jvm/src/test/java/solutions/bitbadger/documents/java/support/JsonDocument.java index 97cd733..d18acaa 100644 --- a/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/JsonDocument.java +++ b/src/jvm/src/test/java/solutions/bitbadger/documents/java/support/JsonDocument.java @@ -1,12 +1,12 @@ -package solutions.bitbadger.documents.java.java.testDocs; +package solutions.bitbadger.documents.java.support; import kotlinx.serialization.Serializable; -import solutions.bitbadger.documents.java.jvm.Document; -import solutions.bitbadger.documents.java.integration.ThrowawayDatabase; +import solutions.bitbadger.documents.jvm.Document; +import solutions.bitbadger.documents.support.ThrowawayDatabase; import java.util.List; -import static solutions.bitbadger.documents.java.integration.TypesKt.TEST_TABLE; +import static solutions.bitbadger.documents.support.TypesKt.TEST_TABLE; @Serializable public class JsonDocument { diff --git a/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/LongIdClass.java b/src/jvm/src/test/java/solutions/bitbadger/documents/java/support/LongIdClass.java similarity index 79% rename from src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/LongIdClass.java rename to src/jvm/src/test/java/solutions/bitbadger/documents/java/support/LongIdClass.java index 9a56846..665e2c1 100644 --- a/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/LongIdClass.java +++ b/src/jvm/src/test/java/solutions/bitbadger/documents/java/support/LongIdClass.java @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.java.java.testDocs; +package solutions.bitbadger.documents.java.support; public class LongIdClass { diff --git a/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/ShortIdClass.java b/src/jvm/src/test/java/solutions/bitbadger/documents/java/support/ShortIdClass.java similarity index 80% rename from src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/ShortIdClass.java rename to src/jvm/src/test/java/solutions/bitbadger/documents/java/support/ShortIdClass.java index c5913cc..6608387 100644 --- a/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/ShortIdClass.java +++ b/src/jvm/src/test/java/solutions/bitbadger/documents/java/support/ShortIdClass.java @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.java.java.testDocs; +package solutions.bitbadger.documents.java.support; public class ShortIdClass { diff --git a/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/StringIdClass.java b/src/jvm/src/test/java/solutions/bitbadger/documents/java/support/StringIdClass.java similarity index 80% rename from src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/StringIdClass.java rename to src/jvm/src/test/java/solutions/bitbadger/documents/java/support/StringIdClass.java index 35e4945..8264d2b 100644 --- a/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/StringIdClass.java +++ b/src/jvm/src/test/java/solutions/bitbadger/documents/java/support/StringIdClass.java @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.java.java.testDocs; +package solutions.bitbadger.documents.java.support; public class StringIdClass { diff --git a/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/SubDocument.java b/src/jvm/src/test/java/solutions/bitbadger/documents/java/support/SubDocument.java similarity index 89% rename from src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/SubDocument.java rename to src/jvm/src/test/java/solutions/bitbadger/documents/java/support/SubDocument.java index fa4c730..6d5bdf9 100644 --- a/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/testDocs/SubDocument.java +++ b/src/jvm/src/test/java/solutions/bitbadger/documents/java/support/SubDocument.java @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.java.java.testDocs; +package solutions.bitbadger.documents.java.support; public class SubDocument { diff --git a/src/common/src/test/kotlin/AutoIdTest.kt b/src/jvm/src/test/kotlin/AutoIdTest.kt similarity index 98% rename from src/common/src/test/kotlin/AutoIdTest.kt rename to src/jvm/src/test/kotlin/AutoIdTest.kt index 05f4e59..4a1aeff 100644 --- a/src/common/src/test/kotlin/AutoIdTest.kt +++ b/src/jvm/src/test/kotlin/AutoIdTest.kt @@ -1,10 +1,8 @@ -package solutions.bitbadger.documents.common +package solutions.bitbadger.documents -import AutoId import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows -import solutions.bitbadger.documents.DocumentException import kotlin.test.assertEquals import kotlin.test.assertFalse import kotlin.test.assertNotEquals diff --git a/src/common/src/test/kotlin/ComparisonTest.kt b/src/jvm/src/test/kotlin/ComparisonTest.kt similarity index 98% rename from src/common/src/test/kotlin/ComparisonTest.kt rename to src/jvm/src/test/kotlin/ComparisonTest.kt index e6c5bf5..912000b 100644 --- a/src/common/src/test/kotlin/ComparisonTest.kt +++ b/src/jvm/src/test/kotlin/ComparisonTest.kt @@ -1,8 +1,7 @@ -package solutions.bitbadger.documents.common +package solutions.bitbadger.documents import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test -import solutions.bitbadger.documents.* import kotlin.test.assertEquals import kotlin.test.assertFalse import kotlin.test.assertTrue diff --git a/src/common/src/test/kotlin/ConfigurationTest.kt b/src/jvm/src/test/kotlin/ConfigurationTest.kt similarity index 85% rename from src/common/src/test/kotlin/ConfigurationTest.kt rename to src/jvm/src/test/kotlin/ConfigurationTest.kt index 338b7c9..a9255a5 100644 --- a/src/common/src/test/kotlin/ConfigurationTest.kt +++ b/src/jvm/src/test/kotlin/ConfigurationTest.kt @@ -1,12 +1,8 @@ -package solutions.bitbadger.documents.common +package solutions.bitbadger.documents -import AutoId import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows -import solutions.bitbadger.documents.Configuration -import solutions.bitbadger.documents.Dialect -import solutions.bitbadger.documents.DocumentException import kotlin.test.assertEquals /** diff --git a/src/common/src/test/kotlin/DialectTest.kt b/src/jvm/src/test/kotlin/DialectTest.kt similarity index 90% rename from src/common/src/test/kotlin/DialectTest.kt rename to src/jvm/src/test/kotlin/DialectTest.kt index 3eae724..7dbdce0 100644 --- a/src/common/src/test/kotlin/DialectTest.kt +++ b/src/jvm/src/test/kotlin/DialectTest.kt @@ -1,9 +1,7 @@ -package solutions.bitbadger.documents.common +package solutions.bitbadger.documents import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test -import solutions.bitbadger.documents.Dialect -import solutions.bitbadger.documents.DocumentException import kotlin.test.assertEquals import kotlin.test.assertNotNull import kotlin.test.assertTrue diff --git a/src/common/src/test/kotlin/DocumentIndexTest.kt b/src/jvm/src/test/kotlin/DocumentIndexTest.kt similarity index 86% rename from src/common/src/test/kotlin/DocumentIndexTest.kt rename to src/jvm/src/test/kotlin/DocumentIndexTest.kt index fb03e7b..f23d6a0 100644 --- a/src/common/src/test/kotlin/DocumentIndexTest.kt +++ b/src/jvm/src/test/kotlin/DocumentIndexTest.kt @@ -1,8 +1,7 @@ -package solutions.bitbadger.documents.common +package solutions.bitbadger.documents import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test -import solutions.bitbadger.documents.DocumentIndex import kotlin.test.assertEquals /** diff --git a/src/common/src/test/kotlin/FieldMatchTest.kt b/src/jvm/src/test/kotlin/FieldMatchTest.kt similarity index 84% rename from src/common/src/test/kotlin/FieldMatchTest.kt rename to src/jvm/src/test/kotlin/FieldMatchTest.kt index 9c4de5a..2ee51d7 100644 --- a/src/common/src/test/kotlin/FieldMatchTest.kt +++ b/src/jvm/src/test/kotlin/FieldMatchTest.kt @@ -1,8 +1,7 @@ -package solutions.bitbadger.documents.common +package solutions.bitbadger.documents import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test -import solutions.bitbadger.documents.FieldMatch import kotlin.test.assertEquals /** diff --git a/src/common/src/test/kotlin/FieldTest.kt b/src/jvm/src/test/kotlin/FieldTest.kt similarity index 99% rename from src/common/src/test/kotlin/FieldTest.kt rename to src/jvm/src/test/kotlin/FieldTest.kt index e3a6d4a..a48dbf1 100644 --- a/src/common/src/test/kotlin/FieldTest.kt +++ b/src/jvm/src/test/kotlin/FieldTest.kt @@ -1,10 +1,9 @@ -package solutions.bitbadger.documents.common +package solutions.bitbadger.documents import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows -import solutions.bitbadger.documents.* import kotlin.test.assertEquals import kotlin.test.assertNotSame import kotlin.test.assertNull diff --git a/src/common/src/test/kotlin/OpTest.kt b/src/jvm/src/test/kotlin/OpTest.kt similarity index 96% rename from src/common/src/test/kotlin/OpTest.kt rename to src/jvm/src/test/kotlin/OpTest.kt index 9543275..095e9a2 100644 --- a/src/common/src/test/kotlin/OpTest.kt +++ b/src/jvm/src/test/kotlin/OpTest.kt @@ -1,8 +1,7 @@ -package solutions.bitbadger.documents.common +package solutions.bitbadger.documents import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test -import solutions.bitbadger.documents.Op import kotlin.test.assertEquals /** diff --git a/src/common/src/test/kotlin/ParameterNameTest.kt b/src/jvm/src/test/kotlin/ParameterNameTest.kt similarity index 92% rename from src/common/src/test/kotlin/ParameterNameTest.kt rename to src/jvm/src/test/kotlin/ParameterNameTest.kt index 3c09ce0..d8f1d6d 100644 --- a/src/common/src/test/kotlin/ParameterNameTest.kt +++ b/src/jvm/src/test/kotlin/ParameterNameTest.kt @@ -1,8 +1,7 @@ -package solutions.bitbadger.documents.common +package solutions.bitbadger.documents import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test -import solutions.bitbadger.documents.ParameterName import kotlin.test.assertEquals /** diff --git a/src/common/src/test/kotlin/ParameterTest.kt b/src/jvm/src/test/kotlin/ParameterTest.kt similarity index 86% rename from src/common/src/test/kotlin/ParameterTest.kt rename to src/jvm/src/test/kotlin/ParameterTest.kt index 3a312e4..0dadc04 100644 --- a/src/common/src/test/kotlin/ParameterTest.kt +++ b/src/jvm/src/test/kotlin/ParameterTest.kt @@ -1,10 +1,7 @@ -package solutions.bitbadger.documents.common +package solutions.bitbadger.documents import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.assertThrows -import solutions.bitbadger.documents.DocumentException -import solutions.bitbadger.documents.Parameter -import solutions.bitbadger.documents.ParameterType import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNull diff --git a/src/jvm/src/test/kotlin/ParametersTest.kt b/src/jvm/src/test/kotlin/jvm/ParametersTest.kt similarity index 98% rename from src/jvm/src/test/kotlin/ParametersTest.kt rename to src/jvm/src/test/kotlin/jvm/ParametersTest.kt index f2469ed..30ef568 100644 --- a/src/jvm/src/test/kotlin/ParametersTest.kt +++ b/src/jvm/src/test/kotlin/jvm/ParametersTest.kt @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.java +package solutions.bitbadger.documents.jvm import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.DisplayName @@ -38,7 +38,8 @@ class ParametersTest { @DisplayName("nameFields works when changing fields") fun nameFieldsChange() { val fields = listOf( - Field.equal("a", ""), Field.equal("e", "", ":hi"), Field.equal("b", ""), Field.notExists("z")) + Field.equal("a", ""), Field.equal("e", "", ":hi"), Field.equal("b", ""), Field.notExists("z") + ) val named = Parameters.nameFields(fields) assertEquals(fields.size, named.size, "There should have been 4 fields in the list") assertNotSame(fields.elementAt(0), named.elementAt(0), "The first field should not be the same") diff --git a/src/jvm/src/test/kotlin/integration/common/Count.kt b/src/jvm/src/test/kotlin/jvm/integration/common/Count.kt similarity index 78% rename from src/jvm/src/test/kotlin/integration/common/Count.kt rename to src/jvm/src/test/kotlin/jvm/integration/common/Count.kt index b452aab..5ed8ecc 100644 --- a/src/jvm/src/test/kotlin/integration/common/Count.kt +++ b/src/jvm/src/test/kotlin/jvm/integration/common/Count.kt @@ -1,13 +1,8 @@ -package solutions.bitbadger.documents.java.integration.common +package solutions.bitbadger.documents.jvm.integration.common import solutions.bitbadger.documents.Field -import solutions.bitbadger.documents.java.extensions.countAll -import solutions.bitbadger.documents.java.extensions.countByContains -import solutions.bitbadger.documents.java.extensions.countByFields -import solutions.bitbadger.documents.java.extensions.countByJsonPath -import solutions.bitbadger.documents.java.integration.JsonDocument -import solutions.bitbadger.documents.java.integration.TEST_TABLE -import solutions.bitbadger.documents.java.integration.ThrowawayDatabase +import solutions.bitbadger.documents.extensions.* +import solutions.bitbadger.documents.support.* import kotlin.test.assertEquals /** diff --git a/src/jvm/src/test/kotlin/integration/common/Custom.kt b/src/jvm/src/test/kotlin/jvm/integration/common/Custom.kt similarity index 81% rename from src/jvm/src/test/kotlin/integration/common/Custom.kt rename to src/jvm/src/test/kotlin/jvm/integration/common/Custom.kt index 5e8d106..34a8160 100644 --- a/src/jvm/src/test/kotlin/integration/common/Custom.kt +++ b/src/jvm/src/test/kotlin/jvm/integration/common/Custom.kt @@ -1,16 +1,12 @@ -package solutions.bitbadger.documents.java.integration.common +package solutions.bitbadger.documents.jvm.integration.common -import solutions.bitbadger.documents.Configuration -import solutions.bitbadger.documents.Field -import solutions.bitbadger.documents.Parameter -import solutions.bitbadger.documents.ParameterType -import solutions.bitbadger.documents.common.* -import solutions.bitbadger.documents.java.* -import solutions.bitbadger.documents.java.extensions.* -import solutions.bitbadger.documents.java.integration.JsonDocument -import solutions.bitbadger.documents.java.integration.TEST_TABLE -import solutions.bitbadger.documents.java.integration.ThrowawayDatabase -import solutions.bitbadger.documents.java.jvm.Results +import solutions.bitbadger.documents.* +import solutions.bitbadger.documents.extensions.* +import solutions.bitbadger.documents.jvm.Results +import solutions.bitbadger.documents.query.Count +import solutions.bitbadger.documents.query.Delete +import solutions.bitbadger.documents.query.Find +import solutions.bitbadger.documents.support.* import kotlin.test.assertEquals import kotlin.test.assertNotNull import kotlin.test.assertNull diff --git a/src/jvm/src/test/kotlin/integration/common/Definition.kt b/src/jvm/src/test/kotlin/jvm/integration/common/Definition.kt similarity index 84% rename from src/jvm/src/test/kotlin/integration/common/Definition.kt rename to src/jvm/src/test/kotlin/jvm/integration/common/Definition.kt index 7c7dc31..0d7aa26 100644 --- a/src/jvm/src/test/kotlin/integration/common/Definition.kt +++ b/src/jvm/src/test/kotlin/jvm/integration/common/Definition.kt @@ -1,11 +1,11 @@ -package solutions.bitbadger.documents.java.integration.common +package solutions.bitbadger.documents.jvm.integration.common import solutions.bitbadger.documents.DocumentIndex -import solutions.bitbadger.documents.java.extensions.ensureDocumentIndex -import solutions.bitbadger.documents.java.extensions.ensureFieldIndex -import solutions.bitbadger.documents.java.extensions.ensureTable -import solutions.bitbadger.documents.java.integration.TEST_TABLE -import solutions.bitbadger.documents.java.integration.ThrowawayDatabase +import solutions.bitbadger.documents.extensions.ensureDocumentIndex +import solutions.bitbadger.documents.extensions.ensureFieldIndex +import solutions.bitbadger.documents.extensions.ensureTable +import solutions.bitbadger.documents.support.TEST_TABLE +import solutions.bitbadger.documents.support.ThrowawayDatabase import kotlin.test.assertFalse import kotlin.test.assertTrue diff --git a/src/jvm/src/test/kotlin/integration/common/Delete.kt b/src/jvm/src/test/kotlin/jvm/integration/common/Delete.kt similarity index 90% rename from src/jvm/src/test/kotlin/integration/common/Delete.kt rename to src/jvm/src/test/kotlin/jvm/integration/common/Delete.kt index cead888..e0ceada 100644 --- a/src/jvm/src/test/kotlin/integration/common/Delete.kt +++ b/src/jvm/src/test/kotlin/jvm/integration/common/Delete.kt @@ -1,10 +1,10 @@ -package solutions.bitbadger.documents.java.integration.common +package solutions.bitbadger.documents.jvm.integration.common import solutions.bitbadger.documents.Field -import solutions.bitbadger.documents.java.extensions.* -import solutions.bitbadger.documents.java.integration.JsonDocument -import solutions.bitbadger.documents.java.integration.TEST_TABLE -import solutions.bitbadger.documents.java.integration.ThrowawayDatabase +import solutions.bitbadger.documents.extensions.* +import solutions.bitbadger.documents.support.JsonDocument +import solutions.bitbadger.documents.support.TEST_TABLE +import solutions.bitbadger.documents.support.ThrowawayDatabase import kotlin.test.assertEquals /** diff --git a/src/jvm/src/test/kotlin/integration/common/Document.kt b/src/jvm/src/test/kotlin/jvm/integration/common/Document.kt similarity index 96% rename from src/jvm/src/test/kotlin/integration/common/Document.kt rename to src/jvm/src/test/kotlin/jvm/integration/common/Document.kt index 43fa8fa..5b8e7ec 100644 --- a/src/jvm/src/test/kotlin/integration/common/Document.kt +++ b/src/jvm/src/test/kotlin/jvm/integration/common/Document.kt @@ -1,11 +1,10 @@ -package solutions.bitbadger.documents.java.integration.common +package solutions.bitbadger.documents.jvm.integration.common -import AutoId +import solutions.bitbadger.documents.AutoId import solutions.bitbadger.documents.Configuration import solutions.bitbadger.documents.Field -import solutions.bitbadger.documents.common.* -import solutions.bitbadger.documents.java.extensions.* -import solutions.bitbadger.documents.java.integration.* +import solutions.bitbadger.documents.extensions.* +import solutions.bitbadger.documents.support.* import kotlin.test.* /** diff --git a/src/jvm/src/test/kotlin/integration/common/Exists.kt b/src/jvm/src/test/kotlin/jvm/integration/common/Exists.kt similarity index 79% rename from src/jvm/src/test/kotlin/integration/common/Exists.kt rename to src/jvm/src/test/kotlin/jvm/integration/common/Exists.kt index 750eb07..a981f81 100644 --- a/src/jvm/src/test/kotlin/integration/common/Exists.kt +++ b/src/jvm/src/test/kotlin/jvm/integration/common/Exists.kt @@ -1,13 +1,8 @@ -package solutions.bitbadger.documents.java.integration.common +package solutions.bitbadger.documents.jvm.integration.common import solutions.bitbadger.documents.Field -import solutions.bitbadger.documents.java.extensions.existsByContains -import solutions.bitbadger.documents.java.extensions.existsByFields -import solutions.bitbadger.documents.java.extensions.existsById -import solutions.bitbadger.documents.java.extensions.existsByJsonPath -import solutions.bitbadger.documents.java.integration.JsonDocument -import solutions.bitbadger.documents.java.integration.TEST_TABLE -import solutions.bitbadger.documents.java.integration.ThrowawayDatabase +import solutions.bitbadger.documents.extensions.* +import solutions.bitbadger.documents.support.* import kotlin.test.assertFalse import kotlin.test.assertTrue diff --git a/src/jvm/src/test/kotlin/integration/common/Find.kt b/src/jvm/src/test/kotlin/jvm/integration/common/Find.kt similarity index 98% rename from src/jvm/src/test/kotlin/integration/common/Find.kt rename to src/jvm/src/test/kotlin/jvm/integration/common/Find.kt index d6fb4e5..03aaa94 100644 --- a/src/jvm/src/test/kotlin/integration/common/Find.kt +++ b/src/jvm/src/test/kotlin/jvm/integration/common/Find.kt @@ -1,11 +1,10 @@ -package solutions.bitbadger.documents.java.integration.common +package solutions.bitbadger.documents.jvm.integration.common import solutions.bitbadger.documents.Configuration import solutions.bitbadger.documents.Field import solutions.bitbadger.documents.FieldMatch -import solutions.bitbadger.documents.common.* -import solutions.bitbadger.documents.java.extensions.* -import solutions.bitbadger.documents.java.integration.* +import solutions.bitbadger.documents.extensions.* +import solutions.bitbadger.documents.support.* import kotlin.test.assertEquals import kotlin.test.assertNotNull import kotlin.test.assertNull diff --git a/src/jvm/src/test/kotlin/integration/common/Patch.kt b/src/jvm/src/test/kotlin/jvm/integration/common/Patch.kt similarity index 91% rename from src/jvm/src/test/kotlin/integration/common/Patch.kt rename to src/jvm/src/test/kotlin/jvm/integration/common/Patch.kt index a74e670..30c0731 100644 --- a/src/jvm/src/test/kotlin/integration/common/Patch.kt +++ b/src/jvm/src/test/kotlin/jvm/integration/common/Patch.kt @@ -1,10 +1,8 @@ -package solutions.bitbadger.documents.java.integration.common +package solutions.bitbadger.documents.jvm.integration.common import solutions.bitbadger.documents.Field -import solutions.bitbadger.documents.java.extensions.* -import solutions.bitbadger.documents.java.integration.JsonDocument -import solutions.bitbadger.documents.java.integration.TEST_TABLE -import solutions.bitbadger.documents.java.integration.ThrowawayDatabase +import solutions.bitbadger.documents.extensions.* +import solutions.bitbadger.documents.support.* import kotlin.test.assertEquals import kotlin.test.assertFalse import kotlin.test.assertNotNull diff --git a/src/jvm/src/test/kotlin/integration/common/RemoveFields.kt b/src/jvm/src/test/kotlin/jvm/integration/common/RemoveFields.kt similarity index 93% rename from src/jvm/src/test/kotlin/integration/common/RemoveFields.kt rename to src/jvm/src/test/kotlin/jvm/integration/common/RemoveFields.kt index f70251e..2c90f1b 100644 --- a/src/jvm/src/test/kotlin/integration/common/RemoveFields.kt +++ b/src/jvm/src/test/kotlin/jvm/integration/common/RemoveFields.kt @@ -1,10 +1,8 @@ -package solutions.bitbadger.documents.java.integration.common +package solutions.bitbadger.documents.jvm.integration.common import solutions.bitbadger.documents.Field -import solutions.bitbadger.documents.java.extensions.* -import solutions.bitbadger.documents.java.integration.JsonDocument -import solutions.bitbadger.documents.java.integration.TEST_TABLE -import solutions.bitbadger.documents.java.integration.ThrowawayDatabase +import solutions.bitbadger.documents.extensions.* +import solutions.bitbadger.documents.support.* import kotlin.test.* diff --git a/src/jvm/src/test/kotlin/integration/postgresql/CountIT.kt b/src/jvm/src/test/kotlin/jvm/integration/postgresql/CountIT.kt similarity index 90% rename from src/jvm/src/test/kotlin/integration/postgresql/CountIT.kt rename to src/jvm/src/test/kotlin/jvm/integration/postgresql/CountIT.kt index 04afcc4..21a50c1 100644 --- a/src/jvm/src/test/kotlin/integration/postgresql/CountIT.kt +++ b/src/jvm/src/test/kotlin/jvm/integration/postgresql/CountIT.kt @@ -1,7 +1,7 @@ -package solutions.bitbadger.documents.java.integration.postgresql +package solutions.bitbadger.documents.jvm.integration.postgresql import org.junit.jupiter.api.DisplayName -import solutions.bitbadger.documents.java.integration.common.Count +import solutions.bitbadger.documents.jvm.integration.common.Count import kotlin.test.Test /** diff --git a/src/jvm/src/test/kotlin/integration/postgresql/CustomIT.kt b/src/jvm/src/test/kotlin/jvm/integration/postgresql/CustomIT.kt similarity index 89% rename from src/jvm/src/test/kotlin/integration/postgresql/CustomIT.kt rename to src/jvm/src/test/kotlin/jvm/integration/postgresql/CustomIT.kt index 673d78d..a8ea10e 100644 --- a/src/jvm/src/test/kotlin/integration/postgresql/CustomIT.kt +++ b/src/jvm/src/test/kotlin/jvm/integration/postgresql/CustomIT.kt @@ -1,7 +1,7 @@ -package solutions.bitbadger.documents.java.integration.postgresql +package solutions.bitbadger.documents.jvm.integration.postgresql import org.junit.jupiter.api.DisplayName -import solutions.bitbadger.documents.java.integration.common.Custom +import solutions.bitbadger.documents.jvm.integration.common.Custom import kotlin.test.Test diff --git a/src/jvm/src/test/kotlin/integration/postgresql/DefinitionIT.kt b/src/jvm/src/test/kotlin/jvm/integration/postgresql/DefinitionIT.kt similarity index 86% rename from src/jvm/src/test/kotlin/integration/postgresql/DefinitionIT.kt rename to src/jvm/src/test/kotlin/jvm/integration/postgresql/DefinitionIT.kt index ddf47a6..298fb93 100644 --- a/src/jvm/src/test/kotlin/integration/postgresql/DefinitionIT.kt +++ b/src/jvm/src/test/kotlin/jvm/integration/postgresql/DefinitionIT.kt @@ -1,7 +1,7 @@ -package solutions.bitbadger.documents.java.integration.postgresql +package solutions.bitbadger.documents.jvm.integration.postgresql import org.junit.jupiter.api.DisplayName -import solutions.bitbadger.documents.java.integration.common.Definition +import solutions.bitbadger.documents.jvm.integration.common.Definition import kotlin.test.Test /** diff --git a/src/jvm/src/test/kotlin/integration/postgresql/DeleteIT.kt b/src/jvm/src/test/kotlin/jvm/integration/postgresql/DeleteIT.kt similarity index 91% rename from src/jvm/src/test/kotlin/integration/postgresql/DeleteIT.kt rename to src/jvm/src/test/kotlin/jvm/integration/postgresql/DeleteIT.kt index f5332c7..be56697 100644 --- a/src/jvm/src/test/kotlin/integration/postgresql/DeleteIT.kt +++ b/src/jvm/src/test/kotlin/jvm/integration/postgresql/DeleteIT.kt @@ -1,7 +1,7 @@ -package solutions.bitbadger.documents.java.integration.postgresql +package solutions.bitbadger.documents.jvm.integration.postgresql import org.junit.jupiter.api.DisplayName -import solutions.bitbadger.documents.java.integration.common.Delete +import solutions.bitbadger.documents.jvm.integration.common.Delete import kotlin.test.Test /** diff --git a/src/jvm/src/test/kotlin/integration/postgresql/DocumentIT.kt b/src/jvm/src/test/kotlin/jvm/integration/postgresql/DocumentIT.kt similarity index 91% rename from src/jvm/src/test/kotlin/integration/postgresql/DocumentIT.kt rename to src/jvm/src/test/kotlin/jvm/integration/postgresql/DocumentIT.kt index bb070d5..478e9e1 100644 --- a/src/jvm/src/test/kotlin/integration/postgresql/DocumentIT.kt +++ b/src/jvm/src/test/kotlin/jvm/integration/postgresql/DocumentIT.kt @@ -1,7 +1,7 @@ -package solutions.bitbadger.documents.java.integration.postgresql +package solutions.bitbadger.documents.jvm.integration.postgresql import org.junit.jupiter.api.DisplayName -import solutions.bitbadger.documents.java.integration.common.Document +import solutions.bitbadger.documents.jvm.integration.common.Document import kotlin.test.Test /** diff --git a/src/jvm/src/test/kotlin/integration/postgresql/ExistsIT.kt b/src/jvm/src/test/kotlin/jvm/integration/postgresql/ExistsIT.kt similarity index 91% rename from src/jvm/src/test/kotlin/integration/postgresql/ExistsIT.kt rename to src/jvm/src/test/kotlin/jvm/integration/postgresql/ExistsIT.kt index 4c358e3..848962a 100644 --- a/src/jvm/src/test/kotlin/integration/postgresql/ExistsIT.kt +++ b/src/jvm/src/test/kotlin/jvm/integration/postgresql/ExistsIT.kt @@ -1,7 +1,7 @@ -package solutions.bitbadger.documents.java.integration.postgresql +package solutions.bitbadger.documents.jvm.integration.postgresql import org.junit.jupiter.api.DisplayName -import solutions.bitbadger.documents.java.integration.common.Exists +import solutions.bitbadger.documents.jvm.integration.common.Exists import kotlin.test.Test /** diff --git a/src/jvm/src/test/kotlin/integration/postgresql/FindIT.kt b/src/jvm/src/test/kotlin/jvm/integration/postgresql/FindIT.kt similarity index 97% rename from src/jvm/src/test/kotlin/integration/postgresql/FindIT.kt rename to src/jvm/src/test/kotlin/jvm/integration/postgresql/FindIT.kt index 9907a6c..b6d8e98 100644 --- a/src/jvm/src/test/kotlin/integration/postgresql/FindIT.kt +++ b/src/jvm/src/test/kotlin/jvm/integration/postgresql/FindIT.kt @@ -1,7 +1,7 @@ -package solutions.bitbadger.documents.java.integration.postgresql +package solutions.bitbadger.documents.jvm.integration.postgresql import org.junit.jupiter.api.DisplayName -import solutions.bitbadger.documents.java.integration.common.Find +import solutions.bitbadger.documents.jvm.integration.common.Find import kotlin.test.Test /** diff --git a/src/jvm/src/test/kotlin/integration/postgresql/PatchIT.kt b/src/jvm/src/test/kotlin/jvm/integration/postgresql/PatchIT.kt similarity index 91% rename from src/jvm/src/test/kotlin/integration/postgresql/PatchIT.kt rename to src/jvm/src/test/kotlin/jvm/integration/postgresql/PatchIT.kt index 2bf5e63..7cedf46 100644 --- a/src/jvm/src/test/kotlin/integration/postgresql/PatchIT.kt +++ b/src/jvm/src/test/kotlin/jvm/integration/postgresql/PatchIT.kt @@ -1,7 +1,7 @@ -package solutions.bitbadger.documents.java.integration.postgresql +package solutions.bitbadger.documents.jvm.integration.postgresql import org.junit.jupiter.api.DisplayName -import solutions.bitbadger.documents.java.integration.common.Patch +import solutions.bitbadger.documents.jvm.integration.common.Patch import kotlin.test.Test /** diff --git a/src/jvm/src/test/kotlin/integration/postgresql/PgDB.kt b/src/jvm/src/test/kotlin/jvm/integration/postgresql/PgDB.kt similarity index 66% rename from src/jvm/src/test/kotlin/integration/postgresql/PgDB.kt rename to src/jvm/src/test/kotlin/jvm/integration/postgresql/PgDB.kt index 5c90daa..6f60f71 100644 --- a/src/jvm/src/test/kotlin/integration/postgresql/PgDB.kt +++ b/src/jvm/src/test/kotlin/jvm/integration/postgresql/PgDB.kt @@ -1,18 +1,11 @@ -package solutions.bitbadger.documents.java.integration.postgresql +package solutions.bitbadger.documents.jvm.integration.postgresql -import AutoId -import solutions.bitbadger.documents.Configuration -import solutions.bitbadger.documents.Parameter -import solutions.bitbadger.documents.ParameterType -import solutions.bitbadger.documents.common.* -import solutions.bitbadger.documents.java.* -import solutions.bitbadger.documents.java.extensions.customNonQuery -import solutions.bitbadger.documents.java.extensions.customScalar -import solutions.bitbadger.documents.java.extensions.ensureTable -import solutions.bitbadger.documents.java.integration.TEST_TABLE -import solutions.bitbadger.documents.java.integration.ThrowawayDatabase -import solutions.bitbadger.documents.java.jvm.DocumentConfig -import solutions.bitbadger.documents.java.jvm.Results +import solutions.bitbadger.documents.* +import solutions.bitbadger.documents.extensions.customNonQuery +import solutions.bitbadger.documents.extensions.customScalar +import solutions.bitbadger.documents.extensions.ensureTable +import solutions.bitbadger.documents.jvm.* +import solutions.bitbadger.documents.support.* /** * A wrapper for a throwaway PostgreSQL database diff --git a/src/jvm/src/test/kotlin/integration/postgresql/RemoveFieldsIT.kt b/src/jvm/src/test/kotlin/jvm/integration/postgresql/RemoveFieldsIT.kt similarity index 94% rename from src/jvm/src/test/kotlin/integration/postgresql/RemoveFieldsIT.kt rename to src/jvm/src/test/kotlin/jvm/integration/postgresql/RemoveFieldsIT.kt index 4fa0fac..4919ce8 100644 --- a/src/jvm/src/test/kotlin/integration/postgresql/RemoveFieldsIT.kt +++ b/src/jvm/src/test/kotlin/jvm/integration/postgresql/RemoveFieldsIT.kt @@ -1,7 +1,7 @@ -package solutions.bitbadger.documents.java.integration.postgresql +package solutions.bitbadger.documents.jvm.integration.postgresql import org.junit.jupiter.api.DisplayName -import solutions.bitbadger.documents.java.integration.common.RemoveFields +import solutions.bitbadger.documents.jvm.integration.common.RemoveFields import kotlin.test.Test /** diff --git a/src/jvm/src/test/kotlin/integration/sqlite/CountIT.kt b/src/jvm/src/test/kotlin/jvm/integration/sqlite/CountIT.kt similarity index 89% rename from src/jvm/src/test/kotlin/integration/sqlite/CountIT.kt rename to src/jvm/src/test/kotlin/jvm/integration/sqlite/CountIT.kt index 3b4aeda..5d2d269 100644 --- a/src/jvm/src/test/kotlin/integration/sqlite/CountIT.kt +++ b/src/jvm/src/test/kotlin/jvm/integration/sqlite/CountIT.kt @@ -1,9 +1,9 @@ -package solutions.bitbadger.documents.java.integration.sqlite +package solutions.bitbadger.documents.jvm.integration.sqlite import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.assertThrows import solutions.bitbadger.documents.DocumentException -import solutions.bitbadger.documents.java.integration.common.Count +import solutions.bitbadger.documents.jvm.integration.common.Count import kotlin.test.Test /** diff --git a/src/jvm/src/test/kotlin/integration/sqlite/CustomIT.kt b/src/jvm/src/test/kotlin/jvm/integration/sqlite/CustomIT.kt similarity index 89% rename from src/jvm/src/test/kotlin/integration/sqlite/CustomIT.kt rename to src/jvm/src/test/kotlin/jvm/integration/sqlite/CustomIT.kt index 047371f..5d9b3dc 100644 --- a/src/jvm/src/test/kotlin/integration/sqlite/CustomIT.kt +++ b/src/jvm/src/test/kotlin/jvm/integration/sqlite/CustomIT.kt @@ -1,7 +1,7 @@ -package solutions.bitbadger.documents.java.integration.sqlite +package solutions.bitbadger.documents.jvm.integration.sqlite import org.junit.jupiter.api.DisplayName -import solutions.bitbadger.documents.java.integration.common.Custom +import solutions.bitbadger.documents.jvm.integration.common.Custom import kotlin.test.Test /** diff --git a/src/jvm/src/test/kotlin/integration/sqlite/DefinitionIT.kt b/src/jvm/src/test/kotlin/jvm/integration/sqlite/DefinitionIT.kt similarity index 88% rename from src/jvm/src/test/kotlin/integration/sqlite/DefinitionIT.kt rename to src/jvm/src/test/kotlin/jvm/integration/sqlite/DefinitionIT.kt index b43f661..313eab5 100644 --- a/src/jvm/src/test/kotlin/integration/sqlite/DefinitionIT.kt +++ b/src/jvm/src/test/kotlin/jvm/integration/sqlite/DefinitionIT.kt @@ -1,9 +1,9 @@ -package solutions.bitbadger.documents.java.integration.sqlite +package solutions.bitbadger.documents.jvm.integration.sqlite import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.assertThrows import solutions.bitbadger.documents.DocumentException -import solutions.bitbadger.documents.java.integration.common.Definition +import solutions.bitbadger.documents.jvm.integration.common.Definition import kotlin.test.Test /** diff --git a/src/jvm/src/test/kotlin/integration/sqlite/DeleteIT.kt b/src/jvm/src/test/kotlin/jvm/integration/sqlite/DeleteIT.kt similarity index 90% rename from src/jvm/src/test/kotlin/integration/sqlite/DeleteIT.kt rename to src/jvm/src/test/kotlin/jvm/integration/sqlite/DeleteIT.kt index 9947de5..7975e1a 100644 --- a/src/jvm/src/test/kotlin/integration/sqlite/DeleteIT.kt +++ b/src/jvm/src/test/kotlin/jvm/integration/sqlite/DeleteIT.kt @@ -1,9 +1,9 @@ -package solutions.bitbadger.documents.java.integration.sqlite +package solutions.bitbadger.documents.jvm.integration.sqlite import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.assertThrows import solutions.bitbadger.documents.DocumentException -import solutions.bitbadger.documents.java.integration.common.Delete +import solutions.bitbadger.documents.jvm.integration.common.Delete import kotlin.test.Test /** diff --git a/src/jvm/src/test/kotlin/integration/sqlite/DocumentIT.kt b/src/jvm/src/test/kotlin/jvm/integration/sqlite/DocumentIT.kt similarity index 92% rename from src/jvm/src/test/kotlin/integration/sqlite/DocumentIT.kt rename to src/jvm/src/test/kotlin/jvm/integration/sqlite/DocumentIT.kt index c5317e7..414dbcd 100644 --- a/src/jvm/src/test/kotlin/integration/sqlite/DocumentIT.kt +++ b/src/jvm/src/test/kotlin/jvm/integration/sqlite/DocumentIT.kt @@ -1,7 +1,7 @@ -package solutions.bitbadger.documents.java.integration.sqlite +package solutions.bitbadger.documents.jvm.integration.sqlite import org.junit.jupiter.api.DisplayName -import solutions.bitbadger.documents.java.integration.common.Document +import solutions.bitbadger.documents.jvm.integration.common.Document import kotlin.test.Test /** diff --git a/src/jvm/src/test/kotlin/integration/sqlite/ExistsIT.kt b/src/jvm/src/test/kotlin/jvm/integration/sqlite/ExistsIT.kt similarity index 90% rename from src/jvm/src/test/kotlin/integration/sqlite/ExistsIT.kt rename to src/jvm/src/test/kotlin/jvm/integration/sqlite/ExistsIT.kt index da43f75..36b0bd4 100644 --- a/src/jvm/src/test/kotlin/integration/sqlite/ExistsIT.kt +++ b/src/jvm/src/test/kotlin/jvm/integration/sqlite/ExistsIT.kt @@ -1,9 +1,9 @@ -package solutions.bitbadger.documents.java.integration.sqlite +package solutions.bitbadger.documents.jvm.integration.sqlite import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.assertThrows import solutions.bitbadger.documents.DocumentException -import solutions.bitbadger.documents.java.integration.common.Exists +import solutions.bitbadger.documents.jvm.integration.common.Exists import kotlin.test.Test /** diff --git a/src/jvm/src/test/kotlin/integration/sqlite/FindIT.kt b/src/jvm/src/test/kotlin/jvm/integration/sqlite/FindIT.kt similarity index 96% rename from src/jvm/src/test/kotlin/integration/sqlite/FindIT.kt rename to src/jvm/src/test/kotlin/jvm/integration/sqlite/FindIT.kt index b40d364..abe0aaa 100644 --- a/src/jvm/src/test/kotlin/integration/sqlite/FindIT.kt +++ b/src/jvm/src/test/kotlin/jvm/integration/sqlite/FindIT.kt @@ -1,9 +1,9 @@ -package solutions.bitbadger.documents.java.integration.sqlite +package solutions.bitbadger.documents.jvm.integration.sqlite import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.assertThrows import solutions.bitbadger.documents.DocumentException -import solutions.bitbadger.documents.java.integration.common.Find +import solutions.bitbadger.documents.jvm.integration.common.Find import kotlin.test.Test /** diff --git a/src/jvm/src/test/kotlin/integration/sqlite/PatchIT.kt b/src/jvm/src/test/kotlin/jvm/integration/sqlite/PatchIT.kt similarity index 90% rename from src/jvm/src/test/kotlin/integration/sqlite/PatchIT.kt rename to src/jvm/src/test/kotlin/jvm/integration/sqlite/PatchIT.kt index 7c2a15a..ac1d2c4 100644 --- a/src/jvm/src/test/kotlin/integration/sqlite/PatchIT.kt +++ b/src/jvm/src/test/kotlin/jvm/integration/sqlite/PatchIT.kt @@ -1,9 +1,9 @@ -package solutions.bitbadger.documents.java.integration.sqlite +package solutions.bitbadger.documents.jvm.integration.sqlite import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.assertThrows import solutions.bitbadger.documents.DocumentException -import solutions.bitbadger.documents.java.integration.common.Patch +import solutions.bitbadger.documents.jvm.integration.common.Patch import kotlin.test.Test /** diff --git a/src/jvm/src/test/kotlin/integration/sqlite/RemoveFieldsIT.kt b/src/jvm/src/test/kotlin/jvm/integration/sqlite/RemoveFieldsIT.kt similarity index 92% rename from src/jvm/src/test/kotlin/integration/sqlite/RemoveFieldsIT.kt rename to src/jvm/src/test/kotlin/jvm/integration/sqlite/RemoveFieldsIT.kt index 4dc23dd..7518ab4 100644 --- a/src/jvm/src/test/kotlin/integration/sqlite/RemoveFieldsIT.kt +++ b/src/jvm/src/test/kotlin/jvm/integration/sqlite/RemoveFieldsIT.kt @@ -1,9 +1,9 @@ -package solutions.bitbadger.documents.java.integration.sqlite +package solutions.bitbadger.documents.jvm.integration.sqlite import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.assertThrows import solutions.bitbadger.documents.DocumentException -import solutions.bitbadger.documents.java.integration.common.RemoveFields +import solutions.bitbadger.documents.jvm.integration.common.RemoveFields import kotlin.test.Test /** diff --git a/src/jvm/src/test/kotlin/integration/sqlite/SQLiteDB.kt b/src/jvm/src/test/kotlin/jvm/integration/sqlite/SQLiteDB.kt similarity index 53% rename from src/jvm/src/test/kotlin/integration/sqlite/SQLiteDB.kt rename to src/jvm/src/test/kotlin/jvm/integration/sqlite/SQLiteDB.kt index cdcbd32..609124e 100644 --- a/src/jvm/src/test/kotlin/integration/sqlite/SQLiteDB.kt +++ b/src/jvm/src/test/kotlin/jvm/integration/sqlite/SQLiteDB.kt @@ -1,17 +1,10 @@ -package solutions.bitbadger.documents.java.integration.sqlite +package solutions.bitbadger.documents.jvm.integration.sqlite -import AutoId -import solutions.bitbadger.documents.Configuration -import solutions.bitbadger.documents.Parameter -import solutions.bitbadger.documents.ParameterType -import solutions.bitbadger.documents.common.* -import solutions.bitbadger.documents.java.* -import solutions.bitbadger.documents.java.extensions.customScalar -import solutions.bitbadger.documents.java.extensions.ensureTable -import solutions.bitbadger.documents.java.integration.TEST_TABLE -import solutions.bitbadger.documents.java.integration.ThrowawayDatabase -import solutions.bitbadger.documents.java.jvm.DocumentConfig -import solutions.bitbadger.documents.java.jvm.Results +import solutions.bitbadger.documents.* +import solutions.bitbadger.documents.extensions.customScalar +import solutions.bitbadger.documents.extensions.ensureTable +import solutions.bitbadger.documents.jvm.* +import solutions.bitbadger.documents.support.* import java.io.File /** diff --git a/src/common/src/test/kotlin/query/CountTest.kt b/src/jvm/src/test/kotlin/query/CountTest.kt similarity index 96% rename from src/common/src/test/kotlin/query/CountTest.kt rename to src/jvm/src/test/kotlin/query/CountTest.kt index 48f4ddb..7943110 100644 --- a/src/common/src/test/kotlin/query/CountTest.kt +++ b/src/jvm/src/test/kotlin/query/CountTest.kt @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.common.query +package solutions.bitbadger.documents.query import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.DisplayName @@ -8,7 +8,6 @@ import solutions.bitbadger.documents.Configuration import solutions.bitbadger.documents.Dialect import solutions.bitbadger.documents.DocumentException import solutions.bitbadger.documents.Field -import solutions.bitbadger.documents.java.query.Count import kotlin.test.assertEquals /** diff --git a/src/common/src/test/kotlin/query/DefinitionTest.kt b/src/jvm/src/test/kotlin/query/DefinitionTest.kt similarity index 98% rename from src/common/src/test/kotlin/query/DefinitionTest.kt rename to src/jvm/src/test/kotlin/query/DefinitionTest.kt index 7ab6436..4a37200 100644 --- a/src/common/src/test/kotlin/query/DefinitionTest.kt +++ b/src/jvm/src/test/kotlin/query/DefinitionTest.kt @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.common.query +package solutions.bitbadger.documents.query import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.DisplayName diff --git a/src/common/src/test/kotlin/query/DeleteTest.kt b/src/jvm/src/test/kotlin/query/DeleteTest.kt similarity index 98% rename from src/common/src/test/kotlin/query/DeleteTest.kt rename to src/jvm/src/test/kotlin/query/DeleteTest.kt index e9f10ee..dfdd80a 100644 --- a/src/common/src/test/kotlin/query/DeleteTest.kt +++ b/src/jvm/src/test/kotlin/query/DeleteTest.kt @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.common.query +package solutions.bitbadger.documents.query import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.DisplayName diff --git a/src/common/src/test/kotlin/query/DocumentTest.kt b/src/jvm/src/test/kotlin/query/DocumentTest.kt similarity index 97% rename from src/common/src/test/kotlin/query/DocumentTest.kt rename to src/jvm/src/test/kotlin/query/DocumentTest.kt index cf59b0c..6566c7f 100644 --- a/src/common/src/test/kotlin/query/DocumentTest.kt +++ b/src/jvm/src/test/kotlin/query/DocumentTest.kt @@ -1,14 +1,13 @@ -package solutions.bitbadger.documents.common.query +package solutions.bitbadger.documents.query import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows -import AutoId +import solutions.bitbadger.documents.AutoId import solutions.bitbadger.documents.Configuration import solutions.bitbadger.documents.Dialect import solutions.bitbadger.documents.DocumentException -import solutions.bitbadger.documents.java.query.Document import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/src/common/src/test/kotlin/query/ExistsTest.kt b/src/jvm/src/test/kotlin/query/ExistsTest.kt similarity index 98% rename from src/common/src/test/kotlin/query/ExistsTest.kt rename to src/jvm/src/test/kotlin/query/ExistsTest.kt index 7b852c0..fb22189 100644 --- a/src/common/src/test/kotlin/query/ExistsTest.kt +++ b/src/jvm/src/test/kotlin/query/ExistsTest.kt @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.common.query +package solutions.bitbadger.documents.query import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.DisplayName diff --git a/src/common/src/test/kotlin/query/FindTest.kt b/src/jvm/src/test/kotlin/query/FindTest.kt similarity index 98% rename from src/common/src/test/kotlin/query/FindTest.kt rename to src/jvm/src/test/kotlin/query/FindTest.kt index d0b6583..5ad3e5a 100644 --- a/src/common/src/test/kotlin/query/FindTest.kt +++ b/src/jvm/src/test/kotlin/query/FindTest.kt @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.common.query +package solutions.bitbadger.documents.query import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.DisplayName diff --git a/src/common/src/test/kotlin/query/PatchTest.kt b/src/jvm/src/test/kotlin/query/PatchTest.kt similarity index 98% rename from src/common/src/test/kotlin/query/PatchTest.kt rename to src/jvm/src/test/kotlin/query/PatchTest.kt index a7f5675..fd0cfad 100644 --- a/src/common/src/test/kotlin/query/PatchTest.kt +++ b/src/jvm/src/test/kotlin/query/PatchTest.kt @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.common.query +package solutions.bitbadger.documents.query import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.DisplayName diff --git a/src/common/src/test/kotlin/query/QueryTest.kt b/src/jvm/src/test/kotlin/query/QueryTest.kt similarity index 94% rename from src/common/src/test/kotlin/query/QueryTest.kt rename to src/jvm/src/test/kotlin/query/QueryTest.kt index 912f9c4..6788ac4 100644 --- a/src/common/src/test/kotlin/query/QueryTest.kt +++ b/src/jvm/src/test/kotlin/query/QueryTest.kt @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.common.query +package solutions.bitbadger.documents.query import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.DisplayName @@ -7,9 +7,6 @@ import solutions.bitbadger.documents.Configuration import solutions.bitbadger.documents.Dialect import solutions.bitbadger.documents.Field import solutions.bitbadger.documents.FieldMatch -import solutions.bitbadger.documents.java.query.byFields -import solutions.bitbadger.documents.java.query.byId -import solutions.bitbadger.documents.java.query.orderBy import kotlin.test.assertEquals /** @@ -29,7 +26,7 @@ class QueryTest { @Test @DisplayName("statementWhere generates correctly") fun statementWhere() = - assertEquals("x WHERE y", solutions.bitbadger.documents.java.query.statementWhere("x", "y"), "Statements not combined correctly") + assertEquals("x WHERE y", statementWhere("x", "y"), "Statements not combined correctly") @Test @DisplayName("byId generates a numeric ID query (PostgreSQL)") diff --git a/src/common/src/test/kotlin/query/RemoveFieldsTest.kt b/src/jvm/src/test/kotlin/query/RemoveFieldsTest.kt similarity index 97% rename from src/common/src/test/kotlin/query/RemoveFieldsTest.kt rename to src/jvm/src/test/kotlin/query/RemoveFieldsTest.kt index 78199f8..34fce2d 100644 --- a/src/common/src/test/kotlin/query/RemoveFieldsTest.kt +++ b/src/jvm/src/test/kotlin/query/RemoveFieldsTest.kt @@ -1,11 +1,10 @@ -package solutions.bitbadger.documents.common.query +package solutions.bitbadger.documents.query import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows import solutions.bitbadger.documents.* -import solutions.bitbadger.documents.common.* import kotlin.test.assertEquals /** diff --git a/src/common/src/test/kotlin/query/WhereTest.kt b/src/jvm/src/test/kotlin/query/WhereTest.kt similarity index 97% rename from src/common/src/test/kotlin/query/WhereTest.kt rename to src/jvm/src/test/kotlin/query/WhereTest.kt index a5ae71b..cdac60d 100644 --- a/src/common/src/test/kotlin/query/WhereTest.kt +++ b/src/jvm/src/test/kotlin/query/WhereTest.kt @@ -1,12 +1,10 @@ -package solutions.bitbadger.documents.common.query +package solutions.bitbadger.documents.query import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows import solutions.bitbadger.documents.* -import solutions.bitbadger.documents.common.* -import solutions.bitbadger.documents.java.query.Where import kotlin.test.assertEquals /** diff --git a/src/jvm/src/test/kotlin/JacksonDocumentSerializer.kt b/src/jvm/src/test/kotlin/support/JacksonDocumentSerializer.kt similarity index 91% rename from src/jvm/src/test/kotlin/JacksonDocumentSerializer.kt rename to src/jvm/src/test/kotlin/support/JacksonDocumentSerializer.kt index a0b493f..fb211c2 100644 --- a/src/jvm/src/test/kotlin/JacksonDocumentSerializer.kt +++ b/src/jvm/src/test/kotlin/support/JacksonDocumentSerializer.kt @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.java +package solutions.bitbadger.documents.support import solutions.bitbadger.documents.DocumentSerializer import com.fasterxml.jackson.databind.ObjectMapper diff --git a/src/jvm/src/test/kotlin/integration/ThrowawayDatabase.kt b/src/jvm/src/test/kotlin/support/ThrowawayDatabase.kt similarity index 89% rename from src/jvm/src/test/kotlin/integration/ThrowawayDatabase.kt rename to src/jvm/src/test/kotlin/support/ThrowawayDatabase.kt index 1e46251..9c63c30 100644 --- a/src/jvm/src/test/kotlin/integration/ThrowawayDatabase.kt +++ b/src/jvm/src/test/kotlin/support/ThrowawayDatabase.kt @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.java.integration +package solutions.bitbadger.documents.support import java.sql.Connection diff --git a/src/jvm/src/test/kotlin/integration/Types.kt b/src/jvm/src/test/kotlin/support/Types.kt similarity index 93% rename from src/jvm/src/test/kotlin/integration/Types.kt rename to src/jvm/src/test/kotlin/support/Types.kt index 9cf9462..97385e2 100644 --- a/src/jvm/src/test/kotlin/integration/Types.kt +++ b/src/jvm/src/test/kotlin/support/Types.kt @@ -1,7 +1,7 @@ -package solutions.bitbadger.documents.java.integration +package solutions.bitbadger.documents.support import kotlinx.serialization.Serializable -import solutions.bitbadger.documents.java.extensions.insert +import solutions.bitbadger.documents.extensions.insert /** The test table name to use for integration tests */ const val TEST_TABLE = "test_table" diff --git a/src/kotlin/src/main/kotlin/Configuration.kt b/src/kotlin/src/main/kotlin/Configuration.kt deleted file mode 100644 index f8becb9..0000000 --- a/src/kotlin/src/main/kotlin/Configuration.kt +++ /dev/null @@ -1,24 +0,0 @@ -package solutions.bitbadger.documents.kotlin - -import kotlinx.serialization.json.Json - -object Configuration { - - /** - * JSON serializer; replace to configure with non-default options - * - * The default sets `encodeDefaults` to `true` and `explicitNulls` to `false`; see - * https://github.com/Kotlin/kotlinx.serialization/blob/master/docs/json.md for all configuration options - */ - @JvmField - var json = Json { - encodeDefaults = true - explicitNulls = false - coerceInputValues = true - } - - /** The JSON serializer to use for documents */ - @JvmStatic - var serializer: DocumentSerializer = DocumentSerializerKotlin() - -} diff --git a/src/kotlin/src/main/kotlin/Count.kt b/src/kotlin/src/main/kotlin/Count.kt index 02836a3..4b2f3f5 100644 --- a/src/kotlin/src/main/kotlin/Count.kt +++ b/src/kotlin/src/main/kotlin/Count.kt @@ -5,6 +5,7 @@ import solutions.bitbadger.documents.Field import solutions.bitbadger.documents.FieldMatch import solutions.bitbadger.documents.Parameter import solutions.bitbadger.documents.ParameterType +import solutions.bitbadger.documents.query.Count import java.sql.Connection diff --git a/src/kotlin/src/main/kotlin/Custom.kt b/src/kotlin/src/main/kotlin/Custom.kt index d84df88..265abd6 100644 --- a/src/kotlin/src/main/kotlin/Custom.kt +++ b/src/kotlin/src/main/kotlin/Custom.kt @@ -1,7 +1,9 @@ package solutions.bitbadger.documents.kotlin +import solutions.bitbadger.documents.* import solutions.bitbadger.documents.Configuration -import solutions.bitbadger.documents.Parameter +import solutions.bitbadger.documents.jvm.Parameters +import solutions.bitbadger.documents.jvm.Custom as JvmCustom import java.sql.Connection import java.sql.ResultSet @@ -15,17 +17,16 @@ object Custom { * * @param query The query to retrieve the results * @param parameters Parameters to use for the query - * @param clazz The class of the document to be returned * @param conn The connection over which the query should be executed * @param mapFunc The mapping function between the document and the domain item * @return A list of results for the given query */ - inline fun list( + inline fun list( query: String, parameters: Collection> = listOf(), conn: Connection, - noinline mapFunc: (ResultSet, Class) -> TDoc - ) = Custom.list(query, parameters, TDoc::class.java, conn, mapFunc) + mapFunc: (ResultSet) -> TDoc + ) = Parameters.apply(conn, query, parameters).use { Results.toCustomList(it, mapFunc) } /** * Execute a query that returns a list of results (creates connection) @@ -35,10 +36,10 @@ object Custom { * @param mapFunc The mapping function between the document and the domain item * @return A list of results for the given query */ - inline fun list( + inline fun list( query: String, parameters: Collection> = listOf(), - noinline mapFunc: (ResultSet, Class) -> TDoc + mapFunc: (ResultSet) -> TDoc ) = Configuration.dbConn().use { list(query, parameters, it, mapFunc) } /** @@ -50,12 +51,12 @@ object Custom { * @param mapFunc The mapping function between the document and the domain item * @return The document if one matches the query, `null` otherwise */ - inline fun single( + inline fun single( query: String, parameters: Collection> = listOf(), conn: Connection, - noinline mapFunc: (ResultSet, Class) -> TDoc - ) = Custom.single(query, parameters, TDoc::class.java, conn, mapFunc) + mapFunc: (ResultSet) -> TDoc + ) = list("$query LIMIT 1", parameters, conn, mapFunc).singleOrNull() /** * Execute a query that returns one or no results @@ -65,10 +66,10 @@ object Custom { * @param mapFunc The mapping function between the document and the domain item * @return The document if one matches the query, `null` otherwise */ - inline fun single( + inline fun single( query: String, parameters: Collection> = listOf(), - noinline mapFunc: (ResultSet, Class) -> TDoc + noinline mapFunc: (ResultSet) -> TDoc ) = Configuration.dbConn().use { single(query, parameters, it, mapFunc) } /** @@ -79,7 +80,7 @@ object Custom { * @param parameters Parameters to use for the query */ fun nonQuery(query: String, parameters: Collection> = listOf(), conn: Connection) = - Custom.nonQuery(query, parameters, conn) + JvmCustom.nonQuery(query, parameters, conn) /** * Execute a query that returns no results @@ -103,8 +104,13 @@ object Custom { query: String, parameters: Collection> = listOf(), conn: Connection, - noinline mapFunc: (ResultSet, Class) -> T - ) = Custom.scalar(query, parameters, T::class.java, conn, mapFunc) + mapFunc: (ResultSet) -> T + ) = Parameters.apply(conn, query, parameters).use { stmt -> + stmt.executeQuery().use { rs -> + rs.next() + mapFunc(rs) + } + } /** * Execute a query that returns a scalar result @@ -115,6 +121,6 @@ object Custom { * @return The scalar value from the query */ inline fun scalar( - query: String, parameters: Collection> = listOf(), noinline mapFunc: (ResultSet, Class) -> T + query: String, parameters: Collection> = listOf(), mapFunc: (ResultSet) -> T ) = Configuration.dbConn().use { scalar(query, parameters, it, mapFunc) } } diff --git a/src/kotlin/src/main/kotlin/DocumentConfig.kt b/src/kotlin/src/main/kotlin/DocumentConfig.kt new file mode 100644 index 0000000..cb42341 --- /dev/null +++ b/src/kotlin/src/main/kotlin/DocumentConfig.kt @@ -0,0 +1,33 @@ +package solutions.bitbadger.documents.kotlin + +import kotlinx.serialization.json.Json + +/** + * Configuration for document serialization + */ +object DocumentConfig { + + val options = Json { + coerceInputValues = true + encodeDefaults = true + explicitNulls = false + } + + /** + * Serialize a document to JSON + * + * @param document The document to be serialized + * @return The JSON string with the serialized document + */ + inline fun serialize(document: TDoc) = + options.encodeToString(document) + + /** + * Deserialize a document from JSON + * + * @param json The JSON string with the serialized document + * @return The document created from the given JSON + */ + inline fun deserialize(json: String) = + options.decodeFromString(json) +} diff --git a/src/kotlin/src/test/kotlin/DocumentConfigTest.kt b/src/kotlin/src/test/kotlin/DocumentConfigTest.kt new file mode 100644 index 0000000..9b90f19 --- /dev/null +++ b/src/kotlin/src/test/kotlin/DocumentConfigTest.kt @@ -0,0 +1,21 @@ +package solutions.bitbadger.documents.kotlin + +import org.junit.jupiter.api.DisplayName +import org.junit.jupiter.api.Test +import kotlin.test.assertFalse +import kotlin.test.assertTrue + +/** + * Unit tests for the `Configuration` object + */ +@DisplayName("Kotlin | DocumentConfig") +class DocumentConfigTest { + + @Test + @DisplayName("Default JSON options are as expected") + fun defaultJsonOptions() { + assertTrue(DocumentConfig.options.configuration.encodeDefaults, "Encode Defaults should have been set") + assertFalse(DocumentConfig.options.configuration.explicitNulls, "Explicit Nulls should not have been set") + assertTrue(DocumentConfig.options.configuration.coerceInputValues, "Coerce Input Values should have been set") + } +} diff --git a/src/main/kotlin/Custom.kt b/src/main/kotlin/Custom.kt deleted file mode 100644 index fd52866..0000000 --- a/src/main/kotlin/Custom.kt +++ /dev/null @@ -1,118 +0,0 @@ -package solutions.bitbadger.documents - -import java.sql.Connection -import java.sql.ResultSet - -/** - * Custom query execution functions - */ -object Custom { - - /** - * Execute a query that returns a list of results - * - * @param query The query to retrieve the results - * @param parameters Parameters to use for the query - * @param clazz The class of the document to be returned - * @param conn The connection over which the query should be executed - * @param mapFunc The mapping function between the document and the domain item - * @return A list of results for the given query - */ - inline fun list( - query: String, - parameters: Collection> = listOf(), - conn: Connection, - noinline mapFunc: (ResultSet, Class) -> TDoc - ) = Custom.list(query, parameters, TDoc::class.java, conn, mapFunc) - - /** - * Execute a query that returns a list of results (creates connection) - * - * @param query The query to retrieve the results - * @param parameters Parameters to use for the query - * @param mapFunc The mapping function between the document and the domain item - * @return A list of results for the given query - */ - inline fun list( - query: String, - parameters: Collection> = listOf(), - noinline mapFunc: (ResultSet, Class) -> TDoc - ) = Configuration.dbConn().use { list(query, parameters, it, mapFunc) } - - /** - * Execute a query that returns one or no results - * - * @param query The query to retrieve the results - * @param parameters Parameters to use for the query - * @param conn The connection over which the query should be executed - * @param mapFunc The mapping function between the document and the domain item - * @return The document if one matches the query, `null` otherwise - */ - inline fun single( - query: String, - parameters: Collection> = listOf(), - conn: Connection, - noinline mapFunc: (ResultSet, Class) -> TDoc - ) = Custom.single(query, parameters, TDoc::class.java, conn, mapFunc) - - /** - * Execute a query that returns one or no results - * - * @param query The query to retrieve the results - * @param parameters Parameters to use for the query - * @param mapFunc The mapping function between the document and the domain item - * @return The document if one matches the query, `null` otherwise - */ - inline fun single( - query: String, - parameters: Collection> = listOf(), - noinline mapFunc: (ResultSet, Class) -> TDoc - ) = Configuration.dbConn().use { single(query, parameters, it, mapFunc) } - - /** - * Execute a query that returns no results - * - * @param query The query to retrieve the results - * @param conn The connection over which the query should be executed - * @param parameters Parameters to use for the query - */ - fun nonQuery(query: String, parameters: Collection> = listOf(), conn: Connection) = - Custom.nonQuery(query, parameters, conn) - - /** - * Execute a query that returns no results - * - * @param query The query to retrieve the results - * @param parameters Parameters to use for the query - */ - fun nonQuery(query: String, parameters: Collection> = listOf()) = - Configuration.dbConn().use { nonQuery(query, parameters, it) } - - /** - * Execute a query that returns a scalar result - * - * @param query The query to retrieve the result - * @param parameters Parameters to use for the query - * @param conn The connection over which the query should be executed - * @param mapFunc The mapping function between the document and the domain item - * @return The scalar value from the query - */ - inline fun scalar( - query: String, - parameters: Collection> = listOf(), - conn: Connection, - noinline mapFunc: (ResultSet, Class) -> T - ) = Custom.scalar(query, parameters, T::class.java, conn, mapFunc) - - /** - * Execute a query that returns a scalar result - * - * @param query The query to retrieve the result - * @param parameters Parameters to use for the query - * @param mapFunc The mapping function between the document and the domain item - * @return The scalar value from the query - */ - inline fun scalar( - query: String, parameters: Collection> = listOf(), noinline mapFunc: (ResultSet, Class) -> T - ) = Configuration.dbConn().use { scalar(query, parameters, it, mapFunc) } -} diff --git a/src/pom.xml b/src/pom.xml index 1c520aa..96aa6fc 100644 --- a/src/pom.xml +++ b/src/pom.xml @@ -45,7 +45,6 @@ - common jvm diff --git a/src/test/java/solutions/bitbadger/documents/java/ConfigurationTest.java b/src/test/java/solutions/bitbadger/documents/java/ConfigurationTest.java deleted file mode 100644 index fe67b44..0000000 --- a/src/test/java/solutions/bitbadger/documents/java/ConfigurationTest.java +++ /dev/null @@ -1,57 +0,0 @@ -package solutions.bitbadger.documents.java; - -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import solutions.bitbadger.documents.common.Dialect; -import solutions.bitbadger.documents.common.DocumentException; - -import static org.junit.jupiter.api.Assertions.*; - -/** - * Unit tests for the `Configuration` object - */ -@DisplayName("Java | Configuration") -final public class ConfigurationTest { - - @Test - @DisplayName("Default JSON options are as expected") - public void defaultJsonOptions() { - assertTrue(Configuration.json.getConfiguration().getEncodeDefaults(), "Encode Defaults should have been set"); - assertFalse(Configuration.json.getConfiguration().getExplicitNulls(), - "Explicit Nulls should not have been set"); - assertTrue(Configuration.json.getConfiguration().getCoerceInputValues(), - "Coerce Input Values should have been set"); - } - - @Test - @DisplayName("Default ID field is `id`") - public void defaultIdField() { - assertEquals("id", Configuration.idField, "Default ID field incorrect"); - } - - @Test - @DisplayName("Default Auto ID strategy is `DISABLED`") - public void defaultAutoId() { - assertEquals(AutoId.DISABLED, Configuration.autoIdStrategy, "Default Auto ID strategy should be `disabled`"); - } - - @Test - @DisplayName("Default ID string length should be 16") - public void defaultIdStringLength() { - assertEquals(16, Configuration.idStringLength, "Default ID string length should be 16"); - } - - @Test - @DisplayName("Dialect is derived from connection string") - public void dialectIsDerived() { - try { - assertThrows(DocumentException.class, Configuration::dialect); - Configuration.setConnectionString("jdbc:postgresql:db"); - assertEquals(Dialect.POSTGRESQL, Configuration.dialect()); - } catch (DocumentException ex) { - fail(ex); - } finally { - Configuration.setConnectionString(null); - } - } -} diff --git a/src/test/kotlin/ConfigurationTest.kt b/src/test/kotlin/ConfigurationTest.kt deleted file mode 100644 index d3689f7..0000000 --- a/src/test/kotlin/ConfigurationTest.kt +++ /dev/null @@ -1,21 +0,0 @@ -package solutions.bitbadger.documents - -import org.junit.jupiter.api.DisplayName -import org.junit.jupiter.api.Test -import kotlin.test.assertFalse -import kotlin.test.assertTrue - -/** - * Unit tests for the `Configuration` object - */ -@DisplayName("Kotlin | Configuration") -class ConfigurationTest { - - @Test - @DisplayName("Default JSON options are as expected") - fun defaultJsonOptions() { - assertTrue(Configuration.json.configuration.encodeDefaults, "Encode Defaults should have been set") - assertFalse(Configuration.json.configuration.explicitNulls, "Explicit Nulls should not have been set") - assertTrue(Configuration.json.configuration.coerceInputValues, "Coerce Input Values should have been set") - } -}