Fix currentTransaction in references while using query

src/main/kotlin/nl/astraeus/persistence/Persistent.kt

@@ -16,7 +16,19 @@ class Persistent(
   val datastore: Datastore = Datastore(directory, indexes, enableOptimisticLocking)
 
   fun <T> query(block: Query.() -> T): T {
+    var cleanup = false
+    if (transactions.get() == null) {
+      transactions.set(Transaction(this))
+      cleanup = true
+    }
+
+    try {
       return block(Query(this))
+    } finally {
+      if (cleanup) {
+        transactions.remove()
+      }
+    }
   }
 
   fun transaction(block: Transaction.() -> Unit) {

src/main/kotlin/nl/astraeus/persistence/reference/Reference.kt

@@ -10,7 +10,8 @@ inline fun <reified T : Persistable> reference(
 ) = Reference(T::class.java, initialValue)
 
 inline fun <reified T : Persistable> nullableReference(
-) = NullableReference(T::class.java)
+  initialValue:T? = null
+) = NullableReference(T::class.java, initialValue)
 
 class Reference<S : Persistable>(
   val cls: Class<S>,
@@ -33,9 +34,10 @@ class Reference<S : Persistable>(
 }
 
 class NullableReference<S : Persistable>(
-  val cls: Class<S>
+  val cls: Class<S>,
+  initialValue: S? = null
 ) : Serializable {
-  var id: Long? = null
+  var id: Long? = initialValue?.id
 
   operator fun getValue(thisRef: Persistable, property: KProperty<*>): S? {
     return currentTransaction()?.find(cls.kotlin, id ?: 0L)

src/test/java/nl/astraeus/persistence/TestPersistenceJava.java

@@ -2,14 +2,13 @@ package nl.astraeus.persistence;
 
 import nl.astraeus.nl.astraeus.persistence.AbstractPersistable;
 import nl.astraeus.nl.astraeus.persistence.Index;
-import nl.astraeus.nl.astraeus.persistence.Persistable;
 import nl.astraeus.nl.astraeus.persistence.Persistent;
-import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.util.List;
 
+
 public class TestPersistenceJava {
 
     static class Person extends AbstractPersistable {
@@ -100,7 +99,7 @@ public class TestPersistenceJava {
             return null;
         });
 
-        persistent.transaction((t) -> {
+        persistent.query((t) -> {
             List<Person> persons = t.findByIndex(
                     Person.class,
                     "name",

src/test/kotlin/nl/astraeus/persistence/TestOptimisticLocking.kt

@@ -1,12 +1,12 @@
 package nl.astraeus.persistence
 
 import nl.astraeus.nl.astraeus.persistence.OptimisticLockingException
-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.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
 import java.io.File
@@ -14,21 +14,6 @@ import kotlin.test.Test
 
 class TestOptimisticLocking {
 
-  class Person(
-    override var id: Long = 0,
-    override var version: Long = 0,
-    val name: String,
-    val age: Int,
-  ) : Persistable, Cloneable {
-    companion object {
-      private const val serialVersionUID: Long = 1L
-    }
-
-    override fun toString(): String {
-      return "Person(id=$id, version=$version, name='$name', age=$age)"
-    }
-  }
-
   @Test
   fun showTransactions() {
     val log = TransactionLog(File("data", "test-locking"))

src/test/kotlin/nl/astraeus/persistence/TestPersistence.kt

@@ -1,13 +1,12 @@
 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.currentTransaction
 import nl.astraeus.nl.astraeus.persistence.find
 import nl.astraeus.nl.astraeus.persistence.findByIndex
 import nl.astraeus.nl.astraeus.persistence.index
-import nl.astraeus.nl.astraeus.persistence.reference.ReferenceCollection
+import nl.astraeus.persistence.domain.Company
+import nl.astraeus.persistence.domain.Person
 import org.junit.jupiter.api.Assertions.assertNotNull
 import org.junit.jupiter.api.Assertions.assertNull
 import java.io.File
@@ -15,51 +14,6 @@ import kotlin.test.Test
 
 class TestPersistence {
 
-  class Company(
-    override var id: Long = 0,
-    override var version: Long = 0,
-    val name: String
-  ) : Persistable, Cloneable {
-    val personIds: MutableList<Long> = ArrayList()
-    val persons: MutableCollection<Person>
-      get() {
-        return ReferenceCollection(Person::class.java, personIds)
-      }
-
-    companion object {
-      private const val serialVersionUID: Long = 1L
-    }
-
-    override fun toString(): String {
-      return "Company(id=$id, version=$version, name='$name')"
-    }
-  }
-
-  class Person(
-    override var id: Long = 0,
-    override var version: Long = 0,
-    val name: String,
-    val age: Int,
-    private var companyId: Long? = null
-  ) : Persistable, Cloneable {
-    var company: Company?
-      get() = currentTransaction()?.find(Company::class, companyId ?: 0L)
-      set(value) {
-        if (value != null) {
-          currentTransaction()?.store(value)
-        }
-        companyId = value?.id
-      }
-
-    companion object {
-      private const val serialVersionUID: Long = 1L
-    }
-
-    override fun toString(): String {
-      return "Person(id=$id, version=$version, name='$name', age=$age, company=$companyId)"
-    }
-  }
-
   @Test
   fun showTransactions() {
     val log = TransactionLog(File("data", "test-persistence"))

src/test/kotlin/nl/astraeus/persistence/TestPersistenceJavaInKotlin.kt

@@ -0,0 +1,67 @@
+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
+
+
+class TestPersistenceJavaInKotlin {
+  internal class Person(
+    var name: String,
+    var age: Int
+  ) : Persistable {
+    override var id: Long = 0
+    override var version: Long = 0
+
+    companion object {
+      private const val serialVersionUID = 1L
+    }
+  }
+
+  @Test
+  fun testPersistence() {
+    println("TestPersistenceJavaInKotlin.testPersistence")
+
+    val persistent = Persistent(
+      File("data", "java-kotlin-test"),
+      arrayOf(
+        Index(
+          Person::class,
+          "name"
+        ) { p -> (p as Person).name }
+      ),
+      false
+    )
+
+    persistent.transaction {
+      val person = find(Person::class.java, 1L)
+      if (person != null) {
+        println("Person: ${person.name} is ${person.age} years old."
+        )
+      }
+    }
+
+    persistent.transaction {
+      val person = Person("John Doe", 42)
+
+      store(person)
+    }
+
+    persistent.query {
+      val persons = findByIndex(
+        Person::class.java,
+        "name",
+        "John Doe"
+      )
+      for (person in persons) {
+        println("Person: ${person.name}  is ${person.age} years old.")
+      }
+    }
+
+    persistent.snapshot()
+    persistent.datastore.printStatus()
+    persistent.removeOldFiles()
+  }
+}

src/test/kotlin/nl/astraeus/persistence/TestReferences.kt

@@ -4,34 +4,17 @@ 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.nl.astraeus.persistence.reference.referenceCollection
+import nl.astraeus.persistence.domain.Company
 import org.junit.jupiter.api.assertThrows
 import java.io.File
 import kotlin.test.Test
 
 class TestReferences {
 
-  class Company(
-    override var id: Long = 0,
-    override var version: Long = 0,
-    val name: String
-  ) : Persistable, Cloneable {
-    val persons: MutableCollection<Person> = referenceCollection()
-
-    companion object {
-      private const val serialVersionUID: Long = 1L
-    }
-
-    override fun toString(): String {
-      return "Company(id=$id, version=$version, name='$name', persons=${persons.size})"
-    }
-  }
-
   class Person(
     override var id: Long = 0,
     override var version: Long = 0,
     val name: String,
-    val age: Int,
     company: Company
   ) : Persistable, Cloneable {
     var company: Company by reference(company)
@@ -41,7 +24,7 @@ class TestReferences {
     }
 
     override fun toString(): String {
-      return "Person(id=$id, version=$version, name='$name', age=$age)"
+      return "Person(id=$id, version=$version, name='$name')"
     }
   }
 
@@ -67,13 +50,10 @@ class TestReferences {
       val person = Person(
         id = 0L,
         name = "John Doe",
-        age = 25,
         company = company
       )
       store(person)
 
-      company.persons.add(person)
-
       store(company)
 
       for (p in company.persons) {

src/test/kotlin/nl/astraeus/persistence/TestThreaded.kt

@@ -7,52 +7,14 @@ 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
 import kotlin.random.Random
 import kotlin.test.Test
 
 class TestThreaded {
 
-  class Company(
-    override var id: Long = 0,
-    override var version: Long = 0,
-    val name: String,
-    val adres: String = "Blaat"
-  ) : Persistable, Cloneable {
-    //var persons: MutableList<Person> by ListReference<Person, Company>(Person::class.java)
-
-    companion object {
-      private const val serialVersionUID: Long = 1L
-    }
-
-    override fun toString(): String {
-      return "Company(id=$id, version=$version, name='$name', adres='$adres')"
-    }
-
-  }
-
-  class Person(
-    override var id: Long = 0,
-    override var version: Long = 0,
-    val name: String,
-    val age: Int,
-    var companyId: Long? = null
-  ) : Persistable, Cloneable {
-/*    var company: Company? by Reference(
-      Company::class.java,
-      { id -> companyId = id },
-      { companyId }
-    )*/
-
-    companion object {
-      private const val serialVersionUID: Long = 1L
-    }
-
-    override fun toString(): String {
-      return "Person(id=$id, version=$version, name='$name', age=$age)"
-    }
-  }
-
   @Test
   fun showTransactions() {
     val log = TransactionLog(File("data", "test-threaded"))

src/test/kotlin/nl/astraeus/persistence/domain/Company.kt

@@ -0,0 +1,20 @@
+package nl.astraeus.persistence.domain
+
+import nl.astraeus.nl.astraeus.persistence.Persistable
+import nl.astraeus.nl.astraeus.persistence.reference.referenceCollection
+
+class Company(
+  override var id: Long = 0,
+  override var version: Long = 0,
+  val name: String
+) : Persistable, Cloneable {
+  val persons: MutableCollection<Person> = referenceCollection()
+
+  companion object {
+    private const val serialVersionUID: Long = 1L
+  }
+
+  override fun toString(): String {
+    return "Company(id=$id, version=$version, name='$name', persons=${persons.size})"
+  }
+}

src/test/kotlin/nl/astraeus/persistence/domain/Person.kt

@@ -0,0 +1,22 @@
+package nl.astraeus.persistence.domain
+
+import nl.astraeus.nl.astraeus.persistence.Persistable
+import nl.astraeus.nl.astraeus.persistence.reference.nullableReference
+
+class Person(
+  override var id: Long = 0,
+  override var version: Long = 0,
+  val name: String,
+  val age: Int,
+  company: Company? = null
+) : Persistable, Cloneable {
+  var company: Company? by nullableReference(company)
+
+  companion object {
+    private const val serialVersionUID: Long = 1L
+  }
+
+  override fun toString(): String {
+    return "Person(id=$id, version=$version, name='$name', age=$age)"
+  }
+}