From 2697ddaeed435d986fcee4a5f9fd539fc060238d Mon Sep 17 00:00:00 2001 From: "Daniel J. Summers" Date: Fri, 14 Mar 2025 21:29:31 -0400 Subject: [PATCH] Package rearrangement; build succeeds --- .../documents/common/java/AutoIdTest.java | 4 ++-- .../common/java/DocumentIndexTest.java | 2 +- .../documents/common/java/FieldMatchTest.java | 2 +- .../documents/common/java/FieldTest.java | 2 +- .../bitbadger/documents/common/java/OpTest.java | 2 +- .../common/java/ParameterNameTest.java | 2 +- .../documents/common/java/ParameterTest.java | 6 +++--- src/common/src/test/kotlin/AutoIdTest.kt | 2 ++ src/common/src/test/kotlin/ComparisonTest.kt | 1 + src/common/src/test/kotlin/ConfigurationTest.kt | 4 ++++ src/common/src/test/kotlin/DialectTest.kt | 2 ++ src/common/src/test/kotlin/DocumentIndexTest.kt | 1 + src/common/src/test/kotlin/FieldMatchTest.kt | 1 + src/common/src/test/kotlin/FieldTest.kt | 1 + src/common/src/test/kotlin/OpTest.kt | 1 + src/common/src/test/kotlin/ParameterNameTest.kt | 1 + src/common/src/test/kotlin/ParameterTest.kt | 3 +++ src/common/src/test/kotlin/query/CountTest.kt | 9 +++++---- .../src/test/kotlin/query/DefinitionTest.kt | 8 ++++---- src/common/src/test/kotlin/query/DeleteTest.kt | 8 ++++---- .../src/test/kotlin/query/DocumentTest.kt | 9 +++++---- src/common/src/test/kotlin/query/ExistsTest.kt | 8 ++++---- src/common/src/test/kotlin/query/FindTest.kt | 8 ++++---- src/common/src/test/kotlin/query/PatchTest.kt | 8 ++++---- src/common/src/test/kotlin/query/QueryTest.kt | 13 ++++++++----- .../src/test/kotlin/query/RemoveFieldsTest.kt | 1 + src/common/src/test/kotlin/query/WhereTest.kt | 2 ++ src/jvm/pom.xml | 8 -------- src/{common => jvm}/src/main/kotlin/AutoId.kt | 2 +- .../src/main/kotlin/Comparison.kt | 2 +- .../src/main/kotlin/Configuration.kt | 2 +- src/{common => jvm}/src/main/kotlin/Dialect.kt | 2 +- .../src/main/kotlin/DocumentException.kt | 2 +- .../src/main/kotlin/DocumentIndex.kt | 2 +- .../src/main/kotlin/DocumentSerializer.kt | 2 +- src/{common => jvm}/src/main/kotlin/Field.kt | 2 +- .../src/main/kotlin/FieldFormat.kt | 2 +- .../src/main/kotlin/FieldMatch.kt | 2 +- src/{common => jvm}/src/main/kotlin/Op.kt | 2 +- .../src/main/kotlin/Parameter.kt | 2 +- .../src/main/kotlin/ParameterName.kt | 2 +- .../src/main/kotlin/ParameterType.kt | 2 +- .../Connection.kt} | 5 +++-- src/jvm/src/main/kotlin/{ => jvm}/Count.kt | 7 ++++--- src/jvm/src/main/kotlin/{ => jvm}/Custom.kt | 6 +++--- src/jvm/src/main/kotlin/{ => jvm}/Definition.kt | 11 ++++++----- src/jvm/src/main/kotlin/{ => jvm}/Delete.kt | 7 ++++--- src/jvm/src/main/kotlin/{ => jvm}/Document.kt | 17 +++++++++-------- .../src/main/kotlin/{ => jvm}/DocumentConfig.kt | 4 ++-- src/jvm/src/main/kotlin/{ => jvm}/Exists.kt | 7 ++++--- src/jvm/src/main/kotlin/{ => jvm}/Find.kt | 10 ++++++---- .../kotlin/{ => jvm}/NullDocumentSerializer.kt | 4 ++-- src/jvm/src/main/kotlin/{ => jvm}/Parameters.kt | 5 +++-- src/jvm/src/main/kotlin/{ => jvm}/Patch.kt | 7 ++++--- .../src/main/kotlin/{ => jvm}/RemoveFields.kt | 7 ++++--- src/jvm/src/main/kotlin/{ => jvm}/Results.kt | 8 ++++---- .../src/main/kotlin/query/Count.kt | 8 ++++---- .../src/main/kotlin/query/Definition.kt | 4 ++-- .../src/main/kotlin/query/Delete.kt | 10 +++++----- .../src/main/kotlin/query/Document.kt | 8 ++++---- .../src/main/kotlin/query/Exists.kt | 6 +++--- .../src/main/kotlin/query/Find.kt | 10 +++++----- .../src/main/kotlin/query/Patch.kt | 14 +++++++------- .../src/main/kotlin/query/Query.kt | 10 +++++----- .../src/main/kotlin/query/RemoveFields.kt | 8 ++++---- .../src/main/kotlin/query/Where.kt | 12 ++++++------ .../documents/java/java/ParametersTest.java | 4 ++-- .../java/integration/common/CountFunctions.java | 4 ++-- .../java/java/integration/sqlite/CountIT.java | 2 +- .../java/java/testDocs/JsonDocument.java | 2 +- .../test/kotlin/JacksonDocumentSerializer.kt | 2 +- src/jvm/src/test/kotlin/ParametersTest.kt | 2 +- src/jvm/src/test/kotlin/integration/Types.kt | 2 +- .../src/test/kotlin/integration/common/Count.kt | 10 +++++----- .../test/kotlin/integration/common/Custom.kt | 9 ++++++--- .../kotlin/integration/common/Definition.kt | 8 ++++---- .../test/kotlin/integration/common/Delete.kt | 4 ++-- .../test/kotlin/integration/common/Document.kt | 5 ++++- .../test/kotlin/integration/common/Exists.kt | 10 +++++----- .../src/test/kotlin/integration/common/Find.kt | 5 ++++- .../src/test/kotlin/integration/common/Patch.kt | 4 ++-- .../kotlin/integration/common/RemoveFields.kt | 4 ++-- .../test/kotlin/integration/postgresql/PgDB.kt | 9 +++++++++ .../test/kotlin/integration/sqlite/CountIT.kt | 2 +- .../kotlin/integration/sqlite/DefinitionIT.kt | 2 +- .../test/kotlin/integration/sqlite/DeleteIT.kt | 2 +- .../test/kotlin/integration/sqlite/ExistsIT.kt | 2 +- .../test/kotlin/integration/sqlite/FindIT.kt | 2 +- .../test/kotlin/integration/sqlite/PatchIT.kt | 2 +- .../kotlin/integration/sqlite/RemoveFieldsIT.kt | 2 +- .../test/kotlin/integration/sqlite/SQLiteDB.kt | 8 ++++++++ .../src/main/kotlin/ConnectionExtensions.kt | 10 +++++----- src/kotlin/src/main/kotlin/Count.kt | 11 +++++------ src/kotlin/src/main/kotlin/Custom.kt | 5 ++--- src/kotlin/src/main/kotlin/Definition.kt | 2 +- src/kotlin/src/main/kotlin/Delete.kt | 8 ++++---- src/kotlin/src/main/kotlin/Exists.kt | 8 ++++---- src/kotlin/src/main/kotlin/Find.kt | 9 ++++----- src/kotlin/src/main/kotlin/Parameters.kt | 2 ++ src/kotlin/src/main/kotlin/Patch.kt | 8 ++++---- src/kotlin/src/main/kotlin/RemoveFields.kt | 1 + src/kotlin/src/main/kotlin/Results.kt | 7 +++---- src/main/kotlin/Custom.kt | 2 -- src/pom.xml | 2 +- 104 files changed, 288 insertions(+), 237 deletions(-) rename src/{common => jvm}/src/main/kotlin/AutoId.kt (98%) rename src/{common => jvm}/src/main/kotlin/Comparison.kt (97%) rename src/{common => jvm}/src/main/kotlin/Configuration.kt (97%) rename src/{common => jvm}/src/main/kotlin/Dialect.kt (94%) rename src/{common => jvm}/src/main/kotlin/DocumentException.kt (85%) rename src/{common => jvm}/src/main/kotlin/DocumentIndex.kt (87%) rename src/{common => jvm}/src/main/kotlin/DocumentSerializer.kt (93%) rename src/{common => jvm}/src/main/kotlin/Field.kt (99%) rename src/{common => jvm}/src/main/kotlin/FieldFormat.kt (84%) rename src/{common => jvm}/src/main/kotlin/FieldMatch.kt (83%) rename src/{common => jvm}/src/main/kotlin/Op.kt (94%) rename src/{common => jvm}/src/main/kotlin/Parameter.kt (97%) rename src/{common => jvm}/src/main/kotlin/ParameterName.kt (91%) rename src/{common => jvm}/src/main/kotlin/ParameterType.kt (87%) rename src/jvm/src/main/kotlin/{ConnectionExtensions.kt => extensions/Connection.kt} (99%) rename src/jvm/src/main/kotlin/{ => jvm}/Count.kt (96%) rename src/jvm/src/main/kotlin/{ => jvm}/Custom.kt (97%) rename src/jvm/src/main/kotlin/{ => jvm}/Definition.kt (90%) rename src/jvm/src/main/kotlin/{ => jvm}/Delete.kt (95%) rename src/jvm/src/main/kotlin/{ => jvm}/Document.kt (91%) rename src/jvm/src/main/kotlin/{ => jvm}/DocumentConfig.kt (67%) rename src/jvm/src/main/kotlin/{ => jvm}/Exists.kt (96%) rename src/jvm/src/main/kotlin/{ => jvm}/Find.kt (98%) rename src/jvm/src/main/kotlin/{ => jvm}/NullDocumentSerializer.kt (85%) rename src/jvm/src/main/kotlin/{ => jvm}/Parameters.kt (97%) rename src/jvm/src/main/kotlin/{ => jvm}/Patch.kt (96%) rename src/jvm/src/main/kotlin/{ => jvm}/RemoveFields.kt (97%) rename src/jvm/src/main/kotlin/{ => jvm}/Results.kt (93%) rename src/{common => jvm}/src/main/kotlin/query/Count.kt (87%) rename src/{common => jvm}/src/main/kotlin/query/Definition.kt (97%) rename src/{common => jvm}/src/main/kotlin/query/Delete.kt (87%) rename src/{common => jvm}/src/main/kotlin/query/Document.kt (91%) rename src/{common => jvm}/src/main/kotlin/query/Exists.kt (93%) rename src/{common => jvm}/src/main/kotlin/query/Find.kt (87%) rename src/{common => jvm}/src/main/kotlin/query/Patch.kt (84%) rename src/{common => jvm}/src/main/kotlin/query/Query.kt (90%) rename src/{common => jvm}/src/main/kotlin/query/RemoveFields.kt (92%) rename src/{common => jvm}/src/main/kotlin/query/Where.kt (87%) diff --git a/src/common/src/test/java/solutions/bitbadger/documents/common/java/AutoIdTest.java b/src/common/src/test/java/solutions/bitbadger/documents/common/java/AutoIdTest.java index 9321974..9ff6314 100644 --- a/src/common/src/test/java/solutions/bitbadger/documents/common/java/AutoIdTest.java +++ b/src/common/src/test/java/solutions/bitbadger/documents/common/java/AutoIdTest.java @@ -2,8 +2,8 @@ package solutions.bitbadger.documents.common.java; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import solutions.bitbadger.documents.common.AutoId; -import solutions.bitbadger.documents.common.DocumentException; +import AutoId; +import solutions.bitbadger.documents.DocumentException; import solutions.bitbadger.documents.java.java.testDocs.*; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/common/src/test/java/solutions/bitbadger/documents/common/java/DocumentIndexTest.java b/src/common/src/test/java/solutions/bitbadger/documents/common/java/DocumentIndexTest.java index 95716e7..9440d16 100644 --- a/src/common/src/test/java/solutions/bitbadger/documents/common/java/DocumentIndexTest.java +++ b/src/common/src/test/java/solutions/bitbadger/documents/common/java/DocumentIndexTest.java @@ -2,7 +2,7 @@ package solutions.bitbadger.documents.common.java; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import solutions.bitbadger.documents.common.DocumentIndex; +import solutions.bitbadger.documents.DocumentIndex; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/common/src/test/java/solutions/bitbadger/documents/common/java/FieldMatchTest.java b/src/common/src/test/java/solutions/bitbadger/documents/common/java/FieldMatchTest.java index c8f02da..3335d6e 100644 --- a/src/common/src/test/java/solutions/bitbadger/documents/common/java/FieldMatchTest.java +++ b/src/common/src/test/java/solutions/bitbadger/documents/common/java/FieldMatchTest.java @@ -2,7 +2,7 @@ package solutions.bitbadger.documents.common.java; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import solutions.bitbadger.documents.common.FieldMatch; +import solutions.bitbadger.documents.FieldMatch; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/common/src/test/java/solutions/bitbadger/documents/common/java/FieldTest.java b/src/common/src/test/java/solutions/bitbadger/documents/common/java/FieldTest.java index 672ff2a..22192ec 100644 --- a/src/common/src/test/java/solutions/bitbadger/documents/common/java/FieldTest.java +++ b/src/common/src/test/java/solutions/bitbadger/documents/common/java/FieldTest.java @@ -4,7 +4,7 @@ import kotlin.Pair; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import solutions.bitbadger.documents.common.*; +import solutions.bitbadger.documents.*; import java.util.Collection; import java.util.List; diff --git a/src/common/src/test/java/solutions/bitbadger/documents/common/java/OpTest.java b/src/common/src/test/java/solutions/bitbadger/documents/common/java/OpTest.java index 2d70565..d26ffbe 100644 --- a/src/common/src/test/java/solutions/bitbadger/documents/common/java/OpTest.java +++ b/src/common/src/test/java/solutions/bitbadger/documents/common/java/OpTest.java @@ -2,7 +2,7 @@ package solutions.bitbadger.documents.common.java; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import solutions.bitbadger.documents.common.Op; +import solutions.bitbadger.documents.Op; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/common/src/test/java/solutions/bitbadger/documents/common/java/ParameterNameTest.java b/src/common/src/test/java/solutions/bitbadger/documents/common/java/ParameterNameTest.java index f8bdff9..910289d 100644 --- a/src/common/src/test/java/solutions/bitbadger/documents/common/java/ParameterNameTest.java +++ b/src/common/src/test/java/solutions/bitbadger/documents/common/java/ParameterNameTest.java @@ -2,7 +2,7 @@ package solutions.bitbadger.documents.common.java; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import solutions.bitbadger.documents.common.ParameterName; +import solutions.bitbadger.documents.ParameterName; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/common/src/test/java/solutions/bitbadger/documents/common/java/ParameterTest.java b/src/common/src/test/java/solutions/bitbadger/documents/common/java/ParameterTest.java index aba9a4c..2bce5ed 100644 --- a/src/common/src/test/java/solutions/bitbadger/documents/common/java/ParameterTest.java +++ b/src/common/src/test/java/solutions/bitbadger/documents/common/java/ParameterTest.java @@ -2,9 +2,9 @@ package solutions.bitbadger.documents.common.java; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import solutions.bitbadger.documents.common.DocumentException; -import solutions.bitbadger.documents.common.Parameter; -import solutions.bitbadger.documents.common.ParameterType; +import solutions.bitbadger.documents.DocumentException; +import solutions.bitbadger.documents.Parameter; +import solutions.bitbadger.documents.ParameterType; import static org.junit.jupiter.api.Assertions.*; diff --git a/src/common/src/test/kotlin/AutoIdTest.kt b/src/common/src/test/kotlin/AutoIdTest.kt index 540342e..05f4e59 100644 --- a/src/common/src/test/kotlin/AutoIdTest.kt +++ b/src/common/src/test/kotlin/AutoIdTest.kt @@ -1,8 +1,10 @@ package solutions.bitbadger.documents.common +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/common/src/test/kotlin/ComparisonTest.kt index b40a89e..e6c5bf5 100644 --- a/src/common/src/test/kotlin/ComparisonTest.kt +++ b/src/common/src/test/kotlin/ComparisonTest.kt @@ -2,6 +2,7 @@ package solutions.bitbadger.documents.common 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/common/src/test/kotlin/ConfigurationTest.kt index cef0cb3..338b7c9 100644 --- a/src/common/src/test/kotlin/ConfigurationTest.kt +++ b/src/common/src/test/kotlin/ConfigurationTest.kt @@ -1,8 +1,12 @@ package solutions.bitbadger.documents.common +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/common/src/test/kotlin/DialectTest.kt index b2fe4b2..3eae724 100644 --- a/src/common/src/test/kotlin/DialectTest.kt +++ b/src/common/src/test/kotlin/DialectTest.kt @@ -2,6 +2,8 @@ package solutions.bitbadger.documents.common 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/common/src/test/kotlin/DocumentIndexTest.kt index 9840671..fb03e7b 100644 --- a/src/common/src/test/kotlin/DocumentIndexTest.kt +++ b/src/common/src/test/kotlin/DocumentIndexTest.kt @@ -2,6 +2,7 @@ package solutions.bitbadger.documents.common 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/common/src/test/kotlin/FieldMatchTest.kt index 2c3fdad..9c4de5a 100644 --- a/src/common/src/test/kotlin/FieldMatchTest.kt +++ b/src/common/src/test/kotlin/FieldMatchTest.kt @@ -2,6 +2,7 @@ package solutions.bitbadger.documents.common 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/common/src/test/kotlin/FieldTest.kt index c32a2a9..e3a6d4a 100644 --- a/src/common/src/test/kotlin/FieldTest.kt +++ b/src/common/src/test/kotlin/FieldTest.kt @@ -4,6 +4,7 @@ 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/common/src/test/kotlin/OpTest.kt index 6a272e9..9543275 100644 --- a/src/common/src/test/kotlin/OpTest.kt +++ b/src/common/src/test/kotlin/OpTest.kt @@ -2,6 +2,7 @@ package solutions.bitbadger.documents.common 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/common/src/test/kotlin/ParameterNameTest.kt index 93dd9c8..3c09ce0 100644 --- a/src/common/src/test/kotlin/ParameterNameTest.kt +++ b/src/common/src/test/kotlin/ParameterNameTest.kt @@ -2,6 +2,7 @@ package solutions.bitbadger.documents.common 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/common/src/test/kotlin/ParameterTest.kt index ea8753a..3a312e4 100644 --- a/src/common/src/test/kotlin/ParameterTest.kt +++ b/src/common/src/test/kotlin/ParameterTest.kt @@ -2,6 +2,9 @@ package solutions.bitbadger.documents.common 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/common/src/test/kotlin/query/CountTest.kt b/src/common/src/test/kotlin/query/CountTest.kt index a664f21..48f4ddb 100644 --- a/src/common/src/test/kotlin/query/CountTest.kt +++ b/src/common/src/test/kotlin/query/CountTest.kt @@ -4,10 +4,11 @@ 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.common.Configuration -import solutions.bitbadger.documents.common.Dialect -import solutions.bitbadger.documents.common.DocumentException -import solutions.bitbadger.documents.common.Field +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/common/src/test/kotlin/query/DefinitionTest.kt index 90343c9..7ab6436 100644 --- a/src/common/src/test/kotlin/query/DefinitionTest.kt +++ b/src/common/src/test/kotlin/query/DefinitionTest.kt @@ -4,10 +4,10 @@ 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.common.Configuration -import solutions.bitbadger.documents.common.Dialect -import solutions.bitbadger.documents.common.DocumentException -import solutions.bitbadger.documents.common.DocumentIndex +import solutions.bitbadger.documents.Configuration +import solutions.bitbadger.documents.Dialect +import solutions.bitbadger.documents.DocumentException +import solutions.bitbadger.documents.DocumentIndex import kotlin.test.assertEquals /** diff --git a/src/common/src/test/kotlin/query/DeleteTest.kt b/src/common/src/test/kotlin/query/DeleteTest.kt index 54206d8..e9f10ee 100644 --- a/src/common/src/test/kotlin/query/DeleteTest.kt +++ b/src/common/src/test/kotlin/query/DeleteTest.kt @@ -4,10 +4,10 @@ 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.common.Configuration -import solutions.bitbadger.documents.common.Dialect -import solutions.bitbadger.documents.common.DocumentException -import solutions.bitbadger.documents.common.Field +import solutions.bitbadger.documents.Configuration +import solutions.bitbadger.documents.Dialect +import solutions.bitbadger.documents.DocumentException +import solutions.bitbadger.documents.Field import kotlin.test.assertEquals /** diff --git a/src/common/src/test/kotlin/query/DocumentTest.kt b/src/common/src/test/kotlin/query/DocumentTest.kt index 1ee9277..cf59b0c 100644 --- a/src/common/src/test/kotlin/query/DocumentTest.kt +++ b/src/common/src/test/kotlin/query/DocumentTest.kt @@ -4,10 +4,11 @@ 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.common.AutoId -import solutions.bitbadger.documents.common.Configuration -import solutions.bitbadger.documents.common.Dialect -import solutions.bitbadger.documents.common.DocumentException +import 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/common/src/test/kotlin/query/ExistsTest.kt index a1ea2d9..7b852c0 100644 --- a/src/common/src/test/kotlin/query/ExistsTest.kt +++ b/src/common/src/test/kotlin/query/ExistsTest.kt @@ -4,10 +4,10 @@ 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.common.Configuration -import solutions.bitbadger.documents.common.Dialect -import solutions.bitbadger.documents.common.DocumentException -import solutions.bitbadger.documents.common.Field +import solutions.bitbadger.documents.Configuration +import solutions.bitbadger.documents.Dialect +import solutions.bitbadger.documents.DocumentException +import solutions.bitbadger.documents.Field import kotlin.test.assertEquals /** diff --git a/src/common/src/test/kotlin/query/FindTest.kt b/src/common/src/test/kotlin/query/FindTest.kt index 4b89e82..d0b6583 100644 --- a/src/common/src/test/kotlin/query/FindTest.kt +++ b/src/common/src/test/kotlin/query/FindTest.kt @@ -4,10 +4,10 @@ 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.common.Configuration -import solutions.bitbadger.documents.common.Dialect -import solutions.bitbadger.documents.common.DocumentException -import solutions.bitbadger.documents.common.Field +import solutions.bitbadger.documents.Configuration +import solutions.bitbadger.documents.Dialect +import solutions.bitbadger.documents.DocumentException +import solutions.bitbadger.documents.Field import kotlin.test.assertEquals /** diff --git a/src/common/src/test/kotlin/query/PatchTest.kt b/src/common/src/test/kotlin/query/PatchTest.kt index e7511b0..a7f5675 100644 --- a/src/common/src/test/kotlin/query/PatchTest.kt +++ b/src/common/src/test/kotlin/query/PatchTest.kt @@ -4,10 +4,10 @@ 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.common.Configuration -import solutions.bitbadger.documents.common.Dialect -import solutions.bitbadger.documents.common.DocumentException -import solutions.bitbadger.documents.common.Field +import solutions.bitbadger.documents.Configuration +import solutions.bitbadger.documents.Dialect +import solutions.bitbadger.documents.DocumentException +import solutions.bitbadger.documents.Field import kotlin.test.assertEquals /** diff --git a/src/common/src/test/kotlin/query/QueryTest.kt b/src/common/src/test/kotlin/query/QueryTest.kt index 82e5285..912f9c4 100644 --- a/src/common/src/test/kotlin/query/QueryTest.kt +++ b/src/common/src/test/kotlin/query/QueryTest.kt @@ -3,10 +3,13 @@ package solutions.bitbadger.documents.common.query import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test -import solutions.bitbadger.documents.common.Configuration -import solutions.bitbadger.documents.common.Dialect -import solutions.bitbadger.documents.common.Field -import solutions.bitbadger.documents.common.FieldMatch +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 /** @@ -26,7 +29,7 @@ class QueryTest { @Test @DisplayName("statementWhere generates correctly") fun statementWhere() = - assertEquals("x WHERE y", statementWhere("x", "y"), "Statements not combined correctly") + assertEquals("x WHERE y", solutions.bitbadger.documents.java.query.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/common/src/test/kotlin/query/RemoveFieldsTest.kt index 1710e0b..78199f8 100644 --- a/src/common/src/test/kotlin/query/RemoveFieldsTest.kt +++ b/src/common/src/test/kotlin/query/RemoveFieldsTest.kt @@ -4,6 +4,7 @@ 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/common/src/test/kotlin/query/WhereTest.kt index aeed546..a5ae71b 100644 --- a/src/common/src/test/kotlin/query/WhereTest.kt +++ b/src/common/src/test/kotlin/query/WhereTest.kt @@ -4,7 +4,9 @@ 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/pom.xml b/src/jvm/pom.xml index 55e441b..2da78a7 100644 --- a/src/jvm/pom.xml +++ b/src/jvm/pom.xml @@ -30,14 +30,6 @@ - - solutions.bitbadger.documents - common - 4.0.0-alpha1-SNAPSHOT - system - ${project.basedir}/../common/target/common-4.0.0-alpha1-SNAPSHOT.jar - jar - com.fasterxml.jackson.core jackson-databind diff --git a/src/common/src/main/kotlin/AutoId.kt b/src/jvm/src/main/kotlin/AutoId.kt similarity index 98% rename from src/common/src/main/kotlin/AutoId.kt rename to src/jvm/src/main/kotlin/AutoId.kt index daa61c1..f94d7da 100644 --- a/src/common/src/main/kotlin/AutoId.kt +++ b/src/jvm/src/main/kotlin/AutoId.kt @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.common +package solutions.bitbadger.documents import kotlin.jvm.Throws import kotlin.reflect.full.* diff --git a/src/common/src/main/kotlin/Comparison.kt b/src/jvm/src/main/kotlin/Comparison.kt similarity index 97% rename from src/common/src/main/kotlin/Comparison.kt rename to src/jvm/src/main/kotlin/Comparison.kt index 5946aeb..f187882 100644 --- a/src/common/src/main/kotlin/Comparison.kt +++ b/src/jvm/src/main/kotlin/Comparison.kt @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.common +package solutions.bitbadger.documents /** * Information required to generate a JSON field comparison diff --git a/src/common/src/main/kotlin/Configuration.kt b/src/jvm/src/main/kotlin/Configuration.kt similarity index 97% rename from src/common/src/main/kotlin/Configuration.kt rename to src/jvm/src/main/kotlin/Configuration.kt index c4969a1..e89793a 100644 --- a/src/common/src/main/kotlin/Configuration.kt +++ b/src/jvm/src/main/kotlin/Configuration.kt @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.common +package solutions.bitbadger.documents import java.sql.Connection import java.sql.DriverManager diff --git a/src/common/src/main/kotlin/Dialect.kt b/src/jvm/src/main/kotlin/Dialect.kt similarity index 94% rename from src/common/src/main/kotlin/Dialect.kt rename to src/jvm/src/main/kotlin/Dialect.kt index e950ba5..986dddb 100644 --- a/src/common/src/main/kotlin/Dialect.kt +++ b/src/jvm/src/main/kotlin/Dialect.kt @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.common +package solutions.bitbadger.documents /** * The SQL dialect to use when building queries diff --git a/src/common/src/main/kotlin/DocumentException.kt b/src/jvm/src/main/kotlin/DocumentException.kt similarity index 85% rename from src/common/src/main/kotlin/DocumentException.kt rename to src/jvm/src/main/kotlin/DocumentException.kt index c8ce19f..4a292e6 100644 --- a/src/common/src/main/kotlin/DocumentException.kt +++ b/src/jvm/src/main/kotlin/DocumentException.kt @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.common +package solutions.bitbadger.documents /** * An exception caused by invalid operations in the document library diff --git a/src/common/src/main/kotlin/DocumentIndex.kt b/src/jvm/src/main/kotlin/DocumentIndex.kt similarity index 87% rename from src/common/src/main/kotlin/DocumentIndex.kt rename to src/jvm/src/main/kotlin/DocumentIndex.kt index 45f1fac..3ce8743 100644 --- a/src/common/src/main/kotlin/DocumentIndex.kt +++ b/src/jvm/src/main/kotlin/DocumentIndex.kt @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.common +package solutions.bitbadger.documents /** * The type of index to generate for the document diff --git a/src/common/src/main/kotlin/DocumentSerializer.kt b/src/jvm/src/main/kotlin/DocumentSerializer.kt similarity index 93% rename from src/common/src/main/kotlin/DocumentSerializer.kt rename to src/jvm/src/main/kotlin/DocumentSerializer.kt index 09cb1c9..bbdee39 100644 --- a/src/common/src/main/kotlin/DocumentSerializer.kt +++ b/src/jvm/src/main/kotlin/DocumentSerializer.kt @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.common +package solutions.bitbadger.documents /** * The interface for a document serializer/deserializer diff --git a/src/common/src/main/kotlin/Field.kt b/src/jvm/src/main/kotlin/Field.kt similarity index 99% rename from src/common/src/main/kotlin/Field.kt rename to src/jvm/src/main/kotlin/Field.kt index 7b75702..d15a838 100644 --- a/src/common/src/main/kotlin/Field.kt +++ b/src/jvm/src/main/kotlin/Field.kt @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.common +package solutions.bitbadger.documents /** * A field and its comparison diff --git a/src/common/src/main/kotlin/FieldFormat.kt b/src/jvm/src/main/kotlin/FieldFormat.kt similarity index 84% rename from src/common/src/main/kotlin/FieldFormat.kt rename to src/jvm/src/main/kotlin/FieldFormat.kt index 02d4c20..c804a87 100644 --- a/src/common/src/main/kotlin/FieldFormat.kt +++ b/src/jvm/src/main/kotlin/FieldFormat.kt @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.common +package solutions.bitbadger.documents /** * The data format for a document field retrieval diff --git a/src/common/src/main/kotlin/FieldMatch.kt b/src/jvm/src/main/kotlin/FieldMatch.kt similarity index 83% rename from src/common/src/main/kotlin/FieldMatch.kt rename to src/jvm/src/main/kotlin/FieldMatch.kt index e621dba..3b1d3ff 100644 --- a/src/common/src/main/kotlin/FieldMatch.kt +++ b/src/jvm/src/main/kotlin/FieldMatch.kt @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.common +package solutions.bitbadger.documents /** * How fields should be matched in by-field queries diff --git a/src/common/src/main/kotlin/Op.kt b/src/jvm/src/main/kotlin/Op.kt similarity index 94% rename from src/common/src/main/kotlin/Op.kt rename to src/jvm/src/main/kotlin/Op.kt index dc93dfc..61723c9 100644 --- a/src/common/src/main/kotlin/Op.kt +++ b/src/jvm/src/main/kotlin/Op.kt @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.common +package solutions.bitbadger.documents /** * A comparison operator used for fields diff --git a/src/common/src/main/kotlin/Parameter.kt b/src/jvm/src/main/kotlin/Parameter.kt similarity index 97% rename from src/common/src/main/kotlin/Parameter.kt rename to src/jvm/src/main/kotlin/Parameter.kt index 9e63336..1bd707b 100644 --- a/src/common/src/main/kotlin/Parameter.kt +++ b/src/jvm/src/main/kotlin/Parameter.kt @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.common +package solutions.bitbadger.documents import java.sql.PreparedStatement import java.sql.Types diff --git a/src/common/src/main/kotlin/ParameterName.kt b/src/jvm/src/main/kotlin/ParameterName.kt similarity index 91% rename from src/common/src/main/kotlin/ParameterName.kt rename to src/jvm/src/main/kotlin/ParameterName.kt index 566dca0..a090db0 100644 --- a/src/common/src/main/kotlin/ParameterName.kt +++ b/src/jvm/src/main/kotlin/ParameterName.kt @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.common +package solutions.bitbadger.documents /** * Derive parameter names; each instance wraps a counter to provide names for anonymous fields diff --git a/src/common/src/main/kotlin/ParameterType.kt b/src/jvm/src/main/kotlin/ParameterType.kt similarity index 87% rename from src/common/src/main/kotlin/ParameterType.kt rename to src/jvm/src/main/kotlin/ParameterType.kt index 159bc14..edf44b7 100644 --- a/src/common/src/main/kotlin/ParameterType.kt +++ b/src/jvm/src/main/kotlin/ParameterType.kt @@ -1,4 +1,4 @@ -package solutions.bitbadger.documents.common +package solutions.bitbadger.documents /** * The types of parameters supported by the document library diff --git a/src/jvm/src/main/kotlin/ConnectionExtensions.kt b/src/jvm/src/main/kotlin/extensions/Connection.kt similarity index 99% rename from src/jvm/src/main/kotlin/ConnectionExtensions.kt rename to src/jvm/src/main/kotlin/extensions/Connection.kt index f25e658..71f7ecc 100644 --- a/src/jvm/src/main/kotlin/ConnectionExtensions.kt +++ b/src/jvm/src/main/kotlin/extensions/Connection.kt @@ -1,8 +1,9 @@ @file:JvmName("ConnExt") -package solutions.bitbadger.documents.java +package solutions.bitbadger.documents.extensions -import solutions.bitbadger.documents.common.* +import solutions.bitbadger.documents.* +import solutions.bitbadger.documents.jvm.* import java.sql.Connection import java.sql.ResultSet diff --git a/src/jvm/src/main/kotlin/Count.kt b/src/jvm/src/main/kotlin/jvm/Count.kt similarity index 96% rename from src/jvm/src/main/kotlin/Count.kt rename to src/jvm/src/main/kotlin/jvm/Count.kt index df9bc16..94ced3a 100644 --- a/src/jvm/src/main/kotlin/Count.kt +++ b/src/jvm/src/main/kotlin/jvm/Count.kt @@ -1,7 +1,8 @@ -package solutions.bitbadger.documents.java +package solutions.bitbadger.documents.jvm -import solutions.bitbadger.documents.common.* -import solutions.bitbadger.documents.common.query.Count +import solutions.bitbadger.documents.* +import solutions.bitbadger.documents.query.Count +import solutions.bitbadger.documents.extensions.customScalar import java.sql.Connection /** diff --git a/src/jvm/src/main/kotlin/Custom.kt b/src/jvm/src/main/kotlin/jvm/Custom.kt similarity index 97% rename from src/jvm/src/main/kotlin/Custom.kt rename to src/jvm/src/main/kotlin/jvm/Custom.kt index 5503022..b4f5d54 100644 --- a/src/jvm/src/main/kotlin/Custom.kt +++ b/src/jvm/src/main/kotlin/jvm/Custom.kt @@ -1,7 +1,7 @@ -package solutions.bitbadger.documents.java +package solutions.bitbadger.documents.jvm -import solutions.bitbadger.documents.common.Configuration -import solutions.bitbadger.documents.common.Parameter +import solutions.bitbadger.documents.Configuration +import solutions.bitbadger.documents.Parameter import java.sql.Connection import java.sql.ResultSet diff --git a/src/jvm/src/main/kotlin/Definition.kt b/src/jvm/src/main/kotlin/jvm/Definition.kt similarity index 90% rename from src/jvm/src/main/kotlin/Definition.kt rename to src/jvm/src/main/kotlin/jvm/Definition.kt index 531415d..7946838 100644 --- a/src/jvm/src/main/kotlin/Definition.kt +++ b/src/jvm/src/main/kotlin/jvm/Definition.kt @@ -1,9 +1,10 @@ -package solutions.bitbadger.documents.java +package solutions.bitbadger.documents.jvm -import solutions.bitbadger.documents.common.Configuration -import solutions.bitbadger.documents.common.DocumentException -import solutions.bitbadger.documents.common.DocumentIndex -import solutions.bitbadger.documents.common.query.Definition +import solutions.bitbadger.documents.Configuration +import solutions.bitbadger.documents.DocumentException +import solutions.bitbadger.documents.DocumentIndex +import solutions.bitbadger.documents.extensions.customNonQuery +import solutions.bitbadger.documents.query.Definition import java.sql.Connection /** diff --git a/src/jvm/src/main/kotlin/Delete.kt b/src/jvm/src/main/kotlin/jvm/Delete.kt similarity index 95% rename from src/jvm/src/main/kotlin/Delete.kt rename to src/jvm/src/main/kotlin/jvm/Delete.kt index 0587fb7..9715698 100644 --- a/src/jvm/src/main/kotlin/Delete.kt +++ b/src/jvm/src/main/kotlin/jvm/Delete.kt @@ -1,7 +1,8 @@ -package solutions.bitbadger.documents.java +package solutions.bitbadger.documents.jvm -import solutions.bitbadger.documents.common.* -import solutions.bitbadger.documents.common.query.Delete +import solutions.bitbadger.documents.* +import solutions.bitbadger.documents.extensions.customNonQuery +import solutions.bitbadger.documents.query.Delete import java.sql.Connection /** diff --git a/src/jvm/src/main/kotlin/Document.kt b/src/jvm/src/main/kotlin/jvm/Document.kt similarity index 91% rename from src/jvm/src/main/kotlin/Document.kt rename to src/jvm/src/main/kotlin/jvm/Document.kt index 6a29a7c..ba7faac 100644 --- a/src/jvm/src/main/kotlin/Document.kt +++ b/src/jvm/src/main/kotlin/jvm/Document.kt @@ -1,13 +1,14 @@ -package solutions.bitbadger.documents.java +package solutions.bitbadger.documents.jvm -import solutions.bitbadger.documents.common.AutoId -import solutions.bitbadger.documents.common.Configuration -import solutions.bitbadger.documents.common.Dialect -import solutions.bitbadger.documents.common.Field +import solutions.bitbadger.documents.AutoId +import solutions.bitbadger.documents.Configuration +import solutions.bitbadger.documents.Dialect +import solutions.bitbadger.documents.Field +import solutions.bitbadger.documents.extensions.customNonQuery +import solutions.bitbadger.documents.query.Document +import solutions.bitbadger.documents.query.Where +import solutions.bitbadger.documents.query.statementWhere import java.sql.Connection -import solutions.bitbadger.documents.common.query.Document -import solutions.bitbadger.documents.common.query.Where -import solutions.bitbadger.documents.common.query.statementWhere /** * Functions for manipulating documents diff --git a/src/jvm/src/main/kotlin/DocumentConfig.kt b/src/jvm/src/main/kotlin/jvm/DocumentConfig.kt similarity index 67% rename from src/jvm/src/main/kotlin/DocumentConfig.kt rename to src/jvm/src/main/kotlin/jvm/DocumentConfig.kt index 81431d7..d8b39fd 100644 --- a/src/jvm/src/main/kotlin/DocumentConfig.kt +++ b/src/jvm/src/main/kotlin/jvm/DocumentConfig.kt @@ -1,6 +1,6 @@ -package solutions.bitbadger.documents.java +package solutions.bitbadger.documents.jvm -import solutions.bitbadger.documents.common.DocumentSerializer +import solutions.bitbadger.documents.DocumentSerializer /** * Configuration for document serialization diff --git a/src/jvm/src/main/kotlin/Exists.kt b/src/jvm/src/main/kotlin/jvm/Exists.kt similarity index 96% rename from src/jvm/src/main/kotlin/Exists.kt rename to src/jvm/src/main/kotlin/jvm/Exists.kt index 7e55f89..d69fa88 100644 --- a/src/jvm/src/main/kotlin/Exists.kt +++ b/src/jvm/src/main/kotlin/jvm/Exists.kt @@ -1,7 +1,8 @@ -package solutions.bitbadger.documents.java +package solutions.bitbadger.documents.jvm -import solutions.bitbadger.documents.common.* -import solutions.bitbadger.documents.common.query.Exists +import solutions.bitbadger.documents.* +import solutions.bitbadger.documents.extensions.customScalar +import solutions.bitbadger.documents.query.Exists import java.sql.Connection /** diff --git a/src/jvm/src/main/kotlin/Find.kt b/src/jvm/src/main/kotlin/jvm/Find.kt similarity index 98% rename from src/jvm/src/main/kotlin/Find.kt rename to src/jvm/src/main/kotlin/jvm/Find.kt index 70cef9c..ab22a91 100644 --- a/src/jvm/src/main/kotlin/Find.kt +++ b/src/jvm/src/main/kotlin/jvm/Find.kt @@ -1,8 +1,10 @@ -package solutions.bitbadger.documents.java +package solutions.bitbadger.documents.jvm -import solutions.bitbadger.documents.common.* -import solutions.bitbadger.documents.common.query.Find -import solutions.bitbadger.documents.common.query.orderBy +import solutions.bitbadger.documents.* +import solutions.bitbadger.documents.extensions.customList +import solutions.bitbadger.documents.extensions.customSingle +import solutions.bitbadger.documents.query.Find +import solutions.bitbadger.documents.query.orderBy import java.sql.Connection /** diff --git a/src/jvm/src/main/kotlin/NullDocumentSerializer.kt b/src/jvm/src/main/kotlin/jvm/NullDocumentSerializer.kt similarity index 85% rename from src/jvm/src/main/kotlin/NullDocumentSerializer.kt rename to src/jvm/src/main/kotlin/jvm/NullDocumentSerializer.kt index 0fd5ea4..41a7b63 100644 --- a/src/jvm/src/main/kotlin/NullDocumentSerializer.kt +++ b/src/jvm/src/main/kotlin/jvm/NullDocumentSerializer.kt @@ -1,6 +1,6 @@ -package solutions.bitbadger.documents.java +package solutions.bitbadger.documents.jvm -import solutions.bitbadger.documents.common.DocumentSerializer +import solutions.bitbadger.documents.DocumentSerializer /** * A serializer that tells the user to implement another one diff --git a/src/jvm/src/main/kotlin/Parameters.kt b/src/jvm/src/main/kotlin/jvm/Parameters.kt similarity index 97% rename from src/jvm/src/main/kotlin/Parameters.kt rename to src/jvm/src/main/kotlin/jvm/Parameters.kt index e8b94b6..a614480 100644 --- a/src/jvm/src/main/kotlin/Parameters.kt +++ b/src/jvm/src/main/kotlin/jvm/Parameters.kt @@ -1,6 +1,7 @@ -package solutions.bitbadger.documents.java +package solutions.bitbadger.documents.jvm -import solutions.bitbadger.documents.common.* +import solutions.bitbadger.documents.* +import solutions.bitbadger.documents.ParameterName import java.sql.Connection import java.sql.PreparedStatement import java.sql.SQLException diff --git a/src/jvm/src/main/kotlin/Patch.kt b/src/jvm/src/main/kotlin/jvm/Patch.kt similarity index 96% rename from src/jvm/src/main/kotlin/Patch.kt rename to src/jvm/src/main/kotlin/jvm/Patch.kt index a59fc2f..80d265a 100644 --- a/src/jvm/src/main/kotlin/Patch.kt +++ b/src/jvm/src/main/kotlin/jvm/Patch.kt @@ -1,7 +1,8 @@ -package solutions.bitbadger.documents.java +package solutions.bitbadger.documents.jvm -import solutions.bitbadger.documents.common.* -import solutions.bitbadger.documents.common.query.Patch +import solutions.bitbadger.documents.* +import solutions.bitbadger.documents.extensions.customNonQuery +import solutions.bitbadger.documents.query.Patch import java.sql.Connection /** diff --git a/src/jvm/src/main/kotlin/RemoveFields.kt b/src/jvm/src/main/kotlin/jvm/RemoveFields.kt similarity index 97% rename from src/jvm/src/main/kotlin/RemoveFields.kt rename to src/jvm/src/main/kotlin/jvm/RemoveFields.kt index 3a52eba..22bc308 100644 --- a/src/jvm/src/main/kotlin/RemoveFields.kt +++ b/src/jvm/src/main/kotlin/jvm/RemoveFields.kt @@ -1,7 +1,8 @@ -package solutions.bitbadger.documents.java +package solutions.bitbadger.documents.jvm -import solutions.bitbadger.documents.common.* -import solutions.bitbadger.documents.common.query.RemoveFields +import solutions.bitbadger.documents.* +import solutions.bitbadger.documents.extensions.customNonQuery +import solutions.bitbadger.documents.query.RemoveFields import java.sql.Connection /** diff --git a/src/jvm/src/main/kotlin/Results.kt b/src/jvm/src/main/kotlin/jvm/Results.kt similarity index 93% rename from src/jvm/src/main/kotlin/Results.kt rename to src/jvm/src/main/kotlin/jvm/Results.kt index 028007c..f670a67 100644 --- a/src/jvm/src/main/kotlin/Results.kt +++ b/src/jvm/src/main/kotlin/jvm/Results.kt @@ -1,8 +1,8 @@ -package solutions.bitbadger.documents.java +package solutions.bitbadger.documents.jvm -import solutions.bitbadger.documents.common.Configuration -import solutions.bitbadger.documents.common.Dialect -import solutions.bitbadger.documents.common.DocumentException +import solutions.bitbadger.documents.Configuration +import solutions.bitbadger.documents.Dialect +import solutions.bitbadger.documents.DocumentException import java.sql.PreparedStatement import java.sql.ResultSet import java.sql.SQLException diff --git a/src/common/src/main/kotlin/query/Count.kt b/src/jvm/src/main/kotlin/query/Count.kt similarity index 87% rename from src/common/src/main/kotlin/query/Count.kt rename to src/jvm/src/main/kotlin/query/Count.kt index 28b726d..e3db117 100644 --- a/src/common/src/main/kotlin/query/Count.kt +++ b/src/jvm/src/main/kotlin/query/Count.kt @@ -1,8 +1,8 @@ -package solutions.bitbadger.documents.common.query +package solutions.bitbadger.documents.query -import solutions.bitbadger.documents.common.Field -import solutions.bitbadger.documents.common.FieldMatch -import solutions.bitbadger.documents.common.query.byFields as byFieldsBase; +import solutions.bitbadger.documents.Field +import solutions.bitbadger.documents.FieldMatch +import solutions.bitbadger.documents.query.byFields as byFieldsBase; /** * Functions to count documents diff --git a/src/common/src/main/kotlin/query/Definition.kt b/src/jvm/src/main/kotlin/query/Definition.kt similarity index 97% rename from src/common/src/main/kotlin/query/Definition.kt rename to src/jvm/src/main/kotlin/query/Definition.kt index c43ea3b..6187216 100644 --- a/src/common/src/main/kotlin/query/Definition.kt +++ b/src/jvm/src/main/kotlin/query/Definition.kt @@ -1,6 +1,6 @@ -package solutions.bitbadger.documents.common.query +package solutions.bitbadger.documents.query -import solutions.bitbadger.documents.common.* +import solutions.bitbadger.documents.* /** * Functions to create queries to define tables and indexes diff --git a/src/common/src/main/kotlin/query/Delete.kt b/src/jvm/src/main/kotlin/query/Delete.kt similarity index 87% rename from src/common/src/main/kotlin/query/Delete.kt rename to src/jvm/src/main/kotlin/query/Delete.kt index e5fc511..0899c8b 100644 --- a/src/common/src/main/kotlin/query/Delete.kt +++ b/src/jvm/src/main/kotlin/query/Delete.kt @@ -1,9 +1,9 @@ -package solutions.bitbadger.documents.common.query +package solutions.bitbadger.documents.query -import solutions.bitbadger.documents.common.Field -import solutions.bitbadger.documents.common.FieldMatch -import solutions.bitbadger.documents.common.query.byFields as byFieldsBase -import solutions.bitbadger.documents.common.query.byId as byIdBase +import solutions.bitbadger.documents.Field +import solutions.bitbadger.documents.FieldMatch +import solutions.bitbadger.documents.query.byFields as byFieldsBase +import solutions.bitbadger.documents.query.byId as byIdBase /** * Functions to delete documents diff --git a/src/common/src/main/kotlin/query/Document.kt b/src/jvm/src/main/kotlin/query/Document.kt similarity index 91% rename from src/common/src/main/kotlin/query/Document.kt rename to src/jvm/src/main/kotlin/query/Document.kt index 6ee19b9..c60c986 100644 --- a/src/common/src/main/kotlin/query/Document.kt +++ b/src/jvm/src/main/kotlin/query/Document.kt @@ -1,8 +1,8 @@ -package solutions.bitbadger.documents.common.query +package solutions.bitbadger.documents.query -import solutions.bitbadger.documents.common.AutoId -import solutions.bitbadger.documents.common.Configuration -import solutions.bitbadger.documents.common.Dialect +import solutions.bitbadger.documents.AutoId +import solutions.bitbadger.documents.Configuration +import solutions.bitbadger.documents.Dialect /** * Functions for document-level operations diff --git a/src/common/src/main/kotlin/query/Exists.kt b/src/jvm/src/main/kotlin/query/Exists.kt similarity index 93% rename from src/common/src/main/kotlin/query/Exists.kt rename to src/jvm/src/main/kotlin/query/Exists.kt index 7e21c8e..54689d0 100644 --- a/src/common/src/main/kotlin/query/Exists.kt +++ b/src/jvm/src/main/kotlin/query/Exists.kt @@ -1,7 +1,7 @@ -package solutions.bitbadger.documents.common.query +package solutions.bitbadger.documents.query -import solutions.bitbadger.documents.common.Field -import solutions.bitbadger.documents.common.FieldMatch +import solutions.bitbadger.documents.Field +import solutions.bitbadger.documents.FieldMatch /** * Functions to check for document existence diff --git a/src/common/src/main/kotlin/query/Find.kt b/src/jvm/src/main/kotlin/query/Find.kt similarity index 87% rename from src/common/src/main/kotlin/query/Find.kt rename to src/jvm/src/main/kotlin/query/Find.kt index c622485..6d57232 100644 --- a/src/common/src/main/kotlin/query/Find.kt +++ b/src/jvm/src/main/kotlin/query/Find.kt @@ -1,9 +1,9 @@ -package solutions.bitbadger.documents.common.query +package solutions.bitbadger.documents.query -import solutions.bitbadger.documents.common.Field -import solutions.bitbadger.documents.common.FieldMatch -import solutions.bitbadger.documents.common.query.byId as byIdBase -import solutions.bitbadger.documents.common.query.byFields as byFieldsBase +import solutions.bitbadger.documents.Field +import solutions.bitbadger.documents.FieldMatch +import solutions.bitbadger.documents.query.byId as byIdBase +import solutions.bitbadger.documents.query.byFields as byFieldsBase /** * Functions to retrieve documents diff --git a/src/common/src/main/kotlin/query/Patch.kt b/src/jvm/src/main/kotlin/query/Patch.kt similarity index 84% rename from src/common/src/main/kotlin/query/Patch.kt rename to src/jvm/src/main/kotlin/query/Patch.kt index 3589154..dc1e699 100644 --- a/src/common/src/main/kotlin/query/Patch.kt +++ b/src/jvm/src/main/kotlin/query/Patch.kt @@ -1,11 +1,11 @@ -package solutions.bitbadger.documents.common.query +package solutions.bitbadger.documents.query -import solutions.bitbadger.documents.common.Configuration -import solutions.bitbadger.documents.common.Dialect -import solutions.bitbadger.documents.common.Field -import solutions.bitbadger.documents.common.FieldMatch -import solutions.bitbadger.documents.common.query.byFields as byFieldsBase -import solutions.bitbadger.documents.common.query.byId as byIdBase +import solutions.bitbadger.documents.Configuration +import solutions.bitbadger.documents.Dialect +import solutions.bitbadger.documents.Field +import solutions.bitbadger.documents.FieldMatch +import solutions.bitbadger.documents.query.byFields as byFieldsBase +import solutions.bitbadger.documents.query.byId as byIdBase /** * Functions to create queries to patch (partially update) JSON documents diff --git a/src/common/src/main/kotlin/query/Query.kt b/src/jvm/src/main/kotlin/query/Query.kt similarity index 90% rename from src/common/src/main/kotlin/query/Query.kt rename to src/jvm/src/main/kotlin/query/Query.kt index 5d6cafd..39784bc 100644 --- a/src/common/src/main/kotlin/query/Query.kt +++ b/src/jvm/src/main/kotlin/query/Query.kt @@ -1,9 +1,9 @@ -package solutions.bitbadger.documents.common.query +package solutions.bitbadger.documents.query -import solutions.bitbadger.documents.common.Configuration -import solutions.bitbadger.documents.common.Dialect -import solutions.bitbadger.documents.common.Field -import solutions.bitbadger.documents.common.FieldMatch +import solutions.bitbadger.documents.Configuration +import solutions.bitbadger.documents.Dialect +import solutions.bitbadger.documents.Field +import solutions.bitbadger.documents.FieldMatch // ~~~ TOP-LEVEL FUNCTIONS FOR THE QUERY PACKAGE ~~~ diff --git a/src/common/src/main/kotlin/query/RemoveFields.kt b/src/jvm/src/main/kotlin/query/RemoveFields.kt similarity index 92% rename from src/common/src/main/kotlin/query/RemoveFields.kt rename to src/jvm/src/main/kotlin/query/RemoveFields.kt index 0190269..b3842c4 100644 --- a/src/common/src/main/kotlin/query/RemoveFields.kt +++ b/src/jvm/src/main/kotlin/query/RemoveFields.kt @@ -1,8 +1,8 @@ -package solutions.bitbadger.documents.common.query +package solutions.bitbadger.documents.query -import solutions.bitbadger.documents.common.* -import solutions.bitbadger.documents.common.query.byFields as byFieldsBase -import solutions.bitbadger.documents.common.query.byId as byIdBase +import solutions.bitbadger.documents.* +import solutions.bitbadger.documents.query.byFields as byFieldsBase +import solutions.bitbadger.documents.query.byId as byIdBase /** * Functions to create queries to remove fields from documents diff --git a/src/common/src/main/kotlin/query/Where.kt b/src/jvm/src/main/kotlin/query/Where.kt similarity index 87% rename from src/common/src/main/kotlin/query/Where.kt rename to src/jvm/src/main/kotlin/query/Where.kt index 7e49aa2..dce4a32 100644 --- a/src/common/src/main/kotlin/query/Where.kt +++ b/src/jvm/src/main/kotlin/query/Where.kt @@ -1,10 +1,10 @@ -package solutions.bitbadger.documents.common.query +package solutions.bitbadger.documents.query -import solutions.bitbadger.documents.common.Configuration -import solutions.bitbadger.documents.common.Dialect -import solutions.bitbadger.documents.common.DocumentException -import solutions.bitbadger.documents.common.Field -import solutions.bitbadger.documents.common.FieldMatch +import solutions.bitbadger.documents.Configuration +import solutions.bitbadger.documents.Dialect +import solutions.bitbadger.documents.DocumentException +import solutions.bitbadger.documents.Field +import solutions.bitbadger.documents.FieldMatch /** * Functions to create `WHERE` clause fragments 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/java/ParametersTest.java index d2f2ee4..a0f48d0 100644 --- a/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/ParametersTest.java +++ b/src/jvm/src/test/java/solutions/bitbadger/documents/java/java/ParametersTest.java @@ -3,8 +3,8 @@ package solutions.bitbadger.documents.java.java; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import solutions.bitbadger.documents.common.*; -import solutions.bitbadger.documents.java.Parameters; +import solutions.bitbadger.documents.*; +import solutions.bitbadger.documents.java.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/java/integration/common/CountFunctions.java index 4556020..912dc4e 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/java/integration/common/CountFunctions.java @@ -1,7 +1,7 @@ package solutions.bitbadger.documents.java.java.integration.common; -import solutions.bitbadger.documents.common.Field; -import solutions.bitbadger.documents.java.Count; +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; 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/java/integration/sqlite/CountIT.java index ec59271..3c7338e 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/java/integration/sqlite/CountIT.java @@ -2,7 +2,7 @@ package solutions.bitbadger.documents.java.java.integration.sqlite; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import solutions.bitbadger.documents.common.DocumentException; +import solutions.bitbadger.documents.DocumentException; import solutions.bitbadger.documents.java.integration.sqlite.SQLiteDB; import solutions.bitbadger.documents.java.java.integration.common.CountFunctions; 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/java/testDocs/JsonDocument.java index d1d02c6..97cd733 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/java/testDocs/JsonDocument.java @@ -1,7 +1,7 @@ package solutions.bitbadger.documents.java.java.testDocs; import kotlinx.serialization.Serializable; -import solutions.bitbadger.documents.java.Document; +import solutions.bitbadger.documents.java.jvm.Document; import solutions.bitbadger.documents.java.integration.ThrowawayDatabase; import java.util.List; diff --git a/src/jvm/src/test/kotlin/JacksonDocumentSerializer.kt b/src/jvm/src/test/kotlin/JacksonDocumentSerializer.kt index f491be5..a0b493f 100644 --- a/src/jvm/src/test/kotlin/JacksonDocumentSerializer.kt +++ b/src/jvm/src/test/kotlin/JacksonDocumentSerializer.kt @@ -1,6 +1,6 @@ package solutions.bitbadger.documents.java -import solutions.bitbadger.documents.common.DocumentSerializer +import solutions.bitbadger.documents.DocumentSerializer import com.fasterxml.jackson.databind.ObjectMapper /** diff --git a/src/jvm/src/test/kotlin/ParametersTest.kt b/src/jvm/src/test/kotlin/ParametersTest.kt index 6e31030..f2469ed 100644 --- a/src/jvm/src/test/kotlin/ParametersTest.kt +++ b/src/jvm/src/test/kotlin/ParametersTest.kt @@ -3,7 +3,7 @@ package solutions.bitbadger.documents.java import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.assertThrows -import solutions.bitbadger.documents.common.* +import solutions.bitbadger.documents.* import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNotSame diff --git a/src/jvm/src/test/kotlin/integration/Types.kt b/src/jvm/src/test/kotlin/integration/Types.kt index d239866..9cf9462 100644 --- a/src/jvm/src/test/kotlin/integration/Types.kt +++ b/src/jvm/src/test/kotlin/integration/Types.kt @@ -1,7 +1,7 @@ package solutions.bitbadger.documents.java.integration import kotlinx.serialization.Serializable -import solutions.bitbadger.documents.java.insert +import solutions.bitbadger.documents.java.extensions.insert /** The test table name to use for integration tests */ const val TEST_TABLE = "test_table" diff --git a/src/jvm/src/test/kotlin/integration/common/Count.kt b/src/jvm/src/test/kotlin/integration/common/Count.kt index e8b3258..b452aab 100644 --- a/src/jvm/src/test/kotlin/integration/common/Count.kt +++ b/src/jvm/src/test/kotlin/integration/common/Count.kt @@ -1,10 +1,10 @@ package solutions.bitbadger.documents.java.integration.common -import solutions.bitbadger.documents.common.Field -import solutions.bitbadger.documents.java.countAll -import solutions.bitbadger.documents.java.countByContains -import solutions.bitbadger.documents.java.countByFields -import solutions.bitbadger.documents.java.countByJsonPath +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 diff --git a/src/jvm/src/test/kotlin/integration/common/Custom.kt b/src/jvm/src/test/kotlin/integration/common/Custom.kt index a66e4e8..5e8d106 100644 --- a/src/jvm/src/test/kotlin/integration/common/Custom.kt +++ b/src/jvm/src/test/kotlin/integration/common/Custom.kt @@ -1,13 +1,16 @@ package solutions.bitbadger.documents.java.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.common.query.Count -import solutions.bitbadger.documents.common.query.Delete -import solutions.bitbadger.documents.common.query.Find 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 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/integration/common/Definition.kt index 6f36226..7c7dc31 100644 --- a/src/jvm/src/test/kotlin/integration/common/Definition.kt +++ b/src/jvm/src/test/kotlin/integration/common/Definition.kt @@ -1,9 +1,9 @@ package solutions.bitbadger.documents.java.integration.common -import solutions.bitbadger.documents.common.DocumentIndex -import solutions.bitbadger.documents.java.ensureDocumentIndex -import solutions.bitbadger.documents.java.ensureFieldIndex -import solutions.bitbadger.documents.java.ensureTable +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 kotlin.test.assertFalse diff --git a/src/jvm/src/test/kotlin/integration/common/Delete.kt b/src/jvm/src/test/kotlin/integration/common/Delete.kt index 2ea4338..cead888 100644 --- a/src/jvm/src/test/kotlin/integration/common/Delete.kt +++ b/src/jvm/src/test/kotlin/integration/common/Delete.kt @@ -1,7 +1,7 @@ package solutions.bitbadger.documents.java.integration.common -import solutions.bitbadger.documents.common.Field -import solutions.bitbadger.documents.java.* +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 diff --git a/src/jvm/src/test/kotlin/integration/common/Document.kt b/src/jvm/src/test/kotlin/integration/common/Document.kt index 2a1eb98..43fa8fa 100644 --- a/src/jvm/src/test/kotlin/integration/common/Document.kt +++ b/src/jvm/src/test/kotlin/integration/common/Document.kt @@ -1,7 +1,10 @@ package solutions.bitbadger.documents.java.integration.common +import AutoId +import solutions.bitbadger.documents.Configuration +import solutions.bitbadger.documents.Field import solutions.bitbadger.documents.common.* -import solutions.bitbadger.documents.java.* +import solutions.bitbadger.documents.java.extensions.* import solutions.bitbadger.documents.java.integration.* import kotlin.test.* diff --git a/src/jvm/src/test/kotlin/integration/common/Exists.kt b/src/jvm/src/test/kotlin/integration/common/Exists.kt index 3d5513e..750eb07 100644 --- a/src/jvm/src/test/kotlin/integration/common/Exists.kt +++ b/src/jvm/src/test/kotlin/integration/common/Exists.kt @@ -1,10 +1,10 @@ package solutions.bitbadger.documents.java.integration.common -import solutions.bitbadger.documents.common.Field -import solutions.bitbadger.documents.java.existsByContains -import solutions.bitbadger.documents.java.existsByFields -import solutions.bitbadger.documents.java.existsById -import solutions.bitbadger.documents.java.existsByJsonPath +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 diff --git a/src/jvm/src/test/kotlin/integration/common/Find.kt b/src/jvm/src/test/kotlin/integration/common/Find.kt index 3be673c..d6fb4e5 100644 --- a/src/jvm/src/test/kotlin/integration/common/Find.kt +++ b/src/jvm/src/test/kotlin/integration/common/Find.kt @@ -1,7 +1,10 @@ package solutions.bitbadger.documents.java.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.* +import solutions.bitbadger.documents.java.extensions.* import solutions.bitbadger.documents.java.integration.* import kotlin.test.assertEquals import kotlin.test.assertNotNull diff --git a/src/jvm/src/test/kotlin/integration/common/Patch.kt b/src/jvm/src/test/kotlin/integration/common/Patch.kt index 05982ed..a74e670 100644 --- a/src/jvm/src/test/kotlin/integration/common/Patch.kt +++ b/src/jvm/src/test/kotlin/integration/common/Patch.kt @@ -1,7 +1,7 @@ package solutions.bitbadger.documents.java.integration.common -import solutions.bitbadger.documents.common.Field -import solutions.bitbadger.documents.java.* +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 diff --git a/src/jvm/src/test/kotlin/integration/common/RemoveFields.kt b/src/jvm/src/test/kotlin/integration/common/RemoveFields.kt index d6f2387..f70251e 100644 --- a/src/jvm/src/test/kotlin/integration/common/RemoveFields.kt +++ b/src/jvm/src/test/kotlin/integration/common/RemoveFields.kt @@ -1,7 +1,7 @@ package solutions.bitbadger.documents.java.integration.common -import solutions.bitbadger.documents.common.Field -import solutions.bitbadger.documents.java.* +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 diff --git a/src/jvm/src/test/kotlin/integration/postgresql/PgDB.kt b/src/jvm/src/test/kotlin/integration/postgresql/PgDB.kt index 87413b1..5c90daa 100644 --- a/src/jvm/src/test/kotlin/integration/postgresql/PgDB.kt +++ b/src/jvm/src/test/kotlin/integration/postgresql/PgDB.kt @@ -1,9 +1,18 @@ package solutions.bitbadger.documents.java.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 /** * A wrapper for a throwaway PostgreSQL database diff --git a/src/jvm/src/test/kotlin/integration/sqlite/CountIT.kt b/src/jvm/src/test/kotlin/integration/sqlite/CountIT.kt index 4b3581e..3b4aeda 100644 --- a/src/jvm/src/test/kotlin/integration/sqlite/CountIT.kt +++ b/src/jvm/src/test/kotlin/integration/sqlite/CountIT.kt @@ -2,7 +2,7 @@ package solutions.bitbadger.documents.java.integration.sqlite import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.assertThrows -import solutions.bitbadger.documents.common.DocumentException +import solutions.bitbadger.documents.DocumentException import solutions.bitbadger.documents.java.integration.common.Count import kotlin.test.Test diff --git a/src/jvm/src/test/kotlin/integration/sqlite/DefinitionIT.kt b/src/jvm/src/test/kotlin/integration/sqlite/DefinitionIT.kt index ca943f4..b43f661 100644 --- a/src/jvm/src/test/kotlin/integration/sqlite/DefinitionIT.kt +++ b/src/jvm/src/test/kotlin/integration/sqlite/DefinitionIT.kt @@ -2,7 +2,7 @@ package solutions.bitbadger.documents.java.integration.sqlite import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.assertThrows -import solutions.bitbadger.documents.common.DocumentException +import solutions.bitbadger.documents.DocumentException import solutions.bitbadger.documents.java.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/integration/sqlite/DeleteIT.kt index 112711f..9947de5 100644 --- a/src/jvm/src/test/kotlin/integration/sqlite/DeleteIT.kt +++ b/src/jvm/src/test/kotlin/integration/sqlite/DeleteIT.kt @@ -2,7 +2,7 @@ package solutions.bitbadger.documents.java.integration.sqlite import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.assertThrows -import solutions.bitbadger.documents.common.DocumentException +import solutions.bitbadger.documents.DocumentException import solutions.bitbadger.documents.java.integration.common.Delete import kotlin.test.Test diff --git a/src/jvm/src/test/kotlin/integration/sqlite/ExistsIT.kt b/src/jvm/src/test/kotlin/integration/sqlite/ExistsIT.kt index c1502f8..da43f75 100644 --- a/src/jvm/src/test/kotlin/integration/sqlite/ExistsIT.kt +++ b/src/jvm/src/test/kotlin/integration/sqlite/ExistsIT.kt @@ -2,7 +2,7 @@ package solutions.bitbadger.documents.java.integration.sqlite import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.assertThrows -import solutions.bitbadger.documents.common.DocumentException +import solutions.bitbadger.documents.DocumentException import solutions.bitbadger.documents.java.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/integration/sqlite/FindIT.kt index dc893b6..b40d364 100644 --- a/src/jvm/src/test/kotlin/integration/sqlite/FindIT.kt +++ b/src/jvm/src/test/kotlin/integration/sqlite/FindIT.kt @@ -2,7 +2,7 @@ package solutions.bitbadger.documents.java.integration.sqlite import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.assertThrows -import solutions.bitbadger.documents.common.DocumentException +import solutions.bitbadger.documents.DocumentException import solutions.bitbadger.documents.java.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/integration/sqlite/PatchIT.kt index 1a51dae..7c2a15a 100644 --- a/src/jvm/src/test/kotlin/integration/sqlite/PatchIT.kt +++ b/src/jvm/src/test/kotlin/integration/sqlite/PatchIT.kt @@ -2,7 +2,7 @@ package solutions.bitbadger.documents.java.integration.sqlite import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.assertThrows -import solutions.bitbadger.documents.common.DocumentException +import solutions.bitbadger.documents.DocumentException import solutions.bitbadger.documents.java.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/integration/sqlite/RemoveFieldsIT.kt index 3cfeab8..4dc23dd 100644 --- a/src/jvm/src/test/kotlin/integration/sqlite/RemoveFieldsIT.kt +++ b/src/jvm/src/test/kotlin/integration/sqlite/RemoveFieldsIT.kt @@ -2,7 +2,7 @@ package solutions.bitbadger.documents.java.integration.sqlite import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.assertThrows -import solutions.bitbadger.documents.common.DocumentException +import solutions.bitbadger.documents.DocumentException import solutions.bitbadger.documents.java.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/integration/sqlite/SQLiteDB.kt index 5075ae7..cdcbd32 100644 --- a/src/jvm/src/test/kotlin/integration/sqlite/SQLiteDB.kt +++ b/src/jvm/src/test/kotlin/integration/sqlite/SQLiteDB.kt @@ -1,9 +1,17 @@ package solutions.bitbadger.documents.java.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 java.io.File /** diff --git a/src/kotlin/src/main/kotlin/ConnectionExtensions.kt b/src/kotlin/src/main/kotlin/ConnectionExtensions.kt index 28e951b..599cb22 100644 --- a/src/kotlin/src/main/kotlin/ConnectionExtensions.kt +++ b/src/kotlin/src/main/kotlin/ConnectionExtensions.kt @@ -1,10 +1,10 @@ package solutions.bitbadger.documents.kotlin -import solutions.bitbadger.documents.common.DocumentIndex -import solutions.bitbadger.documents.common.Field -import solutions.bitbadger.documents.common.FieldMatch -import solutions.bitbadger.documents.common.Parameter -import solutions.bitbadger.documents.java.Document +import solutions.bitbadger.documents.DocumentIndex +import solutions.bitbadger.documents.Field +import solutions.bitbadger.documents.FieldMatch +import solutions.bitbadger.documents.Parameter +import solutions.bitbadger.documents.java.jvm.Document import java.sql.Connection import java.sql.ResultSet diff --git a/src/kotlin/src/main/kotlin/Count.kt b/src/kotlin/src/main/kotlin/Count.kt index e2ac2d5..02836a3 100644 --- a/src/kotlin/src/main/kotlin/Count.kt +++ b/src/kotlin/src/main/kotlin/Count.kt @@ -1,11 +1,10 @@ package solutions.bitbadger.documents.kotlin -import solutions.bitbadger.documents.common.Configuration -import solutions.bitbadger.documents.common.Field -import solutions.bitbadger.documents.common.FieldMatch -import solutions.bitbadger.documents.common.Parameter -import solutions.bitbadger.documents.common.ParameterType -import solutions.bitbadger.documents.common.query.Count +import solutions.bitbadger.documents.Configuration +import solutions.bitbadger.documents.Field +import solutions.bitbadger.documents.FieldMatch +import solutions.bitbadger.documents.Parameter +import solutions.bitbadger.documents.ParameterType import java.sql.Connection diff --git a/src/kotlin/src/main/kotlin/Custom.kt b/src/kotlin/src/main/kotlin/Custom.kt index b3f75fd..d84df88 100644 --- a/src/kotlin/src/main/kotlin/Custom.kt +++ b/src/kotlin/src/main/kotlin/Custom.kt @@ -1,8 +1,7 @@ package solutions.bitbadger.documents.kotlin -import solutions.bitbadger.documents.common.Configuration -import solutions.bitbadger.documents.common.Parameter -import solutions.bitbadger.documents.java.Custom +import solutions.bitbadger.documents.Configuration +import solutions.bitbadger.documents.Parameter import java.sql.Connection import java.sql.ResultSet diff --git a/src/kotlin/src/main/kotlin/Definition.kt b/src/kotlin/src/main/kotlin/Definition.kt index 07af62a..8c2b2d9 100644 --- a/src/kotlin/src/main/kotlin/Definition.kt +++ b/src/kotlin/src/main/kotlin/Definition.kt @@ -1,4 +1,4 @@ -import solutions.bitbadger.documents.common.DocumentIndex +import solutions.bitbadger.documents.DocumentIndex import java.sql.Connection /** diff --git a/src/kotlin/src/main/kotlin/Delete.kt b/src/kotlin/src/main/kotlin/Delete.kt index 07288a2..e092b05 100644 --- a/src/kotlin/src/main/kotlin/Delete.kt +++ b/src/kotlin/src/main/kotlin/Delete.kt @@ -1,7 +1,7 @@ -import solutions.bitbadger.documents.common.Field -import solutions.bitbadger.documents.common.FieldMatch -import solutions.bitbadger.documents.common.Parameter -import solutions.bitbadger.documents.common.ParameterType +import solutions.bitbadger.documents.Field +import solutions.bitbadger.documents.FieldMatch +import solutions.bitbadger.documents.Parameter +import solutions.bitbadger.documents.ParameterType import java.sql.Connection /** diff --git a/src/kotlin/src/main/kotlin/Exists.kt b/src/kotlin/src/main/kotlin/Exists.kt index dfb1eb2..5146ba7 100644 --- a/src/kotlin/src/main/kotlin/Exists.kt +++ b/src/kotlin/src/main/kotlin/Exists.kt @@ -1,7 +1,7 @@ -import solutions.bitbadger.documents.common.Field -import solutions.bitbadger.documents.common.FieldMatch -import solutions.bitbadger.documents.common.Parameter -import solutions.bitbadger.documents.common.ParameterType +import solutions.bitbadger.documents.Field +import solutions.bitbadger.documents.FieldMatch +import solutions.bitbadger.documents.Parameter +import solutions.bitbadger.documents.ParameterType import java.sql.Connection /** diff --git a/src/kotlin/src/main/kotlin/Find.kt b/src/kotlin/src/main/kotlin/Find.kt index 3e58e71..d698790 100644 --- a/src/kotlin/src/main/kotlin/Find.kt +++ b/src/kotlin/src/main/kotlin/Find.kt @@ -1,9 +1,8 @@ -import solutions.bitbadger.documents.common.Field -import solutions.bitbadger.documents.common.FieldMatch -import solutions.bitbadger.documents.common.Parameter -import solutions.bitbadger.documents.common.ParameterType +import solutions.bitbadger.documents.Field +import solutions.bitbadger.documents.FieldMatch +import solutions.bitbadger.documents.Parameter +import solutions.bitbadger.documents.ParameterType import java.sql.Connection -import solutions.bitbadger.documents.common.query.orderBy /** * Functions to find and retrieve documents diff --git a/src/kotlin/src/main/kotlin/Parameters.kt b/src/kotlin/src/main/kotlin/Parameters.kt index 46cd843..7dae9e9 100644 --- a/src/kotlin/src/main/kotlin/Parameters.kt +++ b/src/kotlin/src/main/kotlin/Parameters.kt @@ -1,3 +1,5 @@ +import solutions.bitbadger.documents.* +import solutions.bitbadger.documents.ParameterName import solutions.bitbadger.documents.common.* import java.sql.Connection import java.sql.PreparedStatement diff --git a/src/kotlin/src/main/kotlin/Patch.kt b/src/kotlin/src/main/kotlin/Patch.kt index 5217b4a..ea8ebc3 100644 --- a/src/kotlin/src/main/kotlin/Patch.kt +++ b/src/kotlin/src/main/kotlin/Patch.kt @@ -1,7 +1,7 @@ -import solutions.bitbadger.documents.common.Field -import solutions.bitbadger.documents.common.FieldMatch -import solutions.bitbadger.documents.common.Parameter -import solutions.bitbadger.documents.common.ParameterType +import solutions.bitbadger.documents.Field +import solutions.bitbadger.documents.FieldMatch +import solutions.bitbadger.documents.Parameter +import solutions.bitbadger.documents.ParameterType import java.sql.Connection /** diff --git a/src/kotlin/src/main/kotlin/RemoveFields.kt b/src/kotlin/src/main/kotlin/RemoveFields.kt index d75c63b..9d40864 100644 --- a/src/kotlin/src/main/kotlin/RemoveFields.kt +++ b/src/kotlin/src/main/kotlin/RemoveFields.kt @@ -1,3 +1,4 @@ +import solutions.bitbadger.documents.* import solutions.bitbadger.documents.common.* import java.sql.Connection diff --git a/src/kotlin/src/main/kotlin/Results.kt b/src/kotlin/src/main/kotlin/Results.kt index f961b00..131dd66 100644 --- a/src/kotlin/src/main/kotlin/Results.kt +++ b/src/kotlin/src/main/kotlin/Results.kt @@ -1,9 +1,8 @@ package solutions.bitbadger.documents.kotlin -import solutions.bitbadger.documents.common.Configuration -import solutions.bitbadger.documents.common.Dialect -import solutions.bitbadger.documents.common.DocumentException -import solutions.bitbadger.documents.java.Results +import solutions.bitbadger.documents.Configuration +import solutions.bitbadger.documents.Dialect +import solutions.bitbadger.documents.DocumentException import java.sql.PreparedStatement import java.sql.ResultSet import java.sql.SQLException diff --git a/src/main/kotlin/Custom.kt b/src/main/kotlin/Custom.kt index e3e8ca7..fd52866 100644 --- a/src/main/kotlin/Custom.kt +++ b/src/main/kotlin/Custom.kt @@ -1,7 +1,5 @@ package solutions.bitbadger.documents -import solutions.bitbadger.documents.common.Parameter -import solutions.bitbadger.documents.java.Custom import java.sql.Connection import java.sql.ResultSet diff --git a/src/pom.xml b/src/pom.xml index fa7686e..1c520aa 100644 --- a/src/pom.xml +++ b/src/pom.xml @@ -46,7 +46,7 @@ common - java + jvm