diff --git a/pom.xml b/pom.xml index 3e295e2..9e493fa 100644 --- a/pom.xml +++ b/pom.xml @@ -14,6 +14,7 @@ simplenotes-shared simplenotes-search simplenotes-types + simplenotes-config pom diff --git a/simplenotes-app/pom.xml b/simplenotes-app/pom.xml index cc5d923..ee06139 100644 --- a/simplenotes-app/pom.xml +++ b/simplenotes-app/pom.xml @@ -35,6 +35,11 @@ simplenotes-shared 1.0-SNAPSHOT + + be.simplenotes + simplenotes-config + 1.0-SNAPSHOT + org.http4k http4k-core diff --git a/simplenotes-app/src/main/kotlin/Config.kt b/simplenotes-app/src/main/kotlin/Config.kt index b391ccd..c714f7e 100644 --- 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 diff --git a/simplenotes-app/src/main/kotlin/Server.kt b/simplenotes-app/src/main/kotlin/Server.kt index 817db49..5b5a01a 100644 --- 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, diff --git a/simplenotes-app/src/main/kotlin/controllers/UserController.kt b/simplenotes-app/src/main/kotlin/controllers/UserController.kt index 49925ca..d223955 100644 --- 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 diff --git a/simplenotes-app/src/main/kotlin/modules/ServerModule.kt b/simplenotes-app/src/main/kotlin/modules/ServerModule.kt index 0c732ed..b1e6f1f 100644 --- 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 diff --git a/simplenotes-app/src/test/kotlin/filters/AuthFilterTest.kt b/simplenotes-app/src/test/kotlin/filters/AuthFilterTest.kt index d3ce561..929542d 100644 --- 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 diff --git a/simplenotes-config/pom.xml b/simplenotes-config/pom.xml new file mode 100644 index 0000000..1fc19b6 --- /dev/null +++ b/simplenotes-config/pom.xml @@ -0,0 +1,15 @@ + + + + simplenotes-parent + be.simplenotes + 1.0-SNAPSHOT + + 4.0.0 + + simplenotes-config + + + diff --git a/simplenotes-shared/src/main/kotlin/Config.kt b/simplenotes-config/src/main/kotlin/Config.kt similarity index 95% rename from simplenotes-shared/src/main/kotlin/Config.kt rename to simplenotes-config/src/main/kotlin/Config.kt index 424eee5..963d4e4 100644 --- a/simplenotes-shared/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 diff --git a/simplenotes-domain/pom.xml b/simplenotes-domain/pom.xml index 4b3fb83..b7d7137 100644 --- a/simplenotes-domain/pom.xml +++ b/simplenotes-domain/pom.xml @@ -16,6 +16,11 @@ simplenotes-shared 1.0-SNAPSHOT + + be.simplenotes + simplenotes-config + 1.0-SNAPSHOT + be.simplenotes simplenotes-shared diff --git a/simplenotes-domain/src/main/kotlin/security/SimpleJwt.kt b/simplenotes-domain/src/main/kotlin/security/SimpleJwt.kt index fc4eb99..0fde615 100644 --- 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 diff --git a/simplenotes-domain/src/test/kotlin/security/JwtPayloadExtractorTest.kt b/simplenotes-domain/src/test/kotlin/security/JwtPayloadExtractorTest.kt index 6608696..0f09b32 100644 --- 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 diff --git a/simplenotes-domain/src/test/kotlin/usecases/users/login/LoginUseCaseImplTest.kt b/simplenotes-domain/src/test/kotlin/usecases/users/login/LoginUseCaseImplTest.kt index b2829ac..27cacde 100644 --- 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 diff --git a/simplenotes-persistance/pom.xml b/simplenotes-persistance/pom.xml index da901df..a3bff0a 100644 --- a/simplenotes-persistance/pom.xml +++ b/simplenotes-persistance/pom.xml @@ -25,6 +25,11 @@ simplenotes-types 1.0-SNAPSHOT + + be.simplenotes + simplenotes-config + 1.0-SNAPSHOT + be.simplenotes simplenotes-shared diff --git a/simplenotes-persistance/src/main/kotlin/HealthCheck.kt b/simplenotes-persistance/src/main/kotlin/HealthCheck.kt index 063646a..97e3928 100644 --- 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 diff --git a/simplenotes-persistance/src/main/kotlin/Migrations.kt b/simplenotes-persistance/src/main/kotlin/Migrations.kt index 3938ded..dcd9add 100644 --- 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 diff --git a/simplenotes-persistance/src/main/kotlin/PersistanceModule.kt b/simplenotes-persistance/src/main/kotlin/PersistanceModule.kt index bfe9d67..9cbdddc 100644 --- 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 diff --git a/simplenotes-persistance/src/main/kotlin/utils/DataSourceConfigUtils.kt b/simplenotes-persistance/src/main/kotlin/utils/DataSourceConfigUtils.kt index c683027..36f4450 100644 --- 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 } diff --git a/simplenotes-persistance/src/test/kotlin/notes/NoteRepositoryImplTest.kt b/simplenotes-persistance/src/test/kotlin/notes/NoteRepositoryImplTest.kt index d6fa766..31c6bbb 100644 --- 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 diff --git a/simplenotes-persistance/src/test/kotlin/users/UserRepositoryImplTest.kt b/simplenotes-persistance/src/test/kotlin/users/UserRepositoryImplTest.kt index ade0709..286eb6c 100644 --- 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.*