Refactor packages

Heapy · Oct 10, 2024 · 4960cde · 4960cde
1 parent b205207
commit 4960cde
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 17 deletions.
diff --git a/komok-app/src/main/kotlin/io/heapy/komok/Application.kt b/komok-app/src/main/kotlin/io/heapy/komok/Application.kt
@@ -1,7 +1,7 @@
 @file:JvmName("Application")
 package io.heapy.komok
 
-import io.heapy.komok.business.ServerModule
+import io.heapy.komok.infra.http.server.ServerModule
 import io.heapy.komok.infra.uptime.JvmUptime
 import io.heapy.komok.tech.logging.Logger
 import io.heapy.komok.infra.uptime.JvmUptimeModule

diff --git a/komok-app/src/main/kotlin/io/heapy/komok/business/AnonymousRoutesModule.kt b/komok-app/src/main/kotlin/io/heapy/komok/business/AnonymousRoutesModule.kt
@@ -1,12 +1,13 @@
 package io.heapy.komok.business
 
 import io.heapy.komok.business.healthcheck.HealthCheckRoute
+import io.heapy.komok.server.common.KomokRoute
 import io.heapy.komok.server.common.KomokRoutes
 import io.heapy.komok.tech.di.lib.Module
 
 @Module
 open class AnonymousRoutesModule {
-    open val anonymousRoutes: KomokRoutes by lazy {
+    open val anonymousRoutes: KomokRoute by lazy {
         KomokRoutes(
             routes = listOf(
                 healthCheckRoute,

diff --git a/komok-app/src/main/kotlin/io/heapy/komok/business/AuthenticatedRoutesModule.kt b/komok-app/src/main/kotlin/io/heapy/komok/business/AuthenticatedRoutesModule.kt
@@ -2,6 +2,8 @@ package io.heapy.komok.business
 
 import io.heapy.komok.business.entity.EntityModule
 import io.heapy.komok.business.user.UserRoute
+import io.heapy.komok.infra.http.server.AuthenticatedRoutes
+import io.heapy.komok.server.common.KomokRoute
 import io.heapy.komok.server.common.KomokRoutes
 import io.heapy.komok.tech.di.lib.Module
 
@@ -13,12 +15,18 @@ open class AuthenticatedRoutesModule(
         UserRoute()
     }
 
-    open val authenticatedRoutes by lazy {
+    open val routes: KomokRoute by lazy {
         KomokRoutes(
             routes = listOf(
                 userRoute,
                 entityModule.routes,
             ),
         )
     }
+
+    open val authenticatedRoutes: KomokRoute by lazy {
+        AuthenticatedRoutes(
+            routes = routes,
+        )
+    }
 }
diff --git a/...apy/komok/business/AuthenticatedRoutes.kt → .../infra/http/server/AuthenticatedRoutes.kt b/...apy/komok/business/AuthenticatedRoutes.kt → .../infra/http/server/AuthenticatedRoutes.kt
@@ -1,4 +1,4 @@
-package io.heapy.komok.business
+package io.heapy.komok.infra.http.server
 
 import io.heapy.komok.server.common.KomokRoute
 import io.ktor.server.auth.*

diff --git a/...eapy/komok/business/CallLoggingFeature.kt → ...k/infra/http/server/CallLoggingFeature.kt b/...eapy/komok/business/CallLoggingFeature.kt → ...k/infra/http/server/CallLoggingFeature.kt
@@ -1,4 +1,4 @@
-package io.heapy.komok.business
+package io.heapy.komok.infra.http.server
 
 import io.heapy.komok.server.common.KomokServerFeature
 import io.ktor.server.application.Application

diff --git a/...otlin/io/heapy/komok/business/Defaults.kt → ...heapy/komok/infra/http/server/Defaults.kt b/...otlin/io/heapy/komok/business/Defaults.kt → ...heapy/komok/infra/http/server/Defaults.kt
@@ -1,4 +1,4 @@
-package io.heapy.komok.business
+package io.heapy.komok.infra.http.server
 
 import com.auth0.jwt.JWT
 import com.auth0.jwt.algorithms.Algorithm

diff --git a/...heapy/komok/business/MonitoringFeature.kt → ...ok/infra/http/server/MonitoringFeature.kt b/...heapy/komok/business/MonitoringFeature.kt → ...ok/infra/http/server/MonitoringFeature.kt
@@ -1,4 +1,4 @@
-package io.heapy.komok.business
+package io.heapy.komok.infra.http.server
 
 import io.heapy.komok.server.common.KomokServerFeature
 import io.ktor.server.application.*

diff --git a/...s/ServerApplicationConfigurationModule.kt → ...r/ServerApplicationConfigurationModule.kt b/...s/ServerApplicationConfigurationModule.kt → ...r/ServerApplicationConfigurationModule.kt
@@ -1,4 +1,4 @@
-package io.heapy.komok.business
+package io.heapy.komok.infra.http.server
 
 import io.heapy.komok.business.login.JwtModule
 import io.heapy.komok.metrics.MetricsModule

diff --git a/...mok/business/ServerConfigurationModule.kt → .../http/server/ServerConfigurationModule.kt b/...mok/business/ServerConfigurationModule.kt → .../http/server/ServerConfigurationModule.kt
@@ -1,4 +1,4 @@
-package io.heapy.komok.business
+package io.heapy.komok.infra.http.server
 
 import io.heapy.komok.tech.config.ConfigurationModule
 import io.heapy.komok.tech.di.lib.Module

diff --git a/...n/io/heapy/komok/business/ServerModule.kt → ...y/komok/infra/http/server/ServerModule.kt b/...n/io/heapy/komok/business/ServerModule.kt → ...y/komok/infra/http/server/ServerModule.kt
@@ -1,4 +1,4 @@
-package io.heapy.komok.business
+package io.heapy.komok.infra.http.server
 
 import io.heapy.komok.tech.di.lib.Module
 import io.ktor.server.cio.CIO

diff --git a/...iness/ServerRoutingConfigurationModule.kt → ...erver/ServerRoutingConfigurationModule.kt b/...iness/ServerRoutingConfigurationModule.kt → ...erver/ServerRoutingConfigurationModule.kt
@@ -1,5 +1,7 @@
-package io.heapy.komok.business
+package io.heapy.komok.infra.http.server
 
+import io.heapy.komok.business.AnonymousRoutesModule
+import io.heapy.komok.business.AuthenticatedRoutesModule
 import io.heapy.komok.server.common.KomokRoutes
 import io.heapy.komok.tech.di.lib.Module
 
@@ -14,9 +16,7 @@ open class ServerRoutingConfigurationModule(
             listOf(
                 staticFilesRoute,
                 anonymousRoutesModule.anonymousRoutes,
-                AuthenticatedRoutes(
-                    routes = authenticatedRoutesModule.authenticatedRoutes,
-                ),
+                authenticatedRoutesModule.authenticatedRoutes,
             ),
         )
     }

diff --git a/.../heapy/komok/business/StaticFilesRoute.kt → ...mok/infra/http/server/StaticFilesRoute.kt b/.../heapy/komok/business/StaticFilesRoute.kt → ...mok/infra/http/server/StaticFilesRoute.kt
@@ -1,4 +1,4 @@
-package io.heapy.komok.business
+package io.heapy.komok.infra.http.server
 
 import io.heapy.komok.server.common.KomokRoute
 import io.ktor.server.http.content.CompressedFileType

diff --git a/...heapy/komok/business/WebSocketsFeature.kt → ...ok/infra/http/server/WebSocketsFeature.kt b/...heapy/komok/business/WebSocketsFeature.kt → ...ok/infra/http/server/WebSocketsFeature.kt
@@ -1,4 +1,4 @@
-package io.heapy.komok.business
+package io.heapy.komok.infra.http.server
 
 import io.heapy.komok.server.common.KomokServerFeature
 import io.ktor.server.application.*

diff --git a/.../kotlin/io/heapy/komok/business/config.kt → ...o/heapy/komok/infra/http/server/config.kt b/.../kotlin/io/heapy/komok/business/config.kt → ...o/heapy/komok/infra/http/server/config.kt
@@ -1,6 +1,6 @@
 @file:Suppress("FunctionName")
 
-package io.heapy.komok.business
+package io.heapy.komok.infra.http.server
 
 import kotlinx.serialization.Serializable