Add spring code formatting plugin to the build

Closes: gh-1185

Signed-off-by: Andrey Litvitski <[email protected]>

Author: therepanic

pom.xml

@@ -73,6 +73,7 @@
 		<antora-maven-plugin.version>1.0.0-alpha.5</antora-maven-plugin.version>
 
 		<!-- plugin versions -->
+		<spring-javaformat-maven-plugin.version>0.0.47</spring-javaformat-maven-plugin.version>
 		<maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
 		<maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
 		<maven-failsafe-plugin.version>3.5.3</maven-failsafe-plugin.version>
@@ -98,6 +99,20 @@
 
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>io.spring.javaformat</groupId>
+				<artifactId>spring-javaformat-maven-plugin</artifactId>
+				<version>${spring-javaformat-maven-plugin.version}</version>
+				<executions>
+					<execution>
+						<phase>validate</phase>
+						<inherited>true</inherited>
+						<goals>
+							<goal>validate</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>

spring-shell-autoconfigure/src/main/java/org/springframework/shell/boot/ApplicationRunnerAutoConfiguration.java

@@ -32,13 +32,15 @@ public ApplicationReadyEventListener applicationReadyEventListener() {
 		return new ApplicationReadyEventListener();
 	}
 
-	static class ApplicationReadyEventListener implements ApplicationListener<ApplicationReadyEvent>{
+	static class ApplicationReadyEventListener implements ApplicationListener<ApplicationReadyEvent> {
 
 		@Override
 		public void onApplicationEvent(ApplicationReadyEvent event) {
 			// request context close after application runners so that
 			// shell exits in case that context is kept alive
 			event.getApplicationContext().close();
 		}
+
 	}
+
 }

spring-shell-autoconfigure/src/main/java/org/springframework/shell/boot/CommandRegistrationCustomizer.java

@@ -27,8 +27,8 @@ public interface CommandRegistrationCustomizer {
 
 	/**
 	 * Callback to customize a {@link CommandRegistration.Builder} instance.
-	 *
 	 * @param commandRegistrationBuilder the command registration builder to customize
 	 */
 	void customize(CommandRegistration.Builder commandRegistrationBuilder);
+
 }

spring-shell-autoconfigure/src/main/java/org/springframework/shell/boot/CommandRegistryAutoConfiguration.java

