Move template engine to vlaue classes

awelless · Feb 17, 2024 · 971f810 · 971f810
1 parent f955094
commit 971f810
Show file tree

Hide file tree

Showing 20 changed files with 21 additions and 25 deletions.
diff --git a/admin-console/src/main/kotlin/io/mailit/admin/console/http/dto/MailMessageTypeDtos.kt b/admin-console/src/main/kotlin/io/mailit/admin/console/http/dto/MailMessageTypeDtos.kt
@@ -1,7 +1,7 @@
 package io.mailit.admin.console.http.dto
 
 import io.mailit.core.admin.api.type.MailMessageContentType
-import io.mailit.template.api.TemplateEngine
+import io.mailit.value.TemplateEngine
 import io.quarkus.runtime.annotations.RegisterForReflection
 
 @RegisterForReflection

diff --git a/common-test/src/main/kotlin/io/mailit/test/TestCreateMethods.kt b/common-test/src/main/kotlin/io/mailit/test/TestCreateMethods.kt
@@ -6,10 +6,10 @@ import io.mailit.core.model.MailMessageStatus
 import io.mailit.core.model.MailMessageTemplate
 import io.mailit.core.model.MailMessageType
 import io.mailit.core.model.PlainTextMailMessageType
-import io.mailit.template.api.TemplateEngine
 import io.mailit.value.EmailAddress.Companion.toEmailAddress
 import io.mailit.value.MailId
 import io.mailit.value.MailTypeId
+import io.mailit.value.TemplateEngine
 import java.util.concurrent.atomic.AtomicLong
 
 private val counter = AtomicLong()

diff --git a/core/admin-api/build.gradle.kts b/core/admin-api/build.gradle.kts
@@ -1,5 +1,5 @@
 dependencies {
     api(project(":core:exception"))
     api(project(":core:model"))
-    api(project(":template:template-api")) // Should be removed.
+    api(project(":value-classes"))
 }
diff --git a/core/admin-api/src/main/kotlin/io/mailit/core/admin/api/type/MailMessageTypeService.kt b/core/admin-api/src/main/kotlin/io/mailit/core/admin/api/type/MailMessageTypeService.kt
@@ -3,8 +3,8 @@ package io.mailit.core.admin.api.type
 import io.mailit.core.model.MailMessageTemplate
 import io.mailit.core.model.MailMessageType
 import io.mailit.core.model.Slice
-import io.mailit.template.api.TemplateEngine
 import io.mailit.value.MailTypeId
