Merge branch 'develop' into release

anidotnet · anidotnet · commit 9477885a846d · 2025-09-25T20:51:27.000+05:30
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -105,7 +105,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
 
-      - uses: graalvm/setup-graalvm@v1.3.6
+      - uses: graalvm/setup-graalvm@v1.3.7
         with:
           java-version: ${{ matrix.java }}
           distribution: 'graalvm-community'
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: maven-settings-action
-        uses: s4u/maven-settings-action@v3.1.0
+        uses: s4u/maven-settings-action@v4.0.0
         with:
           servers: |
             [
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: maven-settings-action
-        uses: s4u/maven-settings-action@v3.1.0
+        uses: s4u/maven-settings-action@v4.0.0
         with:
           servers: |
             [
diff --git a/.gitignore b/.gitignore
@@ -452,6 +452,7 @@ test.log
 /build
 !no2-old.db
 !no2-v3.db
+!no2-v4.3.0.db
 .diffblue
 infer-out
 secring.gpg
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## Release 4.3.2 - Sep 25, 2025
+
+### Issue Fixes
+
+- Fix for small safety/cleanup in Nitrite interface (map lookups, closed check, name trim) #1161
+- Fix for updating to 4.3.1 causes existing databases to not open correctly #1162
+
 ## Release 4.3.1 - Sep 23, 2025
 
 ### New Changes
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.3.1</version>
+        <version>4.3.2-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.3.1</version>
+        <version>4.3.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>nitrite-jackson-mapper</artifactId>
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.3.1</version>
+        <version>4.3.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>nitrite-mvstore-adapter</artifactId>
diff --git a/nitrite-mvstore-adapter/src/test/java/org/dizitart/no2/NitriteTest.java b/nitrite-mvstore-adapter/src/test/java/org/dizitart/no2/NitriteTest.java
@@ -53,6 +53,7 @@
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -622,7 +623,7 @@ public void run() {
                     log.error("Error in thread", e);
                 }
             }
-        };
+        }
 
         Thread t0 = new Thread(new ThreadRunner());
         Thread t1 = new Thread(new ThreadRunner());
@@ -682,6 +683,32 @@ public void testReadOnlyMode() {
         deleteDb(fileName);
     }
 
+    @Test
+    public void testIssue1162() throws IOException {
+
+        // setup no2-v4.3.0.db as a temp file
+        var databasePath = Files.createTempFile("temp-no2-v4.3.0", ".db");
+        var templateDb = Objects.requireNonNull(NitriteTest.class.getResourceAsStream("/no2-v4.3.0.db"));
+        Files.copy(templateDb, databasePath, StandardCopyOption.REPLACE_EXISTING);
+
+        var module = MVStoreModule.withConfig()
+            .filePath(databasePath.toAbsolutePath().toFile())
+            .build();
+
+        var database = Nitrite.builder()
+            .loadModule(module)
+            .openOrCreate();
+
+        try (database) {
+            var collection = database.getCollection("myCollection");
+            assertEquals(1, collection.size());
+
+            var firstPerson = collection.find().firstOrNull();
+            assertNotNull(firstPerson);
+            assertEquals(1970829645337976832L, firstPerson.getId().getIdValue());
+        }
+    }
+
     @Data
     @AllArgsConstructor
     @NoArgsConstructor
diff --git a/nitrite-mvstore-adapter/src/test/resources/no2-v4.3.0.db b/nitrite-mvstore-adapter/src/test/resources/no2-v4.3.0.db
diff --git a/nitrite-native-tests/pom.xml b/nitrite-native-tests/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.dizitart</groupId>
         <artifactId>nitrite-java</artifactId>
-        <version>4.3.1</version>
+        <version>4.3.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>nitrite-native-tests</artifactId>
@@ -20,7 +20,7 @@
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <assertj.version>3.27.4</assertj.version>
+        <assertj.version>3.27.5</assertj.version>
         <junit.version>5.12.2</junit.version>
         <native-build-tools-plugin.version>0.10.6</native-build-tools-plugin.version>
     </properties>
diff --git a/nitrite-rocksdb-adapter/pom.xml b/nitrite-rocksdb-adapter/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.dizitart</groupId>
         <artifactId>nitrite-java</artifactId>
-        <version>4.3.1</version>
+        <version>4.3.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>nitrite-rocksdb-adapter</artifactId>
diff --git a/nitrite-spatial/pom.xml b/nitrite-spatial/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.dizitart</groupId>
         <artifactId>nitrite-java</artifactId>
-        <version>4.3.1</version>
+        <version>4.3.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>nitrite-spatial</artifactId>
diff --git a/nitrite-support/pom.xml b/nitrite-support/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.dizitart</groupId>
         <artifactId>nitrite-java</artifactId>
-        <version>4.3.1</version>
+        <version>4.3.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>nitrite-support</artifactId>
diff --git a/nitrite/pom.xml b/nitrite/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.dizitart</groupId>
         <artifactId>nitrite-java</artifactId>
