Backup and create typeArgsMap in ManufacturingContext

Author: daivanov

src/main/java/uk/co/jemos/podam/api/PodamFactoryImpl.java

@@ -47,10 +47,6 @@ public class PodamFactoryImpl implements PodamFactory {
     /** Application logger */
 	private static final Logger LOG = LoggerFactory.getLogger(PodamFactoryImpl.class);
 
-	/** Empty type map */
-	private static final Map<String, Type> NULL_TYPE_ARGS_MAP = new HashMap<String, Type>();
-
-
 	// ------------------->> Instance / variables
 
 	/**
@@ -480,8 +476,7 @@ private <T> T manufacturePojoInternal(Class<T> pojoClass,
 					pojoClass, Arrays.toString(genericTypeArgs));
 		}
 
-		Map<String, Type> typeArgsMap = manufacturingCtx.getTypeArgsMap();
-		manufacturingCtx.setTypeArgsMap(new HashMap<String, Type>());
+		manufacturingCtx.backupTypeArgsMap(manufacturingCtx.createEmptyTypeArgsMap());
 		Type[] genericTypeArgsExtra = TypeManufacturerUtil.fillTypeArgMap(
 				manufacturingCtx.getTypeArgsMap(), pojoClass, genericTypeArgs);
 
@@ -514,7 +509,7 @@ private <T> T manufacturePojoInternal(Class<T> pojoClass,
 					genericTypeArgsExtra);
 		}
 
-		manufacturingCtx.setTypeArgsMap(typeArgsMap);
+		manufacturingCtx.restoreTypeArgsMap();
 		return retValue;
 	}
 
@@ -705,13 +700,12 @@ private <T> boolean populateReadOnlyField(T pojo, ClassAttribute attribute,
 			}
 			if (depth < strategy.getMaxDepth(fieldClass)) {
 
-				Map<String, Type> typeArgsMap = manufacturingCtx.getTypeArgsMap();
-				manufacturingCtx.setTypeArgsMap(paramTypeArgsMap);
+				manufacturingCtx.backupTypeArgsMap(paramTypeArgsMap);
 				manufacturingCtx.getPojos().put(fieldClass, depth + 1);
 				populatePojoInternal(fieldValue, pojoAttributeAnnotations,
 						manufacturingCtx, genericTypeArgsAll);
 				manufacturingCtx.getPojos().put(fieldClass, depth);
-				manufacturingCtx.setTypeArgsMap(typeArgsMap);
+				manufacturingCtx.restoreTypeArgsMap();
 			} else {
 
 				LOG.warn("Loop of depth " + depth + " in filling read-only field {} detected.",
@@ -1221,12 +1215,11 @@ private void fillCollection(ManufacturingContext manufacturingCtx,
 
 				if (null == element) {
 
-					final Map<String, Type> typeArgsMap = manufacturingCtx.getTypeArgsMap();
-					manufacturingCtx.setTypeArgsMap(NULL_TYPE_ARGS_MAP);
+					manufacturingCtx.backupTypeArgsMap(manufacturingCtx.createEmptyTypeArgsMap());
 					element = manufactureAttributeValue(collection, manufacturingCtx,
 							collectionElementType, collectionElementType,
 							annotations, attributeName, genericTypeArgs);
-					manufacturingCtx.setTypeArgsMap(typeArgsMap);
+					manufacturingCtx.restoreTypeArgsMap();
 				}
 
 				if (null != element) {
@@ -1549,8 +1542,7 @@ private Object getMapKeyOrElementValue(
 
 		if (null == retValue) {
 
-			final Map<String, Type> typeArgsMap = manufacturingCtx.getTypeArgsMap();
-			manufacturingCtx.setTypeArgsMap(NULL_TYPE_ARGS_MAP);
+			manufacturingCtx.backupTypeArgsMap(manufacturingCtx.createEmptyTypeArgsMap());
 			retValue = manufactureAttributeValue(
 					keyOrElementsArguments.getMapToBeFilled(),
 					manufacturingCtx,
@@ -1559,7 +1551,7 @@ private Object getMapKeyOrElementValue(
 					keyOrElementsArguments.getAnnotations(),
 					keyOrElementsArguments.getAttributeName(),
 					keyOrElementsArguments.getGenericTypeArgs());
-			manufacturingCtx.setTypeArgsMap(typeArgsMap);
+			manufacturingCtx.restoreTypeArgsMap();
 		}
 		return retValue;
 	}
@@ -1885,12 +1877,11 @@ private Object manufactureParameterValue(Class<?> pojoClass,
 			typeArgsMapForParam = manufacturingCtx.getTypeArgsMap();
 		}
 
-		final Map<String, Type> typeArgsMap = manufacturingCtx.getTypeArgsMap();
-		manufacturingCtx.setTypeArgsMap(typeArgsMapForParam);
+		manufacturingCtx.backupTypeArgsMap(typeArgsMapForParam);
 		Object retValue = manufactureAttributeValue(pojoClass, manufacturingCtx, parameterType,
 				genericType, annotations, parameterName,
 				genericTypeArgs);
-		manufacturingCtx.setTypeArgsMap(typeArgsMap);
+		manufacturingCtx.restoreTypeArgsMap();
 		return retValue;
 	}
 

src/main/java/uk/co/jemos/podam/common/ManufacturingContext.java

@@ -1,6 +1,8 @@
 package uk.co.jemos.podam.common;
 
 import java.lang.reflect.Type;
+import java.util.ArrayDeque;
+import java.util.Deque;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -25,6 +27,11 @@ public class ManufacturingContext {
 	 *  example) with their actual types */
 	private Map<String, Type> typeArgsMap = new HashMap<String, Type>();
 
+	/** Backup stack of maps relating the generic class arguments ("&lt;T, V&gt;" for
+	 *  example) with their actual types */
+	/** Constructors sorting order */
+	private Deque<Map<String, Type>> backupTypeArgsMaps = new ArrayDeque<Map<String, Type>>();
+
 	/**
 	 * Getter for constructor ordering
 	 * @return constructor ordering
@@ -68,4 +75,33 @@ public Map<String, Type> getTypeArgsMap() {
 	public void setTypeArgsMap(Map<String, Type> typeArgsMap) {
 		this.typeArgsMap = typeArgsMap;
 	}
+
+	/**
+	 * Creates an empty typeArgsMap
+	 * @return newly created map
+	 */
+	public Map<String, Type> createEmptyTypeArgsMap() {
+        return new HashMap<String, Type>();
+	}
+
+	/**
+	 * Backups typeArgsMap and replace it with a new one
+	 * @param typeArgsMap
+	 *         relating the generic class arguments ("&lt;T, V&gt;" for
+	 *         example) with their actual types
+	 */
+	public void backupTypeArgsMap(Map<String, Type> typeArgsMap) {
+        backupTypeArgsMaps.push(this.typeArgsMap);
+        this.typeArgsMap = typeArgsMap;
+	}
+
+	/**
+	 * Restores typeArgsMap from backup
+	 * @return previous map
+	 */
+	public Map<String, Type> restoreTypeArgsMap() {
+        final Map<String, Type> oldTypeArgsMap = this.typeArgsMap;
+        this.typeArgsMap = backupTypeArgsMaps.pop();
+        return oldTypeArgsMap;
+	}
 }