From cd2b6f10a9cc459e9e9ef04d4f4cb993c53bbdb4 Mon Sep 17 00:00:00 2001 From: Anindya Chatterjee Date: Fri, 6 Sep 2024 10:00:38 +0530 Subject: [PATCH] fixes #1035 --- CHANGELOG.md | 1 + .../jackson}/JacksonMapper.java | 9 +++++---- .../jackson}/JacksonMapperModule.java | 6 +++--- .../modules/NitriteIdDeserializer.java | 2 +- .../jackson}/modules/NitriteIdModule.java | 2 +- .../jackson}/modules/NitriteIdSerializer.java | 2 +- .../jackson}/JacksonMapperModuleTest.java | 2 +- .../jackson}/JacksonMapperTest.java | 2 +- .../jackson}/integration/NitriteTest.java | 8 ++++---- .../integration/migrate/MigrationTest.java | 12 +++++------ .../integration/migrate/NewClass.java | 2 +- .../integration/migrate/OldClass.java | 2 +- .../repository/BaseObjectRepositoryTest.java | 6 +++--- .../repository/CustomFieldSeparatorTest.java | 10 +++++----- .../integration/repository/InternalClass.java | 2 +- .../repository/JacksonModuleTest.java | 6 +++--- .../repository/NitriteIdAsIdTest.java | 8 ++++---- .../repository/ObjectCursorTest.java | 4 ++-- .../ObjectRepositoryNegativeTest.java | 6 +++--- .../repository/ObjectRepositoryTest.java | 6 +++--- .../repository/ProjectionTest.java | 4 ++-- .../RepositoryCompoundIndexTest.java | 6 +++--- .../repository/RepositoryFactoryTest.java | 20 +++++-------------- .../repository/RepositoryJoinTest.java | 4 ++-- .../RepositoryModificationTest.java | 4 ++-- .../repository/RepositorySearchTest.java | 4 ++-- .../integration/repository/Retry.java | 2 +- .../integration/repository/TestUtil.java | 2 +- .../repository/UnAnnotatedObjectTest.java | 6 +++--- .../UniversalTextTokenizerTest.java | 4 ++-- .../integration/repository/data/Book.java | 2 +- .../integration/repository/data/BookId.java | 2 +- .../repository/data/ChildClass.java | 2 +- .../integration/repository/data/ClassA.java | 2 +- .../integration/repository/data/ClassB.java | 2 +- .../integration/repository/data/ClassC.java | 2 +- .../integration/repository/data/Company.java | 2 +- .../repository/data/DataGenerator.java | 2 +- .../repository/data/ElemMatch.java | 2 +- .../integration/repository/data/Employee.java | 2 +- .../repository/data/EncryptedPerson.java | 2 +- .../integration/repository/data/Note.java | 2 +- .../repository/data/ParentClass.java | 2 +- .../repository/data/PersonEntity.java | 2 +- .../repository/data/ProductScore.java | 2 +- .../repository/data/RepeatableIndexTest.java | 2 +- .../repository/data/StressRecord.java | 2 +- .../repository/data/SubEmployee.java | 2 +- .../repository/data/SuperDuperClass.java | 2 +- .../integration/repository/data/TestData.java | 2 +- .../data/WithCircularReference.java | 2 +- .../repository/data/WithClassField.java | 2 +- .../data/WithCustomConstructor.java | 2 +- .../repository/data/WithDateId.java | 2 +- .../repository/data/WithEmptyStringId.java | 2 +- .../repository/data/WithNitriteId.java | 2 +- .../repository/data/WithNullId.java | 2 +- .../repository/data/WithObjectId.java | 2 +- .../repository/data/WithOutGetterSetter.java | 2 +- .../repository/data/WithOutId.java | 2 +- .../data/WithPrivateConstructor.java | 2 +- .../repository/data/WithPublicField.java | 2 +- .../repository/data/WithTransientField.java | 2 +- .../repository/data/WithoutEmbeddedId.java | 2 +- .../TransactionRepositoryTest.java | 6 +++--- .../integration/transaction/TxData.java | 2 +- .../modules/NitriteIdDeserializerTest.java | 2 +- .../modules/NitriteIdSerializerTest.java | 2 +- .../jackson}/utils/ObjectUtilsTest.java | 6 +++--- .../no2/support/exchange/GithubIssueTest.java | 2 +- .../org/dizitart/kno2/KNO2JacksonMapper.kt | 2 +- 71 files changed, 118 insertions(+), 126 deletions(-) rename nitrite-jackson-mapper/src/main/java/org/dizitart/no2/{common/mapper => mapper/jackson}/JacksonMapper.java (96%) rename nitrite-jackson-mapper/src/main/java/org/dizitart/no2/{common/mapper => mapper/jackson}/JacksonMapperModule.java (89%) rename nitrite-jackson-mapper/src/main/java/org/dizitart/no2/{common/mapper => mapper/jackson}/modules/NitriteIdDeserializer.java (96%) rename nitrite-jackson-mapper/src/main/java/org/dizitart/no2/{common/mapper => mapper/jackson}/modules/NitriteIdModule.java (96%) rename nitrite-jackson-mapper/src/main/java/org/dizitart/no2/{common/mapper => mapper/jackson}/modules/NitriteIdSerializer.java (96%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{common/mapper => mapper/jackson}/JacksonMapperModuleTest.java (95%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{common/mapper => mapper/jackson}/JacksonMapperTest.java (98%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/NitriteTest.java (97%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/migrate/MigrationTest.java (97%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/migrate/NewClass.java (95%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/migrate/OldClass.java (96%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/BaseObjectRepositoryTest.java (96%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/CustomFieldSeparatorTest.java (92%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/InternalClass.java (92%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/JacksonModuleTest.java (92%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/NitriteIdAsIdTest.java (91%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/ObjectCursorTest.java (93%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/ObjectRepositoryNegativeTest.java (97%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/ObjectRepositoryTest.java (98%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/ProjectionTest.java (93%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/RepositoryCompoundIndexTest.java (87%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/RepositoryFactoryTest.java (76%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/RepositoryJoinTest.java (98%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/RepositoryModificationTest.java (99%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/RepositorySearchTest.java (99%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/Retry.java (96%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/TestUtil.java (97%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/UnAnnotatedObjectTest.java (90%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/UniversalTextTokenizerTest.java (98%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/data/Book.java (95%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/data/BookId.java (92%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/data/ChildClass.java (92%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/data/ClassA.java (95%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/data/ClassB.java (94%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/data/ClassC.java (94%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/data/Company.java (95%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/data/DataGenerator.java (98%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/data/ElemMatch.java (92%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/data/Employee.java (96%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/data/EncryptedPerson.java (93%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/data/Note.java (93%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/data/ParentClass.java (93%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/data/PersonEntity.java (95%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/data/ProductScore.java (93%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/data/RepeatableIndexTest.java (93%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/data/StressRecord.java (92%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/data/SubEmployee.java (93%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/data/SuperDuperClass.java (93%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/data/TestData.java (92%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/data/WithCircularReference.java (92%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/data/WithClassField.java (92%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/data/WithCustomConstructor.java (93%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/data/WithDateId.java (92%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/data/WithEmptyStringId.java (92%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/data/WithNitriteId.java (92%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/data/WithNullId.java (92%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/data/WithObjectId.java (92%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/data/WithOutGetterSetter.java (92%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/data/WithOutId.java (93%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/data/WithPrivateConstructor.java (94%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/data/WithPublicField.java (92%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/data/WithTransientField.java (92%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/repository/data/WithoutEmbeddedId.java (93%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/transaction/TransactionRepositoryTest.java (99%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{ => mapper/jackson}/integration/transaction/TxData.java (93%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{common/mapper => mapper/jackson}/modules/NitriteIdDeserializerTest.java (95%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{common/mapper => mapper/jackson}/modules/NitriteIdSerializerTest.java (95%) rename nitrite-jackson-mapper/src/test/java/org/dizitart/no2/{common => mapper/jackson}/utils/ObjectUtilsTest.java (94%) diff --git a/CHANGELOG.md b/CHANGELOG.md index b76281fae..d597b9da7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Fix for `Document.getFields()` not returning iterable fields - Fix for failing tests on systems with non-ENGLISH locale #994 - Fix for NPE in `DefaultTransactionalRepository` #1032 +- Fix for JPMS issue #1035 ## Release 4.3.0 - Jul 1, 2024 diff --git a/nitrite-jackson-mapper/src/main/java/org/dizitart/no2/common/mapper/JacksonMapper.java b/nitrite-jackson-mapper/src/main/java/org/dizitart/no2/mapper/jackson/JacksonMapper.java similarity index 96% rename from nitrite-jackson-mapper/src/main/java/org/dizitart/no2/common/mapper/JacksonMapper.java rename to nitrite-jackson-mapper/src/main/java/org/dizitart/no2/mapper/jackson/JacksonMapper.java index 951eae0f3..bafbadbca 100644 --- a/nitrite-jackson-mapper/src/main/java/org/dizitart/no2/common/mapper/JacksonMapper.java +++ b/nitrite-jackson-mapper/src/main/java/org/dizitart/no2/mapper/jackson/JacksonMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dizitart.no2.common.mapper; +package org.dizitart.no2.mapper.jackson; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.core.JsonParser; @@ -22,7 +22,8 @@ import com.fasterxml.jackson.databind.*; import org.dizitart.no2.NitriteConfig; import org.dizitart.no2.collection.Document; -import org.dizitart.no2.common.mapper.modules.NitriteIdModule; +import org.dizitart.no2.common.mapper.NitriteMapper; +import org.dizitart.no2.mapper.jackson.modules.NitriteIdModule; import org.dizitart.no2.exceptions.ObjectMappingException; import org.dizitart.no2.exceptions.ValidationException; @@ -32,11 +33,11 @@ import static org.dizitart.no2.common.util.ValidationUtils.notNull; /** - * A {@link NitriteMapper} implementation that uses Jackson ObjectMapper to + * A {@link org.dizitart.no2.common.mapper.NitriteMapper} implementation that uses Jackson ObjectMapper to * convert objects to and from Nitrite document. * * @since 4.0 - * @see NitriteMapper + * @see org.dizitart.no2.common.mapper.NitriteMapper * @author Anindya Chatterjee */ public class JacksonMapper implements NitriteMapper { diff --git a/nitrite-jackson-mapper/src/main/java/org/dizitart/no2/common/mapper/JacksonMapperModule.java b/nitrite-jackson-mapper/src/main/java/org/dizitart/no2/mapper/jackson/JacksonMapperModule.java similarity index 89% rename from nitrite-jackson-mapper/src/main/java/org/dizitart/no2/common/mapper/JacksonMapperModule.java rename to nitrite-jackson-mapper/src/main/java/org/dizitart/no2/mapper/jackson/JacksonMapperModule.java index 47edf3429..0759dfd9e 100644 --- a/nitrite-jackson-mapper/src/main/java/org/dizitart/no2/common/mapper/JacksonMapperModule.java +++ b/nitrite-jackson-mapper/src/main/java/org/dizitart/no2/mapper/jackson/JacksonMapperModule.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dizitart.no2.common.mapper; +package org.dizitart.no2.mapper.jackson; import com.fasterxml.jackson.databind.Module; import org.dizitart.no2.common.module.NitriteModule; @@ -25,11 +25,11 @@ import static org.dizitart.no2.common.util.Iterables.setOf; /** - * A Nitrite module that provides a jackson based {@link NitriteMapper} + * A Nitrite module that provides a jackson based {@link org.dizitart.no2.common.mapper.NitriteMapper} * implementation for object to document conversion. * * @since 4.0 - * @see NitriteMapper + * @see org.dizitart.no2.common.mapper.NitriteMapper * @see JacksonMapper * @author Anindya Chatterjee */ diff --git a/nitrite-jackson-mapper/src/main/java/org/dizitart/no2/common/mapper/modules/NitriteIdDeserializer.java b/nitrite-jackson-mapper/src/main/java/org/dizitart/no2/mapper/jackson/modules/NitriteIdDeserializer.java similarity index 96% rename from nitrite-jackson-mapper/src/main/java/org/dizitart/no2/common/mapper/modules/NitriteIdDeserializer.java rename to nitrite-jackson-mapper/src/main/java/org/dizitart/no2/mapper/jackson/modules/NitriteIdDeserializer.java index 701996982..647409a1b 100644 --- a/nitrite-jackson-mapper/src/main/java/org/dizitart/no2/common/mapper/modules/NitriteIdDeserializer.java +++ b/nitrite-jackson-mapper/src/main/java/org/dizitart/no2/mapper/jackson/modules/NitriteIdDeserializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dizitart.no2.common.mapper.modules; +package org.dizitart.no2.mapper.jackson.modules; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; diff --git a/nitrite-jackson-mapper/src/main/java/org/dizitart/no2/common/mapper/modules/NitriteIdModule.java b/nitrite-jackson-mapper/src/main/java/org/dizitart/no2/mapper/jackson/modules/NitriteIdModule.java similarity index 96% rename from nitrite-jackson-mapper/src/main/java/org/dizitart/no2/common/mapper/modules/NitriteIdModule.java rename to nitrite-jackson-mapper/src/main/java/org/dizitart/no2/mapper/jackson/modules/NitriteIdModule.java index 2c0c451e7..ed05554bb 100644 --- a/nitrite-jackson-mapper/src/main/java/org/dizitart/no2/common/mapper/modules/NitriteIdModule.java +++ b/nitrite-jackson-mapper/src/main/java/org/dizitart/no2/mapper/jackson/modules/NitriteIdModule.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dizitart.no2.common.mapper.modules; +package org.dizitart.no2.mapper.jackson.modules; import com.fasterxml.jackson.databind.module.SimpleModule; import org.dizitart.no2.collection.NitriteId; diff --git a/nitrite-jackson-mapper/src/main/java/org/dizitart/no2/common/mapper/modules/NitriteIdSerializer.java b/nitrite-jackson-mapper/src/main/java/org/dizitart/no2/mapper/jackson/modules/NitriteIdSerializer.java similarity index 96% rename from nitrite-jackson-mapper/src/main/java/org/dizitart/no2/common/mapper/modules/NitriteIdSerializer.java rename to nitrite-jackson-mapper/src/main/java/org/dizitart/no2/mapper/jackson/modules/NitriteIdSerializer.java index e2402e1d1..36616de79 100644 --- a/nitrite-jackson-mapper/src/main/java/org/dizitart/no2/common/mapper/modules/NitriteIdSerializer.java +++ b/nitrite-jackson-mapper/src/main/java/org/dizitart/no2/mapper/jackson/modules/NitriteIdSerializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.dizitart.no2.common.mapper.modules; +package org.dizitart.no2.mapper.jackson.modules; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/common/mapper/JacksonMapperModuleTest.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/JacksonMapperModuleTest.java similarity index 95% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/common/mapper/JacksonMapperModuleTest.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/JacksonMapperModuleTest.java index d06ce7466..90fdb1dd3 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/common/mapper/JacksonMapperModuleTest.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/JacksonMapperModuleTest.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.common.mapper; +package org.dizitart.no2.mapper.jackson; import org.junit.Test; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/common/mapper/JacksonMapperTest.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/JacksonMapperTest.java similarity index 98% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/common/mapper/JacksonMapperTest.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/JacksonMapperTest.java index 87efabe06..9dd3ceb0c 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/common/mapper/JacksonMapperTest.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/JacksonMapperTest.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.common.mapper; +package org.dizitart.no2.mapper.jackson; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/NitriteTest.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/NitriteTest.java similarity index 97% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/NitriteTest.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/NitriteTest.java index 5790fa388..5ded0103a 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/NitriteTest.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/NitriteTest.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration; +package org.dizitart.no2.mapper.jackson.integration; import lombok.AllArgsConstructor; import lombok.Data; @@ -23,13 +23,13 @@ import org.dizitart.no2.Nitrite; import org.dizitart.no2.collection.Document; import org.dizitart.no2.collection.NitriteCollection; -import org.dizitart.no2.common.mapper.JacksonMapperModule; +import org.dizitart.no2.mapper.jackson.JacksonMapperModule; import org.dizitart.no2.exceptions.IndexingException; import org.dizitart.no2.exceptions.NitriteIOException; import org.dizitart.no2.exceptions.ValidationException; import org.dizitart.no2.index.IndexOptions; import org.dizitart.no2.index.IndexType; -import org.dizitart.no2.integration.repository.Retry; +import org.dizitart.no2.mapper.jackson.integration.repository.Retry; import org.dizitart.no2.repository.ObjectRepository; import org.dizitart.no2.repository.annotations.Id; import org.dizitart.no2.repository.annotations.Index; @@ -47,7 +47,7 @@ import static org.dizitart.no2.common.Constants.INTERNAL_NAME_SEPARATOR; import static org.dizitart.no2.common.Constants.META_MAP_NAME; import static org.dizitart.no2.filters.Filter.ALL; -import static org.dizitart.no2.integration.repository.TestUtil.createDb; +import static org.dizitart.no2.mapper.jackson.integration.repository.TestUtil.createDb; import static org.junit.Assert.*; /** diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/migrate/MigrationTest.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/migrate/MigrationTest.java similarity index 97% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/migrate/MigrationTest.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/migrate/MigrationTest.java index 97da14d08..ceff04dcb 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/migrate/MigrationTest.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/migrate/MigrationTest.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.migrate; +package org.dizitart.no2.mapper.jackson.integration.migrate; import com.github.javafaker.Faker; import org.dizitart.no2.Nitrite; @@ -23,11 +23,11 @@ import org.dizitart.no2.collection.NitriteCollection; import org.dizitart.no2.common.Constants; import org.dizitart.no2.common.Fields; -import org.dizitart.no2.common.mapper.JacksonMapperModule; +import org.dizitart.no2.mapper.jackson.JacksonMapperModule; import org.dizitart.no2.exceptions.MigrationException; import org.dizitart.no2.index.IndexType; -import org.dizitart.no2.integration.repository.Retry; -import org.dizitart.no2.integration.repository.TestUtil; +import org.dizitart.no2.mapper.jackson.integration.repository.Retry; +import org.dizitart.no2.mapper.jackson.integration.repository.TestUtil; import org.dizitart.no2.migration.InstructionSet; import org.dizitart.no2.migration.Migration; import org.dizitart.no2.migration.TypeConverter; @@ -42,8 +42,8 @@ import static org.dizitart.no2.filters.FluentFilter.where; import static org.dizitart.no2.index.IndexOptions.indexOptions; -import static org.dizitart.no2.integration.repository.BaseObjectRepositoryTest.getRandomTempDbFile; -import static org.dizitart.no2.integration.repository.TestUtil.createDb; +import static org.dizitart.no2.mapper.jackson.integration.repository.BaseObjectRepositoryTest.getRandomTempDbFile; +import static org.dizitart.no2.mapper.jackson.integration.repository.TestUtil.createDb; import static org.junit.Assert.*; /** diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/migrate/NewClass.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/migrate/NewClass.java similarity index 95% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/migrate/NewClass.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/migrate/NewClass.java index d5cae58ad..0feeca4b9 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/migrate/NewClass.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/migrate/NewClass.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.migrate; +package org.dizitart.no2.mapper.jackson.integration.migrate; import lombok.Data; import org.dizitart.no2.index.IndexType; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/migrate/OldClass.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/migrate/OldClass.java similarity index 96% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/migrate/OldClass.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/migrate/OldClass.java index 82044f93a..ff109ee8f 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/migrate/OldClass.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/migrate/OldClass.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.migrate; +package org.dizitart.no2.mapper.jackson.integration.migrate; import lombok.Data; import org.dizitart.no2.index.IndexType; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/BaseObjectRepositoryTest.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/BaseObjectRepositoryTest.java similarity index 96% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/BaseObjectRepositoryTest.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/BaseObjectRepositoryTest.java index 0e9b2a14a..041d9abb0 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/BaseObjectRepositoryTest.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/BaseObjectRepositoryTest.java @@ -15,12 +15,12 @@ * */ -package org.dizitart.no2.integration.repository; +package org.dizitart.no2.mapper.jackson.integration.repository; import org.dizitart.no2.Nitrite; import org.dizitart.no2.NitriteBuilder; -import org.dizitart.no2.common.mapper.JacksonMapperModule; -import org.dizitart.no2.integration.repository.data.*; +import org.dizitart.no2.mapper.jackson.JacksonMapperModule; +import org.dizitart.no2.mapper.jackson.integration.repository.data.*; import org.dizitart.no2.mvstore.MVStoreModule; import org.dizitart.no2.mvstore.MVStoreModuleBuilder; import org.dizitart.no2.repository.ObjectRepository; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/CustomFieldSeparatorTest.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/CustomFieldSeparatorTest.java similarity index 92% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/CustomFieldSeparatorTest.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/CustomFieldSeparatorTest.java index c932c7d4d..c9b085e90 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/CustomFieldSeparatorTest.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/CustomFieldSeparatorTest.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository; +package org.dizitart.no2.mapper.jackson.integration.repository; import lombok.EqualsAndHashCode; import lombok.Getter; @@ -23,10 +23,10 @@ import lombok.ToString; import org.dizitart.no2.Nitrite; import org.dizitart.no2.NitriteConfig; -import org.dizitart.no2.common.mapper.JacksonMapperModule; +import org.dizitart.no2.mapper.jackson.JacksonMapperModule; import org.dizitart.no2.index.IndexType; -import org.dizitart.no2.integration.repository.data.Company; -import org.dizitart.no2.integration.repository.data.Note; +import org.dizitart.no2.mapper.jackson.integration.repository.data.Company; +import org.dizitart.no2.mapper.jackson.integration.repository.data.Note; import org.dizitart.no2.mvstore.MVStoreModule; import org.dizitart.no2.repository.ObjectRepository; import org.dizitart.no2.repository.annotations.Id; @@ -39,7 +39,7 @@ import java.util.Date; import static org.dizitart.no2.filters.FluentFilter.where; -import static org.dizitart.no2.integration.repository.BaseObjectRepositoryTest.getRandomTempDbFile; +import static org.dizitart.no2.mapper.jackson.integration.repository.BaseObjectRepositoryTest.getRandomTempDbFile; import static org.junit.Assert.assertEquals; /** diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/InternalClass.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/InternalClass.java similarity index 92% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/InternalClass.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/InternalClass.java index a437f6c1a..12b5893f0 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/InternalClass.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/InternalClass.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository; +package org.dizitart.no2.mapper.jackson.integration.repository; import lombok.Data; import org.dizitart.no2.repository.annotations.Id; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/JacksonModuleTest.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/JacksonModuleTest.java similarity index 92% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/JacksonModuleTest.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/JacksonModuleTest.java index bad871a27..aa8011968 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/JacksonModuleTest.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/JacksonModuleTest.java @@ -1,10 +1,10 @@ -package org.dizitart.no2.integration.repository; +package org.dizitart.no2.mapper.jackson.integration.repository; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import lombok.Data; import org.dizitart.no2.Nitrite; import org.dizitart.no2.NitriteBuilder; -import org.dizitart.no2.common.mapper.JacksonMapperModule; +import org.dizitart.no2.mapper.jackson.JacksonMapperModule; import org.dizitart.no2.exceptions.ObjectMappingException; import org.dizitart.no2.mvstore.MVStoreModule; import org.dizitart.no2.repository.ObjectRepository; @@ -15,7 +15,7 @@ import java.time.LocalDateTime; import java.util.UUID; -import static org.dizitart.no2.integration.repository.BaseObjectRepositoryTest.getRandomTempDbFile; +import static org.dizitart.no2.mapper.jackson.integration.repository.BaseObjectRepositoryTest.getRandomTempDbFile; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/NitriteIdAsIdTest.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/NitriteIdAsIdTest.java similarity index 91% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/NitriteIdAsIdTest.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/NitriteIdAsIdTest.java index 096e9a82b..120106433 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/NitriteIdAsIdTest.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/NitriteIdAsIdTest.java @@ -15,13 +15,13 @@ * */ -package org.dizitart.no2.integration.repository; +package org.dizitart.no2.mapper.jackson.integration.repository; import lombok.Data; import org.dizitart.no2.Nitrite; import org.dizitart.no2.collection.NitriteId; import org.dizitart.no2.common.WriteResult; -import org.dizitart.no2.common.mapper.JacksonMapper; +import org.dizitart.no2.mapper.jackson.JacksonMapper; import org.dizitart.no2.common.util.Iterables; import org.dizitart.no2.exceptions.InvalidIdException; import org.dizitart.no2.repository.Cursor; @@ -33,8 +33,8 @@ import org.junit.Test; import static org.dizitart.no2.common.module.NitriteModule.module; -import static org.dizitart.no2.integration.repository.BaseObjectRepositoryTest.getRandomTempDbFile; -import static org.dizitart.no2.integration.repository.TestUtil.createDb; +import static org.dizitart.no2.mapper.jackson.integration.repository.BaseObjectRepositoryTest.getRandomTempDbFile; +import static org.dizitart.no2.mapper.jackson.integration.repository.TestUtil.createDb; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/ObjectCursorTest.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/ObjectCursorTest.java similarity index 93% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/ObjectCursorTest.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/ObjectCursorTest.java index bb8c8a728..125cc1969 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/ObjectCursorTest.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/ObjectCursorTest.java @@ -15,11 +15,11 @@ * */ -package org.dizitart.no2.integration.repository; +package org.dizitart.no2.mapper.jackson.integration.repository; import org.dizitart.no2.common.RecordStream; import org.dizitart.no2.exceptions.ValidationException; -import org.dizitart.no2.integration.repository.data.Employee; +import org.dizitart.no2.mapper.jackson.integration.repository.data.Employee; import org.dizitart.no2.repository.Cursor; import org.junit.Assert; import org.junit.Test; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/ObjectRepositoryNegativeTest.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/ObjectRepositoryNegativeTest.java similarity index 97% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/ObjectRepositoryNegativeTest.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/ObjectRepositoryNegativeTest.java index 281c02d08..5b04a0f45 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/ObjectRepositoryNegativeTest.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/ObjectRepositoryNegativeTest.java @@ -15,15 +15,15 @@ * */ -package org.dizitart.no2.integration.repository; +package org.dizitart.no2.mapper.jackson.integration.repository; import org.dizitart.no2.Nitrite; import org.dizitart.no2.collection.NitriteId; import org.dizitart.no2.common.RecordStream; import org.dizitart.no2.common.WriteResult; -import org.dizitart.no2.common.mapper.JacksonMapperModule; import org.dizitart.no2.exceptions.*; -import org.dizitart.no2.integration.repository.data.*; +import org.dizitart.no2.mapper.jackson.JacksonMapperModule; +import org.dizitart.no2.mapper.jackson.integration.repository.data.*; import org.dizitart.no2.repository.ObjectRepository; import org.junit.After; import org.junit.Before; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/ObjectRepositoryTest.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/ObjectRepositoryTest.java similarity index 98% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/ObjectRepositoryTest.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/ObjectRepositoryTest.java index f829b4050..bf51cb3eb 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/ObjectRepositoryTest.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/ObjectRepositoryTest.java @@ -15,17 +15,17 @@ * */ -package org.dizitart.no2.integration.repository; +package org.dizitart.no2.mapper.jackson.integration.repository; import com.github.javafaker.Faker; import lombok.Data; import org.dizitart.no2.Nitrite; import org.dizitart.no2.collection.NitriteCollection; -import org.dizitart.no2.common.mapper.JacksonMapperModule; import org.dizitart.no2.common.meta.Attributes; import org.dizitart.no2.exceptions.ValidationException; import org.dizitart.no2.index.IndexType; -import org.dizitart.no2.integration.repository.data.*; +import org.dizitart.no2.mapper.jackson.JacksonMapperModule; +import org.dizitart.no2.mapper.jackson.integration.repository.data.*; import org.dizitart.no2.repository.Cursor; import org.dizitart.no2.repository.ObjectRepository; import org.dizitart.no2.repository.annotations.Entity; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/ProjectionTest.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/ProjectionTest.java similarity index 93% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/ProjectionTest.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/ProjectionTest.java index a384735ad..907123f3b 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/ProjectionTest.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/ProjectionTest.java @@ -15,11 +15,11 @@ * */ -package org.dizitart.no2.integration.repository; +package org.dizitart.no2.mapper.jackson.integration.repository; import org.dizitart.no2.common.RecordStream; import org.dizitart.no2.exceptions.InvalidOperationException; -import org.dizitart.no2.integration.repository.data.SubEmployee; +import org.dizitart.no2.mapper.jackson.integration.repository.data.SubEmployee; import org.junit.Test; import java.util.Iterator; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/RepositoryCompoundIndexTest.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/RepositoryCompoundIndexTest.java similarity index 87% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/RepositoryCompoundIndexTest.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/RepositoryCompoundIndexTest.java index 9431d991e..ab21e4148 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/RepositoryCompoundIndexTest.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/RepositoryCompoundIndexTest.java @@ -15,10 +15,10 @@ * */ -package org.dizitart.no2.integration.repository; +package org.dizitart.no2.mapper.jackson.integration.repository; -import org.dizitart.no2.integration.repository.data.Book; -import org.dizitart.no2.integration.repository.data.BookId; +import org.dizitart.no2.mapper.jackson.integration.repository.data.Book; +import org.dizitart.no2.mapper.jackson.integration.repository.data.BookId; import org.junit.Test; import java.util.Arrays; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/RepositoryFactoryTest.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/RepositoryFactoryTest.java similarity index 76% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/RepositoryFactoryTest.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/RepositoryFactoryTest.java index 8fa4bb093..5b8a7530b 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/RepositoryFactoryTest.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/RepositoryFactoryTest.java @@ -15,31 +15,21 @@ * */ -package org.dizitart.no2.integration.repository; +package org.dizitart.no2.mapper.jackson.integration.repository; import org.dizitart.no2.Nitrite; import org.dizitart.no2.collection.*; -import org.dizitart.no2.collection.events.CollectionEventListener; -import org.dizitart.no2.common.meta.Attributes; -import org.dizitart.no2.common.WriteResult; import org.dizitart.no2.common.concurrent.LockService; -import org.dizitart.no2.common.mapper.JacksonMapper; +import org.dizitart.no2.mapper.jackson.JacksonMapper; import org.dizitart.no2.common.module.NitriteModule; -import org.dizitart.no2.common.processors.Processor; import org.dizitart.no2.exceptions.ValidationException; -import org.dizitart.no2.filters.Filter; -import org.dizitart.no2.index.IndexDescriptor; -import org.dizitart.no2.index.IndexOptions; import org.dizitart.no2.repository.RepositoryFactory; -import org.dizitart.no2.store.NitriteStore; -import org.dizitart.no2.integration.repository.data.Book; +import org.dizitart.no2.mapper.jackson.integration.repository.data.Book; import org.junit.After; import org.junit.Rule; import org.junit.Test; -import java.util.Collection; - -import static org.dizitart.no2.integration.repository.BaseObjectRepositoryTest.getRandomTempDbFile; +import static org.dizitart.no2.mapper.jackson.integration.repository.BaseObjectRepositoryTest.getRandomTempDbFile; import static org.junit.Assert.assertNotNull; /** @@ -63,7 +53,7 @@ public void testNullType() { RepositoryFactory factory = new RepositoryFactory(new CollectionFactory(new LockService())); JacksonMapper mapper = new JacksonMapper(); db = TestUtil.createDb(fileName, NitriteModule.module(mapper)); - factory.getRepository(db.getConfig(), (Class) null, "dummy"); + factory.getRepository(db.getConfig(), (Class) null, "dummy"); } @Test diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/RepositoryJoinTest.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/RepositoryJoinTest.java similarity index 98% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/RepositoryJoinTest.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/RepositoryJoinTest.java index 6e1556eb4..b200c4df4 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/RepositoryJoinTest.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/RepositoryJoinTest.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository; +package org.dizitart.no2.mapper.jackson.integration.repository; import lombok.Data; import org.dizitart.no2.Nitrite; @@ -24,7 +24,7 @@ import org.dizitart.no2.collection.NitriteId; import org.dizitart.no2.common.Lookup; import org.dizitart.no2.common.RecordStream; -import org.dizitart.no2.common.mapper.JacksonMapperModule; +import org.dizitart.no2.mapper.jackson.JacksonMapperModule; import org.dizitart.no2.exceptions.InvalidOperationException; import org.dizitart.no2.mvstore.MVStoreModule; import org.dizitart.no2.mvstore.MVStoreModuleBuilder; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/RepositoryModificationTest.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/RepositoryModificationTest.java similarity index 99% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/RepositoryModificationTest.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/RepositoryModificationTest.java index 8fa0d1c98..ee2dfb408 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/RepositoryModificationTest.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/RepositoryModificationTest.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository; +package org.dizitart.no2.mapper.jackson.integration.repository; import org.dizitart.no2.collection.Document; import org.dizitart.no2.collection.NitriteId; @@ -26,7 +26,7 @@ import org.dizitart.no2.index.IndexDescriptor; import org.dizitart.no2.index.IndexOptions; import org.dizitart.no2.index.IndexType; -import org.dizitart.no2.integration.repository.data.*; +import org.dizitart.no2.mapper.jackson.integration.repository.data.*; import org.dizitart.no2.repository.Cursor; import org.dizitart.no2.repository.ObjectRepository; import org.junit.Test; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/RepositorySearchTest.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/RepositorySearchTest.java similarity index 99% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/RepositorySearchTest.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/RepositorySearchTest.java index b582b49d2..76a971bf5 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/RepositorySearchTest.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/RepositorySearchTest.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository; +package org.dizitart.no2.mapper.jackson.integration.repository; import org.dizitart.no2.collection.Document; import org.dizitart.no2.common.SortOrder; @@ -24,7 +24,7 @@ import org.dizitart.no2.exceptions.InvalidIdException; import org.dizitart.no2.exceptions.NotIdentifiableException; import org.dizitart.no2.filters.Filter; -import org.dizitart.no2.integration.repository.data.*; +import org.dizitart.no2.mapper.jackson.integration.repository.data.*; import org.dizitart.no2.repository.Cursor; import org.dizitart.no2.repository.ObjectRepository; import org.junit.Test; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/Retry.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/Retry.java similarity index 96% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/Retry.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/Retry.java index 475106b6e..a372d74d6 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/Retry.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/Retry.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository; +package org.dizitart.no2.mapper.jackson.integration.repository; import lombok.extern.slf4j.Slf4j; import org.junit.rules.TestRule; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/TestUtil.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/TestUtil.java similarity index 97% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/TestUtil.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/TestUtil.java index 264b53b6f..af502835c 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/TestUtil.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/TestUtil.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository; +package org.dizitart.no2.mapper.jackson.integration.repository; import lombok.extern.slf4j.Slf4j; import org.dizitart.no2.Nitrite; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/UnAnnotatedObjectTest.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/UnAnnotatedObjectTest.java similarity index 90% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/UnAnnotatedObjectTest.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/UnAnnotatedObjectTest.java index 0306f8eca..8f47d6c15 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/UnAnnotatedObjectTest.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/UnAnnotatedObjectTest.java @@ -15,12 +15,12 @@ * */ -package org.dizitart.no2.integration.repository; +package org.dizitart.no2.mapper.jackson.integration.repository; import org.dizitart.no2.common.SortOrder; import org.dizitart.no2.repository.Cursor; -import org.dizitart.no2.integration.repository.data.ClassA; -import org.dizitart.no2.integration.repository.data.ClassC; +import org.dizitart.no2.mapper.jackson.integration.repository.data.ClassA; +import org.dizitart.no2.mapper.jackson.integration.repository.data.ClassC; import org.junit.Test; import static org.dizitart.no2.collection.FindOptions.orderBy; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/UniversalTextTokenizerTest.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/UniversalTextTokenizerTest.java similarity index 98% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/UniversalTextTokenizerTest.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/UniversalTextTokenizerTest.java index 6aa3ab298..7cbcaa03c 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/UniversalTextTokenizerTest.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/UniversalTextTokenizerTest.java @@ -15,11 +15,11 @@ * */ -package org.dizitart.no2.integration.repository; +package org.dizitart.no2.mapper.jackson.integration.repository; import org.dizitart.no2.Nitrite; import org.dizitart.no2.NitriteBuilder; -import org.dizitart.no2.common.mapper.JacksonMapperModule; +import org.dizitart.no2.mapper.jackson.JacksonMapperModule; import org.dizitart.no2.index.IndexType; import org.dizitart.no2.index.NitriteTextIndexer; import org.dizitart.no2.index.fulltext.Languages; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/Book.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/Book.java similarity index 95% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/Book.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/Book.java index e14af920b..d9433d714 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/Book.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/Book.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository.data; +package org.dizitart.no2.mapper.jackson.integration.repository.data; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/BookId.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/BookId.java similarity index 92% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/BookId.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/BookId.java index b051dfe18..055e039bc 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/BookId.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/BookId.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository.data; +package org.dizitart.no2.mapper.jackson.integration.repository.data; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/ChildClass.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/ChildClass.java similarity index 92% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/ChildClass.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/ChildClass.java index 7df72c261..9c72c3d12 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/ChildClass.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/ChildClass.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository.data; +package org.dizitart.no2.mapper.jackson.integration.repository.data; import lombok.Getter; import lombok.Setter; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/ClassA.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/ClassA.java similarity index 95% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/ClassA.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/ClassA.java index 10aa57a6d..2462cc9c9 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/ClassA.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/ClassA.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository.data; +package org.dizitart.no2.mapper.jackson.integration.repository.data; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/ClassB.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/ClassB.java similarity index 94% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/ClassB.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/ClassB.java index 567c99244..be417ec8f 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/ClassB.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/ClassB.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository.data; +package org.dizitart.no2.mapper.jackson.integration.repository.data; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/ClassC.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/ClassC.java similarity index 94% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/ClassC.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/ClassC.java index 237f3f835..f187303fa 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/ClassC.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/ClassC.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository.data; +package org.dizitart.no2.mapper.jackson.integration.repository.data; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/Company.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/Company.java similarity index 95% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/Company.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/Company.java index acf8c9311..3350a913f 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/Company.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/Company.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository.data; +package org.dizitart.no2.mapper.jackson.integration.repository.data; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/DataGenerator.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/DataGenerator.java similarity index 98% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/DataGenerator.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/DataGenerator.java index 26e0dcf4a..f52c11f56 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/DataGenerator.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/DataGenerator.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository.data; +package org.dizitart.no2.mapper.jackson.integration.repository.data; import com.github.javafaker.Faker; import lombok.val; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/ElemMatch.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/ElemMatch.java similarity index 92% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/ElemMatch.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/ElemMatch.java index 9de46c3a4..7f75c6e37 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/ElemMatch.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/ElemMatch.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository.data; +package org.dizitart.no2.mapper.jackson.integration.repository.data; import lombok.Data; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/Employee.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/Employee.java similarity index 96% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/Employee.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/Employee.java index fa84714f9..b32c21ce3 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/Employee.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/Employee.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository.data; +package org.dizitart.no2.mapper.jackson.integration.repository.data; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/EncryptedPerson.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/EncryptedPerson.java similarity index 93% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/EncryptedPerson.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/EncryptedPerson.java index fcf5e7cd6..0da27ca84 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/EncryptedPerson.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/EncryptedPerson.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository.data; +package org.dizitart.no2.mapper.jackson.integration.repository.data; import lombok.Data; import org.dizitart.no2.repository.annotations.Entity; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/Note.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/Note.java similarity index 93% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/Note.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/Note.java index 68942f3c3..433690ba7 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/Note.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/Note.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository.data; +package org.dizitart.no2.mapper.jackson.integration.repository.data; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/ParentClass.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/ParentClass.java similarity index 93% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/ParentClass.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/ParentClass.java index f27a3f869..7466431d7 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/ParentClass.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/ParentClass.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository.data; +package org.dizitart.no2.mapper.jackson.integration.repository.data; import lombok.Getter; import lombok.Setter; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/PersonEntity.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/PersonEntity.java similarity index 95% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/PersonEntity.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/PersonEntity.java index cf6d420fa..d17b90668 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/PersonEntity.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/PersonEntity.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository.data; +package org.dizitart.no2.mapper.jackson.integration.repository.data; import lombok.Data; import org.dizitart.no2.index.IndexType; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/ProductScore.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/ProductScore.java similarity index 93% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/ProductScore.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/ProductScore.java index c796a49d3..a114a53e5 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/ProductScore.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/ProductScore.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository.data; +package org.dizitart.no2.mapper.jackson.integration.repository.data; import lombok.Getter; import lombok.Setter; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/RepeatableIndexTest.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/RepeatableIndexTest.java similarity index 93% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/RepeatableIndexTest.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/RepeatableIndexTest.java index 5d5423a1b..e6925ebdc 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/RepeatableIndexTest.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/RepeatableIndexTest.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository.data; +package org.dizitart.no2.mapper.jackson.integration.repository.data; import lombok.Data; import org.dizitart.no2.index.IndexType; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/StressRecord.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/StressRecord.java similarity index 92% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/StressRecord.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/StressRecord.java index 9ab3c6d10..607c54c2a 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/StressRecord.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/StressRecord.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository.data; +package org.dizitart.no2.mapper.jackson.integration.repository.data; import lombok.Getter; import lombok.Setter; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/SubEmployee.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/SubEmployee.java similarity index 93% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/SubEmployee.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/SubEmployee.java index 0b4713a03..c7efeafb1 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/SubEmployee.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/SubEmployee.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository.data; +package org.dizitart.no2.mapper.jackson.integration.repository.data; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/SuperDuperClass.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/SuperDuperClass.java similarity index 93% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/SuperDuperClass.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/SuperDuperClass.java index 523cebb87..b251400b9 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/SuperDuperClass.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/SuperDuperClass.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository.data; +package org.dizitart.no2.mapper.jackson.integration.repository.data; import lombok.Getter; import lombok.Setter; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/TestData.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/TestData.java similarity index 92% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/TestData.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/TestData.java index d4a1733f7..11d9c96bb 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/TestData.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/TestData.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository.data; +package org.dizitart.no2.mapper.jackson.integration.repository.data; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithCircularReference.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithCircularReference.java similarity index 92% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithCircularReference.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithCircularReference.java index ef9128b30..09603e263 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithCircularReference.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithCircularReference.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository.data; +package org.dizitart.no2.mapper.jackson.integration.repository.data; import lombok.Getter; import lombok.Setter; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithClassField.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithClassField.java similarity index 92% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithClassField.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithClassField.java index 648f562d0..df09b43a1 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithClassField.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithClassField.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository.data; +package org.dizitart.no2.mapper.jackson.integration.repository.data; import lombok.Getter; import lombok.Setter; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithCustomConstructor.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithCustomConstructor.java similarity index 93% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithCustomConstructor.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithCustomConstructor.java index 5982ee0e1..4e55687bc 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithCustomConstructor.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithCustomConstructor.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository.data; +package org.dizitart.no2.mapper.jackson.integration.repository.data; import lombok.Getter; import lombok.Setter; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithDateId.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithDateId.java similarity index 92% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithDateId.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithDateId.java index 1ad510072..a82d457c5 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithDateId.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithDateId.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository.data; +package org.dizitart.no2.mapper.jackson.integration.repository.data; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithEmptyStringId.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithEmptyStringId.java similarity index 92% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithEmptyStringId.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithEmptyStringId.java index cb32a0d84..2b4b1ce7a 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithEmptyStringId.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithEmptyStringId.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository.data; +package org.dizitart.no2.mapper.jackson.integration.repository.data; import lombok.Getter; import lombok.Setter; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithNitriteId.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithNitriteId.java similarity index 92% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithNitriteId.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithNitriteId.java index b9b980f70..55726f733 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithNitriteId.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithNitriteId.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository.data; +package org.dizitart.no2.mapper.jackson.integration.repository.data; import lombok.Data; import org.dizitart.no2.collection.NitriteId; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithNullId.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithNullId.java similarity index 92% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithNullId.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithNullId.java index 4a7059eaf..2150b0dec 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithNullId.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithNullId.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository.data; +package org.dizitart.no2.mapper.jackson.integration.repository.data; import lombok.Getter; import lombok.Setter; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithObjectId.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithObjectId.java similarity index 92% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithObjectId.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithObjectId.java index ab1009b01..5c67b485d 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithObjectId.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithObjectId.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository.data; +package org.dizitart.no2.mapper.jackson.integration.repository.data; import lombok.Getter; import lombok.Setter; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithOutGetterSetter.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithOutGetterSetter.java similarity index 92% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithOutGetterSetter.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithOutGetterSetter.java index eebfa6f6f..2ed3d2083 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithOutGetterSetter.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithOutGetterSetter.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository.data; +package org.dizitart.no2.mapper.jackson.integration.repository.data; import lombok.EqualsAndHashCode; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithOutId.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithOutId.java similarity index 93% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithOutId.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithOutId.java index 43a6de490..e1604b9a9 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithOutId.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithOutId.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository.data; +package org.dizitart.no2.mapper.jackson.integration.repository.data; import lombok.Getter; import lombok.Setter; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithPrivateConstructor.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithPrivateConstructor.java similarity index 94% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithPrivateConstructor.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithPrivateConstructor.java index 2570ebb50..32b0052d1 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithPrivateConstructor.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithPrivateConstructor.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository.data; +package org.dizitart.no2.mapper.jackson.integration.repository.data; import lombok.EqualsAndHashCode; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithPublicField.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithPublicField.java similarity index 92% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithPublicField.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithPublicField.java index d5fde086b..77e552723 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithPublicField.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithPublicField.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository.data; +package org.dizitart.no2.mapper.jackson.integration.repository.data; import org.dizitart.no2.repository.annotations.Id; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithTransientField.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithTransientField.java similarity index 92% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithTransientField.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithTransientField.java index 2371e5998..8fb385d7f 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithTransientField.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithTransientField.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository.data; +package org.dizitart.no2.mapper.jackson.integration.repository.data; import lombok.Getter; import lombok.Setter; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithoutEmbeddedId.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithoutEmbeddedId.java similarity index 93% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithoutEmbeddedId.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithoutEmbeddedId.java index 147513d86..b8d68efef 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/WithoutEmbeddedId.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/repository/data/WithoutEmbeddedId.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.repository.data; +package org.dizitart.no2.mapper.jackson.integration.repository.data; import lombok.Data; import org.dizitart.no2.repository.annotations.Id; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/transaction/TransactionRepositoryTest.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/transaction/TransactionRepositoryTest.java similarity index 99% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/transaction/TransactionRepositoryTest.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/transaction/TransactionRepositoryTest.java index 7d3c1ff00..e94fb43b8 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/transaction/TransactionRepositoryTest.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/transaction/TransactionRepositoryTest.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.transaction; +package org.dizitart.no2.mapper.jackson.integration.transaction; import com.github.javafaker.Faker; import lombok.extern.slf4j.Slf4j; @@ -25,9 +25,9 @@ import org.dizitart.no2.exceptions.NitriteIOException; import org.dizitart.no2.exceptions.TransactionException; import org.dizitart.no2.index.IndexType; -import org.dizitart.no2.integration.repository.BaseObjectRepositoryTest; +import org.dizitart.no2.mapper.jackson.integration.repository.BaseObjectRepositoryTest; import org.dizitart.no2.repository.ObjectRepository; -import org.dizitart.no2.integration.repository.data.SubEmployee; +import org.dizitart.no2.mapper.jackson.integration.repository.data.SubEmployee; import org.dizitart.no2.transaction.Session; import org.dizitart.no2.transaction.Transaction; import org.junit.Test; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/transaction/TxData.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/transaction/TxData.java similarity index 93% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/transaction/TxData.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/transaction/TxData.java index 57461811e..47fca493b 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/transaction/TxData.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/transaction/TxData.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.integration.transaction; +package org.dizitart.no2.mapper.jackson.integration.transaction; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/common/mapper/modules/NitriteIdDeserializerTest.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/modules/NitriteIdDeserializerTest.java similarity index 95% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/common/mapper/modules/NitriteIdDeserializerTest.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/modules/NitriteIdDeserializerTest.java index 7528e79a1..70000b87a 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/common/mapper/modules/NitriteIdDeserializerTest.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/modules/NitriteIdDeserializerTest.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.common.mapper.modules; +package org.dizitart.no2.mapper.jackson.modules; import org.dizitart.no2.collection.NitriteId; import org.junit.Test; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/common/mapper/modules/NitriteIdSerializerTest.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/modules/NitriteIdSerializerTest.java similarity index 95% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/common/mapper/modules/NitriteIdSerializerTest.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/modules/NitriteIdSerializerTest.java index 54030b1ff..033e2d999 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/common/mapper/modules/NitriteIdSerializerTest.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/modules/NitriteIdSerializerTest.java @@ -15,7 +15,7 @@ * */ -package org.dizitart.no2.common.mapper.modules; +package org.dizitart.no2.mapper.jackson.modules; import org.junit.Test; diff --git a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/common/utils/ObjectUtilsTest.java b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/utils/ObjectUtilsTest.java similarity index 94% rename from nitrite-jackson-mapper/src/test/java/org/dizitart/no2/common/utils/ObjectUtilsTest.java rename to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/utils/ObjectUtilsTest.java index ae62377b6..c16c085f3 100644 --- a/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/common/utils/ObjectUtilsTest.java +++ b/nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/utils/ObjectUtilsTest.java @@ -15,10 +15,10 @@ * */ -package org.dizitart.no2.common.utils; +package org.dizitart.no2.mapper.jackson.utils; -import org.dizitart.no2.common.mapper.JacksonMapper; -import org.dizitart.no2.integration.repository.data.Book; +import org.dizitart.no2.mapper.jackson.JacksonMapper; +import org.dizitart.no2.mapper.jackson.integration.repository.data.Book; import org.junit.Test; import java.math.BigDecimal; diff --git a/nitrite-support/src/test/java/org/dizitart/no2/support/exchange/GithubIssueTest.java b/nitrite-support/src/test/java/org/dizitart/no2/support/exchange/GithubIssueTest.java index c94839374..1558cc0da 100644 --- a/nitrite-support/src/test/java/org/dizitart/no2/support/exchange/GithubIssueTest.java +++ b/nitrite-support/src/test/java/org/dizitart/no2/support/exchange/GithubIssueTest.java @@ -8,7 +8,7 @@ import org.dizitart.no2.collection.NitriteId; import org.dizitart.no2.common.SortOrder; import org.dizitart.no2.common.WriteResult; -import org.dizitart.no2.common.mapper.JacksonMapperModule; +import org.dizitart.no2.mapper.jackson.JacksonMapperModule; import org.dizitart.no2.index.IndexOptions; import org.dizitart.no2.index.IndexType; import org.dizitart.no2.mvstore.MVStoreModule; diff --git a/potassium-nitrite/src/main/kotlin/org/dizitart/kno2/KNO2JacksonMapper.kt b/potassium-nitrite/src/main/kotlin/org/dizitart/kno2/KNO2JacksonMapper.kt index 740c8e2e0..93a297d8b 100644 --- a/potassium-nitrite/src/main/kotlin/org/dizitart/kno2/KNO2JacksonMapper.kt +++ b/potassium-nitrite/src/main/kotlin/org/dizitart/kno2/KNO2JacksonMapper.kt @@ -22,7 +22,7 @@ import com.fasterxml.jackson.databind.SerializationFeature import com.fasterxml.jackson.datatype.jdk8.Jdk8Module import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule import com.fasterxml.jackson.module.kotlin.KotlinModule -import org.dizitart.no2.common.mapper.JacksonMapper +import org.dizitart.no2.mapper.jackson.JacksonMapper import org.dizitart.no2.spatial.jackson.GeometryModule /**