From 7677bac1a6003906c1b6d9fe1ba2586ea633e549 Mon Sep 17 00:00:00 2001
From: rnentjes <info@nentjes.com>
Date: Tue, 7 May 2024 14:09:58 +0200
Subject: [PATCH] Fix imports

---
 src/main/kotlin/Main.kt                                    | 5 -----
 src/main/kotlin/nl/astraeus/persistence/Datastore.kt       | 4 ++--
 src/main/kotlin/nl/astraeus/persistence/FileManager.kt     | 2 +-
 src/main/kotlin/nl/astraeus/persistence/Indexing.kt        | 2 +-
 src/main/kotlin/nl/astraeus/persistence/Logger.kt          | 2 +-
 .../nl/astraeus/persistence/OptimisticLockingException.kt  | 2 +-
 src/main/kotlin/nl/astraeus/persistence/Persistable.kt     | 2 +-
 src/main/kotlin/nl/astraeus/persistence/Persistent.kt      | 4 ++--
 src/main/kotlin/nl/astraeus/persistence/Transaction.kt     | 2 +-
 src/main/kotlin/nl/astraeus/persistence/TransactionLog.kt  | 2 +-
 .../kotlin/nl/astraeus/persistence/reference/Reference.kt  | 6 +++---
 .../astraeus/persistence/reference/ReferenceCollection.kt  | 6 +++---
 .../nl/astraeus/persistence/reference/ReferenceList.kt     | 6 +++---
 .../persistence/reference/ReferenceListIterator.kt         | 6 +++---
 .../java/nl/astraeus/persistence/TestPersistenceJava.java  | 3 ---
 .../nl/astraeus/persistence/TestOptimisticLocking.kt       | 6 ------
 src/test/kotlin/nl/astraeus/persistence/TestPersistence.kt | 5 -----
 .../nl/astraeus/persistence/TestPersistenceJavaInKotlin.kt | 3 ---
 src/test/kotlin/nl/astraeus/persistence/TestReferences.kt  | 5 +----
 src/test/kotlin/nl/astraeus/persistence/TestThreaded.kt    | 7 -------
 src/test/kotlin/nl/astraeus/persistence/domain/Company.kt  | 4 ++--
 src/test/kotlin/nl/astraeus/persistence/domain/Person.kt   | 4 ++--
 22 files changed, 28 insertions(+), 60 deletions(-)
 delete mode 100644 src/main/kotlin/Main.kt

diff --git a/src/main/kotlin/Main.kt b/src/main/kotlin/Main.kt
deleted file mode 100644
index ce95399..0000000
--- a/src/main/kotlin/Main.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package nl.astraeus
-
-fun main() {
-  println("Hello World!")
-}
\ No newline at end of file
diff --git a/src/main/kotlin/nl/astraeus/persistence/Datastore.kt b/src/main/kotlin/nl/astraeus/persistence/Datastore.kt
index 53edd1e..3e8112d 100644
--- a/src/main/kotlin/nl/astraeus/persistence/Datastore.kt
+++ b/src/main/kotlin/nl/astraeus/persistence/Datastore.kt
@@ -1,4 +1,4 @@
-package nl.astraeus.nl.astraeus.persistence
+package nl.astraeus.persistence
 
 import java.io.File
 import java.io.ObjectInputStream
