diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleAnnotationProcessorScopeBuildCustomizerTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleAnnotationProcessorScopeBuildCustomizerTests.java index 98d7fafb..6132bedb 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleAnnotationProcessorScopeBuildCustomizerTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleAnnotationProcessorScopeBuildCustomizerTests.java @@ -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. @@ -35,7 +35,7 @@ class GradleAnnotationProcessorScopeBuildCustomizerTests { build.dependencies().add("lib", "com.example", "lib", DependencyScope.COMPILE); build.dependencies().add("ap", "com.example", "model-generator", DependencyScope.ANNOTATION_PROCESSOR); customize(build); - assertThat(build.configurations().customizations()).hasOnlyOneElementSatisfying((configuration) -> { + assertThat(build.configurations().customizations()).singleElement().satisfies((configuration) -> { assertThat(configuration.getName()).isEqualTo("compileOnly"); assertThat(configuration.getExtendsFrom()).containsOnly("annotationProcessor"); }); diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/maven/DefaultMavenBuildCustomizerTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/maven/DefaultMavenBuildCustomizerTests.java index 2e85a5df..485b4a94 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/maven/DefaultMavenBuildCustomizerTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/maven/DefaultMavenBuildCustomizerTests.java @@ -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. @@ -52,7 +52,7 @@ class DefaultMavenBuildCustomizerTests { void customizeRegisterSpringBootPlugin() { InitializrMetadata metadata = InitializrMetadataTestBuilder.withDefaults().build(); 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.getArtifactId()).isEqualTo("spring-boot-maven-plugin"); assertThat(mavenPlugin.getVersion()).isNull(); diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/SourceCodeProjectGenerationConfigurationTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/SourceCodeProjectGenerationConfigurationTests.java index 83e5215b..b4a3b998 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/SourceCodeProjectGenerationConfigurationTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/SourceCodeProjectGenerationConfigurationTests.java @@ -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. @@ -50,8 +50,8 @@ class SourceCodeProjectGenerationConfigurationTests { return type; }); assertThat(declaration.getAnnotations()).hasSize(1); - assertThat(declaration.getAnnotations()) - .hasOnlyOneElementSatisfying((annotation) -> assertThat(annotation.getName()) + assertThat(declaration.getAnnotations()).singleElement() + .satisfies((annotation) -> assertThat(annotation.getName()) .isEqualTo("org.springframework.boot.autoconfigure.SpringBootApplication")); } diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/groovy/GroovyGradleBuildCustomizerTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/groovy/GroovyGradleBuildCustomizerTests.java index 07af26af..ca60d7d2 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/groovy/GroovyGradleBuildCustomizerTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/groovy/GroovyGradleBuildCustomizerTests.java @@ -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,8 +32,8 @@ class GroovyGradleBuildCustomizerTests { void groovyPluginIsConfigured() { GradleBuild build = new GradleBuild(); new GroovyGradleBuildCustomizer().customize(build); - assertThat(build.plugins().values()) - .hasOnlyOneElementSatisfying((plugin) -> assertThat(plugin.getId()).isEqualTo("groovy")); + assertThat(build.plugins().values()).singleElement() + .satisfies((plugin) -> assertThat(plugin.getId()).isEqualTo("groovy")); } } diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/groovy/GroovyMavenBuildCustomizerTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/groovy/GroovyMavenBuildCustomizerTests.java index 05c9422b..d9f8a37e 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/groovy/GroovyMavenBuildCustomizerTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/groovy/GroovyMavenBuildCustomizerTests.java @@ -34,7 +34,7 @@ class GroovyMavenBuildCustomizerTests { void groovyMavenPluginIsConfigured() { MavenBuild build = new MavenBuild(); 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.getArtifactId()).isEqualTo("gmavenplus-plugin"); assertThat(groovyPlugin.getVersion()).isEqualTo("1.11.0"); diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/GroovyDslKotlinGradleBuildCustomizerTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/GroovyDslKotlinGradleBuildCustomizerTests.java index f42ae018..6209d0c5 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/GroovyDslKotlinGradleBuildCustomizerTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/GroovyDslKotlinGradleBuildCustomizerTests.java @@ -45,7 +45,7 @@ class GroovyDslKotlinGradleBuildCustomizerTests { GradleBuild build = new GradleBuild(); new GroovyDslKotlinGradleBuildCustomizer(new SimpleKotlinProjectSettings("1.2.70", "11")).customize(build); 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"); assertKotlinOptions(task, "11"); }); diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinDslKotlinGradleBuildCustomizerTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinDslKotlinGradleBuildCustomizerTests.java index 40faf868..2898322a 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinDslKotlinGradleBuildCustomizerTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinDslKotlinGradleBuildCustomizerTests.java @@ -44,7 +44,7 @@ class KotlinDslKotlinGradleBuildCustomizerTests { GradleBuild build = new GradleBuild(); new KotlinDslKotlinGradleBuildCustomizer(new SimpleKotlinProjectSettings("1.2.70", "11")).customize(build); 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"); assertKotlinOptions(task, "11"); }); diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinJpaGradleBuildCustomizerTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinJpaGradleBuildCustomizerTests.java index ce215efc..18f5c602 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinJpaGradleBuildCustomizerTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinJpaGradleBuildCustomizerTests.java @@ -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. @@ -43,7 +43,7 @@ class KotlinJpaGradleBuildCustomizerTests { dependency.setFacets(Collections.singletonList("jpa")); GradleBuild build = getCustomizedBuild(dependency); 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(((StandardGradlePlugin) plugin).getVersion()).isEqualTo("1.2.70"); }); diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinJpaMavenBuildCustomizerTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinJpaMavenBuildCustomizerTests.java index 26aa91ac..d2649df2 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinJpaMavenBuildCustomizerTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinJpaMavenBuildCustomizerTests.java @@ -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. @@ -42,7 +42,7 @@ class KotlinJpaMavenBuildCustomizerTests { Dependency dependency = Dependency.withId("foo"); dependency.setFacets(Collections.singletonList("jpa")); 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.getArtifactId()).isEqualTo("kotlin-maven-plugin"); MavenPlugin.Setting settings = plugin.getConfiguration().getSettings().get(0); diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinMavenBuildCustomizerTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinMavenBuildCustomizerTests.java index 616db2ae..acd3a94f 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinMavenBuildCustomizerTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinMavenBuildCustomizerTests.java @@ -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. @@ -56,7 +56,7 @@ class KotlinMavenBuildCustomizerTests { void kotlinMavenPluginIsConfigured() { MavenBuild build = new MavenBuild(); 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.getArtifactId()).isEqualTo("kotlin-maven-plugin"); assertThat(kotlinPlugin.getVersion()).isNull(); @@ -86,7 +86,7 @@ class KotlinMavenBuildCustomizerTests { void kotlinMavenPluginWithSeveralArgs() { MavenBuild build = new MavenBuild(); new KotlinMavenBuildCustomizer(new TestKotlinProjectSettings()).customize(build); - assertThat(build.plugins().values()).hasOnlyOneElementSatisfying((kotlinPlugin) -> { + assertThat(build.plugins().values()).singleElement().satisfies((kotlinPlugin) -> { Configuration configuration = kotlinPlugin.getConfiguration(); Setting args = configuration.getSettings().get(0); assertThat(args.getName()).isEqualTo("args"); diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinMavenFullBuildCustomizerTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinMavenFullBuildCustomizerTests.java index 3da3cb38..2da168d0 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinMavenFullBuildCustomizerTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinMavenFullBuildCustomizerTests.java @@ -54,7 +54,7 @@ class KotlinMavenFullBuildCustomizerTests { void kotlinMavenPluginIsConfigured() { MavenBuild build = new MavenBuild(); 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.getArtifactId()).isEqualTo("kotlin-maven-plugin"); assertThat(kotlinPlugin.getVersion()).isEqualTo("${kotlin.version}"); diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GradleTaskContainer.java b/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GradleTaskContainer.java index aa489f49..f1c58daa 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GradleTaskContainer.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GradleTaskContainer.java @@ -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 task) { String packageName = ClassUtils.getPackageName(type); - if (!StringUtils.isEmpty(packageName)) { + if (StringUtils.hasLength(packageName)) { this.importedTypes.add(type); } String shortName = ClassUtils.getShortName(type); diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GradlePluginContainerTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GradlePluginContainerTests.java index cc9ee248..2a165b84 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GradlePluginContainerTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GradlePluginContainerTests.java @@ -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(); }); diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GradleTaskContainerTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GradleTaskContainerTests.java index 676b0127..6b36849c 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GradleTaskContainerTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GradleTaskContainerTests.java @@ -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"); }); diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/maven/MavenBuildTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/maven/MavenBuildTests.java index 33b5029f..97ebcb7f 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/maven/MavenBuildTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/maven/MavenBuildTests.java @@ -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()); } } diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/maven/MavenPluginContainerTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/maven/MavenPluginContainerTests.java index 0f617874..d7288a67 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/maven/MavenPluginContainerTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/maven/MavenPluginContainerTests.java @@ -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"); diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/maven/MavenResourceContainerTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/maven/MavenResourceContainerTests.java index acfe531b..9dd375be 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/maven/MavenResourceContainerTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/maven/MavenResourceContainerTests.java @@ -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(); diff --git a/initializr-parent/pom.xml b/initializr-parent/pom.xml index 229850ff..d351f56b 100644 --- a/initializr-parent/pom.xml +++ b/initializr-parent/pom.xml @@ -19,7 +19,7 @@ 1.8 1.4.2 3.6.3 - 2.3.5.RELEASE + 2.4.0 2.2.4.RELEASE