Merge branch 'main' into release

nitrite · Jul 1, 2024 · b297790 · b297790
2 parents 8efd36c + e81c6c5
commit b297790
Show file tree

Hide file tree

Showing 64 changed files with 680 additions and 465 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,6 +15,7 @@ on:
       - release
     paths-ignore:
       - "README.md"
+      - "CHANGELOG.md"
 
 jobs:
   build_linux:

diff --git a/.gitignore b/.gitignore
@@ -451,6 +451,7 @@ captures/
 test.log
 /build
 !no2-old.db
+!no2-v3.db
 .diffblue
 infer-out
 secring.gpg
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,20 @@
+## Release 4.3.0
+
+### New Changes
+
+- Nitrite now supports JPMS. It is now modular and can be used in Java 9 or above.
+- Version upgrade for several dependencies
+- Repository type validation can be disabled in `NitriteBuilder` as a fix for #966
+
+### Issue Fixes
+
+- Fix for #935
+- Fix for #948
+- Fix for #961
+- Fix for #966
+- Fix for #977
+- Fix for #990
+
 ## Release 4.2.2 - Mar 5, 2024
 
 ### Issue Fixes

diff --git a/nitrite-bom/pom.xml b/nitrite-bom/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.dizitart</groupId>
         <artifactId>nitrite-java</artifactId>
-        <version>4.2.2</version>
+        <version>4.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nitrite-bom</artifactId>

diff --git a/nitrite-jackson-mapper/pom.xml b/nitrite-jackson-mapper/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.dizitart</groupId>
         <artifactId>nitrite-java</artifactId>
-        <version>4.2.2</version>
+        <version>4.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nitrite-jackson-mapper</artifactId>
@@ -144,6 +144,17 @@
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive combine.children="append">
+                        <manifestEntries>
+                            <Automatic-Module-Name>org.dizitart.no2.jackson</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

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/common/mapper/JacksonMapperTest.java
@@ -17,183 +17,24 @@
 
 package org.dizitart.no2.common.mapper;
 
