From af1eab0ece084aa04798e2d86fc20bd65bfa784e Mon Sep 17 00:00:00 2001
From: Filip Hrisafov <filip.hrisafov@gmail.com>
Date: Thu, 29 Sep 2022 22:10:27 +0200
Subject: [PATCH] #2743 BeanMappingOptions should not be inherited for forged
 methods

---
 .../model/source/BeanMappingOptions.java      |  7 +-
 .../model/source/MappingMethodOptions.java    |  2 +-
 .../ap/test/bugs/_2743/Issue2743Mapper.java   | 75 +++++++++++++++++++
 .../ap/test/bugs/_2743/Issue2743Test.java     | 24 ++++++
 4 files changed, 105 insertions(+), 3 deletions(-)
 create mode 100644 processor/src/test/java/org/mapstruct/ap/test/bugs/_2743/Issue2743Mapper.java
 create mode 100644 processor/src/test/java/org/mapstruct/ap/test/bugs/_2743/Issue2743Test.java

diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/source/BeanMappingOptions.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/BeanMappingOptions.java
index 60aac32e5..b73b4084f 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/model/source/BeanMappingOptions.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/BeanMappingOptions.java
@@ -54,13 +54,16 @@ public class BeanMappingOptions extends DelegatingOptions {
         return options;
     }
 
+    public static BeanMappingOptions empty(DelegatingOptions delegatingOptions) {
+        return new BeanMappingOptions( null, Collections.emptyList(), null, delegatingOptions );
+    }
+
     public static BeanMappingOptions getInstanceOn(BeanMappingGem beanMapping, MapperOptions mapperOptions,
                                                    ExecutableElement method, FormattingMessager messager,
                                                    TypeUtils typeUtils, TypeFactory typeFactory
     ) {
         if ( beanMapping == null || !isConsistent( beanMapping, method, messager ) ) {
-            BeanMappingOptions options = new BeanMappingOptions( null, Collections.emptyList(), null, mapperOptions );
-            return options;
+            return empty( mapperOptions );
         }
 
         Objects.requireNonNull( method );
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/source/MappingMethodOptions.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/MappingMethodOptions.java
index 4a140c4fb..a1a64872a 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/model/source/MappingMethodOptions.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/MappingMethodOptions.java
@@ -365,7 +365,7 @@ public class MappingMethodOptions {
             options.mappings,
             options.iterableMapping,
             options.mapMapping,
-            options.beanMapping,
+            BeanMappingOptions.empty( options.beanMapping.next() ),
             options.enumMappingOptions,
             options.valueMappings,
             Collections.emptySet(),
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2743/Issue2743Mapper.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2743/Issue2743Mapper.java
new file mode 100644
index 000000000..db3c0e6d4
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2743/Issue2743Mapper.java
@@ -0,0 +1,75 @@
+/*
+ * 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._2743;
+
+import org.mapstruct.BeanMapping;
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+
+/**
+ * @author Filip Hrisafov
+ */
+@Mapper(unmappedSourcePolicy = ReportingPolicy.ERROR)
+public interface Issue2743Mapper {
+
+    @BeanMapping(ignoreUnmappedSourceProperties = { "number" })
+    Target map(Source source);
+
+    class Source {
+
+        private final int number = 10;
+        private final NestedSource nested;
+
+        public Source(NestedSource nested) {
+            this.nested = nested;
+        }
+
+        public int getNumber() {
+            return number;
+        }
+
+        public NestedSource getNested() {
+            return nested;
+        }
+    }
+
+    class NestedSource {
+        private final String value;
+
+        public NestedSource(String value) {
+            this.value = value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+    }
+
+    class Target {
+
+        private final NestedTarget nested;
+
+        public Target(NestedTarget nested) {
+            this.nested = nested;
+        }
+
+        public NestedTarget getNested() {
+            return nested;
+        }
+    }
+
+    class NestedTarget {
+        private final String value;
+
+        public NestedTarget(String value) {
+            this.value = value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+    }
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2743/Issue2743Test.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2743/Issue2743Test.java
new file mode 100644
index 000000000..5c2bb6127
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2743/Issue2743Test.java
@@ -0,0 +1,24 @@
+/*
+ * 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._2743;
+
+import org.mapstruct.ap.testutil.IssueKey;
+import org.mapstruct.ap.testutil.ProcessorTest;
+import org.mapstruct.ap.testutil.WithClasses;
+
+/**
+ * @author Filip Hrisafov
+ */
+@IssueKey("2743")
+@WithClasses({
+    Issue2743Mapper.class
+})
+class Issue2743Test {
+
+    @ProcessorTest
+    void shouldCompile() {
+    }
+}