Move config into simplenotes-config module

2020-10-23 16:24:50 +02:00 · 2020-10-23 16:24:50 +02:00 · cd12d1561a
commit cd12d1561a
parent c2eaf3d0cc
20 changed files with 48 additions and 17 deletions
--- a/pom.xml
+++ b/pom.xml
@ -14,6 +14,7 @@
        <module>simplenotes-shared</module>
        <module>simplenotes-search</module>
        <module>simplenotes-types</module>
+        <module>simplenotes-config</module>
    </modules>

    <packaging>pom</packaging>
--- a/simplenotes-app/pom.xml
+++ b/simplenotes-app/pom.xml
@ -35,6 +35,11 @@
            <artifactId>simplenotes-shared</artifactId>
            <version>1.0-SNAPSHOT</version>
        </dependency>
+        <dependency>
+            <groupId>be.simplenotes</groupId>
+            <artifactId>simplenotes-config</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
        <dependency>
            <groupId>org.http4k</groupId>
            <artifactId>http4k-core</artifactId>
--- a/simplenotes-app/src/main/kotlin/Config.kt
+++ b/simplenotes-app/src/main/kotlin/Config.kt
@ -1,8 +1,8 @@
 package be.simplenotes.app

-import be.simplenotes.shared.config.DataSourceConfig
-import be.simplenotes.shared.config.JwtConfig
-import be.simplenotes.shared.config.ServerConfig
+import be.simplenotes.config.DataSourceConfig
+import be.simplenotes.config.JwtConfig
+import be.simplenotes.config.ServerConfig
 import java.util.*
 import java.util.concurrent.TimeUnit

--- a/simplenotes-app/src/main/kotlin/Server.kt
+++ b/simplenotes-app/src/main/kotlin/Server.kt
@ -2,7 +2,7 @@ package be.simplenotes.app

 import org.http4k.server.Http4kServer
 import org.slf4j.LoggerFactory