-import com.fasterxml.jackson.databind.DeserializationConfig;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.cfg.ContextAttributes;
-import com.fasterxml.jackson.databind.introspect.VisibilityChecker;
-import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator;
-import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.BinaryNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import org.dizitart.no2.NitriteConfig;
-import org.dizitart.no2.common.mapper.modules.NitriteIdModule;
 import org.dizitart.no2.exceptions.ObjectMappingException;
 import org.junit.Test;
 
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
-import java.text.DateFormat;
 
 import static org.junit.Assert.*;
 
 public class JacksonMapperTest {
-    @Test
-    public void testConstructor() {
-        ObjectMapper objectMapper = (new JacksonMapper()).getObjectMapper();
-        PolymorphicTypeValidator polymorphicTypeValidator = objectMapper.getPolymorphicTypeValidator();
-        assertTrue(polymorphicTypeValidator instanceof LaissezFaireSubTypeValidator);
-        VisibilityChecker<?> visibilityChecker = objectMapper.getVisibilityChecker();
-        assertTrue(visibilityChecker instanceof VisibilityChecker.Std);
-        assertNull(objectMapper.getPropertyNamingStrategy());
-        assertTrue(objectMapper
-            .getDeserializationContext() instanceof com.fasterxml.jackson.databind.deser.DefaultDeserializationContext.Impl);
-        assertSame(objectMapper.getFactory(), objectMapper.getJsonFactory());
-        assertTrue(objectMapper.getSerializerFactory() instanceof com.fasterxml.jackson.databind.ser.BeanSerializerFactory);
-        assertTrue(objectMapper
-            .getSerializerProvider() instanceof com.fasterxml.jackson.databind.ser.DefaultSerializerProvider.Impl);
-        assertTrue(objectMapper
-            .getSerializerProviderInstance() instanceof com.fasterxml.jackson.databind.ser.DefaultSerializerProvider.Impl);
-        assertTrue(
-            objectMapper.getSubtypeResolver() instanceof com.fasterxml.jackson.databind.jsontype.impl.StdSubtypeResolver);
-        DeserializationConfig deserializationConfig = objectMapper.getDeserializationConfig();
-        assertTrue(deserializationConfig
-            .getAnnotationIntrospector() instanceof com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector);
-        assertNull(deserializationConfig.getActiveView());
-        assertNull(deserializationConfig.getHandlerInstantiator());
-        assertSame(visibilityChecker, deserializationConfig.getDefaultVisibilityChecker());
-        assertTrue(deserializationConfig
-            .getClassIntrospector() instanceof com.fasterxml.jackson.databind.introspect.BasicClassIntrospector);
-        DateFormat expectedDateFormat = objectMapper.getDateFormat();
-        assertSame(expectedDateFormat, deserializationConfig.getDateFormat());
-        assertNull(deserializationConfig.getFullRootName());
-        JsonNodeFactory expectedNodeFactory = objectMapper.getNodeFactory();
-        assertSame(expectedNodeFactory, deserializationConfig.getNodeFactory());
-        assertSame(polymorphicTypeValidator, deserializationConfig.getPolymorphicTypeValidator());
-        assertNull(deserializationConfig.getDefaultMergeable());
-        assertEquals(237020288, deserializationConfig.getDeserializationFeatures());
-        assertTrue(deserializationConfig.getAttributes() instanceof ContextAttributes.Impl);
-    }
-
-    @Test
-    public void testConstructor2() {
-        NitriteIdModule nitriteIdModule = new NitriteIdModule();
-        NitriteIdModule nitriteIdModule1 = new NitriteIdModule();
-        JacksonMapper jacksonMapper = new JacksonMapper();
-        jacksonMapper.registerJacksonModule(nitriteIdModule);
-        jacksonMapper.registerJacksonModule(nitriteIdModule1);
-        jacksonMapper.registerJacksonModule(new NitriteIdModule());
-        ObjectMapper objectMapper = jacksonMapper.getObjectMapper();
-        PolymorphicTypeValidator polymorphicTypeValidator = objectMapper.getPolymorphicTypeValidator();
-        assertTrue(polymorphicTypeValidator instanceof LaissezFaireSubTypeValidator);
-        VisibilityChecker<?> visibilityChecker = objectMapper.getVisibilityChecker();
-        assertTrue(visibilityChecker instanceof VisibilityChecker.Std);
-        assertNull(objectMapper.getPropertyNamingStrategy());
-        assertTrue(objectMapper
-            .getDeserializationContext() instanceof com.fasterxml.jackson.databind.deser.DefaultDeserializationContext.Impl);
-        assertSame(objectMapper.getFactory(), objectMapper.getJsonFactory());
-        assertTrue(objectMapper.getSerializerFactory() instanceof com.fasterxml.jackson.databind.ser.BeanSerializerFactory);
-        assertTrue(objectMapper
-            .getSerializerProvider() instanceof com.fasterxml.jackson.databind.ser.DefaultSerializerProvider.Impl);
-        assertTrue(objectMapper
-            .getSerializerProviderInstance() instanceof com.fasterxml.jackson.databind.ser.DefaultSerializerProvider.Impl);
-        assertTrue(
-            objectMapper.getSubtypeResolver() instanceof com.fasterxml.jackson.databind.jsontype.impl.StdSubtypeResolver);
-        DeserializationConfig deserializationConfig = objectMapper.getDeserializationConfig();
-        assertTrue(deserializationConfig
-            .getAnnotationIntrospector() instanceof com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector);
-        assertNull(deserializationConfig.getActiveView());
-        assertNull(deserializationConfig.getHandlerInstantiator());
-        assertSame(visibilityChecker, deserializationConfig.getDefaultVisibilityChecker());
-        assertTrue(deserializationConfig
-            .getClassIntrospector() instanceof com.fasterxml.jackson.databind.introspect.BasicClassIntrospector);
-        DateFormat expectedDateFormat = objectMapper.getDateFormat();
-        assertSame(expectedDateFormat, deserializationConfig.getDateFormat());
-        assertNull(deserializationConfig.getFullRootName());
-        JsonNodeFactory expectedNodeFactory = objectMapper.getNodeFactory();
-        assertSame(expectedNodeFactory, deserializationConfig.getNodeFactory());
-        assertSame(polymorphicTypeValidator, deserializationConfig.getPolymorphicTypeValidator());
-        assertNull(deserializationConfig.getDefaultMergeable());
-        assertEquals(237020288, deserializationConfig.getDeserializationFeatures());
-        assertTrue(deserializationConfig.getAttributes() instanceof ContextAttributes.Impl);
-    }
-
-    @Test
-    public void testConstructor3() {
-        JacksonMapper jacksonMapper = new JacksonMapper();
-        jacksonMapper.registerJacksonModule(new NitriteIdModule());
-        ObjectMapper objectMapper = jacksonMapper.getObjectMapper();
-        PolymorphicTypeValidator polymorphicTypeValidator = objectMapper.getPolymorphicTypeValidator();
-        assertTrue(polymorphicTypeValidator instanceof LaissezFaireSubTypeValidator);
-        VisibilityChecker<?> visibilityChecker = objectMapper.getVisibilityChecker();
-        assertTrue(visibilityChecker instanceof VisibilityChecker.Std);
-        assertNull(objectMapper.getPropertyNamingStrategy());
-        assertTrue(objectMapper
-            .getDeserializationContext() instanceof com.fasterxml.jackson.databind.deser.DefaultDeserializationContext.Impl);
-        assertSame(objectMapper.getFactory(), objectMapper.getJsonFactory());
-        assertTrue(objectMapper.getSerializerFactory() instanceof com.fasterxml.jackson.databind.ser.BeanSerializerFactory);
-        assertTrue(objectMapper
-            .getSerializerProvider() instanceof com.fasterxml.jackson.databind.ser.DefaultSerializerProvider.Impl);
-        assertTrue(objectMapper
-            .getSerializerProviderInstance() instanceof com.fasterxml.jackson.databind.ser.DefaultSerializerProvider.Impl);
-        assertTrue(
-            objectMapper.getSubtypeResolver() instanceof com.fasterxml.jackson.databind.jsontype.impl.StdSubtypeResolver);
-        DeserializationConfig deserializationConfig = objectMapper.getDeserializationConfig();
-        assertTrue(deserializationConfig
-            .getAnnotationIntrospector() instanceof com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector);
-        assertNull(deserializationConfig.getActiveView());
-        assertNull(deserializationConfig.getHandlerInstantiator());
-        assertSame(visibilityChecker, deserializationConfig.getDefaultVisibilityChecker());
-        assertTrue(deserializationConfig
-            .getClassIntrospector() instanceof com.fasterxml.jackson.databind.introspect.BasicClassIntrospector);
-        DateFormat expectedDateFormat = objectMapper.getDateFormat();
-        assertSame(expectedDateFormat, deserializationConfig.getDateFormat());
-        assertNull(deserializationConfig.getFullRootName());
-        JsonNodeFactory expectedNodeFactory = objectMapper.getNodeFactory();
-        assertSame(expectedNodeFactory, deserializationConfig.getNodeFactory());
-        assertSame(polymorphicTypeValidator, deserializationConfig.getPolymorphicTypeValidator());
-        assertNull(deserializationConfig.getDefaultMergeable());
-        assertEquals(237020288, deserializationConfig.getDeserializationFeatures());
-        assertTrue(deserializationConfig.getAttributes() instanceof ContextAttributes.Impl);
-    }
-
     @Test
     public void testGetObjectMapper() {
         ObjectMapper actualCreateObjectMapperResult = (new JacksonMapper()).getObjectMapper();
-        PolymorphicTypeValidator polymorphicTypeValidator = actualCreateObjectMapperResult.getPolymorphicTypeValidator();
-        assertTrue(polymorphicTypeValidator instanceof LaissezFaireSubTypeValidator);
-        VisibilityChecker<?> visibilityChecker = actualCreateObjectMapperResult.getVisibilityChecker();
-        assertTrue(visibilityChecker instanceof VisibilityChecker.Std);
-        assertNull(actualCreateObjectMapperResult.getPropertyNamingStrategy());
-        assertTrue(actualCreateObjectMapperResult
-            .getDeserializationContext() instanceof com.fasterxml.jackson.databind.deser.DefaultDeserializationContext.Impl);
-        assertSame(actualCreateObjectMapperResult.getFactory(), actualCreateObjectMapperResult.getJsonFactory());
-        assertTrue(actualCreateObjectMapperResult
-            .getSerializerFactory() instanceof com.fasterxml.jackson.databind.ser.BeanSerializerFactory);
-        assertTrue(actualCreateObjectMapperResult
-            .getSerializerProvider() instanceof com.fasterxml.jackson.databind.ser.DefaultSerializerProvider.Impl);
-        assertTrue(actualCreateObjectMapperResult
-            .getSerializerProviderInstance() instanceof com.fasterxml.jackson.databind.ser.DefaultSerializerProvider.Impl);
-        assertTrue(actualCreateObjectMapperResult
-            .getSubtypeResolver() instanceof com.fasterxml.jackson.databind.jsontype.impl.StdSubtypeResolver);
-        DeserializationConfig deserializationConfig = actualCreateObjectMapperResult.getDeserializationConfig();
-        assertTrue(deserializationConfig.getAttributes() instanceof ContextAttributes.Impl);
-        assertTrue(deserializationConfig
-            .getAnnotationIntrospector() instanceof com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector);
-        assertNull(deserializationConfig.getActiveView());
-        assertEquals(237020288, deserializationConfig.getDeserializationFeatures());
-        DateFormat expectedDateFormat = actualCreateObjectMapperResult.getDateFormat();
-        assertSame(expectedDateFormat, deserializationConfig.getDateFormat());
-        assertNull(deserializationConfig.getDefaultMergeable());
-        assertSame(visibilityChecker, deserializationConfig.getDefaultVisibilityChecker());
-        assertNull(deserializationConfig.getHandlerInstantiator());
-        JsonNodeFactory expectedNodeFactory = actualCreateObjectMapperResult.getNodeFactory();
-        assertSame(expectedNodeFactory, deserializationConfig.getNodeFactory());
-        assertSame(polymorphicTypeValidator, deserializationConfig.getPolymorphicTypeValidator());
-        assertTrue(deserializationConfig
-            .getClassIntrospector() instanceof com.fasterxml.jackson.databind.introspect.BasicClassIntrospector);
-        assertNull(deserializationConfig.getFullRootName());
-        assertNull(deserializationConfig.getProblemHandlers());
+        assertNotNull(actualCreateObjectMapperResult);
     }
 
     @Test

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/integration/NitriteTest.java
@@ -33,7 +33,6 @@
 import org.dizitart.no2.repository.ObjectRepository;
 import org.dizitart.no2.repository.annotations.Id;
 import org.dizitart.no2.repository.annotations.Index;
-import org.dizitart.no2.repository.annotations.Indices;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -264,9 +263,7 @@ public void testNoUniqueAndTextIndex() {
     @Data
     @NoArgsConstructor
     @AllArgsConstructor
-    @Indices({
-        @Index(fields = "synced", type = IndexType.NON_UNIQUE)
-    })
+    @Index(fields = "synced", type = IndexType.NON_UNIQUE)
     public static class Receipt {
         @Id
         private String clientRef;
@@ -283,21 +280,17 @@ public enum Status {
     public static class EmptyClass {
     }
 
-    @Indices({
-        @Index(fields = "value", type = IndexType.FULL_TEXT),
-        @Index(fields = "value")
-    })
     @Data
     @NoArgsConstructor
     @AllArgsConstructor
+    @Index(fields = "value", type = IndexType.FULL_TEXT)
+    @Index(fields = "value")
     public static class EntityUniqueFullText {
         private String value;
     }
 
-    @Indices({
-        @Index(fields = "value", type = IndexType.FULL_TEXT),
-        @Index(fields = "value", type = IndexType.NON_UNIQUE)
-    })
+    @Index(fields = "value", type = IndexType.FULL_TEXT)
+    @Index(fields = "value", type = IndexType.NON_UNIQUE)
     @Data
     @NoArgsConstructor
     @AllArgsConstructor

diff --git a/...apper/src/test/java/org/dizitart/no2/integration/repository/CustomFieldSeparatorTest.java b/...apper/src/test/java/org/dizitart/no2/integration/repository/CustomFieldSeparatorTest.java
@@ -31,7 +31,6 @@
 import org.dizitart.no2.repository.ObjectRepository;
 import org.dizitart.no2.repository.annotations.Id;
 import org.dizitart.no2.repository.annotations.Index;
-import org.dizitart.no2.repository.annotations.Indices;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -113,11 +112,9 @@ public void testFindByEmbeddedField() {
 
     @ToString
     @EqualsAndHashCode
-    @Indices({
-        @Index(fields = "joinDate", type = IndexType.NON_UNIQUE),
-        @Index(fields = "address", type = IndexType.FULL_TEXT),
-        @Index(fields = "employeeNote:text", type = IndexType.FULL_TEXT)
-    })
+    @Index(fields = "joinDate", type = IndexType.NON_UNIQUE)
+    @Index(fields = "address", type = IndexType.FULL_TEXT)
+    @Index(fields = "employeeNote:text", type = IndexType.FULL_TEXT)
     public static class EmployeeForCustomSeparator implements Serializable {
         @Id
         @Getter

diff --git a/...per/src/test/java/org/dizitart/no2/integration/repository/UniversalTextTokenizerTest.java b/...per/src/test/java/org/dizitart/no2/integration/repository/UniversalTextTokenizerTest.java
@@ -29,7 +29,6 @@
 import org.dizitart.no2.repository.Cursor;
 import org.dizitart.no2.repository.ObjectRepository;
 import org.dizitart.no2.repository.annotations.Index;
-import org.dizitart.no2.repository.annotations.Indices;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -173,9 +172,7 @@ public void testUniversalFullTextIndexing() {
         }
     }
 
-    @Indices(
-        @Index(fields = "text", type = IndexType.FULL_TEXT)
-    )
+    @Index(fields = "text", type = IndexType.FULL_TEXT)
     public static class TextData {
         public int id;
         public String text;

diff --git a/...te-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/Company.java b/...te-jackson-mapper/src/test/java/org/dizitart/no2/integration/repository/data/Company.java
@@ -24,7 +24,6 @@
 import lombok.ToString;
 import org.dizitart.no2.repository.annotations.Id;
 import org.dizitart.no2.repository.annotations.Index;
-import org.dizitart.no2.repository.annotations.Indices;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -38,9 +37,7 @@
 @Setter
 @ToString
 @EqualsAndHashCode
-@Indices({
-    @Index(fields = "companyName")
-})
+@Index(fields = "companyName")
 public class Company implements Serializable {
     @Id(fieldName = "company_id")
     @JsonProperty("company_id")

diff --git a/nitrite-mvstore-adapter/pom.xml b/nitrite-mvstore-adapter/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.dizitart</groupId>
         <artifactId>nitrite-java</artifactId>
-        <version>4.2.2</version>
+        <version>4.3.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>nitrite-mvstore-adapter</artifactId>
@@ -182,6 +182,17 @@
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive combine.children="append">
+                        <manifestEntries>
+                            <Automatic-Module-Name>org.dizitart.no2.mvstore</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
         </plugins>
     </build>