Move types into simplenotes-types module

pom.xml

@@ -13,6 +13,7 @@
         <module>simplenotes-domain</module>
         <module>simplenotes-shared</module>
         <module>simplenotes-search</module>
+        <module>simplenotes-types</module>
     </modules>
 
     <packaging>pom</packaging>

simplenotes-app/src/main/kotlin/api/ApiNoteController.kt

@@ -2,8 +2,8 @@ package be.simplenotes.app.api
 
 import be.simplenotes.app.extensions.auto
 import be.simplenotes.app.utils.parseSearchTerms
-import be.simplenotes.domain.model.PersistedNote
+import be.simplenotes.types.PersistedNote
-import be.simplenotes.domain.model.PersistedNoteMetadata
+import be.simplenotes.types.PersistedNoteMetadata
 import be.simplenotes.domain.security.JwtPayload
 import be.simplenotes.domain.usecases.NoteService
 import kotlinx.serialization.Contextual

simplenotes-app/src/main/kotlin/views/NoteView.kt

@@ -2,8 +2,8 @@ package be.simplenotes.app.views
 
 import be.simplenotes.app.utils.StaticFileResolver
 import be.simplenotes.app.views.components.*
-import be.simplenotes.domain.model.PersistedNote
+import be.simplenotes.types.PersistedNote
-import be.simplenotes.domain.model.PersistedNoteMetadata
+import be.simplenotes.types.PersistedNoteMetadata
 import be.simplenotes.domain.security.JwtPayload
 import io.konform.validation.ValidationError
 import kotlinx.html.*

simplenotes-app/src/main/kotlin/views/components/DeletedNoteTable.kt

@@ -1,7 +1,7 @@
 package be.simplenotes.app.views.components
 
 import be.simplenotes.app.utils.toTimeAgo
-import be.simplenotes.domain.model.PersistedNoteMetadata
+import be.simplenotes.types.PersistedNoteMetadata
 import kotlinx.html.*
 import kotlinx.html.ButtonType.submit
 import kotlinx.html.FormMethod.post

simplenotes-app/src/main/kotlin/views/components/NoteTable.kt

@@ -1,7 +1,7 @@
 package be.simplenotes.app.views.components
 
 import be.simplenotes.app.utils.toTimeAgo
-import be.simplenotes.domain.model.PersistedNoteMetadata
+import be.simplenotes.types.PersistedNoteMetadata
 import kotlinx.html.*
 import kotlinx.html.ThScope.col
 

simplenotes-domain/pom.xml

@@ -24,14 +24,14 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.arrow-kt</groupId>
-            <artifactId>arrow-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.koin</groupId>
             <artifactId>koin-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.arrow-kt</groupId>
+            <artifactId>arrow-core</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.natpryce</groupId>
             <artifactId>hamkrest</artifactId>
@@ -83,15 +83,17 @@
             <artifactId>owasp-java-html-sanitizer</artifactId>
             <version>20200713.1</version>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlinx</groupId>
-            <artifactId>kotlinx-serialization-json-jvm</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
             <version>1.20</version>
         </dependency>
+        <dependency>
+            <groupId>be.simplenotes</groupId>
+            <artifactId>simplenotes-types</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>

simplenotes-domain/src/main/kotlin/security/JwtPayload.kt

@@ -1,6 +1,6 @@
 package be.simplenotes.domain.security
 
