Skip to content

Commit 239bffa

Browse files
hduelmehduelme
committed
iterate over entrySet
1 parent 10655a5 commit 239bffa

4 files changed

Lines changed: 44 additions & 44 deletions

File tree

‎processor/src/main/resources/org/mapstruct/tools/gem/processor/Gem.ftl‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -106,27 +106,27 @@ public class ${gemInfo.gemName} implements Gem {
106106
mirror.getElementValues().entrySet().forEach( e -> values.put( e.getKey().getSimpleName().toString(), e.getValue() ) );
107107

108108
// iterate and populate builder
109-
for ( String methodName : defaultValues.keySet() ) {
110-
109+
for ( Map.Entry<String, AnnotationValue> defaultMethod : defaultValues.entrySet() ) {
110+
String methodName = defaultMethod.getKey();
111111
<#macro fillBuilder gemValueInfo indnet>
112112
${indnet}<@compress single_line=true>builder.set${gemValueInfo.name?capitalize}(
113113
<#if gemValueInfo.valueType.gem>
114114
<#if gemValueInfo.valueType.array>
115-
GemValue.createArray( values.get( methodName ), defaultValues.get( methodName ), ${gemValueInfo.valueType.gemName}::instanceOn )
115+
GemValue.createArray( values.get( methodName ), defaultMethod.getValue(), ${gemValueInfo.valueType.gemName}::instanceOn )
116116
<#else>
117-
GemValue.create( values.get( methodName ), defaultValues.get( methodName ), ${gemValueInfo.valueType.gemName}::instanceOn )
117+
GemValue.create( values.get( methodName ), defaultMethod.getValue(), ${gemValueInfo.valueType.gemName}::instanceOn )
118118
</#if>
119119
<#elseif gemValueInfo.valueType.enum>
120120
<#if gemValueInfo.valueType.array>
121-
GemValue.createEnumArray( values.get( methodName ), defaultValues.get( methodName ) )
121+
GemValue.createEnumArray( values.get( methodName ), defaultMethod.getValue() )
122122
<#else>
123-
GemValue.createEnum( values.get( methodName ), defaultValues.get( methodName ) )
123+
GemValue.createEnum( values.get( methodName ), defaultMethod.getValue() )
124124
</#if>
125125
<#else>
126126
<#if gemValueInfo.valueType.array>
127-
GemValue.createArray( values.get( methodName ), defaultValues.get( methodName ), ${gemValueInfo.valueType.elementName}.class )
127+
GemValue.createArray( values.get( methodName ), defaultMethod.getValue(), ${gemValueInfo.valueType.elementName}.class )
128128
<#else>
129-
GemValue.create( values.get( methodName ), defaultValues.get( methodName ), ${gemValueInfo.valueType.elementName}.class )
129+
GemValue.create( values.get( methodName ), defaultMethod.getValue(), ${gemValueInfo.valueType.elementName}.class )
130130
</#if>
131131
</#if>
132132
);
@@ -141,7 +141,7 @@ public class ${gemInfo.gemName} implements Gem {
141141
}
142142
</#list>
143143
<#else>
144-
switch (methodName) {
144+
switch ( methodName ) {
145145
<#list gemInfo.gemValueInfos as gemValueInfo>
146146
case "${gemValueInfo.name}":
147147
<#assign indentString = " ">

‎processor/src/test/resources/fixtures/org/mapstruct/tools/gem/processor/SomeAnnotationGem.java‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -336,74 +336,74 @@ public static <T> T build(AnnotationMirror mirror, Builder<T> builder ) {
336336
mirror.getElementValues().entrySet().forEach( e -> values.put( e.getKey().getSimpleName().toString(), e.getValue() ) );
337337

338338
// iterate and populate builder
339-
for ( String methodName : defaultValues.keySet() ) {
340-
341-
switch (methodName) {
339+
for ( Map.Entry<String, AnnotationValue> defaultMethod : defaultValues.entrySet() ) {
340+
String methodName = defaultMethod.getKey();
341+
switch ( methodName ) {
342342
case "myClassWithDefault":
343-
builder.setMyclasswithdefault( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), TypeMirror.class ) );
343+
builder.setMyclasswithdefault( GemValue.create( values.get( methodName ), defaultMethod.getValue(), TypeMirror.class ) );
344344
break;
345345
case "myBooleanWithDefault":
346-
builder.setMybooleanwithdefault( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), Boolean.class ) );
346+
builder.setMybooleanwithdefault( GemValue.create( values.get( methodName ), defaultMethod.getValue(), Boolean.class ) );
347347
break;
348348
case "myCharWithDefault":
349-
builder.setMycharwithdefault( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), Character.class ) );
349+
builder.setMycharwithdefault( GemValue.create( values.get( methodName ), defaultMethod.getValue(), Character.class ) );
350350
break;
351351
case "myByteWithDefault":
352-
builder.setMybytewithdefault( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), Byte.class ) );
352+
builder.setMybytewithdefault( GemValue.create( values.get( methodName ), defaultMethod.getValue(), Byte.class ) );
353353
break;
354354
case "mShortWithDefault":
355-
builder.setMshortwithdefault( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), Short.class ) );
355+
builder.setMshortwithdefault( GemValue.create( values.get( methodName ), defaultMethod.getValue(), Short.class ) );
356356
break;
357357
case "myIntWithDefault":
358-
builder.setMyintwithdefault( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), Integer.class ) );
358+
builder.setMyintwithdefault( GemValue.create( values.get( methodName ), defaultMethod.getValue(), Integer.class ) );
359359
break;
360360
case "myLongWithDefault":
361-
builder.setMylongwithdefault( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), Integer.class ) );
361+
builder.setMylongwithdefault( GemValue.create( values.get( methodName ), defaultMethod.getValue(), Integer.class ) );
362362
break;
363363
case "myFloatWithDefault":
364-
builder.setMyfloatwithdefault( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), Float.class ) );
364+
builder.setMyfloatwithdefault( GemValue.create( values.get( methodName ), defaultMethod.getValue(), Float.class ) );
365365
break;
366366
case "myDoubleWithDefault":
367-
builder.setMydoublewithdefault( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), Double.class ) );
367+
builder.setMydoublewithdefault( GemValue.create( values.get( methodName ), defaultMethod.getValue(), Double.class ) );
368368
break;
369369
case "myStringWithDefault":
370-
builder.setMystringwithdefault( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), String.class ) );
370+
builder.setMystringwithdefault( GemValue.create( values.get( methodName ), defaultMethod.getValue(), String.class ) );
371371
break;
372372
case "myEnumWithDefault":
373-
builder.setMyenumwithdefault( GemValue.createEnum( values.get( methodName ), defaultValues.get( methodName ) ) );
373+
builder.setMyenumwithdefault( GemValue.createEnum( values.get( methodName ), defaultMethod.getValue() ) );
374374
break;
375375
case "myClass":
376-
builder.setMyclass( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), TypeMirror.class ) );
376+
builder.setMyclass( GemValue.create( values.get( methodName ), defaultMethod.getValue(), TypeMirror.class ) );
377377
break;
378378
case "myBoolean":
379-
builder.setMyboolean( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), Boolean.class ) );
379+
builder.setMyboolean( GemValue.create( values.get( methodName ), defaultMethod.getValue(), Boolean.class ) );
380380
break;
381381
case "myChar":
382-
builder.setMychar( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), Character.class ) );
382+
builder.setMychar( GemValue.create( values.get( methodName ), defaultMethod.getValue(), Character.class ) );
383383
break;
384384
case "myByte":
385-
builder.setMybyte( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), Byte.class ) );
385+
builder.setMybyte( GemValue.create( values.get( methodName ), defaultMethod.getValue(), Byte.class ) );
386386
break;
387387
case "myShort":
388-
builder.setMyshort( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), Short.class ) );
388+
builder.setMyshort( GemValue.create( values.get( methodName ), defaultMethod.getValue(), Short.class ) );
389389
break;
390390
case "myInt":
391-
builder.setMyint( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), Integer.class ) );
391+
builder.setMyint( GemValue.create( values.get( methodName ), defaultMethod.getValue(), Integer.class ) );
392392
break;
393393
case "myLong":
394-
builder.setMylong( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), Integer.class ) );
394+
builder.setMylong( GemValue.create( values.get( methodName ), defaultMethod.getValue(), Integer.class ) );
395395
break;
396396
case "myFloat":
397-
builder.setMyfloat( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), Float.class ) );
397+
builder.setMyfloat( GemValue.create( values.get( methodName ), defaultMethod.getValue(), Float.class ) );
398398
break;
399399
case "myDouble":
400-
builder.setMydouble( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), Double.class ) );
400+
builder.setMydouble( GemValue.create( values.get( methodName ), defaultMethod.getValue(), Double.class ) );
401401
break;
402402
case "myString":
403-
builder.setMystring( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), String.class ) );
403+
builder.setMystring( GemValue.create( values.get( methodName ), defaultMethod.getValue(), String.class ) );
404404
break;
405405
case "myEnum":
406-
builder.setMyenum( GemValue.createEnum( values.get( methodName ), defaultValues.get( methodName ) ) );
406+
builder.setMyenum( GemValue.createEnum( values.get( methodName ), defaultMethod.getValue() ) );
407407
break;
408408
}
409409
}