@@ -38,8 +38,8 @@ class Action(
 
 class Datastore(
   private val directory: File,
-  indexes: Array<PersistableIndex> = arrayOf(),
   val enableOptimisticLocking: Boolean = false,
+  indexes: Array<PersistableIndex> = arrayOf(),
 ) {
   private val fileManager = FileManager(directory)
   private val transactionFormatter = DecimalFormat("#")
diff --git a/src/main/kotlin/nl/astraeus/persistence/FileManager.kt b/src/main/kotlin/nl/astraeus/persistence/FileManager.kt
index 70011a0..a7d784e 100644
--- a/src/main/kotlin/nl/astraeus/persistence/FileManager.kt
+++ b/src/main/kotlin/nl/astraeus/persistence/FileManager.kt
@@ -1,4 +1,4 @@
-package nl.astraeus.nl.astraeus.persistence
+package nl.astraeus.persistence
 
 import java.io.File
 
diff --git a/src/main/kotlin/nl/astraeus/persistence/Indexing.kt b/src/main/kotlin/nl/astraeus/persistence/Indexing.kt
index 40f9117..c3379bc 100644
--- a/src/main/kotlin/nl/astraeus/persistence/Indexing.kt
+++ b/src/main/kotlin/nl/astraeus/persistence/Indexing.kt
@@ -1,4 +1,4 @@
-package nl.astraeus.nl.astraeus.persistence
+package nl.astraeus.persistence
 
 import java.io.Serializable
 import kotlin.reflect.KClass
diff --git a/src/main/kotlin/nl/astraeus/persistence/Logger.kt b/src/main/kotlin/nl/astraeus/persistence/Logger.kt
index c6ff1c3..66c7587 100644
--- a/src/main/kotlin/nl/astraeus/persistence/Logger.kt
+++ b/src/main/kotlin/nl/astraeus/persistence/Logger.kt
@@ -1,4 +1,4 @@
-package nl.astraeus.nl.astraeus.persistence
+package nl.astraeus.persistence
 
 enum class LogLevel {
   TRACE,
diff --git a/src/main/kotlin/nl/astraeus/persistence/OptimisticLockingException.kt b/src/main/kotlin/nl/astraeus/persistence/OptimisticLockingException.kt
index 45d0e71..dd660a4 100644
--- a/src/main/kotlin/nl/astraeus/persistence/OptimisticLockingException.kt
+++ b/src/main/kotlin/nl/astraeus/persistence/OptimisticLockingException.kt
@@ -1,4 +1,4 @@
-package nl.astraeus.nl.astraeus.persistence
+package nl.astraeus.persistence
 
 class OptimisticLockingException : Exception {
   constructor(
diff --git a/src/main/kotlin/nl/astraeus/persistence/Persistable.kt b/src/main/kotlin/nl/astraeus/persistence/Persistable.kt
index f7b6088..66a351d 100644
--- a/src/main/kotlin/nl/astraeus/persistence/Persistable.kt
+++ b/src/main/kotlin/nl/astraeus/persistence/Persistable.kt
@@ -1,4 +1,4 @@
-package nl.astraeus.nl.astraeus.persistence
+package nl.astraeus.persistence
 
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
diff --git a/src/main/kotlin/nl/astraeus/persistence/Persistent.kt b/src/main/kotlin/nl/astraeus/persistence/Persistent.kt
index b199665..578bc25 100644
--- a/src/main/kotlin/nl/astraeus/persistence/Persistent.kt
+++ b/src/main/kotlin/nl/astraeus/persistence/Persistent.kt
@@ -1,4 +1,4 @@
-package nl.astraeus.nl.astraeus.persistence
+package nl.astraeus.persistence
 
 import java.io.File
 
@@ -13,7 +13,7 @@ class Persistent(
   indexes: Array<PersistableIndex> = arrayOf(),
   enableOptimisticLocking: Boolean = false,
 ) {
-  val datastore: Datastore = Datastore(directory, indexes, enableOptimisticLocking)
+  val datastore: Datastore = Datastore(directory, enableOptimisticLocking, indexes)
 
   fun <T> query(block: Query.() -> T): T {
     var cleanup = false
diff --git a/src/main/kotlin/nl/astraeus/persistence/Transaction.kt b/src/main/kotlin/nl/astraeus/persistence/Transaction.kt
index 3a9c388..0c8c209 100644
--- a/src/main/kotlin/nl/astraeus/persistence/Transaction.kt
+++ b/src/main/kotlin/nl/astraeus/persistence/Transaction.kt
@@ -1,4 +1,4 @@
-package nl.astraeus.nl.astraeus.persistence
+package nl.astraeus.persistence
 
 import java.io.Serializable
 import kotlin.reflect.KClass
diff --git a/src/main/kotlin/nl/astraeus/persistence/TransactionLog.kt b/src/main/kotlin/nl/astraeus/persistence/TransactionLog.kt
index 08a0824..b98e75e 100644
--- a/src/main/kotlin/nl/astraeus/persistence/TransactionLog.kt
+++ b/src/main/kotlin/nl/astraeus/persistence/TransactionLog.kt
@@ -1,4 +1,4 @@
-package nl.astraeus.nl.astraeus.persistence
+package nl.astraeus.persistence
 
 import java.io.File
 import java.io.ObjectInputStream
diff --git a/src/main/kotlin/nl/astraeus/persistence/reference/Reference.kt b/src/main/kotlin/nl/astraeus/persistence/reference/Reference.kt
index 5cd11d5..33dd532 100644
--- a/src/main/kotlin/nl/astraeus/persistence/reference/Reference.kt
+++ b/src/main/kotlin/nl/astraeus/persistence/reference/Reference.kt
@@ -1,7 +1,7 @@
-package nl.astraeus.nl.astraeus.persistence.reference
+package nl.astraeus.persistence.reference
 
-import nl.astraeus.nl.astraeus.persistence.Persistable
-import nl.astraeus.nl.astraeus.persistence.currentTransaction
+import nl.astraeus.persistence.Persistable
+import nl.astraeus.persistence.currentTransaction
 import java.io.Serializable
 import kotlin.reflect.KProperty
 
diff --git a/src/main/kotlin/nl/astraeus/persistence/reference/ReferenceCollection.kt b/src/main/kotlin/nl/astraeus/persistence/reference/ReferenceCollection.kt
index c804cfb..b4fb53f 100644
--- a/src/main/kotlin/nl/astraeus/persistence/reference/ReferenceCollection.kt
+++ b/src/main/kotlin/nl/astraeus/persistence/reference/ReferenceCollection.kt
@@ -1,7 +1,7 @@
-package nl.astraeus.nl.astraeus.persistence.reference
+package nl.astraeus.persistence.reference
 
-import nl.astraeus.nl.astraeus.persistence.Persistable
-import nl.astraeus.nl.astraeus.persistence.currentTransaction
+import nl.astraeus.persistence.Persistable
+import nl.astraeus.persistence.currentTransaction
 import java.io.Serializable
 
 inline fun <reified T : Persistable> referenceCollection(
diff --git a/src/main/kotlin/nl/astraeus/persistence/reference/ReferenceList.kt b/src/main/kotlin/nl/astraeus/persistence/reference/ReferenceList.kt
index efc483f..ac5a629 100644
--- a/src/main/kotlin/nl/astraeus/persistence/reference/ReferenceList.kt
+++ b/src/main/kotlin/nl/astraeus/persistence/reference/ReferenceList.kt
@@ -1,7 +1,7 @@
-package nl.astraeus.nl.astraeus.persistence.reference
+package nl.astraeus.persistence.reference
 
-import nl.astraeus.nl.astraeus.persistence.Persistable
-import nl.astraeus.nl.astraeus.persistence.currentTransaction
+import nl.astraeus.persistence.Persistable
+import nl.astraeus.persistence.currentTransaction
 import java.io.Serializable
 
 inline fun <reified T : Persistable> referenceList(
diff --git a/src/main/kotlin/nl/astraeus/persistence/reference/ReferenceListIterator.kt b/src/main/kotlin/nl/astraeus/persistence/reference/ReferenceListIterator.kt
index 7da58f4..5acba6b 100644
--- a/src/main/kotlin/nl/astraeus/persistence/reference/ReferenceListIterator.kt
+++ b/src/main/kotlin/nl/astraeus/persistence/reference/ReferenceListIterator.kt
@@ -1,7 +1,7 @@
-package nl.astraeus.nl.astraeus.persistence.reference
+package nl.astraeus.persistence.reference
 
-import nl.astraeus.nl.astraeus.persistence.Persistable
-import nl.astraeus.nl.astraeus.persistence.currentTransaction
+import nl.astraeus.persistence.Persistable
+import nl.astraeus.persistence.currentTransaction
 
 class ReferenceListIterator<T : Persistable>(
   private val cls: Class<T>,
diff --git a/src/test/java/nl/astraeus/persistence/TestPersistenceJava.java b/src/test/java/nl/astraeus/persistence/TestPersistenceJava.java
index 798b24c..cdd1516 100644
--- a/src/test/java/nl/astraeus/persistence/TestPersistenceJava.java
+++ b/src/test/java/nl/astraeus/persistence/TestPersistenceJava.java
@@ -1,8 +1,5 @@
 package nl.astraeus.persistence;
 
-import nl.astraeus.nl.astraeus.persistence.AbstractPersistable;
-import nl.astraeus.nl.astraeus.persistence.Index;
-import nl.astraeus.nl.astraeus.persistence.Persistent;
 import org.junit.jupiter.api.Test;
 
 import java.io.File;
diff --git a/src/test/kotlin/nl/astraeus/persistence/TestOptimisticLocking.kt b/src/test/kotlin/nl/astraeus/persistence/TestOptimisticLocking.kt
index e5c7e52..7349239 100644
--- a/src/test/kotlin/nl/astraeus/persistence/TestOptimisticLocking.kt
+++ b/src/test/kotlin/nl/astraeus/persistence/TestOptimisticLocking.kt
@@ -1,11 +1,5 @@
 package nl.astraeus.persistence
 
-import nl.astraeus.nl.astraeus.persistence.OptimisticLockingException
-import nl.astraeus.nl.astraeus.persistence.Persistent
-import nl.astraeus.nl.astraeus.persistence.TransactionLog
-import nl.astraeus.nl.astraeus.persistence.find
-import nl.astraeus.nl.astraeus.persistence.findByIndex
-import nl.astraeus.nl.astraeus.persistence.index
 import nl.astraeus.persistence.domain.Person
 import org.junit.jupiter.api.Assertions.assertNotNull
 import org.junit.jupiter.api.assertThrows
diff --git a/src/test/kotlin/nl/astraeus/persistence/TestPersistence.kt b/src/test/kotlin/nl/astraeus/persistence/TestPersistence.kt
index 49380ad..d1d6e11 100644
--- a/src/test/kotlin/nl/astraeus/persistence/TestPersistence.kt
+++ b/src/test/kotlin/nl/astraeus/persistence/TestPersistence.kt
@@ -1,10 +1,5 @@
 package nl.astraeus.persistence
 
-import nl.astraeus.nl.astraeus.persistence.Persistent
-import nl.astraeus.nl.astraeus.persistence.TransactionLog
-import nl.astraeus.nl.astraeus.persistence.find
-import nl.astraeus.nl.astraeus.persistence.findByIndex
-import nl.astraeus.nl.astraeus.persistence.index
 import nl.astraeus.persistence.domain.Company
 import nl.astraeus.persistence.domain.Person
 import org.junit.jupiter.api.Assertions.assertNotNull
diff --git a/src/test/kotlin/nl/astraeus/persistence/TestPersistenceJavaInKotlin.kt b/src/test/kotlin/nl/astraeus/persistence/TestPersistenceJavaInKotlin.kt
index 1bd2a89..2fb072d 100644
--- a/src/test/kotlin/nl/astraeus/persistence/TestPersistenceJavaInKotlin.kt
+++ b/src/test/kotlin/nl/astraeus/persistence/TestPersistenceJavaInKotlin.kt
@@ -1,8 +1,5 @@
 package nl.astraeus.persistence
 
-import nl.astraeus.nl.astraeus.persistence.Index
-import nl.astraeus.nl.astraeus.persistence.Persistable
-import nl.astraeus.nl.astraeus.persistence.Persistent
 import org.junit.jupiter.api.Test
 import java.io.File
 
diff --git a/src/test/kotlin/nl/astraeus/persistence/TestReferences.kt b/src/test/kotlin/nl/astraeus/persistence/TestReferences.kt
index bec78f9..368e76b 100644
--- a/src/test/kotlin/nl/astraeus/persistence/TestReferences.kt
+++ b/src/test/kotlin/nl/astraeus/persistence/TestReferences.kt
@@ -1,10 +1,7 @@
 package nl.astraeus.persistence
 
-import nl.astraeus.nl.astraeus.persistence.Persistable
-import nl.astraeus.nl.astraeus.persistence.Persistent
-import nl.astraeus.nl.astraeus.persistence.TransactionLog
-import nl.astraeus.nl.astraeus.persistence.reference.reference
 import nl.astraeus.persistence.domain.Company
+import nl.astraeus.persistence.reference.reference
 import org.junit.jupiter.api.assertThrows
 import java.io.File
 import kotlin.test.Test
diff --git a/src/test/kotlin/nl/astraeus/persistence/TestThreaded.kt b/src/test/kotlin/nl/astraeus/persistence/TestThreaded.kt
index 9a397e3..29535e8 100644
--- a/src/test/kotlin/nl/astraeus/persistence/TestThreaded.kt
+++ b/src/test/kotlin/nl/astraeus/persistence/TestThreaded.kt
@@ -1,12 +1,5 @@
 package nl.astraeus.persistence
 
-import nl.astraeus.nl.astraeus.persistence.Persistable
-import nl.astraeus.nl.astraeus.persistence.Persistent
-import nl.astraeus.nl.astraeus.persistence.reference.Reference
-import nl.astraeus.nl.astraeus.persistence.TransactionLog
-import nl.astraeus.nl.astraeus.persistence.count
-import nl.astraeus.nl.astraeus.persistence.index
-import nl.astraeus.nl.astraeus.persistence.searchIndex
 import nl.astraeus.persistence.domain.Company
 import nl.astraeus.persistence.domain.Person
 import java.io.File
diff --git a/src/test/kotlin/nl/astraeus/persistence/domain/Company.kt b/src/test/kotlin/nl/astraeus/persistence/domain/Company.kt
index 05ad009..8657e13 100644
--- a/src/test/kotlin/nl/astraeus/persistence/domain/Company.kt
+++ b/src/test/kotlin/nl/astraeus/persistence/domain/Company.kt
@@ -1,7 +1,7 @@
 package nl.astraeus.persistence.domain
 
-import nl.astraeus.nl.astraeus.persistence.Persistable
-import nl.astraeus.nl.astraeus.persistence.reference.referenceCollection
+import nl.astraeus.persistence.Persistable
+import nl.astraeus.persistence.reference.referenceCollection
 
 class Company(
   override var id: Long = 0,
diff --git a/src/test/kotlin/nl/astraeus/persistence/domain/Person.kt b/src/test/kotlin/nl/astraeus/persistence/domain/Person.kt
index 568da37..a98f48a 100644
--- a/src/test/kotlin/nl/astraeus/persistence/domain/Person.kt
+++ b/src/test/kotlin/nl/astraeus/persistence/domain/Person.kt
@@ -1,7 +1,7 @@
 package nl.astraeus.persistence.domain
 
-import nl.astraeus.nl.astraeus.persistence.Persistable
-import nl.astraeus.nl.astraeus.persistence.reference.nullableReference
+import nl.astraeus.persistence.Persistable
+import nl.astraeus.persistence.reference.nullableReference
 
 class Person(
   override var id: Long = 0,