Merge branch 'jigsaw' into master

Some libraires are not yet ready..

{Arrow,Lucene,Http4k} should be packed inside a shaded jar because they
all have some split packages

HikariCP has an invalid module-info.java

Kapt doesn't work

.gitignore

@@ -125,8 +125,8 @@ data/
 letsencrypt/
 
 # generated resources
-app/src/main/resources/css-manifest.json
-app/src/main/resources/static/styles*
+simplenotes-app/src/main/resources/css-manifest.json
+simplenotes-app/src/main/resources/static/styles*
 
 # h2 db
 *.db

Dockerfile

@@ -4,19 +4,23 @@ WORKDIR /tmp
 
 # Cache dependencies
 COPY pom.xml .
-COPY app/pom.xml app/pom.xml
-COPY domain/pom.xml domain/pom.xml
-COPY persistance/pom.xml persistance/pom.xml
-COPY shared/pom.xml shared/pom.xml
-COPY search/pom.xml search/pom.xml
+COPY simplenotes-test-resources/pom.xml simplenotes-test-resources/pom.xml
+COPY simplenotes-types/pom.xml simplenotes-types/pom.xml
+COPY simplenotes-config/pom.xml simplenotes-config/pom.xml
+COPY simplenotes-persistance/pom.xml simplenotes-persistance/pom.xml
+COPY simplenotes-search/pom.xml simplenotes-search/pom.xml
+COPY simplenotes-domain/pom.xml simplenotes-domain/pom.xml
+COPY simplenotes-app/pom.xml simplenotes-app/pom.xml
 
 RUN mvn verify clean --fail-never
 
-COPY app/src app/src
-COPY domain/src domain/src
-COPY persistance/src persistance/src
-COPY shared/src shared/src
-COPY search/src search/src
+COPY simplenotes-test-resources/src simplenotes-test-resources/src
+COPY simplenotes-types/src simplenotes-types/src
+COPY simplenotes-config/src simplenotes-config/src
+COPY simplenotes-persistance/src simplenotes-persistance/src
+COPY simplenotes-search/src simplenotes-search/src
+COPY simplenotes-domain/src simplenotes-domain/src
+COPY simplenotes-app/src simplenotes-app/src
 
 RUN mvn -Dstyle.color=always package
 
@@ -42,8 +46,8 @@ RUN chown -R $APPLICATION_USER /app
 
 USER $APPLICATION_USER
 
-COPY --from=builder /tmp/app/target/app-*.jar /app/app.jar
+COPY --from=builder /tmp/simplenotes-app/target/simplenotes-app-*.jar /app/simplenotes.jar
 COPY --from=jdkbuilder /myjdk /myjdk
 WORKDIR /app
 
-CMD ["/myjdk/bin/java", "-server", "-XX:+UnlockExperimentalVMOptions", "-Xms64m", "-Xmx256m", "-XX:+UseG1GC", "-XX:MaxGCPauseMillis=100", "-XX:+UseStringDeduplication", "-jar", "app.jar"]
+CMD ["/myjdk/bin/java", "-server", "-XX:+UnlockExperimentalVMOptions", "-Xms64m", "-Xmx256m", "-XX:+UseG1GC", "-XX:MaxGCPauseMillis=100", "-XX:+UseStringDeduplication", "-jar", "simplenotes.jar"]

app/src/main/kotlin/api/ApiUserController.kt

@@ -1,26 +0,0 @@
-package be.simplenotes.app.api
-
-import be.simplenotes.app.extensions.json
-import be.simplenotes.domain.usecases.UserService
-import be.simplenotes.domain.usecases.users.login.LoginForm
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.Json
-import org.http4k.core.Request
-import org.http4k.core.Response
-import org.http4k.core.Status
-
-class ApiUserController(private val userService: UserService, private val json: Json) {
-
-    fun login(request: Request): Response {
-        val form = json.decodeFromString(LoginForm.serializer(), request.bodyString())
-        val result = userService.login(form)
-        return result.fold({
-            Response(Status.BAD_REQUEST)
-        }, {
-            Response(Status.OK).json(json.encodeToString(Token.serializer(), Token(it)))
-        })
-    }
-}
-
-@Serializable
-data class Token(val token: String)

