Skip to content

Fixes #1035 #1036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anidotnet merged 1 commit into from
Sep 6, 2024
Merged

Fixes #1035 #1036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
9 changes: 5 additions & 4 deletions ...tart/no2/common/mapper/JacksonMapper.java → ...art/no2/mapper/jackson/JacksonMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,16 @@
* 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;
import com.fasterxml.jackson.databind.Module;
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;

Expand All @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions ...o2/common/mapper/JacksonMapperModule.java → ...2/mapper/jackson/JacksonMapperModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
*/
Expand Down
2 changes: 1 addition & 1 deletion ...mapper/modules/NitriteIdDeserializer.java → ...ackson/modules/NitriteIdDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ommon/mapper/modules/NitriteIdModule.java → ...pper/jackson/modules/NitriteIdModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...n/mapper/modules/NitriteIdSerializer.java → .../jackson/modules/NitriteIdSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ommon/mapper/JacksonMapperModuleTest.java → ...pper/jackson/JacksonMapperModuleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
*/

package org.dizitart.no2.common.mapper;
package org.dizitart.no2.mapper.jackson;

import org.junit.Test;

Expand Down
2 changes: 1 addition & 1 deletion .../no2/common/mapper/JacksonMapperTest.java → ...no2/mapper/jackson/JacksonMapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions ...dizitart/no2/integration/NitriteTest.java → ...pper/jackson/integration/NitriteTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@
*
*/

package org.dizitart.no2.integration;
package org.dizitart.no2.mapper.jackson.integration;

import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
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;
Expand All @@ -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.*;

/**
Expand Down
12 changes: 6 additions & 6 deletions ...o2/integration/migrate/MigrationTest.java → ...on/integration/migrate/MigrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@
*
*/

package org.dizitart.no2.integration.migrate;
package org.dizitart.no2.mapper.jackson.integration.migrate;

import com.github.javafaker.Faker;
import org.dizitart.no2.Nitrite;
import org.dizitart.no2.collection.Document;
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;
Expand All @@ -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.*;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...art/no2/integration/migrate/NewClass.java → ...jackson/integration/migrate/NewClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...art/no2/integration/migrate/OldClass.java → ...jackson/integration/migrate/OldClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions .../repository/BaseObjectRepositoryTest.java → .../repository/BaseObjectRepositoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions .../repository/CustomFieldSeparatorTest.java → .../repository/CustomFieldSeparatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@
*
*/

package org.dizitart.no2.integration.repository;
package org.dizitart.no2.mapper.jackson.integration.repository;

import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
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;
Expand All @@ -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;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...integration/repository/InternalClass.java → ...integration/repository/InternalClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...gration/repository/JacksonModuleTest.java → ...gration/repository/JacksonModuleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;

Expand Down
8 changes: 4 additions & 4 deletions ...gration/repository/NitriteIdAsIdTest.java → ...gration/repository/NitriteIdAsIdTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions ...egration/repository/ObjectCursorTest.java → ...egration/repository/ObjectCursorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...ository/ObjectRepositoryNegativeTest.java → ...ository/ObjectRepositoryNegativeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...tion/repository/ObjectRepositoryTest.java → ...tion/repository/ObjectRepositoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...ntegration/repository/ProjectionTest.java → ...ntegration/repository/ProjectionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...pository/RepositoryCompoundIndexTest.java → ...pository/RepositoryCompoundIndexTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading