Encapsulate typeArgsMap in ManufacturingContext

Author: daivanov

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

@@ -669,43 +669,36 @@ private <T> boolean populateReadOnlyField(T pojo, ClassAttribute attribute,
 
 			LOG.debug("Populating read-only field {}", getter);
 
-			Type[] genericTypeArgsAll;
-			Map<String, Type> paramTypeArgsMap;
-			Type genericPojoType = getter.getGenericReturnType();
-			if (genericPojoType instanceof ParameterizedType) {
-
-				paramTypeArgsMap = new HashMap<String, Type>(manufacturingCtx.getTypeArgsMap());
-
-				ParameterizedType paramType = (ParameterizedType) genericPojoType;
-				Type[] actualTypes = paramType.getActualTypeArguments();
-				TypeManufacturerUtil.fillTypeArgMap(paramTypeArgsMap,
-						pojoType, actualTypes);
-				genericTypeArgsAll = TypeManufacturerUtil.fillTypeArgMap(paramTypeArgsMap,
-						pojoType, genericTypeArgs);
-
-			} else {
-
-				paramTypeArgsMap = manufacturingCtx.getTypeArgsMap();
-				genericTypeArgsAll = genericTypeArgs;
-			}
-
-			List<Annotation> pojoAttributeAnnotations =
-					PodamUtils.getAttributeAnnotations(
-							attribute.getAttribute(), getter);
-
 			Class<?> fieldClass = fieldValue.getClass();
 			Integer depth = manufacturingCtx.getPojos().get(fieldClass);
 			if (depth == null) {
 				depth = 0;
 			}
 			if (depth < strategy.getMaxDepth(fieldClass)) {
 
-				manufacturingCtx.backupTypeArgsMap(paramTypeArgsMap);
+				Type[] genericTypeArgsAll;
+				Type genericPojoType = getter.getGenericReturnType();
+				final boolean cloneTypeArgsMap = (genericPojoType instanceof ParameterizedType);
+				if (cloneTypeArgsMap) {
+
+					genericTypeArgsAll = manufacturingCtx.cloneTypeArgsMap(
+							pojoType, (ParameterizedType) genericPojoType, genericTypeArgs);
+				} else {
+
+					genericTypeArgsAll = genericTypeArgs;
+				}
+
+				List<Annotation> pojoAttributeAnnotations =
+						PodamUtils.getAttributeAnnotations(
+								attribute.getAttribute(), getter);
+
 				manufacturingCtx.getPojos().put(fieldClass, depth + 1);
 				populatePojoInternal(fieldValue, pojoAttributeAnnotations,
 						manufacturingCtx, genericTypeArgsAll);
 				manufacturingCtx.getPojos().put(fieldClass, depth);
-				manufacturingCtx.restoreTypeArgsMap();
+				if (cloneTypeArgsMap) {
+					manufacturingCtx.restoreTypeArgsMap();
+				}
 			} else {
 
 				LOG.warn("Loop of depth " + depth + " in filling read-only field {} detected.",
@@ -1858,30 +1851,21 @@ private Object manufactureParameterValue(Class<?> pojoClass,
 					parameterType, annotations, attributeStrategy);
 		}
 
-		Map<String, Type> typeArgsMapForParam;
-		if (genericType instanceof ParameterizedType) {
-			typeArgsMapForParam = new HashMap<String, Type>(manufacturingCtx.getTypeArgsMap());
-			ParameterizedType parametrizedType =
-					(ParameterizedType) genericType;
-
-			TypeVariable<?>[] argumentTypes = parameterType.getTypeParameters();
-			Type[] argumentGenericTypes = parametrizedType.getActualTypeArguments();
-
-			for (int k = 0; k < argumentTypes.length; k++) {
-				if (argumentGenericTypes[k] instanceof Class) {
-					Class<?> genericParam = (Class<?>) argumentGenericTypes[k];
-					typeArgsMapForParam.put(argumentTypes[k].getName(), genericParam);
-				}
-			}
+		final boolean cloneTypeArgsMap = (genericType instanceof ParameterizedType);
+		Type[] genericTypeArgsAll;
+		if (cloneTypeArgsMap) {
+			genericTypeArgsAll = manufacturingCtx.cloneTypeArgsMap(
+					parameterType, (ParameterizedType) genericType, genericTypeArgs);
 		} else {
-			typeArgsMapForParam = manufacturingCtx.getTypeArgsMap();
+			genericTypeArgsAll = genericTypeArgs;
 		}
 
-		manufacturingCtx.backupTypeArgsMap(typeArgsMapForParam);
 		Object retValue = manufactureAttributeValue(pojoClass, manufacturingCtx, parameterType,
 				genericType, annotations, parameterName,
-				genericTypeArgs);
-		manufacturingCtx.restoreTypeArgsMap();
+				genericTypeArgsAll);
+		if (cloneTypeArgsMap) {
+			manufacturingCtx.restoreTypeArgsMap();
+		}
 		return retValue;
 	}
 

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

@@ -1,12 +1,14 @@
 package uk.co.jemos.podam.common;
 
+import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.ArrayDeque;
 import java.util.Deque;
 import java.util.HashMap;
 import java.util.Map;
 
 import uk.co.jemos.podam.api.DataProviderStrategy.Order;
+import uk.co.jemos.podam.typeManufacturers.TypeManufacturerUtil;
 
 /**
  * Object to hold manufacturing related data
@@ -84,6 +86,32 @@ public Map<String, Type> createEmptyTypeArgsMap() {
         return new HashMap<String, Type>();
 	}
 
+	/**
+	 * Clones and backups typeArgsMap and fills it with types for a new POJO
+	 * @param pojoType
+     *         class of a new POJO
+	 * @param parameterizedPojoType
+     *         parameterized type of a new POJO
+	 * @param genericTypeArgs
+	 *         The generic type arguments for the current generic class
+	 *         instance
+	 * @return
+	 *         The updated generic type arguments for the current generic class
+	 *         instance
+	 */
+	public Type[] cloneTypeArgsMap(Class<?> pojoType,
+			ParameterizedType parameterizedPojoType,
+			Type[] genericTypeArgs) {
+		backupTypeArgsMaps.push(typeArgsMap);
+		typeArgsMap = new HashMap<String, Type>(typeArgsMap);
+
+		Type[] actualTypes = parameterizedPojoType.getActualTypeArguments();
+		TypeManufacturerUtil.fillTypeArgMap(typeArgsMap,
+				pojoType, actualTypes);
+		return TypeManufacturerUtil.fillTypeArgMap(typeArgsMap,
+				pojoType, genericTypeArgs);
+	}
+
 	/**
 	 * Backups typeArgsMap and replace it with a new one
 	 * @param typeArgsMap