mirror of
https://github.com/tiennm99/lombok.git
synced 2026-10-14 22:17:41 +00:00
Detangle key/value param creation in JavacJavaUtilMapSingularizer.generateSingularMethod
This commit is contained in:
1 parent
f843499658
commit
85759a1949
1 file changed
+6
-4
@@ -149,15 +149,17 @@ public class JavacJavaUtilMapSingularizer extends JavacJavaUtilSingularizer {
|
||||
|
||||
Name name = data.getSingularName();
|
||||
if (!fluent) name = builderType.toName(HandlerUtil.buildAccessorName("put", name.toString()));
|
||||
|
||||
JCExpression paramTypeKey = cloneParamType(0, maker, data.getTypeArgs(), builderType, source);
|
||||
JCExpression paramTypeValue = cloneParamType(1, maker, data.getTypeArgs(), builderType, source);
|
||||
List<JCAnnotation> typeUseAnnsKey = getTypeUseAnnotations(paramTypeKey);
|
||||
List<JCAnnotation> typeUseAnnsValue = getTypeUseAnnotations(paramTypeValue);
|
||||
paramTypeKey = removeTypeUseAnnotations(paramTypeKey);
|
||||
paramTypeValue = removeTypeUseAnnotations(paramTypeValue);
|
||||
JCModifiers paramModsKey = typeUseAnnsKey.isEmpty() ? maker.Modifiers(paramFlags) : maker.Modifiers(paramFlags, typeUseAnnsKey);
|
||||
JCModifiers paramModsValue = typeUseAnnsValue.isEmpty() ? maker.Modifiers(paramFlags) : maker.Modifiers(paramFlags, typeUseAnnsValue);
|
||||
JCVariableDecl paramKey = maker.VarDef(paramModsKey, keyName, paramTypeKey, null);
|
||||
|
||||
JCExpression paramTypeValue = cloneParamType(1, maker, data.getTypeArgs(), builderType, source);
|
||||
List<JCAnnotation> typeUseAnnsValue = getTypeUseAnnotations(paramTypeValue);
|
||||
paramTypeValue = removeTypeUseAnnotations(paramTypeValue);
|
||||
JCModifiers paramModsValue = typeUseAnnsValue.isEmpty() ? maker.Modifiers(paramFlags) : maker.Modifiers(paramFlags, typeUseAnnsValue);
|
||||
JCVariableDecl paramValue = maker.VarDef(paramModsValue, valueName, paramTypeValue, null);
|
||||
finishAndInjectMethod(maker, returnType, builderType, source, mods, body, name, List.of(paramKey, paramValue));
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user