FMWK-467 Issue using refs with yaml file (#161)

Null Pointer Exception using refs with the YAML file
aerospike · Jul 4, 2024 · 47b9952 · 47b9952
1 parent 954fac9
commit 47b9952
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 21 deletions.
diff --git a/src/main/java/com/aerospike/mapper/tools/configuration/ClassConfig.java b/src/main/java/com/aerospike/mapper/tools/configuration/ClassConfig.java
@@ -183,34 +183,42 @@ public Builder withNamespace(String namespace) {
             this.classConfig.setNamespace(namespace);
             return this;
         }
+
         public Builder withShortName(String shortName) {
             this.classConfig.setShortName(shortName);
             return this;
         }
+
         public Builder withSet(String setName) {
             this.classConfig.setSet(setName);
             return this;
         }
+
         public Builder withTtl(int ttl) {
             this.classConfig.setTtl(ttl);
             return this;
         }
+
         public Builder withVersion(int version) {
             this.classConfig.setVersion(version);
             return this;
         }
+
         public Builder withSendKey(boolean sendKey) {
             this.classConfig.setSendKey(sendKey);
             return this;
         }
+
         public Builder withMapAll(boolean mapAll) {
             this.classConfig.setMapAll(mapAll);
             return this;
         }
+
         public Builder withDurableDelete(boolean durableDelete) {
             this.classConfig.setDurableDelete(durableDelete);
             return this;
         }
+
         public Builder withShortName(boolean sendKey) {
             this.classConfig.setSendKey(sendKey);
             return this;
@@ -221,7 +229,7 @@ public Builder withFactoryClassAndMethod(@NotNull Class<?> factoryClass, @NotNul
             this.classConfig.setFactoryMethod(factoryMethod);
             return this;
         }
-        
+
         public Builder withKeyField(String fieldName) {
             if (this.classConfig.getKey() == null) {
                 this.classConfig.setKey(new KeyConfig());
@@ -230,7 +238,7 @@ public Builder withKeyField(String fieldName) {
             this.classConfig.getKey().setField(fieldName);
             return this;
         }
-        
+
         public Builder withKeyFieldAndStoreAsBin(String fieldName, boolean storeAsBin) {
             if (this.classConfig.getKey() == null) {
                 this.classConfig.setKey(new KeyConfig());
@@ -240,7 +248,7 @@ public Builder withKeyFieldAndStoreAsBin(String fieldName, boolean storeAsBin) {
             this.classConfig.getKey().setStoreAsBin(storeAsBin);
             return this;
         }
-        
+
         public Builder withKeyGetterAndSetterOf(String getterName, String setterName) {
             if (this.classConfig.getKey() == null) {
                 this.classConfig.setKey(new KeyConfig());
@@ -250,12 +258,12 @@ public Builder withKeyGetterAndSetterOf(String getterName, String setterName) {
             this.classConfig.getKey().setSetter(setterName);
             return this;
         }
-        
+
         public AeroBinConfig withFieldNamed(String fieldName) {
             validateFieldExists(fieldName);
             return new AeroBinConfig(this, fieldName);
         }
-        
+
         private void mergeBinConfig(BinConfig config) {
             List<BinConfig> bins = this.classConfig.getBins();
             for (BinConfig thisBin : bins) {
@@ -271,46 +279,48 @@ public ClassConfig build() {
             return this.classConfig;
         }
     }
-    
+
     public static class AeroBinConfig {
         private final Builder builder;
         private final BinConfig binConfig;
-        
+
         public AeroBinConfig(Builder builder, String fieldName) {
             super();
             this.builder = builder;
             this.binConfig = new BinConfig();
             this.binConfig.setField(fieldName);
         }
-        
+
         public Builder mappingToBin(String name) {
             this.binConfig.setName(name);
             return this.end();
         }
-        
+
         public Builder beingReferencedBy(AerospikeReference.ReferenceType type) {
-            this.binConfig.setReference(new ReferenceConfig(type, false));
+            this.binConfig.setReference(new ReferenceConfig(type, false, true));
             return this.end();
         }
-        
+
         public Builder beingLazilyReferencedBy(AerospikeReference.ReferenceType type) {
-            this.binConfig.setReference(new ReferenceConfig(type, true));
+            this.binConfig.setReference(new ReferenceConfig(type, true, true));
             return this.end();
         }
-        
+
         public Builder beingEmbeddedAs(AerospikeEmbed.EmbedType type) {
             EmbedConfig embedConfig = new EmbedConfig();
             embedConfig.setType(type);
             this.binConfig.setEmbed(embedConfig);
             return this.end();
         }
+
         public Builder beingEmbeddedAs(AerospikeEmbed.EmbedType type, AerospikeEmbed.EmbedType elementType) {
             EmbedConfig embedConfig = new EmbedConfig();
             embedConfig.setType(type);
             embedConfig.setElementType(elementType);
             this.binConfig.setEmbed(embedConfig);
             return this.end();
         }
+
         public Builder beingEmbeddedAs(AerospikeEmbed.EmbedType type, AerospikeEmbed.EmbedType elementType, boolean saveKey) {
             EmbedConfig embedConfig = new EmbedConfig();
             embedConfig.setType(type);
@@ -319,6 +329,7 @@ public Builder beingEmbeddedAs(AerospikeEmbed.EmbedType type, AerospikeEmbed.Emb
             this.binConfig.setEmbed(embedConfig);
             return this.end();
         }
+
         /**
          * Exclude the field. An excluded field doesn't need any other config, so return the parent.
          * This allows for more natural syntax like:
@@ -327,17 +338,16 @@ public Builder beingEmbeddedAs(AerospikeEmbed.EmbedType type, AerospikeEmbed.Emb
          *     .withFieldName("ignoreMe").beingExcluded()
          * .end()
          * </code>
-         * @return
+         * @return Parent builder
          */
         public Builder beingExcluded() {
             this.binConfig.setExclude(true);
             return this.end();
         }
-        
+
         private Builder end() {
             this.builder.mergeBinConfig(binConfig);
             return this.builder;
         }
     }
-
-}
+}
diff --git a/src/main/java/com/aerospike/mapper/tools/configuration/ReferenceConfig.java b/src/main/java/com/aerospike/mapper/tools/configuration/ReferenceConfig.java
@@ -7,12 +7,15 @@ public class ReferenceConfig {
     private Boolean lazy;
     private Boolean batchLoad;
 
-    public ReferenceConfig() {}
-    public ReferenceConfig(ReferenceType type, boolean lazy) {
+    public ReferenceConfig() {
+    }
+
+    public ReferenceConfig(ReferenceType type, boolean lazy, boolean batchLoad) {
         this.type = type;
         this.lazy = lazy;
+        this.batchLoad = batchLoad;
     }
-    
+
     public ReferenceType getType() {
         return type;
     }

diff --git a/src/main/java/com/aerospike/mapper/tools/utils/TypeUtils.java b/src/main/java/com/aerospike/mapper/tools/utils/TypeUtils.java
@@ -229,7 +229,11 @@ private static TypeMapper getMapper(Class<?> clazz, AnnotatedType type, IBaseAer
                         } else {
                             // Reference
                             ReferenceConfig ref = binConfig.getReference();
-                            typeMapper = new ObjectReferenceMapper(ClassCache.getInstance().loadClass(clazz, mapper), ref.getLazy(), ref.getBatchLoad(), ref.getType(), mapper);
+                            typeMapper = new ObjectReferenceMapper(
+                                    ClassCache.getInstance().loadClass(clazz, mapper),
+                                    ref.getLazy() == null ? false : ref.getLazy(),
+                                    ref.getBatchLoad() == null ? true : ref.getBatchLoad(),
+                                    ref.getType(), mapper);
                             addToMap = false;
                         }
                     } else {