Merge pull request #124 from JetBrains/adopt-orientdb-bump-xodus2

Updated xodus
JetBrains · Dec 17, 2024 · 744f89d · 744f89d
2 parents 43aac9a + ae17fa3
commit 744f89d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext.kotlin_version = '1.8.10'
-    ext.exodus_version = '9.9.130'
+    ext.exodus_version = '9.9.136'
     ext.dokka_version = '1.7.20'
     ext.log4j_version = '2.17.1'
     ext.google_truth_version = '1.4.2'

diff --git a/dnq/src/main/kotlin/kotlinx/dnq/store/container/StaticStoreContainer.kt b/dnq/src/main/kotlin/kotlinx/dnq/store/container/StaticStoreContainer.kt
@@ -20,10 +20,7 @@ import com.orientechnologies.orient.core.db.ODatabaseType
 import com.orientechnologies.orient.core.db.OrientDB
 import com.orientechnologies.orient.core.db.OrientDBConfigBuilder
 import jetbrains.exodus.database.TransientEntityStore
-import jetbrains.exodus.entitystore.orientdb.ODatabaseConfig
-import jetbrains.exodus.entitystore.orientdb.ODatabaseProvider
-import jetbrains.exodus.entitystore.orientdb.ODatabaseProviderImpl
-import jetbrains.exodus.entitystore.orientdb.initOrientDbServer
+import jetbrains.exodus.entitystore.orientdb.*
 import java.io.File
 
 object StaticStoreContainer : StoreContainer {
@@ -41,16 +38,20 @@ object StaticStoreContainer : StoreContainer {
         }
 
     fun init(dbFolder: File, entityStoreName: String, configure: OrientDBConfigBuilder.() -> Unit = {}): TransientEntityStoreImpl {
-        val config = ODatabaseConfig.builder()
+        val connectionConfig = ODatabaseConnectionConfig
+            .builder()
             .withUserName("admin")
             .withPassword("admin")
             .withDatabaseType(ODatabaseType.MEMORY)
-            .withDatabaseName("memory")
             .withDatabaseRoot(dbFolder.absolutePath)
+            .build()
+        val config = ODatabaseConfig.builder()
+            .withConnectionConfig(connectionConfig)
+            .withDatabaseName("memory")
             .tweakConfig(configure)
             .build()
         //TODO use dbFolder
-        db = initOrientDbServer(config)
+        db = initOrientDbServer(connectionConfig)
 
         dbProvider = ODatabaseProviderImpl(config, db!!)
         val store = createTransientEntityStore(dbProvider!!, entityStoreName)