diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurations.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurations.java index d57a087b933..a4239abc538 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurations.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurations.java @@ -51,7 +51,7 @@ public class AutoConfigurations extends Configurations implements Ordered { .collect(Collectors.toCollection(ArrayList::new)); List sorted = SORTER.getInPriorityOrder(names); return sorted.stream() - .map(className -> ClassUtils.resolveClassName(className, null)) + .map((className) -> ClassUtils.resolveClassName(className, null)) .collect(Collectors.toCollection(ArrayList::new)); } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfiguration.java index ce49baf2ee1..9bb30c558ba 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfiguration.java @@ -136,7 +136,7 @@ public class QuartzAutoConfiguration { public SchedulerFactoryBeanCustomizer dataSourceCustomizer( QuartzProperties properties, DataSource dataSource, ObjectProvider transactionManager) { - return schedulerFactoryBean -> { + return (schedulerFactoryBean) -> { if (properties.getJobStoreType() == JobStoreType.JDBC) { schedulerFactoryBean.setDataSource(dataSource); PlatformTransactionManager txManager = transactionManager diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/function/client/WebClientAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/function/client/WebClientAutoConfiguration.java index 5e2b567bd46..1fd7a5997bb 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/function/client/WebClientAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/function/client/WebClientAutoConfiguration.java @@ -62,7 +62,7 @@ public class WebClientAutoConfiguration { customizers = new ArrayList<>(customizers); AnnotationAwareOrderComparator.sort(customizers); customizers - .forEach(customizer -> customizer.customize(this.webClientBuilder)); + .forEach((customizer) -> customizer.customize(this.webClientBuilder)); } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/function/client/WebClientCodecCustomizer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/function/client/WebClientCodecCustomizer.java index d1964708991..f42d8efc21e 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/function/client/WebClientCodecCustomizer.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/function/client/WebClientCodecCustomizer.java @@ -40,7 +40,7 @@ public class WebClientCodecCustomizer implements WebClientCustomizer { @Override public void customize(WebClient.Builder webClientBuilder) { webClientBuilder - .exchangeStrategies(ExchangeStrategies.builder().codecs(codecs -> { + .exchangeStrategies(ExchangeStrategies.builder().codecs((codecs) -> { this.codecCustomizers .forEach((customizer) -> customizer.customize(codecs)); }).build()); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/DefaultServletWebServerFactoryCustomizer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/DefaultServletWebServerFactoryCustomizer.java index d7fe68ced3f..8604e5c73d1 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/DefaultServletWebServerFactoryCustomizer.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/DefaultServletWebServerFactoryCustomizer.java @@ -646,7 +646,7 @@ public class DefaultServletWebServerFactoryCustomizer private static void customizeAccessLog(JettyServletWebServerFactory factory, final ServerProperties.Jetty.Accesslog properties) { - factory.addServerCustomizers(server -> { + factory.addServerCustomizers((server) -> { NCSARequestLog log = new NCSARequestLog(); if (properties.getFilename() != null) { log.setFilename(properties.getFilename()); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcProperties.java index d175200bd69..a75ee7bbf67 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcProperties.java @@ -84,7 +84,7 @@ public class WebMvcProperties { private boolean logResolvedException = false; /** - * Maps file extensions to media types for content negotiation, e.g. yml->text/yaml. + * Maps file extensions to media types for content negotiation, e.g. yml to text/yaml. */ private Map mediaTypes = new LinkedHashMap<>(); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java index 68b1ce5d73a..f452b954c49 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java @@ -66,8 +66,7 @@ public class DataSourceAutoConfigurationTests { @Test public void testDefaultDataSourceExists() throws Exception { - this.context - .run((loaded) -> assertThat(loaded).hasSingleBean(DataSource.class)); + this.context.run((loaded) -> assertThat(loaded).hasSingleBean(DataSource.class)); } @Test @@ -110,7 +109,7 @@ public class DataSourceAutoConfigurationTests { @Test public void hikariValidatesConnectionByDefault() throws Exception { assertDataSource(HikariDataSource.class, - Collections.singletonList("org.apache.tomcat"), dataSource -> + Collections.singletonList("org.apache.tomcat"), (dataSource) -> // Use Connection#isValid() assertThat(dataSource.getConnectionTestQuery()).isNull()); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTests.java index 4db31347b9f..c5f3a80788f 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTests.java @@ -225,7 +225,7 @@ public class ActiveMQAutoConfigurationTests { @Bean public ActiveMQConnectionFactoryCustomizer activeMQConnectionFactoryCustomizer() { - return factory -> { + return (factory) -> { factory.setBrokerURL( "vm://localhost?useJmx=false&broker.persistent=false"); factory.setUserName("foobar"); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java index 6dd9aa32bf8..40a4703ada6 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java @@ -277,7 +277,7 @@ public class ArtemisAutoConfigurationTests { "spring.artemis.embedded.serverId=93", // Do not start a specific one "spring.artemis.embedded.enabled=false") - .run(secondContext -> { + .run((secondContext) -> { DestinationChecker firstChecker = new DestinationChecker(first); firstChecker.checkQueue("Queue1", true); DestinationChecker secondChecker = new DestinationChecker( diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java index f4ba5aa8dff..fb59dbf910b 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java @@ -157,7 +157,7 @@ public class MongoReactiveAutoConfigurationTests { @Bean public MongoClientSettingsBuilderCustomizer customizer() { - return clientSettingsBuilder -> clientSettingsBuilder + return (clientSettingsBuilder) -> clientSettingsBuilder .applicationName("overridden-name"); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfigurationTests.java index 73a439fef06..0f1240d7534 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfigurationTests.java @@ -331,7 +331,7 @@ public class QuartzAutoConfigurationTests { @Bean public SchedulerFactoryBeanCustomizer customizer() { - return schedulerFactoryBean -> schedulerFactoryBean + return (schedulerFactoryBean) -> schedulerFactoryBean .setTaskExecutor(yetAnotherExecutor()); } @@ -342,7 +342,7 @@ public class QuartzAutoConfigurationTests { @Bean public SchedulerFactoryBeanCustomizer customizer() { - return schedulerFactoryBean -> schedulerFactoryBean + return (schedulerFactoryBean) -> schedulerFactoryBean .setSchedulerName("fooScheduler"); } diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/web/reactive/WebTestClientContextCustomizer.java b/spring-boot-test/src/main/java/org/springframework/boot/test/web/reactive/WebTestClientContextCustomizer.java index 5e3f45b8b1d..081c28acecf 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/web/reactive/WebTestClientContextCustomizer.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/web/reactive/WebTestClientContextCustomizer.java @@ -139,9 +139,9 @@ class WebTestClientContextCustomizer implements ContextCustomizer { .getBeansOfType(CodecCustomizer.class).values(); if (!CollectionUtils.isEmpty(codecCustomizers)) { clientBuilder.exchangeStrategies( - ExchangeStrategies.builder().codecs(codecs -> { - codecCustomizers.forEach( - codecCustomizer -> codecCustomizer.customize(codecs)); + ExchangeStrategies.builder().codecs((codecs) -> { + codecCustomizers.forEach((codecCustomizer) -> codecCustomizer + .customize(codecs)); }).build()); } } diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/context/AbstractApplicationContextTesterTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/context/AbstractApplicationContextTesterTests.java index 8b49573434a..5463d2b304d 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/context/AbstractApplicationContextTesterTests.java +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/context/AbstractApplicationContextTesterTests.java @@ -51,7 +51,7 @@ public abstract class AbstractApplicationContextTesterTests { + get().withSystemProperties(key + "=value").run((loaded) -> { assertThat(System.getProperties()).containsEntry(key, "value"); }); assertThat(System.getProperties().containsKey(key)).isFalse(); @@ -63,7 +63,7 @@ public abstract class AbstractApplicationContextTesterTests { + .withUserConfiguration(FailingConfig.class).run((loaded) -> { assertThat(loaded).hasFailed(); }); assertThat(System.getProperties().containsKey(key)).isFalse(); @@ -76,7 +76,7 @@ public abstract class AbstractApplicationContextTesterTests { + get().withSystemProperties(key + "=newValue").run((loaded) -> { assertThat(System.getProperties()).containsEntry(key, "newValue"); }); assertThat(System.getProperties().getProperty(key)).isEqualTo("value"); @@ -93,7 +93,7 @@ public abstract class AbstractApplicationContextTesterTests { + get().withSystemProperty(key, null).run((loaded) -> { assertThat(System.getProperties()).doesNotContainKey(key); }); assertThat(System.getProperties().getProperty(key)).isEqualTo("value"); @@ -106,7 +106,7 @@ public abstract class AbstractApplicationContextTesterTests { + .run((loaded) -> { Environment environment = loaded.getEnvironment(); assertThat(environment.getProperty("test.foo")).isEqualTo("1"); assertThat(environment.getProperty("test.bar")).isEqualTo("2"); @@ -117,7 +117,7 @@ public abstract class AbstractApplicationContextTesterTests { + .run((loaded) -> { Environment environment = loaded.getEnvironment(); assertThat(environment.getProperty("test.foo")).isEqualTo("2"); }); diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/dsl/SpringBootExtension.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/dsl/SpringBootExtension.java index bfcfb1e6893..ce2d31e8a46 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/dsl/SpringBootExtension.java +++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/dsl/SpringBootExtension.java @@ -19,16 +19,17 @@ package org.springframework.boot.gradle.dsl; import java.io.File; import java.util.concurrent.Callable; -import org.gradle.api.Action; +import javax.swing.Action; + import org.gradle.api.Project; import org.gradle.api.plugins.BasePlugin; import org.gradle.api.plugins.JavaPlugin; import org.gradle.api.plugins.JavaPluginConvention; import org.gradle.api.tasks.SourceSet; -import org.gradle.api.tasks.bundling.Jar; import org.springframework.boot.gradle.tasks.buildinfo.BuildInfo; import org.springframework.boot.gradle.tasks.buildinfo.BuildInfoProperties; +import org.springframework.boot.loader.tools.Layouts.Jar; /** * Entry point to Spring Boot's Gradle DSL. @@ -78,10 +79,10 @@ public class SpringBootExtension { BuildInfo.class); bootBuildInfo.setGroup(BasePlugin.BUILD_GROUP); bootBuildInfo.setDescription("Generates a META-INF/build-info.properties file."); - this.project.getPlugins().withType(JavaPlugin.class, plugin -> { + this.project.getPlugins().withType(JavaPlugin.class, (plugin) -> { this.project.getTasks().getByName(JavaPlugin.CLASSES_TASK_NAME) .dependsOn(bootBuildInfo); - this.project.afterEvaluate(evaluated -> { + this.project.afterEvaluate((evaluated) -> { BuildInfoProperties properties = bootBuildInfo.getProperties(); if (properties.getArtifact() == null) { properties.setArtifact(determineArtifactBaseName()); diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/ApplicationPluginAction.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/ApplicationPluginAction.java index 547eb516173..2594527343f 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/ApplicationPluginAction.java +++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/ApplicationPluginAction.java @@ -23,7 +23,6 @@ import java.io.StringWriter; import java.util.concurrent.Callable; import org.gradle.api.GradleException; -import org.gradle.api.Plugin; import org.gradle.api.Project; import org.gradle.api.distribution.Distribution; import org.gradle.api.distribution.DistributionContainer; @@ -59,7 +58,7 @@ final class ApplicationPluginAction implements PluginApplicationAction { ((TemplateBasedScriptGenerator) bootStartScripts.getWindowsStartScriptGenerator()) .setTemplate(project.getResources().getText() .fromString(loadResource("/windowsStartScript.txt"))); - project.getConfigurations().all(configuration -> { + project.getConfigurations().all((configuration) -> { if ("bootArchives".equals(configuration.getName())) { distribution.getContents() .with(project.copySpec().into("lib") diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/DependencyManagementPluginAction.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/DependencyManagementPluginAction.java index acd7e5ed7a8..a9d677ccbef 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/DependencyManagementPluginAction.java +++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/DependencyManagementPluginAction.java @@ -18,8 +18,6 @@ package org.springframework.boot.gradle.plugin; import io.spring.gradle.dependencymanagement.DependencyManagementPlugin; import io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension; -import org.gradle.api.Action; -import org.gradle.api.Plugin; import org.gradle.api.Project; /** @@ -39,7 +37,7 @@ final class DependencyManagementPluginAction implements PluginApplicationAction @Override public void execute(Project project) { project.getExtensions().findByType(DependencyManagementExtension.class) - .imports(importsHandler -> importsHandler.mavenBom(SPRING_BOOT_BOM)); + .imports((importsHandler) -> importsHandler.mavenBom(SPRING_BOOT_BOM)); } @Override diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/JavaPluginAction.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/JavaPluginAction.java index 7f08789c47c..b00caf8190a 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/JavaPluginAction.java +++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/JavaPluginAction.java @@ -19,8 +19,6 @@ package org.springframework.boot.gradle.plugin; import java.util.Collections; import java.util.concurrent.Callable; -import org.gradle.api.Action; -import org.gradle.api.Plugin; import org.gradle.api.Project; import org.gradle.api.file.FileCollection; import org.gradle.api.internal.artifacts.publish.ArchivePublishArtifact; @@ -113,8 +111,8 @@ final class JavaPluginAction implements PluginApplicationAction { } private void configureUtf8Encoding(Project project) { - project.afterEvaluate( - evaluated -> evaluated.getTasks().withType(JavaCompile.class, compile -> { + project.afterEvaluate(evaluated -> evaluated.getTasks() + .withType(JavaCompile.class, (compile) -> { if (compile.getOptions().getEncoding() == null) { compile.getOptions().setEncoding("UTF-8"); } diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/MavenPluginAction.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/MavenPluginAction.java index 644ce661ef9..9f69d63e10a 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/MavenPluginAction.java +++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/MavenPluginAction.java @@ -16,8 +16,6 @@ package org.springframework.boot.gradle.plugin; -import org.gradle.api.Action; -import org.gradle.api.Plugin; import org.gradle.api.Project; import org.gradle.api.artifacts.maven.MavenResolver; import org.gradle.api.plugins.MavenPlugin; @@ -43,16 +41,16 @@ final class MavenPluginAction implements PluginApplicationAction { @Override public void execute(Project project) { - project.getTasks().withType(Upload.class, upload -> { + project.getTasks().withType(Upload.class, (upload) -> { if (this.uploadTaskName.equals(upload.getName())) { - project.afterEvaluate(evaluated -> clearConfigurationMappings(upload)); + project.afterEvaluate((evaluated) -> clearConfigurationMappings(upload)); } }); } private void clearConfigurationMappings(Upload upload) { upload.getRepositories().withType(MavenResolver.class, - resolver -> resolver.getPom().getScopeMappings().getMappings().clear()); + (resolver) -> resolver.getPom().getScopeMappings().getMappings().clear()); } } diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootPlugin.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootPlugin.java index f96e09edc2c..82016cd0e31 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootPlugin.java +++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootPlugin.java @@ -19,10 +19,9 @@ package org.springframework.boot.gradle.plugin; import java.util.Arrays; import java.util.List; +import net.bytebuddy.build.Plugin; import org.gradle.api.GradleException; -import org.gradle.api.Plugin; import org.gradle.api.Project; -import org.gradle.api.artifacts.Configuration; import org.gradle.util.GradleVersion; import org.springframework.boot.gradle.dsl.SpringBootExtension; @@ -96,19 +95,19 @@ public class SpringBootPlugin implements Plugin { new DependencyManagementPluginAction(), new ApplicationPluginAction()); for (PluginApplicationAction action : actions) { project.getPlugins().withType(action.getPluginClass(), - plugin -> action.execute(project)); + (plugin) -> action.execute(project)); } } private void unregisterUnresolvedDependenciesAnalyzer(Project project) { UnresolvedDependenciesAnalyzer unresolvedDependenciesAnalyzer = new UnresolvedDependenciesAnalyzer(); - project.getConfigurations().all(configuration -> configuration.getIncoming() - .afterResolve(resolvableDependencies -> unresolvedDependenciesAnalyzer + project.getConfigurations().all((configuration) -> configuration.getIncoming() + .afterResolve((resolvableDependencies) -> unresolvedDependenciesAnalyzer .analyze(configuration.getResolvedConfiguration() .getLenientConfiguration() .getUnresolvedModuleDependencies()))); project.getGradle().buildFinished( - buildResult -> unresolvedDependenciesAnalyzer.buildFinished(project)); + (buildResult) -> unresolvedDependenciesAnalyzer.buildFinished(project)); } } diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/UnresolvedDependenciesAnalyzer.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/UnresolvedDependenciesAnalyzer.java index b56ab5cea0a..e6a789a3fd2 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/UnresolvedDependenciesAnalyzer.java +++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/UnresolvedDependenciesAnalyzer.java @@ -42,7 +42,7 @@ class UnresolvedDependenciesAnalyzer { void analyze(Set unresolvedDependencies) { this.dependenciesWithNoVersion = unresolvedDependencies.stream() - .map(unresolvedDependency -> unresolvedDependency.getSelector()) + .map((unresolvedDependency) -> unresolvedDependency.getSelector()) .filter(this::hasNoVersion).collect(Collectors.toSet()); } @@ -53,7 +53,7 @@ class UnresolvedDependenciesAnalyzer { message.append("\nDuring the build, one or more dependencies that were " + "declared without a version failed to resolve:\n"); this.dependenciesWithNoVersion.stream() - .forEach(dependency -> message.append(" " + dependency + "\n")); + .forEach((dependency) -> message.append(" " + dependency + "\n")); message.append("\nDid you forget to apply the " + "io.spring.dependency-management plugin to the " + project.getName() + " project?\n"); diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootArchiveSupport.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootArchiveSupport.java index a4951136446..364072bfb5c 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootArchiveSupport.java +++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootArchiveSupport.java @@ -23,18 +23,19 @@ import java.util.Set; import java.util.TreeMap; import java.util.function.Function; +import javax.swing.text.DefaultEditorKit.CopyAction; + +import io.spring.gradle.dependencymanagement.org.apache.maven.model.PatternSet; import org.gradle.api.file.FileCopyDetails; import org.gradle.api.file.FileTreeElement; import org.gradle.api.file.RelativePath; -import org.gradle.api.internal.file.copy.CopyAction; import org.gradle.api.internal.file.copy.CopyActionProcessingStream; import org.gradle.api.internal.file.copy.FileCopyDetailsInternal; -import org.gradle.api.java.archives.Attributes; import org.gradle.api.specs.Spec; import org.gradle.api.specs.Specs; import org.gradle.api.tasks.WorkResult; -import org.gradle.api.tasks.bundling.Jar; -import org.gradle.api.tasks.util.PatternSet; + +import org.springframework.boot.loader.tools.Layouts.Jar; /** * Support class for implementations of {@link BootArchive}. @@ -138,10 +139,10 @@ class BootArchiveSupport { @Override public WorkResult execute(CopyActionProcessingStream stream) { - return this.delegate.execute(action -> { + return this.delegate.execute((action) -> { Map detailsByPath = new TreeMap<>(); - stream.process( - details -> detailsByPath.put(details.getRelativePath(), details)); + stream.process((details) -> detailsByPath.put(details.getRelativePath(), + details)); detailsByPath.values().stream().forEach(action::processFile); }); } diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java index 74befe9eb67..bd979175b74 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java +++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootJar.java @@ -20,14 +20,16 @@ import java.io.File; import java.util.Collections; import java.util.concurrent.Callable; -import org.gradle.api.Action; +import javax.swing.Action; +import javax.swing.text.DefaultEditorKit.CopyAction; + import org.gradle.api.file.CopySpec; import org.gradle.api.file.FileCollection; import org.gradle.api.file.FileCopyDetails; import org.gradle.api.file.FileTreeElement; -import org.gradle.api.internal.file.copy.CopyAction; import org.gradle.api.specs.Spec; -import org.gradle.api.tasks.bundling.Jar; + +import org.springframework.boot.loader.tools.Layouts.Jar; /** * A custom {@link Jar} task that produces a Spring Boot executable jar. @@ -55,7 +57,7 @@ public class BootJar extends Jar implements BootArchive { } private Action classpathFiles(Spec filter) { - return copySpec -> copySpec + return (copySpec) -> copySpec .from((Callable>) () -> this.classpath == null ? Collections.emptyList() : this.classpath.filter(filter)); diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootWar.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootWar.java index 3b704135db3..500fc11300e 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootWar.java +++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootWar.java @@ -20,15 +20,17 @@ import java.io.File; import java.util.Collections; import java.util.concurrent.Callable; -import org.gradle.api.Action; +import javax.swing.Action; +import javax.swing.text.DefaultEditorKit.CopyAction; + import org.gradle.api.Project; import org.gradle.api.file.FileCollection; import org.gradle.api.file.FileCopyDetails; import org.gradle.api.file.FileTreeElement; -import org.gradle.api.internal.file.copy.CopyAction; import org.gradle.api.specs.Spec; import org.gradle.api.tasks.Optional; -import org.gradle.api.tasks.bundling.War; + +import org.springframework.boot.loader.tools.Layouts.War; /** * A custom {@link War} task that produces a Spring Boot executable war. @@ -50,7 +52,7 @@ public class BootWar extends War implements BootArchive { */ public BootWar() { getWebInf().into("lib-provided", - copySpec -> copySpec + (copySpec) -> copySpec .from((Callable>) () -> this.providedClasspath == null ? Collections.emptyList() : this.providedClasspath)); } diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/run/BootRun.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/run/BootRun.java index 07a463ae7ff..1b76bc34a01 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/run/BootRun.java +++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/run/BootRun.java @@ -40,7 +40,7 @@ public class BootRun extends JavaExec { public void sourceResources(SourceSet sourceSet) { setClasspath(getProject() .files(sourceSet.getResources().getSrcDirs(), getClasspath()) - .filter(file -> !file.equals(sourceSet.getOutput().getResourcesDir()))); + .filter((file) -> !file.equals(sourceSet.getOutput().getResourcesDir()))); } @Override diff --git a/spring-boot/src/main/java/org/springframework/boot/context/annotation/Configurations.java b/spring-boot/src/main/java/org/springframework/boot/context/annotation/Configurations.java index 8626c2733cb..07a89632170 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/annotation/Configurations.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/annotation/Configurations.java @@ -55,7 +55,7 @@ import org.springframework.util.Assert; public abstract class Configurations { private static final Comparator COMPARATOR = OrderComparator.INSTANCE - .thenComparing(o -> o.getClass().getName()); + .thenComparing((other) -> other.getClass().getName()); private Set> classes; @@ -117,7 +117,7 @@ public abstract class Configurations { List orderedConfigurations = new ArrayList<>(configurations); orderedConfigurations.sort(COMPARATOR); List collated = collate(orderedConfigurations); - return collated.stream().flatMap(c -> c.getClasses().stream()) + return collated.stream().flatMap((c) -> c.getClasses().stream()) .collect(Collectors.toCollection(LinkedHashSet::new)) .toArray(new Class[0]); } diff --git a/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/NettyWebServer.java b/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/NettyWebServer.java index 6ad516eee43..511ed67cc71 100644 --- a/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/NettyWebServer.java +++ b/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/NettyWebServer.java @@ -109,7 +109,7 @@ public class NettyWebServer implements WebServer { this.nettyContext.shutdown(); // temporary fix for gh-9146 this.nettyContext.getContext().onClose() - .doOnSuccess(aVoid -> HttpResources.reset()).block(); + .doOnSuccess((o) -> HttpResources.reset()).block(); this.nettyContext = null; } } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/handler/NoUnboundElementsBindHandlerTests.java b/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/handler/NoUnboundElementsBindHandlerTests.java index 9281fe4d1ed..60832690e89 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/handler/NoUnboundElementsBindHandlerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/handler/NoUnboundElementsBindHandlerTests.java @@ -112,9 +112,10 @@ public class NoUnboundElementsBindHandlerTests { source.put("example.other", "baz"); this.sources.add(source); this.binder = new Binder(this.sources); - NoUnboundElementsBindHandler handler = new NoUnboundElementsBindHandler(BindHandler.DEFAULT, (configurationPropertySource -> false)); - Example bound = this.binder.bind("example", Bindable.of(Example.class), - handler).get(); + NoUnboundElementsBindHandler handler = new NoUnboundElementsBindHandler( + BindHandler.DEFAULT, ((configurationPropertySource) -> false)); + Example bound = this.binder.bind("example", Bindable.of(Example.class), handler) + .get(); assertThat(bound.getFoo()).isEqualTo("bar"); } diff --git a/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java index 712b02778d3..07fd2f1c0fb 100644 --- a/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java @@ -78,7 +78,7 @@ public abstract class AbstractReactiveWebServerFactoryTests { Mono result = getWebClient().post().uri("/test") .contentType(MediaType.TEXT_PLAIN) .body(BodyInserters.fromObject("Hello World")).exchange() - .flatMap(response -> response.bodyToMono(String.class)); + .flatMap((response) -> response.bodyToMono(String.class)); assertThat(result.block()).isEqualTo("Hello World"); this.webServer.stop(); Mono response = getWebClient().post().uri("/test") @@ -97,7 +97,7 @@ public abstract class AbstractReactiveWebServerFactoryTests { Mono result = WebClient.create("http://localhost:" + specificPort).post() .uri("/test").contentType(MediaType.TEXT_PLAIN) .body(BodyInserters.fromObject("Hello World")).exchange() - .flatMap(response -> response.bodyToMono(String.class)); + .flatMap((response) -> response.bodyToMono(String.class)); assertThat(result.block()).isEqualTo("Hello World"); assertThat(this.webServer.getPort()).isEqualTo(specificPort); }