Clarify lambda code block methods

Author: snicoll

spring-aop/src/main/java/org/springframework/aop/scope/ScopedProxyBeanRegistrationContributionProvider.java

@@ -92,7 +92,7 @@ public CodeContribution generateBeanInstantiation(RuntimeHints runtimeHints) {
 				statements.addStatement("factory.setTargetBeanName($S)", targetBeanName);
 				statements.addStatement("factory.setBeanFactory(beanFactory)");
 				statements.addStatement("return factory.getObject()");
-				codeContribution.statements().add(statements.toLambdaBody("() ->"));
+				codeContribution.statements().add(statements.toLambda("() ->"));
 				return codeContribution;
 			}
 		};

spring-beans/src/main/java/org/springframework/beans/factory/generator/BeanRegistrationBeanFactoryContribution.java

@@ -421,7 +421,7 @@ private void handleBeanDefinitionMetadata(Builder code) {
 			if (statements.isEmpty()) {
 				return;
 			}
-			code.add(statements.toLambdaBody(".customize((" + bdVariable + ") ->"));
+			code.add(statements.toLambda(".customize((" + bdVariable + ") ->"));
 			code.add(")");
 		}
 

spring-beans/src/main/java/org/springframework/beans/factory/generator/InjectionGenerator.java

@@ -234,7 +234,7 @@ CodeBlock generateFieldInjection(Field injectionPoint, boolean required) {
 			code.add(".resolve(beanFactory, false).ifResolved(");
 		}
 		code.add(this.fieldGenerator.generateSetValue("bean", injectionPoint,
-				CodeBlock.of("attributes.get(0)")).toLambdaBody("(attributes) ->"));
+				CodeBlock.of("attributes.get(0)")).toLambda("(attributes) ->"));
 		code.add(")").unindent().unindent();
 		return code.build();
 	}

spring-core/src/main/java/org/springframework/javapoet/support/MultiStatement.java

@@ -141,7 +141,7 @@ public CodeBlock toCodeBlock() {
 	 * Return a {@link CodeBlock} that applies all the {@code statements} of this
 	 * instance. If only one statement is available, it is not completed using the
 	 * {@code ;} termination so that it can be used in the context of a lambda.
-	 * @return the statement(s)
+	 * @return the body of the lambda
 	 */
 	public CodeBlock toLambdaBody() {
 		Builder code = CodeBlock.builder();
@@ -155,12 +155,12 @@ public CodeBlock toLambdaBody() {
 	/**
 	 * Return a {@link CodeBlock} that applies all the {@code statements} of this
 	 * instance in the context of a lambda.
-	 * @param lambda the context of the lambda, must end with {@code ->}
-	 * @return the lambda body
+	 * @param lambdaParameter the parameter(s) of the lambda, must end with {@code ->}
+	 * @return a lambda whose body is generated from the statements of this instance
 	 */
-	public CodeBlock toLambdaBody(CodeBlock lambda) {
+	public CodeBlock toLambda(CodeBlock lambdaParameter) {
 		Builder code = CodeBlock.builder();
-		code.add(lambda);
+		code.add(lambdaParameter);
 		if (isMulti()) {
 			code.beginControlFlow("");
 		}
@@ -177,11 +177,11 @@ public CodeBlock toLambdaBody(CodeBlock lambda) {
 	/**
 	 * Return a {@link CodeBlock} that applies all the {@code statements} of this
 	 * instance in the context of a lambda.
-	 * @param lambda the context of the lambda, must end with {@code ->}
-	 * @return the lambda body
+	 * @param lambdaParameter the parameter(s) of the lambda, must end with {@code ->}
+	 * @return a lambda whose body is generated from the statements of this instance
 	 */
-	public CodeBlock toLambdaBody(String lambda) {
-		return toLambdaBody(CodeBlock.of(lambda));
+	public CodeBlock toLambda(String lambdaParameter) {
+		return toLambda(CodeBlock.of(lambdaParameter));
 	}
 
 	private boolean isMulti() {

spring-core/src/test/java/org/springframework/javapoet/support/MultiStatementTests.java

@@ -119,7 +119,7 @@ void multiStatementsWithCodeBlockRenderedAsIsLambdaBody() {
 	void singleStatementWithLambda() {
 		MultiStatement statements = new MultiStatement();
 		statements.addStatement("field.method($S)", "hello");
-		CodeBlock codeBlock = statements.toLambdaBody(CodeBlock.of("() ->"));
+		CodeBlock codeBlock = statements.toLambda(CodeBlock.of("() ->"));
 		assertThat(codeBlock.toString()).isEqualTo("() -> field.method(\"hello\")");
 	}
 
@@ -128,7 +128,7 @@ void multiStatementsWithLambda() {
 		MultiStatement statements = new MultiStatement();
 		statements.addStatement("field.method($S)", "hello");
 		statements.addStatement("field.anotherMethod($S)", "hello");
-		CodeBlock codeBlock = statements.toLambdaBody(CodeBlock.of("() ->"));
+		CodeBlock codeBlock = statements.toLambda(CodeBlock.of("() ->"));
 		assertThat(codeBlock.toString().lines()).containsExactly(
 				"() -> {",
 				"  field.method(\"hello\");",
@@ -141,7 +141,7 @@ void multiStatementsWithAddAllAndLambda() {
 		MultiStatement statements = new MultiStatement();
 		statements.addAll(List.of(0, 1, 2),
 				index -> CodeBlock.of("field[$L] = $S", index, "hello"));
-		CodeBlock codeBlock = statements.toLambdaBody("() ->");
+		CodeBlock codeBlock = statements.toLambda("() ->");
 		assertThat(codeBlock.toString().lines()).containsExactly(
 				"() -> {",
 				"  field[0] = \"hello\";",