Skip to content

Commit 8167612

Browse files
anidotnetanidotnet
committed
Merge branch 'main' into develop
2 parents 48b971e + 57dbf3c commit 8167612

File tree

72 files changed

+119
-127
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+119
-127
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
- Fix for `Document.getFields()` not returning iterable fields
1111
- Fix for failing tests on systems with non-ENGLISH locale #994
1212
- Fix for NPE in `DefaultTransactionalRepository` #1032
13+
- Fix for JPMS issue #1035
1314

1415
## Release 4.3.0 - Jul 1, 2024
1516

nitrite-jackson-mapper/src/main/java/org/dizitart/no2/common/mapper/JacksonMapper.java renamed to nitrite-jackson-mapper/src/main/java/org/dizitart/no2/mapper/jackson/JacksonMapper.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,16 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.dizitart.no2.common.mapper;
17+
package org.dizitart.no2.mapper.jackson;
1818

1919
import com.fasterxml.jackson.annotation.JsonAutoDetect;
2020
import com.fasterxml.jackson.core.JsonParser;
2121
import com.fasterxml.jackson.databind.Module;
2222
import com.fasterxml.jackson.databind.*;
2323
import org.dizitart.no2.NitriteConfig;
2424
import org.dizitart.no2.collection.Document;
25-
import org.dizitart.no2.common.mapper.modules.NitriteIdModule;
25+
import org.dizitart.no2.common.mapper.NitriteMapper;
26+
import org.dizitart.no2.mapper.jackson.modules.NitriteIdModule;
2627
import org.dizitart.no2.exceptions.ObjectMappingException;
2728
import org.dizitart.no2.exceptions.ValidationException;
2829

@@ -32,11 +33,11 @@
3233
import static org.dizitart.no2.common.util.ValidationUtils.notNull;
3334

