Skip to content

#3110 Fix throws declaration for ValueMapping annotated methods #3122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
filiphr merged 2 commits into from
Feb 5, 2023
Merged

#3110 Fix throws declaration for ValueMapping annotated methods #3122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97fa9b2
#3110 Fix throws declaration for ValueMapping annotated methods
EvaristeGalois11 Dec 26, 2022
f44c59a
Change to trigger GitHub Actions
filiphr Feb 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion processor/src/main/resources/org/mapstruct/ap/internal/model/ValueMappingMethod.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<#nt><@includeModel object=annotation/>
</#list>
<#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>
Expand Down Expand Up @@ -69,3 +69,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>
29 changes: 29 additions & 0 deletions processor/src/test/java/org/mapstruct/ap/test/bugs/_3110/Issue3110Mapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
27 changes: 27 additions & 0 deletions processor/src/test/java/org/mapstruct/ap/test/bugs/_3110/Issue3110MapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" );
}
}