From 1ad3dae7705580a542c59ae5b0f0550b9f2dc090 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 15 Mar 2019 14:19:54 +0100 Subject: [PATCH] Polish --- .../info/DependencyRangesInfoContributor.java | 4 +--- .../spring/build/BuildComplianceTests.java | 9 ++++----- .../spring/code/CodeComplianceTests.java | 19 ++++++------------- .../buildsystem/gradle/GradleBuildWriter.java | 7 ++----- .../AbstractProjectGenerationTester.java | 6 ++---- .../initializr/web/ui/UiController.java | 6 +++--- 6 files changed, 18 insertions(+), 33 deletions(-) diff --git a/initializr-actuator/src/main/java/io/spring/initializr/actuate/info/DependencyRangesInfoContributor.java b/initializr-actuator/src/main/java/io/spring/initializr/actuate/info/DependencyRangesInfoContributor.java index a1fa58c0..a3bd00f7 100644 --- a/initializr-actuator/src/main/java/io/spring/initializr/actuate/info/DependencyRangesInfoContributor.java +++ b/initializr-actuator/src/main/java/io/spring/initializr/actuate/info/DependencyRangesInfoContributor.java @@ -73,9 +73,7 @@ public class DependencyRangesInfoContributor implements InfoContributor { } } Map depInfo = new LinkedHashMap<>(); - dep.forEach((k, r) -> { - depInfo.put(k, "Spring Boot " + r); - }); + dep.forEach((k, r) -> depInfo.put(k, "Spring Boot " + r)); details.put(dependency.getId(), depInfo); } } diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/BuildComplianceTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/BuildComplianceTests.java index 19c92071..32299fc8 100755 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/BuildComplianceTests.java +++ b/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", - (description) -> { - description.addDependency("foo", - MetadataBuildItemMapper.toDependency(foo)); - }, metadata); + ProjectAssert project = generateProject( + java, build, "2.1.1.RELEASE", (description) -> description + .addDependency("foo", MetadataBuildItemMapper.toDependency(foo)), + metadata); project.sourceCodeAssert(fileName).equalsTo(new ClassPathResource( "project/" + build + "/bom-property-" + getAssertFileName(fileName))); } diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/CodeComplianceTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/CodeComplianceTests.java index e02f7b76..81b9a3e1 100755 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/CodeComplianceTests.java +++ b/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.setPackaging(Packaging.forId("war")); - }); + (description) -> 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.setPlatformVersion(Version.parse("1.5.18.RELEASE")); - }); + (description) -> description + .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.addDependency("web", - MetadataBuildItemMapper.toDependency(WEB)); - }); + (description) -> description.addDependency("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.setPackaging(Packaging.forId("war")); - }); + (description) -> description.setPackaging(Packaging.forId("war"))); project.sourceCodeAssert("src/main/" + language + "/com/example/demo/ServletInitializer." + extension) .equalsTo(new ClassPathResource("project/" + language + "/standard/" diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GradleBuildWriter.java b/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GradleBuildWriter.java index 242a0083..361819bb 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GradleBuildWriter.java +++ b/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(() -> { - configurationCustomizations.forEach((name, customization) -> { - writeConfiguration(writer, name, customization); - }); - }); + writer.indented(() -> configurationCustomizations.forEach((name, + customization) -> writeConfiguration(writer, name, customization))); writer.println("}"); } diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/test/project/AbstractProjectGenerationTester.java b/initializr-generator/src/test/java/io/spring/initializr/generator/test/project/AbstractProjectGenerationTester.java index da5fe017..fb0b543c 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/test/project/AbstractProjectGenerationTester.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/test/project/AbstractProjectGenerationTester.java @@ -124,10 +124,8 @@ public abstract class AbstractProjectGenerationTester beansConfigurer() { - return (context) -> { - this.beanDefinitions.forEach( - (type, definition) -> register(context, type, definition.get())); - }; + return (context) -> this.beanDefinitions + .forEach((type, definition) -> register(context, type, definition.get())); } // Restore proper generic signature to make sure the context resolve the bean properly diff --git a/initializr-web/src/main/java/io/spring/initializr/web/ui/UiController.java b/initializr-web/src/main/java/io/spring/initializr/web/ui/UiController.java index 5b993820..cb9480d1 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/ui/UiController.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/ui/UiController.java @@ -54,9 +54,9 @@ public class UiController { List dependencyGroups = this.metadataProvider.get() .getDependencies().getContent(); List content = new ArrayList<>(); - dependencyGroups.forEach((group) -> group.getContent().forEach((dependency) -> { - content.add(new DependencyItem(group.getName(), dependency)); - })); + dependencyGroups + .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);