‎processor/src/test/resources/fixtures/org/mapstruct/tools/gem/processor/SomeAnnotationsGem.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ public static <T> T build(AnnotationMirror mirror, Builder<T> builder ) {
8383
mirror.getElementValues().entrySet().forEach( e -> values.put( e.getKey().getSimpleName().toString(), e.getValue() ) );
8484

8585
// iterate and populate builder
86-
for ( String methodName : defaultValues.keySet() ) {
87-
86+
for ( Map.Entry<String, AnnotationValue> defaultMethod : defaultValues.entrySet() ) {
87+
String methodName = defaultMethod.getKey();
8888
if ( "value".equals( methodName ) ) {
89-
builder.setValue( GemValue.createArray( values.get( methodName ), defaultValues.get( methodName ), SomeAnnotationGem::instanceOn ) );
89+
builder.setValue( GemValue.createArray( values.get( methodName ), defaultMethod.getValue(), SomeAnnotationGem::instanceOn ) );
9090
}
9191
}
9292
builder.setMirror( mirror );

‎processor/src/test/resources/fixtures/org/mapstruct/tools/gem/processor/SomeArrayAnnotationGem.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,20 +120,20 @@ public static <T> T build(AnnotationMirror mirror, Builder<T> builder ) {
120120
mirror.getElementValues().entrySet().forEach( e -> values.put( e.getKey().getSimpleName().toString(), e.getValue() ) );
121121

122122
// iterate and populate builder
123-
for ( String methodName : defaultValues.keySet() ) {
124-
125-
switch (methodName) {
123+
for ( Map.Entry<String, AnnotationValue> defaultMethod : defaultValues.entrySet() ) {
124+
String methodName = defaultMethod.getKey();
125+
switch ( methodName ) {
126126
case "myClassWithDefault":
127-
builder.setMyclasswithdefault( GemValue.createArray( values.get( methodName ), defaultValues.get( methodName ), TypeMirror.class ) );
127+
builder.setMyclasswithdefault( GemValue.createArray( values.get( methodName ), defaultMethod.getValue(), TypeMirror.class ) );
128128
break;
129129
case "myBooleanWithDefault":
130-
builder.setMybooleanwithdefault( GemValue.createArray( values.get( methodName ), defaultValues.get( methodName ), Boolean.class ) );
130+
builder.setMybooleanwithdefault( GemValue.createArray( values.get( methodName ), defaultMethod.getValue(), Boolean.class ) );
131131
break;
132132
case "myEnumWithDefault":
133-
builder.setMyenumwithdefault( GemValue.createEnumArray( values.get( methodName ), defaultValues.get( methodName ) ) );
133+
builder.setMyenumwithdefault( GemValue.createEnumArray( values.get( methodName ), defaultMethod.getValue() ) );
134134
break;
135135
case "myAnnotation":
136-
builder.setMyannotation( GemValue.create( values.get( methodName ), defaultValues.get( methodName ), SomeAnnotationGem::instanceOn ) );
136+
builder.setMyannotation( GemValue.create( values.get( methodName ), defaultMethod.getValue(), SomeAnnotationGem::instanceOn ) );
137137
break;
138138
}
139139
}

0 commit comments

Comments
 (0)