GH-458 Simplify web domain

dzikoysk · Aug 17, 2021 · 78098e1 · 78098e1
1 parent 69ef2aa
commit 78098e1
Show file tree

Hide file tree

Showing 20 changed files with 39 additions and 42 deletions.
diff --git a/reposilite-backend/src/main/kotlin/com/reposilite/ReposiliteWebConfiguration.kt b/reposilite-backend/src/main/kotlin/com/reposilite/ReposiliteWebConfiguration.kt
@@ -26,7 +26,7 @@ import com.reposilite.shared.HttpRemoteClient
 import com.reposilite.statistics.application.StatisticsWebConfiguration
 import com.reposilite.token.application.AccessTokenWebConfiguration
 import com.reposilite.web.ReposiliteContextFactory
-import com.reposilite.web.api.ReposiliteRoutes
+import com.reposilite.web.ReposiliteRoutes
 import com.reposilite.web.application.WebConfiguration
 import io.javalin.Javalin
 import net.dzikoysk.dynamiclogger.Journalist

diff --git a/...backend/src/main/kotlin/com/reposilite/auth/application/AuthenticationWebConfiguration.kt b/...backend/src/main/kotlin/com/reposilite/auth/application/AuthenticationWebConfiguration.kt
@@ -23,7 +23,7 @@ import com.reposilite.auth.infrastructure.AuthenticationEndpoint
 import com.reposilite.auth.infrastructure.PostAuthHandler
 import com.reposilite.maven.MavenFacade
 import com.reposilite.token.AccessTokenFacade
