Merge branch 'main' into develop

anidotnet · anidotnet · commit 1f0e61fa5785 · 2025-01-26T12:53:55.000+05:30
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -3,11 +3,33 @@ updates:
   - package-ecosystem: maven
     directory: "/"
     schedule:
-      interval: daily
+      interval: weekly
     target-branch: main
+    ignore:
+      # Ignore minor version updates for dependencies with group ID "com.google.errorprone"
+      - dependency-name: "com.google.errorprone:*"
+        update-types: [ "version-update:semver-minor" ]
+    groups:
+      security:
+        # Group security updates into a single pull request
+        applies-to: security-updates
+        patterns:
+          - "*"
+      production-dependencies:
+        # Group version updates for "production" dependencies into a single pull request
+        applies-to: version-updates
+        dependency-type: production
+        patterns:
+          - "*"
+      development-dependencies:
+        # Group version updates for "development" dependencies into a single pull request
+        applies-to: version-updates
+        dependency-type: development
+        patterns:
+          - "*"
 
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: "weekly"
     target-branch: main
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -39,11 +39,11 @@ jobs:
           cache: 'maven'
 
       - name: Build with Maven
-        run: mvn -B -ff -ntp clean install -Dgpg.skip=true
+        run: mvn -B -ff -ntp clean install
 
       - name: Publish Code Coverage
         if: github.ref == 'refs/heads/main' && matrix.java == '11'
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           flags: unittests
@@ -70,7 +70,7 @@ jobs:
           cache: 'maven'
 
       - name: Build with Maven
-        run: mvn -B -ff -ntp clean install -Dgpg.skip=true
+        run: mvn -B -ff -ntp clean install
 
   build_windows:
     runs-on: windows-latest
@@ -93,7 +93,7 @@ jobs:
           cache: 'maven'
 
       - name: Build with Maven
-        run: mvn -B -ff -ntp clean install --% -Dgpg.skip=true
+        run: mvn -B -ff -ntp clean install
 
   verify-native:
     name: Verify GraalVM ${{ matrix.java }} compatibility on ${{ matrix.os }}
@@ -105,13 +105,13 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: graalvm/setup-graalvm@v1.2.3
+      - uses: graalvm/setup-graalvm@v1.2.8
         with:
           java-version: ${{ matrix.java }}
           distribution: 'graalvm-community'
 
       - name: Install nitrite
-        run: mvn -B -ff -ntp clean install "-Dgpg.skip=true" -DskipTests
+        run: mvn -B -ff -ntp clean install -DskipTests
 
       - name: Run native tests
         working-directory: ./nitrite-native-tests
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -51,7 +51,7 @@ jobs:
           PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }}
 
       - name: Deploy Release
-        run: mvn -B -ff -ntp deploy -DskipTests -Dgpg.passphrase="$PGP_KEY_PASSWORD"
+        run: mvn -P deploy -B -ff -ntp deploy -DskipTests -Dgpg.passphrase="$PGP_KEY_PASSWORD"
         shell: bash
         env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USER }}
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -51,7 +51,7 @@ jobs:
           PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }}
 
       - name: Deploy Snapshot
-        run: mvn -B -ff -ntp deploy -DskipTests -Dgpg.passphrase="$PGP_KEY_PASSWORD"
+        run: mvn -P deploy -B -ff -ntp  deploy -DskipTests -Dgpg.passphrase="$PGP_KEY_PASSWORD"
         shell: bash
         env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USER }}
diff --git a/nitrite-bom/pom.xml b/nitrite-bom/pom.xml
@@ -67,17 +67,4 @@
             <snapshots><enabled>true</enabled></snapshots>
         </repository>
     </repositories>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/nitrite-jackson-mapper/pom.xml b/nitrite-jackson-mapper/pom.xml
@@ -132,18 +132,10 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>animal-sniffer-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
diff --git a/nitrite-mvstore-adapter/pom.xml b/nitrite-mvstore-adapter/pom.xml
@@ -174,14 +174,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
diff --git a/nitrite-native-tests/pom.xml b/nitrite-native-tests/pom.xml
@@ -20,9 +20,9 @@
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <assertj.version>3.26.3</assertj.version>
-        <junit.version>5.11.0</junit.version>
-        <native-build-tools-plugin.version>0.10.2</native-build-tools-plugin.version>
+        <assertj.version>3.27.3</assertj.version>
+        <junit.version>5.11.4</junit.version>
+        <native-build-tools-plugin.version>0.10.4</native-build-tools-plugin.version>
     </properties>
 
     <dependencyManagement>
