Move invariant parameter inside finishAndInjectMethod

projectlombok · Jan 13, 2019 · fe143bf · fe143bf
1 parent 3665332
commit fe143bf
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/src/core/lombok/javac/handlers/JavacSingularsRecipes.java b/src/core/lombok/javac/handlers/JavacSingularsRecipes.java
@@ -241,7 +241,8 @@ protected void doGenerateMethods(SingularData data, boolean deprecate, JavacNode
 			generateClearMethod(deprecate, maker, returnTypeMaker.make(), returnStatementMaker.make(), data, builderType, source);
 		}
 
-		protected void finishAndInjectMethod(JavacTreeMaker maker, JCExpression returnType, JavacNode builderType, JCTree source, JCModifiers mods, JCBlock body, Name methodName, List<JCVariableDecl> jcVariableDecls) {
+		protected void finishAndInjectMethod(JavacTreeMaker maker, JCExpression returnType, JavacNode builderType, JCTree source, boolean deprecate, JCBlock body, Name methodName, List<JCVariableDecl> jcVariableDecls) {
+			JCModifiers mods = makeMods(maker, builderType, deprecate);
 			List<JCTypeParameter> typeParams = List.nil();
 			List<JCExpression> thrown = List.nil();
 			JCMethodDecl method = maker.MethodDef(mods, methodName, returnType, typeParams, jcVariableDecls, thrown, body, null);
@@ -258,8 +259,7 @@ protected void generateClearMethod(boolean deprecate, JavacTreeMaker maker, JCEx
 
 			JCBlock body = maker.Block(0, statements);
 			Name methodName = builderType.toName(HandlerUtil.buildAccessorName("clear", data.getPluralName().toString()));
-			JCModifiers mods = makeMods(maker, builderType, deprecate);
-			finishAndInjectMethod(maker, returnType, builderType, source, mods, body, methodName, params);
+			finishAndInjectMethod(maker, returnType, builderType, source, deprecate, body, methodName, params);
 		}
 
 		protected abstract JCStatement generateClearStatements(JavacTreeMaker maker, SingularData data, JavacNode builderType);
@@ -272,8 +272,7 @@ void generateSingularMethod(boolean deprecate, JavacTreeMaker maker, JCExpressio
 			Name name = data.getSingularName();
 			if (!fluent) name = builderType.toName(HandlerUtil.buildAccessorName(getAddMethodName(), name.toString()));
 
-			JCModifiers mods = makeMods(maker, builderType, deprecate);
-			finishAndInjectMethod(maker, returnType, builderType, source, mods, body, name, params);
+			finishAndInjectMethod(maker, returnType, builderType, source, deprecate, body, name, params);
 		}
 
 		protected JCVariableDecl generateSingularMethodParameter(int typeIndex, JavacTreeMaker maker, SingularData data, JavacNode builderType, JCTree source, Name name) {

diff --git a/src/core/lombok/javac/handlers/singulars/JavacGuavaSingularizer.java b/src/core/lombok/javac/handlers/singulars/JavacGuavaSingularizer.java
@@ -139,8 +139,7 @@ protected void generatePluralMethod(boolean deprecate, JavacTreeMaker maker, JCE
 		}
 		paramType = addTypeArgs(getTypeArgumentsCount(), true, builderType, paramType, data.getTypeArgs(), source);
 		JCVariableDecl param = maker.VarDef(maker.Modifiers(paramFlags), data.getPluralName(), paramType, null);
-		JCModifiers mods = makeMods(maker, builderType, deprecate);
-		finishAndInjectMethod(maker, returnType, builderType, source, mods, body, methodName, List.of(param));
+		finishAndInjectMethod(maker, returnType, builderType, source, deprecate, body, methodName, List.of(param));
     }
 
 	@Override public void appendBuildCode(SingularData data, JavacNode builderType, JCTree source, ListBuffer<JCStatement> statements, Name targetVariableName, String builderVariable) {

diff --git a/src/core/lombok/javac/handlers/singulars/JavacJavaUtilListSetSingularizer.java b/src/core/lombok/javac/handlers/singulars/JavacJavaUtilListSetSingularizer.java
@@ -125,8 +125,7 @@ protected void generatePluralMethod(boolean deprecate, JavacTreeMaker maker, JCE
 		JCExpression paramType = chainDots(builderType, "java", "util", "Collection");
 		paramType = addTypeArgs(1, true, builderType, paramType, data.getTypeArgs(), source);
 		JCVariableDecl param = maker.VarDef(maker.Modifiers(paramFlags), data.getPluralName(), paramType, null);
-		JCModifiers mods = makeMods(maker, builderType, deprecate);
-		finishAndInjectMethod(maker, returnType, builderType, source, mods, body, name, List.of(param));
+		finishAndInjectMethod(maker, returnType, builderType, source, deprecate, body, name, List.of(param));
 	}
 
 	@Override

diff --git a/src/core/lombok/javac/handlers/singulars/JavacJavaUtilMapSingularizer.java b/src/core/lombok/javac/handlers/singulars/JavacJavaUtilMapSingularizer.java
@@ -173,8 +173,7 @@ protected void generatePluralMethod(boolean deprecate, JavacTreeMaker maker, JCE
 		JCExpression paramType = chainDots(builderType, "java", "util", "Map");
 		paramType = addTypeArgs(2, true, builderType, paramType, data.getTypeArgs(), source);
 		JCVariableDecl param = maker.VarDef(maker.Modifiers(paramFlags), data.getPluralName(), paramType, null);
-		JCModifiers mods = makeMods(maker, builderType, deprecate);
-		finishAndInjectMethod(maker, returnType, builderType, source, mods, body, name, List.of(param));
+		finishAndInjectMethod(maker, returnType, builderType, source, deprecate, body, name, List.of(param));
 	}
 
 	@Override public void appendBuildCode(SingularData data, JavacNode builderType, JCTree source, ListBuffer<JCStatement> statements, Name targetVariableName, String builderVariable) {