+import io.mailit.value.TemplateEngine
 
 interface MailMessageTypeService {
 

diff --git a/core/model/build.gradle.kts b/core/model/build.gradle.kts
@@ -1,6 +1,5 @@
 dependencies {
     api(project(":value-classes"))
-    implementation(project(":template:template-api"))
 
     testImplementation(project(":common-test"))
 }
diff --git a/core/model/src/main/kotlin/io/mailit/core/model/MailMessageType.kt b/core/model/src/main/kotlin/io/mailit/core/model/MailMessageType.kt
@@ -1,7 +1,7 @@
 package io.mailit.core.model
 
-import io.mailit.template.api.TemplateEngine
 import io.mailit.value.MailTypeId
+import io.mailit.value.TemplateEngine
 import java.time.Instant
 
 /**

diff --git a/core/service/src/test/kotlin/io/mailit/core/service/mail/type/MailMessageTypeFactoryTest.kt b/core/service/src/test/kotlin/io/mailit/core/service/mail/type/MailMessageTypeFactoryTest.kt
@@ -8,8 +8,8 @@ import io.mailit.core.model.HtmlMailMessageType
 import io.mailit.core.model.MailMessageTemplate
 import io.mailit.core.model.PlainTextMailMessageType
 import io.mailit.idgenerator.test.ConstantIdGenerator
-import io.mailit.template.api.TemplateEngine.FREEMARKER
 import io.mailit.value.MailTypeId
+import io.mailit.value.TemplateEngine.FREEMARKER
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test

diff --git a/...ervice/src/test/kotlin/io/mailit/core/service/mail/type/MailMessageTypeStateUpdateTest.kt b/...ervice/src/test/kotlin/io/mailit/core/service/mail/type/MailMessageTypeStateUpdateTest.kt
@@ -5,10 +5,10 @@ import io.mailit.core.exception.ValidationException
 import io.mailit.core.model.HtmlMailMessageType
 import io.mailit.core.model.MailMessageTemplate
 import io.mailit.core.model.PlainTextMailMessageType
-import io.mailit.template.api.TemplateEngine.FREEMARKER
-import io.mailit.template.api.TemplateEngine.NONE
 import io.mailit.test.createHtmlMailMessageType
 import io.mailit.test.createPlainMailMessageType
+import io.mailit.value.TemplateEngine.FREEMARKER
+import io.mailit.value.TemplateEngine.NONE
 import io.mockk.junit5.MockKExtension
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeEach

diff --git a/persistence/h2/build.gradle.kts b/persistence/h2/build.gradle.kts
@@ -8,7 +8,6 @@ dependencies {
     implementation(project(":id-generator:id-generator-spi-locking"))
     implementation(project(":persistence:common"))
     implementation(project(":persistence:liquibase"))
-    implementation(project(":template:template-api")) // Should be removed.
     implementation(project(":template:template-spi-persistence"))
 
     implementation("io.quarkus:quarkus-config-yaml")

diff --git a/persistence/h2/src/main/kotlin/io/mailit/persistence/h2/ResultSetExtensions.kt b/persistence/h2/src/main/kotlin/io/mailit/persistence/h2/ResultSetExtensions.kt
@@ -13,11 +13,11 @@ import io.mailit.persistence.h2.Columns.ApiKey as ApiKeyCol
 import io.mailit.persistence.h2.Columns.MailMessage as MailMessageCol
 import io.mailit.persistence.h2.Columns.MailMessageType as MailMessageTypeCol
 import io.mailit.persistence.h2.MailMessageContent.HTML
-import io.mailit.template.api.TemplateEngine
 import io.mailit.template.spi.persistence.PersistenceTemplate
 import io.mailit.value.EmailAddress.Companion.toEmailAddress
 import io.mailit.value.MailId
 import io.mailit.value.MailTypeId
+import io.mailit.value.TemplateEngine
 import java.sql.ResultSet
 import java.time.Instant
 

diff --git a/persistence/mysql/build.gradle.kts b/persistence/mysql/build.gradle.kts
@@ -8,7 +8,6 @@ dependencies {
     implementation(project(":id-generator:id-generator-spi-locking"))
     implementation(project(":persistence:common"))
     implementation(project(":persistence:liquibase"))
-    implementation(project(":template:template-api")) // Should be removed.
     implementation(project(":template:template-spi-persistence"))
 
     implementation("io.quarkus:quarkus-config-yaml")

diff --git a/persistence/mysql/src/main/kotlin/io/mailit/persistence/mysql/RowExtensions.kt b/persistence/mysql/src/main/kotlin/io/mailit/persistence/mysql/RowExtensions.kt
@@ -13,11 +13,11 @@ import io.mailit.persistence.mysql.Columns.ApiKey as ApiKeyCol
 import io.mailit.persistence.mysql.Columns.MailMessage as MailMessageCol
 import io.mailit.persistence.mysql.Columns.MailMessageType as MailMessageTypeCol
 import io.mailit.persistence.mysql.MailMessageContent.HTML
-import io.mailit.template.api.TemplateEngine
 import io.mailit.template.spi.persistence.PersistenceTemplate
 import io.mailit.value.EmailAddress.Companion.toEmailAddress
 import io.mailit.value.MailId
 import io.mailit.value.MailTypeId
+import io.mailit.value.TemplateEngine
 import io.vertx.mutiny.sqlclient.Row
 import java.time.Instant
 import java.time.ZoneOffset.UTC

diff --git a/persistence/postgresql/build.gradle.kts b/persistence/postgresql/build.gradle.kts
@@ -8,7 +8,6 @@ dependencies {
     implementation(project(":id-generator:id-generator-spi-locking"))
     implementation(project(":persistence:common"))
     implementation(project(":persistence:liquibase"))
-    implementation(project(":template:template-api")) // Should be removed.
     implementation(project(":template:template-spi-persistence"))
 
     implementation("io.quarkus:quarkus-config-yaml")

diff --git a/persistence/postgresql/src/main/kotlin/io/mailit/persistence/postgresql/RowExtensions.kt b/persistence/postgresql/src/main/kotlin/io/mailit/persistence/postgresql/RowExtensions.kt
@@ -13,11 +13,11 @@ import io.mailit.persistence.postgresql.Columns.ApiKey as ApiKeyCol
 import io.mailit.persistence.postgresql.Columns.MailMessage as MailMessageCol
 import io.mailit.persistence.postgresql.Columns.MailMessageType as MailMessageTypeCol
 import io.mailit.persistence.postgresql.MailMessageContent.HTML
-import io.mailit.template.api.TemplateEngine
 import io.mailit.template.spi.persistence.PersistenceTemplate
 import io.mailit.value.EmailAddress.Companion.toEmailAddress
 import io.mailit.value.MailId
 import io.mailit.value.MailTypeId
+import io.mailit.value.TemplateEngine
 import io.vertx.mutiny.sqlclient.Row
 import java.time.Instant
 import java.time.ZoneOffset.UTC

diff --git a/template/template-api/src/main/kotlin/io/mailit/template/api/TemplateProcessor.kt b/template/template-api/src/main/kotlin/io/mailit/template/api/TemplateProcessor.kt
@@ -1,6 +1,7 @@
 package io.mailit.template.api
 
 import io.mailit.value.MailTypeId
+import io.mailit.value.TemplateEngine
 
 interface TemplateProcessor {
 

diff --git a/template/template-core/src/main/kotlin/io/mailit/template/core/MultiTemplateProcessor.kt b/template/template-core/src/main/kotlin/io/mailit/template/core/MultiTemplateProcessor.kt
@@ -1,12 +1,12 @@
 package io.mailit.template.core
 
-import io.mailit.template.api.TemplateEngine
-import io.mailit.template.api.TemplateEngine.FREEMARKER
-import io.mailit.template.api.TemplateEngine.NONE
 import io.mailit.template.api.TemplateProcessor
 import io.mailit.template.core.freemarker.FreemarkerTemplateProcessor
 import io.mailit.template.core.none.NoneTemplateProcessor
 import io.mailit.value.MailTypeId
+import io.mailit.value.TemplateEngine
+import io.mailit.value.TemplateEngine.FREEMARKER
+import io.mailit.value.TemplateEngine.NONE
 
 internal class MultiTemplateProcessor(
     private val noneTemplateProcessor: NoneTemplateProcessor,

diff --git a/template/template-core/src/main/kotlin/io/mailit/template/core/none/NoneTemplateProcessor.kt b/template/template-core/src/main/kotlin/io/mailit/template/core/none/NoneTemplateProcessor.kt
@@ -1,10 +1,10 @@
 package io.mailit.template.core.none
 
 import io.mailit.core.exception.NotFoundException
-import io.mailit.template.api.TemplateEngine
 import io.mailit.template.api.TemplateProcessor
 import io.mailit.template.spi.persistence.TemplateRepository
 import io.mailit.value.MailTypeId
+import io.mailit.value.TemplateEngine
 
 /**
  * [TemplateProcessor] for [TemplateEngine.NONE].

diff --git a/template/template-test/src/main/kotlin/io/mailit/template/test/StubTemplateProcessor.kt b/template/template-test/src/main/kotlin/io/mailit/template/test/StubTemplateProcessor.kt
@@ -1,8 +1,8 @@
 package io.mailit.template.test
 
-import io.mailit.template.api.TemplateEngine
 import io.mailit.template.api.TemplateProcessor
 import io.mailit.value.MailTypeId
+import io.mailit.value.TemplateEngine
 
 class StubTemplateProcessor(val html: String) : TemplateProcessor {
     override suspend fun process(mailTypeId: MailTypeId, templateEngine: TemplateEngine, data: Map<String, Any?>) = Result.success(html)

diff --git a/.../io/mailit/template/api/TemplateEngine.kt → ...c/main/kotlin/io/mailit/value/MailType.kt b/.../io/mailit/template/api/TemplateEngine.kt → ...c/main/kotlin/io/mailit/value/MailType.kt
@@ -1,4 +1,7 @@
-package io.mailit.template.api
+package io.mailit.value
+
+@JvmInline
+value class MailTypeId(val value: Long)
 
 enum class TemplateEngine {
     /**

diff --git a/value-classes/src/main/kotlin/io/mailit/value/MailTypeId.kt b/value-classes/src/main/kotlin/io/mailit/value/MailTypeId.kt