Refine contribution #1283

- Use dependency injection for CommandHighlighter
- Add Javadoc
- Add missing license headers
- Rename test class
- Remove wildcard imports

Author: fmbenhassine

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

@@ -111,13 +111,13 @@ public ShellRunner jlineShellRunner(JLineInputProvider inputProvider, CommandPar
 
 	@Bean
 	public LineReader lineReader(Terminal terminal, Parser parser, CommandCompleter commandCompleter,
-			CommandRegistry commandRegistry) {
+			CommandHighlighter commandHighlighter) {
 		LineReaderBuilder lineReaderBuilder = LineReaderBuilder.builder()
 			.terminal(terminal)
 			.appName("Spring Shell")
 			.completer(commandCompleter)
 			.history(jLineHistory)
-			.highlighter(new CommandHighlighter(commandRegistry))
+			.highlighter(commandHighlighter)
 			.parser(parser);
 
 		LineReader lineReader = lineReaderBuilder.build();
@@ -176,6 +176,12 @@ public Parser parser() {
 		return parser;
 	}
 
+	@Bean
+	@ConditionalOnMissingBean
+	public CommandHighlighter commandHighlighter(CommandRegistry commandRegistry) {
+		return new CommandHighlighter(commandRegistry);
+	}
+
 	@Bean
 	@ConditionalOnMissingBean
 	public CommandCompleter commandCompleter(CommandRegistry commandRegistry) {

spring-shell-jline/src/main/java/org/springframework/shell/jline/CommandHighlighter.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2026-present 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.springframework.shell.jline;
 
 import java.util.Comparator;
@@ -19,13 +34,17 @@ public class CommandHighlighter implements Highlighter {
 
 	private final CommandRegistry commandRegistry;
 
+	/**
+	 * Create a new {@link CommandHighlighter} instance.
+	 * @param commandRegistry the command registry
+	 */
 	public CommandHighlighter(CommandRegistry commandRegistry) {
 		this.commandRegistry = commandRegistry;
 	}
 
 	@Override
 	public AttributedString highlight(LineReader reader, String buffer) {
-		return commandRegistry.getCommands()
+		return this.commandRegistry.getCommands()
 			.stream()
 			.flatMap(command -> Stream.concat(Stream.of(command.getName()), command.getAliases().stream()))
 			.filter(buffer::startsWith)

…/shell/jline/CommandHighlighterTest.java …shell/jline/CommandHighlighterTests.javaspring-shell-jline/src/test/java/org/springframework/shell/jline/CommandHighlighterTest.java renamed to spring-shell-jline/src/test/java/org/springframework/shell/jline/CommandHighlighterTests.java spring-shell-jline/src/test/java/org/springframework/shell/jline/CommandHighlighterTest.java renamed to spring-shell-jline/src/test/java/org/springframework/shell/jline/CommandHighlighterTests.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2026-present 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.springframework.shell.jline;
 
 import java.util.Collections;
@@ -12,13 +27,15 @@
 import org.springframework.shell.core.command.Command;
 import org.springframework.shell.core.command.CommandRegistry;
 import org.springframework.shell.jline.tui.style.ThemeResolver;
-import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Mockito.*;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 /**
  * @author Piotr Olaszewski
  */
-class CommandHighlighterTest {
+class CommandHighlighterTests {
 
 	private final LineReader lineReader = mock(LineReader.class);