Reformat code following spring-javaformat upgrade

Author: philwebb

buildSrc/src/main/java/org/springframework/boot/build/AsciidoctorConventions.java

@@ -72,8 +72,9 @@ void apply(Project project) {
 			makeAllWarningsFatal(project);
 			upgradeAsciidoctorJVersion(project);
 			createAsciidoctorExtensionsConfiguration(project);
-			project.getTasks().withType(AbstractAsciidoctorTask.class,
-					(asciidoctorTask) -> configureAsciidoctorTask(project, asciidoctorTask));
+			project.getTasks()
+				.withType(AbstractAsciidoctorTask.class,
+						(asciidoctorTask) -> configureAsciidoctorTask(project, asciidoctorTask));
 		});
 	}
 
@@ -87,12 +88,14 @@ private void upgradeAsciidoctorJVersion(Project project) {
 
 	private void createAsciidoctorExtensionsConfiguration(Project project) {
 		project.getConfigurations().create(EXTENSIONS_CONFIGURATION_NAME, (configuration) -> {
-			project.getConfigurations().matching((candidate) -> "dependencyManagement".equals(candidate.getName()))
-					.all(configuration::extendsFrom);
-			configuration.getDependencies().add(project.getDependencies()
+			project.getConfigurations()
+				.matching((candidate) -> "dependencyManagement".equals(candidate.getName()))
+				.all(configuration::extendsFrom);
+			configuration.getDependencies()
+				.add(project.getDependencies()
 					.create("io.spring.asciidoctor.backends:spring-asciidoctor-backends:0.0.4"));
 			configuration.getDependencies()
-					.add(project.getDependencies().create("org.asciidoctor:asciidoctorj-pdf:1.5.3"));
+				.add(project.getDependencies().create("org.asciidoctor:asciidoctorj-pdf:1.5.3"));
 		});
 	}
 
@@ -140,13 +143,15 @@ private void configureOptions(AbstractAsciidoctorTask asciidoctorTask) {
 
 	private Sync createSyncDocumentationSourceTask(Project project, AbstractAsciidoctorTask asciidoctorTask) {
 		Sync syncDocumentationSource = project.getTasks()
-				.create("syncDocumentationSourceFor" + StringUtils.capitalize(asciidoctorTask.getName()), Sync.class);
+			.create("syncDocumentationSourceFor" + StringUtils.capitalize(asciidoctorTask.getName()), Sync.class);
 		File syncedSource = new File(project.getBuildDir(), "docs/src/" + asciidoctorTask.getName());
 		syncDocumentationSource.setDestinationDir(syncedSource);
 		syncDocumentationSource.from("src/docs/");
 		asciidoctorTask.dependsOn(syncDocumentationSource);
-		asciidoctorTask.getInputs().dir(syncedSource).withPathSensitivity(PathSensitivity.RELATIVE)
-				.withPropertyName("synced source");
+		asciidoctorTask.getInputs()
+			.dir(syncedSource)
+			.withPathSensitivity(PathSensitivity.RELATIVE)
+			.withPropertyName("synced source");
 		asciidoctorTask.setSourceDir(project.relativePath(new File(syncedSource, "asciidoc/")));
 		return syncDocumentationSource;
 	}

buildSrc/src/main/java/org/springframework/boot/build/DeployedPlugin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2023 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.
@@ -46,12 +46,16 @@ public void apply(Project project) {
 		MavenPublication mavenPublication = publishing.getPublications().create("maven", MavenPublication.class);
 		project.afterEvaluate((evaluated) -> project.getPlugins().withType(JavaPlugin.class).all((javaPlugin) -> {
 			if (((Jar) project.getTasks().getByName(JavaPlugin.JAR_TASK_NAME)).isEnabled()) {
-				project.getComponents().matching((component) -> component.getName().equals("java"))
-						.all(mavenPublication::from);
+				project.getComponents()
+					.matching((component) -> component.getName().equals("java"))
+					.all(mavenPublication::from);
 			}
 		}));
-		project.getPlugins().withType(JavaPlatformPlugin.class).all((javaPlugin) -> project.getComponents()
-				.matching((component) -> component.getName().equals("javaPlatform")).all(mavenPublication::from));
+		project.getPlugins()
+			.withType(JavaPlatformPlugin.class)
+			.all((javaPlugin) -> project.getComponents()
+				.matching((component) -> component.getName().equals("javaPlatform"))
+				.all(mavenPublication::from));
 	}
 
 }

buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java

@@ -120,16 +120,18 @@ void apply(Project project) {
 	}
 
 	private void configureJarManifestConventions(Project project) {
-		ExtractResources extractLegalResources = project.getTasks().create("extractLegalResources",
-				ExtractResources.class);
+		ExtractResources extractLegalResources = project.getTasks()
+			.create("extractLegalResources", ExtractResources.class);
 		extractLegalResources.getDestinationDirectory().set(project.getLayout().getBuildDirectory().dir("legal"));
 		extractLegalResources.setResourcesNames(Arrays.asList("LICENSE.txt", "NOTICE.txt"));
 		extractLegalResources.property("version", project.getVersion().toString());
 		SourceSetContainer sourceSets = project.getExtensions().getByType(SourceSetContainer.class);
-		Set<String> sourceJarTaskNames = sourceSets.stream().map(SourceSet::getSourcesJarTaskName)
-				.collect(Collectors.toSet());
-		Set<String> javadocJarTaskNames = sourceSets.stream().map(SourceSet::getJavadocJarTaskName)
-				.collect(Collectors.toSet());
+		Set<String> sourceJarTaskNames = sourceSets.stream()
+			.map(SourceSet::getSourcesJarTaskName)
+			.collect(Collectors.toSet());
+		Set<String> javadocJarTaskNames = sourceSets.stream()
+			.map(SourceSet::getJavadocJarTaskName)
+			.collect(Collectors.toSet());
 		project.getTasks().withType(Jar.class, (jar) -> project.afterEvaluate((evaluated) -> {
 			jar.metaInf((metaInf) -> metaInf.from(extractLegalResources));
 			jar.manifest((manifest) -> {
@@ -166,7 +168,8 @@ private void configureTestConventions(Project project) {
 			testRetry.getFailOnPassedAfterRetry().set(true);
 			testRetry.getMaxRetries().set(isCi() ? 3 : 0);
 		});
-		project.getPlugins().withType(JavaPlugin.class, (javaPlugin) -> project.getDependencies()
+		project.getPlugins()
+			.withType(JavaPlugin.class, (javaPlugin) -> project.getDependencies()
 				.add(JavaPlugin.TEST_RUNTIME_ONLY_CONFIGURATION_NAME, "org.junit.platform:junit-platform-launcher"));
 	}
 
@@ -214,7 +217,7 @@ private void configureSpringJavaFormat(Project project) {
 		String version = SpringJavaFormatPlugin.class.getPackage().getImplementationVersion();
 		DependencySet checkstyleDependencies = project.getConfigurations().getByName("checkstyle").getDependencies();
 		checkstyleDependencies
-				.add(project.getDependencies().create("io.spring.javaformat:spring-javaformat-checkstyle:" + version));
+			.add(project.getDependencies().create("io.spring.javaformat:spring-javaformat-checkstyle:" + version));
 	}
 
 	private void configureDependencyManagement(Project project) {
@@ -225,16 +228,19 @@ private void configureDependencyManagement(Project project) {
 			configuration.setCanBeResolved(false);
 		});
 		configurations
-				.matching((configuration) -> configuration.getName().endsWith("Classpath")
-						|| JavaPlugin.ANNOTATION_PROCESSOR_CONFIGURATION_NAME.equals(configuration.getName()))
-				.all((configuration) -> configuration.extendsFrom(dependencyManagement));
+			.matching((configuration) -> configuration.getName().endsWith("Classpath")
+					|| JavaPlugin.ANNOTATION_PROCESSOR_CONFIGURATION_NAME.equals(configuration.getName()))
+			.all((configuration) -> configuration.extendsFrom(dependencyManagement));
 		String path = project.getName().contains("spring-boot-starter")
 				? ":spring-boot-project:spring-boot-dependencies" : ":spring-boot-project:spring-boot-parent";
 		Dependency dependency = project.getDependencies()
-				.enforcedPlatform(project.getDependencies().project(Collections.singletonMap("path", path)));
+			.enforcedPlatform(project.getDependencies().project(Collections.singletonMap("path", path)));
 		dependencyManagement.getDependencies().add(dependency);
-		project.getPlugins().withType(OptionalDependenciesPlugin.class, (optionalDependencies) -> configurations
-				.getByName(OptionalDependenciesPlugin.OPTIONAL_CONFIGURATION_NAME).extendsFrom(dependencyManagement));
+		project.getPlugins()
+			.withType(OptionalDependenciesPlugin.class,
+					(optionalDependencies) -> configurations
+						.getByName(OptionalDependenciesPlugin.OPTIONAL_CONFIGURATION_NAME)
+						.extendsFrom(dependencyManagement));
 	}
 
 	private void configureToolchain(Project project) {
@@ -256,9 +262,9 @@ private void createProhibitedDependenciesChecks(Project project, String... confi
 	}
 
 	private void createProhibitedDependenciesCheck(Configuration classpath, Project project) {
-		CheckClasspathForProhibitedDependencies checkClasspathForProhibitedDependencies = project.getTasks().create(
-				"check" + StringUtils.capitalize(classpath.getName() + "ForProhibitedDependencies"),
-				CheckClasspathForProhibitedDependencies.class);
+		CheckClasspathForProhibitedDependencies checkClasspathForProhibitedDependencies = project.getTasks()
+			.create("check" + StringUtils.capitalize(classpath.getName() + "ForProhibitedDependencies"),
+					CheckClasspathForProhibitedDependencies.class);
 		checkClasspathForProhibitedDependencies.setClasspath(classpath);
 		project.getTasks().getByName(JavaBasePlugin.CHECK_TASK_NAME).dependsOn(checkClasspathForProhibitedDependencies);
 	}

buildSrc/src/main/java/org/springframework/boot/build/KotlinConventions.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2023 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.
@@ -44,8 +44,9 @@
 class KotlinConventions {
 
 	void apply(Project project) {
-		project.getPlugins().withId("org.jetbrains.kotlin.jvm",
-				(plugin) -> project.getTasks().withType(KotlinCompile.class, this::configure));
+		project.getPlugins()
+			.withId("org.jetbrains.kotlin.jvm",
+					(plugin) -> project.getTasks().withType(KotlinCompile.class, this::configure));
 	}
 
 	private void configure(KotlinCompile compile) {

buildSrc/src/main/java/org/springframework/boot/build/MavenPublishingConventions.java

@@ -67,8 +67,9 @@ void apply(Project project) {
 					mavenRepository.setName("deployment");
 				});
 			}
-			publishing.getPublications().withType(MavenPublication.class)
-					.all((mavenPublication) -> customizeMavenPublication(mavenPublication, project));
+			publishing.getPublications()
+				.withType(MavenPublication.class)
+				.all((mavenPublication) -> customizeMavenPublication(mavenPublication, project));
 			project.getPlugins().withType(JavaPlugin.class).all((javaPlugin) -> {
 				JavaPluginExtension extension = project.getExtensions().getByType(JavaPluginExtension.class);
 				extension.withJavadocJar();
@@ -79,8 +80,9 @@ void apply(Project project) {
 
 	private void customizeMavenPublication(MavenPublication publication, Project project) {
 		customizePom(publication.getPom(), project);
-		project.getPlugins().withType(JavaPlugin.class)
-				.all((javaPlugin) -> customizeJavaMavenPublication(publication, project));
+		project.getPlugins()
+			.withType(JavaPlugin.class)
+			.all((javaPlugin) -> customizeJavaMavenPublication(publication, project));
 		suppressMavenOptionalFeatureWarnings(publication);
 	}
 
@@ -102,7 +104,7 @@ private void customizePom(MavenPom pom, Project project) {
 	private void customizeJavaMavenPublication(MavenPublication publication, Project project) {
 		addMavenOptionalFeature(project);
 		publication.versionMapping((strategy) -> strategy.usage(Usage.JAVA_API, (mappingStrategy) -> mappingStrategy
-				.fromResolutionOf(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME)));
+			.fromResolutionOf(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME)));
 		publication.versionMapping(
 				(strategy) -> strategy.usage(Usage.JAVA_RUNTIME, VariantVersionMappingStrategy::fromResolutionResult));
 	}
@@ -117,7 +119,7 @@ private void addMavenOptionalFeature(Project project) {
 		extension.registerFeature("mavenOptional",
 				(feature) -> feature.usingSourceSet(extension.getSourceSets().getByName("main")));
 		AdhocComponentWithVariants javaComponent = (AdhocComponentWithVariants) project.getComponents()
-				.findByName("java");
+			.findByName("java");
 		javaComponent.addVariantsFromConfiguration(
 				project.getConfigurations().findByName("mavenOptionalRuntimeElements"),
 				ConfigurationVariantDetails::mapToOptional);

buildSrc/src/main/java/org/springframework/boot/build/MavenRepositoryPlugin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2023 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.
@@ -61,36 +61,45 @@ public void apply(Project project) {
 			mavenRepository.setName("project");
 			mavenRepository.setUrl(repositoryLocation.toURI());
 		});
-		project.getTasks().matching((task) -> task.getName().equals(PUBLISH_TO_PROJECT_REPOSITORY_TASK_NAME))
-				.all((task) -> setUpProjectRepository(project, task, repositoryLocation));
-		project.getTasks().matching((task) -> task.getName().equals("publishPluginMavenPublicationToProjectRepository"))
-				.all((task) -> setUpProjectRepository(project, task, repositoryLocation));
+		project.getTasks()
+			.matching((task) -> task.getName().equals(PUBLISH_TO_PROJECT_REPOSITORY_TASK_NAME))
+			.all((task) -> setUpProjectRepository(project, task, repositoryLocation));
+		project.getTasks()
+			.matching((task) -> task.getName().equals("publishPluginMavenPublicationToProjectRepository"))
+			.all((task) -> setUpProjectRepository(project, task, repositoryLocation));
 	}
 
 	private void setUpProjectRepository(Project project, Task publishTask, File repositoryLocation) {
 		publishTask.doFirst(new CleanAction(repositoryLocation));
 		Configuration projectRepository = project.getConfigurations().create(MAVEN_REPOSITORY_CONFIGURATION_NAME);
-		project.getArtifacts().add(projectRepository.getName(), repositoryLocation,
-				(artifact) -> artifact.builtBy(publishTask));
+		project.getArtifacts()
+			.add(projectRepository.getName(), repositoryLocation, (artifact) -> artifact.builtBy(publishTask));
 		DependencySet target = projectRepository.getDependencies();
-		project.getPlugins().withType(JavaPlugin.class).all((javaPlugin) -> addMavenRepositoryDependencies(project,
-				JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME, target));
-		project.getPlugins().withType(JavaLibraryPlugin.class)
-				.all((javaLibraryPlugin) -> addMavenRepositoryDependencies(project, JavaPlugin.API_CONFIGURATION_NAME,
-						target));
-		project.getPlugins().withType(JavaPlatformPlugin.class)
-				.all((javaPlugin) -> addMavenRepositoryDependencies(project, JavaPlatformPlugin.API_CONFIGURATION_NAME,
-						target));
+		project.getPlugins()
+			.withType(JavaPlugin.class)
+			.all((javaPlugin) -> addMavenRepositoryDependencies(project, JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME,
+					target));
+		project.getPlugins()
+			.withType(JavaLibraryPlugin.class)
+			.all((javaLibraryPlugin) -> addMavenRepositoryDependencies(project, JavaPlugin.API_CONFIGURATION_NAME,
+					target));
+		project.getPlugins()
+			.withType(JavaPlatformPlugin.class)
+			.all((javaPlugin) -> addMavenRepositoryDependencies(project, JavaPlatformPlugin.API_CONFIGURATION_NAME,
+					target));
 	}
 
 	private void addMavenRepositoryDependencies(Project project, String sourceConfigurationName, DependencySet target) {
-		project.getConfigurations().getByName(sourceConfigurationName).getDependencies()
-				.withType(ProjectDependency.class).all((dependency) -> {
-					Map<String, String> dependencyDescriptor = new HashMap<>();
-					dependencyDescriptor.put("path", dependency.getDependencyProject().getPath());
-					dependencyDescriptor.put("configuration", MAVEN_REPOSITORY_CONFIGURATION_NAME);
-					target.add(project.getDependencies().project(dependencyDescriptor));
-				});
+		project.getConfigurations()
+			.getByName(sourceConfigurationName)
+			.getDependencies()
+			.withType(ProjectDependency.class)
+			.all((dependency) -> {
+				Map<String, String> dependencyDescriptor = new HashMap<>();
+				dependencyDescriptor.put("path", dependency.getDependencyProject().getPath());
+				dependencyDescriptor.put("configuration", MAVEN_REPOSITORY_CONFIGURATION_NAME);
+				target.add(project.getDependencies().project(dependencyDescriptor));
+			});
 	}
 
 	private static final class CleanAction implements Action<Task> {

buildSrc/src/main/java/org/springframework/boot/build/SyncAppSource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2021 the original author or authors.
+ * Copyright 2021-2023 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.
@@ -44,7 +44,7 @@ public SyncAppSource() {
 		this.sourceDirectory = objects.directoryProperty();
 		this.destinationDirectory = objects.directoryProperty();
 		this.pluginVersion = objects.property(String.class)
-				.convention(getProject().provider(() -> getProject().getVersion().toString()));
+			.convention(getProject().provider(() -> getProject().getVersion().toString()));
 	}
 
 	@TaskAction

buildSrc/src/main/java/org/springframework/boot/build/architecture/ArchitecturePlugin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2023 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.
@@ -46,14 +46,14 @@ private void registerTasks(Project project) {
 		JavaPluginExtension javaPluginExtension = project.getExtensions().getByType(JavaPluginExtension.class);
 		List<TaskProvider<PackageTangleCheck>> packageTangleChecks = new ArrayList<>();
 		for (SourceSet sourceSet : javaPluginExtension.getSourceSets()) {
-			TaskProvider<PackageTangleCheck> checkPackageTangles = project.getTasks().register(
-					"checkForPackageTangles" + StringUtils.capitalize(sourceSet.getName()), PackageTangleCheck.class,
-					(task) -> {
-						task.setClasses(sourceSet.getOutput().getClassesDirs());
-						task.setDescription("Checks the classes of the " + sourceSet.getName()
-								+ " source set for package tangles.");
-						task.setGroup(LifecycleBasePlugin.VERIFICATION_GROUP);
-					});
+			TaskProvider<PackageTangleCheck> checkPackageTangles = project.getTasks()
+				.register("checkForPackageTangles" + StringUtils.capitalize(sourceSet.getName()),
+						PackageTangleCheck.class, (task) -> {
+							task.setClasses(sourceSet.getOutput().getClassesDirs());
+							task.setDescription("Checks the classes of the " + sourceSet.getName()
+									+ " source set for package tangles.");
+							task.setGroup(LifecycleBasePlugin.VERIFICATION_GROUP);
+						});
 			packageTangleChecks.add(checkPackageTangles);
 		}
 		if (!packageTangleChecks.isEmpty()) {

buildSrc/src/main/java/org/springframework/boot/build/architecture/PackageTangleCheck.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2022 the original author or authors.
+ * Copyright 2022-2023 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.
@@ -62,7 +62,7 @@ public PackageTangleCheck() {
 	@TaskAction
 	void checkForPackageTangles() throws IOException {
 		JavaClasses javaClasses = new ClassFileImporter()
-				.importPaths(this.classes.getFiles().stream().map(File::toPath).collect(Collectors.toList()));
+			.importPaths(this.classes.getFiles().stream().map(File::toPath).collect(Collectors.toList()));
 		SliceRule freeOfCycles = SlicesRuleDefinition.slices().matching("(**)").should().beFreeOfCycles();
 		EvaluationResult result = freeOfCycles.evaluate(javaClasses);
 		File outputFile = getOutputDirectory().file("failure-report.txt").get().getAsFile();