Skip to content

Specify a distinct base package for the model-server example #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nkoester merged 1 commit into from
Nov 17, 2022
Merged

Specify a distinct base package for the model-server example #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .idea/gradle.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion rest-api-model-server/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies {
testImplementation("io.rest-assured:rest-assured")
}

val basePackage = "org.modelix.sample"
val basePackage = "org.modelix.sample.restapimodelserver"

val openApiFile = layout.projectDirectory.file("../openapi/openapi.yaml")

Expand All @@ -38,6 +38,7 @@ openApiGenerate {
generatorName.set("kotlin-server")
inputSpec.set(openApiFile.toString())
outputDir.set("$buildDir/openapi-generator")
packageName.set(basePackage)
apiPackage.set(basePackage)
modelPackage.set(basePackage)
configOptions.set(
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/kotlin/org/modelix/sample/Api.kt → .../modelix/sample/restapimodelserver/Api.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.modelix.sample
package org.modelix.sample.restapimodelserver

import University.Schedule.structure.Courses
import University.Schedule.structure.Rooms
Expand Down
2 changes: 1 addition & 1 deletion ...tlin/org/modelix/sample/LanguageConfig.kt → ...mple/restapimodelserver/LanguageConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.modelix.sample
package org.modelix.sample.restapimodelserver

import University.Schedule.api.gen.University_Schedule
import University.Schedule.api.gen.jetbrains_mps_lang_core
Expand Down
2 changes: 1 addition & 1 deletion ...odelix/sample/ModelClientConfiguration.kt → ...pimodelserver/ModelClientConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.modelix.sample
package org.modelix.sample.restapimodelserver

import io.smallrye.config.ConfigMapping
import io.smallrye.config.WithDefault
Expand Down
2 changes: 1 addition & 1 deletion ...org/modelix/sample/ModelClientProducer.kt → ...restapimodelserver/ModelClientProducer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.modelix.sample
package org.modelix.sample.restapimodelserver

import org.modelix.model.client.ReplicatedRepository
import org.modelix.model.client.RestWebModelClient
Expand Down