mapstruct · filiphr · Jul 8, 2023 · Jun 1, 2023 · Jun 2, 2023 · Jun 24, 2023
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/processor/MethodRetrievalProcessor.java b/processor/src/main/java/org/mapstruct/ap/internal/processor/MethodRetrievalProcessor.java
@@ -124,6 +124,11 @@ private List<SourceMethod> retrievePrototypeMethods(TypeElement mapperTypeElemen
         List<SourceMethod> methods = new ArrayList<>();
         for ( ExecutableElement executable : elementUtils.getAllEnclosedExecutableElements( typeElement ) ) {
 
+            if ( executable.isDefault() || executable.getModifiers().contains( Modifier.STATIC ) ) {
+                // skip the default and static methods because these are not prototypes.
+                continue;
+            }
+
             ExecutableType methodType = typeFactory.getMethodType( mapperAnnotation.mapperConfigType(), executable );
             List<Parameter> parameters = typeFactory.getParameters( methodType, executable );
             boolean containsTargetTypeParameter = SourceMethod.containsTargetTypeParameter( parameters );

diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_3296/Entity.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_3296/Entity.java
@@ -0,0 +1,18 @@
+/*
+ * 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._3296;
+
+public class Entity {
+    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/_3296/Issue3296Test.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_3296/Issue3296Test.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._3296;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.mapstruct.ap.testutil.IssueKey;
+import org.mapstruct.ap.testutil.ProcessorTest;
+import org.mapstruct.ap.testutil.WithClasses;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * @author Ben Zegveld
+ */
+@IssueKey( "3296" )
+@WithClasses( { Entity.class, Payload.class } )
+public class Issue3296Test {
+
+    @ProcessorTest
+    @WithClasses( { MapperExtendingConfig.class, MapperConfigWithPayloadArgument.class } )
+    public void shouldNotRaiseErrorForDefaultAfterMappingMethodImplementation() {
+        Payload payload = new Payload();
+        payload.setName( "original" );
+
+        Entity entity = Mappers.getMapper( MapperExtendingConfig.class ).toEntity( payload );
+
+        assertThat( entity.getName() ).isEqualTo( "AfterMapping called" );
+    }
+
+    @ProcessorTest
+    @WithClasses( { MapperNotExtendingConfig.class, MapperConfigWithoutPayloadArgument.class } )
+    public void shouldNotRaiseErrorRequiringArgumentsForDefaultMethods() {
+        Payload payload = new Payload();
+        payload.setName( "original" );
+
+        Entity entity = Mappers.getMapper( MapperNotExtendingConfig.class ).toEntity( payload );
+
+        assertThat( entity.getName() ).isEqualTo( "original" );
+    }
+}
diff --git a/...essor/src/test/java/org/mapstruct/ap/test/bugs/_3296/MapperConfigWithPayloadArgument.java b/...essor/src/test/java/org/mapstruct/ap/test/bugs/_3296/MapperConfigWithPayloadArgument.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._3296;
+
+import org.mapstruct.AfterMapping;
+import org.mapstruct.MapperConfig;
+import org.mapstruct.MappingTarget;
+
+@MapperConfig
+public interface MapperConfigWithPayloadArgument {
+
+    @AfterMapping
+    default void afterMapping(@MappingTarget Entity entity, Payload unused) {
+        staticMethod( entity );
+    }
+
+    static void staticMethod(Entity entity) {
+        entity.setName( "AfterMapping called" );
+    }
+
+}
diff --git a/...or/src/test/java/org/mapstruct/ap/test/bugs/_3296/MapperConfigWithoutPayloadArgument.java b/...or/src/test/java/org/mapstruct/ap/test/bugs/_3296/MapperConfigWithoutPayloadArgument.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._3296;
+
+import org.mapstruct.AfterMapping;
+import org.mapstruct.MapperConfig;
+import org.mapstruct.MappingTarget;
+
+@MapperConfig
+public interface MapperConfigWithoutPayloadArgument {
+
+    @AfterMapping
+    default void afterMapping(@MappingTarget Entity entity) {
+        staticMethod( entity );
+    }
+
+    static void staticMethod(Entity entity) {
+        entity.setName( "AfterMapping called" );
+    }
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_3296/MapperExtendingConfig.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_3296/MapperExtendingConfig.java
@@ -0,0 +1,13 @@
+/*
+ * 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._3296;
+
+import org.mapstruct.Mapper;
+
+@Mapper( config = MapperConfigWithPayloadArgument.class )
+public interface MapperExtendingConfig extends MapperConfigWithPayloadArgument {
+    Entity toEntity(Payload payload);
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_3296/MapperNotExtendingConfig.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_3296/MapperNotExtendingConfig.java
@@ -0,0 +1,13 @@
+/*
+ * 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._3296;
+
+import org.mapstruct.Mapper;
+
+@Mapper( config = MapperConfigWithoutPayloadArgument.class )
+public interface MapperNotExtendingConfig {
+    Entity toEntity(Payload payload);
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_3296/Payload.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_3296/Payload.java
@@ -0,0 +1,19 @@
+/*
+ * 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._3296;
+
+public class Payload {
+
+    String name;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}