Use multi-catch in generated code (#4021)

hduelme · web-flow · commit 0d3104908196 · 2026-03-23T23:35:47.000+01:00
diff --git a/processor/src/main/resources/org/mapstruct/ap/internal/model/assignment/Java8FunctionWrapper.ftl b/processor/src/main/resources/org/mapstruct/ap/internal/model/assignment/Java8FunctionWrapper.ftl
@@ -6,6 +6,7 @@
 
 -->
 <#-- @ftlvariable name="" type="org.mapstruct.ap.internal.model.assignment.Java8FunctionWrapper" -->
+<#import "../macro/CommonMacros.ftl" as lib>
 <#assign sourceVarName><#if assignment.sourceLocalVarName?? >${assignment.sourceLocalVarName}<#else>${assignment.sourceReference}</#if></#assign>
 <#if (thrownTypes?size == 0) >
     <#compress>
@@ -17,14 +18,9 @@
 <#else>
     <#compress>
         ${sourceVarName} -> {
-            try {
+            <@lib.handleExceptions>
                 return <@_assignment/>;
-            }
-            <#list thrownTypes as exceptionType>
-            catch ( <@includeModel object=exceptionType/> e ) {
-                throw new RuntimeException( e );
-            }
-            </#list>
+            </@lib.handleExceptions>
         }
     </#compress>
 </#if>
diff --git a/processor/src/main/resources/org/mapstruct/ap/internal/model/assignment/LocalVarWrapper.ftl b/processor/src/main/resources/org/mapstruct/ap/internal/model/assignment/LocalVarWrapper.ftl
@@ -6,18 +6,14 @@
 
 -->
 <#-- @ftlvariable name="" type="org.mapstruct.ap.internal.model.assignment.LocalVarWrapper" -->
+<#import "../macro/CommonMacros.ftl" as lib>
 <#if (thrownTypes?size == 0) >
     <#if !ext.isTargetDefined?? ><@includeModel object=ext.targetType/></#if> ${ext.targetWriteAccessorName} = <@_assignment/>;
 <#else>
     <#if !ext.isTargetDefined?? ><@includeModel object=ext.targetType/> ${ext.targetWriteAccessorName};</#if>
-    try {
+    <@lib.handleExceptions>
         ${ext.targetWriteAccessorName} = <@_assignment/>;
-    }
-    <#list thrownTypes as exceptionType>
-    catch ( <@includeModel object=exceptionType/> e ) {
-       throw new RuntimeException( e );
-    }
-    </#list>
+    </@lib.handleExceptions>
 </#if>
 <#macro _assignment>
     <@includeModel object=assignment
diff --git a/processor/src/main/resources/org/mapstruct/ap/internal/model/macro/CommonMacros.ftl b/processor/src/main/resources/org/mapstruct/ap/internal/model/macro/CommonMacros.ftl
@@ -104,11 +104,16 @@
         try {
             <#nested>
         }
-        <#list thrownTypes as exceptionType>
-        catch ( <@includeModel object=exceptionType/> e ) {
+        <@compress single_line=true>catch (
+            <#list thrownTypes as exceptionType>
+                <#if exceptionType_index &gt; 0> | </#if>
+                <@includeModel object=exceptionType/>
+            </#list>
+            e ) {
+        </@compress>
+
             throw new RuntimeException( e );
         }
-        </#list>
   </#if>
 </#macro>
 <#--
diff --git a/processor/src/test/resources/fixtures/org/mapstruct/ap/test/collection/adder/SourceTargetMapperImpl.java b/processor/src/test/resources/fixtures/org/mapstruct/ap/test/collection/adder/SourceTargetMapperImpl.java
@@ -59,10 +59,7 @@ public Source toSource(Target source) {
         try {
             source1.setPets( petMapper.toSourcePets( source.getPets() ) );
         }
-        catch ( CatException e ) {
-            throw new RuntimeException( e );
-        }
-        catch ( DogException e ) {
+        catch ( CatException | DogException e ) {
             throw new RuntimeException( e );
         }
 
@@ -82,10 +79,7 @@ public void toExistingTarget(Source source, Target target) {
                 }
             }
         }
-        catch ( CatException e ) {
-            throw new RuntimeException( e );
-        }
-        catch ( DogException e ) {
+        catch ( CatException | DogException e ) {
             throw new RuntimeException( e );
         }
     }
@@ -161,10 +155,7 @@ public TargetViaTargetType toTargetViaTargetType(Source source) {
                 }
             }
         }
-        catch ( CatException e ) {
-            throw new RuntimeException( e );
-        }
-        catch ( DogException e ) {
+        catch ( CatException | DogException e ) {
             throw new RuntimeException( e );
         }
 
@@ -184,10 +175,7 @@ public Target fromSingleElementSource(SingleElementSource source) {
                 target.addPet( petMapper.toPet( source.getPet() ) );
             }
         }
-        catch ( CatException e ) {
-            throw new RuntimeException( e );
-        }
-        catch ( DogException e ) {
+        catch ( CatException | DogException e ) {
             throw new RuntimeException( e );
         }
 

Original file line number	Diff line number	Diff line change
`@@ -59,10 +59,7 @@ public Source toSource(Target source) {`
`59`	`59`	`try {`
`60`	`60`	`source1.setPets( petMapper.toSourcePets( source.getPets() ) );`
`61`	`61`	`}`
`62`		`- catch ( CatException e ) {`
`63`		`- throw new RuntimeException( e );`
`64`		`- }`
`65`		`- catch ( DogException e ) {`
	`62`	`+ catch ( CatException \| DogException e ) {`
`66`	`63`	`throw new RuntimeException( e );`
`67`	`64`	`}`
`68`	`65`
`@@ -82,10 +79,7 @@ public void toExistingTarget(Source source, Target target) {`
`82`	`79`	`}`
`83`	`80`	`}`
`84`	`81`	`}`
`85`		`- catch ( CatException e ) {`
`86`		`- throw new RuntimeException( e );`
`87`		`- }`
`88`		`- catch ( DogException e ) {`
	`82`	`+ catch ( CatException \| DogException e ) {`
`89`	`83`	`throw new RuntimeException( e );`
`90`	`84`	`}`
`91`	`85`	`}`
`@@ -161,10 +155,7 @@ public TargetViaTargetType toTargetViaTargetType(Source source) {`
`161`	`155`	`}`
`162`	`156`	`}`
`163`	`157`	`}`
`164`		`- catch ( CatException e ) {`
`165`		`- throw new RuntimeException( e );`
`166`		`- }`
`167`		`- catch ( DogException e ) {`
	`158`	`+ catch ( CatException \| DogException e ) {`
`168`	`159`	`throw new RuntimeException( e );`
`169`	`160`	`}`
`170`	`161`
`@@ -184,10 +175,7 @@ public Target fromSingleElementSource(SingleElementSource source) {`
`184`	`175`	`target.addPet( petMapper.toPet( source.getPet() ) );`
`185`	`176`	`}`
`186`	`177`	`}`
`187`		`- catch ( CatException e ) {`
`188`		`- throw new RuntimeException( e );`
`189`		`- }`
`190`		`- catch ( DogException e ) {`
	`178`	`+ catch ( CatException \| DogException e ) {`
`191`	`179`	`throw new RuntimeException( e );`
`192`	`180`	`}`
`193`	`181`