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 AutoId;
-import solutions.bitbadger.documents.common.DocumentException;
+import solutions.bitbadger.documents.DocumentException;
 import solutions.bitbadger.documents.java.java.testDocs.*;
 
 import static org.junit.jupiter.api.Assertions.*;

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;
 

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;
 

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;

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;
 

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;
 

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.DocumentException;
-import solutions.bitbadger.documents.common.Parameter;
+import solutions.bitbadger.documents.Parameter;
-import solutions.bitbadger.documents.common.ParameterType;
+import solutions.bitbadger.documents.ParameterType;
 
 import static org.junit.jupiter.api.Assertions.*;
 

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

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

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
 
 /**

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

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
 
 /**

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
 
 /**

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

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
 
 /**

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
 
 /**

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

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.Configuration
-import solutions.bitbadger.documents.common.Dialect
+import solutions.bitbadger.documents.Dialect
-import solutions.bitbadger.documents.common.DocumentException
+import solutions.bitbadger.documents.DocumentException
-import solutions.bitbadger.documents.common.Field
+import solutions.bitbadger.documents.Field
+import solutions.bitbadger.documents.java.query.Count
 import kotlin.test.assertEquals
 
 /**

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.Configuration
-import solutions.bitbadger.documents.common.Dialect
+import solutions.bitbadger.documents.Dialect
-import solutions.bitbadger.documents.common.DocumentException
+import solutions.bitbadger.documents.DocumentException
-import solutions.bitbadger.documents.common.DocumentIndex
+import solutions.bitbadger.documents.DocumentIndex
 import kotlin.test.assertEquals
 
 /**

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.Configuration
-import solutions.bitbadger.documents.common.Dialect
+import solutions.bitbadger.documents.Dialect
-import solutions.bitbadger.documents.common.DocumentException
+import solutions.bitbadger.documents.DocumentException
-import solutions.bitbadger.documents.common.Field
+import solutions.bitbadger.documents.Field
 import kotlin.test.assertEquals
 
 /**

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 AutoId
-import solutions.bitbadger.documents.common.Configuration
+import solutions.bitbadger.documents.Configuration
-import solutions.bitbadger.documents.common.Dialect
+import solutions.bitbadger.documents.Dialect
-import solutions.bitbadger.documents.common.DocumentException
+import solutions.bitbadger.documents.DocumentException
+import solutions.bitbadger.documents.java.query.Document
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 

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.Configuration
-import solutions.bitbadger.documents.common.Dialect
+import solutions.bitbadger.documents.Dialect
-import solutions.bitbadger.documents.common.DocumentException
+import solutions.bitbadger.documents.DocumentException
-import solutions.bitbadger.documents.common.Field
+import solutions.bitbadger.documents.Field
 import kotlin.test.assertEquals
 
 /**

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.Configuration
-import solutions.bitbadger.documents.common.Dialect
+import solutions.bitbadger.documents.Dialect
-import solutions.bitbadger.documents.common.DocumentException
+import solutions.bitbadger.documents.DocumentException
-import solutions.bitbadger.documents.common.Field
+import solutions.bitbadger.documents.Field
 import kotlin.test.assertEquals
 
 /**

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.Configuration
-import solutions.bitbadger.documents.common.Dialect
+import solutions.bitbadger.documents.Dialect
-import solutions.bitbadger.documents.common.DocumentException
+import solutions.bitbadger.documents.DocumentException
-import solutions.bitbadger.documents.common.Field
+import solutions.bitbadger.documents.Field
 import kotlin.test.assertEquals
 
 /**

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.Configuration
-import solutions.bitbadger.documents.common.Dialect
+import solutions.bitbadger.documents.Dialect
-import solutions.bitbadger.documents.common.Field
+import solutions.bitbadger.documents.Field
-import solutions.bitbadger.documents.common.FieldMatch
+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)")

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
 

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
 
 /**

src/jvm/pom.xml

@@ -30,14 +30,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>solutions.bitbadger.documents</groupId>
-            <artifactId>common</artifactId>
-            <version>4.0.0-alpha1-SNAPSHOT</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/../common/target/common-4.0.0-alpha1-SNAPSHOT.jar</systemPath>
-            <type>jar</type>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>

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.*

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

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

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

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

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

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

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

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

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

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

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

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

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

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
 

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.*
-import solutions.bitbadger.documents.common.query.Count
+import solutions.bitbadger.documents.query.Count
+import solutions.bitbadger.documents.extensions.customScalar
 import java.sql.Connection
 
 /**

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.Configuration
-import solutions.bitbadger.documents.common.Parameter
+import solutions.bitbadger.documents.Parameter
 import java.sql.Connection
 import java.sql.ResultSet
 

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.Configuration
-import solutions.bitbadger.documents.common.DocumentException
+import solutions.bitbadger.documents.DocumentException
-import solutions.bitbadger.documents.common.DocumentIndex
+import solutions.bitbadger.documents.DocumentIndex
-import solutions.bitbadger.documents.common.query.Definition
+import solutions.bitbadger.documents.extensions.customNonQuery
+import solutions.bitbadger.documents.query.Definition
 import java.sql.Connection
 
 /**

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.*
-import solutions.bitbadger.documents.common.query.Delete
+import solutions.bitbadger.documents.extensions.customNonQuery
+import solutions.bitbadger.documents.query.Delete
 import java.sql.Connection
 
 /**

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.AutoId
-import solutions.bitbadger.documents.common.Configuration
+import solutions.bitbadger.documents.Configuration
-import solutions.bitbadger.documents.common.Dialect
+import solutions.bitbadger.documents.Dialect
-import solutions.bitbadger.documents.common.Field
+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

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

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.*
-import solutions.bitbadger.documents.common.query.Exists
+import solutions.bitbadger.documents.extensions.customScalar
+import solutions.bitbadger.documents.query.Exists
 import java.sql.Connection
 
 /**

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.*
-import solutions.bitbadger.documents.common.query.Find
+import solutions.bitbadger.documents.extensions.customList
-import solutions.bitbadger.documents.common.query.orderBy
+import solutions.bitbadger.documents.extensions.customSingle
+import solutions.bitbadger.documents.query.Find
+import solutions.bitbadger.documents.query.orderBy
 import java.sql.Connection
 
 /**

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

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

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.*
-import solutions.bitbadger.documents.common.query.Patch
+import solutions.bitbadger.documents.extensions.customNonQuery
+import solutions.bitbadger.documents.query.Patch
 import java.sql.Connection
 
 /**

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.*
-import solutions.bitbadger.documents.common.query.RemoveFields
+import solutions.bitbadger.documents.extensions.customNonQuery
+import solutions.bitbadger.documents.query.RemoveFields
 import java.sql.Connection
 
 /**

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.Configuration
-import solutions.bitbadger.documents.common.Dialect
+import solutions.bitbadger.documents.Dialect
-import solutions.bitbadger.documents.common.DocumentException
+import solutions.bitbadger.documents.DocumentException
 import java.sql.PreparedStatement
 import java.sql.ResultSet
 import java.sql.SQLException

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.Field
-import solutions.bitbadger.documents.common.FieldMatch
+import solutions.bitbadger.documents.FieldMatch
-import solutions.bitbadger.documents.common.query.byFields as byFieldsBase;
+import solutions.bitbadger.documents.query.byFields as byFieldsBase;
 
 /**
  * Functions to count documents

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

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.Field
-import solutions.bitbadger.documents.common.FieldMatch
+import solutions.bitbadger.documents.FieldMatch
-import solutions.bitbadger.documents.common.query.byFields as byFieldsBase
+import solutions.bitbadger.documents.query.byFields as byFieldsBase
-import solutions.bitbadger.documents.common.query.byId as byIdBase
+import solutions.bitbadger.documents.query.byId as byIdBase
 
 /**
  * Functions to delete documents

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.AutoId
-import solutions.bitbadger.documents.common.Configuration
+import solutions.bitbadger.documents.Configuration
-import solutions.bitbadger.documents.common.Dialect
+import solutions.bitbadger.documents.Dialect
 
 /**
  * Functions for document-level operations

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.Field
-import solutions.bitbadger.documents.common.FieldMatch
+import solutions.bitbadger.documents.FieldMatch
 
 /**
  * Functions to check for document existence

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.Field
-import solutions.bitbadger.documents.common.FieldMatch
+import solutions.bitbadger.documents.FieldMatch
-import solutions.bitbadger.documents.common.query.byId as byIdBase
+import solutions.bitbadger.documents.query.byId as byIdBase
-import solutions.bitbadger.documents.common.query.byFields as byFieldsBase
+import solutions.bitbadger.documents.query.byFields as byFieldsBase
 
 /**
  * Functions to retrieve documents

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.Configuration
-import solutions.bitbadger.documents.common.Dialect
+import solutions.bitbadger.documents.Dialect
-import solutions.bitbadger.documents.common.Field
+import solutions.bitbadger.documents.Field
-import solutions.bitbadger.documents.common.FieldMatch
+import solutions.bitbadger.documents.FieldMatch
-import solutions.bitbadger.documents.common.query.byFields as byFieldsBase
+import solutions.bitbadger.documents.query.byFields as byFieldsBase
-import solutions.bitbadger.documents.common.query.byId as byIdBase
+import solutions.bitbadger.documents.query.byId as byIdBase
 
 /**
  * Functions to create queries to patch (partially update) JSON documents

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.Configuration
-import solutions.bitbadger.documents.common.Dialect
+import solutions.bitbadger.documents.Dialect
-import solutions.bitbadger.documents.common.Field
+import solutions.bitbadger.documents.Field
-import solutions.bitbadger.documents.common.FieldMatch
+import solutions.bitbadger.documents.FieldMatch
 
 // ~~~ TOP-LEVEL FUNCTIONS FOR THE QUERY PACKAGE ~~~
 

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.*
-import solutions.bitbadger.documents.common.query.byFields as byFieldsBase
+import solutions.bitbadger.documents.query.byFields as byFieldsBase
-import solutions.bitbadger.documents.common.query.byId as byIdBase
+import solutions.bitbadger.documents.query.byId as byIdBase
 
 /**
  * Functions to create queries to remove fields from documents

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.Configuration
-import solutions.bitbadger.documents.common.Dialect
+import solutions.bitbadger.documents.Dialect
-import solutions.bitbadger.documents.common.DocumentException
+import solutions.bitbadger.documents.DocumentException
-import solutions.bitbadger.documents.common.Field
+import solutions.bitbadger.documents.Field
-import solutions.bitbadger.documents.common.FieldMatch
+import solutions.bitbadger.documents.FieldMatch
 
 /**
  * Functions to create `WHERE` clause fragments

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.*;
-import solutions.bitbadger.documents.java.Parameters;
+import solutions.bitbadger.documents.java.jvm.Parameters;
 
 import java.util.List;
 

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.Field;
-import solutions.bitbadger.documents.java.Count;
+import solutions.bitbadger.documents.java.jvm.Count;
 import solutions.bitbadger.documents.java.integration.ThrowawayDatabase;
 import solutions.bitbadger.documents.java.java.testDocs.JsonDocument;
 

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;
 

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;

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
 
 /**

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

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"

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.Field
-import solutions.bitbadger.documents.java.countAll
+import solutions.bitbadger.documents.java.extensions.countAll
-import solutions.bitbadger.documents.java.countByContains
+import solutions.bitbadger.documents.java.extensions.countByContains
-import solutions.bitbadger.documents.java.countByFields
+import solutions.bitbadger.documents.java.extensions.countByFields
-import solutions.bitbadger.documents.java.countByJsonPath
+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

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

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.DocumentIndex
-import solutions.bitbadger.documents.java.ensureDocumentIndex
+import solutions.bitbadger.documents.java.extensions.ensureDocumentIndex
-import solutions.bitbadger.documents.java.ensureFieldIndex
+import solutions.bitbadger.documents.java.extensions.ensureFieldIndex
-import solutions.bitbadger.documents.java.ensureTable
+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

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.Field
-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

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.*
 

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.Field
-import solutions.bitbadger.documents.java.existsByContains
+import solutions.bitbadger.documents.java.extensions.existsByContains
-import solutions.bitbadger.documents.java.existsByFields
+import solutions.bitbadger.documents.java.extensions.existsByFields
-import solutions.bitbadger.documents.java.existsById
+import solutions.bitbadger.documents.java.extensions.existsById
-import solutions.bitbadger.documents.java.existsByJsonPath
+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

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

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.Field
-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

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.Field
-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

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

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 
 /**

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.DocumentIndex
-import solutions.bitbadger.documents.common.Field
+import solutions.bitbadger.documents.Field
-import solutions.bitbadger.documents.common.FieldMatch
+import solutions.bitbadger.documents.FieldMatch
-import solutions.bitbadger.documents.common.Parameter
+import solutions.bitbadger.documents.Parameter
-import solutions.bitbadger.documents.java.Document
+import solutions.bitbadger.documents.java.jvm.Document
 import java.sql.Connection
 import java.sql.ResultSet
 

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.Configuration
-import solutions.bitbadger.documents.common.Field
+import solutions.bitbadger.documents.Field
-import solutions.bitbadger.documents.common.FieldMatch
+import solutions.bitbadger.documents.FieldMatch
-import solutions.bitbadger.documents.common.Parameter
+import solutions.bitbadger.documents.Parameter
-import solutions.bitbadger.documents.common.ParameterType
+import solutions.bitbadger.documents.ParameterType
-import solutions.bitbadger.documents.common.query.Count
 
 import java.sql.Connection
 

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.Configuration
-import solutions.bitbadger.documents.common.Parameter
+import solutions.bitbadger.documents.Parameter
-import solutions.bitbadger.documents.java.Custom
 import java.sql.Connection
 import java.sql.ResultSet
 

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
 
 /**

src/kotlin/src/main/kotlin/Delete.kt

@@ -1,7 +1,7 @@
-import solutions.bitbadger.documents.common.Field
+import solutions.bitbadger.documents.Field
-import solutions.bitbadger.documents.common.FieldMatch
+import solutions.bitbadger.documents.FieldMatch
-import solutions.bitbadger.documents.common.Parameter
+import solutions.bitbadger.documents.Parameter
-import solutions.bitbadger.documents.common.ParameterType
+import solutions.bitbadger.documents.ParameterType
 import java.sql.Connection
 
 /**

src/kotlin/src/main/kotlin/Exists.kt

@@ -1,7 +1,7 @@
-import solutions.bitbadger.documents.common.Field
+import solutions.bitbadger.documents.Field
-import solutions.bitbadger.documents.common.FieldMatch
+import solutions.bitbadger.documents.FieldMatch
-import solutions.bitbadger.documents.common.Parameter
+import solutions.bitbadger.documents.Parameter
-import solutions.bitbadger.documents.common.ParameterType
+import solutions.bitbadger.documents.ParameterType
 import java.sql.Connection
 
 /**

src/kotlin/src/main/kotlin/Find.kt

@@ -1,9 +1,8 @@
-import solutions.bitbadger.documents.common.Field
+import solutions.bitbadger.documents.Field
-import solutions.bitbadger.documents.common.FieldMatch
+import solutions.bitbadger.documents.FieldMatch
-import solutions.bitbadger.documents.common.Parameter
+import solutions.bitbadger.documents.Parameter
-import solutions.bitbadger.documents.common.ParameterType
+import solutions.bitbadger.documents.ParameterType
 import java.sql.Connection
-import solutions.bitbadger.documents.common.query.orderBy
 
 /**
  * Functions to find and retrieve documents

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

src/kotlin/src/main/kotlin/Patch.kt

@@ -1,7 +1,7 @@
-import solutions.bitbadger.documents.common.Field
+import solutions.bitbadger.documents.Field
-import solutions.bitbadger.documents.common.FieldMatch
+import solutions.bitbadger.documents.FieldMatch
-import solutions.bitbadger.documents.common.Parameter
+import solutions.bitbadger.documents.Parameter
-import solutions.bitbadger.documents.common.ParameterType
+import solutions.bitbadger.documents.ParameterType
 import java.sql.Connection
 
 /**