app/src/main/kotlin/extensions/Http4kExtensions.kt

@@ -1,17 +0,0 @@
-package be.simplenotes.app.extensions
-
-import org.http4k.core.Request
-import org.http4k.core.Response
-import org.http4k.core.Status.Companion.FOUND
-import org.http4k.core.Status.Companion.MOVED_PERMANENTLY
-
-fun Response.html(html: String) = body(html)
-    .header("Content-Type", "text/html; charset=utf-8")
-    .header("Cache-Control", "no-cache")
-
-fun Response.json(json: String) = body(json).header("Content-Type", "application/json")
-
-fun Response.Companion.redirect(url: String, permanent: Boolean = false) =
-    Response(if (permanent) MOVED_PERMANENTLY else FOUND).header("Location", url)
-
-fun Request.isSecure() = header("X-Forwarded-Proto")?.contains("https") ?: false

app/src/test/kotlin/Empty.kt

@@ -1 +0,0 @@
-package be.simplenotes.app

css/package.json

@@ -2,8 +2,8 @@
     "name": "css",
     "version": "1.0.0",
     "scripts": {
-        "css": "NODE_ENV=dev MANIFEST=../app/src/main/resources/css-manifest.json postcss build src/styles.pcss --output ../app/src/main/resources/static/styles.css",
-        "css-purge": "NODE_ENV=production  MANIFEST=../app/src/main/resources/css-manifest.json postcss build src/styles.pcss --output ../app/src/main/resources/static/styles.css"
+        "css": "NODE_ENV=dev MANIFEST=../simplenotes-app/src/main/resources/css-manifest.json postcss build src/styles.pcss --output ../simplenotes-app/src/main/resources/static/styles.css",
+        "css-purge": "NODE_ENV=production  MANIFEST=../simplenotes-app/src/main/resources/css-manifest.json postcss build src/styles.pcss --output ../simplenotes-app/src/main/resources/static/styles.css"
     },
     "dependencies": {
         "autoprefixer": "^9.8.6",

css/tailwind.config.js

@@ -1,7 +1,7 @@
 module.exports = {
     purge: {
         content: [
-            '../app/src/main/kotlin/views/**/*.kt'
+            '../simplenotes-app/src/main/kotlin/be/simplenotes/app/views/**/*.kt'
         ]
     },
     theme: {

deploy-docker-hub.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-rm app/src/main/resources/css-manifest.json
-rm app/src/main/resources/static/styles*
+rm simplenotes-app/src/main/resources/css-manifest.json
+rm simplenotes-app/src/main/resources/static/styles*
 
 yarn --cwd css run css-purge \
     && docker build -t hubv/simplenotes:latest . \

domain/src/test/kotlin/Empty.kt

@@ -1,5 +0,0 @@
-package be.simplenotes.domain
-
-/**
- * Empty file @see [root-package-declaration](https://discuss.kotlinlang.org/t/root-package-declaration-to-reduce-folder-clutter/2247/4)
- */

persistance/src/test/kotlin/Empty.kt

@@ -1 +0,0 @@
-package be.simplenotes.persistance

pom.xml

@@ -4,15 +4,17 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>be.simplenotes</groupId>
-    <artifactId>parent</artifactId>
+    <artifactId>simplenotes-parent</artifactId>
     <version>1.0-SNAPSHOT</version>
 
     <modules>
-        <module>persistance</module>
-        <module>app</module>
-        <module>domain</module>
-        <module>shared</module>
-        <module>search</module>
+        <module>simplenotes-persistance</module>
+        <module>simplenotes-app</module>
+        <module>simplenotes-domain</module>
+        <module>simplenotes-search</module>
+        <module>simplenotes-types</module>
+        <module>simplenotes-config</module>
+        <module>simplenotes-test-resources</module>
     </modules>
 
     <packaging>pom</packaging>
@@ -29,6 +31,8 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <kotlin.compiler.jvmTarget>${java.version}</kotlin.compiler.jvmTarget>
+
+        <org.mapstruct.version>1.4.1.Final</org.mapstruct.version>
     </properties>
 
     <dependencies>
@@ -99,6 +103,21 @@
                 <groupId>org.jetbrains.kotlin</groupId>
                 <version>${kotlin.version}</version>
                 <executions>
+                    <execution>
+                        <id>kapt</id>
+                        <goals>
+                            <goal>kapt</goal>
+                        </goals>
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <annotationProcessorPath>
+                                    <groupId>org.mapstruct</groupId>
+                                    <artifactId>mapstruct-processor</artifactId>
+                                    <version>${org.mapstruct.version}</version>
+                                </annotationProcessorPath>
+                            </annotationProcessorPaths>
+                        </configuration>
+                    </execution>
                     <execution>
                         <id>compile</id>
                         <phase>process-sources</phase>
@@ -162,7 +181,7 @@
             <dependency>
                 <groupId>io.arrow-kt</groupId>
                 <artifactId>arrow-core</artifactId>
-                <version>0.10.5</version>
+                <version>0.11.0</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
@@ -181,6 +200,12 @@
                 <version>3.0.0</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.mapstruct</groupId>
+                <artifactId>mapstruct</artifactId>
+                <version>${org.mapstruct.version}</version>
+            </dependency>
+
             <!-- region tests -->
             <dependency>
                 <groupId>org.junit.jupiter</groupId>

shared/src/test/kotlin/Empty.kt

@@ -1 +0,0 @@
-package be.simplenotes.shared

simplenotes-app/pom.xml

@@ -2,13 +2,13 @@
 <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>parent</artifactId>
+        <artifactId>simplenotes-parent</artifactId>
         <groupId>be.simplenotes</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>app</artifactId>
+    <artifactId>simplenotes-app</artifactId>
 
     <properties>
         <http4k.version>3.268.0</http4k.version>
@@ -17,38 +17,54 @@
     <dependencies>
         <dependency>
             <groupId>be.simplenotes</groupId>
-            <artifactId>persistance</artifactId>
+            <artifactId>simplenotes-persistance</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>be.simplenotes</groupId>
-            <artifactId>search</artifactId>
+            <artifactId>simplenotes-search</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>be.simplenotes</groupId>
-            <artifactId>domain</artifactId>
+            <artifactId>simplenotes-domain</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>be.simplenotes</groupId>
-            <artifactId>shared</artifactId>
+            <artifactId>simplenotes-config</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.http4k</groupId>
             <artifactId>http4k-core</artifactId>
         </dependency>
+
+        <!--
         <dependency>
             <groupId>org.http4k</groupId>
             <artifactId>http4k-server-jetty</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.eclipse.jetty.websocket</groupId>
-                    <artifactId>javax-websocket-server-impl</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
+        -->
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
+            <version>9.4.32.v20200930</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-servlet</artifactId>
+            <version>9.4.32.v20200930</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>4.0.1</version>
+            <scope>compile</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.jetbrains.kotlinx</groupId>
             <artifactId>kotlinx-html-jvm</artifactId>
@@ -81,7 +97,7 @@
 
         <dependency>
             <groupId>be.simplenotes</groupId>
-            <artifactId>shared</artifactId>
+            <artifactId>simplenotes-test-resources</artifactId>
             <version>1.0-SNAPSHOT</version>
             <type>test-jar</type>
             <scope>test</scope>

simplenotes-app/src/main/kotlin/be/simplenotes/app/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
 

simplenotes-app/src/main/kotlin/be/simplenotes/app/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,

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

@@ -1,55 +1,46 @@
 package be.simplenotes.app.api
 
-import be.simplenotes.app.extensions.json
+import be.simplenotes.app.extensions.auto
 import be.simplenotes.app.utils.parseSearchTerms
-import be.simplenotes.domain.model.PersistedNote
-import be.simplenotes.domain.model.PersistedNoteMetadata
+import be.simplenotes.types.PersistedNote
+import be.simplenotes.types.PersistedNoteMetadata
 import be.simplenotes.domain.security.JwtPayload
 import be.simplenotes.domain.usecases.NoteService
 import kotlinx.serialization.Contextual
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.json.Json
 import org.http4k.core.Request
 import org.http4k.core.Response
 import org.http4k.core.Status.Companion.BAD_REQUEST
 import org.http4k.core.Status.Companion.NOT_FOUND
 import org.http4k.core.Status.Companion.OK
-import org.http4k.routing.path
+import org.http4k.lens.Path
+import org.http4k.lens.uuid
 import java.util.*
 
 class ApiNoteController(private val noteService: NoteService, private val json: Json) {
 
     fun createNote(request: Request, jwtPayload: JwtPayload): Response {
-        val content = json.decodeFromString(NoteContent.serializer(), request.bodyString()).content
+        val content = noteContentLens(request)
         return noteService.create(jwtPayload.userId, content).fold(
-            {
-                Response(BAD_REQUEST)
-            },
-            {
-                Response(OK).json(json.encodeToString(UuidContent.serializer(), UuidContent(it.uuid)))
-            }
+            { Response(BAD_REQUEST) },
+            { uuidContentLens(UuidContent(it.uuid), Response(OK)) }
         )
     }
 
     fun notes(request: Request, jwtPayload: JwtPayload): Response {
         val notes = noteService.paginatedNotes(jwtPayload.userId, page = 1).notes
-        val json = json.encodeToString(ListSerializer(PersistedNoteMetadata.serializer()), notes)
-        return Response(OK).json(json)
+        return persistedNotesMetadataLens(notes, Response(OK))
     }
 
-    fun note(request: Request, jwtPayload: JwtPayload): Response {
-        val uuid = request.path("uuid")!!
-
-        return noteService.find(jwtPayload.userId, UUID.fromString(uuid))
-            ?.let { Response(OK).json(json.encodeToString(PersistedNote.serializer(), it)) }
+    fun note(request: Request, jwtPayload: JwtPayload): Response =
+        noteService.find(jwtPayload.userId, uuidLens(request))
+            ?.let { persistedNoteLens(it, Response(OK)) }
             ?: Response(NOT_FOUND)
-    }
 
     fun update(request: Request, jwtPayload: JwtPayload): Response {
-        val uuid = UUID.fromString(request.path("uuid")!!)
-        val content = json.decodeFromString(NoteContent.serializer(), request.bodyString()).content
-        return noteService.update(jwtPayload.userId, uuid, content).fold({
+        val content = noteContentLens(request)
+        return noteService.update(jwtPayload.userId, uuidLens(request), content).fold({
             Response(BAD_REQUEST)
         }, {
             if (it == null) Response(NOT_FOUND)
@@ -58,13 +49,19 @@ class ApiNoteController(private val noteService: NoteService, private val json:
     }
 
     fun search(request: Request, jwtPayload: JwtPayload): Response {
-        val query = json.decodeFromString(SearchContent.serializer(), request.bodyString()).query
+        val query = searchContentLens(request)
         val terms = parseSearchTerms(query)
         val notes = noteService.search(jwtPayload.userId, terms)
-        val json = json.encodeToString(ListSerializer(PersistedNoteMetadata.serializer()), notes)
-        return Response(OK).json(json)
+        return persistedNotesMetadataLens(notes, Response(OK))
     }
 
+    private val uuidContentLens = json.auto<UuidContent>().toLens()
+    private val noteContentLens = json.auto<NoteContent>().map { it.content }.toLens()
+    private val searchContentLens = json.auto<SearchContent>().map { it.query }.toLens()
+    private val persistedNotesMetadataLens = json.auto<List<PersistedNoteMetadata>>().toLens()
+    private val persistedNoteLens = json.auto<PersistedNote>().toLens()
+    private val uuidLens = Path.uuid().of("uuid")
+
 }
 
 @Serializable

simplenotes-app/src/main/kotlin/be/simplenotes/app/api/ApiUserController.kt

@@ -0,0 +1,26 @@
+package be.simplenotes.app.api
+
+import be.simplenotes.app.extensions.auto
+import be.simplenotes.domain.usecases.UserService
+import be.simplenotes.domain.usecases.users.login.LoginForm
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.Json
+import org.http4k.core.Request
+import org.http4k.core.Response
+import org.http4k.core.Status.Companion.BAD_REQUEST
+import org.http4k.core.Status.Companion.OK
+
+class ApiUserController(private val userService: UserService, private val json: Json) {
+    private val tokenLens = json.auto<Token>().toLens()
+    private val loginFormLens = json.auto<LoginForm>().toLens()
+
+    fun login(request: Request) = userService
+        .login(loginFormLens(request))
+        .fold(
+            { Response(BAD_REQUEST) },
+            { tokenLens(Token(it), Response(OK)) }
+        )
+}
+
+@Serializable
+data class Token(val token: String)

simplenotes-app/src/main/kotlin/be/simplenotes/app/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

simplenotes-app/src/main/kotlin/be/simplenotes/app/extensions/Http4kExtensions.kt

@@ -0,0 +1,35 @@
+package be.simplenotes.app.extensions
+
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import org.http4k.asString
+import org.http4k.core.Body
+import org.http4k.core.ContentType
+import org.http4k.core.Request
+import org.http4k.core.Response
+import org.http4k.core.Status.Companion.FOUND
+import org.http4k.core.Status.Companion.MOVED_PERMANENTLY
+import org.http4k.lens.*
+
+fun Response.html(html: String) = body(html)
+    .header("Content-Type", "text/html; charset=utf-8")
+    .header("Cache-Control", "no-cache")
+
+fun Response.Companion.redirect(url: String, permanent: Boolean = false) =
+    Response(if (permanent) MOVED_PERMANENTLY else FOUND).header("Location", url)
+
+fun Request.isSecure() = header("X-Forwarded-Proto")?.contains("https") ?: false
+
+val bodyLens = httpBodyRoot(
+    listOf(Meta(true, "body", ParamMeta.ObjectParam, "body")),
+    ContentType.APPLICATION_JSON.withNoDirectives(), ContentNegotiation.StrictNoDirective
+).map(
+    { it.payload.asString() },
+    { Body(it) }
+)
+
+inline fun <reified T> Json.auto(): BiDiBodyLensSpec<T> = bodyLens.map(
+    { decodeFromString(it) },
+    { encodeToString(it) }
+)

simplenotes-app/src/main/kotlin/be/simplenotes/app/jetty/Jetty.kt

@@ -0,0 +1,40 @@
+package be.simplenotes.app.jetty
+
+import org.eclipse.jetty.server.Server
+import org.eclipse.jetty.server.ServerConnector
+import org.eclipse.jetty.servlet.ServletContextHandler
+import org.eclipse.jetty.servlet.ServletContextHandler.SESSIONS
+import org.eclipse.jetty.servlet.ServletHolder
+import org.http4k.core.HttpHandler
+import org.http4k.server.Http4kServer
+import org.http4k.server.ServerConfig
+import org.http4k.servlet.asServlet
+
+class Jetty(private val port: Int, private val server: Server) : ServerConfig {
+    constructor(port: Int = 8000) : this(port, http(port))
+    constructor(port: Int, vararg inConnectors: ConnectorBuilder) : this(port, Server().apply {
+        inConnectors.forEach { addConnector(it(this)) }
+    })
+
+    override fun toServer(httpHandler: HttpHandler): Http4kServer {
+        server.insertHandler(httpHandler.toJettyHandler())
+
+        return object : Http4kServer {
+            override fun start(): Http4kServer = apply {
+                server.start()
+            }
+
+            override fun stop(): Http4kServer = apply { server.stop() }
+
+            override fun port(): Int = if (port > 0) port else server.uri.port
+        }
+    }
+}
+
+fun HttpHandler.toJettyHandler() = ServletContextHandler(SESSIONS).apply {
+    addServlet(ServletHolder(this@toJettyHandler.asServlet()), "/*")
+}
+
+typealias ConnectorBuilder = (Server) -> ServerConnector
+
+fun http(httpPort: Int): ConnectorBuilder = { server: Server -> ServerConnector(server).apply { port = httpPort } }

simplenotes-app/src/main/kotlin/be/simplenotes/app/modules/ServerModule.kt

@@ -5,17 +5,17 @@ import be.simplenotes.app.filters.AuthFilter
 import be.simplenotes.app.filters.AuthType
 import be.simplenotes.app.filters.ErrorFilter
 import be.simplenotes.app.filters.TransactionFilter
+import be.simplenotes.app.jetty.ConnectorBuilder
+import be.simplenotes.app.jetty.Jetty
 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
 import org.http4k.routing.RoutingHttpHandler
-import org.http4k.server.ConnectorBuilder
-import org.http4k.server.Jetty
 import org.http4k.server.asServer
 import org.koin.core.qualifier.named
 import org.koin.core.qualifier.qualifier

simplenotes-app/src/main/kotlin/be/simplenotes/app/utils/SearchTermsParser.kt

@@ -1,6 +1,6 @@
 package be.simplenotes.app.utils
 
-import be.simplenotes.domain.usecases.search.SearchTerms
+import be.simplenotes.search.SearchTerms
 
 private fun innerRegex(name: String) =
     """$name:['"](.*?)['"]""".toRegex()

simplenotes-app/src/main/kotlin/be/simplenotes/app/views/BaseView.kt

@@ -13,7 +13,7 @@ class BaseView(staticFileResolver: StaticFileResolver) : View(staticFileResolver
     ) {
         section("text-center my-2 p-2") {
             h1("text-5xl casual") {
-                span("text-teal-300") { +"Simplenotes " }
+                span("text-teal-300") { +"SimpleNotes " }
                 +"- access your notes anywhere"
             }
         }

simplenotes-app/src/main/kotlin/be/simplenotes/app/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.domain.model.PersistedNoteMetadata
+import be.simplenotes.types.PersistedNote
+import be.simplenotes.types.PersistedNoteMetadata
 import be.simplenotes.domain.security.JwtPayload
 import io.konform.validation.ValidationError
 import kotlinx.html.*
@@ -143,7 +143,6 @@ class NoteView(staticFileResolver: StaticFileResolver) : View(staticFileResolver
             }
             if (!shared) {
                 noteActionForm(note)
-                publicPrivateForm(note)
 
                 if (note.public) {
                     p("my-4") {
@@ -166,12 +165,29 @@ class NoteView(staticFileResolver: StaticFileResolver) : View(staticFileResolver
     }
 
     private fun DIV.noteActionForm(note: PersistedNote) {
-        span("flex space-x-2 justify-end mb-4") {
+        form(method = FormMethod.post, classes = "inline flex space-x-2 justify-end mb-4") {
             a(
                 href = "/notes/${note.uuid}/edit",
-                classes = "btn btn-teal"
+                classes = "btn btn-green"
             ) { +"Edit" }
-            form(method = FormMethod.post, classes = "inline") {
+            span {
+                button(
+                    type = ButtonType.submit,
+                    name = if (note.public) "private" else "public",
+                    classes = "font-semibold border-b-4 ${if (note.public) "border-teal-200" else "border-green-500"}" +
+                        " p-2 rounded-l bg-teal-200 text-gray-800"
+                ) {
+                    +"Private"
+                }
+                button(
+                    type = ButtonType.submit,
+                    name = if (note.public) "private" else "public",
+                    classes = "font-semibold border-b-4 ${if (!note.public) "border-teal-200" else "border-green-500"}" +
+                        " p-2 rounded-r bg-teal-200 text-gray-800"
+                ) {
+                    +"Public"
+                }
+            }
             button(
                 type = ButtonType.submit,
                 name = "delete",
@@ -180,22 +196,3 @@ class NoteView(staticFileResolver: StaticFileResolver) : View(staticFileResolver
         }
     }
 }
-
-    private fun DIV.publicPrivateForm(note: PersistedNote) {
-        span("flex space-x-2 justify-end mb-4") {
-
-            form(method = FormMethod.post, classes = "ml-auto ") {
-                button(
-                    type = ButtonType.submit,
-                    name = if (note.public) "private" else "public",
-                    classes = "btn btn-teal"
-                ) {
-                    if (note.public)
-                        +"This note is public, do you want to make it private ?"
-                    else
-                        +"This note is private, do you want to make it public ?"
-                }
-            }
-        }
-    }
-}

simplenotes-app/src/main/kotlin/be/simplenotes/app/views/SettingView.kt

@@ -26,22 +26,23 @@ class SettingView(staticFileResolver: StaticFileResolver) : View(staticFileResol
                 }
             }
 
-            section("m-4 p-4 bg-gray-800 rounded flex justify-around") {
+            section("m-4 p-2 bg-gray-800 rounded flex flex-wrap justify-around items-end") {
 
-                form(method = FormMethod.post, action = "/export") {
+                form(classes = "m-2", method = FormMethod.post, action = "/export") {
                     button(name = "display",
                         classes = "inline btn btn-teal block",
                         type = submit) { +"Display my data" }
                 }
 
-                form(method = FormMethod.post, action = "/export") {
+                form(classes = "m-2", method = FormMethod.post, action = "/export") {
 
-                    listOf("json", "zip").forEach { format ->
                     div {
+                        listOf("json", "zip").forEach { format ->
                             radioInput(name = "format") {
                                 id = format
                                 attributes["value"] = format
                                 if (format == "json") attributes["checked"] = ""
+                                else attributes["class"] = "ml-4"
                             }
                             label(classes = "ml-2") {
                                 attributes["for"] = format

simplenotes-app/src/main/kotlin/be/simplenotes/app/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
@@ -25,8 +25,8 @@ fun FlowContent.deletedNoteTable(notes: List<PersistedNoteMetadata>) = div("over
                     td("text-center") { +updatedAt.toTimeAgo() }
                     td { tags(tags) }
                     td("text-center") {
-                        form(classes = "inline", method = post, action = "/notes/deleted/$uuid") {
-                            button(classes = "btn btn-red", type = submit, name = "delete") {
+                        form(method = post, action = "/notes/deleted/$uuid") {
+                            button(classes = "btn btn-red mb-2", type = submit, name = "delete") {
                                 +"Delete permanently"
                             }
                             button(classes = "ml-2 btn btn-green", type = submit, name = "restore") {

simplenotes-app/src/main/kotlin/be/simplenotes/app/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-app/src/test/kotlin/be/simplenotes/app/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

simplenotes-app/src/test/kotlin/be/simplenotes/app/utils/SearchTermsParserKtTest.kt

@@ -1,6 +1,6 @@
 package be.simplenotes.app.utils
 
-import be.simplenotes.domain.usecases.search.SearchTerms
+import be.simplenotes.search.SearchTerms
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.MethodSource

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>

simplenotes-config/src/main/kotlin/be/simplenotes/config/Config.kt

@@ -1,4 +1,4 @@
-package be.simplenotes.shared.config
+package be.simplenotes.config
 
 import java.util.concurrent.TimeUnit
 

simplenotes-domain/pom.xml

@@ -2,36 +2,38 @@
 <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>parent</artifactId>
+        <artifactId>simplenotes-parent</artifactId>
         <groupId>be.simplenotes</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>domain</artifactId>
+    <artifactId>simplenotes-domain</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>be.simplenotes</groupId>
-            <artifactId>shared</artifactId>
+            <artifactId>simplenotes-config</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>be.simplenotes</groupId>
-            <artifactId>shared</artifactId>
+            <artifactId>simplenotes-test-resources</artifactId>
             <version>1.0-SNAPSHOT</version>
             <type>test-jar</type>
             <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 +85,29 @@
             <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>
+        <dependency>
+            <groupId>be.simplenotes</groupId>
+            <artifactId>simplenotes-persistance</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>be.simplenotes</groupId>
+            <artifactId>simplenotes-search</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>

simplenotes-domain/src/main/kotlin/be/simplenotes/domain/security/HtmlSanitizer.kt

@@ -2,7 +2,7 @@ package be.simplenotes.domain.security
 
 import org.owasp.html.HtmlPolicyBuilder
 
-object HtmlSanitizer {
+internal object HtmlSanitizer {
     private val htmlPolicy = HtmlPolicyBuilder()
         .allowElements("a")
         .allowCommonBlockElements()

simplenotes-domain/src/main/kotlin/be/simplenotes/domain/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/be/simplenotes/domain/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

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

@@ -2,16 +2,16 @@ package be.simplenotes.domain.usecases
 
 import arrow.core.Either
 import arrow.core.extensions.fx
-import be.simplenotes.domain.model.Note
-import be.simplenotes.domain.model.PersistedNote
-import be.simplenotes.domain.model.PersistedNoteMetadata
+import be.simplenotes.types.Note
+import be.simplenotes.types.PersistedNote
+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
-import be.simplenotes.domain.usecases.repositories.NoteRepository
-import be.simplenotes.domain.usecases.repositories.UserRepository
-import be.simplenotes.domain.usecases.search.NoteSearcher
-import be.simplenotes.domain.usecases.search.SearchTerms
+import be.simplenotes.persistance.repositories.NoteRepository
+import be.simplenotes.persistance.repositories.UserRepository
+import be.simplenotes.search.NoteSearcher
+import be.simplenotes.search.SearchTerms
 import java.util.*
 
 class NoteService(

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

@@ -1,7 +1,7 @@
 package be.simplenotes.domain.usecases.export
 
-import be.simplenotes.domain.model.ExportedNote
-import be.simplenotes.domain.usecases.repositories.NoteRepository
+import be.simplenotes.types.ExportedNote
+import be.simplenotes.persistance.repositories.NoteRepository
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.json.Json
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry

simplenotes-domain/src/main/kotlin/be/simplenotes/domain/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/be/simplenotes/domain/usecases/users/delete/DeleteUseCaseImpl.kt

@@ -4,9 +4,9 @@ import arrow.core.Either
 import arrow.core.extensions.fx
 import arrow.core.rightIfNotNull
 import be.simplenotes.domain.security.PasswordHash
-import be.simplenotes.domain.usecases.repositories.UserRepository
-import be.simplenotes.domain.usecases.search.NoteSearcher
+import be.simplenotes.persistance.repositories.UserRepository
 import be.simplenotes.domain.validation.UserValidations
+import be.simplenotes.search.NoteSearcher
 
 internal class DeleteUseCaseImpl(
     private val userRepository: UserRepository,

simplenotes-domain/src/main/kotlin/be/simplenotes/domain/usecases/users/login/LoginUseCaseImpl.kt

@@ -7,8 +7,8 @@ import arrow.core.rightIfNotNull
 import be.simplenotes.domain.security.JwtPayload
 import be.simplenotes.domain.security.PasswordHash
 import be.simplenotes.domain.security.SimpleJwt
-import be.simplenotes.domain.usecases.repositories.UserRepository
 import be.simplenotes.domain.validation.UserValidations
+import be.simplenotes.persistance.repositories.UserRepository
 
 internal class LoginUseCaseImpl(
     private val userRepository: UserRepository,

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

@@ -3,10 +3,10 @@ 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
+import be.simplenotes.persistance.repositories.UserRepository
 
 internal class RegisterUseCaseImpl(
     private val userRepository: UserRepository,

simplenotes-domain/src/main/kotlin/be/simplenotes/domain/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/be/simplenotes/domain/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/be/simplenotes/domain/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/be/simplenotes/domain/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

simplenotes-domain/src/test/kotlin/be/simplenotes/domain/testutils/ArrowAssertions.kt

@@ -1,4 +1,4 @@
-package be.simplenotes.shared.testutils.assertions
+package be.simplenotes.domain.testutils
 
 import arrow.core.Either
 import com.natpryce.hamkrest.MatchResult

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

@@ -1,12 +1,12 @@
 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
-import be.simplenotes.shared.config.JwtConfig
-import be.simplenotes.shared.testutils.assertions.isLeftOfType
-import be.simplenotes.shared.testutils.assertions.isRight
+import be.simplenotes.persistance.repositories.UserRepository
+import be.simplenotes.config.JwtConfig
+import be.simplenotes.domain.testutils.isLeftOfType
+import be.simplenotes.domain.testutils.isRight
 import com.natpryce.hamkrest.assertion.assertThat
 import io.mockk.*
 import org.junit.jupiter.api.BeforeEach