Corrected issues with type-less object references not being able to load

correctly.

Author: tim-aero

README.md

@@ -791,7 +791,7 @@ The elements in the list are (in order): createdDate, name, productId, version.
 
 This is far more compact and wastes less space, but has an issue: How do you add new items to the product? The answer is to use versioning.
 
-#### Versioning Links
+#### Versioning Lists
 
 Maps and Aerospike records are self-describing -- each value has a name, so it is obvious how to map the data to the database and back. For example, if we have a class
 
@@ -1032,6 +1032,10 @@ Multiple ordinals can be specified for a single class, but these must be sequent
 
 **Note**: Ordinal fields cannot be versioned.
 
+#### The importance of Generic Types
+
+When using the object mapper, it is important to 
+
 ----
 
 ## Advanced Features
@@ -1609,10 +1613,6 @@ When mapping a Java object to Aerospike the most common operations to do are to
 ----
 
 ## To finish
-- lists of embedded objects
-- maps of embedded objects
-- lists of referenced objects
-- maps of referenced objects
 - Document virtual lists
 - Validate some of the limits, eg bin name length, set name length, etc.
 - Make all maps (esp Embedded ones) K_ORDERED
@@ -1623,7 +1623,7 @@ When mapping a Java object to Aerospike the most common operations to do are to
 - Document creation of builder -- multiple configuration files are allowed, if the same class is declared in both the first one encountered wins. 
 - Document methods with 2 parameters for keys and setters, the second one either a Key or a Value
 - Document subclasses and the mapping to tables + references stored as lists
-- Batch load of child items on Maps and References. Ensure testing of non-parameterized classes too. Also of methods on Virtual LIsts
+- Batch load of child items on Maps and References. Ensure testing of non-parameterized classes too.
 - Document batch loading
 - Ensure batch loading option exists in AerospikeReference Configuration
 - handle object graph circularities (A->B->C). Be careful of: A->B(Lazy), A->C->B: B should end up fully hydrated in both instances, not lazy in both instances

src/main/java/com/aerospike/mapper/tools/AeroMapper.java

