lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2026-02-26 05:32:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upgrade to Spring Boot 2.4.0

Browse Source 
Closes gh-1145
This commit is contained in:
Stephane Nicoll
2020-10-21 14:54:52 +02:00
parent e97233b107
commit f2accaa7f7
18 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GradleTaskContainer.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -102,7 +102,7 @@ public class GradleTaskContainer {
*/
public void customizeWithType(String type, Consumer<Builder> task) {
String packageName = ClassUtils.getPackageName(type);
if (!StringUtils.isEmpty(packageName)) {
if (StringUtils.hasLength(packageName)) {
this.importedTypes.add(type);
}
String shortName = ClassUtils.getShortName(type);

16
initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GradlePluginContainerTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ class GradlePluginContainerTests {
void addPluginWithId() {
GradlePluginContainer pluginContainer = new GradlePluginContainer();
pluginContainer.add("com.example");
assertThat(pluginContainer.values()).hasOnlyOneElementSatisfying((plugin) -> {
assertThat(pluginContainer.values()).singleElement().satisfies((plugin) -> {
assertThat(plugin.getId()).isEqualTo("com.example");
assertThat(plugin.isApply()).isFalse();
});
@@ -42,7 +42,7 @@ class GradlePluginContainerTests {
void addPluginWithConsumer() {
GradlePluginContainer pluginContainer = new GradlePluginContainer();
pluginContainer.add("com.example", (plugin) -> plugin.setVersion("1.0"));
assertThat(pluginContainer.values()).hasOnlyOneElementSatisfying((plugin) -> {
assertThat(pluginContainer.values()).singleElement().satisfies((plugin) -> {
assertThat(plugin.getId()).isEqualTo("com.example");
assertThat(plugin).isInstanceOf(StandardGradlePlugin.class);
assertThat(((StandardGradlePlugin) plugin).getVersion()).isEqualTo("1.0");
@@ -61,7 +61,7 @@ class GradlePluginContainerTests {
assertThat(plugin.getVersion()).isEqualTo("1.0");
plugin.setVersion("2.0");
});
assertThat(pluginContainer.values()).hasOnlyOneElementSatisfying((plugin) -> {
assertThat(pluginContainer.values()).singleElement().satisfies((plugin) -> {
assertThat(plugin.getId()).isEqualTo("com.example");
assertThat(plugin).isInstanceOf(StandardGradlePlugin.class);
assertThat(((StandardGradlePlugin) plugin).getVersion()).isEqualTo("2.0");
@@ -73,7 +73,7 @@ class GradlePluginContainerTests {
void applyGradlePlugin() {
GradlePluginContainer pluginContainer = new GradlePluginContainer();
pluginContainer.apply("com.example");
assertThat(pluginContainer.values()).hasOnlyOneElementSatisfying((plugin) -> {
assertThat(pluginContainer.values()).singleElement().satisfies((plugin) -> {
assertThat(plugin.getId()).isEqualTo("com.example");
assertThat(plugin.isApply()).isTrue();
});
@@ -84,7 +84,7 @@ class GradlePluginContainerTests {
GradlePluginContainer pluginContainer = new GradlePluginContainer();
pluginContainer.apply("com.example");
pluginContainer.apply("com.example");
assertThat(pluginContainer.values()).hasOnlyOneElementSatisfying((plugin) -> {
assertThat(pluginContainer.values()).singleElement().satisfies((plugin) -> {
assertThat(plugin.getId()).isEqualTo("com.example");
assertThat(plugin.isApply()).isTrue();
});
@@ -95,7 +95,7 @@ class GradlePluginContainerTests {
GradlePluginContainer pluginContainer = new GradlePluginContainer();
pluginContainer.add("com.example");
pluginContainer.apply("com.example");
assertThat(pluginContainer.values()).hasOnlyOneElementSatisfying((plugin) -> {
assertThat(pluginContainer.values()).singleElement().satisfies((plugin) -> {
assertThat(plugin.getId()).isEqualTo("com.example");
assertThat(plugin.isApply()).isFalse();
});
@@ -106,7 +106,7 @@ class GradlePluginContainerTests {
GradlePluginContainer pluginContainer = new GradlePluginContainer();
pluginContainer.apply("com.example");
pluginContainer.add("com.example");
assertThat(pluginContainer.values()).hasOnlyOneElementSatisfying((plugin) -> {
assertThat(pluginContainer.values()).singleElement().satisfies((plugin) -> {
assertThat(plugin.getId()).isEqualTo("com.example");
assertThat(plugin.isApply()).isTrue();
});

12
initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GradleTaskContainerTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -74,7 +74,7 @@ class GradleTaskContainerTests {
void customizeTask() {
GradleTaskContainer container = new GradleTaskContainer();
container.customize("test", (task) -> task.attribute("fork", "true"));
assertThat(container.values()).hasOnlyOneElementSatisfying((task) -> {
assertThat(container.values()).singleElement().satisfies((task) -> {
assertThat(task.getName()).isEqualTo("test");
assertThat(task.getType()).isNull();
assertThat(task.getAttributes()).containsOnly(entry("fork", "true"));
@@ -90,11 +90,11 @@ class GradleTaskContainerTests {
task.attribute("fork", "true");
task.invoke("property", "taskDir");
});
assertThat(container.values()).hasOnlyOneElementSatisfying((task) -> {
assertThat(container.values()).singleElement().satisfies((task) -> {
assertThat(task.getName()).isEqualTo("MyTask");
assertThat(task.getType()).isEqualTo("com.example.MyTask");
assertThat(task.getAttributes()).containsOnly(entry("fork", "true"));
assertThat(task.getInvocations()).hasOnlyOneElementSatisfying((invocation) -> {
assertThat(task.getInvocations()).singleElement().satisfies((invocation) -> {
assertThat(invocation.getTarget()).isEqualTo("property");
assertThat(invocation.getArguments()).containsOnly("taskDir");
});
@@ -113,11 +113,11 @@ class GradleTaskContainerTests {
task.attribute("fork", "false");
task.invoke("method", "arg1", "arg2");
});
assertThat(container.values()).hasOnlyOneElementSatisfying((task) -> {
assertThat(container.values()).singleElement().satisfies((task) -> {
assertThat(task.getName()).isEqualTo("test");
assertThat(task.getType()).isNull();
assertThat(task.getAttributes()).containsOnly(entry("ignore", "false"), entry("fork", "false"));
assertThat(task.getInvocations()).hasOnlyOneElementSatisfying((invocation) -> {
assertThat(task.getInvocations()).singleElement().satisfies((invocation) -> {
assertThat(invocation.getTarget()).isEqualTo("method");
assertThat(invocation.getArguments()).containsOnly("arg1", "arg2");
});

24
initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/maven/MavenBuildTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@ class MavenBuildTests {
void mavenResourcesCanBeConfigured() {
MavenBuild build = new MavenBuild();
build.resources().add("src/main/custom", (resource) -> resource.filtering(true));
assertThat(build.resources().values()).hasOnlyOneElementSatisfying((resource) -> {
assertThat(build.resources().values()).singleElement().satisfies((resource) -> {
assertThat(resource.getDirectory()).isEqualTo("src/main/custom");
assertThat(resource.isFiltering()).isTrue();
});
@@ -51,7 +51,7 @@ class MavenBuildTests {
MavenBuild build = new MavenBuild();
build.testResources().add("src/test/custom", (resource) -> resource.excludes("**/*.gen"));
assertThat(build.resources().isEmpty()).isTrue();
assertThat(build.testResources().values()).hasOnlyOneElementSatisfying((resource) -> {
assertThat(build.testResources().values()).singleElement().satisfies((resource) -> {
assertThat(resource.getDirectory()).isEqualTo("src/test/custom");
assertThat(resource.getExcludes()).containsExactly("**/*.gen");
});
@@ -62,7 +62,7 @@ class MavenBuildTests {
MavenBuild build = new MavenBuild();
build.plugins().add("com.example", "test-plugin",
(plugin) -> plugin.execution("first", (first) -> first.goal("run-this")));
assertThat(build.plugins().values()).hasOnlyOneElementSatisfying((testPlugin) -> {
assertThat(build.plugins().values()).singleElement().satisfies((testPlugin) -> {
assertThat(testPlugin.getGroupId()).isEqualTo("com.example");
assertThat(testPlugin.getArtifactId()).isEqualTo("test-plugin");
assertThat(testPlugin.getVersion()).isNull();
@@ -77,7 +77,7 @@ class MavenBuildTests {
MavenBuild build = new MavenBuild();
build.plugins().add("com.example", "test-plugin");
build.plugins().add("com.example", "test-plugin", (plugin) -> plugin.version("1.0.0"));
assertThat(build.plugins().values()).hasOnlyOneElementSatisfying((testPlugin) -> {
assertThat(build.plugins().values()).singleElement().satisfies((testPlugin) -> {
assertThat(testPlugin.getGroupId()).isEqualTo("com.example");
assertThat(testPlugin.getArtifactId()).isEqualTo("test-plugin");
assertThat(testPlugin.getVersion()).isEqualTo("1.0.0");
@@ -90,7 +90,7 @@ class MavenBuildTests {
MavenBuild build = new MavenBuild();
build.plugins().add("com.example", "test-plugin", (plugin) -> plugin.version("1.0.0"));
build.plugins().add("com.example", "test-plugin", (plugin) -> plugin.version(null));
assertThat(build.plugins().values()).hasOnlyOneElementSatisfying((testPlugin) -> {
assertThat(build.plugins().values()).singleElement().satisfies((testPlugin) -> {
assertThat(testPlugin.getGroupId()).isEqualTo("com.example");
assertThat(testPlugin.getArtifactId()).isEqualTo("test-plugin");
assertThat(testPlugin.getVersion()).isNull();
@@ -102,7 +102,7 @@ class MavenBuildTests {
MavenBuild build = new MavenBuild();
build.plugins().add("com.example", "test-plugin", (plugin) -> plugin.version("1.0.0"));
build.plugins().add("com.example", "test-plugin");
assertThat(build.plugins().values()).hasOnlyOneElementSatisfying((testPlugin) -> {
assertThat(build.plugins().values()).singleElement().satisfies((testPlugin) -> {
assertThat(testPlugin.getGroupId()).isEqualTo("com.example");
assertThat(testPlugin.getArtifactId()).isEqualTo("test-plugin");
assertThat(testPlugin.getVersion()).isEqualTo("1.0.0");
@@ -116,7 +116,7 @@ class MavenBuildTests {
(plugin) -> plugin.execution("first", (first) -> first.goal("run-this")));
build.plugins().add("com.example", "test-plugin",
(plugin) -> plugin.execution("first", (first) -> first.goal("run-that")));
assertThat(build.plugins().values()).hasOnlyOneElementSatisfying((testPlugin) -> {
assertThat(build.plugins().values()).singleElement().satisfies((testPlugin) -> {
assertThat(testPlugin.getExecutions()).hasSize(1);
assertThat(testPlugin.getExecutions().get(0).getId()).isEqualTo("first");
assertThat(testPlugin.getExecutions().get(0).getGoals()).containsExactly("run-this", "run-that");
@@ -127,16 +127,16 @@ class MavenBuildTests {
void mavenPluginExtensionsNotLoadedByDefault() {
MavenBuild build = new MavenBuild();
build.plugins().add("com.example", "test-plugin");
assertThat(build.plugins().values())
.hasOnlyOneElementSatisfying((testPlugin) -> assertThat(testPlugin.isExtensions()).isFalse());
assertThat(build.plugins().values()).singleElement()
.satisfies((testPlugin) -> assertThat(testPlugin.isExtensions()).isFalse());
}
@Test
void mavenPluginExtensionsCanBeLoaded() {
MavenBuild build = new MavenBuild();
build.plugins().add("com.example", "test-plugin", (plugin) -> plugin.extensions(true));
assertThat(build.plugins().values())
.hasOnlyOneElementSatisfying((testPlugin) -> assertThat(testPlugin.isExtensions()).isTrue());
assertThat(build.plugins().values()).singleElement()
.satisfies((testPlugin) -> assertThat(testPlugin.isExtensions()).isTrue());
}
}

8
initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/maven/MavenPluginContainerTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ public class MavenPluginContainerTests {
void addPlugin() {
MavenPluginContainer pluginContainer = new MavenPluginContainer();
pluginContainer.add("com.example", "test-plugin");
assertThat(pluginContainer.values()).hasOnlyOneElementSatisfying((plugin) -> {
assertThat(pluginContainer.values()).singleElement().satisfies((plugin) -> {
assertThat(plugin.getGroupId()).isEqualTo("com.example");
assertThat(plugin.getArtifactId()).isEqualTo("test-plugin");
assertThat(plugin.getVersion()).isNull();
@@ -44,7 +44,7 @@ public class MavenPluginContainerTests {
MavenPluginContainer pluginContainer = new MavenPluginContainer();
pluginContainer.add("com.example", "test-plugin",
(plugin) -> plugin.version("1.0").execution("first", (first) -> first.goal("run-this")));
assertThat(pluginContainer.values()).hasOnlyOneElementSatisfying((plugin) -> {
assertThat(pluginContainer.values()).singleElement().satisfies((plugin) -> {
assertThat(plugin.getGroupId()).isEqualTo("com.example");
assertThat(plugin.getArtifactId()).isEqualTo("test-plugin");
assertThat(plugin.getVersion()).isEqualTo("1.0");
@@ -59,7 +59,7 @@ public class MavenPluginContainerTests {
MavenPluginContainer pluginContainer = new MavenPluginContainer();
pluginContainer.add("com.example", "test-plugin", (plugin) -> plugin.version("1.0"));
pluginContainer.add("com.example", "test-plugin", (plugin) -> plugin.version("2.0"));
assertThat(pluginContainer.values()).hasOnlyOneElementSatisfying((plugin) -> {
assertThat(pluginContainer.values()).singleElement().satisfies((plugin) -> {
assertThat(plugin.getGroupId()).isEqualTo("com.example");
assertThat(plugin.getArtifactId()).isEqualTo("test-plugin");
assertThat(plugin.getVersion()).isEqualTo("2.0");

8
initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/maven/MavenResourceContainerTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@ class MavenResourceContainerTests {
resource.includes("**/*.yml");
resource.excludes("**/*.properties");
});
assertThat(container.values()).hasOnlyOneElementSatisfying((resource) -> {
assertThat(container.values()).singleElement().satisfies((resource) -> {
assertThat(resource.getDirectory()).isEqualTo("src/main/resources");
assertThat(resource.getTargetPath()).isEqualTo("targetPath");
assertThat(resource.isFiltering()).isTrue();
@@ -56,7 +56,7 @@ class MavenResourceContainerTests {
resource.includes("**/*.yaml");
resource.excludes("**/*.properties");
});
assertThat(container.values()).hasOnlyOneElementSatisfying((resource) -> {
assertThat(container.values()).singleElement().satisfies((resource) -> {
assertThat(resource.getDirectory()).isEqualTo("src/main/resources");
assertThat(resource.getTargetPath()).isNull();
assertThat(resource.isFiltering()).isTrue();
@@ -70,7 +70,7 @@ class MavenResourceContainerTests {
void mavenResourceDefaultValues() {
MavenResourceContainer container = new MavenResourceContainer();
container.add("src/main/custom");
assertThat(container.values()).hasOnlyOneElementSatisfying((resource) -> {
assertThat(container.values()).singleElement().satisfies((resource) -> {
assertThat(resource.getDirectory()).isEqualTo("src/main/custom");
assertThat(resource.getTargetPath()).isNull();
assertThat(resource.isFiltering()).isFalse();