Skip to content

Improve builder value fill #20

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 8 commits into from
Mar 15, 2026
Merged

Improve builder value fill #20

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
10655a5
use switch for String matching, if more than 3 Strings are present
hduelme Feb 13, 2026
239bffa
iterate over entrySet
hduelme Feb 13, 2026
064cf0c
move macro outside build methode
hduelme Feb 15, 2026
fedb680
fix typo
hduelme Feb 15, 2026
fb6f7d9
move assigment in front of list
hduelme Feb 15, 2026
98c7e79
move value and defaultValue at beginning of loop
hduelme Feb 15, 2026
b8da139
move macro to end of file
hduelme Feb 15, 2026
7b8b7b5
Apply suggestions from code review
filiphr Mar 15, 2026
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
66 changes: 43 additions & 23 deletions processor/src/main/resources/org/mapstruct/tools/gem/processor/Gem.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,33 +106,29 @@ public class ${gemInfo.gemName} implements Gem {
mirror.getElementValues().entrySet().forEach( e -> values.put( e.getKey().getSimpleName().toString(), e.getValue() ) );

// iterate and populate builder
for ( String methodName : defaultValues.keySet() ) {

for ( Map.Entry<String, AnnotationValue> defaultMethod : defaultValues.entrySet() ) {
String methodName = defaultMethod.getKey();
AnnotationValue defaultValue = defaultMethod.getValue();
AnnotationValue value = values.get( methodName );
<#if (gemInfo.gemValueInfos?size < 4)>
<#assign indentString = " ">
<#list gemInfo.gemValueInfos as gemValueInfo>
<#if gemValueInfo_index != 0>else </#if>if ( "${gemValueInfo.name}".equals( methodName ) ) {
<@compress single_line=true>builder.set${gemValueInfo.name?capitalize}(
<#if gemValueInfo.valueType.gem>
<#if gemValueInfo.valueType.array>
GemValue.createArray( values.get( methodName ), defaultValues.get( methodName ), ${gemValueInfo.valueType.gemName}::instanceOn )
<#else>
GemValue.create( values.get( methodName ), defaultValues.get( methodName ), ${gemValueInfo.valueType.gemName}::instanceOn )
</#if>
<#elseif gemValueInfo.valueType.enum>
<#if gemValueInfo.valueType.array>
GemValue.createEnumArray( values.get( methodName ), defaultValues.get( methodName ) )
<#else>
GemValue.createEnum( values.get( methodName ), defaultValues.get( methodName ) )
</#if>
<#else>
<#if gemValueInfo.valueType.array>
GemValue.createArray( values.get( methodName ), defaultValues.get( methodName ), ${gemValueInfo.valueType.elementName}.class )
<#else>
GemValue.create( values.get( methodName ), defaultValues.get( methodName ), ${gemValueInfo.valueType.elementName}.class )
</#if>
</#if>
);</@compress>
<@fillBuilder gemValueInfo, indentString/>

}
</#list>
<#else>
switch ( methodName ) {
<#assign indentString = " ">
<#list gemInfo.gemValueInfos as gemValueInfo>
case "${gemValueInfo.name}":
<@fillBuilder gemValueInfo, indentString/>

break;
</#list>
Comment thread
filiphr marked this conversation as resolved.
Outdated
}
</#if>
}
</#if>
builder.setMirror( mirror );
Expand Down Expand Up @@ -197,3 +193,27 @@ public class ${gemInfo.gemName} implements Gem {
}

}
<#macro fillBuilder gemValueInfo indent>
${indent}<@compress single_line=true>builder.set${gemValueInfo.name?capitalize}(
<#if gemValueInfo.valueType.gem>
<#if gemValueInfo.valueType.array>
GemValue.createArray( value, defaultValue, ${gemValueInfo.valueType.gemName}::instanceOn )
<#else>
GemValue.create( value, defaultValue, ${gemValueInfo.valueType.gemName}::instanceOn )
</#if>
<#elseif gemValueInfo.valueType.enum>
<#if gemValueInfo.valueType.array>
GemValue.createEnumArray( value, defaultValue )
<#else>
GemValue.createEnum( value, defaultValue )
</#if>
<#else>
<#if gemValueInfo.valueType.array>
GemValue.createArray( value, defaultValue, ${gemValueInfo.valueType.elementName}.class )
<#else>
GemValue.create( value, defaultValue, ${gemValueInfo.valueType.elementName}.class )
</#if>
</#if>
);
</@compress>
</#macro>
Comment thread
filiphr marked this conversation as resolved.
Outdated
138 changes: 71 additions & 67 deletions ...ssor/src/test/resources/fixtures/org/mapstruct/tools/gem/processor/SomeAnnotationGem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,73 +336,77 @@ public static <T> T build(AnnotationMirror mirror, Builder<T> builder ) {
mirror.getElementValues().entrySet().forEach( e -> values.put( e.getKey().getSimpleName().toString(), e.getValue() ) );

// iterate and populate builder
for ( String methodName : defaultValues.keySet() ) {

if ( "myClassWithDefault".equals( methodName ) ) {
builder.setMyclasswithdefault( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), TypeMirror.class ) );
}
else if ( "myBooleanWithDefault".equals( methodName ) ) {
builder.setMybooleanwithdefault( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), Boolean.class ) );
}
else if ( "myCharWithDefault".equals( methodName ) ) {
builder.setMycharwithdefault( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), Character.class ) );
}
else if ( "myByteWithDefault".equals( methodName ) ) {
builder.setMybytewithdefault( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), Byte.class ) );
}
else if ( "mShortWithDefault".equals( methodName ) ) {
builder.setMshortwithdefault( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), Short.class ) );
}
else if ( "myIntWithDefault".equals( methodName ) ) {
builder.setMyintwithdefault( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), Integer.class ) );
}
else if ( "myLongWithDefault".equals( methodName ) ) {
builder.setMylongwithdefault( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), Integer.class ) );
}
else if ( "myFloatWithDefault".equals( methodName ) ) {
builder.setMyfloatwithdefault( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), Float.class ) );
}
else if ( "myDoubleWithDefault".equals( methodName ) ) {
builder.setMydoublewithdefault( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), Double.class ) );
}
else if ( "myStringWithDefault".equals( methodName ) ) {
builder.setMystringwithdefault( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), String.class ) );
}
else if ( "myEnumWithDefault".equals( methodName ) ) {
builder.setMyenumwithdefault( GemValue.createEnum( values.get( methodName ), defaultValues.get( methodName ) ) );
}
else if ( "myClass".equals( methodName ) ) {
builder.setMyclass( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), TypeMirror.class ) );
}
else if ( "myBoolean".equals( methodName ) ) {
builder.setMyboolean( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), Boolean.class ) );
}
else if ( "myChar".equals( methodName ) ) {
builder.setMychar( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), Character.class ) );
}
else if ( "myByte".equals( methodName ) ) {
builder.setMybyte( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), Byte.class ) );
}
else if ( "myShort".equals( methodName ) ) {
builder.setMyshort( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), Short.class ) );
}
else if ( "myInt".equals( methodName ) ) {
builder.setMyint( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), Integer.class ) );
}
else if ( "myLong".equals( methodName ) ) {
builder.setMylong( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), Integer.class ) );
}
else if ( "myFloat".equals( methodName ) ) {
builder.setMyfloat( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), Float.class ) );
}
else if ( "myDouble".equals( methodName ) ) {
builder.setMydouble( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), Double.class ) );
}
else if ( "myString".equals( methodName ) ) {
builder.setMystring( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), String.class ) );
}
else if ( "myEnum".equals( methodName ) ) {
builder.setMyenum( GemValue.createEnum( values.get( methodName ), defaultValues.get( methodName ) ) );
for ( Map.Entry<String, AnnotationValue> defaultMethod : defaultValues.entrySet() ) {
String methodName = defaultMethod.getKey();
AnnotationValue defaultValue = defaultMethod.getValue();
AnnotationValue value = values.get( methodName );
switch ( methodName ) {
case "myClassWithDefault":
builder.setMyclasswithdefault( GemValue.create( value, defaultValue, TypeMirror.class ) );
break;
case "myBooleanWithDefault":
builder.setMybooleanwithdefault( GemValue.create( value, defaultValue, Boolean.class ) );
break;
case "myCharWithDefault":
builder.setMycharwithdefault( GemValue.create( value, defaultValue, Character.class ) );
break;
case "myByteWithDefault":
builder.setMybytewithdefault( GemValue.create( value, defaultValue, Byte.class ) );
break;
case "mShortWithDefault":
builder.setMshortwithdefault( GemValue.create( value, defaultValue, Short.class ) );
break;
case "myIntWithDefault":
builder.setMyintwithdefault( GemValue.create( value, defaultValue, Integer.class ) );
break;
case "myLongWithDefault":
builder.setMylongwithdefault( GemValue.create( value, defaultValue, Integer.class ) );
break;
case "myFloatWithDefault":
builder.setMyfloatwithdefault( GemValue.create( value, defaultValue, Float.class ) );
break;
case "myDoubleWithDefault":
builder.setMydoublewithdefault( GemValue.create( value, defaultValue, Double.class ) );
break;
case "myStringWithDefault":
builder.setMystringwithdefault( GemValue.create( value, defaultValue, String.class ) );
break;
case "myEnumWithDefault":
builder.setMyenumwithdefault( GemValue.createEnum( value, defaultValue ) );
break;
case "myClass":
builder.setMyclass( GemValue.create( value, defaultValue, TypeMirror.class ) );
break;
case "myBoolean":
builder.setMyboolean( GemValue.create( value, defaultValue, Boolean.class ) );
break;
case "myChar":
builder.setMychar( GemValue.create( value, defaultValue, Character.class ) );
break;
case "myByte":
builder.setMybyte( GemValue.create( value, defaultValue, Byte.class ) );
break;
case "myShort":
builder.setMyshort( GemValue.create( value, defaultValue, Short.class ) );
break;
case "myInt":
builder.setMyint( GemValue.create( value, defaultValue, Integer.class ) );
break;
case "myLong":
builder.setMylong( GemValue.create( value, defaultValue, Integer.class ) );
break;
case "myFloat":
builder.setMyfloat( GemValue.create( value, defaultValue, Float.class ) );
break;
case "myDouble":
builder.setMydouble( GemValue.create( value, defaultValue, Double.class ) );
break;
case "myString":
builder.setMystring( GemValue.create( value, defaultValue, String.class ) );
break;
case "myEnum":
builder.setMyenum( GemValue.createEnum( value, defaultValue ) );
break;
}
}
builder.setMirror( mirror );
Expand Down
8 changes: 5 additions & 3 deletions ...sor/src/test/resources/fixtures/org/mapstruct/tools/gem/processor/SomeAnnotationsGem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,12 @@ public static <T> T build(AnnotationMirror mirror, Builder<T> builder ) {
mirror.getElementValues().entrySet().forEach( e -> values.put( e.getKey().getSimpleName().toString(), e.getValue() ) );

// iterate and populate builder
for ( String methodName : defaultValues.keySet() ) {

for ( Map.Entry<String, AnnotationValue> defaultMethod : defaultValues.entrySet() ) {
String methodName = defaultMethod.getKey();
AnnotationValue defaultValue = defaultMethod.getValue();
AnnotationValue value = values.get( methodName );
if ( "value".equals( methodName ) ) {
builder.setValue( GemValue.createArray( values.get( methodName ), defaultValues.get( methodName ), SomeAnnotationGem::instanceOn ) );
builder.setValue( GemValue.createArray( value, defaultValue, SomeAnnotationGem::instanceOn ) );
}
}
builder.setMirror( mirror );
Expand Down
30 changes: 17 additions & 13 deletions ...src/test/resources/fixtures/org/mapstruct/tools/gem/processor/SomeArrayAnnotationGem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,19 +120,23 @@ public static <T> T build(AnnotationMirror mirror, Builder<T> builder ) {
mirror.getElementValues().entrySet().forEach( e -> values.put( e.getKey().getSimpleName().toString(), e.getValue() ) );

// iterate and populate builder
for ( String methodName : defaultValues.keySet() ) {

if ( "myClassWithDefault".equals( methodName ) ) {
builder.setMyclasswithdefault( GemValue.createArray( values.get( methodName ), defaultValues.get( methodName ), TypeMirror.class ) );
}
else if ( "myBooleanWithDefault".equals( methodName ) ) {
builder.setMybooleanwithdefault( GemValue.createArray( values.get( methodName ), defaultValues.get( methodName ), Boolean.class ) );
}
else if ( "myEnumWithDefault".equals( methodName ) ) {
builder.setMyenumwithdefault( GemValue.createEnumArray( values.get( methodName ), defaultValues.get( methodName ) ) );
}
else if ( "myAnnotation".equals( methodName ) ) {
builder.setMyannotation( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), SomeAnnotationGem::instanceOn ) );
for ( Map.Entry<String, AnnotationValue> defaultMethod : defaultValues.entrySet() ) {
String methodName = defaultMethod.getKey();
AnnotationValue defaultValue = defaultMethod.getValue();
AnnotationValue value = values.get( methodName );
switch ( methodName ) {
case "myClassWithDefault":
builder.setMyclasswithdefault( GemValue.createArray( value, defaultValue, TypeMirror.class ) );
break;
case "myBooleanWithDefault":
builder.setMybooleanwithdefault( GemValue.createArray( value, defaultValue, Boolean.class ) );
break;
case "myEnumWithDefault":
builder.setMyenumwithdefault( GemValue.createEnumArray( value, defaultValue ) );
break;
case "myAnnotation":
builder.setMyannotation( GemValue.create( value, defaultValue, SomeAnnotationGem::instanceOn ) );
break;
}
}
builder.setMirror( mirror );
Expand Down