@@ -503,7 +503,7 @@ public <T> T convertToObject(Class<T> clazz, Record record, ClassCacheEntry<T> e
         if (entry == null) {
             entry = ClassCache.getInstance().loadClass(clazz, this);
         }
-        T result = entry.constructAndHydrate(clazz, record);
+        T result = entry.constructAndHydrate(record);
         if (resolveDependencies) {
         	resolveDependencies(entry);
         }
@@ -608,7 +608,7 @@ void resolveDependencies(ClassCacheEntry<?> parentEntity) {
     			DeferredObjectSetter thisObjectSetter = deferredObjects.get(i);
     			try {
                 	ThreadLocalKeySaver.save(keys[i]);
-                	Object result = this.convertToObject((Class)thisObjectSetter.getObject().getType(), records[i], classCaches[i], false);
+                	Object result = records[i] == null ? null : this.convertToObject((Class)thisObjectSetter.getObject().getType(), records[i], classCaches[i], false);
                 	thisObjectSetter.getSetter().setValue(result);
 	            } catch (ReflectiveOperationException e) {
 	                throw new AerospikeException(e);

src/main/java/com/aerospike/mapper/tools/ClassCache.java

@@ -45,7 +45,7 @@ private ClassCache() {
 	}
 
 	public <T> ClassCacheEntry<T> loadClass(@NotNull Class<T> clazz, AeroMapper mapper) {
-		if (clazz.isPrimitive() || clazz.equals(Object.class) || clazz.equals(String.class) || Number.class.isAssignableFrom(clazz)) {
+		if (clazz.isPrimitive() || clazz.equals(Object.class) || clazz.equals(String.class) || clazz.equals(Character.class) || Number.class.isAssignableFrom(clazz)) {
 			return null;
 		}
 		ClassCacheEntry<T> entry = cacheMap.get(clazz);

src/main/java/com/aerospike/mapper/tools/ClassCacheEntry.java

@@ -101,7 +101,7 @@ public class ClassCacheEntry<T> {
 
 		AerospikeRecord recordDescription = clazz.getAnnotation(AerospikeRecord.class);
 		if (recordDescription == null && config == null) {
-			throw new IllegalArgumentException("Class " + clazz.getName() + " is not augmented by the @AerospikeRecord annotation");
+			throw new AerospikeException("Class " + clazz.getName() + " is not augmented by the @AerospikeRecord annotation");
 		}
 		else if (recordDescription != null) {
 			this.namespace = ParserUtils.getInstance().get(recordDescription.namespace());
@@ -723,14 +723,14 @@ public List<Object> getList(Object instance, boolean skipKey, boolean needsType)
 		}
 	}
 
-	public T constructAndHydrate(Class<T> clazz, Map<String, Object> map) {
-		return constructAndHydrate(clazz, null, map);
+	public T constructAndHydrate(Map<String, Object> map) {
+		return constructAndHydrate(null, map);
 	}
-	public T constructAndHydrate(Class<T> clazz, Record record) {
-		return constructAndHydrate(clazz, record, null);
+	public T constructAndHydrate(Record record) {
+		return constructAndHydrate(record, null);
 	}
 
-	private T constructAndHydrate(Class<T> clazz, Record record, Map<String, Object> map) {
+	private T constructAndHydrate(Record record, Map<String, Object> map) {
 		Map<String, Object> valueMap = new HashMap<>();
 		try {
 			ClassCacheEntry<?> thisClass = this;
@@ -754,7 +754,7 @@ private T constructAndHydrate(Class<T> clazz, Record record, Map<String, Object>
 					valueMap.put(name, value.getTypeMapper().fromAerospikeFormat(aerospikeValue));
 				}
 				if (result == null) {
-					result = (T)thisClass.constructAndHydrate(valueMap);
+					result = (T)thisClass.constructAndHydrateFromJavaMap(valueMap);
 				}
 				else {
 					for (String field : valueMap.keySet()) {
@@ -827,33 +827,32 @@ public void hydrateFromList(List<Object> list, Object instance) {
 		this.hydrateFromList(list, instance, false);
 	}
 
-	private T constructAndHydrate(Map<String, Object> javaValuesMap) throws ReflectiveOperationException {
+	private T constructAndHydrateFromJavaMap(Map<String, Object> javaValuesMap) throws ReflectiveOperationException {
 		// Now form the values which satisfy the constructor
 		T result;
-		if (constructorParamBins.length == 0) {
-			result = clazz.newInstance();				
-		}
-		else {
-			Object[] args = new Object[constructorParamBins.length];
-			for (int i = 0; i < constructorParamBins.length; i++) {
-				if (javaValuesMap.containsKey(constructorParamBins[i])) {
-					args[i] = javaValuesMap.get(constructorParamBins[i]);
-				}
-				else {
-					args[i] = constructorParamDefaults[i];
-				}
-				javaValuesMap.remove(constructorParamBins[i]);
+		Object[] args = new Object[constructorParamBins.length];
+		for (int i = 0; i < constructorParamBins.length; i++) {
+			if (javaValuesMap.containsKey(constructorParamBins[i])) {
+				args[i] = javaValuesMap.get(constructorParamBins[i]);
+			}
+			else {
+				args[i] = constructorParamDefaults[i];
 			}
-			result = constructor.newInstance(args);
+			javaValuesMap.remove(constructorParamBins[i]);
 		}
+		result = constructor.newInstance(args);
 		for (String field : javaValuesMap.keySet()) {
 			ValueType value = this.values.get(field);
-			value.set(result, javaValuesMap.get(field));
+			Object object = javaValuesMap.get(field);
+			if (object == null && value.getType().isPrimitive()) {
+				object = PrimitiveDefaults.getDefaultValue(value.getType());
+			}
+			value.set(result, object);
 		}
 		return result;
 	}
 
-	public T constructAndHydrate(Class<T> clazz, List<Object> list, boolean skipKey) {
+	public T constructAndHydrate(List<Object> list, boolean skipKey) {
 		Map<String, Object> valueMap = new HashMap<>();
 		try {
 			ClassCacheEntry<?> thisClass = this;
@@ -900,7 +899,7 @@ public T constructAndHydrate(Class<T> clazz, List<Object> list, boolean skipKey)
 						}
 					}
 					if (result == null) {
-						result = (T)thisClass.constructAndHydrate(valueMap);
+						result = (T)thisClass.constructAndHydrateFromJavaMap(valueMap);
 					}
 					else {
 						for (String field : valueMap.keySet()) {
@@ -964,7 +963,7 @@ ValueType getValueFromBinName(String name) {
 
 	@Override
 	public String toString() {
-		return String.format("ClassCacheEntry<%s> (ns=%s, set=%s,subclass=%b,shortName=%s)", this.getUnderlyingClass().getSimpleName(), this.namespace, this.setName, this.isChildClass, this.shortenedClassName);
+		return String.format("ClassCacheEntry<%s> (ns=%s,set=%s,subclass=%b,shortName=%s)", this.getUnderlyingClass().getSimpleName(), this.namespace, this.setName, this.isChildClass, this.shortenedClassName);
 	}
 
 }

src/main/java/com/aerospike/mapper/tools/TypeMapper.java

@@ -10,7 +10,7 @@ public abstract class TypeMapper {
 	 * @param isExpectedType
 	 * @return
 	 */
-	public Object toAerospikeFormat(Object value, boolean isExpectedType) {
+	public Object toAerospikeFormat(Object value, boolean isUnknownType, boolean isSubclassOfKnownType) {
 		return toAerospikeFormat(value);
 	}
 }

src/main/java/com/aerospike/mapper/tools/TypeUtils.java

@@ -267,29 +267,31 @@ else if (binConfig.getEmbed() != null) {
 						}
 					}
 					else {
-						for (Annotation annotation : type.getAnnotations()) {
-							if (annotation.annotationType().equals(AerospikeReference.class)) {
-								if (typeMapper != null) {
-									throwError = true;
-									break;
+						if (type.getAnnotations() != null) {
+							for (Annotation annotation : type.getAnnotations()) {
+								if (annotation.annotationType().equals(AerospikeReference.class)) {
+									if (typeMapper != null) {
+										throwError = true;
+										break;
+									}
+									else {
+										AerospikeReference ref = (AerospikeReference)annotation;
+										typeMapper = new ObjectReferenceMapper(ClassCache.getInstance().loadClass(clazz, mapper), ref.lazy(), ref.batchLoad(), ref.type(), mapper);
+										addToMap = false;
+									}
 								}
-								else {
-									AerospikeReference ref = (AerospikeReference)annotation;
-									typeMapper = new ObjectReferenceMapper(ClassCache.getInstance().loadClass(clazz, mapper), ref.lazy(), ref.batchLoad(), ref.type(), mapper);
-									addToMap = false;
-								}
-							}
-							if (annotation.annotationType().equals(AerospikeEmbed.class)) {
-								AerospikeEmbed embed = (AerospikeEmbed)annotation;
-								if (typeMapper != null) {
-									throwError = true;
-									break;
-								}
-								else {
-									EmbedType embedType = isForSubType ? embed.elementType() : embed.type();
-									boolean skipKey = isForSubType && (embed.type() == EmbedType.MAP && embed.elementType() == EmbedType.LIST && (!embed.saveKey()));
-									typeMapper = new ObjectEmbedMapper(clazz, embedType, mapper, skipKey);
-									addToMap = false;
+								if (annotation.annotationType().equals(AerospikeEmbed.class)) {
+									AerospikeEmbed embed = (AerospikeEmbed)annotation;
+									if (typeMapper != null) {
+										throwError = true;
+										break;
+									}
+									else {
+										EmbedType embedType = isForSubType ? embed.elementType() : embed.type();
+										boolean skipKey = isForSubType && (embed.type() == EmbedType.MAP && embed.elementType() == EmbedType.LIST && (!embed.saveKey()));
+										typeMapper = new ObjectEmbedMapper(clazz, embedType, mapper, skipKey);
+										addToMap = false;
+									}
 								}
 							}
 						}

src/main/java/com/aerospike/mapper/tools/mappers/ListMapper.java

@@ -73,7 +73,7 @@ public Object toAerospikeInstanceFormat(Object obj) {
 				}
 				else {
 					TypeMapper thisMapper = TypeUtils.getMapper(obj.getClass(), null, mapper);
-					return thisMapper == null ? obj : thisMapper.toAerospikeFormat(obj, false);
+					return thisMapper == null ? obj : thisMapper.toAerospikeFormat(obj, true, false);
 				}
 			}
 			else {
@@ -82,7 +82,7 @@ public Object toAerospikeInstanceFormat(Object obj) {
 				}
 				else {
 					// This class must be a subclass of the annotated type
-					return this.instanceClassMapper.toAerospikeFormat(obj, false);
+					return this.instanceClassMapper.toAerospikeFormat(obj, false, true);
 				}
 			}
 		}
@@ -94,7 +94,7 @@ public Object toAerospikeInstanceFormat(Object obj) {
 			}
 			else {
 				// This class must be a subclass of the annotated type
-				item = this.instanceClassMapper.toAerospikeFormat(obj, false);
+				item = this.instanceClassMapper.toAerospikeFormat(obj, false, true);
 			}
 			return new AbstractMap.SimpleEntry<Object, Object>(key, item);
 		}
@@ -124,7 +124,7 @@ public Object toAerospikeFormat(Object value) {
 				}
 				else {
 					// This class must be a subclass of the annotated type
-					item = this.instanceClassMapper.toAerospikeFormat(obj, false);
+					item = this.instanceClassMapper.toAerospikeFormat(obj, false, true);
 				}
 				results.put(key, item);
 			}
@@ -133,6 +133,24 @@ public Object toAerospikeFormat(Object value) {
 		}
 	}
 
+	private Class<?> getClassToUse(Object obj) {
+		if (List.class.isAssignableFrom(obj.getClass())) {
+			List<Object> list = (List<Object>) obj;
+			int lastElementIndex = list.size()-1;
+			if ((!list.isEmpty()) && (list.get(lastElementIndex) instanceof String)) {
+				String lastElement = (String)list.get(lastElementIndex);
+				if (lastElement.startsWith(ClassCacheEntry.TYPE_PREFIX)) {
+					String className = lastElement.substring(ClassCacheEntry.TYPE_PREFIX.length());
+					ClassCacheEntry<?> thisClass = ClassCache.getInstance().getCacheEntryFromStoredName(className);
+					if (thisClass != null) {
+						return thisClass.getUnderlyingClass();
+					}
+				}
+			}
+		}
+		return obj.getClass();
+	}
+	
 	public Object fromAerospikeInstanceFormat(Object obj) {
 		if (embedType == null || embedType == EmbedType.LIST) {
 			if (instanceClass == null) {
@@ -141,7 +159,7 @@ public Object fromAerospikeInstanceFormat(Object obj) {
 					return null;
 				}
 				else {
-					TypeMapper thisMapper = TypeUtils.getMapper(obj.getClass(), AnnotatedType.getDefaultAnnotateType(), mapper);
+					TypeMapper thisMapper = TypeUtils.getMapper(getClassToUse(obj), AnnotatedType.getDefaultAnnotateType(), mapper);
 					return thisMapper == null ? obj : thisMapper.fromAerospikeFormat(obj);
 				}
 			}
@@ -172,14 +190,32 @@ public Object fromAerospikeFormat(Object value) {
 
 			if (instanceClass == null) {
 				// We don't have any hints as to how to translate them, we have to look up each type
+				int index = 0;
 				for (Object obj : list) {
 					if (obj == null) {
 						results.add(null);
 					}
 					else {
-						TypeMapper thisMapper = TypeUtils.getMapper(obj.getClass(), AnnotatedType.getDefaultAnnotateType(), mapper);
-						results.add(thisMapper == null ? obj : thisMapper.fromAerospikeFormat(obj));
+						TypeMapper thisMapper = TypeUtils.getMapper(getClassToUse(obj), AnnotatedType.getDefaultAnnotateType(), mapper);
+						Object result = thisMapper == null ? obj : thisMapper.fromAerospikeFormat(obj);
+						if (result instanceof DeferredObject) {
+							final int thisIndex = index;
+							DeferredSetter setter = new DeferredSetter() {
+								@Override
+								public void setValue(Object object) {
+									results.set(thisIndex, object);
+								}
+							};
+							DeferredObjectSetter objectSetter = new DeferredObjectSetter(setter, (DeferredObject)result);
+							DeferredObjectLoader.add(objectSetter);
+							// add a placeholder to maintain the index
+							results.add(null);
+						}
+						else {
+							results.add(result);
+						}
 					}
+					index++;
 				}
 			}
 			else {

src/main/java/com/aerospike/mapper/tools/mappers/ObjectEmbedMapper.java

@@ -55,11 +55,11 @@ public Object fromAerospikeFormat(Object value) {
 			switch (type) {
 			case LIST:
 				List<Object> listValue = (List<Object>) value;
-				instance = entry.constructAndHydrate((Class)this.referencedClass, listValue, skipKey);
+				instance = entry.constructAndHydrate(listValue, skipKey);
 				break;
 			case MAP:	// Fall through
 			case DEFAULT:
-				instance = entry.constructAndHydrate((Class)this.referencedClass, (Map<String,Object>)value);
+				instance = entry.constructAndHydrate((Map<String,Object>)value);
 				break;
 			default:
 				throw new AerospikeException("Unspecified EmbedType");