diff --git a/nitrite-rocksdb-adapter/pom.xml b/nitrite-rocksdb-adapter/pom.xml
@@ -172,14 +172,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
diff --git a/nitrite-rocksdb-adapter/src/main/java/org/dizitart/no2/rocksdb/formatter/NitriteSerializers.java b/nitrite-rocksdb-adapter/src/main/java/org/dizitart/no2/rocksdb/formatter/NitriteSerializers.java
@@ -9,10 +9,10 @@
 import com.esotericsoftware.kryo.kryo5.serializers.MapSerializer;
 import org.dizitart.no2.collection.Document;
 import org.dizitart.no2.collection.NitriteId;
-import org.dizitart.no2.common.meta.Attributes;
+import org.dizitart.no2.common.DBValue;
 import org.dizitart.no2.common.Fields;
+import org.dizitart.no2.common.meta.Attributes;
 import org.dizitart.no2.common.tuples.Pair;
-import org.dizitart.no2.common.DBValue;
 import org.dizitart.no2.common.util.SpatialKey;
 import org.dizitart.no2.index.BoundingBox;
 import org.dizitart.no2.index.IndexDescriptor;
diff --git a/nitrite-rocksdb-adapter/src/test/java/org/dizitart/no2/NitriteTest.java b/nitrite-rocksdb-adapter/src/test/java/org/dizitart/no2/NitriteTest.java
@@ -443,6 +443,31 @@ public void run() {
         db.close();
     }
 
+    @Test
+    public void testIssue1093() {
+        ObjectRepository<Receipt> repository = db.getRepository(Receipt.class);
+        repository.clear();
+
+        Receipt receipt1 = new Receipt();
+        receipt1.clientRef = "111-11111";
+        receipt1.status = Receipt.Status.PREPARING;
+
+        Receipt receipt2 = new Receipt();
+        receipt2.clientRef = "222-22222";
+        receipt2.status = Receipt.Status.PREPARING;
+
+        repository = db.getRepository(Receipt.class);
+        repository.update(receipt1, true);
+        repository.update(receipt2, true);
+
+        assertEquals(repository.find().size(), 2);
+        Receipt found1 = repository.getById("111-11111");
+        assertNotNull(found1);
+
+        Receipt found2 = repository.getById("222-22222");
+        assertNotNull(found2);
+    }
+
     @Data
     @AllArgsConstructor
     @NoArgsConstructor
diff --git a/nitrite-spatial/pom.xml b/nitrite-spatial/pom.xml
@@ -117,10 +117,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>animal-sniffer-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
diff --git a/nitrite-support/pom.xml b/nitrite-support/pom.xml
@@ -125,14 +125,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>animal-sniffer-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
diff --git a/nitrite/pom.xml b/nitrite/pom.xml
@@ -206,18 +206,10 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>animal-sniffer-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
diff --git a/nitrite/src/main/java/org/dizitart/no2/collection/NitriteDocument.java b/nitrite/src/main/java/org/dizitart/no2/collection/NitriteDocument.java
@@ -308,6 +308,10 @@ private void deepPut(String[] splits, Object value) {
             throw new ValidationException("Invalid key provided");
         }
         String key = splits[0];
