✨ Bump spring boot and shell (and others), add fix on completion

Author: fonimus

starter/src/main/java/com/github/fonimus/ssh/shell/commands/ManageSessionsCommand.java

@@ -20,18 +20,22 @@
 import com.github.fonimus.ssh.shell.SshShellHelper;
 import com.github.fonimus.ssh.shell.SshShellProperties;
 import com.github.fonimus.ssh.shell.manage.SshShellSessionManager;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.sshd.server.channel.ChannelSession;
 import org.apache.sshd.server.session.ServerSession;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.shell.Availability;
-import org.springframework.shell.standard.ShellCommandGroup;
-import org.springframework.shell.standard.ShellMethod;
-import org.springframework.shell.standard.ShellMethodAvailability;
-import org.springframework.shell.standard.ShellOption;
+import org.springframework.shell.CompletionContext;
+import org.springframework.shell.CompletionProposal;
+import org.springframework.shell.standard.*;
+import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import static com.github.fonimus.ssh.shell.manage.SshShellSessionManager.sessionUserName;
 
@@ -80,7 +84,7 @@ public String manageSessionsList() {
 
     @ShellMethod(key = COMMAND_MANAGE_SESSIONS_INFO, value = "Displays session")
     @ShellMethodAvailability("manageSessionsInfoAvailability")
-    public String manageSessionsInfo(@ShellOption(help = "Session identifier") long sessionId) {
+    public String manageSessionsInfo(@ShellOption(help = "Session identifier", valueProvider = SessionsValuesProvider.class) long sessionId) {
         ChannelSession session = sessionManager.getSession(sessionId);
         if (session == null) {
             return helper.getError("Session [" + sessionId + "] not found");
@@ -90,7 +94,7 @@ public String manageSessionsInfo(@ShellOption(help = "Session identifier") long
 
     @ShellMethod(key = COMMAND_MANAGE_SESSIONS_STOP, value = "Stop session")
     @ShellMethodAvailability("manageSessionsStopAvailability")
-    public String manageSessionsStop(@ShellOption(help = "Session identifier") long sessionId) {
+    public String manageSessionsStop(@ShellOption(help = "Session identifier", valueProvider = SessionsValuesProvider.class) long sessionId) {
         return sessionManager.stopSession(sessionId) ?
                 helper.getSuccess("Session [" + sessionId + "] stopped") :
                 helper.getWarning("Unable to stop session [" + sessionId + "], maybe it does not exist");
@@ -119,3 +123,18 @@ private Availability manageSessionsStopAvailability() {
         return availability(GROUP, COMMAND_MANAGE_SESSIONS_STOP);
     }
 }
+
+@Slf4j
+@Component
+@AllArgsConstructor
+class SessionsValuesProvider
+        implements ValueProvider {
+
+    @Lazy
+    private final SshShellSessionManager sessionManager;
+
+    @Override
+    public List<CompletionProposal> complete(CompletionContext completionContext) {
+        return sessionManager.listSessions().keySet().stream().map(id -> new CompletionProposal(id.toString())).collect(Collectors.toList());
+    }
+}

starter/src/test/java/com/github/fonimus/ssh/shell/ExtendedShellTest.java

@@ -141,7 +141,9 @@ private static List<Arguments> completeSource() {
                 // used complete adapter
                 Arguments.of("cmd --ac ", Arrays.asList("cp1", "cp2")),
                 // propose only not used options
-                Arguments.of("cmd --ac cp1 ", Collections.singletonList("--ab"))
+                Arguments.of("cmd --ac cp1 ", Collections.singletonList("--ab")),
+                // after pipe, complete with post processors
+                Arguments.of("cmd --ac cp1 --ab test | ", Collections.singletonList("grep"))
         );
     }