Merge pull request #399 from modelix/bugfix/missing-openapi-in-docker

nkoester · web-flow · commit c374e541b196 · 2024-01-11T11:28:48.000+01:00
MODELIX-685 Resource based routing breaks docker container of model-server
diff --git a/model-server/build.gradle.kts b/model-server/build.gradle.kts
@@ -117,8 +117,30 @@ val cucumber = task("cucumber") {
     }
 }
 
+// copies the openAPI specifications from the api folder into a resource
+// folder so that they are packaged and deployed with the model-server
+tasks.register<Copy>("copyApis") {
+    from("../api/")
+    include("*.yaml")
+    into(project.layout.buildDirectory.dir("openapi/src/main/resources/api"))
+    sourceSets["main"].resources.srcDir(project.layout.buildDirectory.dir("openapi/src/main/resources/"))
+}
+
+tasks.named("runKtlintCheckOverMainSourceSet") {
+    dependsOn("copyApis")
+}
+
+tasks.named("compileKotlin") {
+    dependsOn("copyApis")
+}
+
 tasks.named("build") {
     dependsOn("cucumber")
+    dependsOn("copyApis")
+}
+
+tasks.named("processResources") {
+    dependsOn("copyApis")
 }
 
 task("copyLibs", Sync::class) {
diff --git a/model-server/src/main/kotlin/org/modelix/model/server/Main.kt b/model-server/src/main/kotlin/org/modelix/model/server/Main.kt
@@ -63,6 +63,7 @@ import org.modelix.model.server.store.loadDump
 import org.modelix.model.server.store.writeDump
 import org.modelix.model.server.templates.PageWithMenuBar
 import org.slf4j.LoggerFactory
+import org.springframework.util.ResourceUtils
 import java.io.File
 import java.io.IOException
 import java.nio.charset.StandardCharsets
@@ -238,8 +239,8 @@ object Main {
                             call.respondText("SwaggerUI is disabled")
                         }
                     } else {
-                        // we only serve the public API to the outside via swagger UI
-                        swaggerUI(path = "swagger", swaggerFile = "../api/model-server.yaml")
+                        // we serve the public API to the outside via swagger UI
+                        swaggerUI(path = "swagger", swaggerFile = ResourceUtils.getFile("api/model-server.yaml").path.toString())
                     }
                 }
             }
diff --git a/model-server/src/main/kotlin/org/modelix/model/server/templates/PageWithMenuBar.kt b/model-server/src/main/kotlin/org/modelix/model/server/templates/PageWithMenuBar.kt
@@ -13,6 +13,7 @@ import kotlinx.html.head
 import kotlinx.html.img
 import kotlinx.html.link
 import kotlinx.html.style
+import kotlinx.html.title
 
 class PageWithMenuBar(val activePage: String, val baseUrl: String) : Template<HTML> {
 
@@ -21,6 +22,7 @@ class PageWithMenuBar(val activePage: String, val baseUrl: String) : Template<HT
 
     override fun HTML.apply() {
         head {
+            title("Model-Server Home")
             link("$baseUrl/public/modelix-base.css", rel = "stylesheet")
             link("$baseUrl/public/menu-bar.css", rel = "stylesheet")
             insert(headContent)

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ import org.modelix.model.server.store.loadDump`
`63`	`63`	`import org.modelix.model.server.store.writeDump`
`64`	`64`	`import org.modelix.model.server.templates.PageWithMenuBar`
`65`	`65`	`import org.slf4j.LoggerFactory`
	`66`	`+import org.springframework.util.ResourceUtils`
`66`	`67`	`import java.io.File`
`67`	`68`	`import java.io.IOException`
`68`	`69`	`import java.nio.charset.StandardCharsets`
`@@ -238,8 +239,8 @@ object Main {`
`238`	`239`	`call.respondText("SwaggerUI is disabled")`
`239`	`240`	`}`
`240`	`241`	`} else {`
`241`		`- // we only serve the public API to the outside via swagger UI`
`242`		`- swaggerUI(path = "swagger", swaggerFile = "../api/model-server.yaml")`
	`242`	`+ // we serve the public API to the outside via swagger UI`
	`243`	`+ swaggerUI(path = "swagger", swaggerFile = ResourceUtils.getFile("api/model-server.yaml").path.toString())`
`243`	`244`	`}`
`244`	`245`	`}`
`245`	`246`	`}`