mapstruct · filiphr · Jul 20, 2024 · May 28, 2024 · Jul 13, 2024 · Jul 20, 2024
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/ForgedMethod.java b/processor/src/main/java/org/mapstruct/ap/internal/model/ForgedMethod.java
@@ -146,13 +146,30 @@ public static ForgedMethod forSubclassMapping(String name, Type sourceType, Type
             basedOn,
             history,
             mappingReferences == null ? MappingReferences.empty() : mappingReferences,
-            forgedNameBased
+            forgedNameBased,
+            MappingMethodOptions.getSubclassForgedMethodInheritedOptions( basedOn.getOptions() )
         );
     }
 
     private ForgedMethod(String name, Type sourceType, Type returnType, List<Parameter> additionalParameters,
                          Method basedOn, ForgedMethodHistory history, MappingReferences mappingReferences,
                          boolean forgedNameBased) {
+        this(
+            name,
+            sourceType,
+            returnType,
+            additionalParameters,
+            basedOn,
+            history,
+            mappingReferences,
+            forgedNameBased,
+            MappingMethodOptions.getForgedMethodInheritedOptions( basedOn.getOptions() )
+        );
+    }
+
+    private ForgedMethod(String name, Type sourceType, Type returnType, List<Parameter> additionalParameters,
+                         Method basedOn, ForgedMethodHistory history, MappingReferences mappingReferences,
+                         boolean forgedNameBased, MappingMethodOptions options) {
 
         // establish name
         String sourceParamSafeName;
@@ -185,7 +202,7 @@ private ForgedMethod(String name, Type sourceType, Type returnType, List<Paramet
         this.mappingReferences = mappingReferences;
         this.forgedNameBased = forgedNameBased;
 
-        this.options = MappingMethodOptions.getForgedMethodInheritedOptions( basedOn.getOptions() );
+        this.options = options;
     }
 
     /**

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
@@ -66,6 +66,17 @@ public static BeanMappingOptions forForgedMethods(BeanMappingOptions beanMapping
         return options;
     }
 
+    public static BeanMappingOptions forSubclassForgedMethods(BeanMappingOptions beanMapping) {
+
+        return new BeanMappingOptions(
+            beanMapping.selectionParameters != null ?
+                SelectionParameters.withoutResultType( beanMapping.selectionParameters ) : null,
+            beanMapping.ignoreUnmappedSourceProperties,
+            beanMapping.beanMapping,
+            beanMapping
+        );
+    }
+
     public static BeanMappingOptions empty(DelegatingOptions delegatingOptions) {
         return new BeanMappingOptions( null, Collections.emptyList(), null, delegatingOptions );
     }

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
@@ -398,4 +398,17 @@ public static MappingMethodOptions getForgedMethodInheritedOptions(MappingMethod
             null );
     }
 
+    public static MappingMethodOptions getSubclassForgedMethodInheritedOptions(MappingMethodOptions options) {
+        return new MappingMethodOptions(
+            options.mapper,
+            options.mappings,
+            options.iterableMapping,
+            options.mapMapping,
+            BeanMappingOptions.forSubclassForgedMethods( options.beanMapping ),
+            options.enumMappingOptions,
+            options.valueMappings,
+            Collections.emptySet(),
+            null );
+    }
+
 }
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_3609/Issue3609Mapper.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_3609/Issue3609Mapper.java
@@ -0,0 +1,43 @@
+/*
+ * 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._3609;
+
+import org.mapstruct.BeanMapping;
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+import org.mapstruct.SubclassMapping;
+
+@Mapper(unmappedSourcePolicy = ReportingPolicy.ERROR)
+public abstract class Issue3609Mapper {
+
+    @SubclassMapping(source = CarDto.class, target = Car.class)
+    @BeanMapping(ignoreUnmappedSourceProperties = "id")
+    public abstract Vehicle toVehicle(VehicleDto vehicle);
+
+    //CHECKSTYLE:OFF
+    public static class Vehicle {
+        public int price;
+    }
+
+    public static class Car extends Vehicle {
+        public int seats;
+
+        public Car(int price, int seats) {
+            this.price = price;
+            this.seats = seats;
+        }
+    }
+
+    public static class VehicleDto {
+        public int id;
+        public int price;
+    }
+
+    public static class CarDto extends VehicleDto {
+        public int seats;
+    }
+    //CHECKSTYLE:ON
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_3609/Issue3609Test.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_3609/Issue3609Test.java
@@ -0,0 +1,23 @@
+/*
+ * 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._3609;
+
+import org.mapstruct.ap.testutil.IssueKey;
+import org.mapstruct.ap.testutil.ProcessorTest;
+import org.mapstruct.ap.testutil.WithClasses;
+
+/**
+ * @author Roman Obolonskyii
+ */
+@IssueKey("3609")
+@WithClasses(Issue3609Mapper.class)
+public class Issue3609Test {
+
+    @ProcessorTest
+    void shouldCompileWithoutErrors() {
+
+    }
+}