Fix some issues

Author: fonimus

samples/complete/src/main/java/com/github/fonimus/ssh/shell/complete/DemoCommand.java

@@ -44,7 +44,12 @@
 
 import java.io.File;
 import java.security.SecureRandom;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**

samples/complete/src/test/java/com/github/fonimus/ssh/shell/complete/DemoCommandTest.java

@@ -16,7 +16,11 @@
 
 package com.github.fonimus.ssh.shell.complete;
 
-import com.github.fonimus.ssh.shell.*;
+import com.github.fonimus.ssh.shell.SshContext;
+import com.github.fonimus.ssh.shell.SshShellCommandFactory;
+import com.github.fonimus.ssh.shell.SshShellHelper;
+import com.github.fonimus.ssh.shell.SshShellProperties;
+import com.github.fonimus.ssh.shell.SshShellRunnable;
 import com.github.fonimus.ssh.shell.auth.SshAuthentication;
 import org.jline.reader.LineReader;
 import org.jline.reader.ParsedLine;

starter/src/main/java/com/github/fonimus/ssh/shell/ExtendedCompleterAdapter.java

@@ -70,13 +70,12 @@ private static boolean isComplete(CompletionProposal p) {
      * line continuations, <em>etc.</em>)
      * See @{@link org.springframework.shell.jline.JLineShellAutoConfiguration}
      */
-    static List<String> sanitizeInput(List<String> words) {
-        words = words.stream()
+    private static List<String> sanitizeInput(List<String> words) {
+        return words.stream()
                 // CR at beginning/end of line introduced by backslash
                 .map(s -> s.replaceAll("^\\n+|\\n+$", ""))
                 // CR in middle of word introduced by return inside a quoted string
                 .map(s -> s.replaceAll("\\n+", " "))
                 .collect(Collectors.toList());
-        return words;
     }
 }

starter/src/main/java/com/github/fonimus/ssh/shell/ExtendedShell.java

@@ -20,15 +20,21 @@
 import com.github.fonimus.ssh.shell.postprocess.PostProcessorObject;
 import com.github.fonimus.ssh.shell.postprocess.provided.SavePostProcessor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.shell.*;
