From 03d44b5a872f796b79336429d8cde2ee7918910a Mon Sep 17 00:00:00 2001
From: Zegveld <41897697+Zegveld@users.noreply.github.com>
Date: Sat, 2 Apr 2022 18:55:06 +0200
Subject: [PATCH] #2795: use 'includeModel' for the
 'sourcePresenceCheckerReference' in the 'UpdateWrapper'. (#2796)

* #2795: use 'includeModel' for the 'sourcePresenceCheckerReference' in the 'UpdateWrapper'.
* Simplify the tests

Co-authored-by: Ben Zegveld <Ben.Zegveld@gmail.com>
Co-authored-by: Filip Hrisafov <filip.hrisafov@gmail.com>
---
 .../model/assignment/UpdateWrapper.ftl        |  2 +-
 .../ap/test/bugs/_2795/Issue2795Mapper.java   | 30 +++++++++++++++++++
 .../ap/test/bugs/_2795/Issue2795Test.java     | 25 ++++++++++++++++
 .../mapstruct/ap/test/bugs/_2795/Nested.java  | 20 +++++++++++++
 .../ap/test/bugs/_2795/NestedDto.java         | 20 +++++++++++++
 .../mapstruct/ap/test/bugs/_2795/Source.java  | 22 ++++++++++++++
 .../mapstruct/ap/test/bugs/_2795/Target.java  | 20 +++++++++++++
 7 files changed, 138 insertions(+), 1 deletion(-)
 create mode 100644 processor/src/test/java/org/mapstruct/ap/test/bugs/_2795/Issue2795Mapper.java
 create mode 100644 processor/src/test/java/org/mapstruct/ap/test/bugs/_2795/Issue2795Test.java
 create mode 100644 processor/src/test/java/org/mapstruct/ap/test/bugs/_2795/Nested.java
 create mode 100644 processor/src/test/java/org/mapstruct/ap/test/bugs/_2795/NestedDto.java
 create mode 100644 processor/src/test/java/org/mapstruct/ap/test/bugs/_2795/Source.java
 create mode 100644 processor/src/test/java/org/mapstruct/ap/test/bugs/_2795/Target.java

diff --git a/processor/src/main/resources/org/mapstruct/ap/internal/model/assignment/UpdateWrapper.ftl b/processor/src/main/resources/org/mapstruct/ap/internal/model/assignment/UpdateWrapper.ftl
index 58416fc63..9cdd07c23 100644
--- a/processor/src/main/resources/org/mapstruct/ap/internal/model/assignment/UpdateWrapper.ftl
+++ b/processor/src/main/resources/org/mapstruct/ap/internal/model/assignment/UpdateWrapper.ftl
@@ -10,7 +10,7 @@
 <@lib.handleExceptions>
   <#if includeSourceNullCheck>
     <@lib.sourceLocalVarAssignment/>
-    if ( <#if sourcePresenceCheckerReference?? >${sourcePresenceCheckerReference}<#else><#if sourceLocalVarName??>${sourceLocalVarName}<#else>${sourceReference}</#if> != null</#if> ) {
+    if ( <#if sourcePresenceCheckerReference?? ><@includeModel object=sourcePresenceCheckerReference /><#else><#if sourceLocalVarName??>${sourceLocalVarName}<#else>${sourceReference}</#if> != null</#if> ) {
       <@assignToExistingTarget/>
       <@lib.handleAssignment/>;
     }
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2795/Issue2795Mapper.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2795/Issue2795Mapper.java
new file mode 100644
index 000000000..41f29da92
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2795/Issue2795Mapper.java
@@ -0,0 +1,30 @@
+/*
+ * 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.bugs._2795;
+
+import java.util.Optional;
+
+import org.mapstruct.Condition;
+import org.mapstruct.Mapper;
+import org.mapstruct.MappingTarget;
+
+@Mapper
+public interface Issue2795Mapper {
+
+    void update(Source update, @MappingTarget Target destination);
+
+    void update(NestedDto update, @MappingTarget Nested destination);
+
+    static <T> T unwrap(Optional<T> optional) {
+        return optional.orElse( null );
+    }
+
+    @Condition
+    static <T> boolean isNotEmpty(Optional<T> field) {
+        return field != null && field.isPresent();
+    }
+
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2795/Issue2795Test.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2795/Issue2795Test.java
new file mode 100644
index 000000000..4b7b59952
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2795/Issue2795Test.java
@@ -0,0 +1,25 @@
+/*
+ * 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.bugs._2795;
+
+import org.mapstruct.ap.testutil.IssueKey;
+import org.mapstruct.ap.testutil.ProcessorTest;
+import org.mapstruct.ap.testutil.WithClasses;
+
+@IssueKey("2795")
+@WithClasses({
+    Issue2795Mapper.class,
+    Nested.class,
+    NestedDto.class,
+    Target.class,
+    Source.class,
+})
+public class Issue2795Test {
+
+    @ProcessorTest
+    void shouldCompile() {
+    }
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2795/Nested.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2795/Nested.java
new file mode 100644
index 000000000..5214c7d07
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2795/Nested.java
@@ -0,0 +1,20 @@
+/*
+ * 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.bugs._2795;
+
+public class Nested {
+
+    private String name;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2795/NestedDto.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2795/NestedDto.java
new file mode 100644
index 000000000..1b2745343
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2795/NestedDto.java
@@ -0,0 +1,20 @@
+/*
+ * 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.bugs._2795;
+
+public class NestedDto {
+
+    private String name;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2795/Source.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2795/Source.java
new file mode 100644
index 000000000..927e2b09f
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2795/Source.java
@@ -0,0 +1,22 @@
+/*
+ * 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.bugs._2795;
+
+import java.util.Optional;
+
+public class Source {
+
+    private Optional<NestedDto> nested = Optional.empty();
+
+    public Optional<NestedDto> getNested() {
+        return nested;
+    }
+
+    public void setNested(Optional<NestedDto> nested) {
+        this.nested = nested;
+    }
+
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2795/Target.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2795/Target.java
new file mode 100644
index 000000000..ed69a6d48
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2795/Target.java
@@ -0,0 +1,20 @@
+/*
+ * 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.bugs._2795;
+
+public class Target {
+
+    private Nested nested;
+
+    public Nested getNested() {
+        return nested;
+    }
+
+    public void setNested(Nested nested) {
+        this.nested = nested;
+    }
+
+}