Updates and improvements to Entity Generator script - not storing 'payload' or any other field unless required.

Author: johnlpage

memex/README.md

@@ -408,7 +408,9 @@ goal below. customId shodu lmap to the id
 field in the JSON
 
 ```shell
- mvn generate-sources -Pgenerate-models-from-json   -DjsonFile=path/to/sample.json   -DbasePackage=com.johnlpage.memex.model       -DcollectionName=myCollectio    -DidFieldName=myCustomId
+
+ mvn generate-sources -Pgenerate-models-from-json   -DjsonFile=../companies250k.json  -DbasePackage=com.johnlpage.memex  -Dentity=Company  -DidFieldName=companyNumber
+
 ```
 
 # Testing

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

@@ -1,21 +1,23 @@
 package com.johnlpage.memex.VehicleInspection.model;
 
-import com.fasterxml.jackson.annotation.*;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.johnlpage.memex.util.DeleteFlag;
 import com.johnlpage.memex.util.ObjectConverter;
-import jakarta.validation.constraints.*;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
+import jakarta.validation.constraints.Min;
 import lombok.Data;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.Transient;
 import org.springframework.data.annotation.Version;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.Field;
 
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
 /* Replace @Data with this to make an Immutable model
  * which is a little more efficient but no setters just a builder
  * This also impact the controller and fuzzer and JsonLoaderService -
@@ -58,17 +60,30 @@ public class VehicleInspection {
     Boolean deleted;
 
     /**
-     * Use this to capture any fields not captured explicitly As MongoDB's flexibility makes this easy
+     * Captures any fields not explicitly mapped to class fields.
+     * Supports schema flexibility and evolution.
+     * Only persisted/serialized when non-empty.
      */
-    private Map<String, Object> payload = new HashMap<>();
+    @Field(write = Field.Write.NON_NULL)
+    private Map<String, Object> payload;
 
     @JsonAnySetter
     public void set(String key, Object value) {
+        if (payload == null) {
+            payload = new HashMap<String, Object>();
+        }
         payload.put(key, ObjectConverter.convertObject(value));
     }
 
     @JsonAnyGetter
     public Map<String, Object> getPayload() {
         return payload;
     }
+
+    /**
+     * Helper method to safely add to payload from your own code
+     */
+    public void addToPayload(String key, Object value) {
+        set(key, value);
+    }
 }

memex/src/main/java/com/johnlpage/memex/config/MongoConfig.java

@@ -5,30 +5,31 @@
 import org.bson.Document;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.data.mongodb.MongoDatabaseFactory;
 import org.springframework.data.mongodb.MongoTransactionManager;
-import org.springframework.data.mongodb.core.convert.DefaultMongoTypeMapper;
-import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.convert.MongoCustomConversions;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @Configuration
 @EnableTransactionManagement(proxyTargetClass = true)
-public class MongoConfig implements InitializingBean {
+public class MongoConfig {
     private static final Logger LOG = LoggerFactory.getLogger(MongoConfig.class);
-    final MongoDatabaseFactory mongoDatabaseFactory;
-    @Lazy
-    private final MappingMongoConverter mappingMongoConverter;
+
+    private final MongoDatabaseFactory mongoDatabaseFactory;
 
     @Autowired
-    public MongoConfig(
-            MongoDatabaseFactory mongoDatabaseFactory, MappingMongoConverter mappingMongoConverter) {
+    public MongoConfig(MongoDatabaseFactory mongoDatabaseFactory) {
         this.mongoDatabaseFactory = mongoDatabaseFactory;
-        this.mappingMongoConverter = mappingMongoConverter;
+    }
+
+    @Bean
+    public MongoCustomConversions customConversions() {
+        return MongoCustomConversions.create(adapter ->
+                adapter.useNativeDriverJavaTimeCodecs()
+        );
     }
 
     /**
@@ -37,25 +38,13 @@ public MongoConfig(
     @Bean
     public MongoTransactionManager transactionManager() {
         LOG.info("MongoDB Native Transactions Enabled");
-
         return new MongoTransactionManager(mongoDatabaseFactory);
     }
 
     @Bean
     public MongoVersionBean mongoVersionBean(MongoClient mongoClient) {
-        // TODO - Detect if Atlas Search available
         Document buildInfo = mongoClient.getDatabase("admin").runCommand(new Document("buildInfo", 1));
-
         String version = buildInfo.getString("version");
-
         return new MongoVersionBean(version);
     }
-
-    @Override
-    public void afterPropertiesSet() {
-        // We are disabling the _class field here as it has a significant impact on query performance
-        // When it gets included in queries but is not in the index. You only need it when you have
-        // polymorphism for a collection.
-        mappingMongoConverter.setTypeMapper(new DefaultMongoTypeMapper(null));
-    }
 }

memex/src/main/java/com/johnlpage/memex/config/MongoTypeMapperConfig.java

@@ -0,0 +1,25 @@
+package com.johnlpage.memex.config;
+
+import jakarta.annotation.PostConstruct;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.mongodb.core.convert.DefaultMongoTypeMapper;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+
+@Configuration
+public class MongoTypeMapperConfig {
+
+    private final MappingMongoConverter mappingMongoConverter;
+
+    @Autowired
+    public MongoTypeMapperConfig(MappingMongoConverter mappingMongoConverter) {
+        this.mappingMongoConverter = mappingMongoConverter;
+    }
+
+    @PostConstruct
+    public void removeClassField() {
+        // Disabling the _class field as it has a significant impact on query performance
+        // when included in queries but not in the index.
+        mappingMongoConverter.setTypeMapper(new DefaultMongoTypeMapper(null));
+    }
+}