diff --git a/app/test/filters/RequiredAuthFilterTest.kt b/app/test/filters/RequiredAuthFilterTest.kt index 01db86c..e035026 100644 --- a/app/test/filters/RequiredAuthFilterTest.kt +++ b/app/test/filters/RequiredAuthFilterTest.kt @@ -106,7 +106,7 @@ internal class RequiredAuthFilterTest { } @Test - fun `it should allow a valid token"`() { + fun `it should allow a valid token`() { val jwtPayload = LoggedInUser(1, "user") val token = simpleJwt.sign(jwtPayload) val response = app(Request(GET, "/protected").cookie("Bearer", token)) diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts index c0f639c..9561739 100644 --- a/domain/build.gradle.kts +++ b/domain/build.gradle.kts @@ -10,7 +10,7 @@ plugins { dependencies { api(project(":config")) api(project(":types")) - implementation(project(":persistance")) + implementation(project(":persistence")) implementation(project(":search")) api(Libs.arrowCoreData) diff --git a/domain/src/usecases/HealthCheckService.kt b/domain/src/usecases/HealthCheckService.kt index f74b9e8..fc144e7 100644 --- a/domain/src/usecases/HealthCheckService.kt +++ b/domain/src/usecases/HealthCheckService.kt @@ -1,6 +1,6 @@ package be.simplenotes.domain.usecases -import be.simplenotes.persistance.DbHealthCheck +import be.simplenotes.persistence.DbHealthCheck import javax.inject.Singleton interface HealthCheckService { diff --git a/domain/src/usecases/NoteService.kt b/domain/src/usecases/NoteService.kt index c49d298..158f2fd 100644 --- a/domain/src/usecases/NoteService.kt +++ b/domain/src/usecases/NoteService.kt @@ -5,9 +5,9 @@ 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.search.parseSearchTerms -import be.simplenotes.persistance.repositories.NoteRepository -import be.simplenotes.persistance.repositories.UserRepository -import be.simplenotes.persistance.transactions.TransactionService +import be.simplenotes.persistence.repositories.NoteRepository +import be.simplenotes.persistence.repositories.UserRepository +import be.simplenotes.persistence.transactions.TransactionService import be.simplenotes.search.NoteSearcher import be.simplenotes.types.LoggedInUser import be.simplenotes.types.Note diff --git a/domain/src/usecases/export/ExportUseCaseImpl.kt b/domain/src/usecases/export/ExportUseCaseImpl.kt index 4eadc61..2c3bc76 100644 --- a/domain/src/usecases/export/ExportUseCaseImpl.kt +++ b/domain/src/usecases/export/ExportUseCaseImpl.kt @@ -1,6 +1,6 @@ package be.simplenotes.domain.usecases.export -import be.simplenotes.persistance.repositories.NoteRepository +import be.simplenotes.persistence.repositories.NoteRepository import be.simplenotes.types.ExportedNote import io.micronaut.context.annotation.Primary import kotlinx.serialization.builtins.ListSerializer diff --git a/domain/src/usecases/users/delete/DeleteUseCaseImpl.kt b/domain/src/usecases/users/delete/DeleteUseCaseImpl.kt index ee7d5c8..21ff619 100644 --- a/domain/src/usecases/users/delete/DeleteUseCaseImpl.kt +++ b/domain/src/usecases/users/delete/DeleteUseCaseImpl.kt @@ -5,8 +5,8 @@ import arrow.core.computations.either import arrow.core.rightIfNotNull import be.simplenotes.domain.security.PasswordHash import be.simplenotes.domain.validation.UserValidations -import be.simplenotes.persistance.repositories.UserRepository -import be.simplenotes.persistance.transactions.TransactionService +import be.simplenotes.persistence.repositories.UserRepository +import be.simplenotes.persistence.transactions.TransactionService import be.simplenotes.search.NoteSearcher import io.micronaut.context.annotation.Primary import javax.inject.Singleton diff --git a/domain/src/usecases/users/login/LoginUseCaseImpl.kt b/domain/src/usecases/users/login/LoginUseCaseImpl.kt index 17326cd..e30ece0 100644 --- a/domain/src/usecases/users/login/LoginUseCaseImpl.kt +++ b/domain/src/usecases/users/login/LoginUseCaseImpl.kt @@ -6,7 +6,7 @@ import arrow.core.rightIfNotNull import be.simplenotes.domain.security.PasswordHash import be.simplenotes.domain.security.SimpleJwt import be.simplenotes.domain.validation.UserValidations -import be.simplenotes.persistance.repositories.UserRepository +import be.simplenotes.persistence.repositories.UserRepository import be.simplenotes.types.LoggedInUser import io.micronaut.context.annotation.Primary import javax.inject.Singleton diff --git a/domain/src/usecases/users/register/RegisterUseCaseImpl.kt b/domain/src/usecases/users/register/RegisterUseCaseImpl.kt index 1986c31..6b3c87b 100644 --- a/domain/src/usecases/users/register/RegisterUseCaseImpl.kt +++ b/domain/src/usecases/users/register/RegisterUseCaseImpl.kt @@ -5,8 +5,8 @@ import arrow.core.filterOrElse import arrow.core.leftIfNull import be.simplenotes.domain.security.PasswordHash import be.simplenotes.domain.validation.UserValidations -import be.simplenotes.persistance.repositories.UserRepository -import be.simplenotes.persistance.transactions.TransactionService +import be.simplenotes.persistence.repositories.UserRepository +import be.simplenotes.persistence.transactions.TransactionService import be.simplenotes.types.PersistedUser import io.micronaut.context.annotation.Primary import javax.inject.Singleton diff --git a/domain/test/usecases/users/login/LoginUseCaseImplTest.kt b/domain/test/usecases/users/login/LoginUseCaseImplTest.kt index 180c5c4..bfe691b 100644 --- a/domain/test/usecases/users/login/LoginUseCaseImplTest.kt +++ b/domain/test/usecases/users/login/LoginUseCaseImplTest.kt @@ -6,7 +6,7 @@ import be.simplenotes.domain.security.SimpleJwt import be.simplenotes.domain.security.UserJwtMapper import be.simplenotes.domain.testutils.isLeftOfType import be.simplenotes.domain.testutils.isRight -import be.simplenotes.persistance.repositories.UserRepository +import be.simplenotes.persistence.repositories.UserRepository import be.simplenotes.types.PersistedUser import com.natpryce.hamkrest.assertion.assertThat import io.mockk.* diff --git a/domain/test/usecases/users/register/RegisterUseCaseImplTest.kt b/domain/test/usecases/users/register/RegisterUseCaseImplTest.kt index 840d2b1..1f35006 100644 --- a/domain/test/usecases/users/register/RegisterUseCaseImplTest.kt +++ b/domain/test/usecases/users/register/RegisterUseCaseImplTest.kt @@ -3,8 +3,8 @@ package be.simplenotes.domain.usecases.users.register import be.simplenotes.domain.security.BcryptPasswordHash import be.simplenotes.domain.testutils.isLeftOfType import be.simplenotes.domain.testutils.isRight -import be.simplenotes.persistance.repositories.UserRepository -import be.simplenotes.persistance.transactions.TransactionService +import be.simplenotes.persistence.repositories.UserRepository +import be.simplenotes.persistence.transactions.TransactionService import be.simplenotes.types.PersistedUser import com.natpryce.hamkrest.assertion.assertThat import com.natpryce.hamkrest.equalTo diff --git a/persistance/build.gradle.kts b/persistence/build.gradle.kts similarity index 96% rename from persistance/build.gradle.kts rename to persistence/build.gradle.kts index d6254a4..102d789 100644 --- a/persistance/build.gradle.kts +++ b/persistence/build.gradle.kts @@ -33,7 +33,7 @@ dependencies { testFixturesImplementation(project(":types")) testFixturesImplementation(project(":config")) - testFixturesImplementation(project(":persistance")) + testFixturesImplementation(project(":persistence")) testFixturesImplementation(Libs.Test.faker) { exclude(group = "org.yaml") diff --git a/persistance/resources/db/migration/mariadb/V1__Create_tables.sql b/persistence/resources/db/migration/mariadb/V1__Create_tables.sql similarity index 100% rename from persistance/resources/db/migration/mariadb/V1__Create_tables.sql rename to persistence/resources/db/migration/mariadb/V1__Create_tables.sql diff --git a/persistance/resources/db/migration/mariadb/V2__Add_deleted_column.sql b/persistence/resources/db/migration/mariadb/V2__Add_deleted_column.sql similarity index 100% rename from persistance/resources/db/migration/mariadb/V2__Add_deleted_column.sql rename to persistence/resources/db/migration/mariadb/V2__Add_deleted_column.sql diff --git a/persistance/resources/db/migration/mariadb/V3__Add_public_column.sql b/persistence/resources/db/migration/mariadb/V3__Add_public_column.sql similarity index 100% rename from persistance/resources/db/migration/mariadb/V3__Add_public_column.sql rename to persistence/resources/db/migration/mariadb/V3__Add_public_column.sql diff --git a/persistance/resources/db/migration/other/V1__Create_tables.sql b/persistence/resources/db/migration/other/V1__Create_tables.sql similarity index 100% rename from persistance/resources/db/migration/other/V1__Create_tables.sql rename to persistence/resources/db/migration/other/V1__Create_tables.sql diff --git a/persistance/resources/db/migration/other/V2__Add_deleted_column.sql b/persistence/resources/db/migration/other/V2__Add_deleted_column.sql similarity index 100% rename from persistance/resources/db/migration/other/V2__Add_deleted_column.sql rename to persistence/resources/db/migration/other/V2__Add_deleted_column.sql diff --git a/persistance/resources/db/migration/other/V3__Add_public_column.sql b/persistence/resources/db/migration/other/V3__Add_public_column.sql similarity index 100% rename from persistance/resources/db/migration/other/V3__Add_public_column.sql rename to persistence/resources/db/migration/other/V3__Add_public_column.sql diff --git a/persistance/src/HealthCheck.kt b/persistence/src/HealthCheck.kt similarity index 86% rename from persistance/src/HealthCheck.kt rename to persistence/src/HealthCheck.kt index 6c106a6..b966647 100644 --- a/persistance/src/HealthCheck.kt +++ b/persistence/src/HealthCheck.kt @@ -1,8 +1,8 @@ -package be.simplenotes.persistance +package be.simplenotes.persistence import be.simplenotes.config.DataSourceConfig -import be.simplenotes.persistance.utils.DbType -import be.simplenotes.persistance.utils.type +import be.simplenotes.persistence.utils.DbType +import be.simplenotes.persistence.utils.type import me.liuwj.ktorm.database.Database import me.liuwj.ktorm.database.asIterable import me.liuwj.ktorm.database.use diff --git a/persistance/src/Migrations.kt b/persistence/src/Migrations.kt similarity index 84% rename from persistance/src/Migrations.kt rename to persistence/src/Migrations.kt index 7681c15..0a32465 100644 --- a/persistance/src/Migrations.kt +++ b/persistence/src/Migrations.kt @@ -1,8 +1,8 @@ -package be.simplenotes.persistance +package be.simplenotes.persistence import be.simplenotes.config.DataSourceConfig -import be.simplenotes.persistance.utils.DbType -import be.simplenotes.persistance.utils.type +import be.simplenotes.persistence.utils.DbType +import be.simplenotes.persistence.utils.type import org.flywaydb.core.Flyway import javax.inject.Singleton import javax.sql.DataSource diff --git a/persistance/src/PersistanceModule.kt b/persistence/src/PersistenceModule.kt similarity index 94% rename from persistance/src/PersistanceModule.kt rename to persistence/src/PersistenceModule.kt index 132a9ed..ec33e35 100644 --- a/persistance/src/PersistanceModule.kt +++ b/persistence/src/PersistenceModule.kt @@ -1,4 +1,4 @@ -package be.simplenotes.persistance +package be.simplenotes.persistence import be.simplenotes.config.DataSourceConfig import com.zaxxer.hikari.HikariConfig @@ -10,7 +10,7 @@ import javax.inject.Singleton import javax.sql.DataSource @Factory -class PersistanceModule { +class PersistenceModule { @Singleton internal fun database(migrations: DbMigrations, dataSource: DataSource): Database { diff --git a/persistance/src/converters/NoteConverter.kt b/persistence/src/converters/NoteConverter.kt similarity index 96% rename from persistance/src/converters/NoteConverter.kt rename to persistence/src/converters/NoteConverter.kt index 43508ba..ec9e777 100644 --- a/persistance/src/converters/NoteConverter.kt +++ b/persistence/src/converters/NoteConverter.kt @@ -1,6 +1,6 @@ -package be.simplenotes.persistance.converters +package be.simplenotes.persistence.converters -import be.simplenotes.persistance.notes.NoteEntity +import be.simplenotes.persistence.notes.NoteEntity import be.simplenotes.types.* import me.liuwj.ktorm.entity.Entity import org.mapstruct.Mapper diff --git a/persistance/src/converters/UserConverter.kt b/persistence/src/converters/UserConverter.kt similarity index 87% rename from persistance/src/converters/UserConverter.kt rename to persistence/src/converters/UserConverter.kt index 6ad64e3..9071e6f 100644 --- a/persistance/src/converters/UserConverter.kt +++ b/persistence/src/converters/UserConverter.kt @@ -1,6 +1,6 @@ -package be.simplenotes.persistance.converters +package be.simplenotes.persistence.converters -import be.simplenotes.persistance.users.UserEntity +import be.simplenotes.persistence.users.UserEntity import be.simplenotes.types.PersistedUser import be.simplenotes.types.User import me.liuwj.ktorm.entity.Entity diff --git a/persistance/src/extensions/KtormExtensions.kt b/persistence/src/extensions/KtormExtensions.kt similarity index 95% rename from persistance/src/extensions/KtormExtensions.kt rename to persistence/src/extensions/KtormExtensions.kt index f2a6ba4..bf6cdc6 100644 --- a/persistance/src/extensions/KtormExtensions.kt +++ b/persistence/src/extensions/KtormExtensions.kt @@ -1,4 +1,4 @@ -package be.simplenotes.persistance.extensions +package be.simplenotes.persistence.extensions import me.liuwj.ktorm.schema.BaseTable import me.liuwj.ktorm.schema.SqlType diff --git a/persistance/src/notes/NoteRepositoryImpl.kt b/persistence/src/notes/NoteRepositoryImpl.kt similarity index 97% rename from persistance/src/notes/NoteRepositoryImpl.kt rename to persistence/src/notes/NoteRepositoryImpl.kt index 0bf9f3d..01d5d60 100644 --- a/persistance/src/notes/NoteRepositoryImpl.kt +++ b/persistence/src/notes/NoteRepositoryImpl.kt @@ -1,7 +1,7 @@ -package be.simplenotes.persistance.notes +package be.simplenotes.persistence.notes -import be.simplenotes.persistance.converters.NoteConverter -import be.simplenotes.persistance.repositories.NoteRepository +import be.simplenotes.persistence.converters.NoteConverter +import be.simplenotes.persistence.repositories.NoteRepository import be.simplenotes.types.ExportedNote import be.simplenotes.types.Note import be.simplenotes.types.PersistedNote diff --git a/persistance/src/notes/Notes.kt b/persistence/src/notes/Notes.kt similarity index 87% rename from persistance/src/notes/Notes.kt rename to persistence/src/notes/Notes.kt index a7b5c60..1237dfe 100644 --- a/persistance/src/notes/Notes.kt +++ b/persistence/src/notes/Notes.kt @@ -1,10 +1,10 @@ @file:Suppress("unused") -package be.simplenotes.persistance.notes +package be.simplenotes.persistence.notes -import be.simplenotes.persistance.extensions.uuidBinary -import be.simplenotes.persistance.users.UserEntity -import be.simplenotes.persistance.users.Users +import be.simplenotes.persistence.extensions.uuidBinary +import be.simplenotes.persistence.users.UserEntity +import be.simplenotes.persistence.users.Users import me.liuwj.ktorm.database.Database import me.liuwj.ktorm.entity.Entity import me.liuwj.ktorm.entity.sequenceOf diff --git a/persistance/src/notes/Tags.kt b/persistence/src/notes/Tags.kt similarity index 89% rename from persistance/src/notes/Tags.kt rename to persistence/src/notes/Tags.kt index c31c53a..609f7f1 100644 --- a/persistance/src/notes/Tags.kt +++ b/persistence/src/notes/Tags.kt @@ -1,6 +1,6 @@ -package be.simplenotes.persistance.notes +package be.simplenotes.persistence.notes -import be.simplenotes.persistance.extensions.uuidBinary +import be.simplenotes.persistence.extensions.uuidBinary import me.liuwj.ktorm.database.Database import me.liuwj.ktorm.entity.Entity import me.liuwj.ktorm.entity.sequenceOf diff --git a/persistance/src/repositories/NoteRepository.kt b/persistence/src/repositories/NoteRepository.kt similarity index 96% rename from persistance/src/repositories/NoteRepository.kt rename to persistence/src/repositories/NoteRepository.kt index a4edeac..40e9e88 100644 --- a/persistance/src/repositories/NoteRepository.kt +++ b/persistence/src/repositories/NoteRepository.kt @@ -1,4 +1,4 @@ -package be.simplenotes.persistance.repositories +package be.simplenotes.persistence.repositories import be.simplenotes.types.ExportedNote import be.simplenotes.types.Note diff --git a/persistance/src/repositories/UserRepository.kt b/persistence/src/repositories/UserRepository.kt similarity index 88% rename from persistance/src/repositories/UserRepository.kt rename to persistence/src/repositories/UserRepository.kt index f0abf52..0872b1a 100644 --- a/persistance/src/repositories/UserRepository.kt +++ b/persistence/src/repositories/UserRepository.kt @@ -1,4 +1,4 @@ -package be.simplenotes.persistance.repositories +package be.simplenotes.persistence.repositories import be.simplenotes.types.PersistedUser import be.simplenotes.types.User diff --git a/persistance/src/transactions/KtormTransactionService.kt b/persistence/src/transactions/KtormTransactionService.kt similarity index 84% rename from persistance/src/transactions/KtormTransactionService.kt rename to persistence/src/transactions/KtormTransactionService.kt index bbd18a9..37e03d3 100644 --- a/persistance/src/transactions/KtormTransactionService.kt +++ b/persistence/src/transactions/KtormTransactionService.kt @@ -1,4 +1,4 @@ -package be.simplenotes.persistance.transactions +package be.simplenotes.persistence.transactions import me.liuwj.ktorm.database.Database import javax.inject.Singleton diff --git a/persistance/src/transactions/TransactionService.kt b/persistence/src/transactions/TransactionService.kt similarity index 58% rename from persistance/src/transactions/TransactionService.kt rename to persistence/src/transactions/TransactionService.kt index 30a05ea..d87de66 100644 --- a/persistance/src/transactions/TransactionService.kt +++ b/persistence/src/transactions/TransactionService.kt @@ -1,4 +1,4 @@ -package be.simplenotes.persistance.transactions +package be.simplenotes.persistence.transactions interface TransactionService { fun use(block: () -> T): T diff --git a/persistance/src/users/UserRepositoryImpl.kt b/persistence/src/users/UserRepositoryImpl.kt similarity index 89% rename from persistance/src/users/UserRepositoryImpl.kt rename to persistence/src/users/UserRepositoryImpl.kt index 92c969d..8e50748 100644 --- a/persistance/src/users/UserRepositoryImpl.kt +++ b/persistence/src/users/UserRepositoryImpl.kt @@ -1,7 +1,7 @@ -package be.simplenotes.persistance.users +package be.simplenotes.persistence.users -import be.simplenotes.persistance.converters.UserConverter -import be.simplenotes.persistance.repositories.UserRepository +import be.simplenotes.persistence.converters.UserConverter +import be.simplenotes.persistence.repositories.UserRepository import be.simplenotes.types.PersistedUser import be.simplenotes.types.User import me.liuwj.ktorm.database.Database diff --git a/persistance/src/users/Users.kt b/persistence/src/users/Users.kt similarity index 95% rename from persistance/src/users/Users.kt rename to persistence/src/users/Users.kt index 2ebb042..81940e2 100644 --- a/persistance/src/users/Users.kt +++ b/persistence/src/users/Users.kt @@ -1,4 +1,4 @@ -package be.simplenotes.persistance.users +package be.simplenotes.persistence.users import me.liuwj.ktorm.database.Database import me.liuwj.ktorm.entity.Entity diff --git a/persistance/src/utils/DataSourceConfigUtils.kt b/persistence/src/utils/DataSourceConfigUtils.kt similarity index 81% rename from persistance/src/utils/DataSourceConfigUtils.kt rename to persistence/src/utils/DataSourceConfigUtils.kt index 36f4450..4c2236e 100644 --- a/persistance/src/utils/DataSourceConfigUtils.kt +++ b/persistence/src/utils/DataSourceConfigUtils.kt @@ -1,4 +1,4 @@ -package be.simplenotes.persistance.utils +package be.simplenotes.persistence.utils import be.simplenotes.config.DataSourceConfig diff --git a/persistance/test/DataSources.kt b/persistence/test/DataSources.kt similarity index 94% rename from persistance/test/DataSources.kt rename to persistence/test/DataSources.kt index a7fe074..7a75a2d 100644 --- a/persistance/test/DataSources.kt +++ b/persistence/test/DataSources.kt @@ -1,4 +1,4 @@ -package be.simplenotes.persistance +package be.simplenotes.persistence import be.simplenotes.config.DataSourceConfig import org.testcontainers.containers.MariaDBContainer diff --git a/persistance/test/DbHealthCheckImplTest.kt b/persistence/test/DbHealthCheckImplTest.kt similarity index 96% rename from persistance/test/DbHealthCheckImplTest.kt rename to persistence/test/DbHealthCheckImplTest.kt index 0032368..a590e4f 100644 --- a/persistance/test/DbHealthCheckImplTest.kt +++ b/persistence/test/DbHealthCheckImplTest.kt @@ -1,4 +1,4 @@ -package be.simplenotes.persistance +package be.simplenotes.persistence import be.simplenotes.config.DataSourceConfig import org.assertj.core.api.Assertions.assertThat diff --git a/persistance/test/DbTest.kt b/persistence/test/DbTest.kt similarity index 96% rename from persistance/test/DbTest.kt rename to persistence/test/DbTest.kt index cf065b0..5f76564 100644 --- a/persistance/test/DbTest.kt +++ b/persistence/test/DbTest.kt @@ -1,4 +1,4 @@ -package be.simplenotes.persistance +package be.simplenotes.persistence import be.simplenotes.config.DataSourceConfig import io.micronaut.context.BeanContext diff --git a/persistance/test/converters/NoteConverterTest.kt b/persistence/test/converters/NoteConverterTest.kt similarity index 98% rename from persistance/test/converters/NoteConverterTest.kt rename to persistence/test/converters/NoteConverterTest.kt index 72e0e94..3b3ec30 100644 --- a/persistance/test/converters/NoteConverterTest.kt +++ b/persistence/test/converters/NoteConverterTest.kt @@ -1,6 +1,6 @@ -package be.simplenotes.persistance.converters +package be.simplenotes.persistence.converters -import be.simplenotes.persistance.notes.NoteEntity +import be.simplenotes.persistence.notes.NoteEntity import be.simplenotes.types.* import io.micronaut.context.BeanContext import org.assertj.core.api.Assertions.assertThat diff --git a/persistance/test/converters/UserConverterTest.kt b/persistence/test/converters/UserConverterTest.kt similarity index 93% rename from persistance/test/converters/UserConverterTest.kt rename to persistence/test/converters/UserConverterTest.kt index 8e59050..c8707d9 100644 --- a/persistance/test/converters/UserConverterTest.kt +++ b/persistence/test/converters/UserConverterTest.kt @@ -1,6 +1,6 @@ -package be.simplenotes.persistance.converters +package be.simplenotes.persistence.converters -import be.simplenotes.persistance.users.UserEntity +import be.simplenotes.persistence.users.UserEntity import be.simplenotes.types.PersistedUser import be.simplenotes.types.User import io.micronaut.context.BeanContext diff --git a/persistance/test/notes/BaseNoteRepositoryImplTest.kt b/persistence/test/notes/BaseNoteRepositoryImplTest.kt similarity index 97% rename from persistance/test/notes/BaseNoteRepositoryImplTest.kt rename to persistence/test/notes/BaseNoteRepositoryImplTest.kt index 5855a68..a4fdae3 100644 --- a/persistance/test/notes/BaseNoteRepositoryImplTest.kt +++ b/persistence/test/notes/BaseNoteRepositoryImplTest.kt @@ -1,10 +1,10 @@ -package be.simplenotes.persistance.notes +package be.simplenotes.persistence.notes -import be.simplenotes.persistance.DbTest -import be.simplenotes.persistance.converters.NoteConverter -import be.simplenotes.persistance.repositories.NoteRepository -import be.simplenotes.persistance.repositories.UserRepository -import be.simplenotes.persistance.users.createFakeUser +import be.simplenotes.persistence.DbTest +import be.simplenotes.persistence.converters.NoteConverter +import be.simplenotes.persistence.repositories.NoteRepository +import be.simplenotes.persistence.repositories.UserRepository +import be.simplenotes.persistence.users.createFakeUser import be.simplenotes.types.ExportedNote import be.simplenotes.types.PersistedUser import me.liuwj.ktorm.database.Database diff --git a/persistance/test/notes/H2NoteRepositoryImplTests.kt b/persistence/test/notes/H2NoteRepositoryImplTests.kt similarity index 77% rename from persistance/test/notes/H2NoteRepositoryImplTests.kt rename to persistence/test/notes/H2NoteRepositoryImplTests.kt index 9b311f1..f371d2b 100644 --- a/persistance/test/notes/H2NoteRepositoryImplTests.kt +++ b/persistence/test/notes/H2NoteRepositoryImplTests.kt @@ -1,9 +1,9 @@ -package be.simplenotes.persistance.notes +package be.simplenotes.persistence.notes import be.simplenotes.config.DataSourceConfig -import be.simplenotes.persistance.KMariadbContainer -import be.simplenotes.persistance.h2dataSourceConfig -import be.simplenotes.persistance.mariadbDataSourceConfig +import be.simplenotes.persistence.KMariadbContainer +import be.simplenotes.persistence.h2dataSourceConfig +import be.simplenotes.persistence.mariadbDataSourceConfig import org.junit.jupiter.api.AfterAll import org.junit.jupiter.api.parallel.ResourceLock diff --git a/persistance/test/users/BaseUserRepositoryImplTest.kt b/persistence/test/users/BaseUserRepositoryImplTest.kt similarity index 94% rename from persistance/test/users/BaseUserRepositoryImplTest.kt rename to persistence/test/users/BaseUserRepositoryImplTest.kt index 8f4973d..82ee254 100644 --- a/persistance/test/users/BaseUserRepositoryImplTest.kt +++ b/persistence/test/users/BaseUserRepositoryImplTest.kt @@ -1,7 +1,7 @@ -package be.simplenotes.persistance.users +package be.simplenotes.persistence.users -import be.simplenotes.persistance.DbTest -import be.simplenotes.persistance.repositories.UserRepository +import be.simplenotes.persistence.DbTest +import be.simplenotes.persistence.repositories.UserRepository import me.liuwj.ktorm.database.Database import me.liuwj.ktorm.dsl.eq import me.liuwj.ktorm.entity.find diff --git a/persistance/test/users/UserRepositoryImplTests.kt b/persistence/test/users/UserRepositoryImplTests.kt similarity index 77% rename from persistance/test/users/UserRepositoryImplTests.kt rename to persistence/test/users/UserRepositoryImplTests.kt index 38dcf71..15cfca6 100644 --- a/persistance/test/users/UserRepositoryImplTests.kt +++ b/persistence/test/users/UserRepositoryImplTests.kt @@ -1,9 +1,9 @@ -package be.simplenotes.persistance.users +package be.simplenotes.persistence.users import be.simplenotes.config.DataSourceConfig -import be.simplenotes.persistance.KMariadbContainer -import be.simplenotes.persistance.h2dataSourceConfig -import be.simplenotes.persistance.mariadbDataSourceConfig +import be.simplenotes.persistence.KMariadbContainer +import be.simplenotes.persistence.h2dataSourceConfig +import be.simplenotes.persistence.mariadbDataSourceConfig import org.junit.jupiter.api.AfterAll import org.junit.jupiter.api.parallel.ResourceLock diff --git a/persistance/testfixtures/DbTest.kt b/persistence/testfixtures/DbTest.kt similarity index 95% rename from persistance/testfixtures/DbTest.kt rename to persistence/testfixtures/DbTest.kt index 0415cca..122c756 100644 --- a/persistance/testfixtures/DbTest.kt +++ b/persistence/testfixtures/DbTest.kt @@ -1,4 +1,4 @@ -package be.simplenotes.persistance +package be.simplenotes.persistence import be.simplenotes.config.DataSourceConfig import io.micronaut.context.BeanContext diff --git a/persistance/testfixtures/notes/NotesFixtures.kt b/persistence/testfixtures/notes/NotesFixtures.kt similarity index 92% rename from persistance/testfixtures/notes/NotesFixtures.kt rename to persistence/testfixtures/notes/NotesFixtures.kt index a546dd3..a82485b 100644 --- a/persistance/testfixtures/notes/NotesFixtures.kt +++ b/persistence/testfixtures/notes/NotesFixtures.kt @@ -1,6 +1,6 @@ -package be.simplenotes.persistance.notes +package be.simplenotes.persistence.notes -import be.simplenotes.persistance.repositories.NoteRepository +import be.simplenotes.persistence.repositories.NoteRepository import be.simplenotes.types.* import com.github.javafaker.Faker import java.util.* diff --git a/persistance/testfixtures/users/UserFixtures.kt b/persistence/testfixtures/users/UserFixtures.kt similarity index 74% rename from persistance/testfixtures/users/UserFixtures.kt rename to persistence/testfixtures/users/UserFixtures.kt index 179eb56..43cb7ec 100644 --- a/persistance/testfixtures/users/UserFixtures.kt +++ b/persistence/testfixtures/users/UserFixtures.kt @@ -1,6 +1,6 @@ -package be.simplenotes.persistance.users +package be.simplenotes.persistence.users -import be.simplenotes.persistance.repositories.UserRepository +import be.simplenotes.persistence.repositories.UserRepository import be.simplenotes.types.PersistedUser import be.simplenotes.types.User import com.github.javafaker.Faker diff --git a/persistance/testresources/logback.xml b/persistence/testresources/logback.xml similarity index 100% rename from persistance/testresources/logback.xml rename to persistence/testresources/logback.xml diff --git a/settings.gradle.kts b/settings.gradle.kts index e921310..1fd652f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -5,6 +5,6 @@ include(":app") include(":domain") include(":search") include(":types") -include(":persistance") +include(":persistence") include(":css") include(":junit-config")