-import be.simplenotes.domain.model.PersistedUser
+import be.simplenotes.types.PersistedUser
 import com.auth0.jwt.exceptions.JWTVerificationException
 
 data class JwtPayload(val userId: Int, val username: String) {

simplenotes-domain/src/main/kotlin/usecases/NoteService.kt

@@ -2,9 +2,9 @@ package be.simplenotes.domain.usecases
 
 import arrow.core.Either
 import arrow.core.extensions.fx
-import be.simplenotes.domain.model.Note
+import be.simplenotes.types.Note
-import be.simplenotes.domain.model.PersistedNote
+import be.simplenotes.types.PersistedNote
-import be.simplenotes.domain.model.PersistedNoteMetadata
+import be.simplenotes.types.PersistedNoteMetadata
 import be.simplenotes.domain.security.HtmlSanitizer
 import be.simplenotes.domain.usecases.markdown.MarkdownConverter
 import be.simplenotes.domain.usecases.markdown.MarkdownParsingError

simplenotes-domain/src/main/kotlin/usecases/export/ExportUseCaseImpl.kt

@@ -1,6 +1,6 @@
 package be.simplenotes.domain.usecases.export
 
-import be.simplenotes.domain.model.ExportedNote
+import be.simplenotes.types.ExportedNote
 import be.simplenotes.domain.usecases.repositories.NoteRepository
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.json.Json

simplenotes-domain/src/main/kotlin/usecases/markdown/MarkdownConverter.kt

@@ -4,7 +4,7 @@ import arrow.core.Either
 import arrow.core.extensions.fx
 import arrow.core.left
 import arrow.core.right
-import be.simplenotes.domain.model.NoteMetadata
+import be.simplenotes.types.NoteMetadata
 import be.simplenotes.domain.validation.NoteValidations
 import com.vladsch.flexmark.ext.gfm.tasklist.TaskListExtension
 import com.vladsch.flexmark.html.HtmlRenderer

simplenotes-domain/src/main/kotlin/usecases/repositories/NoteRepository.kt

@@ -1,9 +1,9 @@
 package be.simplenotes.domain.usecases.repositories
 
-import be.simplenotes.domain.model.ExportedNote
+import be.simplenotes.types.ExportedNote
-import be.simplenotes.domain.model.Note
+import be.simplenotes.types.Note
-import be.simplenotes.domain.model.PersistedNote
+import be.simplenotes.types.PersistedNote
-import be.simplenotes.domain.model.PersistedNoteMetadata
+import be.simplenotes.types.PersistedNoteMetadata
 import java.util.*
 
 interface NoteRepository {

simplenotes-domain/src/main/kotlin/usecases/repositories/UserRepository.kt

@@ -1,7 +1,7 @@
 package be.simplenotes.domain.usecases.repositories
 
-import be.simplenotes.domain.model.PersistedUser
+import be.simplenotes.types.PersistedUser
-import be.simplenotes.domain.model.User
+import be.simplenotes.types.User
 
 interface UserRepository {
     fun create(user: User): PersistedUser?

simplenotes-domain/src/main/kotlin/usecases/search/SearchUseCase.kt

@@ -1,7 +1,7 @@
 package be.simplenotes.domain.usecases.search
 
-import be.simplenotes.domain.model.PersistedNote
+import be.simplenotes.types.PersistedNote
-import be.simplenotes.domain.model.PersistedNoteMetadata
+import be.simplenotes.types.PersistedNoteMetadata
 import java.util.*
 
 data class SearchTerms(val title: String?, val tag: String?, val content: String?, val all: String?)

simplenotes-domain/src/main/kotlin/usecases/users/register/RegisterUseCaseImpl.kt

@@ -3,7 +3,7 @@ package be.simplenotes.domain.usecases.users.register
 import arrow.core.Either
 import arrow.core.filterOrElse
 import arrow.core.leftIfNull
-import be.simplenotes.domain.model.PersistedUser
+import be.simplenotes.types.PersistedUser
 import be.simplenotes.domain.security.PasswordHash
 import be.simplenotes.domain.usecases.repositories.UserRepository
 import be.simplenotes.domain.validation.UserValidations

simplenotes-domain/src/main/kotlin/usecases/users/register/RegisterUsecase.kt

@@ -1,7 +1,7 @@
 package be.simplenotes.domain.usecases.users.register
 
 import arrow.core.Either
-import be.simplenotes.domain.model.PersistedUser
+import be.simplenotes.types.PersistedUser
 import be.simplenotes.domain.usecases.users.login.LoginForm
 import io.konform.validation.ValidationErrors
 

simplenotes-domain/src/main/kotlin/validation/NoteValidations.kt

@@ -1,7 +1,7 @@
 package be.simplenotes.domain.validation
 
 import arrow.core.*
-import be.simplenotes.domain.model.NoteMetadata
+import be.simplenotes.types.NoteMetadata
 import be.simplenotes.domain.usecases.markdown.ValidationError
 import io.konform.validation.Validation
 import io.konform.validation.jsonschema.maxItems

simplenotes-domain/src/main/kotlin/validation/UserValidations.kt

@@ -3,7 +3,7 @@ package be.simplenotes.domain.validation
 import arrow.core.Either
 import arrow.core.left
 import arrow.core.right
-import be.simplenotes.domain.model.User
+import be.simplenotes.types.User
 import be.simplenotes.domain.usecases.users.delete.DeleteError
 import be.simplenotes.domain.usecases.users.delete.DeleteForm
 import be.simplenotes.domain.usecases.users.login.InvalidLoginForm

simplenotes-domain/src/test/kotlin/usecases/users/login/LoginUseCaseImplTest.kt

@@ -1,6 +1,6 @@
 package be.simplenotes.domain.usecases.users.login
 
-import be.simplenotes.domain.model.PersistedUser
+import be.simplenotes.types.PersistedUser
 import be.simplenotes.domain.security.BcryptPasswordHash
 import be.simplenotes.domain.security.SimpleJwt
 import be.simplenotes.domain.usecases.repositories.UserRepository

simplenotes-domain/src/test/kotlin/usecases/users/register/RegisterUseCaseImplTest.kt

@@ -1,6 +1,6 @@
 package be.simplenotes.domain.usecases.users.register
 
-import be.simplenotes.domain.model.PersistedUser
+import be.simplenotes.types.PersistedUser
 import be.simplenotes.domain.security.BcryptPasswordHash
 import be.simplenotes.domain.usecases.repositories.UserRepository
 import be.simplenotes.shared.testutils.assertions.isLeftOfType

simplenotes-persistance/pom.xml

@@ -20,6 +20,11 @@
             <artifactId>simplenotes-domain</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>be.simplenotes</groupId>
+            <artifactId>simplenotes-types</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>be.simplenotes</groupId>
             <artifactId>simplenotes-shared</artifactId>
@@ -33,6 +38,11 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.koin</groupId>
+            <artifactId>koin-core</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>

simplenotes-persistance/src/main/kotlin/PersistanceModule.kt

@@ -3,9 +3,7 @@ package be.simplenotes.persistance
 import be.simplenotes.domain.usecases.repositories.NoteRepository
 import be.simplenotes.domain.usecases.repositories.UserRepository
 import be.simplenotes.persistance.converters.NoteConverter
-import be.simplenotes.persistance.converters.NoteConverterImpl
 import be.simplenotes.persistance.converters.UserConverter
-import be.simplenotes.persistance.converters.UserConverterImpl
 import be.simplenotes.persistance.notes.NoteRepositoryImpl
 import be.simplenotes.persistance.users.UserRepositoryImpl
 import be.simplenotes.shared.config.DataSourceConfig
@@ -15,6 +13,7 @@ import me.liuwj.ktorm.database.Database
 import org.koin.dsl.bind
 import org.koin.dsl.module
 import org.koin.dsl.onClose
+import org.mapstruct.factory.Mappers
 import javax.sql.DataSource
 
 private fun hikariDataSource(conf: DataSourceConfig): HikariDataSource {
@@ -34,8 +33,8 @@ val migrationModule = module {
 }
 
 val persistanceModule = module {
-    single<NoteConverter> { NoteConverterImpl() }
+    single { Mappers.getMapper(NoteConverter::class.java) }
-    single<UserConverter> { UserConverterImpl() }
+    single { Mappers.getMapper(UserConverter::class.java) }
     single<UserRepository> { UserRepositoryImpl(get(), get()) }
     single<NoteRepository> { NoteRepositoryImpl(get(), get()) }
     single { hikariDataSource(get()) } bind DataSource::class onClose { it?.close() }

simplenotes-persistance/src/main/kotlin/converters/NoteConverter.kt

@@ -1,6 +1,6 @@
 package be.simplenotes.persistance.converters
 
-import be.simplenotes.domain.model.*
+import be.simplenotes.types.*
 import be.simplenotes.persistance.notes.NoteEntity
 import me.liuwj.ktorm.entity.Entity
 import org.mapstruct.Mapper

simplenotes-persistance/src/main/kotlin/converters/UserConverter.kt

@@ -1,7 +1,7 @@
 package be.simplenotes.persistance.converters
 
-import be.simplenotes.domain.model.PersistedUser
+import be.simplenotes.types.PersistedUser
-import be.simplenotes.domain.model.User
+import be.simplenotes.types.User
 import be.simplenotes.persistance.users.UserEntity
 import me.liuwj.ktorm.entity.Entity
 import org.mapstruct.Mapper

simplenotes-persistance/src/main/kotlin/notes/NoteRepositoryImpl.kt

@@ -1,9 +1,9 @@
 package be.simplenotes.persistance.notes
 
-import be.simplenotes.domain.model.ExportedNote
+import be.simplenotes.types.ExportedNote
-import be.simplenotes.domain.model.Note
+import be.simplenotes.types.Note
-import be.simplenotes.domain.model.PersistedNote
+import be.simplenotes.types.PersistedNote
-import be.simplenotes.domain.model.PersistedNoteMetadata
+import be.simplenotes.types.PersistedNoteMetadata
 import be.simplenotes.domain.usecases.repositories.NoteRepository
 import be.simplenotes.persistance.converters.NoteConverter
 import me.liuwj.ktorm.database.Database

simplenotes-persistance/src/main/kotlin/users/UserRepositoryImpl.kt

@@ -1,7 +1,7 @@
 package be.simplenotes.persistance.users
 
-import be.simplenotes.domain.model.PersistedUser
+import be.simplenotes.types.PersistedUser
-import be.simplenotes.domain.model.User
+import be.simplenotes.types.User
 import be.simplenotes.domain.usecases.repositories.UserRepository
 import be.simplenotes.persistance.converters.UserConverter
 import me.liuwj.ktorm.database.Database

simplenotes-persistance/src/test/kotlin/converters/NoteConverterTest.kt

@@ -1,6 +1,6 @@
 package be.simplenotes.persistance.converters
 
-import be.simplenotes.domain.model.*
+import be.simplenotes.types.*
 import be.simplenotes.persistance.notes.NoteEntity
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.DisplayName

simplenotes-persistance/src/test/kotlin/converters/UserConverterTest.kt

@@ -1,7 +1,7 @@
 package be.simplenotes.persistance.converters
 
-import be.simplenotes.domain.model.PersistedUser
+import be.simplenotes.types.PersistedUser
-import be.simplenotes.domain.model.User
+import be.simplenotes.types.User
 import be.simplenotes.persistance.users.UserEntity
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test

simplenotes-persistance/src/test/kotlin/notes/NoteRepositoryImplTest.kt

@@ -1,6 +1,6 @@
 package be.simplenotes.persistance.notes
 
-import be.simplenotes.domain.model.*
+import be.simplenotes.types.*
 import be.simplenotes.domain.usecases.repositories.NoteRepository
 import be.simplenotes.domain.usecases.repositories.UserRepository
 import be.simplenotes.persistance.DbMigrations

simplenotes-persistance/src/test/kotlin/users/UserRepositoryImplTest.kt

@@ -1,6 +1,6 @@
 package be.simplenotes.persistance.users
 
-import be.simplenotes.domain.model.User
+import be.simplenotes.types.User
 import be.simplenotes.domain.usecases.repositories.UserRepository
 import be.simplenotes.persistance.DbMigrations
 import be.simplenotes.persistance.migrationModule

simplenotes-search/pom.xml

@@ -16,6 +16,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>be.simplenotes</groupId>
+            <artifactId>simplenotes-types</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>be.simplenotes</groupId>
             <artifactId>simplenotes-domain</artifactId>
@@ -41,6 +46,10 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.koin</groupId>
+            <artifactId>koin-core</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.junit.jupiter</groupId>

simplenotes-search/src/main/kotlin/Extractors.kt

@@ -1,7 +1,7 @@
 package be.simplenotes.search
 
-import be.simplenotes.domain.model.PersistedNote
+import be.simplenotes.types.PersistedNote
-import be.simplenotes.domain.model.PersistedNoteMetadata
+import be.simplenotes.types.PersistedNoteMetadata
 import org.apache.lucene.document.Document
 import org.apache.lucene.document.Field
 import org.apache.lucene.document.StringField

simplenotes-search/src/main/kotlin/NoteSearcherImpl.kt

@@ -1,6 +1,6 @@
 package be.simplenotes.search
 
-import be.simplenotes.domain.model.PersistedNote
+import be.simplenotes.types.PersistedNote
 import be.simplenotes.domain.usecases.search.NoteSearcher
 import be.simplenotes.domain.usecases.search.SearchTerms
 import be.simplenotes.search.utils.rmdir

simplenotes-search/src/test/kotlin/NoteSearcherImplTest.kt

@@ -1,8 +1,8 @@
 package be.simplenotes.search
 
-import be.simplenotes.domain.model.NoteMetadata
+import be.simplenotes.types.NoteMetadata
-import be.simplenotes.domain.model.PersistedNote
+import be.simplenotes.types.PersistedNote
-import be.simplenotes.domain.model.PersistedNoteMetadata
+import be.simplenotes.types.PersistedNoteMetadata
 import be.simplenotes.domain.usecases.search.SearchTerms
 import org.assertj.core.api.Assertions.assertThat
 import org.intellij.lang.annotations.Language

simplenotes-types/pom.xml

@@ -0,0 +1,21 @@
+<?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-types</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jetbrains.kotlinx</groupId>
+            <artifactId>kotlinx-serialization-json-jvm</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

simplenotes-types/src/main/kotlin/Note.kt

@@ -1,4 +1,4 @@
-package be.simplenotes.domain.model
+package be.simplenotes.types
 
 import kotlinx.serialization.Contextual
 import kotlinx.serialization.Serializable

simplenotes-types/src/main/kotlin/User.kt

@@ -1,4 +1,4 @@
-package be.simplenotes.domain.model
+package be.simplenotes.types
 
 data class User(val username: String, val password: String)
 data class PersistedUser(val username: String, val password: String, val id: Int)