-import be.simplenotes.shared.config.ServerConfig as SimpleNotesServerConfig
+import be.simplenotes.config.ServerConfig as SimpleNotesServerConfig

 class Server(
    private val config: SimpleNotesServerConfig,
--- a/simplenotes-app/src/main/kotlin/controllers/UserController.kt
+++ b/simplenotes-app/src/main/kotlin/controllers/UserController.kt
@ -10,7 +10,7 @@ import be.simplenotes.domain.usecases.users.login.*
 import be.simplenotes.domain.usecases.users.register.InvalidRegisterForm
 import be.simplenotes.domain.usecases.users.register.RegisterForm
 import be.simplenotes.domain.usecases.users.register.UserExists
-import be.simplenotes.shared.config.JwtConfig
+import be.simplenotes.config.JwtConfig
 import org.http4k.core.Method.GET
 import org.http4k.core.Request
 import org.http4k.core.Response
--- a/simplenotes-app/src/main/kotlin/modules/ServerModule.kt
+++ b/simplenotes-app/src/main/kotlin/modules/ServerModule.kt
@ -9,7 +9,7 @@ import be.simplenotes.app.routes.Router
 import be.simplenotes.app.utils.StaticFileResolver
 import be.simplenotes.app.utils.StaticFileResolverImpl
 import be.simplenotes.app.views.ErrorView
-import be.simplenotes.shared.config.ServerConfig
+import be.simplenotes.config.ServerConfig
 import org.eclipse.jetty.server.ServerConnector
 import org.http4k.core.Filter
 import org.http4k.core.RequestContexts
--- a/simplenotes-app/src/test/kotlin/filters/AuthFilterTest.kt
+++ b/simplenotes-app/src/test/kotlin/filters/AuthFilterTest.kt
@ -3,7 +3,7 @@ package be.simplenotes.app.filters
 import be.simplenotes.domain.security.JwtPayload
 import be.simplenotes.domain.security.JwtPayloadExtractor
 import be.simplenotes.domain.security.SimpleJwt
-import be.simplenotes.shared.config.JwtConfig
+import be.simplenotes.config.JwtConfig
 import com.natpryce.hamkrest.assertion.assertThat
 import org.http4k.core.*
 import org.http4k.core.Method.GET
--- a/simplenotes-config/pom.xml
+++ b/simplenotes-config/pom.xml
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>simplenotes-parent</artifactId>
+        <groupId>be.simplenotes</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>simplenotes-config</artifactId>
+
+
+</project>
--- a/simplenotes-config/src/main/kotlin/Config.kt
+++ b/simplenotes-config/src/main/kotlin/Config.kt
@ -1,4 +1,4 @@
-package be.simplenotes.shared.config
+package be.simplenotes.config

 import java.util.concurrent.TimeUnit

--- a/simplenotes-domain/pom.xml
+++ b/simplenotes-domain/pom.xml
@ -16,6 +16,11 @@
            <artifactId>simplenotes-shared</artifactId>
            <version>1.0-SNAPSHOT</version>
        </dependency>
+        <dependency>
+            <groupId>be.simplenotes</groupId>
+            <artifactId>simplenotes-config</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
        <dependency>
            <groupId>be.simplenotes</groupId>
            <artifactId>simplenotes-shared</artifactId>
--- a/simplenotes-domain/src/main/kotlin/security/SimpleJwt.kt
+++ b/simplenotes-domain/src/main/kotlin/security/SimpleJwt.kt
@ -1,6 +1,6 @@
 package be.simplenotes.domain.security

-import be.simplenotes.shared.config.JwtConfig
+import be.simplenotes.config.JwtConfig
 import com.auth0.jwt.JWT
 import com.auth0.jwt.JWTVerifier
 import com.auth0.jwt.algorithms.Algorithm
--- a/simplenotes-domain/src/test/kotlin/security/JwtPayloadExtractorTest.kt
+++ b/simplenotes-domain/src/test/kotlin/security/JwtPayloadExtractorTest.kt
@ -1,7 +1,7 @@
 package be.simplenotes.domain.security

 import be.simplenotes.domain.usecases.users.login.Token
-import be.simplenotes.shared.config.JwtConfig
+import be.simplenotes.config.JwtConfig
 import com.auth0.jwt.JWT
 import com.auth0.jwt.algorithms.Algorithm
 import com.natpryce.hamkrest.absent
--- a/simplenotes-domain/src/test/kotlin/usecases/users/login/LoginUseCaseImplTest.kt
+++ b/simplenotes-domain/src/test/kotlin/usecases/users/login/LoginUseCaseImplTest.kt
@ -4,7 +4,7 @@ import be.simplenotes.types.PersistedUser
 import be.simplenotes.domain.security.BcryptPasswordHash
 import be.simplenotes.domain.security.SimpleJwt
 import be.simplenotes.domain.usecases.repositories.UserRepository
-import be.simplenotes.shared.config.JwtConfig
+import be.simplenotes.config.JwtConfig
 import be.simplenotes.shared.testutils.assertions.isLeftOfType
 import be.simplenotes.shared.testutils.assertions.isRight
 import com.natpryce.hamkrest.assertion.assertThat
--- a/simplenotes-persistance/pom.xml
+++ b/simplenotes-persistance/pom.xml
@ -25,6 +25,11 @@
            <artifactId>simplenotes-types</artifactId>
            <version>1.0-SNAPSHOT</version>
        </dependency>
+        <dependency>
+            <groupId>be.simplenotes</groupId>
+            <artifactId>simplenotes-config</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
        <dependency>
            <groupId>be.simplenotes</groupId>
            <artifactId>simplenotes-shared</artifactId>
--- a/simplenotes-persistance/src/main/kotlin/HealthCheck.kt
+++ b/simplenotes-persistance/src/main/kotlin/HealthCheck.kt
@ -2,7 +2,7 @@ package be.simplenotes.persistance

 import be.simplenotes.persistance.utils.DbType
 import be.simplenotes.persistance.utils.type
-import be.simplenotes.shared.config.DataSourceConfig
+import be.simplenotes.config.DataSourceConfig
 import me.liuwj.ktorm.database.Database
 import me.liuwj.ktorm.database.asIterable
 import java.sql.SQLTransientException
--- a/simplenotes-persistance/src/main/kotlin/Migrations.kt
+++ b/simplenotes-persistance/src/main/kotlin/Migrations.kt
@ -2,7 +2,7 @@ package be.simplenotes.persistance

 import be.simplenotes.persistance.utils.DbType
 import be.simplenotes.persistance.utils.type
-import be.simplenotes.shared.config.DataSourceConfig
+import be.simplenotes.config.DataSourceConfig
 import org.flywaydb.core.Flyway
 import javax.sql.DataSource

--- a/simplenotes-persistance/src/main/kotlin/PersistanceModule.kt
+++ b/simplenotes-persistance/src/main/kotlin/PersistanceModule.kt
@ -6,7 +6,7 @@ import be.simplenotes.persistance.converters.NoteConverter
 import be.simplenotes.persistance.converters.UserConverter
 import be.simplenotes.persistance.notes.NoteRepositoryImpl
 import be.simplenotes.persistance.users.UserRepositoryImpl
-import be.simplenotes.shared.config.DataSourceConfig
+import be.simplenotes.config.DataSourceConfig
 import com.zaxxer.hikari.HikariConfig
 import com.zaxxer.hikari.HikariDataSource
 import me.liuwj.ktorm.database.Database
--- a/simplenotes-persistance/src/main/kotlin/utils/DataSourceConfigUtils.kt
+++ b/simplenotes-persistance/src/main/kotlin/utils/DataSourceConfigUtils.kt
@ -1,6 +1,6 @@
 package be.simplenotes.persistance.utils

-import be.simplenotes.shared.config.DataSourceConfig
+import be.simplenotes.config.DataSourceConfig

 enum class DbType { H2, MariaDb }

--- a/simplenotes-persistance/src/test/kotlin/notes/NoteRepositoryImplTest.kt
+++ b/simplenotes-persistance/src/test/kotlin/notes/NoteRepositoryImplTest.kt
@ -7,7 +7,7 @@ import be.simplenotes.persistance.DbMigrations
 import be.simplenotes.persistance.converters.NoteConverter
 import be.simplenotes.persistance.migrationModule
 import be.simplenotes.persistance.persistanceModule
-import be.simplenotes.shared.config.DataSourceConfig
+import be.simplenotes.config.DataSourceConfig
 import me.liuwj.ktorm.database.Database
 import me.liuwj.ktorm.dsl.eq
 import me.liuwj.ktorm.entity.filter
--- a/simplenotes-persistance/src/test/kotlin/users/UserRepositoryImplTest.kt
+++ b/simplenotes-persistance/src/test/kotlin/users/UserRepositoryImplTest.kt
@ -5,7 +5,7 @@ import be.simplenotes.domain.usecases.repositories.UserRepository
 import be.simplenotes.persistance.DbMigrations
 import be.simplenotes.persistance.migrationModule
 import be.simplenotes.persistance.persistanceModule
-import be.simplenotes.shared.config.DataSourceConfig
+import be.simplenotes.config.DataSourceConfig
 import me.liuwj.ktorm.database.*
 import me.liuwj.ktorm.dsl.*
 import me.liuwj.ktorm.entity.*