Skip to content

Commit 24a5f2f

Browse files
committed
fix(model-server): new parameter for using roleIds
1 parent 668a31e commit 24a5f2f

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

model-server/src/main/kotlin/org/modelix/model/server/CmdLineArgs.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ internal class CmdLineArgs {
4040
)
4141
var schemaInit = false
4242

43+
@Parameter(names = ["-useroleids"], description = "Use IDs for roles instead of simpleNames. Required for bulk sync.", converter = BooleanConverter::class)
44+
var useRoleIds = false
45+
4346
@Parameter(names = ["-h", "--help"], help = true)
4447
var help = false
4548
}

model-server/src/main/kotlin/org/modelix/model/server/Main.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ object Main {
151151
}
152152

153153
val jsonModelServer = DeprecatedLightModelServer(localModelClient)
154-
val repositoriesManager = RepositoriesManager(localModelClient)
154+
val repositoriesManager = RepositoriesManager(localModelClient, cmdLineArgs.useRoleIds)
155155
val repositoryOverview = RepositoryOverview(repositoriesManager)
156156
val historyHandler = HistoryHandler(localModelClient, repositoriesManager)
157157
val contentExplorer = ContentExplorer(localModelClient, repositoriesManager)

model-server/src/main/kotlin/org/modelix/model/server/handlers/RepositoriesManager.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import org.modelix.model.server.store.IStoreClient
3030
import org.modelix.model.server.store.LocalModelClient
3131
import org.modelix.model.server.store.pollEntry
3232

33-
class RepositoriesManager(val client: LocalModelClient) {
33+
class RepositoriesManager(val client: LocalModelClient, val useRoleIds: Boolean = false) {
3434
init {
3535
migrateLegacyRepositoriesList()
3636
}
@@ -57,7 +57,7 @@ class RepositoriesManager(val client: LocalModelClient) {
5757
id = client.idGenerator.generate(),
5858
time = Clock.System.now().epochSeconds.toString(),
5959
author = userName,
60-
tree = CLTree(client.storeCache),
60+
tree = CLTree(null, null, client.storeCache, useRoleIds = useRoleIds),
6161
baseVersion = null,
6262
operations = emptyArray(),
6363
)

0 commit comments

Comments
 (0)