Skip to content

Commit 984e3fe

Browse files
slissonmhuster23
authored andcommitted
fix(model-server): removed -useroleids flag
The /init endpoint now has a parameter instead. ID based roles should be the default for new repositories anyway and the parameter is not expected to be ever used.
1 parent 6af6477 commit 984e3fe

File tree

6 files changed

+5
-10
lines changed

6 files changed

+5
-10
lines changed

bulk-model-sync-gradle-test/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ tasks.register("runModelServer", JavaExec::class) {
7474
classpath = sourceSets["main"].runtimeClasspath
7575
mainClass.set("org.modelix.model.server.Main")
7676
args("-inmemory")
77-
args("-useroleids")
7877
}
7978

8079
val resolveMps by tasks.registering(Copy::class) {

docs/global/modules/core/pages/reference/component-bulk-model-sync-gradle.adoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ https://github.com/modelix/modelix.core[Repository^] | https://github.com/modeli
1212
The `bulk-model-sync` Gradle plugin synchronizes models between `model-api` endpoints.
1313
A common example would be synchronizing a local MPS project to a `model-server`.
1414

15-
IMPORTANT: For correct synchronization the used model-server is required to use IDs for roles. This can be achieved by starting the model-server with the `-useroleids` flag.
16-
1715
.Bulk Synchronization between MPS and model-server
1816
image::bulk-model-sync-gradle.overview.png[Bulk Synchronization between MPS and model-server]
1917

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ 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-
4643
@Parameter(names = ["-h", "--help"], help = true)
4744
var help = false
4845
}

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, cmdLineArgs.useRoleIds)
154+
val repositoriesManager = RepositoriesManager(localModelClient)
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/ModelReplicationServer.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ class ModelReplicationServer(val repositoriesManager: RepositoriesManager) {
103103
fun ApplicationCall.repositoryId() = RepositoryId(parameters["repository"]!!)
104104
fun PipelineContext<Unit, ApplicationCall>.repositoryId() = call.repositoryId()
105105
post("init") {
106-
val initialVersion = repositoriesManager.createRepository(repositoryId(), call.getUserName())
106+
val useRoleIds = call.request.queryParameters["useRoleIds"] != "false"
107+
val initialVersion = repositoriesManager.createRepository(repositoryId(), call.getUserName(), useRoleIds)
107108
call.respondDelta(initialVersion.getContentHash(), null)
108109
}
109110
route("branches") {

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, val useRoleIds: Boolean = false) {
33+
class RepositoriesManager(val client: LocalModelClient) {
3434
init {
3535
migrateLegacyRepositoriesList()
3636
}
@@ -45,7 +45,7 @@ class RepositoriesManager(val client: LocalModelClient, val useRoleIds: Boolean
4545
return store[REPOSITORIES_LIST_KEY]?.lines()?.map { RepositoryId(it) }?.toSet() ?: emptySet()
4646
}
4747

48-
fun createRepository(repositoryId: RepositoryId, userName: String?): CLVersion {
48+
fun createRepository(repositoryId: RepositoryId, userName: String?, useRoleIds: Boolean = true): CLVersion {
4949
var initialVersion: CLVersion? = null
5050
store.runTransaction {
5151
val masterBranch = repositoryId.getBranchReference()

0 commit comments

Comments
 (0)