-import com.reposilite.web.api.ReposiliteRoutes
+import com.reposilite.web.ReposiliteRoutes
 import net.dzikoysk.dynamiclogger.Journalist
 
 internal object AuthenticationWebConfiguration {

diff --git a/...lite-backend/src/main/kotlin/com/reposilite/auth/infrastructure/AuthenticationEndpoint.kt b/...lite-backend/src/main/kotlin/com/reposilite/auth/infrastructure/AuthenticationEndpoint.kt
@@ -17,8 +17,8 @@ package com.reposilite.auth.infrastructure
 
 import com.reposilite.auth.AuthenticationFacade
 import com.reposilite.auth.api.AuthenticationResponse
-import com.reposilite.web.api.ReposiliteRoute
-import com.reposilite.web.api.ReposiliteRoutes
+import com.reposilite.web.ReposiliteRoute
+import com.reposilite.web.ReposiliteRoutes
 import com.reposilite.web.http.ErrorResponse
 import com.reposilite.web.routing.RouteMethod.GET
 import io.javalin.openapi.HttpMethod

diff --git a/reposilite-backend/src/main/kotlin/com/reposilite/auth/infrastructure/PostAuthHandler.kt b/reposilite-backend/src/main/kotlin/com/reposilite/auth/infrastructure/PostAuthHandler.kt
@@ -15,8 +15,8 @@
  */
 package com.reposilite.auth.infrastructure
 
-import com.reposilite.web.api.ReposiliteRoute
-import com.reposilite.web.api.ReposiliteRoutes
+import com.reposilite.web.ReposiliteRoute
+import com.reposilite.web.ReposiliteRoutes
 import com.reposilite.web.routing.RouteMethod.AFTER
 import io.javalin.http.HttpCode.UNAUTHORIZED
 

diff --git a/...ite-backend/src/main/kotlin/com/reposilite/console/application/ConsoleWebConfiguration.kt b/...ite-backend/src/main/kotlin/com/reposilite/console/application/ConsoleWebConfiguration.kt
@@ -25,7 +25,7 @@ import com.reposilite.console.VersionCommand
 import com.reposilite.console.infrastructure.CliEndpoint
 import com.reposilite.console.infrastructure.RemoteExecutionEndpoint
 import com.reposilite.failure.FailureFacade
-import com.reposilite.web.api.ReposiliteRoutes
+import com.reposilite.web.ReposiliteRoutes
 import io.javalin.Javalin
 import net.dzikoysk.dynamiclogger.Journalist
 

diff --git a/...-backend/src/main/kotlin/com/reposilite/console/infrastructure/RemoteExecutionEndpoint.kt b/...-backend/src/main/kotlin/com/reposilite/console/infrastructure/RemoteExecutionEndpoint.kt
@@ -18,8 +18,8 @@ package com.reposilite.console.infrastructure
 import com.reposilite.console.ConsoleFacade
 import com.reposilite.console.MAX_COMMAND_LENGTH
 import com.reposilite.console.api.ExecutionResponse
-import com.reposilite.web.api.ReposiliteRoute
-import com.reposilite.web.api.ReposiliteRoutes
+import com.reposilite.web.ReposiliteRoute
+import com.reposilite.web.ReposiliteRoutes
 import com.reposilite.web.http.ErrorResponse
 import com.reposilite.web.routing.RouteMethod.POST
 import io.javalin.http.HttpCode.UNAUTHORIZED

diff --git a/...ite-backend/src/main/kotlin/com/reposilite/failure/application/FailureWebConfiguration.kt b/...ite-backend/src/main/kotlin/com/reposilite/failure/application/FailureWebConfiguration.kt
@@ -20,7 +20,7 @@ import com.reposilite.console.ConsoleFacade
 import com.reposilite.failure.FailureFacade
 import com.reposilite.failure.FailuresCommand
 import com.reposilite.failure.infrastructure.FailureHandler
-import com.reposilite.web.api.ReposiliteRoutes
+import com.reposilite.web.ReposiliteRoutes
 import io.javalin.Javalin
 import net.dzikoysk.dynamiclogger.Journalist
 

diff --git a/...e-backend/src/main/kotlin/com/reposilite/frontend/application/FrontendWebConfiguration.kt b/...e-backend/src/main/kotlin/com/reposilite/frontend/application/FrontendWebConfiguration.kt
@@ -20,7 +20,7 @@ import com.reposilite.frontend.FrontendFacade
 import com.reposilite.frontend.infrastructure.CustomFrontendHandler
 import com.reposilite.frontend.infrastructure.ResourcesFrontendHandler
 import com.reposilite.shared.safeResolve
-import com.reposilite.web.api.ReposiliteRoutes
+import com.reposilite.web.ReposiliteRoutes
 import java.nio.file.Path
 import kotlin.io.path.exists
 

diff --git a/...e-backend/src/main/kotlin/com/reposilite/frontend/infrastructure/CustomFrontendHandler.kt b/...e-backend/src/main/kotlin/com/reposilite/frontend/infrastructure/CustomFrontendHandler.kt
@@ -4,7 +4,7 @@ import com.reposilite.frontend.FrontendFacade
 import com.reposilite.shared.getSimpleName
 import com.reposilite.shared.inputStream
 import com.reposilite.shared.safeResolve
-import com.reposilite.web.api.ReposiliteRoute
+import com.reposilite.web.ReposiliteRoute
 import com.reposilite.web.routing.RouteMethod.GET
 import java.nio.file.Files
 import java.nio.file.Path

diff --git a/reposilite-backend/src/main/kotlin/com/reposilite/frontend/infrastructure/FrontendHandler.kt b/reposilite-backend/src/main/kotlin/com/reposilite/frontend/infrastructure/FrontendHandler.kt
@@ -2,7 +2,7 @@ package com.reposilite.frontend.infrastructure
 
 import com.reposilite.frontend.FrontendFacade
 import com.reposilite.shared.FilesUtils.getExtension
-import com.reposilite.web.api.ReposiliteRoutes
+import com.reposilite.web.ReposiliteRoutes
 import com.reposilite.web.http.ContentType
 import com.reposilite.web.http.ContentType.Companion.PLAIN
 import com.reposilite.web.http.ErrorResponse

diff --git a/...ackend/src/main/kotlin/com/reposilite/frontend/infrastructure/ResourcesFrontendHandler.kt b/...ackend/src/main/kotlin/com/reposilite/frontend/infrastructure/ResourcesFrontendHandler.kt
@@ -16,7 +16,7 @@
 package com.reposilite.frontend.infrastructure
 
 import com.reposilite.frontend.FrontendFacade
-import com.reposilite.web.api.ReposiliteRoute
+import com.reposilite.web.ReposiliteRoute
 import com.reposilite.web.http.ErrorResponse
 import com.reposilite.web.routing.RouteMethod.GET
 import io.javalin.http.Context

diff --git a/reposilite-backend/src/main/kotlin/com/reposilite/maven/application/MavenWebConfiguration.kt b/reposilite-backend/src/main/kotlin/com/reposilite/maven/application/MavenWebConfiguration.kt
@@ -26,7 +26,7 @@ import com.reposilite.maven.RepositorySecurityProvider
 import com.reposilite.maven.RepositoryService
 import com.reposilite.maven.infrastructure.MavenEndpoint
 import com.reposilite.shared.RemoteClient
-import com.reposilite.web.api.ReposiliteRoutes
+import com.reposilite.web.ReposiliteRoutes
 import net.dzikoysk.dynamiclogger.Journalist
 import java.nio.file.Path
 

diff --git a/reposilite-backend/src/main/kotlin/com/reposilite/maven/infrastructure/MavenEndpoint.kt b/reposilite-backend/src/main/kotlin/com/reposilite/maven/infrastructure/MavenEndpoint.kt
@@ -7,8 +7,8 @@ import com.reposilite.maven.api.DeployRequest
 import com.reposilite.maven.api.DocumentInfo
 import com.reposilite.maven.api.FileDetails
 import com.reposilite.maven.api.LookupRequest
-import com.reposilite.web.api.ReposiliteRoute
-import com.reposilite.web.api.ReposiliteRoutes
+import com.reposilite.web.ReposiliteRoute
+import com.reposilite.web.ReposiliteRoutes
 import com.reposilite.web.http.ErrorResponse
 import com.reposilite.web.http.resultAttachment
 import com.reposilite.web.routing.RouteMethod.DELETE

diff --git a/...ckend/src/main/kotlin/com/reposilite/statistics/application/StatisticsWebConfiguration.kt b/...ckend/src/main/kotlin/com/reposilite/statistics/application/StatisticsWebConfiguration.kt
@@ -22,7 +22,7 @@ import com.reposilite.statistics.StatsCommand
 import com.reposilite.statistics.infrastructure.SqlStatisticsRepository
 import com.reposilite.statistics.infrastructure.StatisticsEndpoint
 import com.reposilite.statistics.infrastructure.StatisticsHandler
-import com.reposilite.web.api.ReposiliteRoutes
+import com.reposilite.web.ReposiliteRoutes
 import net.dzikoysk.dynamiclogger.Journalist
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit.MINUTES

diff --git a/...te-backend/src/main/kotlin/com/reposilite/statistics/infrastructure/StatisticsEndpoint.kt b/...te-backend/src/main/kotlin/com/reposilite/statistics/infrastructure/StatisticsEndpoint.kt
@@ -1,8 +1,8 @@
 package com.reposilite.statistics.infrastructure
 
 import com.reposilite.statistics.StatisticsFacade
-import com.reposilite.web.api.ReposiliteRoute
-import com.reposilite.web.api.ReposiliteRoutes
+import com.reposilite.web.ReposiliteRoute
+import com.reposilite.web.ReposiliteRoutes
 import com.reposilite.web.routing.RouteMethod.GET
 import io.javalin.openapi.HttpMethod
 import io.javalin.openapi.OpenApi

diff --git a/...ite-backend/src/main/kotlin/com/reposilite/statistics/infrastructure/StatisticsHandler.kt b/...ite-backend/src/main/kotlin/com/reposilite/statistics/infrastructure/StatisticsHandler.kt
@@ -19,8 +19,8 @@ package com.reposilite.statistics.infrastructure
 import com.reposilite.statistics.StatisticsFacade
 import com.reposilite.statistics.api.MAX_IDENTIFIER_LENGTH
 import com.reposilite.statistics.api.RecordType.REQUEST
-import com.reposilite.web.api.ReposiliteRoute
-import com.reposilite.web.api.ReposiliteRoutes
+import com.reposilite.web.ReposiliteRoute
+import com.reposilite.web.ReposiliteRoutes
 import com.reposilite.web.routing.RouteMethod.BEFORE
 
 internal class StatisticsHandler(private val statisticsFacade: StatisticsFacade) : ReposiliteRoutes() {

diff --git a/...e-backend/src/main/kotlin/com/reposilite/token/application/AccessTokenWebConfiguration.kt b/...e-backend/src/main/kotlin/com/reposilite/token/application/AccessTokenWebConfiguration.kt
@@ -24,7 +24,7 @@ import com.reposilite.token.KeygenCommand
 import com.reposilite.token.RevokeCommand
 import com.reposilite.token.TokensCommand
 import com.reposilite.token.infrastructure.SqlAccessTokenRepository
-import com.reposilite.web.api.ReposiliteRoutes
+import com.reposilite.web.ReposiliteRoutes
 import net.dzikoysk.dynamiclogger.Journalist
 
 internal object AccessTokenWebConfiguration {

diff --git a/...n/kotlin/com/reposilite/web/DslContext.kt → ...in/com/reposilite/web/ReposiliteWebDsl.kt b/...n/kotlin/com/reposilite/web/DslContext.kt → ...in/com/reposilite/web/ReposiliteWebDsl.kt
@@ -19,10 +19,21 @@ package com.reposilite.web
 import com.reposilite.auth.Session
 import com.reposilite.web.http.ErrorResponse
 import com.reposilite.web.http.error
+import com.reposilite.web.routing.Route
+import com.reposilite.web.routing.RouteMethod
+import com.reposilite.web.routing.Routes
 import io.javalin.http.Context
 import io.javalin.http.HttpCode
 
-class DslContext(val ctx: Context, val context: ReposiliteContext) {
+abstract class ReposiliteRoutes : Routes<ReposiliteWebDsl, Unit>
+
+class ReposiliteRoute(
+    path: String,
+    vararg methods: RouteMethod,
+    handler: suspend ReposiliteWebDsl.() -> Unit
+) : Route<ReposiliteWebDsl, Unit>(path = path, methods = methods, handler = handler)
+
+class ReposiliteWebDsl(val ctx: Context, val context: ReposiliteContext) {
 
     /**
      * Response to send at the end of the dsl call
@@ -69,5 +80,5 @@ class DslContext(val ctx: Context, val context: ReposiliteContext) {
 
 }
 
-suspend fun context(contextFactory: ReposiliteContextFactory, ctx: Context, init: suspend DslContext.() -> Unit): DslContext =
-    DslContext(ctx, contextFactory.create(ctx)).also { init(it) }
+suspend fun context(contextFactory: ReposiliteContextFactory, ctx: Context, init: suspend ReposiliteWebDsl.() -> Unit): ReposiliteWebDsl =
+    ReposiliteWebDsl(ctx, contextFactory.create(ctx)).also { init(it) }
diff --git a/reposilite-backend/src/main/kotlin/com/reposilite/web/api/ReposiliteRoute.kt b/reposilite-backend/src/main/kotlin/com/reposilite/web/api/ReposiliteRoute.kt
diff --git a/reposilite-backend/src/main/kotlin/com/reposilite/web/infrastructure/JavalinWebServer.kt b/reposilite-backend/src/main/kotlin/com/reposilite/web/infrastructure/JavalinWebServer.kt
@@ -3,7 +3,7 @@ package com.reposilite.web.infrastructure
 import com.reposilite.Reposilite
 import com.reposilite.ReposiliteWebConfiguration
 import com.reposilite.config.Configuration
-import com.reposilite.web.DslContext
+import com.reposilite.web.ReposiliteWebDsl
 import com.reposilite.web.WebServer
 import com.reposilite.web.context
 import com.reposilite.web.http.response
@@ -54,7 +54,7 @@ internal class JavalinWebServer : WebServer {
     private fun configureServer(reposilite: Reposilite, configuration: Configuration, dispatcher: CoroutineDispatcher, serverConfig: JavalinConfig) {
         JavalinWebServerConfiguration.configure(reposilite, configuration, serverConfig)
 
-        val plugin = ReactiveRoutingPlugin<DslContext, Unit>(
+        val plugin = ReactiveRoutingPlugin<ReposiliteWebDsl, Unit>(
             errorConsumer = { name, error -> reposilite.logger.error("Coroutine $name failed to execute task", error) },
             dispatcher = dispatcher,
             syncHandler = { ctx, route ->