moving interfaces to the domain package

leanix · Aug 28, 2023 · 3da1640 · 3da1640
1 parent 30e2a91
commit 3da1640
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 15 deletions.
diff --git a/src/main/kotlin/net/leanix/vsm/gitlab/broker/connector/runner/InitialStateRunner.kt b/src/main/kotlin/net/leanix/vsm/gitlab/broker/connector/runner/InitialStateRunner.kt
@@ -2,7 +2,7 @@ package net.leanix.vsm.gitlab.broker.connector.runner
 
 import net.leanix.vsm.gitlab.broker.connector.application.AssignmentService
 import net.leanix.vsm.gitlab.broker.shared.cache.AssignmentsCache
-import net.leanix.vsm.gitlab.broker.webhook.application.WebhookService
+import net.leanix.vsm.gitlab.broker.webhook.domain.WebhookService
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.springframework.boot.ApplicationArguments

diff --git a/src/main/kotlin/net/leanix/vsm/gitlab/broker/webhook/adapter/feign/GitlabWebhookProvider.kt b/src/main/kotlin/net/leanix/vsm/gitlab/broker/webhook/adapter/feign/GitlabWebhookProvider.kt
@@ -2,15 +2,12 @@ package net.leanix.vsm.gitlab.broker.webhook.adapter.feign
 
 import net.leanix.vsm.gitlab.broker.connector.application.AssignmentService
 import net.leanix.vsm.gitlab.broker.webhook.domain.GitlabWebhook
+import net.leanix.vsm.gitlab.broker.webhook.domain.WebhookProvider
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.stereotype.Component
 
-interface WebhookProvider {
-    fun getAllWebhooks(): List<GitlabWebhook>
-    fun deleteWebhook(webhookId: Int)
-    fun createWebhook(): GitlabWebhook
-}
+const val LEANIX_WEBHOOK_PATH = "/leanix-vsm/webhook"
 
 @Component
 class GitlabWebhookProvider(
@@ -45,7 +42,7 @@ class GitlabWebhookProvider(
     override fun createWebhook(): GitlabWebhook {
         return kotlin.runCatching {
             webhookClient.createWebhook(
-                url = "$gitlabWebhookUrl/webhook",
+                url = "$gitlabWebhookUrl$LEANIX_WEBHOOK_PATH",
                 token = leanixId,
                 receivePushEvents = true,
                 receiveTagPushEvents = false,

diff --git a/src/main/kotlin/net/leanix/vsm/gitlab/broker/webhook/application/GitlabWebhookServiceImpl.kt b/src/main/kotlin/net/leanix/vsm/gitlab/broker/webhook/application/GitlabWebhookServiceImpl.kt
@@ -1,6 +1,6 @@
 package net.leanix.vsm.gitlab.broker.webhook.application
 
-import net.leanix.vsm.gitlab.broker.webhook.adapter.feign.leanixWebhookPath
+import net.leanix.vsm.gitlab.broker.webhook.adapter.feign.LEANIX_WEBHOOK_PATH
 import net.leanix.vsm.gitlab.broker.webhook.domain.GitlabWebhook
 import net.leanix.vsm.gitlab.broker.webhook.domain.WebhookProvider
 import net.leanix.vsm.gitlab.broker.webhook.domain.WebhookService
@@ -15,7 +15,7 @@ class GitlabWebhookServiceImpl(
         val webhook = webhookProvider.createWebhook()
 
         webhookProvider.getAllWebhooks()
-            .filter { it.url.contains(leanixWebhookPath) && it.id != webhook.id }
+            .filter { it.url.contains(LEANIX_WEBHOOK_PATH) && it.id != webhook.id }
             .forEach { webhookProvider.deleteWebhook(it.id) }
 
         return webhook

diff --git a/src/main/kotlin/net/leanix/vsm/gitlab/broker/webhook/domain/WebhookProvider.kt b/src/main/kotlin/net/leanix/vsm/gitlab/broker/webhook/domain/WebhookProvider.kt
@@ -1,4 +1,8 @@
 package net.leanix.vsm.gitlab.broker.webhook.domain
 
-class WebhookProvider {
-}
+interface WebhookProvider {
+
+    fun getAllWebhooks(): List<GitlabWebhook>
+    fun deleteWebhook(webhookId: Int)
+    fun createWebhook(): GitlabWebhook
+}
diff --git a/src/main/kotlin/net/leanix/vsm/gitlab/broker/webhook/domain/WebhookService.kt b/src/main/kotlin/net/leanix/vsm/gitlab/broker/webhook/domain/WebhookService.kt
@@ -1,4 +1,5 @@
 package net.leanix.vsm.gitlab.broker.webhook.domain
 
-class WebhookService {
-}
+interface WebhookService {
+    fun registerWebhook(): GitlabWebhook
+}
diff --git a/...t/kotlin/net/leanix/vsm/gitlab/broker/webhook/application/GitlabWebhookServiceImplTest.kt b/...t/kotlin/net/leanix/vsm/gitlab/broker/webhook/application/GitlabWebhookServiceImplTest.kt
@@ -1,7 +1,8 @@
 package net.leanix.vsm.gitlab.broker.webhook.application
 
-import net.leanix.vsm.gitlab.broker.webhook.adapter.feign.WebhookProvider
+import net.leanix.vsm.gitlab.broker.webhook.adapter.feign.LEANIX_WEBHOOK_PATH
 import net.leanix.vsm.gitlab.broker.webhook.domain.GitlabWebhook
+import net.leanix.vsm.gitlab.broker.webhook.domain.WebhookProvider
 import org.junit.jupiter.api.Test
 import org.mockito.ArgumentMatchers.eq
 import org.mockito.Mockito.mock
@@ -34,7 +35,7 @@ class GitlabWebhookServiceImplTest {
 
 fun dummyGitlabWebhookDto(id: Int) = GitlabWebhook(
     id = id,
-    url = "https://gitlab.example.com/hook",
+    url = "https://gitlab.example.com$LEANIX_WEBHOOK_PATH",
     createdAt = Date(),
     pushEvents = true,
     tagPushEvents = false,