Polish

initializr-actuator/src/main/java/io/spring/initializr/actuate/info/DependencyRangesInfoContributor.java

@@ -73,9 +73,7 @@ public class DependencyRangesInfoContributor implements InfoContributor {
 					}
 				}
 				Map<String, Object> depInfo = new LinkedHashMap<>();
-				dep.forEach((k, r) -> {
+				dep.forEach((k, r) -> depInfo.put(k, "Spring Boot " + r));
-					depInfo.put(k, "Spring Boot " + r);
-				});
 				details.put(dependency.getId(), depInfo);
 			}
 		}

initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/BuildComplianceTests.java

@@ -178,11 +178,10 @@ class BuildComplianceTests extends AbstractComplianceTests {
 		bom.setVersionProperty("foo.version");
 		InitializrMetadata metadata = InitializrMetadataTestBuilder.withDefaults()
 				.addDependencyGroup("foo", foo).addBom("the-bom", bom).build();
-		ProjectAssert project = generateProject(java, build, "2.1.1.RELEASE",
+		ProjectAssert project = generateProject(
-				(description) -> {
+				java, build, "2.1.1.RELEASE", (description) -> description
-					description.addDependency("foo",
+						.addDependency("foo", MetadataBuildItemMapper.toDependency(foo)),
-							MetadataBuildItemMapper.toDependency(foo));
+				metadata);
-				}, metadata);
 		project.sourceCodeAssert(fileName).equalsTo(new ClassPathResource(
 				"project/" + build + "/bom-property-" + getAssertFileName(fileName)));
 	}

initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/CodeComplianceTests.java

@@ -62,9 +62,7 @@ class CodeComplianceTests extends AbstractComplianceTests {
 	@MethodSource("parameters")
 	void currentGenerationWar(Language language, String extension) {
 		ProjectAssert project = generateProject(language, maven, "2.1.1.RELEASE",
-				(description) -> {
+				(description) -> description.setPackaging(Packaging.forId("war")));
-					description.setPackaging(Packaging.forId("war"));
-				});
 		project.isGenericProject(ProjectAssert.DEFAULT_PACKAGE_NAME,
 				ProjectAssert.DEFAULT_APPLICATION_NAME, language.id(), extension);
 	}
@@ -84,9 +82,8 @@ class CodeComplianceTests extends AbstractComplianceTests {
 	@MethodSource("parameters")
 	void previousGenerationMainClass(Language language, String extension) {
 		ProjectAssert project = generateProject(language, maven, "2.1.1.RELEASE",
-				(description) -> {
+				(description) -> description
-					description.setPlatformVersion(Version.parse("1.5.18.RELEASE"));
+						.setPlatformVersion(Version.parse("1.5.18.RELEASE")));
-				});
 		project.sourceCodeAssert(
 				"src/main/" + language + "/com/example/demo/DemoApplication." + extension)
 				.equalsTo(new ClassPathResource("project/" + language + "/previous/"
@@ -108,10 +105,8 @@ class CodeComplianceTests extends AbstractComplianceTests {
 	@MethodSource("parameters")
 	void currentGenerationTestClassWeb(Language language, String extension) {
 		ProjectAssert project = generateProject(language, maven, "2.1.1.RELEASE",
-				(description) -> {
+				(description) -> description.addDependency("web",
-					description.addDependency("web",
+						MetadataBuildItemMapper.toDependency(WEB)));
-							MetadataBuildItemMapper.toDependency(WEB));
-				});
 		project.sourceCodeAssert("src/test/" + language
 				+ "/com/example/demo/DemoApplicationTests." + extension)
 				.equalsTo(new ClassPathResource(
@@ -123,9 +118,7 @@ class CodeComplianceTests extends AbstractComplianceTests {
 	@MethodSource("parameters")
 	void currentGenerationServletInitializer(Language language, String extension) {
 		ProjectAssert project = generateProject(language, maven, "2.1.1.RELEASE",
-				(description) -> {
+				(description) -> description.setPackaging(Packaging.forId("war")));
-					description.setPackaging(Packaging.forId("war"));
-				});
 		project.sourceCodeAssert("src/main/" + language
 				+ "/com/example/demo/ServletInitializer." + extension)
 				.equalsTo(new ClassPathResource("project/" + language + "/standard/"

initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GradleBuildWriter.java

@@ -128,11 +128,8 @@ public class GradleBuildWriter {
 		}
 		writer.println();
 		writer.println("configurations {");
-		writer.indented(() -> {
+		writer.indented(() -> configurationCustomizations.forEach((name,
-			configurationCustomizations.forEach((name, customization) -> {
+				customization) -> writeConfiguration(writer, name, customization)));
-				writeConfiguration(writer, name, customization);
-			});
-		});
 		writer.println("}");
 	}
 

initializr-generator/src/test/java/io/spring/initializr/generator/test/project/AbstractProjectGenerationTester.java

@@ -124,10 +124,8 @@ public abstract class AbstractProjectGenerationTester<SELF extends AbstractProje
 	}
 
 	private Consumer<ProjectGenerationContext> beansConfigurer() {
-		return (context) -> {
+		return (context) -> this.beanDefinitions
-			this.beanDefinitions.forEach(
+				.forEach((type, definition) -> register(context, type, definition.get()));
-					(type, definition) -> register(context, type, definition.get()));
-		};
 	}
 
 	// Restore proper generic signature to make sure the context resolve the bean properly

initializr-web/src/main/java/io/spring/initializr/web/ui/UiController.java

@@ -54,9 +54,9 @@ public class UiController {
 		List<DependencyGroup> dependencyGroups = this.metadataProvider.get()
 				.getDependencies().getContent();
 		List<DependencyItem> content = new ArrayList<>();
-		dependencyGroups.forEach((group) -> group.getContent().forEach((dependency) -> {
+		dependencyGroups
-			content.add(new DependencyItem(group.getName(), dependency));
+				.forEach((group) -> group.getContent().forEach((dependency) -> content
-		}));
+						.add(new DependencyItem(group.getName(), dependency))));
 		String json = writeDependencies(content);
 		return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON)
 				.eTag(createUniqueId(json)).body(json);