-        <version>4.3.1</version>
+        <version>4.3.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>nitrite</artifactId>
diff --git a/nitrite/src/main/java/org/dizitart/no2/Nitrite.java b/nitrite/src/main/java/org/dizitart/no2/Nitrite.java
@@ -312,9 +312,11 @@ default <T> boolean hasRepository(Class<T> type) {
      */
     default <T> boolean hasRepository(Class<T> type, String key) {
         checkOpened();
+        Map<String, Set<String>> keyed = listKeyedRepositories();
+        Set<String> entities = keyed.get(key);
+        if (entities == null) return false;
         String entityName = ObjectUtils.getEntityName(type);
-        return listKeyedRepositories().containsKey(key)
-                && listKeyedRepositories().get(key).contains(entityName);
+        return entities.contains(entityName);
     }
 
     /**
@@ -343,8 +345,10 @@ default <T> boolean hasRepository(EntityDecorator<T> entityDecorator) {
      */
     default <T> boolean hasRepository(EntityDecorator<T> entityDecorator, String key) {
         checkOpened();
-        return listKeyedRepositories().containsKey(key)
-                && listKeyedRepositories().get(key).contains(entityDecorator.getEntityName());
+        Map<String, Set<String>> keyed = listKeyedRepositories();
+        Set<String> entities = keyed.get(key);
+        if (entities == null) return false;
+        return entities.contains(entityDecorator.getEntityName());
     }
 
     /**
@@ -355,11 +359,12 @@ default <T> boolean hasRepository(EntityDecorator<T> entityDecorator, String key
      *                             reserved names
      */
     default void validateCollectionName(String name) {
-        notNull(name, "name cannot be null");
-        notEmpty(name, "name cannot be empty");
+       notNull(name, "name cannot be null");
+       String normalized = name.trim();
+       notEmpty(normalized, "name cannot be empty");
 
         for (String reservedName : RESERVED_NAMES) {
-            if (name.contains(reservedName)) {
+            if (normalized.contains(reservedName)) {
                 throw new ValidationException("Name cannot contain " + reservedName);
             }
         }
diff --git a/nitrite/src/main/java/org/dizitart/no2/collection/NitriteId.java b/nitrite/src/main/java/org/dizitart/no2/collection/NitriteId.java
@@ -18,6 +18,7 @@
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
+
 import org.dizitart.no2.exceptions.InvalidIdException;
 
 import java.io.IOException;
@@ -48,18 +49,20 @@ public final class NitriteId implements Comparable<NitriteId>, Serializable {
     private static final SnowflakeIdGenerator generator = new SnowflakeIdGenerator();
 
     /** The underlying value of the NitriteId. */
-    private long idValue;
+    /* WARNING(gh-1162): naming it idValue breaks java serialization for databases created with earlier version of nitrite
+     *                   and marking it transient introduces side effects for @EqualsAndHashCode */
+    private long _idValue;
 
     private NitriteId() {
-        this.idValue = generator.getId();
+        this._idValue = generator.getId();
     }
 
     private NitriteId(String value) {
-        this.idValue = Long.parseLong(value);
+        this._idValue = Long.parseLong(value);
     }
 
     private NitriteId(long value) {
-        this.idValue = value;
+        this._idValue = value;
     }
 
     /**
@@ -115,21 +118,25 @@ public static boolean validId(Object value) {
         }
     }
 
+    public long getIdValue() {
+        return _idValue;
+    }
+
     @Override
     public int compareTo(NitriteId other) {
-        return Long.compare(idValue, other.idValue);
+        return Long.compare(_idValue, other._idValue);
     }
 
     @Override
     public String toString() {
-        return ID_PREFIX + idValue + ID_SUFFIX;
+        return ID_PREFIX + _idValue + ID_SUFFIX;
     }
 
     private void writeObject(ObjectOutputStream stream) throws IOException {
-        stream.writeUTF(Long.toString(idValue));
+        stream.writeUTF(Long.toString(_idValue));
     }
 
     private void readObject(ObjectInputStream stream) throws IOException {
-        idValue = Long.parseLong(stream.readUTF());
+        _idValue = Long.parseLong(stream.readUTF());
     }
 }
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.dizitart</groupId>
     <artifactId>nitrite-java</artifactId>
-    <version>4.3.1</version>
+    <version>4.3.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Nitrite Database</name>
@@ -52,7 +52,7 @@
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jackson.version>2.19.2</jackson.version>
+        <jackson.version>2.20.0</jackson.version>
         <slf4j.version>2.0.17</slf4j.version>
         <jasypt.version>1.9.3</jasypt.version>
         <h2.version>2.3.232</h2.version>
diff --git a/potassium-nitrite/pom.xml b/potassium-nitrite/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.dizitart</groupId>
         <artifactId>nitrite-java</artifactId>
-        <version>4.3.1</version>
+        <version>4.3.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>potassium-nitrite</artifactId>

-Original file line number
+Diff line change
     steps:
       - uses: actions/checkout@v5
 -      - uses: graalvm/[email protected].6
 +      - uses: graalvm/[email protected].7
         with:
           java-version: ${{ matrix.java }}
           distribution: 'graalvm-community'
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ jobs:`
`51`	`51`	`PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }}`
`52`	`52`
`53`	`53`	`- name: maven-settings-action`
`54`		`- uses: s4u/maven-settings-action@v3.1.0`
	`54`	`+ uses: s4u/maven-settings-action@v4.0.0`
`55`	`55`	`with:`
`56`	`56`	`servers: \|`
`57`	`57`	`[`