Fixes Issue #303: do not loose resolved attribute generic parameters

mtedone · Apr 10, 2022 · 7a618b1 · 7a618b1
1 parent efd78aa
commit 7a618b1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/main/java/uk/co/jemos/podam/api/PodamFactoryImpl.java b/src/main/java/uk/co/jemos/podam/api/PodamFactoryImpl.java
@@ -911,19 +911,24 @@ private Object manufactureAttributeValue(Object pojo,
 
 		Class<?> pojoClass = (pojo instanceof Class ? (Class<?>) pojo : pojo.getClass());
 		Class<?> realAttributeType;
+		AtomicReference<Type[]> elementGenericTypeArgs = new AtomicReference<Type[]>(PodamConstants.NO_TYPES);
 		if (attributeType != genericAttributeType
 				&& Object.class.equals(attributeType)
 				&& genericAttributeType instanceof TypeVariable) {
-			AtomicReference<Type[]> elementGenericTypeArgs
-					= new AtomicReference<Type[]>(PodamConstants.NO_TYPES);
 			realAttributeType = TypeManufacturerUtil.resolveGenericParameter(genericAttributeType,
                     typeArgsMap, elementGenericTypeArgs);
 		} else {
 			realAttributeType = attributeType;
 		}
 
-		Type[] genericTypeArgsAll = TypeManufacturerUtil.mergeActualAndSuppliedGenericTypes(
-					attributeType, genericAttributeType, genericTypeArgs, typeArgsMap);
+		Type[] genericTypeArgsAll;
+		if (elementGenericTypeArgs.get().length > 0) {
+			genericTypeArgsAll = ArrayUtils.addAll(elementGenericTypeArgs.get(), genericTypeArgs);
+		} else {
+			genericTypeArgsAll = genericTypeArgs;
+		}
+		genericTypeArgsAll = TypeManufacturerUtil.mergeActualAndSuppliedGenericTypes(
+					attributeType, genericAttributeType, genericTypeArgsAll, typeArgsMap);
 
 		AttributeMetadata attributeMetadata = new AttributeMetadata(
 				attributeName, realAttributeType, genericAttributeType,

diff --git a/src/test/java/uk/co/jemos/podam/test/unit/features/collections/CollectionsTest.java b/src/test/java/uk/co/jemos/podam/test/unit/features/collections/CollectionsTest.java
@@ -214,7 +214,7 @@ public void podamShouldHandleOptionalListOfStrings() throws Exception {
         OptionalList pojo = podamInvocationSteps.whenIInvokeTheFactoryForClassWithFullConstructor(OptionalList.class, podamFactory);
         podamValidationSteps.thePojoMustBeOfTheType(pojo, OptionalList.class);
         podamValidationSteps.thePojoMustBeOfTheType(pojo.getOptionalList(), Optional.class);
-        podamValidationSteps.theCollectionShouldNotBeNullOrEmptyAndContainElementsOfType(pojo.getOptionalList().get(), Object.class);
+        podamValidationSteps.theCollectionShouldNotBeNullOrEmptyAndContainElementsOfType(pojo.getOptionalList().get(), String.class);
     }
 
     //------------------> Private methods