refactor(model-server): explicitly name v2 API v2

Author: languitar

model-server-openapi/specifications/model-server.yaml renamed to model-server-openapi/specifications/model-server-v2.yaml

@@ -230,7 +230,7 @@ val openAPIgenerationPath = "${project.layout.buildDirectory.get()}/generated/op
 // Pairs of the different OpenAPI files we use. Each pair must have its own 'category' as first argument as these
 // are used to generate corresponding packages
 val openApiFiles = listOf(
-    "public" to "model-server",
+    "v2" to "model-server-v2",
     "v1" to "model-server-v1",
     "operative" to "model-server-operative",
     "deprecated" to "model-server-deprecated",

model-server/build.gradle.kts

@@ -54,7 +54,7 @@ import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import org.apache.commons.io.FileUtils
 import org.apache.ignite.Ignition
-import org.modelix.api.public.Problem
+import org.modelix.api.v1.Problem
 import org.modelix.authorization.KeycloakUtils
 import org.modelix.authorization.NoPermissionException
 import org.modelix.authorization.NotLoggedInException

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

@@ -17,7 +17,7 @@
 package org.modelix.model.server.handlers
 
 import io.ktor.http.HttpStatusCode
-import org.modelix.api.public.Problem
+import org.modelix.api.v1.Problem
 import org.modelix.model.lazy.BranchReference
 
 /**

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

@@ -21,7 +21,7 @@ import io.ktor.server.application.call
 import io.ktor.server.plugins.origin
 import io.ktor.server.response.respondText
 import io.ktor.util.pipeline.PipelineContext
-import org.modelix.api.public.IdsApi
+import org.modelix.api.v2.IdsApi
 import org.modelix.authorization.getUserName
 import org.modelix.model.server.store.IStoreClient
 import org.modelix.model.server.store.LocalModelClient

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

@@ -43,7 +43,7 @@ import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.onEmpty
 import kotlinx.coroutines.flow.withIndex
 import kotlinx.coroutines.withContext
-import org.modelix.api.public.Paths
+import org.modelix.api.v2.Paths
 import org.modelix.authorization.getUserName
 import org.modelix.model.InMemoryModels
 import org.modelix.model.api.ITree

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

@@ -19,7 +19,6 @@ import io.ktor.client.HttpClient
 import io.ktor.client.call.body
 import io.ktor.client.engine.cio.CIO
 import io.ktor.client.plugins.HttpTimeout
-import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
 import io.ktor.client.plugins.defaultRequest
 import io.ktor.client.request.delete
 import io.ktor.client.request.get
@@ -33,7 +32,6 @@ import io.ktor.http.takeFrom
 import io.ktor.serialization.kotlinx.json.json
 import io.ktor.server.application.Application
 import io.ktor.server.netty.NettyApplicationEngine
-import io.ktor.server.plugins.contentnegotiation.ContentNegotiation
 import io.ktor.server.routing.routing
 import io.ktor.server.testing.ApplicationTestBuilder
 import io.ktor.server.testing.testApplication
@@ -44,7 +42,7 @@ import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.test.runTest
 import kotlinx.coroutines.withTimeout
-import org.modelix.api.public.Problem
+import org.modelix.api.v1.Problem
 import org.modelix.authorization.installAuthentication
 import org.modelix.model.InMemoryModels
 import org.modelix.model.api.IConceptReference