Merge pull request #235 from clementguillot/234-move-gateways-to-thei…

…r-own-module chore(server): move all gateways to a dedicated module
clementguillot · Oct 22, 2024 · 775bf3b · 775bf3b
2 parents 3e8fef5 + 69c575b
commit 775bf3b
Show file tree

Hide file tree

Showing 39 changed files with 164 additions and 78 deletions.
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
diff --git a/apps/server/build.gradle.kts b/apps/server/build.gradle.kts
@@ -41,6 +41,7 @@ dependencies {
   implementation("com.github.ajalt.clikt:clikt:$cliktVersion")
 
   implementation(project(":libs:server:domain"))
+  implementation(project(":libs:server:gateway"))
   implementation(project(":libs:server:persistence"))
   implementation(project(":libs:server:storage:azure"))
   implementation(project(":libs:server:storage:core"))

diff --git a/apps/server/project.json b/apps/server/project.json
@@ -6,7 +6,7 @@
   "targets": {
     "build": {
       "executor": "@jnxplus/nx-gradle:run-task",
-      "outputs": ["{projectRoot}/build"],
+      "outputs": ["{projectRoot}/build/classes", "{projectRoot}/build/libs"],
       "options": {
         "task": "quarkusBuild"
       }
@@ -58,11 +58,7 @@
       "options": {
         "task": "test"
       },
-      "outputs": [
-        "{projectRoot}/build/classes",
-        "{projectRoot}/build/reports",
-        "{projectRoot}/build/test-results"
-      ]
+      "outputs": ["{projectRoot}/build/jacoco-report"]
     },
     "integration-test": {
       "executor": "@jnxplus/nx-gradle:run-task",

diff --git a/.../server/src/main/kotlin/org/nxcloudce/server/technical/producer/DomainUseCaseProducers.kt b/.../server/src/main/kotlin/org/nxcloudce/server/technical/producer/DomainUseCaseProducers.kt
@@ -18,8 +18,8 @@ import org.nxcloudce.server.domain.workspace.interactor.GetWorkspaceAccessTokenI
 import org.nxcloudce.server.domain.workspace.usecase.CreateOrgAndWorkspace
 import org.nxcloudce.server.domain.workspace.usecase.CreateWorkspace
 import org.nxcloudce.server.domain.workspace.usecase.GetWorkspaceAccessToken
-import org.nxcloudce.server.persistence.gateway.*
-import org.nxcloudce.server.storage.gateway.StorageServiceImpl
+import org.nxcloudce.server.gateway.persistence.*
+import org.nxcloudce.server.gateway.storage.StorageServiceImpl
 
 @ApplicationScoped
 class DomainUseCaseProducers(

diff --git a/apps/server/src/main/resources/application.yaml b/apps/server/src/main/resources/application.yaml
@@ -1,7 +1,6 @@
 quarkus:
   http:
-    port:
-      8080
+    port: 8080
     root-path: "/nx-cloud"
   mongodb:
     database: nx-cloud-ce

diff --git a/libs/server/domain/project.json b/libs/server/domain/project.json
@@ -9,7 +9,7 @@
       "options": {
         "task": "build"
       },
-      "outputs": ["{projectRoot}/build"]
+      "outputs": ["{projectRoot}/build/classes", "{projectRoot}/build/libs"]
     },
     "lint": {
       "executor": "@jnxplus/nx-gradle:run-task",
@@ -28,11 +28,7 @@
       "options": {
         "task": "test"
       },
-      "outputs": [
-        "{projectRoot}/build/classes",
-        "{projectRoot}/build/reports",
-        "{projectRoot}/build/test-results"
-      ]
+      "outputs": ["{projectRoot}/build/jacoco-report"]
     }
   },
   "tags": []

diff --git a/libs/server/gateway/README.md b/libs/server/gateway/README.md
@@ -0,0 +1,5 @@
+# libs/server/gateway
+
+This library is part of [`apps/server`](../../../apps/server) application.
+
+It contains all implementation of `gateway`s defined by the `libs/server/domain` layer.
diff --git a/libs/server/gateway/build.gradle.kts b/libs/server/gateway/build.gradle.kts
@@ -0,0 +1,80 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
+plugins {
+  kotlin("jvm")
+  kotlin("plugin.allopen")
+  id("io.quarkus")
+  id("com.diffplug.spotless")
+}
+
+repositories {
+  mavenCentral()
+  mavenLocal()
+}
+
+val javaVersion: String by project
+val quarkusPlatformGroupId: String by project
+val quarkusPlatformArtifactId: String by project
+val quarkusPlatformVersion: String by project
+val ktlintVersion: String by project
+val atriumVersion: String by project
+val mockkVersion: String by project
+val quarkusMockkVersion: String by project
+
+dependencies {
+  implementation(enforcedPlatform("$quarkusPlatformGroupId:$quarkusPlatformArtifactId:$quarkusPlatformVersion"))
+  implementation("io.quarkus:quarkus-kotlin")
+  implementation("io.quarkus:quarkus-mongodb-panache-kotlin")
+
+  implementation(project(":libs:server:domain"))
+  implementation(project(":libs:server:persistence"))
+  implementation(project(":libs:server:storage:core"))
+
+  testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test")
+  testImplementation("ch.tutteli.atrium:atrium-fluent:$atriumVersion")
+  testImplementation("io.mockk:mockk:$mockkVersion")
+  testImplementation("io.quarkiverse.mockk:quarkus-junit5-mockk:$quarkusMockkVersion")
+  testImplementation("io.quarkus:quarkus-junit5")
+  testImplementation("io.quarkus:quarkus-jacoco")
+  testImplementation("io.quarkus:quarkus-test-hibernate-reactive-panache")
+}
+
+group = "org.nxcloudce.server"
+version = "0.4.2"
+
+java {
+  sourceCompatibility = JavaVersion.toVersion(javaVersion)
+  targetCompatibility = JavaVersion.toVersion(javaVersion)
+}
+
+tasks.withType<Jar> {
+  archiveBaseName = "${project.group}.${project.name}"
+}
+
+tasks.withType<Test> {
+  systemProperty("java.util.logging.manager", "org.jboss.logmanager.LogManager")
+}
+
+allOpen {
+  annotation("jakarta.enterprise.context.ApplicationScoped")
+  annotation("io.quarkus.test.junit.QuarkusTest")
+}
+
+kotlin {
+  compilerOptions {
+    freeCompilerArgs.add("-Xjsr305=strict")
+    jvmTarget = JvmTarget.fromTarget(javaVersion)
+    javaParameters = true
+  }
+}
+
+spotless {
+  kotlin {
+    ktlint(ktlintVersion)
+  }
+
+  kotlinGradle {
+    target("*.gradle.kts")
+    ktlint(ktlintVersion)
+  }
+}
diff --git a/libs/server/gateway/project.json b/libs/server/gateway/project.json
@@ -0,0 +1,35 @@
+{
+  "name": "libs/server/gateway",
+  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
+  "projectType": "library",
+  "sourceRoot": "libs/server/gateway/src",
+  "targets": {
+    "build": {
+      "executor": "@jnxplus/nx-gradle:run-task",
+      "options": {
+        "task": "build"
+      },
+      "outputs": ["{projectRoot}/build/classes", "{projectRoot}/build/libs"]
+    },
+    "lint": {
+      "executor": "@jnxplus/nx-gradle:run-task",
+      "options": {
+        "task": "spotlessCheck"
+      }
+    },
+    "format": {
+      "executor": "@jnxplus/nx-gradle:run-task",
+      "options": {
+        "task": "spotlessApply"
+      }
+    },
+    "test": {
+      "executor": "@jnxplus/nx-gradle:run-task",
+      "options": {
+        "task": "test"
+      },
+      "outputs": ["{projectRoot}/build/jacoco-report"]
+    }
+  },
+  "tags": []
+}
diff --git a/.../persistence/gateway/AccessTokenMapper.kt → .../gateway/persistence/AccessTokenMapper.kt b/.../persistence/gateway/AccessTokenMapper.kt → .../gateway/persistence/AccessTokenMapper.kt
@@ -1,4 +1,4 @@
-package org.nxcloudce.server.persistence.gateway
+package org.nxcloudce.server.gateway.persistence
 
 import org.nxcloudce.server.domain.workspace.model.*
 import org.nxcloudce.server.persistence.entity.AccessTokenEntity

diff --git a/...ence/gateway/AccessTokenRepositoryImpl.kt → .../persistence/AccessTokenRepositoryImpl.kt b/...ence/gateway/AccessTokenRepositoryImpl.kt → .../persistence/AccessTokenRepositoryImpl.kt
@@ -1,4 +1,4 @@
-package org.nxcloudce.server.persistence.gateway
+package org.nxcloudce.server.gateway.persistence
 
 import io.smallrye.mutiny.Uni
 import io.smallrye.mutiny.coroutines.awaitSuspending

diff --git a/...ver/persistence/gateway/ArtifactMapper.kt → ...ver/gateway/persistence/ArtifactMapper.kt b/...ver/persistence/gateway/ArtifactMapper.kt → ...ver/gateway/persistence/ArtifactMapper.kt
@@ -1,4 +1,4 @@
-package org.nxcloudce.server.persistence.gateway
+package org.nxcloudce.server.gateway.persistence
 
 import org.nxcloudce.server.domain.run.model.Artifact
 import org.nxcloudce.server.domain.run.model.ArtifactId

diff --git a/...istence/gateway/ArtifactRepositoryImpl.kt → ...way/persistence/ArtifactRepositoryImpl.kt b/...istence/gateway/ArtifactRepositoryImpl.kt → ...way/persistence/ArtifactRepositoryImpl.kt
@@ -1,4 +1,4 @@
-package org.nxcloudce.server.persistence.gateway
+package org.nxcloudce.server.gateway.persistence
 
 import io.smallrye.mutiny.coroutines.awaitSuspending
 import jakarta.enterprise.context.ApplicationScoped

diff --git a/...persistence/gateway/OrganizationMapper.kt → ...gateway/persistence/OrganizationMapper.kt b/...persistence/gateway/OrganizationMapper.kt → ...gateway/persistence/OrganizationMapper.kt
@@ -1,4 +1,4 @@
-package org.nxcloudce.server.persistence.gateway
+package org.nxcloudce.server.gateway.persistence
 
 import org.nxcloudce.server.domain.organization.model.Organization
 import org.nxcloudce.server.domain.organization.model.OrganizationId

diff --git a/...nce/gateway/OrganizationRepositoryImpl.kt → ...persistence/OrganizationRepositoryImpl.kt b/...nce/gateway/OrganizationRepositoryImpl.kt → ...persistence/OrganizationRepositoryImpl.kt
@@ -1,4 +1,4 @@
-package org.nxcloudce.server.persistence.gateway
+package org.nxcloudce.server.gateway.persistence
 
 import io.smallrye.mutiny.Uni
 import io.smallrye.mutiny.coroutines.awaitSuspending

diff --git a/...e/server/persistence/gateway/RunMapper.kt → ...e/server/gateway/persistence/RunMapper.kt b/...e/server/persistence/gateway/RunMapper.kt → ...e/server/gateway/persistence/RunMapper.kt
@@ -1,4 +1,4 @@
-package org.nxcloudce.server.persistence.gateway
+package org.nxcloudce.server.gateway.persistence
 
 import org.bson.types.ObjectId
 import org.nxcloudce.server.domain.run.model.*
@@ -49,7 +49,7 @@ fun RunEntity.toDomain(): Run =
       this@toDomain.projectGraph?.let { projectGraph ->
         ProjectGraph(
           nodes =
-            projectGraph.nodes?.let {
+            projectGraph.nodes.let {
               it.mapValues { (_, node) ->
                 ProjectGraph.Project(
                   type = node.type,
@@ -82,7 +82,7 @@ fun RunEntity.toDomain(): Run =
               }
             },
           dependencies =
-            projectGraph.dependencies?.let {
+            projectGraph.dependencies.let {
               it.mapValues { (_, dependencies) ->
                 dependencies.map { dependency ->
                   ProjectGraph.Dependency(

diff --git a/.../persistence/gateway/RunRepositoryImpl.kt → .../gateway/persistence/RunRepositoryImpl.kt b/.../persistence/gateway/RunRepositoryImpl.kt → .../gateway/persistence/RunRepositoryImpl.kt
@@ -1,4 +1,4 @@
-package org.nxcloudce.server.persistence.gateway
+package org.nxcloudce.server.gateway.persistence
 
 import io.smallrye.mutiny.coroutines.asFlow
 import io.smallrye.mutiny.coroutines.awaitSuspending

diff --git a/.../server/persistence/gateway/TaskMapper.kt → .../server/gateway/persistence/TaskMapper.kt b/.../server/persistence/gateway/TaskMapper.kt → .../server/gateway/persistence/TaskMapper.kt
@@ -1,4 +1,4 @@
-package org.nxcloudce.server.persistence.gateway
+package org.nxcloudce.server.gateway.persistence
 
 import org.bson.types.ObjectId
 import org.nxcloudce.server.domain.run.model.*

diff --git a/...persistence/gateway/TaskRepositoryImpl.kt → ...gateway/persistence/TaskRepositoryImpl.kt b/...persistence/gateway/TaskRepositoryImpl.kt → ...gateway/persistence/TaskRepositoryImpl.kt
@@ -1,4 +1,4 @@
-package org.nxcloudce.server.persistence.gateway
+package org.nxcloudce.server.gateway.persistence
 
 import io.smallrye.mutiny.coroutines.asFlow
 import io.smallrye.mutiny.coroutines.awaitSuspending

diff --git a/...istence/gateway/TaskRunnerMetricMapper.kt → ...way/persistence/TaskRunnerMetricMapper.kt b/...istence/gateway/TaskRunnerMetricMapper.kt → ...way/persistence/TaskRunnerMetricMapper.kt
@@ -1,4 +1,4 @@
-package org.nxcloudce.server.persistence.gateway
+package org.nxcloudce.server.gateway.persistence
 
 import org.bson.types.ObjectId
 import org.nxcloudce.server.domain.metric.model.TaskRunnerMetric

diff --git a/...gateway/TaskRunnerMetricRepositoryImpl.kt → ...istence/TaskRunnerMetricRepositoryImpl.kt b/...gateway/TaskRunnerMetricRepositoryImpl.kt → ...istence/TaskRunnerMetricRepositoryImpl.kt
@@ -1,4 +1,4 @@
-package org.nxcloudce.server.persistence.gateway
+package org.nxcloudce.server.gateway.persistence
 
 import io.smallrye.mutiny.coroutines.awaitSuspending
 import jakarta.enterprise.context.ApplicationScoped

diff --git a/...er/persistence/gateway/WorkspaceMapper.kt → ...er/gateway/persistence/WorkspaceMapper.kt b/...er/persistence/gateway/WorkspaceMapper.kt → ...er/gateway/persistence/WorkspaceMapper.kt
@@ -1,4 +1,4 @@
-package org.nxcloudce.server.persistence.gateway
+package org.nxcloudce.server.gateway.persistence
 
 import org.bson.types.ObjectId
 import org.nxcloudce.server.domain.organization.model.OrganizationId

diff --git a/...stence/gateway/WorkspaceRepositoryImpl.kt → ...ay/persistence/WorkspaceRepositoryImpl.kt b/...stence/gateway/WorkspaceRepositoryImpl.kt → ...ay/persistence/WorkspaceRepositoryImpl.kt
@@ -1,4 +1,4 @@
-package org.nxcloudce.server.persistence.gateway
+package org.nxcloudce.server.gateway.persistence
 
 import io.smallrye.mutiny.Uni
 import io.smallrye.mutiny.coroutines.awaitSuspending

diff --git a/...ver/storage/gateway/StorageServiceImpl.kt → ...ver/gateway/storage/StorageServiceImpl.kt b/...ver/storage/gateway/StorageServiceImpl.kt → ...ver/gateway/storage/StorageServiceImpl.kt
@@ -1,4 +1,4 @@
-package org.nxcloudce.server.storage.gateway
+package org.nxcloudce.server.gateway.storage
 
 import jakarta.enterprise.context.ApplicationScoped
 import jakarta.enterprise.inject.Instance

diff --git a/...ain/src/main/resources/META-INF/beans.xml → ...way/src/main/resources/META-INF/beans.xml b/...ain/src/main/resources/META-INF/beans.xml → ...way/src/main/resources/META-INF/beans.xml
diff --git a/.../gateway/AccessTokenRepositoryImplTest.kt → ...sistence/AccessTokenRepositoryImplTest.kt b/.../gateway/AccessTokenRepositoryImplTest.kt → ...sistence/AccessTokenRepositoryImplTest.kt
@@ -1,4 +1,4 @@
-package org.nxcloudce.server.persistence.gateway
+package org.nxcloudce.server.gateway.persistence
 
 import ch.tutteli.atrium.api.fluent.en_GB.its
 import ch.tutteli.atrium.api.fluent.en_GB.notToEqualNull

diff --git a/...nce/gateway/ArtifactRepositoryImplTest.kt → ...persistence/ArtifactRepositoryImplTest.kt b/...nce/gateway/ArtifactRepositoryImplTest.kt → ...persistence/ArtifactRepositoryImplTest.kt
@@ -1,4 +1,4 @@
-package org.nxcloudce.server.persistence.gateway
+package org.nxcloudce.server.gateway.persistence
 
 import ch.tutteli.atrium.api.fluent.en_GB.*
 import ch.tutteli.atrium.api.verbs.expect

diff --git a/...gateway/OrganizationRepositoryImplTest.kt → ...istence/OrganizationRepositoryImplTest.kt b/...gateway/OrganizationRepositoryImplTest.kt → ...istence/OrganizationRepositoryImplTest.kt
@@ -1,4 +1,4 @@
-package org.nxcloudce.server.persistence.gateway
+package org.nxcloudce.server.gateway.persistence
 
 import ch.tutteli.atrium.api.fluent.en_GB.its
 import ch.tutteli.atrium.api.fluent.en_GB.toEqual

diff --git a/...sistence/gateway/RunRepositoryImplTest.kt → ...eway/persistence/RunRepositoryImplTest.kt b/...sistence/gateway/RunRepositoryImplTest.kt → ...eway/persistence/RunRepositoryImplTest.kt
@@ -1,4 +1,4 @@
-package org.nxcloudce.server.persistence.gateway
+package org.nxcloudce.server.gateway.persistence
 
 import ch.tutteli.atrium.api.fluent.en_GB.its
 import ch.tutteli.atrium.api.fluent.en_GB.toEqual

diff --git a/...istence/gateway/TaskRepositoryImplTest.kt → ...way/persistence/TaskRepositoryImplTest.kt b/...istence/gateway/TaskRepositoryImplTest.kt → ...way/persistence/TaskRepositoryImplTest.kt
@@ -1,4 +1,4 @@
-package org.nxcloudce.server.persistence.gateway
+package org.nxcloudce.server.gateway.persistence
 
 import ch.tutteli.atrium.api.fluent.en_GB.toEqual
 import ch.tutteli.atrium.api.verbs.expect

diff --git a/...way/TaskRunnerMetricRepositoryImplTest.kt → ...nce/TaskRunnerMetricRepositoryImplTest.kt b/...way/TaskRunnerMetricRepositoryImplTest.kt → ...nce/TaskRunnerMetricRepositoryImplTest.kt
@@ -1,4 +1,4 @@
-package org.nxcloudce.server.persistence.gateway
+package org.nxcloudce.server.gateway.persistence
 
 import ch.tutteli.atrium.api.fluent.en_GB.toEqual
 import ch.tutteli.atrium.api.verbs.expect

diff --git a/...ce/gateway/WorkspaceRepositoryImplTest.kt → ...ersistence/WorkspaceRepositoryImplTest.kt b/...ce/gateway/WorkspaceRepositoryImplTest.kt → ...ersistence/WorkspaceRepositoryImplTest.kt
@@ -1,4 +1,4 @@
-package org.nxcloudce.server.persistence.gateway
+package org.nxcloudce.server.gateway.persistence
 
 import ch.tutteli.atrium.api.fluent.en_GB.its
 import ch.tutteli.atrium.api.fluent.en_GB.toEqual

diff --git a/...storage/gateway/StorageServiceImplTest.kt → ...gateway/storage/StorageServiceImplTest.kt b/...storage/gateway/StorageServiceImplTest.kt → ...gateway/storage/StorageServiceImplTest.kt
@@ -1,4 +1,4 @@
-package org.nxcloudce.server.storage.gateway
+package org.nxcloudce.server.gateway.storage
 
 import ch.tutteli.atrium.api.fluent.en_GB.toEqual
 import ch.tutteli.atrium.api.verbs.expect

diff --git a/libs/server/persistence/project.json b/libs/server/persistence/project.json
@@ -9,7 +9,7 @@
       "options": {
         "task": "build"
       },
-      "outputs": ["{projectRoot}/build"]
+      "outputs": ["{projectRoot}/build/classes", "{projectRoot}/build/libs"]
     },
     "lint": {
       "executor": "@jnxplus/nx-gradle:run-task",
@@ -28,11 +28,7 @@
       "options": {
         "task": "test"
       },
-      "outputs": [
-        "{projectRoot}/build/classes",
-        "{projectRoot}/build/reports",
-        "{projectRoot}/build/test-results"
-      ]
+      "outputs": ["{projectRoot}/build/jacoco-report"]
     }
   },
   "tags": []