From ac1f9aeaa529e10cbd7e8d1cc85556a5b5b61c10 Mon Sep 17 00:00:00 2001 From: sjaakd Date: Sun, 17 May 2015 20:17:17 +0200 Subject: [PATCH] #544 fix unused imports due to existing mapping target --- .../main/java/org/mapstruct/ap/model/IterableMappingMethod.java | 2 +- .../src/main/java/org/mapstruct/ap/model/MapMappingMethod.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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() ); }