Make Spring lockVersion field more explicits to avoid conflicts. Removed a TODO comment that was done already, Also Make the jacoco verison compatible with Java 25

Author: johnlpage

memex/src/main/java/com/johnlpage/memex/VehicleInspection/model/VehicleInspection.java

@@ -36,9 +36,9 @@ public class VehicleInspection {
     @Id
     Long testid;
 
-    @Field("version_field")
+    @Field("lock_version")
     @Version
-    Long version;
+    Long lockVersion;
 
     Date testdate;
     String testclass;

memex/src/main/java/com/johnlpage/memex/generics/repository/OptimizedMongoLoadRepositoryImpl.java

@@ -151,13 +151,11 @@ public BulkWriteResult writeMany(
                     addVersionField(item);
                     ops.insert(item); // This will throw exceptions on duplicates
                 } else if (updateStrategy == UpdateStrategy.UPDATE) {
-
-                    // useSimpleUpdate(item, ops, query); // Unwinds and uses $set - smaller oplog, less
-                    // network
+                    // useSimpleUpdate(item, ops, query);
+                    // Unwinds and uses $set - smaller oplog, less network
                     // Left in for comparison after we moved to always smart updates
                     useSmartUpdate(item, ops, query, updateBatchId, false);
                 } else if (updateStrategy == UpdateStrategy.UPDATEWITHHISTORY) {
-                    // TODO - Version field
                     useSmartUpdate(item, ops, query, updateBatchId, true);
                 } else {
                     // Basic full overwrite can be a little less CPU, but more network/disk
@@ -166,8 +164,9 @@ public BulkWriteResult writeMany(
                     // If a @Version annotation is in the model, then make sure we set it to 1
                     // This means that save() will work with it properly
                     // When we replace we always set version back to 1, this means that a replace
-                    // with the same upstream is a no-op, you really shoudlnt be using save() to update
-                    // somethign you replace from upstream
+                    // with the same upstream is a no-op.
+                    // If someone uses save() to modify then tries to overwrite from
+                    // upstream with Replace that should fail as would cause data loss.
 
                     addVersionField(item);
                     ops.replaceOne(query, item, FindAndReplaceOptions.options().upsert());

memex/templates/model/Model.java.template

@@ -28,9 +28,9 @@ public class __className__ {
     @Id
     private __idType__ __idFieldName__;
 
-    @Field("version_field")
+    @Field("lock_version")
     @Version
-    Long version;
+    Long lockVersion;
 
 
     /* Use this to flag from the JSON we want to remove the record */

memex/templates/scripts/generate-models-from-json.groovy

@@ -574,9 +574,9 @@ def generateClassContent = { Map classInfo, String pkgName, String collectionNam
         sb.append("     * Optimistic locking version field.\n")
         sb.append("     * Automatically incremented by Spring Data MongoDB on each save.\n")
         sb.append("     */\n")
-        sb.append("    @Field(\"version_field\")")
+        sb.append("    @Field(\"lock_version\")")
         sb.append("    @Version\n")
-        sb.append("    private Long version;\n\n")
+        sb.append("    private Long lockVersion;\n\n")
     }
 
     // Regular fields (skip _id as we handle it separately for root)