3435
/**
35-
* A {@link NitriteMapper} implementation that uses Jackson ObjectMapper to
36+
* A {@link org.dizitart.no2.common.mapper.NitriteMapper} implementation that uses Jackson ObjectMapper to
3637
* convert objects to and from Nitrite document.
3738
*
3839
* @since 4.0
39-
* @see NitriteMapper
40+
* @see org.dizitart.no2.common.mapper.NitriteMapper
4041
* @author Anindya Chatterjee
4142
*/
4243
public class JacksonMapper implements NitriteMapper {

nitrite-jackson-mapper/src/main/java/org/dizitart/no2/common/mapper/JacksonMapperModule.java renamed to nitrite-jackson-mapper/src/main/java/org/dizitart/no2/mapper/jackson/JacksonMapperModule.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.dizitart.no2.common.mapper;
17+
package org.dizitart.no2.mapper.jackson;
1818

1919
import com.fasterxml.jackson.databind.Module;
2020
import org.dizitart.no2.common.module.NitriteModule;
@@ -25,11 +25,11 @@
2525
import static org.dizitart.no2.common.util.Iterables.setOf;
2626

2727
/**
28-
* A Nitrite module that provides a jackson based {@link NitriteMapper}
28+
* A Nitrite module that provides a jackson based {@link org.dizitart.no2.common.mapper.NitriteMapper}
2929
* implementation for object to document conversion.
3030
*
3131
* @since 4.0
32-
* @see NitriteMapper
32+
* @see org.dizitart.no2.common.mapper.NitriteMapper
3333
* @see JacksonMapper
3434
* @author Anindya Chatterjee
3535
*/

nitrite-jackson-mapper/src/main/java/org/dizitart/no2/common/mapper/modules/NitriteIdDeserializer.java renamed to nitrite-jackson-mapper/src/main/java/org/dizitart/no2/mapper/jackson/modules/NitriteIdDeserializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.dizitart.no2.common.mapper.modules;
17+
package org.dizitart.no2.mapper.jackson.modules;
1818

1919
import com.fasterxml.jackson.core.JsonParser;
2020
import com.fasterxml.jackson.databind.DeserializationContext;

nitrite-jackson-mapper/src/main/java/org/dizitart/no2/common/mapper/modules/NitriteIdModule.java renamed to nitrite-jackson-mapper/src/main/java/org/dizitart/no2/mapper/jackson/modules/NitriteIdModule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.dizitart.no2.common.mapper.modules;
17+
package org.dizitart.no2.mapper.jackson.modules;
1818

1919
import com.fasterxml.jackson.databind.module.SimpleModule;
2020
import org.dizitart.no2.collection.NitriteId;

nitrite-jackson-mapper/src/main/java/org/dizitart/no2/common/mapper/modules/NitriteIdSerializer.java renamed to nitrite-jackson-mapper/src/main/java/org/dizitart/no2/mapper/jackson/modules/NitriteIdSerializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.dizitart.no2.common.mapper.modules;
17+
package org.dizitart.no2.mapper.jackson.modules;
1818

1919
import com.fasterxml.jackson.core.JsonGenerator;
2020
import com.fasterxml.jackson.databind.SerializerProvider;

nitrite-jackson-mapper/src/test/java/org/dizitart/no2/common/mapper/JacksonMapperModuleTest.java renamed to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/JacksonMapperModuleTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
*/
1717

18-
package org.dizitart.no2.common.mapper;
18+
package org.dizitart.no2.mapper.jackson;
1919

2020
import org.junit.Test;
2121

nitrite-jackson-mapper/src/test/java/org/dizitart/no2/common/mapper/JacksonMapperTest.java renamed to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/JacksonMapperTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*
1616
*/
1717

18-
package org.dizitart.no2.common.mapper;
18+
package org.dizitart.no2.mapper.jackson;
1919

2020
import com.fasterxml.jackson.databind.ObjectMapper;
2121
import com.fasterxml.jackson.databind.node.ArrayNode;

nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/NitriteTest.java renamed to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/NitriteTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@
1515
*
1616
*/
1717

18-
package org.dizitart.no2.integration;
18+
package org.dizitart.no2.mapper.jackson.integration;
1919

2020
import lombok.AllArgsConstructor;
2121
import lombok.Data;
2222
import lombok.NoArgsConstructor;
2323
import org.dizitart.no2.Nitrite;
2424
import org.dizitart.no2.collection.Document;
2525
import org.dizitart.no2.collection.NitriteCollection;
26-
import org.dizitart.no2.common.mapper.JacksonMapperModule;
26+
import org.dizitart.no2.mapper.jackson.JacksonMapperModule;
2727
import org.dizitart.no2.exceptions.IndexingException;
2828
import org.dizitart.no2.exceptions.NitriteIOException;
2929
import org.dizitart.no2.exceptions.ValidationException;
3030
import org.dizitart.no2.index.IndexOptions;
3131
import org.dizitart.no2.index.IndexType;
32-
import org.dizitart.no2.integration.repository.Retry;
32+
import org.dizitart.no2.mapper.jackson.integration.repository.Retry;
3333
import org.dizitart.no2.repository.ObjectRepository;
3434
import org.dizitart.no2.repository.annotations.Id;
3535
import org.dizitart.no2.repository.annotations.Index;
@@ -47,7 +47,7 @@
4747
import static org.dizitart.no2.common.Constants.INTERNAL_NAME_SEPARATOR;
4848
import static org.dizitart.no2.common.Constants.META_MAP_NAME;
4949
import static org.dizitart.no2.filters.Filter.ALL;
50-
import static org.dizitart.no2.integration.repository.TestUtil.createDb;
50+
import static org.dizitart.no2.mapper.jackson.integration.repository.TestUtil.createDb;
5151
import static org.junit.Assert.*;
5252

5353
/**

nitrite-jackson-mapper/src/test/java/org/dizitart/no2/integration/migrate/MigrationTest.java renamed to nitrite-jackson-mapper/src/test/java/org/dizitart/no2/mapper/jackson/integration/migrate/MigrationTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@
1515
*
1616
*/
1717

18-
package org.dizitart.no2.integration.migrate;
18+
package org.dizitart.no2.mapper.jackson.integration.migrate;
1919

2020
import com.github.javafaker.Faker;
2121
import org.dizitart.no2.Nitrite;
2222
import org.dizitart.no2.collection.Document;
2323
import org.dizitart.no2.collection.NitriteCollection;
2424
import org.dizitart.no2.common.Constants;
2525
import org.dizitart.no2.common.Fields;
26-
import org.dizitart.no2.common.mapper.JacksonMapperModule;
26+
import org.dizitart.no2.mapper.jackson.JacksonMapperModule;
2727
import org.dizitart.no2.exceptions.MigrationException;
2828
import org.dizitart.no2.index.IndexType;
29-
import org.dizitart.no2.integration.repository.Retry;
30-
import org.dizitart.no2.integration.repository.TestUtil;
29+
import org.dizitart.no2.mapper.jackson.integration.repository.Retry;
30+
import org.dizitart.no2.mapper.jackson.integration.repository.TestUtil;
3131
import org.dizitart.no2.migration.InstructionSet;
3232
import org.dizitart.no2.migration.Migration;
3333
import org.dizitart.no2.migration.TypeConverter;
@@ -42,8 +42,8 @@
4242

4343
import static org.dizitart.no2.filters.FluentFilter.where;
4444
import static org.dizitart.no2.index.IndexOptions.indexOptions;
45-
import static org.dizitart.no2.integration.repository.BaseObjectRepositoryTest.getRandomTempDbFile;
46-
import static org.dizitart.no2.integration.repository.TestUtil.createDb;
45+
import static org.dizitart.no2.mapper.jackson.integration.repository.BaseObjectRepositoryTest.getRandomTempDbFile;
46+
import static org.dizitart.no2.mapper.jackson.integration.repository.TestUtil.createDb;
4747
import static org.junit.Assert.*;
4848

4949
/**

0 commit comments

Comments
 (0)