chore(bulk-model-sync): fix detekt warnings

modelix · Jun 25, 2024 · 78d0bf5 · 78d0bf5
1 parent a57d64d
commit 78d0bf5
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/bulk-model-sync-lib/src/jvmMain/kotlin/org/modelix/model/sync/bulk/InvalidatingVisitor.kt b/bulk-model-sync-lib/src/jvmMain/kotlin/org/modelix/model/sync/bulk/InvalidatingVisitor.kt
@@ -20,6 +20,9 @@ import org.modelix.model.api.ITree
 import org.modelix.model.api.ITreeChangeVisitorEx
 import org.modelix.model.data.NodeData
 
+/**
+ * Visitor that visits a [tree] and stores the invalidation information in an [invalidationTree].
+ */
 class InvalidatingVisitor(val tree: ITree, val invalidationTree: InvalidationTree) : ITreeChangeVisitorEx {
 
     private fun invalidateNode(nodeId: Long) = invalidationTree.invalidate(tree, nodeId)

diff --git a/...c/jvmTest/kotlin/org/modelix/model/sync/bulk/ModelSynchronizerWithInvalidationTreeTest.kt b/...c/jvmTest/kotlin/org/modelix/model/sync/bulk/ModelSynchronizerWithInvalidationTreeTest.kt
@@ -74,12 +74,12 @@ class ModelSynchronizerWithInvalidationTreeTest : AbstractModelSyncTest() {
             val rootNode = sourceBranch.getRootNode()
             rootNode.setPropertyValue(IProperty.fromName(ID_PROPERTY_KEY), rootNode.reference.serialize())
             val grower = RandomModelChangeGenerator(rootNode, rand).growingOperationsOnly()
-            for (i in 1..100) {
+            repeat(100) {
                 grower.applyRandomChange()
             }
 
             val changer = RandomModelChangeGenerator(rootNode, rand)
-            for (i in 1..numChanges) {
+            repeat(numChanges) {
                 changer.applyRandomChange()
             }
         }

diff --git a/bulk-model-sync-mps/src/main/kotlin/org/modelix/mps/model/sync/bulk/IncludedModulesFilter.kt b/bulk-model-sync-mps/src/main/kotlin/org/modelix/mps/model/sync/bulk/IncludedModulesFilter.kt
@@ -21,7 +21,8 @@ import org.modelix.model.api.INode
 import org.modelix.model.sync.bulk.ModelSynchronizer
 
 /**
- * A filter that skips nodes, which represent MPS modules and do not match the included module names or prefixes.
+ * A filter that skips nodes, which represent MPS modules and do not match
+ * the included module names ([includedModules]) or prefixes ([includedModulePrefixes]).
  *
  * Note: This is currently not meant to be used standalone.
  * It should be used with other filters in a [CompositeFilter].

diff --git a/bulk-model-sync-mps/src/main/kotlin/org/modelix/mps/model/sync/bulk/MPSBulkSynchronizer.kt b/bulk-model-sync-mps/src/main/kotlin/org/modelix/mps/model/sync/bulk/MPSBulkSynchronizer.kt
@@ -205,6 +205,10 @@ object MPSBulkSynchronizer {
         }
     }
 
+    /**
+     * Import from model-server via [INode]-based [ModelSynchronizer].
+     * Requires a specified baseVersion.
+     */
     @JvmStatic
     fun importRepositoryFromModelServer() {
         val repository = getRepository()
@@ -220,22 +224,18 @@ object MPSBulkSynchronizer {
         val branchName = System.getProperty("modelix.mps.model.sync.bulk.server.branch")
         val branchRef = repositoryId.getBranchReference(branchName)
         val versionHash: String? = System.getProperty("modelix.mps.model.sync.bulk.server.version.hash")
-        val baseVersionHash: String? = System.getProperty("modelix.mps.model.sync.bulk.server.version.base.hash")
+        val baseVersionHash = requireNotNull(System.getProperty("modelix.mps.model.sync.bulk.server.version.base.hash")) { "modelix.mps.model.sync.bulk.server.version.base.hash not specified" }
         val client = ModelClientV2.builder().url(modelServerUrl).build()
         val version = runBlocking {
             if (versionHash == null) client.lazyLoadVersion(branchRef) else client.lazyLoadVersion(repositoryId, versionHash)
         }
-        val baseVersion = baseVersionHash?.let {
-            runBlocking {
-                client.lazyLoadVersion(repositoryId, it)
-            }
+        val baseVersion = runBlocking {
+            client.lazyLoadVersion(repositoryId, baseVersionHash)
         }
         println("Loading version ${version.getContentHash()}")
 
         val access = repository.modelAccess
         access.executeCommandInEDT {
-            if (baseVersion == null) return@executeCommandInEDT
-
             val invalidationTree = InvalidationTree(1_000_000)
             val newTree = version.getTree()
             newTree.visitChanges(

diff --git a/bulk-model-sync-mps/src/main/kotlin/org/modelix/mps/model/sync/bulk/NodeAssociations.kt b/bulk-model-sync-mps/src/main/kotlin/org/modelix/mps/model/sync/bulk/NodeAssociations.kt
@@ -28,7 +28,7 @@ import org.modelix.model.data.NodeData
 import org.modelix.model.mpsadapters.MPSArea
 import org.modelix.model.sync.bulk.INodeAssociation
 
-class NodeAssociationToModelServer(val branch: IBranch) : INodeAssociation {
+internal class NodeAssociationToModelServer(val branch: IBranch) : INodeAssociation {
 
     private val modelIndex
         get() = ModelIndex.get(branch.transaction, NodeData.ID_PROPERTY_KEY)
@@ -42,7 +42,7 @@ class NodeAssociationToModelServer(val branch: IBranch) : INodeAssociation {
     }
 }
 
-class NodeAssociationToMps(val mpsArea: MPSArea) : INodeAssociation {
+internal class NodeAssociationToMps(val mpsArea: MPSArea) : INodeAssociation {
 
     private val serverToMps: TLongObjectMap<INode> = TLongObjectHashMap()