From 0a935c67a7c9ca17a3c6980b96d964c46be527a1 Mon Sep 17 00:00:00 2001
From: Filip Hrisafov <filip.hrisafov@gmail.com>
Date: Sun, 28 Apr 2024 19:04:57 +0200
Subject: [PATCH] #3565 Presence check methods should not be considered as
 valid mapping candidates

---
 .../creation/MappingResolverImpl.java         |  3 +
 .../ap/test/bugs/_3565/Issue3565Mapper.java   | 57 +++++++++++++++++++
 .../ap/test/bugs/_3565/Issue3565Test.java     | 33 +++++++++++
 3 files changed, 93 insertions(+)
 create mode 100644 processor/src/test/java/org/mapstruct/ap/test/bugs/_3565/Issue3565Mapper.java
 create mode 100644 processor/src/test/java/org/mapstruct/ap/test/bugs/_3565/Issue3565Test.java

diff --git a/processor/src/main/java/org/mapstruct/ap/internal/processor/creation/MappingResolverImpl.java b/processor/src/main/java/org/mapstruct/ap/internal/processor/creation/MappingResolverImpl.java
index b290ff56b..e6a26ba04 100755
--- a/processor/src/main/java/org/mapstruct/ap/internal/processor/creation/MappingResolverImpl.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/processor/creation/MappingResolverImpl.java
@@ -470,6 +470,9 @@ public class MappingResolverImpl implements MappingResolver {
         }
 
         private boolean isCandidateForMapping(Method methodCandidate) {
+            if ( methodCandidate.isPresenceCheck() ) {
+                return false;
+            }
             return isCreateMethodForMapping( methodCandidate ) || isUpdateMethodForMapping( methodCandidate );
         }
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_3565/Issue3565Mapper.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_3565/Issue3565Mapper.java
new file mode 100644
index 000000000..b86e667e5
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_3565/Issue3565Mapper.java
@@ -0,0 +1,57 @@
+/*
+ * 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._3565;
+
+import java.util.Optional;
+
+import org.mapstruct.Condition;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * @author Filip Hrisafov
+ */
+@Mapper
+public interface Issue3565Mapper {
+
+    Issue3565Mapper INSTANCE = Mappers.getMapper( Issue3565Mapper.class );
+
+    default <T> T mapFromOptional(Optional<T> value) {
+        return value.orElse( (T) null );
+    }
+
+    @Condition
+    default boolean isOptionalPresent(Optional<?> value) {
+        return value.isPresent();
+    }
+
+    Target map(Source source);
+
+    class Source {
+
+        private final Boolean condition;
+
+        public Source(Boolean condition) {
+            this.condition = condition;
+        }
+
+        public Optional<Boolean> getCondition() {
+            return Optional.ofNullable( this.condition );
+        }
+    }
+
+    class Target {
+        private String condition;
+
+        public Optional<String> getCondition() {
+            return Optional.ofNullable( this.condition );
+        }
+
+        public void setCondition(String condition) {
+            this.condition = condition;
+        }
+    }
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_3565/Issue3565Test.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_3565/Issue3565Test.java
new file mode 100644
index 000000000..c4cd028d4
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_3565/Issue3565Test.java
@@ -0,0 +1,33 @@
+/*
+ * 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._3565;
+
+import org.mapstruct.ap.testutil.IssueKey;
+import org.mapstruct.ap.testutil.ProcessorTest;
+import org.mapstruct.ap.testutil.WithClasses;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Filip Hrisafov
+ */
+@WithClasses(Issue3565Mapper.class)
+@IssueKey("3565")
+class Issue3565Test {
+
+    @ProcessorTest
+    void shouldGenerateValidCode() {
+        Issue3565Mapper.Target target = Issue3565Mapper.INSTANCE.map( new Issue3565Mapper.Source( null ) );
+
+        assertThat( target ).isNotNull();
+        assertThat( target.getCondition() ).isEmpty();
+
+        target = Issue3565Mapper.INSTANCE.map( new Issue3565Mapper.Source( false ) );
+
+        assertThat( target ).isNotNull();
+        assertThat( target.getCondition() ).hasValue( "false" );
+    }
+}