diff --git a/processor/src/main/java/org/mapstruct/ap/model/IterableMappingMethod.java b/processor/src/main/java/org/mapstruct/ap/model/IterableMappingMethod.java index a45a64f99..d4a7bdb4f 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/IterableMappingMethod.java +++ b/processor/src/main/java/org/mapstruct/ap/model/IterableMappingMethod.java @@ -177,7 +177,7 @@ public class IterableMappingMethod extends MappingMethod { if ( elementAssignment != null ) { types.addAll( elementAssignment.getImportTypes() ); } - if ( factoryMethod == null ) { + if ( ( factoryMethod == null ) && ( !isExistingInstanceMapping() ) ) { types.addAll( getReturnType().getImportTypes() ); } return types; diff --git a/processor/src/main/java/org/mapstruct/ap/model/MapMappingMethod.java b/processor/src/main/java/org/mapstruct/ap/model/MapMappingMethod.java index 3b2d7ec01..c4e8065bc 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/MapMappingMethod.java +++ b/processor/src/main/java/org/mapstruct/ap/model/MapMappingMethod.java @@ -215,7 +215,7 @@ public class MapMappingMethod extends MappingMethod { if ( valueAssignment != null ) { types.addAll( valueAssignment.getImportTypes() ); } - if ( factoryMethod == null ) { + if ( ( factoryMethod == null ) && ( !isExistingInstanceMapping() ) ) { types.addAll( getReturnType().getImportTypes() ); }