lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2025-07-15 05:13:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Polish

Browse Source
This commit is contained in:
Stephane Nicoll 2019-03-15 14:19:54 +01:00
parent 9465a70fa6
commit 1ad3dae770
6 changed files with 18 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,9 +73,7 @@ public class DependencyRangesInfoContributor implements InfoContributor {
}
}
Map<String, Object> 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);
}
}

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

@ -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)));
}

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

@ -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/"

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

@ -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("}");
}

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

@ -124,10 +124,8 @@ public abstract class AbstractProjectGenerationTester<SELF extends AbstractProje
}
private Consumer<ProjectGenerationContext> 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

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

@ -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) -> {
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);