@@ -43,9 +43,8 @@ public class CommandRegistryAutoConfiguration {
 	@Bean
 	@ConditionalOnMissingBean(CommandRegistry.class)
 	public CommandRegistry commandRegistry(ObjectProvider<MethodTargetRegistrar> methodTargetRegistrars,
-										  ObjectProvider<CommandResolver> commandResolvers,
-										  ObjectProvider<CommandRegistryCustomizer> commandRegistryCustomizers,
-										  ShellContext shellContext) {
+			ObjectProvider<CommandResolver> commandResolvers,
+			ObjectProvider<CommandRegistryCustomizer> commandRegistryCustomizers, ShellContext shellContext) {
 		List<CommandResolver> resolvers = commandResolvers.orderedStream().collect(Collectors.toList());
 		CommandRegistry registry = CommandRegistry.of(resolvers, shellContext);
 		methodTargetRegistrars.orderedStream().forEach(resolver -> {
@@ -58,7 +57,8 @@ public CommandRegistry commandRegistry(ObjectProvider<MethodTargetRegistrar> met
 	}
 
 	@Bean
-	public CommandRegistryCustomizer defaultCommandRegistryCustomizer(ObjectProvider<CommandRegistration> commandRegistrations) {
+	public CommandRegistryCustomizer defaultCommandRegistryCustomizer(
+			ObjectProvider<CommandRegistration> commandRegistrations) {
 		return registry -> {
 			commandRegistrations.orderedStream().forEach(registration -> {
 				registry.register(registration);
@@ -82,7 +82,8 @@ public CommandRegistrationCustomizer helpOptionsCommandRegistrationCustomizer(Sp
 
 	@Bean
 	@ConditionalOnBean(OptionNameModifier.class)
-	public CommandRegistrationCustomizer customOptionNameModifierCommandRegistrationCustomizer(OptionNameModifier modifier) {
+	public CommandRegistrationCustomizer customOptionNameModifierCommandRegistrationCustomizer(
+			OptionNameModifier modifier) {
 		return builder -> {
 			builder.defaultOptionNameModifier(modifier);
 		};
@@ -91,7 +92,8 @@ public CommandRegistrationCustomizer customOptionNameModifierCommandRegistration
 	@Bean
 	@ConditionalOnMissingBean(OptionNameModifier.class)
 	@ConditionalOnProperty(prefix = "spring.shell.option.naming", name = "case-type")
-	public CommandRegistrationCustomizer defaultOptionNameModifierCommandRegistrationCustomizer(SpringShellProperties properties) {
+	public CommandRegistrationCustomizer defaultOptionNameModifierCommandRegistrationCustomizer(
+			SpringShellProperties properties) {
 		return builder -> {
 			switch (properties.getOption().getNaming().getCaseType()) {
 				case NOOP:
@@ -124,4 +126,5 @@ public BuilderSupplier commandRegistrationBuilderSupplier(
 			return builder;
 		};
 	}
+
 }

spring-shell-autoconfigure/src/main/java/org/springframework/shell/boot/CompleterAutoConfiguration.java

@@ -57,19 +57,13 @@ public CompleterAdapter(Shell shell) {
 		public void complete(LineReader reader, ParsedLine line, List<Candidate> candidates) {
 			CompletingParsedLine cpl = (line instanceof CompletingParsedLine) ? ((CompletingParsedLine) line) : t -> t;
 
-			CompletionContext context = new CompletionContext(sanitizeInput(line.words()), line.wordIndex(), line.wordCursor(), null, null);
+			CompletionContext context = new CompletionContext(sanitizeInput(line.words()), line.wordIndex(),
+					line.wordCursor(), null, null);
 
 			List<CompletionProposal> proposals = shell.complete(context);
 			proposals.stream()
-				.map(p -> new Candidate(
-					p.dontQuote() ? p.value() : cpl.emit(p.value()).toString(),
-					p.displayText(),
-					p.category(),
-					p.description(),
-					null,
-					null,
-					p.complete())
-				)
+				.map(p -> new Candidate(p.dontQuote() ? p.value() : cpl.emit(p.value()).toString(), p.displayText(),
+						p.category(), p.description(), null, null, p.complete()))
 				.forEach(candidates::add);
 		}
 
@@ -79,11 +73,15 @@ public void setShell(Shell shell) {
 
 		static List<String> sanitizeInput(List<String> words) {
 			words = words.stream()
-				.map(s -> s.replaceAll("^\\n+|\\n+$", "")) // CR at beginning/end of line introduced by backslash continuation
-				.map(s -> s.replaceAll("\\n+", " ")) // CR in middle of word introduced by return inside a quoted string
+				.map(s -> s.replaceAll("^\\n+|\\n+$", "")) // CR at beginning/end of line
+															// introduced by backslash
+															// continuation
+				.map(s -> s.replaceAll("\\n+", " ")) // CR in middle of word introduced by
+														// return inside a quoted string
 				.collect(Collectors.toList());
 			return words;
 		}
+
 	}
 
 }

spring-shell-autoconfigure/src/main/java/org/springframework/shell/boot/ComponentFlowAutoConfiguration.java

@@ -65,7 +65,9 @@ public ComponentFlowCustomizer shellCommonComponentFlowCustomizer(ObjectProvider
 	private static class CommonComponentFlowCustomizer implements ComponentFlowCustomizer {
 
 		private final ObjectProvider<Terminal> terminal;
+
 		private final ObjectProvider<ResourceLoader> resourceLoader;
+
 		private final ObjectProvider<TemplateExecutor> templateExecutor;
 
 		CommonComponentFlowCustomizer(ObjectProvider<Terminal> terminal, ObjectProvider<ResourceLoader> resourceLoader,
@@ -81,5 +83,7 @@ public void customize(Builder componentFlowBuilder) {
 			resourceLoader.ifAvailable(dep -> componentFlowBuilder.resourceLoader(dep));
 			templateExecutor.ifAvailable(dep -> componentFlowBuilder.templateExecutor(dep));
 		}
+
 	}
+
 }

spring-shell-autoconfigure/src/main/java/org/springframework/shell/boot/ComponentFlowCustomizer.java

@@ -30,4 +30,5 @@ public interface ComponentFlowCustomizer {
 	 * @param componentFlowBuilder the component flow builder to customize
 	 */
 	void customize(ComponentFlow.Builder componentFlowBuilder);
+
 }

spring-shell-autoconfigure/src/main/java/org/springframework/shell/boot/ExitCodeAutoConfiguration.java

@@ -69,6 +69,7 @@ else if (exception.getCause() instanceof CommandExecution.CommandParserException
 			// only map parsing error so that other mappers can do their job
 			return 0;
 		}
+
 	}
 
 	static class ShellExitCodeMappingsExceptionMapper implements ExitCodeExceptionMapper, ExitCodeMappings {
@@ -100,6 +101,7 @@ public int getExitCode(Throwable exception) {
 			}
 			return exitCode;
 		}
+
 	}
 
 	static class ShellExitCodeException extends RuntimeException implements ExitCodeGenerator {
@@ -115,5 +117,7 @@ static class ShellExitCodeException extends RuntimeException implements ExitCode
 		public int getExitCode() {
 			return code;
 		}
+
 	}
+
 }

spring-shell-autoconfigure/src/main/java/org/springframework/shell/boot/JLineAutoConfiguration.java

@@ -33,5 +33,7 @@ public static class JLineHistoryConfiguration {
 		public org.jline.reader.History history() {
 			return new DefaultHistory();
 		}
+
 	}
+
 }

spring-shell-autoconfigure/src/main/java/org/springframework/shell/boot/JLineShellAutoConfiguration.java

@@ -68,4 +68,5 @@ public Parser parser() {
 		parser.setEofOnEscapedNewLine(true);
 		return parser;
 	}
+
 }