Merge branch '2.7.x' into 3.0.x

spring-boot-project/spring-boot-tools/spring-boot-cli/src/intTest/java/org/springframework/boot/cli/infrastructure/CommandLineInvoker.java

@@ -132,9 +132,9 @@ public final class CommandLineInvoker {
 		public Invocation(Process process) {
 			this.process = process;
 			this.streamReaders
-					.add(new Thread(new StreamReadingRunnable(this.process.getErrorStream(), this.err, this.combined)));
+				.add(new Thread(new StreamReadingRunnable(this.process.getErrorStream(), this.err, this.combined)));
 			this.streamReaders
-					.add(new Thread(new StreamReadingRunnable(this.process.getInputStream(), this.out, this.combined)));
+				.add(new Thread(new StreamReadingRunnable(this.process.getInputStream(), this.out, this.combined)));
 			for (Thread streamReader : this.streamReaders) {
 				streamReader.start();
 			}

spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandRunner.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.
@@ -40,7 +40,7 @@ import org.springframework.util.StringUtils;
 public class CommandRunner implements Iterable<Command> {
 
 	private static final Set<CommandException.Option> NO_EXCEPTION_OPTIONS = EnumSet
-			.noneOf(CommandException.Option.class);
+		.noneOf(CommandException.Option.class);
 
 	private final String name;
 

spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/encodepassword/EncodePasswordCommand.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.
@@ -70,8 +70,8 @@ public class EncodePasswordCommand extends OptionParsingCommand {
 	@Override
 	public Collection<HelpExample> getExamples() {
 		List<HelpExample> examples = new ArrayList<>();
-		examples.add(
-				new HelpExample("To encode a password with the default encoder", "spring encodepassword mypassword"));
+		examples
+			.add(new HelpExample("To encode a password with the default encoder", "spring encodepassword mypassword"));
 		examples.add(new HelpExample("To encode a password with pbkdf2", "spring encodepassword -a pbkdf2 mypassword"));
 		return examples;
 	}
@@ -83,7 +83,7 @@ public class EncodePasswordCommand extends OptionParsingCommand {
 		@Override
 		protected void options() {
 			this.algorithm = option(Arrays.asList("algorithm", "a"), "The algorithm to use").withRequiredArg()
-					.defaultsTo("default");
+				.defaultsTo("default");
 		}
 
 		@Override

spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitCommand.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.
@@ -139,7 +139,7 @@ public class InitCommand extends OptionParsingCommand {
 		@Override
 		protected void options() {
 			this.target = option(Arrays.asList("target"), "URL of the service to use").withRequiredArg()
-					.defaultsTo(ProjectGenerationRequest.DEFAULT_SERVICE_URL);
+				.defaultsTo(ProjectGenerationRequest.DEFAULT_SERVICE_URL);
 			this.listCapabilities = option(Arrays.asList("list"),
 					"List the capabilities of the service. Use it to discover the "
 							+ "dependencies and the types that are available");
@@ -149,33 +149,37 @@ public class InitCommand extends OptionParsingCommand {
 
 		private void projectGenerationOptions() {
 			this.groupId = option(Arrays.asList("group-id", "g"), "Project coordinates (for example 'org.test')")
-					.withRequiredArg();
+				.withRequiredArg();
 			this.artifactId = option(Arrays.asList("artifact-id", "a"),
-					"Project coordinates; infer archive name (for example 'test')").withRequiredArg();
+					"Project coordinates; infer archive name (for example 'test')")
+				.withRequiredArg();
 			this.version = option(Arrays.asList("version", "v"), "Project version (for example '0.0.1-SNAPSHOT')")
-					.withRequiredArg();
+				.withRequiredArg();
 			this.name = option(Arrays.asList("name", "n"), "Project name; infer application name").withRequiredArg();
 			this.description = option("description", "Project description").withRequiredArg();
 			this.packageName = option(Arrays.asList("package-name"), "Package name").withRequiredArg();
 			this.type = option(Arrays.asList("type", "t"),
 					"Project type. Not normally needed if you use --build "
 							+ "and/or --format. Check the capabilities of the service (--list) for more details")
-									.withRequiredArg();
+				.withRequiredArg();
 			this.packaging = option(Arrays.asList("packaging", "p"), "Project packaging (for example 'jar')")
-					.withRequiredArg();
+				.withRequiredArg();
 			this.build = option("build", "Build system to use (for example 'maven' or 'gradle')").withRequiredArg()
-					.defaultsTo("maven");
+				.defaultsTo("maven");
 			this.format = option("format", "Format of the generated content (for example 'build' for a build file, "
-					+ "'project' for a project archive)").withRequiredArg().defaultsTo("project");
+					+ "'project' for a project archive)")
+				.withRequiredArg()
+				.defaultsTo("project");
 			this.javaVersion = option(Arrays.asList("java-version", "j"), "Language level (for example '1.8')")
-					.withRequiredArg();
+				.withRequiredArg();
 			this.language = option(Arrays.asList("language", "l"), "Programming language  (for example 'java')")
-					.withRequiredArg();
+				.withRequiredArg();
 			this.bootVersion = option(Arrays.asList("boot-version", "b"),
-					"Spring Boot version (for example '1.2.0.RELEASE')").withRequiredArg();
+					"Spring Boot version (for example '1.2.0.RELEASE')")
+				.withRequiredArg();
 			this.dependencies = option(Arrays.asList("dependencies", "d"),
 					"Comma-separated list of dependency identifiers to include in the generated project")
-							.withRequiredArg();
+				.withRequiredArg();
 		}
 
 		private void otherOptions() {

spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionHandler.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.
@@ -152,7 +152,7 @@ public class OptionHandler {
 		@Override
 		public String format(Map<String, ? extends OptionDescriptor> options) {
 			Comparator<OptionDescriptor> comparator = Comparator
-					.comparing((optionDescriptor) -> optionDescriptor.options().iterator().next());
+				.comparing((optionDescriptor) -> optionDescriptor.options().iterator().next());
 			Set<OptionDescriptor> sorted = new TreeSet<>(comparator);
 			sorted.addAll(options.values());
 			for (OptionDescriptor descriptor : sorted) {

spring-boot-project/spring-boot-tools/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/Shell.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.
@@ -114,7 +114,7 @@ public class Shell {
 		this.consoleReader.setBellEnabled(false);
 		this.consoleReader.setExpandEvents(false);
 		this.consoleReader
-				.addCompleter(new CommandCompleter(this.consoleReader, this.argumentDelimiter, this.commandRunner));
+			.addCompleter(new CommandCompleter(this.consoleReader, this.argumentDelimiter, this.commandRunner));
 		this.consoleReader.setCompletionHandler(new CandidateListCompletionHandler());
 	}
 

spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/CommandRunnerTests.java

@@ -160,7 +160,7 @@ class CommandRunnerTests {
 	@Test
 	void exceptionMessages() {
 		assertThat(new NoSuchCommandException("name").getMessage())
-				.isEqualTo("'name' is not a valid command. See 'help'.");
+			.isEqualTo("'name' is not a valid command. See 'help'.");
 	}
 
 	@Test
@@ -172,13 +172,13 @@ class CommandRunnerTests {
 	@Test
 	void helpNoCommand() {
 		assertThatExceptionOfType(NoHelpCommandArgumentsException.class)
-				.isThrownBy(() -> this.commandRunner.run("help"));
+			.isThrownBy(() -> this.commandRunner.run("help"));
 	}
 
 	@Test
 	void helpUnknownCommand() {
 		assertThatExceptionOfType(NoSuchCommandException.class)
-				.isThrownBy(() -> this.commandRunner.run("help", "missing"));
+			.isThrownBy(() -> this.commandRunner.run("help", "missing"));
 	}
 
 	private enum Call {

spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/encodepassword/EncodePasswordCommandTests.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.
@@ -63,7 +63,7 @@ class EncodePasswordCommandTests {
 		then(this.log).should().info(this.message.capture());
 		assertThat(this.message.getValue()).startsWith("{bcrypt}");
 		assertThat(PasswordEncoderFactories.createDelegatingPasswordEncoder().matches("boot", this.message.getValue()))
-				.isTrue();
+			.isTrue();
 		assertThat(status).isEqualTo(ExitStatus.OK);
 	}
 
@@ -84,7 +84,7 @@ class EncodePasswordCommandTests {
 		then(this.log).should().info(this.message.capture());
 		assertThat(this.message.getValue()).doesNotStartWith("{");
 		assertThat(Pbkdf2PasswordEncoder.defaultsForSpringSecurity_v5_8().matches("boot", this.message.getValue()))
-				.isTrue();
+			.isTrue();
 		assertThat(status).isEqualTo(ExitStatus.OK);
 	}
 

spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitializrServiceTests.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.
@@ -77,7 +77,7 @@ class InitializrServiceTests extends AbstractHttpClientMockTests {
 		ProjectGenerationRequest request = new ProjectGenerationRequest();
 		request.getDependencies().add("foo:bar");
 		assertThatExceptionOfType(ReportableException.class).isThrownBy(() -> this.invoker.generate(request))
-				.withMessageContaining(jsonMessage);
+			.withMessageContaining(jsonMessage);
 	}
 
 	@Test
@@ -85,7 +85,7 @@ class InitializrServiceTests extends AbstractHttpClientMockTests {
 		mockProjectGenerationError(400, null);
 		ProjectGenerationRequest request = new ProjectGenerationRequest();
 		assertThatExceptionOfType(ReportableException.class).isThrownBy(() -> this.invoker.generate(request))
-				.withMessageContaining("unexpected 400 error");
+			.withMessageContaining("unexpected 400 error");
 	}
 
 	@Test
@@ -96,7 +96,7 @@ class InitializrServiceTests extends AbstractHttpClientMockTests {
 		given(this.http.execute(isA(HttpGet.class))).willReturn(response);
 		ProjectGenerationRequest request = new ProjectGenerationRequest();
 		assertThatExceptionOfType(ReportableException.class).isThrownBy(() -> this.invoker.generate(request))
-				.withMessageContaining("No content received from server");
+			.withMessageContaining("No content received from server");
 	}
 
 	@Test
@@ -105,7 +105,7 @@ class InitializrServiceTests extends AbstractHttpClientMockTests {
 		mockMetadataGetError(500, jsonMessage);
 		ProjectGenerationRequest request = new ProjectGenerationRequest();
 		assertThatExceptionOfType(ReportableException.class).isThrownBy(() -> this.invoker.generate(request))
-				.withMessageContaining(jsonMessage);
+			.withMessageContaining(jsonMessage);
 	}
 
 	@Test
@@ -116,7 +116,7 @@ class InitializrServiceTests extends AbstractHttpClientMockTests {
 		given(this.http.execute(isA(HttpGet.class))).willReturn(response);
 		ProjectGenerationRequest request = new ProjectGenerationRequest();
 		assertThatExceptionOfType(ReportableException.class).isThrownBy(() -> this.invoker.generate(request))
-				.withMessageContaining("Invalid content received from server");
+			.withMessageContaining("Invalid content received from server");
 	}
 
 	@Test
@@ -126,7 +126,7 @@ class InitializrServiceTests extends AbstractHttpClientMockTests {
 		given(this.http.execute(isA(HttpGet.class))).willReturn(response);
 		ProjectGenerationRequest request = new ProjectGenerationRequest();
 		assertThatExceptionOfType(ReportableException.class).isThrownBy(() -> this.invoker.generate(request))
-				.withMessageContaining("No content received from server");
+			.withMessageContaining("No content received from server");
 	}
 
 	private ProjectGenerationResponse generateProject(ProjectGenerationRequest request,

spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/ProjectGenerationRequestTests.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.
@@ -57,21 +57,21 @@ class ProjectGenerationRequestTests {
 		this.request.setServiceUrl(customServerUrl);
 		this.request.getDependencies().add("security");
 		assertThat(this.request.generateUrl(createDefaultMetadata()))
-				.isEqualTo(new URI(customServerUrl + "/starter.zip?dependencies=security&type=test-type"));
+			.isEqualTo(new URI(customServerUrl + "/starter.zip?dependencies=security&type=test-type"));
 	}
 
 	@Test
 	void customBootVersion() {
 		this.request.setBootVersion("1.2.0.RELEASE");
 		assertThat(this.request.generateUrl(createDefaultMetadata()))
-				.isEqualTo(createDefaultUrl("?type=test-type&bootVersion=1.2.0.RELEASE"));
+			.isEqualTo(createDefaultUrl("?type=test-type&bootVersion=1.2.0.RELEASE"));
 	}
 
 	@Test
 	void singleDependency() {
 		this.request.getDependencies().add("web");
 		assertThat(this.request.generateUrl(createDefaultMetadata()))
-				.isEqualTo(createDefaultUrl("?dependencies=web&type=test-type"));
+			.isEqualTo(createDefaultUrl("?dependencies=web&type=test-type"));
 	}
 
 	@Test
@@ -79,21 +79,21 @@ class ProjectGenerationRequestTests {
 		this.request.getDependencies().add("web");
 		this.request.getDependencies().add("data-jpa");
 		assertThat(this.request.generateUrl(createDefaultMetadata()))
-				.isEqualTo(createDefaultUrl("?dependencies=web%2Cdata-jpa&type=test-type"));
+			.isEqualTo(createDefaultUrl("?dependencies=web%2Cdata-jpa&type=test-type"));
 	}
 
 	@Test
 	void customJavaVersion() {
 		this.request.setJavaVersion("1.8");
 		assertThat(this.request.generateUrl(createDefaultMetadata()))
-				.isEqualTo(createDefaultUrl("?type=test-type&javaVersion=1.8"));
+			.isEqualTo(createDefaultUrl("?type=test-type&javaVersion=1.8"));
 	}
 
 	@Test
 	void customPackageName() {
 		this.request.setPackageName("demo.foo");
 		assertThat(this.request.generateUrl(createDefaultMetadata()))
-				.isEqualTo(createDefaultUrl("?packageName=demo.foo&type=test-type"));
+			.isEqualTo(createDefaultUrl("?packageName=demo.foo&type=test-type"));
 	}
 
 	@Test
@@ -110,14 +110,14 @@ class ProjectGenerationRequestTests {
 	void customPackaging() {
 		this.request.setPackaging("war");
 		assertThat(this.request.generateUrl(createDefaultMetadata()))
-				.isEqualTo(createDefaultUrl("?type=test-type&packaging=war"));
+			.isEqualTo(createDefaultUrl("?type=test-type&packaging=war"));
 	}
 
 	@Test
 	void customLanguage() {
 		this.request.setLanguage("groovy");
 		assertThat(this.request.generateUrl(createDefaultMetadata()))
-				.isEqualTo(createDefaultUrl("?type=test-type&language=groovy"));
+			.isEqualTo(createDefaultUrl("?type=test-type&language=groovy"));
 	}
 
 	@Test
@@ -127,29 +127,29 @@ class ProjectGenerationRequestTests {
 		this.request.setVersion("1.0.1-SNAPSHOT");
 		this.request.setDescription("Spring Boot Test");
 		assertThat(this.request.generateUrl(createDefaultMetadata()))
-				.isEqualTo(createDefaultUrl("?groupId=org.acme&artifactId=sample&version=1.0.1-SNAPSHOT"
-						+ "&description=Spring+Boot+Test&type=test-type"));
+			.isEqualTo(createDefaultUrl("?groupId=org.acme&artifactId=sample&version=1.0.1-SNAPSHOT"
+					+ "&description=Spring+Boot+Test&type=test-type"));
 	}
 
 	@Test
 	void outputCustomizeArtifactId() {
 		this.request.setOutput("my-project");
 		assertThat(this.request.generateUrl(createDefaultMetadata()))
-				.isEqualTo(createDefaultUrl("?artifactId=my-project&type=test-type"));
+			.isEqualTo(createDefaultUrl("?artifactId=my-project&type=test-type"));
 	}
 
 	@Test
 	void outputArchiveCustomizeArtifactId() {
 		this.request.setOutput("my-project.zip");
 		assertThat(this.request.generateUrl(createDefaultMetadata()))
-				.isEqualTo(createDefaultUrl("?artifactId=my-project&type=test-type"));
+			.isEqualTo(createDefaultUrl("?artifactId=my-project&type=test-type"));
 	}
 
 	@Test
 	void outputArchiveWithDotsCustomizeArtifactId() {
 		this.request.setOutput("my.nice.project.zip");
 		assertThat(this.request.generateUrl(createDefaultMetadata()))
-				.isEqualTo(createDefaultUrl("?artifactId=my.nice.project&type=test-type"));
+			.isEqualTo(createDefaultUrl("?artifactId=my.nice.project&type=test-type"));
 	}
 
 	@Test
@@ -157,7 +157,7 @@ class ProjectGenerationRequestTests {
 		this.request.setOutput("my-project");
 		this.request.setArtifactId("my-id");
 		assertThat(this.request.generateUrl(createDefaultMetadata()))
-				.isEqualTo(createDefaultUrl("?artifactId=my-id&type=test-type"));
+			.isEqualTo(createDefaultUrl("?artifactId=my-id&type=test-type"));
 	}
 
 	@Test
@@ -165,7 +165,7 @@ class ProjectGenerationRequestTests {
 		InitializrServiceMetadata metadata = readMetadata();
 		setBuildAndFormat("does-not-exist", null);
 		assertThatExceptionOfType(ReportableException.class).isThrownBy(() -> this.request.generateUrl(metadata))
-				.withMessageContaining("does-not-exist");
+			.withMessageContaining("does-not-exist");
 	}
 
 	@Test
@@ -173,7 +173,8 @@ class ProjectGenerationRequestTests {
 		InitializrServiceMetadata metadata = readMetadata("types-conflict");
 		setBuildAndFormat("gradle", null);
 		assertThatExceptionOfType(ReportableException.class).isThrownBy(() -> this.request.generateUrl(metadata))
-				.withMessageContaining("gradle-project").withMessageContaining("gradle-project-2");
+			.withMessageContaining("gradle-project")
+			.withMessageContaining("gradle-project-2");
 	}
 
 	@Test
@@ -195,14 +196,14 @@ class ProjectGenerationRequestTests {
 	void invalidType() {
 		this.request.setType("does-not-exist");
 		assertThatExceptionOfType(ReportableException.class)
-				.isThrownBy(() -> this.request.generateUrl(createDefaultMetadata()));
+			.isThrownBy(() -> this.request.generateUrl(createDefaultMetadata()));
 	}
 
 	@Test
 	void noTypeAndNoDefault() {
 		assertThatExceptionOfType(ReportableException.class)
-				.isThrownBy(() -> this.request.generateUrl(readMetadata("types-conflict")))
-				.withMessageContaining("no default is defined");
+			.isThrownBy(() -> this.request.generateUrl(readMetadata("types-conflict")))
+			.withMessageContaining("no default is defined");
 	}
 
 	private static URI createUrl(String actionAndParam) {