lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2025-07-16 16:50:42 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleAnnotationProcessorScopeBuildCustomizerTests.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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -35,7 +35,7 @@ class GradleAnnotationProcessorScopeBuildCustomizerTests {
build.dependencies().add("lib", "com.example", "lib", DependencyScope.COMPILE); build.dependencies().add("lib", "com.example", "lib", DependencyScope.COMPILE);
build.dependencies().add("ap", "com.example", "model-generator", DependencyScope.ANNOTATION_PROCESSOR); build.dependencies().add("ap", "com.example", "model-generator", DependencyScope.ANNOTATION_PROCESSOR);
customize(build); customize(build);
assertThat(build.configurations().customizations()).hasOnlyOneElementSatisfying((configuration) -> { assertThat(build.configurations().customizations()).singleElement().satisfies((configuration) -> {
assertThat(configuration.getName()).isEqualTo("compileOnly"); assertThat(configuration.getName()).isEqualTo("compileOnly");
assertThat(configuration.getExtendsFrom()).containsOnly("annotationProcessor"); assertThat(configuration.getExtendsFrom()).containsOnly("annotationProcessor");
}); });

4
initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/maven/DefaultMavenBuildCustomizerTests.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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -52,7 +52,7 @@ class DefaultMavenBuildCustomizerTests {
void customizeRegisterSpringBootPlugin() { void customizeRegisterSpringBootPlugin() {
InitializrMetadata metadata = InitializrMetadataTestBuilder.withDefaults().build(); InitializrMetadata metadata = InitializrMetadataTestBuilder.withDefaults().build();
MavenBuild build = customizeBuild(metadata); MavenBuild build = customizeBuild(metadata);
assertThat(build.plugins().values()).hasOnlyOneElementSatisfying((mavenPlugin) -> { assertThat(build.plugins().values()).singleElement().satisfies((mavenPlugin) -> {
assertThat(mavenPlugin.getGroupId()).isEqualTo("org.springframework.boot"); assertThat(mavenPlugin.getGroupId()).isEqualTo("org.springframework.boot");
assertThat(mavenPlugin.getArtifactId()).isEqualTo("spring-boot-maven-plugin"); assertThat(mavenPlugin.getArtifactId()).isEqualTo("spring-boot-maven-plugin");
assertThat(mavenPlugin.getVersion()).isNull(); assertThat(mavenPlugin.getVersion()).isNull();

6
initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/SourceCodeProjectGenerationConfigurationTests.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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -50,8 +50,8 @@ class SourceCodeProjectGenerationConfigurationTests {
return type; return type;
}); });
assertThat(declaration.getAnnotations()).hasSize(1); assertThat(declaration.getAnnotations()).hasSize(1);
assertThat(declaration.getAnnotations()) assertThat(declaration.getAnnotations()).singleElement()
.hasOnlyOneElementSatisfying((annotation) -> assertThat(annotation.getName()) .satisfies((annotation) -> assertThat(annotation.getName())
.isEqualTo("org.springframework.boot.autoconfigure.SpringBootApplication")); .isEqualTo("org.springframework.boot.autoconfigure.SpringBootApplication"));
} }

6
initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/groovy/GroovyGradleBuildCustomizerTests.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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -32,8 +32,8 @@ class GroovyGradleBuildCustomizerTests {
void groovyPluginIsConfigured() { void groovyPluginIsConfigured() {
GradleBuild build = new GradleBuild(); GradleBuild build = new GradleBuild();
new GroovyGradleBuildCustomizer().customize(build); new GroovyGradleBuildCustomizer().customize(build);
assertThat(build.plugins().values()) assertThat(build.plugins().values()).singleElement()
.hasOnlyOneElementSatisfying((plugin) -> assertThat(plugin.getId()).isEqualTo("groovy")); .satisfies((plugin) -> assertThat(plugin.getId()).isEqualTo("groovy"));
} }
} }

2
initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/groovy/GroovyMavenBuildCustomizerTests.java
View File

@ -34,7 +34,7 @@ class GroovyMavenBuildCustomizerTests {
void groovyMavenPluginIsConfigured() { void groovyMavenPluginIsConfigured() {
MavenBuild build = new MavenBuild(); MavenBuild build = new MavenBuild();
new GroovyMavenBuildCustomizer().customize(build); new GroovyMavenBuildCustomizer().customize(build);
assertThat(build.plugins().values()).hasOnlyOneElementSatisfying((groovyPlugin) -> { assertThat(build.plugins().values()).singleElement().satisfies((groovyPlugin) -> {
assertThat(groovyPlugin.getGroupId()).isEqualTo("org.codehaus.gmavenplus"); assertThat(groovyPlugin.getGroupId()).isEqualTo("org.codehaus.gmavenplus");
assertThat(groovyPlugin.getArtifactId()).isEqualTo("gmavenplus-plugin"); assertThat(groovyPlugin.getArtifactId()).isEqualTo("gmavenplus-plugin");
assertThat(groovyPlugin.getVersion()).isEqualTo("1.11.0"); assertThat(groovyPlugin.getVersion()).isEqualTo("1.11.0");

2
initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/GroovyDslKotlinGradleBuildCustomizerTests.java
View File

@ -45,7 +45,7 @@ class GroovyDslKotlinGradleBuildCustomizerTests {
GradleBuild build = new GradleBuild(); GradleBuild build = new GradleBuild();
new GroovyDslKotlinGradleBuildCustomizer(new SimpleKotlinProjectSettings("1.2.70", "11")).customize(build); new GroovyDslKotlinGradleBuildCustomizer(new SimpleKotlinProjectSettings("1.2.70", "11")).customize(build);
assertThat(build.tasks().importedTypes()).contains("org.jetbrains.kotlin.gradle.tasks.KotlinCompile"); assertThat(build.tasks().importedTypes()).contains("org.jetbrains.kotlin.gradle.tasks.KotlinCompile");
assertThat(build.tasks().values()).hasOnlyOneElementSatisfying((task) -> { assertThat(build.tasks().values()).singleElement().satisfies((task) -> {
assertThat(task.getName()).isEqualTo("KotlinCompile"); assertThat(task.getName()).isEqualTo("KotlinCompile");
assertKotlinOptions(task, "11"); assertKotlinOptions(task, "11");
}); });

2
initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinDslKotlinGradleBuildCustomizerTests.java
View File

@ -44,7 +44,7 @@ class KotlinDslKotlinGradleBuildCustomizerTests {
GradleBuild build = new GradleBuild(); GradleBuild build = new GradleBuild();
new KotlinDslKotlinGradleBuildCustomizer(new SimpleKotlinProjectSettings("1.2.70", "11")).customize(build); new KotlinDslKotlinGradleBuildCustomizer(new SimpleKotlinProjectSettings("1.2.70", "11")).customize(build);
assertThat(build.tasks().importedTypes()).contains("org.jetbrains.kotlin.gradle.tasks.KotlinCompile"); assertThat(build.tasks().importedTypes()).contains("org.jetbrains.kotlin.gradle.tasks.KotlinCompile");
assertThat(build.tasks().values()).hasOnlyOneElementSatisfying((task) -> { assertThat(build.tasks().values()).singleElement().satisfies((task) -> {
assertThat(task.getName()).isEqualTo("KotlinCompile"); assertThat(task.getName()).isEqualTo("KotlinCompile");
assertKotlinOptions(task, "11"); assertKotlinOptions(task, "11");
}); });

4
initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinJpaGradleBuildCustomizerTests.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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -43,7 +43,7 @@ class KotlinJpaGradleBuildCustomizerTests {
dependency.setFacets(Collections.singletonList("jpa")); dependency.setFacets(Collections.singletonList("jpa"));
GradleBuild build = getCustomizedBuild(dependency); GradleBuild build = getCustomizedBuild(dependency);
assertThat(build.plugins().values().filter(GradlePlugin::isApply)).isEmpty(); assertThat(build.plugins().values().filter(GradlePlugin::isApply)).isEmpty();
assertThat(build.plugins().values()).hasOnlyOneElementSatisfying((plugin) -> { assertThat(build.plugins().values()).singleElement().satisfies((plugin) -> {
assertThat(plugin.getId()).isEqualTo("org.jetbrains.kotlin.plugin.jpa"); assertThat(plugin.getId()).isEqualTo("org.jetbrains.kotlin.plugin.jpa");
assertThat(((StandardGradlePlugin) plugin).getVersion()).isEqualTo("1.2.70"); assertThat(((StandardGradlePlugin) plugin).getVersion()).isEqualTo("1.2.70");
}); });

4
initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinJpaMavenBuildCustomizerTests.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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -42,7 +42,7 @@ class KotlinJpaMavenBuildCustomizerTests {
Dependency dependency = Dependency.withId("foo"); Dependency dependency = Dependency.withId("foo");
dependency.setFacets(Collections.singletonList("jpa")); dependency.setFacets(Collections.singletonList("jpa"));
MavenBuild build = getCustomizedBuild(dependency); MavenBuild build = getCustomizedBuild(dependency);
assertThat(build.plugins().values()).hasOnlyOneElementSatisfying((plugin) -> { assertThat(build.plugins().values()).singleElement().satisfies((plugin) -> {
assertThat(plugin.getGroupId()).isEqualTo("org.jetbrains.kotlin"); assertThat(plugin.getGroupId()).isEqualTo("org.jetbrains.kotlin");
assertThat(plugin.getArtifactId()).isEqualTo("kotlin-maven-plugin"); assertThat(plugin.getArtifactId()).isEqualTo("kotlin-maven-plugin");
MavenPlugin.Setting settings = plugin.getConfiguration().getSettings().get(0); MavenPlugin.Setting settings = plugin.getConfiguration().getSettings().get(0);

6
initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinMavenBuildCustomizerTests.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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -56,7 +56,7 @@ class KotlinMavenBuildCustomizerTests {
void kotlinMavenPluginIsConfigured() { void kotlinMavenPluginIsConfigured() {
MavenBuild build = new MavenBuild(); MavenBuild build = new MavenBuild();
new KotlinMavenBuildCustomizer(new SimpleKotlinProjectSettings("1.2.70")).customize(build); new KotlinMavenBuildCustomizer(new SimpleKotlinProjectSettings("1.2.70")).customize(build);
assertThat(build.plugins().values()).hasOnlyOneElementSatisfying((kotlinPlugin) -> { assertThat(build.plugins().values()).singleElement().satisfies((kotlinPlugin) -> {
assertThat(kotlinPlugin.getGroupId()).isEqualTo("org.jetbrains.kotlin"); assertThat(kotlinPlugin.getGroupId()).isEqualTo("org.jetbrains.kotlin");
assertThat(kotlinPlugin.getArtifactId()).isEqualTo("kotlin-maven-plugin"); assertThat(kotlinPlugin.getArtifactId()).isEqualTo("kotlin-maven-plugin");
assertThat(kotlinPlugin.getVersion()).isNull(); assertThat(kotlinPlugin.getVersion()).isNull();
@ -86,7 +86,7 @@ class KotlinMavenBuildCustomizerTests {
void kotlinMavenPluginWithSeveralArgs() { void kotlinMavenPluginWithSeveralArgs() {
MavenBuild build = new MavenBuild(); MavenBuild build = new MavenBuild();
new KotlinMavenBuildCustomizer(new TestKotlinProjectSettings()).customize(build); new KotlinMavenBuildCustomizer(new TestKotlinProjectSettings()).customize(build);
assertThat(build.plugins().values()).hasOnlyOneElementSatisfying((kotlinPlugin) -> { assertThat(build.plugins().values()).singleElement().satisfies((kotlinPlugin) -> {
Configuration configuration = kotlinPlugin.getConfiguration(); Configuration configuration = kotlinPlugin.getConfiguration();
Setting args = configuration.getSettings().get(0); Setting args = configuration.getSettings().get(0);
assertThat(args.getName()).isEqualTo("args"); assertThat(args.getName()).isEqualTo("args");

2
initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinMavenFullBuildCustomizerTests.java
View File

@ -54,7 +54,7 @@ class KotlinMavenFullBuildCustomizerTests {
void kotlinMavenPluginIsConfigured() { void kotlinMavenPluginIsConfigured() {
MavenBuild build = new MavenBuild(); MavenBuild build = new MavenBuild();
new KotlinMavenFullBuildCustomizer(new SimpleKotlinProjectSettings("1.2.70", "1.6")).customize(build); new KotlinMavenFullBuildCustomizer(new SimpleKotlinProjectSettings("1.2.70", "1.6")).customize(build);
assertThat(build.plugins().values()).hasOnlyOneElementSatisfying((kotlinPlugin) -> { assertThat(build.plugins().values()).singleElement().satisfies((kotlinPlugin) -> {
assertThat(kotlinPlugin.getGroupId()).isEqualTo("org.jetbrains.kotlin"); assertThat(kotlinPlugin.getGroupId()).isEqualTo("org.jetbrains.kotlin");
assertThat(kotlinPlugin.getArtifactId()).isEqualTo("kotlin-maven-plugin"); assertThat(kotlinPlugin.getArtifactId()).isEqualTo("kotlin-maven-plugin");
assertThat(kotlinPlugin.getVersion()).isEqualTo("${kotlin.version}"); assertThat(kotlinPlugin.getVersion()).isEqualTo("${kotlin.version}");

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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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) { public void customizeWithType(String type, Consumer<Builder> task) {
String packageName = ClassUtils.getPackageName(type); String packageName = ClassUtils.getPackageName(type);
if (!StringUtils.isEmpty(packageName)) { if (StringUtils.hasLength(packageName)) {
this.importedTypes.add(type); this.importedTypes.add(type);
} }
String shortName = ClassUtils.getShortName(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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -32,7 +32,7 @@ class GradlePluginContainerTests {
void addPluginWithId() { void addPluginWithId() {
GradlePluginContainer pluginContainer = new GradlePluginContainer(); GradlePluginContainer pluginContainer = new GradlePluginContainer();
pluginContainer.add("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.getId()).isEqualTo("com.example");
assertThat(plugin.isApply()).isFalse(); assertThat(plugin.isApply()).isFalse();
}); });
@ -42,7 +42,7 @@ class GradlePluginContainerTests {
void addPluginWithConsumer() { void addPluginWithConsumer() {
GradlePluginContainer pluginContainer = new GradlePluginContainer(); GradlePluginContainer pluginContainer = new GradlePluginContainer();
pluginContainer.add("com.example", (plugin) -> plugin.setVersion("1.0")); 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.getId()).isEqualTo("com.example");
assertThat(plugin).isInstanceOf(StandardGradlePlugin.class); assertThat(plugin).isInstanceOf(StandardGradlePlugin.class);
assertThat(((StandardGradlePlugin) plugin).getVersion()).isEqualTo("1.0"); assertThat(((StandardGradlePlugin) plugin).getVersion()).isEqualTo("1.0");
@ -61,7 +61,7 @@ class GradlePluginContainerTests {
assertThat(plugin.getVersion()).isEqualTo("1.0"); assertThat(plugin.getVersion()).isEqualTo("1.0");
plugin.setVersion("2.0"); plugin.setVersion("2.0");
}); });
assertThat(pluginContainer.values()).hasOnlyOneElementSatisfying((plugin) -> { assertThat(pluginContainer.values()).singleElement().satisfies((plugin) -> {
assertThat(plugin.getId()).isEqualTo("com.example"); assertThat(plugin.getId()).isEqualTo("com.example");
assertThat(plugin).isInstanceOf(StandardGradlePlugin.class); assertThat(plugin).isInstanceOf(StandardGradlePlugin.class);
assertThat(((StandardGradlePlugin) plugin).getVersion()).isEqualTo("2.0"); assertThat(((StandardGradlePlugin) plugin).getVersion()).isEqualTo("2.0");
@ -73,7 +73,7 @@ class GradlePluginContainerTests {
void applyGradlePlugin() { void applyGradlePlugin() {
GradlePluginContainer pluginContainer = new GradlePluginContainer(); 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.getId()).isEqualTo("com.example");
assertThat(plugin.isApply()).isTrue(); assertThat(plugin.isApply()).isTrue();
}); });
@ -84,7 +84,7 @@ class GradlePluginContainerTests {
GradlePluginContainer pluginContainer = new GradlePluginContainer(); GradlePluginContainer pluginContainer = new GradlePluginContainer();
pluginContainer.apply("com.example"); pluginContainer.apply("com.example");
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.getId()).isEqualTo("com.example");
assertThat(plugin.isApply()).isTrue(); assertThat(plugin.isApply()).isTrue();
}); });
@ -95,7 +95,7 @@ class GradlePluginContainerTests {
GradlePluginContainer pluginContainer = new GradlePluginContainer(); GradlePluginContainer pluginContainer = new GradlePluginContainer();
pluginContainer.add("com.example"); pluginContainer.add("com.example");
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.getId()).isEqualTo("com.example");
assertThat(plugin.isApply()).isFalse(); assertThat(plugin.isApply()).isFalse();
}); });
@ -106,7 +106,7 @@ class GradlePluginContainerTests {
GradlePluginContainer pluginContainer = new GradlePluginContainer(); GradlePluginContainer pluginContainer = new GradlePluginContainer();
pluginContainer.apply("com.example"); pluginContainer.apply("com.example");
pluginContainer.add("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.getId()).isEqualTo("com.example");
assertThat(plugin.isApply()).isTrue(); 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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -74,7 +74,7 @@ class GradleTaskContainerTests {
void customizeTask() { void customizeTask() {
GradleTaskContainer container = new GradleTaskContainer(); GradleTaskContainer container = new GradleTaskContainer();
container.customize("test", (task) -> task.attribute("fork", "true")); 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.getName()).isEqualTo("test");
assertThat(task.getType()).isNull(); assertThat(task.getType()).isNull();
assertThat(task.getAttributes()).containsOnly(entry("fork", "true")); assertThat(task.getAttributes()).containsOnly(entry("fork", "true"));
@ -90,11 +90,11 @@ class GradleTaskContainerTests {
task.attribute("fork", "true"); task.attribute("fork", "true");
task.invoke("property", "taskDir"); task.invoke("property", "taskDir");
}); });
assertThat(container.values()).hasOnlyOneElementSatisfying((task) -> { assertThat(container.values()).singleElement().satisfies((task) -> {
assertThat(task.getName()).isEqualTo("MyTask"); assertThat(task.getName()).isEqualTo("MyTask");
assertThat(task.getType()).isEqualTo("com.example.MyTask"); assertThat(task.getType()).isEqualTo("com.example.MyTask");
assertThat(task.getAttributes()).containsOnly(entry("fork", "true")); 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.getTarget()).isEqualTo("property");
assertThat(invocation.getArguments()).containsOnly("taskDir"); assertThat(invocation.getArguments()).containsOnly("taskDir");
}); });
@ -113,11 +113,11 @@ class GradleTaskContainerTests {
task.attribute("fork", "false"); task.attribute("fork", "false");
task.invoke("method", "arg1", "arg2"); task.invoke("method", "arg1", "arg2");
}); });
assertThat(container.values()).hasOnlyOneElementSatisfying((task) -> { assertThat(container.values()).singleElement().satisfies((task) -> {
assertThat(task.getName()).isEqualTo("test"); assertThat(task.getName()).isEqualTo("test");
assertThat(task.getType()).isNull(); assertThat(task.getType()).isNull();
assertThat(task.getAttributes()).containsOnly(entry("ignore", "false"), entry("fork", "false")); 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.getTarget()).isEqualTo("method");
assertThat(invocation.getArguments()).containsOnly("arg1", "arg2"); 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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -39,7 +39,7 @@ class MavenBuildTests {
void mavenResourcesCanBeConfigured() { void mavenResourcesCanBeConfigured() {
MavenBuild build = new MavenBuild(); MavenBuild build = new MavenBuild();
build.resources().add("src/main/custom", (resource) -> resource.filtering(true)); 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.getDirectory()).isEqualTo("src/main/custom");
assertThat(resource.isFiltering()).isTrue(); assertThat(resource.isFiltering()).isTrue();
}); });
@ -51,7 +51,7 @@ class MavenBuildTests {
MavenBuild build = new MavenBuild(); MavenBuild build = new MavenBuild();
build.testResources().add("src/test/custom", (resource) -> resource.excludes("**/*.gen")); build.testResources().add("src/test/custom", (resource) -> resource.excludes("**/*.gen"));
assertThat(build.resources().isEmpty()).isTrue(); 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.getDirectory()).isEqualTo("src/test/custom");
assertThat(resource.getExcludes()).containsExactly("**/*.gen"); assertThat(resource.getExcludes()).containsExactly("**/*.gen");
}); });
@ -62,7 +62,7 @@ class MavenBuildTests {
MavenBuild build = new MavenBuild(); MavenBuild build = new MavenBuild();
build.plugins().add("com.example", "test-plugin", build.plugins().add("com.example", "test-plugin",
(plugin) -> plugin.execution("first", (first) -> first.goal("run-this"))); (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.getGroupId()).isEqualTo("com.example");
assertThat(testPlugin.getArtifactId()).isEqualTo("test-plugin"); assertThat(testPlugin.getArtifactId()).isEqualTo("test-plugin");
assertThat(testPlugin.getVersion()).isNull(); assertThat(testPlugin.getVersion()).isNull();
@ -77,7 +77,7 @@ class MavenBuildTests {
MavenBuild build = new MavenBuild(); MavenBuild build = new MavenBuild();
build.plugins().add("com.example", "test-plugin"); build.plugins().add("com.example", "test-plugin");
build.plugins().add("com.example", "test-plugin", (plugin) -> plugin.version("1.0.0")); 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.getGroupId()).isEqualTo("com.example");
assertThat(testPlugin.getArtifactId()).isEqualTo("test-plugin"); assertThat(testPlugin.getArtifactId()).isEqualTo("test-plugin");
assertThat(testPlugin.getVersion()).isEqualTo("1.0.0"); assertThat(testPlugin.getVersion()).isEqualTo("1.0.0");
@ -90,7 +90,7 @@ class MavenBuildTests {
MavenBuild build = new MavenBuild(); 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("1.0.0"));
build.plugins().add("com.example", "test-plugin", (plugin) -> plugin.version(null)); 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.getGroupId()).isEqualTo("com.example");
assertThat(testPlugin.getArtifactId()).isEqualTo("test-plugin"); assertThat(testPlugin.getArtifactId()).isEqualTo("test-plugin");
assertThat(testPlugin.getVersion()).isNull(); assertThat(testPlugin.getVersion()).isNull();
@ -102,7 +102,7 @@ class MavenBuildTests {
MavenBuild build = new MavenBuild(); 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("1.0.0"));
build.plugins().add("com.example", "test-plugin"); 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.getGroupId()).isEqualTo("com.example");
assertThat(testPlugin.getArtifactId()).isEqualTo("test-plugin"); assertThat(testPlugin.getArtifactId()).isEqualTo("test-plugin");
assertThat(testPlugin.getVersion()).isEqualTo("1.0.0"); assertThat(testPlugin.getVersion()).isEqualTo("1.0.0");
@ -116,7 +116,7 @@ class MavenBuildTests {
(plugin) -> plugin.execution("first", (first) -> first.goal("run-this"))); (plugin) -> plugin.execution("first", (first) -> first.goal("run-this")));
build.plugins().add("com.example", "test-plugin", build.plugins().add("com.example", "test-plugin",
(plugin) -> plugin.execution("first", (first) -> first.goal("run-that"))); (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()).hasSize(1);
assertThat(testPlugin.getExecutions().get(0).getId()).isEqualTo("first"); assertThat(testPlugin.getExecutions().get(0).getId()).isEqualTo("first");
assertThat(testPlugin.getExecutions().get(0).getGoals()).containsExactly("run-this", "run-that"); assertThat(testPlugin.getExecutions().get(0).getGoals()).containsExactly("run-this", "run-that");
@ -127,16 +127,16 @@ class MavenBuildTests {
void mavenPluginExtensionsNotLoadedByDefault() { void mavenPluginExtensionsNotLoadedByDefault() {
MavenBuild build = new MavenBuild(); MavenBuild build = new MavenBuild();
build.plugins().add("com.example", "test-plugin"); build.plugins().add("com.example", "test-plugin");
assertThat(build.plugins().values()) assertThat(build.plugins().values()).singleElement()
.hasOnlyOneElementSatisfying((testPlugin) -> assertThat(testPlugin.isExtensions()).isFalse()); .satisfies((testPlugin) -> assertThat(testPlugin.isExtensions()).isFalse());
} }
@Test @Test
void mavenPluginExtensionsCanBeLoaded() { void mavenPluginExtensionsCanBeLoaded() {
MavenBuild build = new MavenBuild(); MavenBuild build = new MavenBuild();
build.plugins().add("com.example", "test-plugin", (plugin) -> plugin.extensions(true)); build.plugins().add("com.example", "test-plugin", (plugin) -> plugin.extensions(true));
assertThat(build.plugins().values()) assertThat(build.plugins().values()).singleElement()
.hasOnlyOneElementSatisfying((testPlugin) -> assertThat(testPlugin.isExtensions()).isTrue()); .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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -32,7 +32,7 @@ public class MavenPluginContainerTests {
void addPlugin() { void addPlugin() {
MavenPluginContainer pluginContainer = new MavenPluginContainer(); MavenPluginContainer pluginContainer = new MavenPluginContainer();
pluginContainer.add("com.example", "test-plugin"); 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.getGroupId()).isEqualTo("com.example");
assertThat(plugin.getArtifactId()).isEqualTo("test-plugin"); assertThat(plugin.getArtifactId()).isEqualTo("test-plugin");
assertThat(plugin.getVersion()).isNull(); assertThat(plugin.getVersion()).isNull();
@ -44,7 +44,7 @@ public class MavenPluginContainerTests {
MavenPluginContainer pluginContainer = new MavenPluginContainer(); MavenPluginContainer pluginContainer = new MavenPluginContainer();
pluginContainer.add("com.example", "test-plugin", pluginContainer.add("com.example", "test-plugin",
(plugin) -> plugin.version("1.0").execution("first", (first) -> first.goal("run-this"))); (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.getGroupId()).isEqualTo("com.example");
assertThat(plugin.getArtifactId()).isEqualTo("test-plugin"); assertThat(plugin.getArtifactId()).isEqualTo("test-plugin");
assertThat(plugin.getVersion()).isEqualTo("1.0"); assertThat(plugin.getVersion()).isEqualTo("1.0");
@ -59,7 +59,7 @@ public class MavenPluginContainerTests {
MavenPluginContainer pluginContainer = new MavenPluginContainer(); MavenPluginContainer pluginContainer = new MavenPluginContainer();
pluginContainer.add("com.example", "test-plugin", (plugin) -> plugin.version("1.0")); pluginContainer.add("com.example", "test-plugin", (plugin) -> plugin.version("1.0"));
pluginContainer.add("com.example", "test-plugin", (plugin) -> plugin.version("2.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.getGroupId()).isEqualTo("com.example");
assertThat(plugin.getArtifactId()).isEqualTo("test-plugin"); assertThat(plugin.getArtifactId()).isEqualTo("test-plugin");
assertThat(plugin.getVersion()).isEqualTo("2.0"); 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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -36,7 +36,7 @@ class MavenResourceContainerTests {
resource.includes("**/*.yml"); resource.includes("**/*.yml");
resource.excludes("**/*.properties"); resource.excludes("**/*.properties");
}); });
assertThat(container.values()).hasOnlyOneElementSatisfying((resource) -> { assertThat(container.values()).singleElement().satisfies((resource) -> {
assertThat(resource.getDirectory()).isEqualTo("src/main/resources"); assertThat(resource.getDirectory()).isEqualTo("src/main/resources");
assertThat(resource.getTargetPath()).isEqualTo("targetPath"); assertThat(resource.getTargetPath()).isEqualTo("targetPath");
assertThat(resource.isFiltering()).isTrue(); assertThat(resource.isFiltering()).isTrue();
@ -56,7 +56,7 @@ class MavenResourceContainerTests {
resource.includes("**/*.yaml"); resource.includes("**/*.yaml");
resource.excludes("**/*.properties"); resource.excludes("**/*.properties");
}); });
assertThat(container.values()).hasOnlyOneElementSatisfying((resource) -> { assertThat(container.values()).singleElement().satisfies((resource) -> {
assertThat(resource.getDirectory()).isEqualTo("src/main/resources"); assertThat(resource.getDirectory()).isEqualTo("src/main/resources");
assertThat(resource.getTargetPath()).isNull(); assertThat(resource.getTargetPath()).isNull();
assertThat(resource.isFiltering()).isTrue(); assertThat(resource.isFiltering()).isTrue();
@ -70,7 +70,7 @@ class MavenResourceContainerTests {
void mavenResourceDefaultValues() { void mavenResourceDefaultValues() {
MavenResourceContainer container = new MavenResourceContainer(); MavenResourceContainer container = new MavenResourceContainer();
container.add("src/main/custom"); 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.getDirectory()).isEqualTo("src/main/custom");
assertThat(resource.getTargetPath()).isNull(); assertThat(resource.getTargetPath()).isNull();
assertThat(resource.isFiltering()).isFalse(); assertThat(resource.isFiltering()).isFalse();

2
initializr-parent/pom.xml
View File

@ -19,7 +19,7 @@
<commons-text.version>1.8</commons-text.version> <commons-text.version>1.8</commons-text.version>
<maven-resolver.version>1.4.2</maven-resolver.version> <maven-resolver.version>1.4.2</maven-resolver.version>
<maven-resolver-provider.version>3.6.3</maven-resolver-provider.version> <maven-resolver-provider.version>3.6.3</maven-resolver-provider.version>
<spring-boot.version>2.3.5.RELEASE</spring-boot.version> <spring-boot.version>2.4.0</spring-boot.version>
<spring-cloud-contract.version>2.2.4.RELEASE</spring-cloud-contract.version> <spring-cloud-contract.version>2.2.4.RELEASE</spring-cloud-contract.version>
</properties> </properties>
<scm> <scm>