From b22efd9ad7d8878c45d8f5c906b39dbbfe3aeaec Mon Sep 17 00:00:00 2001
From: Justyna <98126210+JKLedzion@users.noreply.github.com>
Date: Mon, 24 Jan 2022 14:17:24 +0100
Subject: [PATCH] =?UTF-8?q?#2674:=20Add=20check=20if=20method=20without=20?=
 =?UTF-8?q?implementation=20doesn=E2=80=99t=20have=20`@AfterMapping`=20/?=
 =?UTF-8?q?=20`@BeforeMapping`=20annotation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processor/MethodRetrievalProcessor.java   | 10 +++++
 .../mapstruct/ap/internal/util/Message.java   |  2 +
 .../_2674/ErroneousSourceTargetMapping.java   | 28 +++++++++++++
 .../ap/test/bugs/_2674/Issue2674Test.java     | 40 +++++++++++++++++++
 .../mapstruct/ap/test/bugs/_2674/Source.java  | 28 +++++++++++++
 .../mapstruct/ap/test/bugs/_2674/Target.java  | 28 +++++++++++++
 6 files changed, 136 insertions(+)
 create mode 100644 processor/src/test/java/org/mapstruct/ap/test/bugs/_2674/ErroneousSourceTargetMapping.java
 create mode 100644 processor/src/test/java/org/mapstruct/ap/test/bugs/_2674/Issue2674Test.java
 create mode 100644 processor/src/test/java/org/mapstruct/ap/test/bugs/_2674/Source.java
 create mode 100644 processor/src/test/java/org/mapstruct/ap/test/bugs/_2674/Target.java

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
index b226c1a05..a31fb41a7 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/processor/MethodRetrievalProcessor.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/processor/MethodRetrievalProcessor.java
@@ -564,6 +564,16 @@ public class MethodRetrievalProcessor implements ModelElementProcessor<Void, Lis
             }
         }
 
+        if ( Executables.isAfterMappingMethod( method ) ) {
+            messager.printMessage( method, Message.RETRIEVAL_AFTER_METHOD_NOT_IMPLEMENTED );
+            return false;
+        }
+
+        if ( Executables.isBeforeMappingMethod( method ) ) {
+            messager.printMessage( method, Message.RETRIEVAL_BEFORE_METHOD_NOT_IMPLEMENTED );
+            return false;
+        }
+
         return true;
     }
 
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/util/Message.java b/processor/src/main/java/org/mapstruct/ap/internal/util/Message.java
index 9b21e4090..26f4a33c5 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/util/Message.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/util/Message.java
@@ -167,6 +167,8 @@ public enum Message {
     RETRIEVAL_WILDCARD_EXTENDS_BOUND_RESULT( "Can't generate mapping method for a wildcard extends bound result." ),
     RETRIEVAL_CONTEXT_PARAMS_WITH_SAME_TYPE( "The types of @Context parameters must be unique." ),
     RETRIEVAL_MAPPER_USES_CYCLE( "The mapper %s is referenced itself in Mapper#uses.", Diagnostic.Kind.WARNING ),
+    RETRIEVAL_AFTER_METHOD_NOT_IMPLEMENTED( "@AfterMapping can only be applied to an implemented method." ),
+    RETRIEVAL_BEFORE_METHOD_NOT_IMPLEMENTED( "@BeforeMapping can only be applied to an implemented method." ),
 
     INHERITINVERSECONFIGURATION_DUPLICATES( "Several matching inverse methods exist: %s(). Specify a name explicitly." ),
     INHERITINVERSECONFIGURATION_INVALID_NAME( "None of the candidates %s() matches given name: \"%s\"." ),
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2674/ErroneousSourceTargetMapping.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2674/ErroneousSourceTargetMapping.java
new file mode 100644
index 000000000..9157a626b
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2674/ErroneousSourceTargetMapping.java
@@ -0,0 +1,28 @@
+/*
+ * 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._2674;
+
+import org.mapstruct.AfterMapping;
+import org.mapstruct.BeforeMapping;
+import org.mapstruct.Mapper;
+import org.mapstruct.MappingTarget;
+import org.mapstruct.factory.Mappers;
+
+@Mapper
+interface ErroneousSourceTargetMapping {
+
+    ErroneousSourceTargetMapping INSTANCE = Mappers.getMapper( ErroneousSourceTargetMapping.class );
+
+    @BeforeMapping
+    void beforeMappingMethod(Target target, @MappingTarget Source source);
+
+    @AfterMapping
+    void afterMappingMethod(Source source, @MappingTarget Target target);
+
+    Target toTarget(Source source);
+
+    Source toSource(Target target);
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2674/Issue2674Test.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2674/Issue2674Test.java
new file mode 100644
index 000000000..90530051f
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2674/Issue2674Test.java
@@ -0,0 +1,40 @@
+/*
+ * 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._2674;
+
+import org.mapstruct.ap.testutil.IssueKey;
+import org.mapstruct.ap.testutil.ProcessorTest;
+import org.mapstruct.ap.testutil.WithClasses;
+import org.mapstruct.ap.testutil.compilation.annotation.CompilationResult;
+import org.mapstruct.ap.testutil.compilation.annotation.Diagnostic;
+import org.mapstruct.ap.testutil.compilation.annotation.ExpectedCompilationOutcome;
+
+import static javax.tools.Diagnostic.Kind;
+
+/**
+ * @author Justyna Kubica-Ledzion
+ */
+@IssueKey("2674")
+@WithClasses({ Source.class, Target.class, ErroneousSourceTargetMapping.class })
+public class Issue2674Test {
+
+    @ProcessorTest
+    @ExpectedCompilationOutcome(
+        value = CompilationResult.FAILED,
+        diagnostics = {
+            @Diagnostic(type = ErroneousSourceTargetMapping.class,
+                kind = Kind.ERROR,
+                line = 20,
+                message = "@BeforeMapping can only be applied to an implemented method."),
+            @Diagnostic(type = ErroneousSourceTargetMapping.class,
+                kind = Kind.ERROR,
+                line = 23,
+                message = "@AfterMapping can only be applied to an implemented method.")
+        }
+    )
+    public void shouldRaiseErrorIfThereIsNoAfterOrBeforeMethodImplementation() {
+    }
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2674/Source.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2674/Source.java
new file mode 100644
index 000000000..f9145c08b
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2674/Source.java
@@ -0,0 +1,28 @@
+/*
+ * 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._2674;
+
+public class Source {
+
+    private int id;
+    private String name;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    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/_2674/Target.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2674/Target.java
new file mode 100644
index 000000000..244bdeb9a
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2674/Target.java
@@ -0,0 +1,28 @@
+/*
+ * 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._2674;
+
+public class Target {
+
+    private int id;
+    private String name;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}