Merge pull request #99 from JetBrains/adopt-orientdb-less-entity-iter…

…able-base Switched a little to interface
JetBrains · Sep 4, 2024 · 76cbbf3 · 76cbbf3
2 parents 89454d0 + fcab02d
commit 76cbbf3
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/...ore/src/main/kotlin/com/jetbrains/teamsys/dnq/database/PersistentEntityIterableWrapper.kt b/...ore/src/main/kotlin/com/jetbrains/teamsys/dnq/database/PersistentEntityIterableWrapper.kt
@@ -17,7 +17,10 @@ package com.jetbrains.teamsys.dnq.database
 
 import jetbrains.exodus.database.TransientEntity
 import jetbrains.exodus.database.TransientEntityStore
-import jetbrains.exodus.entitystore.*
+import jetbrains.exodus.entitystore.Entity
+import jetbrains.exodus.entitystore.EntityIterable
+import jetbrains.exodus.entitystore.EntityIterator
+import jetbrains.exodus.entitystore.StoreTransaction
 import jetbrains.exodus.entitystore.iterate.EntityIterableBase
 import jetbrains.exodus.entitystore.util.unsupported
 
@@ -32,7 +35,7 @@ open class PersistentEntityIterableWrapper(
         wrappedIterable: EntityIterable) :
         EntityIterableWrapper,
         EntityIterableBase(
-                (wrappedIterable as? EntityIterableBase)?.source
+                (wrappedIterable as? EntityIterable)?.unwrap()
                         .takeIf { it !== EMPTY }
                         ?.transaction) {
 
@@ -58,28 +61,28 @@ open class PersistentEntityIterableWrapper(
     public override fun getHandleImpl() = unsupported()
 
     override fun intersect(right: EntityIterable): EntityIterable {
-        right as? EntityIterableBase ?: throwUnsupported()
-        return wrappedIterable.intersect(right.source)
+        right as? EntityIterable ?: throwUnsupported()
+        return wrappedIterable.intersect(right.unwrap())
     }
 
     override fun intersectSavingOrder(right: EntityIterable): EntityIterable {
-        right as? EntityIterableBase ?: throwUnsupported()
-        return wrappedIterable.intersectSavingOrder(right.source)
+        right as? EntityIterable ?: throwUnsupported()
+        return wrappedIterable.intersectSavingOrder(right.unwrap())
     }
 
     override fun union(right: EntityIterable): EntityIterable {
-        right as? EntityIterableBase ?: throwUnsupported()
-        return wrappedIterable.union(right.source)
+        right as? EntityIterable ?: throwUnsupported()
+        return wrappedIterable.union(right.unwrap())
     }
 
     override fun minus(right: EntityIterable): EntityIterable {
-        right as? EntityIterableBase ?: throwUnsupported()
-        return wrappedIterable.minus(right.source)
+        right as? EntityIterable ?: throwUnsupported()
+        return wrappedIterable.minus(right.unwrap())
     }
 
     override fun concat(right: EntityIterable): EntityIterable {
-        right as? EntityIterableBase ?: throwUnsupported()
-        return wrappedIterable.concat(right.source)
+        right as? EntityIterable ?: throwUnsupported()
+        return wrappedIterable.concat(right.unwrap())
     }
 
     override fun take(number: Int): EntityIterable {