+        if (isNullOrEmpty(key)) {
+            throw new ValidationException("Invalid key provided");
+        }
+
         if (splits.length == 1) {
             // if last key, simply put in the current document
             put(key, value);
@@ -338,6 +342,10 @@ private void deepRemove(String[] splits) {
             throw new ValidationException("Invalid key provided");
         }
         String key = splits[0];
+        if (isNullOrEmpty(key)) {
+            throw new ValidationException("Invalid key provided");
+        }
+
         if (splits.length == 1) {
             // if last key, simply remove the current document
             remove(key);
@@ -367,6 +375,12 @@ private void deepRemove(String[] splits) {
                     // if there are more splits, then this is an embedded document
                     // so remove the element at the next level
                     ((NitriteDocument) item).deepRemove(Arrays.copyOfRange(splits, 2, splits.length));
+                    if (((NitriteDocument) item).size() == 0) {
+                        // if the next level document is an empty one
+                        // remove the element at the current level
+                        list.remove(index);
+                        this.put(key, list);
+                    }
                 } else {
                     // if there are no more splits, then this is a primitive value
                     // so remove the element at the next level
@@ -407,8 +421,13 @@ private Object getByEmbeddedKey(String embeddedKey) {
             return null;
         }
 
+        String key = path[0];
+        if (isNullOrEmpty(key)) {
+            throw new ValidationException("Invalid key provided");
+        }
+
         // get current level value and scan to next level using remaining keys
-        return recursiveGet(get(path[0]), Arrays.copyOfRange(path, 1, path.length));
+        return recursiveGet(get(key), Arrays.copyOfRange(path, 1, path.length));
     }
 
     @SuppressWarnings("unchecked")
@@ -423,7 +442,12 @@ private Object recursiveGet(Object object, String[] remainingPath) {
 
         if (object instanceof Document) {
             // if the current level value is document, scan to the next level with remaining keys
-            return recursiveGet(((Document) object).get(remainingPath[0]),
+            String key = remainingPath[0];
+            if (isNullOrEmpty(key)) {
+                throw new ValidationException("Invalid key provided");
+            }
+
+            return recursiveGet(((Document) object).get(key),
                 Arrays.copyOfRange(remainingPath, 1, remainingPath.length));
         }
 
@@ -432,6 +456,9 @@ private Object recursiveGet(Object object, String[] remainingPath) {
 
             // get the first key
             String accessor = remainingPath[0];
+            if (isNullOrEmpty(accessor)) {
+                throw new ValidationException("Invalid key provided");
+            }
 
             // convert current value to object array
             Object[] array = convertToObjectArray(object);
diff --git a/nitrite/src/main/java/org/dizitart/no2/collection/operation/FindOptimizer.java b/nitrite/src/main/java/org/dizitart/no2/collection/operation/FindOptimizer.java
@@ -160,8 +160,8 @@ private void planForIdFilter(FindPlan findPlan, List<Filter> filters) {
                 // handle byId filter specially
                 if (equalsFilter.getField().equals(DOC_ID)) {
                     findPlan.setByIdFilter(equalsFilter);
+                    break;
                 }
-                break;
             }
         }
     }
diff --git a/nitrite/src/main/java/org/dizitart/no2/collection/operation/IndexManager.java b/nitrite/src/main/java/org/dizitart/no2/collection/operation/IndexManager.java
@@ -113,6 +113,7 @@ public void clearAll() {
                     String indexMapName = indexMeta.getIndexMap();
                     NitriteMap<?, ?> indexMap = nitriteStore.openMap(indexMapName, Object.class, Object.class);
                     indexMap.clear();
+                    indexMap.close();
                 }
             }
         }
diff --git a/nitrite/src/main/java/org/dizitart/no2/common/DBNull.java b/nitrite/src/main/java/org/dizitart/no2/common/DBNull.java
@@ -1,11 +1,14 @@
 package org.dizitart.no2.common;
 
+import lombok.Getter;
+
 /**
  * @author Anindya Chatterjee
  * @since 1.0
  */
 public class DBNull extends DBValue {
     private static final long serialVersionUID = 1598819770L;
+    @Getter
     private static final DBNull instance = new DBNull();
 
     private DBNull() {
@@ -22,10 +25,6 @@ public int compareTo(DBValue o) {
         return -1;
     }
 
-    public static DBNull getInstance() {
-        return instance;
-    }
-
     @Override
     public String toString() {
         return null;
diff --git a/nitrite/src/test/java/org/dizitart/no2/collection/DocumentTest.java b/nitrite/src/test/java/org/dizitart/no2/collection/DocumentTest.java
diff --git a/pom.xml b/pom.xml
diff --git a/potassium-nitrite/pom.xml b/potassium-nitrite/pom.xml