+import org.springframework.shell.CompletionContext;
+import org.springframework.shell.CompletionProposal;
+import org.springframework.shell.Input;
+import org.springframework.shell.ResultHandler;
+import org.springframework.shell.Shell;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import static com.github.fonimus.ssh.shell.ExtendedInput.*;
+import static com.github.fonimus.ssh.shell.ExtendedInput.ARROW;
+import static com.github.fonimus.ssh.shell.ExtendedInput.KEY_CHARS;
+import static com.github.fonimus.ssh.shell.ExtendedInput.PIPE;
 import static com.github.fonimus.ssh.shell.SshShellCommandFactory.SSH_THREAD_CONTEXT;
 
 /**

starter/src/main/java/com/github/fonimus/ssh/shell/SshShellAutoConfiguration.java

@@ -23,7 +23,11 @@
 import com.github.fonimus.ssh.shell.listeners.SshShellListenerService;
 import com.github.fonimus.ssh.shell.postprocess.PostProcessor;
 import com.github.fonimus.ssh.shell.postprocess.TypePostProcessorResultHandler;
-import com.github.fonimus.ssh.shell.postprocess.provided.*;
+import com.github.fonimus.ssh.shell.postprocess.provided.GrepPostProcessor;
+import com.github.fonimus.ssh.shell.postprocess.provided.HighlightPostProcessor;
+import com.github.fonimus.ssh.shell.postprocess.provided.JsonPointerPostProcessor;
+import com.github.fonimus.ssh.shell.postprocess.provided.PrettyJsonPostProcessor;
+import com.github.fonimus.ssh.shell.postprocess.provided.SavePostProcessor;
 import com.github.fonimus.ssh.shell.providers.ExtendedFileValueProvider;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.sshd.server.SshServer;

starter/src/main/java/com/github/fonimus/ssh/shell/SshShellHelper.java

@@ -33,11 +33,30 @@
 import org.jline.terminal.Size;
 import org.jline.terminal.Terminal;
 import org.jline.terminal.impl.AbstractPosixTerminal;
-import org.jline.utils.*;
-import org.springframework.shell.table.*;
+import org.jline.utils.AttributedString;
+import org.jline.utils.AttributedStringBuilder;
+import org.jline.utils.AttributedStyle;
+import org.jline.utils.Display;
+import org.jline.utils.InfoCmp;
+import org.jline.utils.NonBlockingReader;
+import org.springframework.shell.table.Aligner;
+import org.springframework.shell.table.ArrayTableModel;
+import org.springframework.shell.table.CellMatcher;
+import org.springframework.shell.table.SimpleHorizontalAligner;
+import org.springframework.shell.table.SimpleVerticalAligner;
+import org.springframework.shell.table.Table;
+import org.springframework.shell.table.TableBuilder;
+import org.springframework.shell.table.TableModel;
 
 import java.io.PrintWriter;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
 
 /**
  * Ssh shell helper for user interactions and authorities check

starter/src/main/java/com/github/fonimus/ssh/shell/SshShellRunnable.java

@@ -48,7 +48,12 @@
 import org.springframework.shell.jline.PromptProvider;
 import org.springframework.shell.result.DefaultResultHandler;
 
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
 
 import static com.github.fonimus.ssh.shell.SshShellCommandFactory.SSH_THREAD_CONTEXT;

starter/src/main/java/com/github/fonimus/ssh/shell/SshShellTerminalDelegate.java

@@ -16,7 +16,11 @@
 
 package com.github.fonimus.ssh.shell;
 
-import org.jline.terminal.*;
+import org.jline.terminal.Attributes;
+import org.jline.terminal.Cursor;
+import org.jline.terminal.MouseEvent;
+import org.jline.terminal.Size;
+import org.jline.terminal.Terminal;
 import org.jline.utils.InfoCmp;
 import org.jline.utils.NonBlockingReader;
 

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

@@ -27,15 +27,27 @@
 import org.springframework.shell.Availability;
 import org.springframework.shell.CompletionContext;
 import org.springframework.shell.CompletionProposal;
-import org.springframework.shell.standard.*;
+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.standard.ValueProviderSupport;
 import org.springframework.stereotype.Component;
 
 import javax.sql.DataSource;
 import java.beans.IntrospectionException;
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.InvocationTargetException;
-import java.sql.*;
-import java.util.*;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;

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

@@ -24,12 +24,31 @@
 import org.springframework.shell.Availability;
 import org.springframework.shell.CompletionContext;
 import org.springframework.shell.CompletionProposal;
-import org.springframework.shell.standard.*;
+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.standard.ValueProviderSupport;
 import org.springframework.stereotype.Component;
 
-import javax.management.*;
+import javax.management.InstanceNotFoundException;
+import javax.management.JMException;
+import javax.management.MBeanAttributeInfo;
+import javax.management.MBeanFeatureInfo;
+import javax.management.MBeanInfo;
+import javax.management.MBeanOperationInfo;
+import javax.management.MBeanParameterInfo;
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectInstance;
+import javax.management.ObjectName;
 import java.lang.management.ManagementFactory;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**

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

@@ -19,7 +19,11 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.shell.standard.ShellComponent;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 import static com.github.fonimus.ssh.shell.SshShellProperties.SSH_SHELL_ENABLE;
 

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

@@ -71,8 +71,6 @@ public class ActuatorCommand extends AbstractCommand {
 
     private final Environment environment;
 
-    private final SshShellProperties properties;
-
     private final SshShellHelper helper;
 
     private final AuditEventsEndpoint audit;
@@ -122,7 +120,6 @@ public ActuatorCommand(ApplicationContext applicationContext, Environment enviro
         super(helper, properties, properties.getCommands().getActuator());
         this.applicationContext = applicationContext;
         this.environment = environment;
-        this.properties = properties;
         this.helper = helper;
         this.audit = audit;
         this.beans = beans;

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

@@ -24,7 +24,14 @@
 import org.springframework.shell.standard.ShellCommandGroup;
 import org.springframework.shell.standard.ShellMethod;
 import org.springframework.shell.standard.ShellMethodAvailability;
-import org.springframework.shell.table.*;
+import org.springframework.shell.table.ArrayTableModel;
+import org.springframework.shell.table.BorderStyle;
+import org.springframework.shell.table.SimpleHorizontalAligner;
+import org.springframework.shell.table.SimpleVerticalAligner;
+import org.springframework.shell.table.SizeConstraints;
+import org.springframework.shell.table.Table;
+import org.springframework.shell.table.TableBuilder;
+import org.springframework.shell.table.TableModel;
 
 import java.util.Map;
 import java.util.TreeMap;

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

@@ -39,9 +39,15 @@
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.*;
-
-import static com.github.fonimus.ssh.shell.SshShellHelper.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.github.fonimus.ssh.shell.SshShellHelper.INTERACTIVE_LONG_MESSAGE;
+import static com.github.fonimus.ssh.shell.SshShellHelper.INTERACTIVE_SHORT_MESSAGE;
+import static com.github.fonimus.ssh.shell.SshShellHelper.at;
 
 /**
  * Thread command

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

@@ -31,9 +31,15 @@
 import java.io.PrintWriter;
 import java.util.Collections;
 
-import static com.github.fonimus.ssh.shell.SshHelperTest.*;
+import static com.github.fonimus.ssh.shell.SshHelperTest.call;
+import static com.github.fonimus.ssh.shell.SshHelperTest.verifyResponse;
+import static com.github.fonimus.ssh.shell.SshHelperTest.write;
 import static com.github.fonimus.ssh.shell.SshShellCommandFactory.SSH_THREAD_CONTEXT;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

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

@@ -25,7 +25,10 @@
 import java.util.List;
 
 import static com.github.fonimus.ssh.shell.SshShellCommandFactory.SSH_THREAD_CONTEXT;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
 
 class ExtendedShellTest {
 

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

@@ -23,7 +23,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.Properties;

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

@@ -24,7 +24,9 @@
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import static com.github.fonimus.ssh.shell.SshHelperTest.*;
+import static com.github.fonimus.ssh.shell.SshHelperTest.call;
+import static com.github.fonimus.ssh.shell.SshHelperTest.verifyResponse;
+import static com.github.fonimus.ssh.shell.SshHelperTest.write;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE,
         classes = {SshShellApplicationCustomAuthenticatorTest.class, SshShellPasswordConfigurationTest.class},

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

@@ -24,7 +24,9 @@
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import static com.github.fonimus.ssh.shell.SshHelperTest.*;
+import static com.github.fonimus.ssh.shell.SshHelperTest.call;
+import static com.github.fonimus.ssh.shell.SshHelperTest.verifyResponse;
+import static com.github.fonimus.ssh.shell.SshHelperTest.write;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
         classes = {SshShellApplicationSecurityTest.class, SshShellSecurityConfigurationTest.class},

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

@@ -28,7 +28,10 @@
 
 import static com.github.fonimus.ssh.shell.SshHelperTest.call;
 import static com.github.fonimus.ssh.shell.SshHelperTest.write;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
         classes = {SshShellApplicationWebTest.class, SshShellSessionConfigurationTest.class},

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

@@ -28,9 +28,15 @@
 import java.util.Arrays;
 import java.util.Collections;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 class SshShellHelperTest extends AbstractShellHelperTest {
 

starter/src/test/java/com/github/fonimus/ssh/shell/auth/SshShellSecurityAuthenticationProviderTest.java

@@ -34,7 +34,11 @@
 import java.util.Map;
 
 import static com.github.fonimus.ssh.shell.auth.SshShellSecurityAuthenticationProvider.AUTHENTICATION_ATTRIBUTE;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 

starter/src/test/java/com/github/fonimus/ssh/shell/commands/HistoryCommandTest.java

@@ -26,7 +26,9 @@
 import java.io.IOException;
 import java.util.List;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;