Upgraded checkstyle version to 7.6
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/22dc7c3a Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/22dc7c3a Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/22dc7c3a Branch: refs/heads/master Commit: 22dc7c3a7b55a98530d9d7720d1d89d5097d2dd4 Parents: 8e25545 Author: Lyor Goldstein <lyor.goldst...@gmail.com> Authored: Thu Mar 2 21:32:08 2017 +0200 Committer: Lyor Goldstein <lyor.goldst...@gmail.com> Committed: Thu Mar 2 22:01:14 2017 +0200 ---------------------------------------------------------------------- .../client/ClientAuthenticationManager.java | 2 +- .../java/org/apache/sshd/client/SshClient.java | 6 ++--- .../auth/hostbased/HostKeyIdentityProvider.java | 2 +- .../auth/password/PasswordIdentityProvider.java | 6 ++--- .../DefaultConfigFileHostEntryResolver.java | 2 +- .../client/config/hosts/HostConfigEntry.java | 4 ++-- .../client/config/hosts/HostPatternsHolder.java | 4 ++-- .../sshd/client/scp/DefaultScpClient.java | 2 +- .../sshd/client/subsystem/sftp/SftpClient.java | 4 ++-- .../subsystem/sftp/SftpVersionSelector.java | 2 +- .../org/apache/sshd/common/channel/PtyMode.java | 4 ++-- .../apache/sshd/common/channel/SttySupport.java | 2 +- .../keys/loader/KeyPairResourceParser.java | 2 +- .../loader/PrivateKeyEncryptionContext.java | 2 +- .../sshd/common/kex/KexFactoryManager.java | 6 ++--- .../common/keyprovider/FileKeyPairProvider.java | 2 +- .../common/keyprovider/KeyIdentityProvider.java | 4 ++-- .../common/keyprovider/KeyPairProvider.java | 2 +- .../keyprovider/MappedKeyPairProvider.java | 2 +- .../org/apache/sshd/common/session/Session.java | 2 +- .../signature/SignatureFactoriesManager.java | 2 +- .../apache/sshd/common/util/GenericUtils.java | 16 ++++++------- .../apache/sshd/common/util/NumberUtils.java | 20 ++++++++-------- .../sshd/common/util/buffer/BufferUtils.java | 10 ++++---- .../keys/AbstractBufferPublicKeyParser.java | 2 +- .../sshd/common/util/io/FileInfoExtractor.java | 2 +- .../sshd/common/util/io/der/ASN1Object.java | 4 ++-- .../server/ServerAuthenticationManager.java | 2 +- .../keys/AuthorizedKeysAuthenticator.java | 2 +- .../server/session/AbstractServerSession.java | 2 +- .../apache/sshd/server/shell/ProcessShell.java | 2 +- .../sshd/server/shell/ProcessShellFactory.java | 4 ++-- .../server/subsystem/sftp/SftpSubsystem.java | 24 ++++++++++---------- .../client/subsystem/sftp/SftpVersionsTest.java | 4 ++-- .../config/keys/AuthorizedKeysTestSupport.java | 2 +- .../SecurityProviderRegistrarTestSupport.java | 2 +- .../server/shell/InvertedShellWrapperTest.java | 2 +- .../apache/sshd/util/test/BaseTestSupport.java | 6 ++--- .../sshd/server/auth/BaseAuthenticatorTest.java | 4 ++-- 39 files changed, 87 insertions(+), 87 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/main/java/org/apache/sshd/client/ClientAuthenticationManager.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/ClientAuthenticationManager.java b/sshd-core/src/main/java/org/apache/sshd/client/ClientAuthenticationManager.java index 0e0ff05..c495c68 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/ClientAuthenticationManager.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/ClientAuthenticationManager.java @@ -141,7 +141,7 @@ public interface ClientAuthenticationManager extends KeyPairProviderHolder { default void setUserAuthFactoriesNameList(String names) { setUserAuthFactoriesNames(GenericUtils.split(names, ',')); } - default void setUserAuthFactoriesNames(String ... names) { + default void setUserAuthFactoriesNames(String... names) { setUserAuthFactoriesNames(GenericUtils.isEmpty((Object[]) names) ? Collections.emptyList() : Arrays.asList(names)); } default void setUserAuthFactoriesNames(Collection<String> names) { http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java b/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java index 63755d2..d3f2f3f 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java @@ -535,7 +535,7 @@ public class SshClient extends AbstractFactoryManager implements ClientFactoryMa return doConnect(hostConfig.getUsername(), new InetSocketAddress(host, port), keys, !hostConfig.isIdentitiesOnly()); } - protected List<KeyPair> loadClientIdentities(Collection<String> locations, LinkOption ... options) throws IOException { + protected List<KeyPair> loadClientIdentities(Collection<String> locations, LinkOption... options) throws IOException { if (GenericUtils.isEmpty(locations)) { return Collections.emptyList(); } @@ -1120,7 +1120,7 @@ public class SshClient extends AbstractFactoryManager implements ClientFactoryMa return current; } - public static Level resolveLoggingVerbosity(String ... args) { + public static Level resolveLoggingVerbosity(String... args) { return resolveLoggingVerbosity(args, GenericUtils.length(args)); } @@ -1139,7 +1139,7 @@ public class SshClient extends AbstractFactoryManager implements ClientFactoryMa return Level.WARNING; } - public static OutputStream resolveLoggingTargetStream(PrintStream stdout, PrintStream stderr, String ... args) { + public static OutputStream resolveLoggingTargetStream(PrintStream stdout, PrintStream stderr, String... args) { return resolveLoggingTargetStream(stdout, stderr, args, GenericUtils.length(args)); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/main/java/org/apache/sshd/client/auth/hostbased/HostKeyIdentityProvider.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/auth/hostbased/HostKeyIdentityProvider.java b/sshd-core/src/main/java/org/apache/sshd/client/auth/hostbased/HostKeyIdentityProvider.java index 1632fc7..62206a1 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/auth/hostbased/HostKeyIdentityProvider.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/auth/hostbased/HostKeyIdentityProvider.java @@ -42,7 +42,7 @@ public interface HostKeyIdentityProvider { return GenericUtils.iteratorOf((provider == null) ? null : provider.loadHostKeys()); } - static HostKeyIdentityProvider wrap(KeyPair ... pairs) { + static HostKeyIdentityProvider wrap(KeyPair... pairs) { return wrap(GenericUtils.asList(pairs)); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/main/java/org/apache/sshd/client/auth/password/PasswordIdentityProvider.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/auth/password/PasswordIdentityProvider.java b/sshd-core/src/main/java/org/apache/sshd/client/auth/password/PasswordIdentityProvider.java index a6263ec..1662764 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/auth/password/PasswordIdentityProvider.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/auth/password/PasswordIdentityProvider.java @@ -132,7 +132,7 @@ public interface PasswordIdentityProvider { * @return The wrapping provider * @see #multiProvider(Collection) */ - static PasswordIdentityProvider multiProvider(PasswordIdentityProvider ... providers) { + static PasswordIdentityProvider multiProvider(PasswordIdentityProvider... providers) { return multiProvider(GenericUtils.asList(providers)); } @@ -166,7 +166,7 @@ public interface PasswordIdentityProvider { * (i.e., returns {@link #EMPTY_PASSWORDS_PROVIDER}) * @return The provider wrapper */ - static PasswordIdentityProvider wrap(String ... passwords) { + static PasswordIdentityProvider wrap(String... passwords) { return wrap(GenericUtils.asList(passwords)); } @@ -177,7 +177,7 @@ public interface PasswordIdentityProvider { * (i.e., returns {@link #EMPTY_PASSWORDS_PROVIDER}) * @return The provider wrapper */ - static PasswordIdentityProvider wrap(final Iterable<String> passwords) { + static PasswordIdentityProvider wrap(Iterable<String> passwords) { return (passwords == null) ? EMPTY_PASSWORDS_PROVIDER : () -> passwords; } } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/DefaultConfigFileHostEntryResolver.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/DefaultConfigFileHostEntryResolver.java b/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/DefaultConfigFileHostEntryResolver.java index 954dc50..e04cad6 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/DefaultConfigFileHostEntryResolver.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/DefaultConfigFileHostEntryResolver.java @@ -59,7 +59,7 @@ public class DefaultConfigFileHostEntryResolver extends ConfigFileHostEntryResol this(Objects.requireNonNull(file, "No file provided").toPath(), strict, IoUtils.getLinkOptions(false)); } - public DefaultConfigFileHostEntryResolver(Path path, boolean strict, LinkOption ... options) { + public DefaultConfigFileHostEntryResolver(Path path, boolean strict, LinkOption... options) { super(path, options); this.strict = strict; } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/HostConfigEntry.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/HostConfigEntry.java b/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/HostConfigEntry.java index 1eed0c6..c17c6ce 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/HostConfigEntry.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/HostConfigEntry.java @@ -639,7 +639,7 @@ public class HostConfigEntry extends HostPatternsHolder implements MutableUserHo * @throws IOException If failed to append the requested data * @see #appendNonEmptyValues(Appendable, String, Collection) */ - public static <A extends Appendable> A appendNonEmptyValues(A sb, String name, Object ... values) throws IOException { + public static <A extends Appendable> A appendNonEmptyValues(A sb, String name, Object... values) throws IOException { return appendNonEmptyValues(sb, name, GenericUtils.isEmpty(values) ? Collections.emptyList() : Arrays.asList(values)); } @@ -1011,7 +1011,7 @@ public class HostConfigEntry extends HostPatternsHolder implements MutableUserHo writeHostConfigEntries(Objects.requireNonNull(file, "No file").toPath(), entries, IoUtils.EMPTY_OPEN_OPTIONS); } - public static void writeHostConfigEntries(Path path, Collection<? extends HostConfigEntry> entries, OpenOption ... options) throws IOException { + public static void writeHostConfigEntries(Path path, Collection<? extends HostConfigEntry> entries, OpenOption... options) throws IOException { try (OutputStream outputStream = Files.newOutputStream(path, options)) { writeHostConfigEntries(outputStream, true, entries); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/HostPatternsHolder.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/HostPatternsHolder.java b/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/HostPatternsHolder.java index e81d01c..a3e20ab 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/HostPatternsHolder.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/HostPatternsHolder.java @@ -113,7 +113,7 @@ public abstract class HostPatternsHolder { * @return A {@link List} of all the matching entries * @see #isHostMatch(String) */ - public static List<HostConfigEntry> findMatchingEntries(String host, HostConfigEntry ... entries) { + public static List<HostConfigEntry> findMatchingEntries(String host, HostConfigEntry... entries) { // TODO in Java-8 use Stream(s) + predicate if (GenericUtils.isEmpty(host) || GenericUtils.isEmpty(entries)) { return Collections.emptyList(); @@ -207,7 +207,7 @@ public abstract class HostPatternsHolder { return m.matches(); } - public static List<Pair<Pattern, Boolean>> parsePatterns(CharSequence ... patterns) { + public static List<Pair<Pattern, Boolean>> parsePatterns(CharSequence... patterns) { return parsePatterns(GenericUtils.isEmpty(patterns) ? Collections.emptyList() : Arrays.asList(patterns)); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/main/java/org/apache/sshd/client/scp/DefaultScpClient.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/scp/DefaultScpClient.java b/sshd-core/src/main/java/org/apache/sshd/client/scp/DefaultScpClient.java index c06210f..854929a 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/scp/DefaultScpClient.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/scp/DefaultScpClient.java @@ -178,7 +178,7 @@ public class DefaultScpClient extends AbstractScpClient { return true; } - private static String[] normalizeCommandArguments(PrintStream stdout, PrintStream stderr, String ... args) { + private static String[] normalizeCommandArguments(PrintStream stdout, PrintStream stderr, String... args) { int numArgs = GenericUtils.length(args); if (numArgs <= 0) { return args; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/SftpClient.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/SftpClient.java b/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/SftpClient.java index 68e40e6..bda565d 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/SftpClient.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/SftpClient.java @@ -808,7 +808,7 @@ public interface SftpClient extends SubsystemClient { // High level API // - default SftpRemotePathChannel openRemotePathChannel(String path, OpenOption ... options) throws IOException { + default SftpRemotePathChannel openRemotePathChannel(String path, OpenOption... options) throws IOException { return openRemotePathChannel(path, GenericUtils.isEmpty(options) ? Collections.emptyList() : Arrays.asList(options)); } @@ -816,7 +816,7 @@ public interface SftpClient extends SubsystemClient { return openRemoteFileChannel(path, OpenMode.fromOpenOptions(options)); } - default SftpRemotePathChannel openRemoteFileChannel(String path, OpenMode ... modes) throws IOException { + default SftpRemotePathChannel openRemoteFileChannel(String path, OpenMode... modes) throws IOException { return openRemoteFileChannel(path, GenericUtils.isEmpty(modes) ? Collections.emptyList() : Arrays.asList(modes)); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/SftpVersionSelector.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/SftpVersionSelector.java b/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/SftpVersionSelector.java index efa5dbe..83a7964 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/SftpVersionSelector.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/SftpVersionSelector.java @@ -83,7 +83,7 @@ public interface SftpVersionSelector { * @return A {@link SftpVersionSelector} that attempts to select * the most preferred version that is also listed as available. */ - static SftpVersionSelector preferredVersionSelector(final int ... preferred) { + static SftpVersionSelector preferredVersionSelector(final int... preferred) { return preferredVersionSelector(NumberUtils.asList(preferred)); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/main/java/org/apache/sshd/common/channel/PtyMode.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/channel/PtyMode.java b/sshd-core/src/main/java/org/apache/sshd/common/channel/PtyMode.java index f58f4cc..9dac896 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/channel/PtyMode.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/channel/PtyMode.java @@ -320,7 +320,7 @@ public enum PtyMode { * @param options The options to enable - ignored if {@code null}/empty * @return A {@link Map} where all the specified {@link PtyMode}s have {@link #TRUE_SETTING} */ - public static Map<PtyMode, Integer> createEnabledOptions(PtyMode ... options) { + public static Map<PtyMode, Integer> createEnabledOptions(PtyMode... options) { return createEnabledOptions(GenericUtils.of(options)); } @@ -341,7 +341,7 @@ public enum PtyMode { return modes; } - public static Set<PtyMode> resolveEnabledOptions(Map<PtyMode, ?> modes, PtyMode ... options) { + public static Set<PtyMode> resolveEnabledOptions(Map<PtyMode, ?> modes, PtyMode... options) { return resolveEnabledOptions(modes, GenericUtils.of(options)); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/main/java/org/apache/sshd/common/channel/SttySupport.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/channel/SttySupport.java b/sshd-core/src/main/java/org/apache/sshd/common/channel/SttySupport.java index 11676e2..b2f712b 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/channel/SttySupport.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/channel/SttySupport.java @@ -258,7 +258,7 @@ public final class SttySupport { * @throws IOException If failed to execute the command * @throws InterruptedException If interrupted while awaiting command execution */ - private static String exec(String ... cmd) + private static String exec(String... cmd) throws IOException, InterruptedException { try (ByteArrayOutputStream bout = new ByteArrayOutputStream()) { Process p = Runtime.getRuntime().exec(cmd); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/main/java/org/apache/sshd/common/config/keys/loader/KeyPairResourceParser.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/config/keys/loader/KeyPairResourceParser.java b/sshd-core/src/main/java/org/apache/sshd/common/config/keys/loader/KeyPairResourceParser.java index e3336ad..88dd2bd 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/config/keys/loader/KeyPairResourceParser.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/config/keys/loader/KeyPairResourceParser.java @@ -141,7 +141,7 @@ public interface KeyPairResourceParser extends KeyPairResourceLoader { return null; } - static KeyPairResourceParser aggregate(KeyPairResourceParser ... parsers) { + static KeyPairResourceParser aggregate(KeyPairResourceParser... parsers) { return aggregate(Arrays.asList(ValidateUtils.checkNotNullAndNotEmpty(parsers, "No parsers to aggregate"))); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/main/java/org/apache/sshd/common/config/keys/loader/PrivateKeyEncryptionContext.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/config/keys/loader/PrivateKeyEncryptionContext.java b/sshd-core/src/main/java/org/apache/sshd/common/config/keys/loader/PrivateKeyEncryptionContext.java index d7ce237..b935460 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/config/keys/loader/PrivateKeyEncryptionContext.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/config/keys/loader/PrivateKeyEncryptionContext.java @@ -101,7 +101,7 @@ public class PrivateKeyEncryptionContext implements Cloneable { return initVector; } - public void setInitVector(byte ... values) { + public void setInitVector(byte... values) { initVector = values; } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/main/java/org/apache/sshd/common/kex/KexFactoryManager.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/kex/KexFactoryManager.java b/sshd-core/src/main/java/org/apache/sshd/common/kex/KexFactoryManager.java index 1559858..898b5c5 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/kex/KexFactoryManager.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/kex/KexFactoryManager.java @@ -67,7 +67,7 @@ public interface KexFactoryManager extends KeyPairProviderHolder, SignatureFacto default void setCipherFactoriesNameList(String names) { setCipherFactoriesNames(GenericUtils.split(names, ',')); } - default void setCipherFactoriesNames(String ... names) { + default void setCipherFactoriesNames(String... names) { setCipherFactoriesNames(GenericUtils.isEmpty((Object[]) names) ? Collections.emptyList() : Arrays.asList(names)); } default void setCipherFactoriesNames(Collection<String> names) { @@ -97,7 +97,7 @@ public interface KexFactoryManager extends KeyPairProviderHolder, SignatureFacto default void setCompressionFactoriesNameList(String names) { setCompressionFactoriesNames(GenericUtils.split(names, ',')); } - default void setCompressionFactoriesNames(String ... names) { + default void setCompressionFactoriesNames(String... names) { setCompressionFactoriesNames(GenericUtils.isEmpty((Object[]) names) ? Collections.emptyList() : Arrays.asList(names)); } default void setCompressionFactoriesNames(Collection<String> names) { @@ -127,7 +127,7 @@ public interface KexFactoryManager extends KeyPairProviderHolder, SignatureFacto default void setMacFactoriesNameList(String names) { setMacFactoriesNames(GenericUtils.split(names, ',')); } - default void setMacFactoriesNames(String ... names) { + default void setMacFactoriesNames(String... names) { setMacFactoriesNames(GenericUtils.isEmpty((Object[]) names) ? Collections.emptyList() : Arrays.asList(names)); } default void setMacFactoriesNames(Collection<String> names) { http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/FileKeyPairProvider.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/FileKeyPairProvider.java b/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/FileKeyPairProvider.java index 9d3ac50..c4aae97 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/FileKeyPairProvider.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/FileKeyPairProvider.java @@ -52,7 +52,7 @@ public class FileKeyPairProvider extends AbstractResourceKeyPairProvider<Path> { this(Collections.singletonList(Objects.requireNonNull(path, "No path provided"))); } - public FileKeyPairProvider(Path ... files) { + public FileKeyPairProvider(Path... files) { this(Arrays.asList(files)); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/KeyIdentityProvider.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/KeyIdentityProvider.java b/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/KeyIdentityProvider.java index 70d436c..c8cddfa 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/KeyIdentityProvider.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/KeyIdentityProvider.java @@ -134,7 +134,7 @@ public interface KeyIdentityProvider { * @return The wrapping provider * @see #multiProvider(Collection) */ - static KeyIdentityProvider multiProvider(KeyIdentityProvider ... providers) { + static KeyIdentityProvider multiProvider(KeyIdentityProvider... providers) { return multiProvider(GenericUtils.asList(providers)); } @@ -169,7 +169,7 @@ public interface KeyIdentityProvider { * {@link #EMPTY_KEYS_PROVIDER}). * @return The provider wrapper */ - static KeyIdentityProvider wrap(KeyPair ... pairs) { + static KeyIdentityProvider wrap(KeyPair... pairs) { return wrap(GenericUtils.asList(pairs)); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/KeyPairProvider.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/KeyPairProvider.java b/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/KeyPairProvider.java index e7d2b7d..a816304 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/KeyPairProvider.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/KeyPairProvider.java @@ -129,7 +129,7 @@ public interface KeyPairProvider extends KeyIdentityProvider { * @return The provider wrapper * @see #wrap(Iterable) */ - static KeyPairProvider wrap(KeyPair ... pairs) { + static KeyPairProvider wrap(KeyPair... pairs) { return GenericUtils.isEmpty(pairs) ? EMPTY_KEYPAIR_PROVIDER : wrap(Arrays.asList(pairs)); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/MappedKeyPairProvider.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/MappedKeyPairProvider.java b/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/MappedKeyPairProvider.java index bc4772d..bf3ec8b 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/MappedKeyPairProvider.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/MappedKeyPairProvider.java @@ -48,7 +48,7 @@ public class MappedKeyPairProvider implements KeyPairProvider { private final Map<String, KeyPair> pairsMap; - public MappedKeyPairProvider(KeyPair ... pairs) { + public MappedKeyPairProvider(KeyPair... pairs) { this(GenericUtils.isEmpty(pairs) ? Collections.emptyList() : Arrays.asList(pairs)); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/main/java/org/apache/sshd/common/session/Session.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/session/Session.java b/sshd-core/src/main/java/org/apache/sshd/common/session/Session.java index d9fca41..2e7e27f 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/session/Session.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/session/Session.java @@ -189,7 +189,7 @@ public interface Session * @throws IOException if an error occurred when encoding sending the packet * @see <A HREF="https://tools.ietf.org/html/rfc4253#section-11.2";>RFC 4253 - section 11.2</A> */ - IoWriteFuture sendIgnoreMessage(byte ... data) throws IOException; + IoWriteFuture sendIgnoreMessage(byte... data) throws IOException; /** * Encode and send the given buffer. http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/main/java/org/apache/sshd/common/signature/SignatureFactoriesManager.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/signature/SignatureFactoriesManager.java b/sshd-core/src/main/java/org/apache/sshd/common/signature/SignatureFactoriesManager.java index 2509a39..3b2d712 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/signature/SignatureFactoriesManager.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/signature/SignatureFactoriesManager.java @@ -50,7 +50,7 @@ public interface SignatureFactoriesManager { default void setSignatureFactoriesNameList(String names) { setSignatureFactoriesNames(GenericUtils.split(names, ',')); } - default void setSignatureFactoriesNames(String ... names) { + default void setSignatureFactoriesNames(String... names) { setSignatureFactoriesNames(GenericUtils.isEmpty((Object[]) names) ? Collections.emptyList() : Arrays.asList(names)); } default void setSignatureFactoriesNames(Collection<String> names) { http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/main/java/org/apache/sshd/common/util/GenericUtils.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/GenericUtils.java b/sshd-core/src/main/java/org/apache/sshd/common/util/GenericUtils.java index 852cba6..82d78d1 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/util/GenericUtils.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/util/GenericUtils.java @@ -430,7 +430,7 @@ public final class GenericUtils { } @SafeVarargs - public static <T> List<T> unmodifiableList(T ... values) { + public static <T> List<T> unmodifiableList(T... values) { return unmodifiableList(asList(values)); } @@ -447,17 +447,17 @@ public final class GenericUtils { } @SafeVarargs - public static <T> List<T> asList(T ... values) { + public static <T> List<T> asList(T... values) { return isEmpty(values) ? Collections.emptyList() : Arrays.asList(values); } @SafeVarargs - public static <T> Set<T> asSet(T ... values) { + public static <T> Set<T> asSet(T... values) { return new HashSet<>(asList(values)); } @SafeVarargs - public static <V extends Comparable<V>> SortedSet<V> asSortedSet(V ... values) { + public static <V extends Comparable<V>> SortedSet<V> asSortedSet(V... values) { return asSortedSet(Comparator.naturalOrder(), values); } @@ -473,7 +473,7 @@ public final class GenericUtils { * using the provided comparator */ @SafeVarargs - public static <V> SortedSet<V> asSortedSet(Comparator<? super V> comp, V ... values) { + public static <V> SortedSet<V> asSortedSet(Comparator<? super V> comp, V... values) { return asSortedSet(comp, isEmpty(values) ? Collections.emptyList() : Arrays.asList(values)); } @@ -520,7 +520,7 @@ public final class GenericUtils { @SafeVarargs public static <K, V> Map<K, V> mapValues( - Function<? super V, ? extends K> keyMapper, Supplier<? extends Map<K, V>> mapCreator, V ... values) { + Function<? super V, ? extends K> keyMapper, Supplier<? extends Map<K, V>> mapCreator, V... values) { return mapValues(keyMapper, mapCreator, isEmpty(values) ? Collections.emptyList() : Arrays.asList(values)); } @@ -556,7 +556,7 @@ public final class GenericUtils { } @SafeVarargs - public static <T> T findFirstMatchingMember(Predicate<? super T> acceptor, T ... values) { + public static <T> T findFirstMatchingMember(Predicate<? super T> acceptor, T... values) { return findFirstMatchingMember(acceptor, isEmpty(values) ? Collections.emptyList() : Arrays.asList(values)); } @@ -574,7 +574,7 @@ public final class GenericUtils { * @return A {@link List} of all the values that were accepted by the predicate */ @SafeVarargs - public static <T> List<T> selectMatchingMembers(Predicate<? super T> acceptor, T ... values) { + public static <T> List<T> selectMatchingMembers(Predicate<? super T> acceptor, T... values) { return selectMatchingMembers(acceptor, isEmpty(values) ? Collections.emptyList() : Arrays.asList(values)); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/main/java/org/apache/sshd/common/util/NumberUtils.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/NumberUtils.java b/sshd-core/src/main/java/org/apache/sshd/common/util/NumberUtils.java index a808d5d..b1aed93 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/util/NumberUtils.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/util/NumberUtils.java @@ -77,15 +77,15 @@ public final class NumberUtils { return j; } - public static int hashCode(long ... values) { + public static int hashCode(long... values) { return Arrays.hashCode(values); } - public static int hashCode(int ... values) { + public static int hashCode(int... values) { return Arrays.hashCode(values); } - public static int hashCode(byte ... values) { + public static int hashCode(byte... values) { return Arrays.hashCode(values); } @@ -149,7 +149,7 @@ public final class NumberUtils { } } - public static String join(CharSequence separator, long ... values) { + public static String join(CharSequence separator, long... values) { if (NumberUtils.isEmpty(values)) { return ""; } @@ -165,7 +165,7 @@ public final class NumberUtils { return sb.toString(); } - public static String join(char separator, long ... values) { + public static String join(char separator, long... values) { if (NumberUtils.isEmpty(values)) { return ""; } @@ -181,7 +181,7 @@ public final class NumberUtils { return sb.toString(); } - public static String join(CharSequence separator, boolean unsigned, byte ... values) { + public static String join(CharSequence separator, boolean unsigned, byte... values) { if (NumberUtils.isEmpty(values)) { return ""; } @@ -197,7 +197,7 @@ public final class NumberUtils { return sb.toString(); } - public static String join(char separator, boolean unsigned, byte ... values) { + public static String join(char separator, boolean unsigned, byte... values) { if (NumberUtils.isEmpty(values)) { return ""; } @@ -213,7 +213,7 @@ public final class NumberUtils { return sb.toString(); } - public static String join(CharSequence separator, int ... values) { + public static String join(CharSequence separator, int... values) { if (NumberUtils.isEmpty(values)) { return ""; } @@ -229,7 +229,7 @@ public final class NumberUtils { return sb.toString(); } - public static String join(char separator, int ... values) { + public static String join(char separator, int... values) { if (NumberUtils.isEmpty(values)) { return ""; } @@ -269,7 +269,7 @@ public final class NumberUtils { return a == null ? 0 : a.length; } - public static List<Integer> asList(int ... values) { + public static List<Integer> asList(int... values) { int len = length(values); if (len <= 0) { return Collections.emptyList(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/main/java/org/apache/sshd/common/util/buffer/BufferUtils.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/buffer/BufferUtils.java b/sshd-core/src/main/java/org/apache/sshd/common/util/buffer/BufferUtils.java index b0b6681..e04da4d 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/util/buffer/BufferUtils.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/util/buffer/BufferUtils.java @@ -66,7 +66,7 @@ public final class BufferUtils { throw new UnsupportedOperationException("No instance allowed"); } - public static void dumpHex(SimplifiedLog logger, Level level, String prefix, PropertyResolver resolver, char sep, byte ... data) { + public static void dumpHex(SimplifiedLog logger, Level level, String prefix, PropertyResolver resolver, char sep, byte... data) { dumpHex(logger, level, prefix, resolver, sep, data, 0, NumberUtils.length(data)); } @@ -74,7 +74,7 @@ public final class BufferUtils { dumpHex(logger, level, prefix, sep, PropertyResolverUtils.getIntProperty(resolver, HEXDUMP_CHUNK_SIZE, DEFAULT_HEXDUMP_CHUNK_SIZE), data, offset, len); } - public static void dumpHex(SimplifiedLog logger, Level level, String prefix, char sep, int chunkSize, byte ... data) { + public static void dumpHex(SimplifiedLog logger, Level level, String prefix, char sep, int chunkSize, byte... data) { dumpHex(logger, level, prefix, sep, chunkSize, data, 0, NumberUtils.length(data)); } @@ -148,7 +148,7 @@ public final class BufferUtils { } } - public static <A extends Appendable> A appendHex(A sb, char sep, byte ... array) throws IOException { + public static <A extends Appendable> A appendHex(A sb, char sep, byte... array) throws IOException { return appendHex(sb, array, 0, NumberUtils.length(array), sep); } @@ -573,7 +573,7 @@ public final class BufferUtils { return value; } - public static long validateInt32Value(long value, String format, Object ... args) { + public static long validateInt32Value(long value, String format, Object... args) { ValidateUtils.checkTrue(isValidInt32Value(value), format, args); return value; } @@ -592,7 +592,7 @@ public final class BufferUtils { return value; } - public static long validateUint32Value(long value, String format, Object ... args) { + public static long validateUint32Value(long value, String format, Object... args) { ValidateUtils.checkTrue(isValidUint32Value(value), format, args); return value; } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/main/java/org/apache/sshd/common/util/buffer/keys/AbstractBufferPublicKeyParser.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/buffer/keys/AbstractBufferPublicKeyParser.java b/sshd-core/src/main/java/org/apache/sshd/common/util/buffer/keys/AbstractBufferPublicKeyParser.java index 547f8b8..aaf9641 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/util/buffer/keys/AbstractBufferPublicKeyParser.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/util/buffer/keys/AbstractBufferPublicKeyParser.java @@ -41,7 +41,7 @@ public abstract class AbstractBufferPublicKeyParser<PUB extends PublicKey> imple private final Class<PUB> keyClass; private final Collection<String> supported; - protected AbstractBufferPublicKeyParser(Class<PUB> keyClass, String ... supported) { + protected AbstractBufferPublicKeyParser(Class<PUB> keyClass, String... supported) { this(keyClass, GenericUtils.isEmpty(supported) ? Collections.emptyList() : Arrays.asList(supported)); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/main/java/org/apache/sshd/common/util/io/FileInfoExtractor.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/io/FileInfoExtractor.java b/sshd-core/src/main/java/org/apache/sshd/common/util/io/FileInfoExtractor.java index 3e84470..feafd18 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/util/io/FileInfoExtractor.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/util/io/FileInfoExtractor.java @@ -48,6 +48,6 @@ public interface FileInfoExtractor<T> { FileInfoExtractor<FileTime> LASTMODIFIED = Files::getLastModifiedTime; - T infoOf(Path file, LinkOption ... options) throws IOException; + T infoOf(Path file, LinkOption... options) throws IOException; } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/main/java/org/apache/sshd/common/util/io/der/ASN1Object.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/io/der/ASN1Object.java b/sshd-core/src/main/java/org/apache/sshd/common/util/io/der/ASN1Object.java index a5f54a8..1d32a40 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/util/io/der/ASN1Object.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/util/io/der/ASN1Object.java @@ -60,11 +60,11 @@ public class ASN1Object implements Serializable, Cloneable { *------------------------------------------------- * </pre> */ - public ASN1Object(byte tag, int len, byte ... data) { + public ASN1Object(byte tag, int len, byte... data) { this(ASN1Class.fromDERValue(tag), ASN1Type.fromDERValue(tag), (tag & CONSTRUCTED) == CONSTRUCTED, len, data); } - public ASN1Object(ASN1Class c, ASN1Type t, boolean ctored, int len, byte ... data) { + public ASN1Object(ASN1Class c, ASN1Type t, boolean ctored, int len, byte... data) { objClass = c; objType = t; constructed = ctored; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/main/java/org/apache/sshd/server/ServerAuthenticationManager.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/server/ServerAuthenticationManager.java b/sshd-core/src/main/java/org/apache/sshd/server/ServerAuthenticationManager.java index 66ea9ff..87e7fcd 100644 --- a/sshd-core/src/main/java/org/apache/sshd/server/ServerAuthenticationManager.java +++ b/sshd-core/src/main/java/org/apache/sshd/server/ServerAuthenticationManager.java @@ -168,7 +168,7 @@ public interface ServerAuthenticationManager { default void setUserAuthFactoriesNameList(String names) { setUserAuthFactoriesNames(GenericUtils.split(names, ',')); } - default void setUserAuthFactoriesNames(String ... names) { + default void setUserAuthFactoriesNames(String... names) { setUserAuthFactoriesNames(GenericUtils.isEmpty((Object[]) names) ? Collections.emptyList() : Arrays.asList(names)); } default void setUserAuthFactoriesNames(Collection<String> names) { http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/main/java/org/apache/sshd/server/config/keys/AuthorizedKeysAuthenticator.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/server/config/keys/AuthorizedKeysAuthenticator.java b/sshd-core/src/main/java/org/apache/sshd/server/config/keys/AuthorizedKeysAuthenticator.java index 9bce5bc..0cdf191 100644 --- a/sshd-core/src/main/java/org/apache/sshd/server/config/keys/AuthorizedKeysAuthenticator.java +++ b/sshd-core/src/main/java/org/apache/sshd/server/config/keys/AuthorizedKeysAuthenticator.java @@ -163,7 +163,7 @@ public class AuthorizedKeysAuthenticator extends ModifiableFileWatcher implement * or empty if file does not exist * @throws IOException If failed to read keys from file */ - public static List<AuthorizedKeyEntry> readDefaultAuthorizedKeys(OpenOption ... options) throws IOException { + public static List<AuthorizedKeyEntry> readDefaultAuthorizedKeys(OpenOption... options) throws IOException { Path keysFile = getDefaultAuthorizedKeysFile(); if (Files.exists(keysFile, IoUtils.EMPTY_LINK_OPTIONS)) { return AuthorizedKeyEntry.readAuthorizedKeys(keysFile); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/main/java/org/apache/sshd/server/session/AbstractServerSession.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/server/session/AbstractServerSession.java b/sshd-core/src/main/java/org/apache/sshd/server/session/AbstractServerSession.java index c34a5a8..29c29e8 100644 --- a/sshd-core/src/main/java/org/apache/sshd/server/session/AbstractServerSession.java +++ b/sshd-core/src/main/java/org/apache/sshd/server/session/AbstractServerSession.java @@ -168,7 +168,7 @@ public abstract class AbstractServerSession extends AbstractSession implements S * identification data being written successfully or failing * @see <A HREF="https://tools.ietf.org/html/rfc4253#section-4.2";>RFC 4253 - section 4.2</A> */ - protected IoWriteFuture sendServerIdentification(String ... headerLines) { + protected IoWriteFuture sendServerIdentification(String... headerLines) { serverVersion = resolveIdentificationString(ServerFactoryManager.SERVER_IDENTIFICATION); String ident = serverVersion; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/main/java/org/apache/sshd/server/shell/ProcessShell.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/server/shell/ProcessShell.java b/sshd-core/src/main/java/org/apache/sshd/server/shell/ProcessShell.java index f4b5717..2b4a023 100644 --- a/sshd-core/src/main/java/org/apache/sshd/server/shell/ProcessShell.java +++ b/sshd-core/src/main/java/org/apache/sshd/server/shell/ProcessShell.java @@ -57,7 +57,7 @@ public class ProcessShell extends AbstractLoggingBean implements InvertedShell, * @param command The command components which when joined (with space separator) * create the full command to be executed by the shell */ - public ProcessShell(String ... command) { + public ProcessShell(String... command) { this(GenericUtils.isEmpty(command) ? Collections.emptyList() : Arrays.asList(command)); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/main/java/org/apache/sshd/server/shell/ProcessShellFactory.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/server/shell/ProcessShellFactory.java b/sshd-core/src/main/java/org/apache/sshd/server/shell/ProcessShellFactory.java index c10c5ec..1bd34cd 100644 --- a/sshd-core/src/main/java/org/apache/sshd/server/shell/ProcessShellFactory.java +++ b/sshd-core/src/main/java/org/apache/sshd/server/shell/ProcessShellFactory.java @@ -42,7 +42,7 @@ public class ProcessShellFactory extends AbstractLoggingBean implements Factory< this(Collections.emptyList()); } - public ProcessShellFactory(String ... command) { + public ProcessShellFactory(String... command) { this(GenericUtils.isEmpty(command) ? Collections.emptyList() : Arrays.asList(command)); } @@ -54,7 +54,7 @@ public class ProcessShellFactory extends AbstractLoggingBean implements Factory< return command; } - public void setCommand(String ... command) { + public void setCommand(String... command) { setCommand(GenericUtils.isEmpty(command) ? Collections.emptyList() : Arrays.asList(command)); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/SftpSubsystem.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/SftpSubsystem.java b/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/SftpSubsystem.java index fb41d33..c10bcce 100644 --- a/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/SftpSubsystem.java +++ b/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/SftpSubsystem.java @@ -2832,7 +2832,7 @@ public class SftpSubsystem * @throws IOException If failed to access the file * @see #resolveMissingFileAttributes(Path, int, Map, LinkOption...) */ - protected Map<String, Object> getAttributes(Path file, int flags, LinkOption ... options) throws IOException { + protected Map<String, Object> getAttributes(Path file, int flags, LinkOption... options) throws IOException { FileSystem fs = file.getFileSystem(); Collection<String> supportedViews = fs.supportedFileAttributeViews(); Map<String, Object> attrs = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); @@ -2881,7 +2881,7 @@ public class SftpSubsystem * an <U>error</U> is returned to the SFTP client * @see #FILEATTRS_RESOLVERS */ - protected Map<String, Object> resolveMissingFileAttributes(Path file, int flags, Map<String, Object> current, LinkOption ... options) throws IOException { + protected Map<String, Object> resolveMissingFileAttributes(Path file, int flags, Map<String, Object> current, LinkOption... options) throws IOException { Map<String, Object> attrs = null; // Cannot use forEach because the attrs variable is not effectively final for (Map.Entry<String, FileInfoExtractor<?>> re : FILEATTRS_RESOLVERS.entrySet()) { @@ -2923,7 +2923,7 @@ public class SftpSubsystem } } - protected Object resolveMissingFileAttributeValue(Path file, String name, Object value, FileInfoExtractor<?> x, LinkOption ... options) throws IOException { + protected Object resolveMissingFileAttributeValue(Path file, String name, Object value, FileInfoExtractor<?> x, LinkOption... options) throws IOException { if (value != null) { return value; } else { @@ -2931,7 +2931,7 @@ public class SftpSubsystem } } - protected Map<String, Object> addMissingAttribute(Path file, Map<String, Object> current, String name, FileInfoExtractor<?> x, LinkOption ... options) throws IOException { + protected Map<String, Object> addMissingAttribute(Path file, Map<String, Object> current, String name, FileInfoExtractor<?> x, LinkOption... options) throws IOException { Object value = GenericUtils.isEmpty(current) ? null : current.get(name); if (value != null) { // already have the value return current; @@ -2951,7 +2951,7 @@ public class SftpSubsystem return current; } - protected Map<String, Object> readFileAttributes(Path file, String view, LinkOption ... options) throws IOException { + protected Map<String, Object> readFileAttributes(Path file, String view, LinkOption... options) throws IOException { try { return Files.readAttributes(file, view, options); } catch (IOException e) { @@ -2994,7 +2994,7 @@ public class SftpSubsystem listener.modifiedAttributes(session, file, attributes, null); } - protected void setFileAttributes(Path file, Map<String, ?> attributes, LinkOption ... options) throws IOException { + protected void setFileAttributes(Path file, Map<String, ?> attributes, LinkOption... options) throws IOException { Set<String> unsupported = new TreeSet<>(String.CASE_INSENSITIVE_ORDER); // Cannot use forEach because of the potential IOException being thrown for (Map.Entry<String, ?> ae : attributes.entrySet()) { @@ -3079,7 +3079,7 @@ public class SftpSubsystem } } - protected void setFileAttribute(Path file, String view, String attribute, Object value, LinkOption ... options) throws IOException { + protected void setFileAttribute(Path file, String view, String attribute, Object value, LinkOption... options) throws IOException { if (log.isTraceEnabled()) { log.trace("setFileAttribute({})[{}] {}:{}={}", getServerSession(), file, view, attribute, value); } @@ -3105,7 +3105,7 @@ public class SftpSubsystem } } - protected void setFileTime(Path file, String view, String attribute, FileTime value, LinkOption ... options) throws IOException { + protected void setFileTime(Path file, String view, String attribute, FileTime value, LinkOption... options) throws IOException { if (value == null) { return; } @@ -3117,7 +3117,7 @@ public class SftpSubsystem Files.setAttribute(file, view + ":" + attribute, value, options); } - protected void setFileOwnership(Path file, String attribute, Principal value, LinkOption ... options) throws IOException { + protected void setFileOwnership(Path file, String attribute, Principal value, LinkOption... options) throws IOException { if (value == null) { return; } @@ -3160,7 +3160,7 @@ public class SftpSubsystem } } - protected void setFileExtensions(Path file, Map<String, byte[]> extensions, LinkOption ... options) throws IOException { + protected void setFileExtensions(Path file, Map<String, byte[]> extensions, LinkOption... options) throws IOException { if (GenericUtils.isEmpty(extensions)) { return; } @@ -3181,7 +3181,7 @@ public class SftpSubsystem } } - protected void setFilePermissions(Path file, Set<PosixFilePermission> perms, LinkOption ... options) throws IOException { + protected void setFilePermissions(Path file, Set<PosixFilePermission> perms, LinkOption... options) throws IOException { if (OsUtils.isWin32()) { IoUtils.setPermissionsToFile(file.toFile(), perms); return; @@ -3198,7 +3198,7 @@ public class SftpSubsystem view.setPermissions(perms); } - protected void setFileAccessControl(Path file, List<AclEntry> acl, LinkOption ... options) throws IOException { + protected void setFileAccessControl(Path file, List<AclEntry> acl, LinkOption... options) throws IOException { AclFileAttributeView view = Files.getFileAttributeView(file, AclFileAttributeView.class, options); if (view == null) { throw new UnsupportedOperationException("ACL view not supported for " + file); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/test/java/org/apache/sshd/client/subsystem/sftp/SftpVersionsTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/client/subsystem/sftp/SftpVersionsTest.java b/sshd-core/src/test/java/org/apache/sshd/client/subsystem/sftp/SftpVersionsTest.java index ce911c1..4ae153a 100644 --- a/sshd-core/src/test/java/org/apache/sshd/client/subsystem/sftp/SftpVersionsTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/client/subsystem/sftp/SftpVersionsTest.java @@ -213,7 +213,7 @@ public class SftpVersionsTest extends AbstractSftpClientTestSupport { } @Override - protected void setFileAccessControl(Path file, List<AclEntry> aclActual, LinkOption ... options) throws IOException { + protected void setFileAccessControl(Path file, List<AclEntry> aclActual, LinkOption... options) throws IOException { if (aclActual != null) { assertListEquals("Mismatched ACL set for file=" + file, aclExpected, aclActual); numInvocations.incrementAndGet(); @@ -331,7 +331,7 @@ public class SftpVersionsTest extends AbstractSftpClientTestSupport { } @Override - protected void setFileExtensions(Path file, Map<String, byte[]> extensions, LinkOption ... options) throws IOException { + protected void setFileExtensions(Path file, Map<String, byte[]> extensions, LinkOption... options) throws IOException { assertExtensionsMapEquals("setFileExtensions(" + file + ")", expExtensions, extensions); numInvocations.incrementAndGet(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/test/java/org/apache/sshd/common/config/keys/AuthorizedKeysTestSupport.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/config/keys/AuthorizedKeysTestSupport.java b/sshd-core/src/test/java/org/apache/sshd/common/config/keys/AuthorizedKeysTestSupport.java index 6d580b8..ab77bf3 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/config/keys/AuthorizedKeysTestSupport.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/config/keys/AuthorizedKeysTestSupport.java @@ -51,7 +51,7 @@ public abstract class AuthorizedKeysTestSupport extends BaseTestSupport { super(); } - protected List<String> writeDefaultSupportedKeys(Path file, OpenOption ... options) throws IOException { + protected List<String> writeDefaultSupportedKeys(Path file, OpenOption... options) throws IOException { List<String> keyLines = loadDefaultSupportedKeys(); if (Files.exists(file)) { Files.delete(file); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/test/java/org/apache/sshd/common/util/security/SecurityProviderRegistrarTestSupport.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/util/security/SecurityProviderRegistrarTestSupport.java b/sshd-core/src/test/java/org/apache/sshd/common/util/security/SecurityProviderRegistrarTestSupport.java index cf955dc..a845e06 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/util/security/SecurityProviderRegistrarTestSupport.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/util/security/SecurityProviderRegistrarTestSupport.java @@ -46,7 +46,7 @@ public abstract class SecurityProviderRegistrarTestSupport extends BaseTestSuppo } public static void assertSecurityEntitySupportState( - String prefix, SecurityProviderRegistrar registrar, boolean expected, String name, Class<?> ... entities) { + String prefix, SecurityProviderRegistrar registrar, boolean expected, String name, Class<?>... entities) { assertSecurityEntitySupportState(prefix, registrar, expected, name, Arrays.asList(entities)); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/test/java/org/apache/sshd/server/shell/InvertedShellWrapperTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/server/shell/InvertedShellWrapperTest.java b/sshd-core/src/test/java/org/apache/sshd/server/shell/InvertedShellWrapperTest.java index 2d7e0cf..93945ed 100644 --- a/sshd-core/src/test/java/org/apache/sshd/server/shell/InvertedShellWrapperTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/server/shell/InvertedShellWrapperTest.java @@ -243,7 +243,7 @@ public class InvertedShellWrapperTest extends BaseTestSupport { return newDelayedInputStream(callsCount, data.getBytes(StandardCharsets.UTF_8)); } - private static InputStream newDelayedInputStream(final int callsCount, byte ... data) { + private static InputStream newDelayedInputStream(final int callsCount, byte... data) { return new ByteArrayInputStream(data) { private int delayCount; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-core/src/test/java/org/apache/sshd/util/test/BaseTestSupport.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/util/test/BaseTestSupport.java b/sshd-core/src/test/java/org/apache/sshd/util/test/BaseTestSupport.java index 49a535f..07c4e84 100644 --- a/sshd-core/src/test/java/org/apache/sshd/util/test/BaseTestSupport.java +++ b/sshd-core/src/test/java/org/apache/sshd/util/test/BaseTestSupport.java @@ -136,7 +136,7 @@ public abstract class BaseTestSupport extends Assert { * @see #TEMP_SUBFOLDER_NAME * @see #getTargetRelativeFile(Collection) */ - protected Path getTempTargetRelativeFile(String ... comps) { + protected Path getTempTargetRelativeFile(String... comps) { return getTempTargetRelativeFile(GenericUtils.isEmpty(comps) ? Collections.emptyList() : Arrays.asList(comps)); } @@ -175,7 +175,7 @@ public abstract class BaseTestSupport extends Assert { * @param comps The path components - ignored if {@code null}/empty * @return The {@link Path} representing the result - same as target folder if no components */ - protected Path getTargetRelativeFile(String ... comps) { + protected Path getTargetRelativeFile(String... comps) { return getTargetRelativeFile(GenericUtils.isEmpty(comps) ? Collections.emptyList() : Arrays.asList(comps)); } @@ -561,7 +561,7 @@ public abstract class BaseTestSupport extends Assert { return false; } - public static void outputDebugMessage(String format, Object ... args) { + public static void outputDebugMessage(String format, Object... args) { if (OUTPUT_DEBUG_MESSAGES) { outputDebugMessage(String.format(format, args)); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/22dc7c3a/sshd-ldap/src/test/java/org/apache/sshd/server/auth/BaseAuthenticatorTest.java ---------------------------------------------------------------------- diff --git a/sshd-ldap/src/test/java/org/apache/sshd/server/auth/BaseAuthenticatorTest.java b/sshd-ldap/src/test/java/org/apache/sshd/server/auth/BaseAuthenticatorTest.java index 2af8455..d7ed83c 100644 --- a/sshd-ldap/src/test/java/org/apache/sshd/server/auth/BaseAuthenticatorTest.java +++ b/sshd-ldap/src/test/java/org/apache/sshd/server/auth/BaseAuthenticatorTest.java @@ -76,7 +76,7 @@ public abstract class BaseAuthenticatorTest extends BaseTestSupport { return getHost((ldapServer == null) ? null : ldapServer.getTransports()); } - public static String getHost(Transport ... transports) { + public static String getHost(Transport... transports) { return GenericUtils.isEmpty(transports) ? null : transports[0].getAddress(); } @@ -88,7 +88,7 @@ public abstract class BaseAuthenticatorTest extends BaseTestSupport { return getPort((ldapServer == null) ? null : ldapServer.getTransports()); } - public static int getPort(Transport ... transports) { + public static int getPort(Transport... transports) { return GenericUtils.isEmpty(transports) ? -1 : transports[0].getPort(); }
