From a67e4e5f9620443598cef8897e17a1af43919d1e Mon Sep 17 00:00:00 2001
From: Claudio Nave <claudionave97@gmail.com>
Date: Sun, 5 Feb 2023 12:17:02 +0100
Subject: [PATCH] #3110 Fix throws declaration for ValueMapping annotated
 methods (#3122)

#3110 Fix throws declaration for ValueMapping annotated methods
---
 .../ap/internal/model/ValueMappingMethod.ftl  | 10 ++++++-
 .../ap/test/bugs/_3110/Issue3110Mapper.java   | 29 +++++++++++++++++++
 .../test/bugs/_3110/Issue3110MapperTest.java  | 27 +++++++++++++++++
 3 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 processor/src/test/java/org/mapstruct/ap/test/bugs/_3110/Issue3110Mapper.java
 create mode 100644 processor/src/test/java/org/mapstruct/ap/test/bugs/_3110/Issue3110MapperTest.java

diff --git a/processor/src/main/resources/org/mapstruct/ap/internal/model/ValueMappingMethod.ftl b/processor/src/main/resources/org/mapstruct/ap/internal/model/ValueMappingMethod.ftl
index 4d961c40a..82b792a70 100644
--- a/processor/src/main/resources/org/mapstruct/ap/internal/model/ValueMappingMethod.ftl
+++ b/processor/src/main/resources/org/mapstruct/ap/internal/model/ValueMappingMethod.ftl
@@ -7,7 +7,7 @@
 -->
 <#-- @ftlvariable name="" type="org.mapstruct.ap.internal.model.ValueMappingMethod" -->
 <#if overridden>@Override</#if>
-<#lt>${accessibility.keyword} <@includeModel object=returnType/> ${name}(<#list parameters as param><@includeModel object=param/><#if param_has_next>, </#if></#list>) {
+<#lt>${accessibility.keyword} <@includeModel object=returnType/> ${name}(<#list parameters as param><@includeModel object=param/><#if param_has_next>, </#if></#list>)<@throws/> {
     <#list beforeMappingReferencesWithoutMappingTarget as callback>
         <@includeModel object=callback targetBeanName=resultName targetType=resultType/>
         <#if !callback_has_next>
@@ -66,3 +66,11 @@
         </#if>
     </@compress>
 </#macro>
+<#macro throws>
+    <#if (thrownTypes?size > 0)><#lt> throws </#if><@compress single_line=true>
+        <#list thrownTypes as exceptionType>
+            <@includeModel object=exceptionType/>
+            <#if exceptionType_has_next>, </#if><#t>
+        </#list>
+    </@compress>
+</#macro>
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_3110/Issue3110Mapper.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_3110/Issue3110Mapper.java
new file mode 100644
index 000000000..12dd82376
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_3110/Issue3110Mapper.java
@@ -0,0 +1,29 @@
+/*
+ * 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._3110;
+
+import org.mapstruct.EnumMapping;
+import org.mapstruct.Mapper;
+
+@Mapper
+public interface Issue3110Mapper {
+    enum SourceEnum {
+        FOO, BAR
+    }
+
+    enum TargetEnum {
+        FOO, BAR
+    }
+
+    class CustomCheckedException extends Exception {
+        public CustomCheckedException(String message) {
+            super( message );
+        }
+    }
+
+    @EnumMapping(unexpectedValueMappingException = CustomCheckedException.class)
+    TargetEnum map(SourceEnum sourceEnum) throws CustomCheckedException;
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_3110/Issue3110MapperTest.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_3110/Issue3110MapperTest.java
new file mode 100644
index 000000000..3b256ba10
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_3110/Issue3110MapperTest.java
@@ -0,0 +1,27 @@
+/*
+ * 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._3110;
+
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.mapstruct.ap.testutil.IssueKey;
+import org.mapstruct.ap.testutil.ProcessorTest;
+import org.mapstruct.ap.testutil.WithClasses;
+import org.mapstruct.ap.testutil.runner.GeneratedSource;
+
+@WithClasses({
+    Issue3110Mapper.class
+})
+@IssueKey("3110")
+class Issue3110MapperTest {
+    @RegisterExtension
+    final GeneratedSource generatedSource = new GeneratedSource();
+
+    @ProcessorTest
+    void throwsException() {
+        generatedSource.forMapper( Issue3110Mapper.class ).content()
+            .contains( "throws CustomCheckedException" );
+    }
+}