From 88745d151ec60c7a0c2b8b840189c2db06fe053f Mon Sep 17 00:00:00 2001
From: Ben Zegveld <Ben.Zegveld@gmail.com>
Date: Thu, 9 Jun 2022 22:36:47 +0200
Subject: [PATCH] #2882: target type is now correctly passed on through the
 MethodReferencePresenceCheck to the MethodReference.

---
 .../model/MethodReferencePresenceCheck.ftl    |  3 ++-
 .../ap/internal/model/macro/CommonMacros.ftl  |  3 ++-
 .../basic/ConditionalMappingTest.java         |  6 +++++
 .../ConditionalMethodWithTargetType.java      | 27 +++++++++++++++++++
 4 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 processor/src/test/java/org/mapstruct/ap/test/conditional/basic/ConditionalMethodWithTargetType.java

diff --git a/processor/src/main/resources/org/mapstruct/ap/internal/model/MethodReferencePresenceCheck.ftl b/processor/src/main/resources/org/mapstruct/ap/internal/model/MethodReferencePresenceCheck.ftl
index 44ec29673..9a2837a02 100644
--- a/processor/src/main/resources/org/mapstruct/ap/internal/model/MethodReferencePresenceCheck.ftl
+++ b/processor/src/main/resources/org/mapstruct/ap/internal/model/MethodReferencePresenceCheck.ftl
@@ -6,4 +6,5 @@
 
 -->
 <#-- @ftlvariable name="" type="org.mapstruct.ap.internal.model.MethodReferencePresenceCheck" -->
-<@includeModel object=methodReference/>
\ No newline at end of file
+<@includeModel object=methodReference
+               targetType=ext.targetType/>
\ No newline at end of file
diff --git a/processor/src/main/resources/org/mapstruct/ap/internal/model/macro/CommonMacros.ftl b/processor/src/main/resources/org/mapstruct/ap/internal/model/macro/CommonMacros.ftl
index 048402401..6d05ddd13 100644
--- a/processor/src/main/resources/org/mapstruct/ap/internal/model/macro/CommonMacros.ftl
+++ b/processor/src/main/resources/org/mapstruct/ap/internal/model/macro/CommonMacros.ftl
@@ -15,7 +15,8 @@
 -->
 <#macro handleSourceReferenceNullCheck>
     <#if sourcePresenceCheckerReference??>
-        if ( <@includeModel object=sourcePresenceCheckerReference /> ) {
+        if ( <@includeModel object=sourcePresenceCheckerReference
+               targetType=ext.targetType/> ) {
             <#nested>
         }
         <@elseDefaultAssignment/>
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conditional/basic/ConditionalMappingTest.java b/processor/src/test/java/org/mapstruct/ap/test/conditional/basic/ConditionalMappingTest.java
index 62fd79ae8..57a68a952 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conditional/basic/ConditionalMappingTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conditional/basic/ConditionalMappingTest.java
@@ -50,6 +50,12 @@ public class ConditionalMappingTest {
         assertThat( employee.getName() ).isNull();
     }
 
+    @IssueKey( "2882" )
+    @ProcessorTest
+    @WithClasses( { ConditionalMethodWithTargetType.class } )
+    public void conditionalMethodWithTargetTypeShouldCompile() {
+    }
+
     @ProcessorTest
     @WithClasses({
         ConditionalMethodAndBeanPresenceCheckMapper.class
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conditional/basic/ConditionalMethodWithTargetType.java b/processor/src/test/java/org/mapstruct/ap/test/conditional/basic/ConditionalMethodWithTargetType.java
new file mode 100644
index 000000000..5ec242d8f
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/conditional/basic/ConditionalMethodWithTargetType.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.ap.test.conditional.basic;
+
+import org.mapstruct.Condition;
+import org.mapstruct.Mapper;
+import org.mapstruct.TargetType;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * @author Ben Zegveld
+ */
+@Mapper
+public interface ConditionalMethodWithTargetType {
+
+    ConditionalMethodWithTargetType INSTANCE = Mappers.getMapper( ConditionalMethodWithTargetType.class );
+
+    BasicEmployee map(BasicEmployeeDto employee);
+
+    @Condition
+    default boolean isNotBlank(String value, @TargetType Class<?> targetType) {
+        return value != null && !value.trim().isEmpty();
+    }
+}