Updated Checkstyle ImportOrder configuration
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/9ef29e4e Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/9ef29e4e Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/9ef29e4e Branch: refs/heads/master Commit: 9ef29e4e359463474be735ae47c2768788c3f96e Parents: a3b70ab Author: Goldstein Lyor <[email protected]> Authored: Wed Aug 29 09:03:10 2018 +0300 Committer: Goldstein Lyor <[email protected]> Committed: Wed Aug 29 09:30:23 2018 +0300 ---------------------------------------------------------------------- sshd-checkstyle.xml | 2 +- .../keys/loader/putty/EdDSAPuttyKeyDecoder.java | 6 +++--- .../util/security/eddsa/Ed25519PublicKeyDecoder.java | 10 +++++----- .../security/eddsa/EdDSASecurityProviderUtils.java | 14 +++++++------- .../eddsa/OpenSSHEd25519PrivateKeyEntryDecoder.java | 12 ++++++------ .../common/util/security/eddsa/SignatureEd25519.java | 4 ++-- .../test/java/org/apache/sshd/KeyReExchangeTest.java | 4 ++-- .../org/apache/sshd/common/cipher/CipherTest.java | 4 ++-- .../sshd/common/compression/CompressionTest.java | 4 ++-- .../common/forward/ApacheServerJSchClientTest.java | 6 +++--- .../sshd/common/forward/PortForwardingLoadTest.java | 8 ++++---- .../sshd/common/forward/PortForwardingTest.java | 8 ++++---- .../test/java/org/apache/sshd/common/mac/MacTest.java | 4 ++-- .../common/util/security/eddsa/EDDSAProviderTest.java | 4 ++-- .../util/security/eddsa/Ed25519VectorsTest.java | 6 +++--- .../eddsa/EdDSASecurityProviderRegistrarTest.java | 4 ++-- .../sshd/server/auth/AsyncAuthInteractiveTest.java | 6 +++--- .../org/apache/sshd/server/auth/AsyncAuthTest.java | 6 +++--- .../apache/sshd/server/auth/AsyncAuthTestBase.java | 4 ++-- .../java/org/apache/sshd/spring/SpringConfigTest.java | 6 +++--- .../java/org/apache/sshd/util/test/JSchLogger.java | 4 ++-- .../org/apache/sshd/git/pack/GitPackCommandTest.java | 4 ++-- .../test/java/org/apache/sshd/client/scp/ScpTest.java | 8 ++++---- .../apache/sshd/client/subsystem/sftp/SftpTest.java | 6 +++--- .../sftp/ApacheSshdSftpSessionFactoryTest.java | 6 +++--- 25 files changed, 75 insertions(+), 75 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9ef29e4e/sshd-checkstyle.xml ---------------------------------------------------------------------- diff --git a/sshd-checkstyle.xml b/sshd-checkstyle.xml index 678f9a9..f698bac 100644 --- a/sshd-checkstyle.xml +++ b/sshd-checkstyle.xml @@ -76,7 +76,7 @@ <module name="RedundantImport" /> <module name="UnusedImports" /> <module name="ImportOrder"> - <property name="groups" value="java,javax,org.w3c,org.xml,junit,antlr,com.,net,org,*" /> + <property name="groups" value="java,javax,org,net,io,com,*" /> <property name="ordered" value="true" /> <property name="separated" value="true" /> </module> http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9ef29e4e/sshd-contrib/src/main/java/org/apache/sshd/common/config/keys/loader/putty/EdDSAPuttyKeyDecoder.java ---------------------------------------------------------------------- diff --git a/sshd-contrib/src/main/java/org/apache/sshd/common/config/keys/loader/putty/EdDSAPuttyKeyDecoder.java b/sshd-contrib/src/main/java/org/apache/sshd/common/config/keys/loader/putty/EdDSAPuttyKeyDecoder.java index bd2662c..f5980ab 100644 --- a/sshd-contrib/src/main/java/org/apache/sshd/common/config/keys/loader/putty/EdDSAPuttyKeyDecoder.java +++ b/sshd-contrib/src/main/java/org/apache/sshd/common/config/keys/loader/putty/EdDSAPuttyKeyDecoder.java @@ -28,13 +28,13 @@ import java.security.spec.InvalidKeySpecException; import java.util.Collection; import java.util.Collections; -import net.i2p.crypto.eddsa.EdDSAPrivateKey; -import net.i2p.crypto.eddsa.EdDSAPublicKey; - import org.apache.sshd.common.keyprovider.KeyPairProvider; import org.apache.sshd.common.util.security.SecurityUtils; import org.apache.sshd.common.util.security.eddsa.EdDSASecurityProviderUtils; +import net.i2p.crypto.eddsa.EdDSAPrivateKey; +import net.i2p.crypto.eddsa.EdDSAPublicKey; + /** * TODO Add javadoc * http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9ef29e4e/sshd-core/src/main/java/org/apache/sshd/common/util/security/eddsa/Ed25519PublicKeyDecoder.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/security/eddsa/Ed25519PublicKeyDecoder.java b/sshd-core/src/main/java/org/apache/sshd/common/util/security/eddsa/Ed25519PublicKeyDecoder.java index c896e0e..793965c 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/util/security/eddsa/Ed25519PublicKeyDecoder.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/util/security/eddsa/Ed25519PublicKeyDecoder.java @@ -27,16 +27,16 @@ import java.security.KeyPairGenerator; import java.util.Collections; import java.util.Objects; -import net.i2p.crypto.eddsa.EdDSAPrivateKey; -import net.i2p.crypto.eddsa.EdDSAPublicKey; -import net.i2p.crypto.eddsa.spec.EdDSAPrivateKeySpec; -import net.i2p.crypto.eddsa.spec.EdDSAPublicKeySpec; - import org.apache.sshd.common.config.keys.KeyEntryResolver; import org.apache.sshd.common.config.keys.impl.AbstractPublicKeyEntryDecoder; import org.apache.sshd.common.keyprovider.KeyPairProvider; import org.apache.sshd.common.util.security.SecurityUtils; +import net.i2p.crypto.eddsa.EdDSAPrivateKey; +import net.i2p.crypto.eddsa.EdDSAPublicKey; +import net.i2p.crypto.eddsa.spec.EdDSAPrivateKeySpec; +import net.i2p.crypto.eddsa.spec.EdDSAPublicKeySpec; + /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9ef29e4e/sshd-core/src/main/java/org/apache/sshd/common/util/security/eddsa/EdDSASecurityProviderUtils.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/security/eddsa/EdDSASecurityProviderUtils.java b/sshd-core/src/main/java/org/apache/sshd/common/util/security/eddsa/EdDSASecurityProviderUtils.java index 2ba5272..242f550 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/util/security/eddsa/EdDSASecurityProviderUtils.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/util/security/eddsa/EdDSASecurityProviderUtils.java @@ -28,6 +28,13 @@ import java.security.PublicKey; import java.util.Arrays; import java.util.Objects; +import org.apache.sshd.common.config.keys.PrivateKeyEntryDecoder; +import org.apache.sshd.common.config.keys.PublicKeyEntryDecoder; +import org.apache.sshd.common.keyprovider.KeyPairProvider; +import org.apache.sshd.common.util.ValidateUtils; +import org.apache.sshd.common.util.buffer.Buffer; +import org.apache.sshd.common.util.security.SecurityUtils; + import net.i2p.crypto.eddsa.EdDSAEngine; import net.i2p.crypto.eddsa.EdDSAKey; import net.i2p.crypto.eddsa.EdDSAPrivateKey; @@ -37,13 +44,6 @@ import net.i2p.crypto.eddsa.spec.EdDSAParameterSpec; import net.i2p.crypto.eddsa.spec.EdDSAPrivateKeySpec; import net.i2p.crypto.eddsa.spec.EdDSAPublicKeySpec; -import org.apache.sshd.common.config.keys.PrivateKeyEntryDecoder; -import org.apache.sshd.common.config.keys.PublicKeyEntryDecoder; -import org.apache.sshd.common.keyprovider.KeyPairProvider; -import org.apache.sshd.common.util.ValidateUtils; -import org.apache.sshd.common.util.buffer.Buffer; -import org.apache.sshd.common.util.security.SecurityUtils; - /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9ef29e4e/sshd-core/src/main/java/org/apache/sshd/common/util/security/eddsa/OpenSSHEd25519PrivateKeyEntryDecoder.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/security/eddsa/OpenSSHEd25519PrivateKeyEntryDecoder.java b/sshd-core/src/main/java/org/apache/sshd/common/util/security/eddsa/OpenSSHEd25519PrivateKeyEntryDecoder.java index 4c511d5..7e839e4 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/util/security/eddsa/OpenSSHEd25519PrivateKeyEntryDecoder.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/util/security/eddsa/OpenSSHEd25519PrivateKeyEntryDecoder.java @@ -32,6 +32,12 @@ import java.util.Collections; import java.util.Locale; import java.util.Objects; +import org.apache.sshd.common.config.keys.FilePasswordProvider; +import org.apache.sshd.common.config.keys.KeyEntryResolver; +import org.apache.sshd.common.config.keys.impl.AbstractPrivateKeyEntryDecoder; +import org.apache.sshd.common.keyprovider.KeyPairProvider; +import org.apache.sshd.common.util.security.SecurityUtils; + import net.i2p.crypto.eddsa.EdDSAPrivateKey; import net.i2p.crypto.eddsa.EdDSAPublicKey; import net.i2p.crypto.eddsa.spec.EdDSANamedCurveTable; @@ -39,12 +45,6 @@ import net.i2p.crypto.eddsa.spec.EdDSAParameterSpec; import net.i2p.crypto.eddsa.spec.EdDSAPrivateKeySpec; import net.i2p.crypto.eddsa.spec.EdDSAPublicKeySpec; -import org.apache.sshd.common.config.keys.FilePasswordProvider; -import org.apache.sshd.common.config.keys.KeyEntryResolver; -import org.apache.sshd.common.config.keys.impl.AbstractPrivateKeyEntryDecoder; -import org.apache.sshd.common.keyprovider.KeyPairProvider; -import org.apache.sshd.common.util.security.SecurityUtils; - /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9ef29e4e/sshd-core/src/main/java/org/apache/sshd/common/util/security/eddsa/SignatureEd25519.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/security/eddsa/SignatureEd25519.java b/sshd-core/src/main/java/org/apache/sshd/common/util/security/eddsa/SignatureEd25519.java index 0d16812..012be95 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/util/security/eddsa/SignatureEd25519.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/util/security/eddsa/SignatureEd25519.java @@ -20,12 +20,12 @@ package org.apache.sshd.common.util.security.eddsa; import java.util.Map; -import net.i2p.crypto.eddsa.EdDSAEngine; - import org.apache.sshd.common.keyprovider.KeyPairProvider; import org.apache.sshd.common.signature.AbstractSignature; import org.apache.sshd.common.util.ValidateUtils; +import net.i2p.crypto.eddsa.EdDSAEngine; + /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9ef29e4e/sshd-core/src/test/java/org/apache/sshd/KeyReExchangeTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/KeyReExchangeTest.java b/sshd-core/src/test/java/org/apache/sshd/KeyReExchangeTest.java index 4fdb932..4595afa 100644 --- a/sshd-core/src/test/java/org/apache/sshd/KeyReExchangeTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/KeyReExchangeTest.java @@ -36,8 +36,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import com.jcraft.jsch.JSch; - import org.apache.sshd.client.SshClient; import org.apache.sshd.client.channel.ChannelShell; import org.apache.sshd.client.channel.ClientChannel; @@ -72,6 +70,8 @@ import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runners.MethodSorters; +import com.jcraft.jsch.JSch; + /** * Test key exchange algorithms. * http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9ef29e4e/sshd-core/src/test/java/org/apache/sshd/common/cipher/CipherTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/cipher/CipherTest.java b/sshd-core/src/test/java/org/apache/sshd/common/cipher/CipherTest.java index 70f9b30..4a02074 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/cipher/CipherTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/cipher/CipherTest.java @@ -28,8 +28,6 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; -import com.jcraft.jsch.JSch; - import org.apache.sshd.common.NamedFactory; import org.apache.sshd.common.NamedResource; import org.apache.sshd.common.channel.Channel; @@ -52,6 +50,8 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; import org.junit.runners.Parameterized.UseParametersRunnerFactory; +import com.jcraft.jsch.JSch; + /** * Test Cipher algorithms. * http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9ef29e4e/sshd-core/src/test/java/org/apache/sshd/common/compression/CompressionTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/compression/CompressionTest.java b/sshd-core/src/test/java/org/apache/sshd/common/compression/CompressionTest.java index 87fb973..a8132fb 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/compression/CompressionTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/compression/CompressionTest.java @@ -26,8 +26,6 @@ import java.util.Collections; import java.util.EnumSet; import java.util.List; -import com.jcraft.jsch.JSch; - import org.apache.sshd.common.channel.Channel; import org.apache.sshd.common.kex.KexProposalOption; import org.apache.sshd.common.mac.MacTest; @@ -52,6 +50,8 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; import org.junit.runners.Parameterized.UseParametersRunnerFactory; +import com.jcraft.jsch.JSch; + /** * Test compression algorithms. * http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9ef29e4e/sshd-core/src/test/java/org/apache/sshd/common/forward/ApacheServerJSchClientTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/forward/ApacheServerJSchClientTest.java b/sshd-core/src/test/java/org/apache/sshd/common/forward/ApacheServerJSchClientTest.java index bec67a1..8dea18a 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/forward/ApacheServerJSchClientTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/forward/ApacheServerJSchClientTest.java @@ -22,9 +22,6 @@ import java.io.IOException; import java.net.ServerSocket; import java.util.concurrent.TimeUnit; -import com.jcraft.jsch.JSch; -import com.jcraft.jsch.Session; - import org.apache.sshd.server.SshServer; import org.apache.sshd.server.forward.AcceptAllForwardingFilter; import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider; @@ -39,6 +36,9 @@ import org.junit.runners.MethodSorters; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.jcraft.jsch.JSch; +import com.jcraft.jsch.Session; + /** * Port forwarding tests - Apache server, JSch client */ http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9ef29e4e/sshd-core/src/test/java/org/apache/sshd/common/forward/PortForwardingLoadTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/forward/PortForwardingLoadTest.java b/sshd-core/src/test/java/org/apache/sshd/common/forward/PortForwardingLoadTest.java index 3b6197e..c68e445 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/forward/PortForwardingLoadTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/forward/PortForwardingLoadTest.java @@ -36,10 +36,6 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import com.jcraft.jsch.JSch; -import com.jcraft.jsch.JSchException; -import com.jcraft.jsch.Session; - import org.apache.commons.httpclient.HostConfiguration; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpVersion; @@ -67,6 +63,10 @@ import org.junit.runners.MethodSorters; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.jcraft.jsch.JSch; +import com.jcraft.jsch.JSchException; +import com.jcraft.jsch.Session; + /** * Port forwarding tests */ http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9ef29e4e/sshd-core/src/test/java/org/apache/sshd/common/forward/PortForwardingTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/forward/PortForwardingTest.java b/sshd-core/src/test/java/org/apache/sshd/common/forward/PortForwardingTest.java index e933046..79bc2db 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/forward/PortForwardingTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/forward/PortForwardingTest.java @@ -39,10 +39,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import com.jcraft.jsch.JSch; -import com.jcraft.jsch.JSchException; -import com.jcraft.jsch.Session; - import org.apache.mina.core.buffer.IoBuffer; import org.apache.mina.core.service.IoAcceptor; import org.apache.mina.core.service.IoHandlerAdapter; @@ -73,6 +69,10 @@ import org.junit.runners.MethodSorters; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.jcraft.jsch.JSch; +import com.jcraft.jsch.JSchException; +import com.jcraft.jsch.Session; + /** * Port forwarding tests */ http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9ef29e4e/sshd-core/src/test/java/org/apache/sshd/common/mac/MacTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/mac/MacTest.java b/sshd-core/src/test/java/org/apache/sshd/common/mac/MacTest.java index 5e24eb5..823955b 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/mac/MacTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/mac/MacTest.java @@ -28,8 +28,6 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.TimeUnit; -import com.jcraft.jsch.JSch; - import org.apache.sshd.common.channel.Channel; import org.apache.sshd.common.util.GenericUtils; import org.apache.sshd.server.SshServer; @@ -50,6 +48,8 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; import org.junit.runners.Parameterized.UseParametersRunnerFactory; +import com.jcraft.jsch.JSch; + import ch.ethz.ssh2.Connection; import ch.ethz.ssh2.ConnectionInfo; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9ef29e4e/sshd-core/src/test/java/org/apache/sshd/common/util/security/eddsa/EDDSAProviderTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/util/security/eddsa/EDDSAProviderTest.java b/sshd-core/src/test/java/org/apache/sshd/common/util/security/eddsa/EDDSAProviderTest.java index bcbb733..d30fe92 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/util/security/eddsa/EDDSAProviderTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/util/security/eddsa/EDDSAProviderTest.java @@ -27,8 +27,6 @@ import java.security.PrivateKey; import java.security.PublicKey; import java.security.Signature; -import net.i2p.crypto.eddsa.EdDSAEngine; - import org.apache.sshd.common.config.keys.AuthorizedKeyEntry; import org.apache.sshd.common.config.keys.KeyUtils; import org.apache.sshd.common.keyprovider.KeyPairProvider; @@ -44,6 +42,8 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runners.MethodSorters; +import net.i2p.crypto.eddsa.EdDSAEngine; + /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9ef29e4e/sshd-core/src/test/java/org/apache/sshd/common/util/security/eddsa/Ed25519VectorsTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/util/security/eddsa/Ed25519VectorsTest.java b/sshd-core/src/test/java/org/apache/sshd/common/util/security/eddsa/Ed25519VectorsTest.java index 00a64b9..23e5517 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/util/security/eddsa/Ed25519VectorsTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/util/security/eddsa/Ed25519VectorsTest.java @@ -27,9 +27,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import net.i2p.crypto.eddsa.EdDSAPrivateKey; -import net.i2p.crypto.eddsa.EdDSAPublicKey; - import org.apache.sshd.common.signature.Signature; import org.apache.sshd.common.util.buffer.BufferUtils; import org.apache.sshd.common.util.security.SecurityUtils; @@ -47,6 +44,9 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; import org.junit.runners.Parameterized.UseParametersRunnerFactory; +import net.i2p.crypto.eddsa.EdDSAPrivateKey; +import net.i2p.crypto.eddsa.EdDSAPublicKey; + /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> * @see <A HREF="https://tools.ietf.org/html/draft-josefsson-eddsa-ed25519-02#section-6";> http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9ef29e4e/sshd-core/src/test/java/org/apache/sshd/common/util/security/eddsa/EdDSASecurityProviderRegistrarTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/util/security/eddsa/EdDSASecurityProviderRegistrarTest.java b/sshd-core/src/test/java/org/apache/sshd/common/util/security/eddsa/EdDSASecurityProviderRegistrarTest.java index f2c1f3f..c2ce550 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/util/security/eddsa/EdDSASecurityProviderRegistrarTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/util/security/eddsa/EdDSASecurityProviderRegistrarTest.java @@ -26,8 +26,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.HashSet; -import net.i2p.crypto.eddsa.EdDSASecurityProvider; - import org.apache.sshd.common.util.security.SecurityProviderRegistrar; import org.apache.sshd.common.util.security.SecurityProviderRegistrarTestSupport; import org.apache.sshd.common.util.security.SecurityUtils; @@ -37,6 +35,8 @@ import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runners.MethodSorters; +import net.i2p.crypto.eddsa.EdDSASecurityProvider; + /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9ef29e4e/sshd-core/src/test/java/org/apache/sshd/server/auth/AsyncAuthInteractiveTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/server/auth/AsyncAuthInteractiveTest.java b/sshd-core/src/test/java/org/apache/sshd/server/auth/AsyncAuthInteractiveTest.java index 4b81fe4..40e86c8 100644 --- a/sshd-core/src/test/java/org/apache/sshd/server/auth/AsyncAuthInteractiveTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/server/auth/AsyncAuthInteractiveTest.java @@ -18,15 +18,15 @@ */ package org.apache.sshd.server.auth; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; + import com.jcraft.jsch.ChannelShell; import com.jcraft.jsch.JSch; import com.jcraft.jsch.JSchException; import com.jcraft.jsch.Session; import com.jcraft.jsch.UserInfo; -import org.junit.FixMethodOrder; -import org.junit.runners.MethodSorters; - /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9ef29e4e/sshd-core/src/test/java/org/apache/sshd/server/auth/AsyncAuthTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/server/auth/AsyncAuthTest.java b/sshd-core/src/test/java/org/apache/sshd/server/auth/AsyncAuthTest.java index aa557e1..70530db 100644 --- a/sshd-core/src/test/java/org/apache/sshd/server/auth/AsyncAuthTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/server/auth/AsyncAuthTest.java @@ -18,15 +18,15 @@ */ package org.apache.sshd.server.auth; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; + import com.jcraft.jsch.ChannelShell; import com.jcraft.jsch.JSch; import com.jcraft.jsch.JSchException; import com.jcraft.jsch.Session; import com.jcraft.jsch.UserInfo; -import org.junit.FixMethodOrder; -import org.junit.runners.MethodSorters; - /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9ef29e4e/sshd-core/src/test/java/org/apache/sshd/server/auth/AsyncAuthTestBase.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/server/auth/AsyncAuthTestBase.java b/sshd-core/src/test/java/org/apache/sshd/server/auth/AsyncAuthTestBase.java index 4328117..76ce606 100644 --- a/sshd-core/src/test/java/org/apache/sshd/server/auth/AsyncAuthTestBase.java +++ b/sshd-core/src/test/java/org/apache/sshd/server/auth/AsyncAuthTestBase.java @@ -20,8 +20,6 @@ package org.apache.sshd.server.auth; import java.io.File; -import com.jcraft.jsch.JSchException; - import org.apache.sshd.common.FactoryManager; import org.apache.sshd.server.SshServer; import org.apache.sshd.server.auth.password.PasswordAuthenticator; @@ -31,6 +29,8 @@ import org.apache.sshd.util.test.EchoShellFactory; import org.junit.After; import org.junit.Test; +import com.jcraft.jsch.JSchException; + /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9ef29e4e/sshd-core/src/test/java/org/apache/sshd/spring/SpringConfigTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/spring/SpringConfigTest.java b/sshd-core/src/test/java/org/apache/sshd/spring/SpringConfigTest.java index 162552a..8d66018 100644 --- a/sshd-core/src/test/java/org/apache/sshd/spring/SpringConfigTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/spring/SpringConfigTest.java @@ -22,9 +22,6 @@ import java.io.OutputStream; import java.nio.charset.StandardCharsets; import java.util.concurrent.TimeUnit; -import com.jcraft.jsch.Channel; -import com.jcraft.jsch.JSch; - import org.apache.sshd.common.util.OsUtils; import org.apache.sshd.server.SshServer; import org.apache.sshd.util.test.BaseTestSupport; @@ -38,6 +35,9 @@ import org.junit.Test; import org.junit.runners.MethodSorters; import org.springframework.context.support.ClassPathXmlApplicationContext; +import com.jcraft.jsch.Channel; +import com.jcraft.jsch.JSch; + /** * Test for spring based configuration. * http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9ef29e4e/sshd-core/src/test/java/org/apache/sshd/util/test/JSchLogger.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/util/test/JSchLogger.java b/sshd-core/src/test/java/org/apache/sshd/util/test/JSchLogger.java index 09124c1..908d359 100644 --- a/sshd-core/src/test/java/org/apache/sshd/util/test/JSchLogger.java +++ b/sshd-core/src/test/java/org/apache/sshd/util/test/JSchLogger.java @@ -18,11 +18,11 @@ */ package org.apache.sshd.util.test; +import org.slf4j.LoggerFactory; + import com.jcraft.jsch.JSch; import com.jcraft.jsch.Logger; -import org.slf4j.LoggerFactory; - /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9ef29e4e/sshd-git/src/test/java/org/apache/sshd/git/pack/GitPackCommandTest.java ---------------------------------------------------------------------- diff --git a/sshd-git/src/test/java/org/apache/sshd/git/pack/GitPackCommandTest.java b/sshd-git/src/test/java/org/apache/sshd/git/pack/GitPackCommandTest.java index f6bc31d..77e520a 100644 --- a/sshd-git/src/test/java/org/apache/sshd/git/pack/GitPackCommandTest.java +++ b/sshd-git/src/test/java/org/apache/sshd/git/pack/GitPackCommandTest.java @@ -22,8 +22,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.Collections; -import com.jcraft.jsch.JSch; - import org.apache.sshd.client.SshClient; import org.apache.sshd.common.util.OsUtils; import org.apache.sshd.git.GitLocationResolver; @@ -45,6 +43,8 @@ import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runners.MethodSorters; +import com.jcraft.jsch.JSch; + /** */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9ef29e4e/sshd-scp/src/test/java/org/apache/sshd/client/scp/ScpTest.java ---------------------------------------------------------------------- diff --git a/sshd-scp/src/test/java/org/apache/sshd/client/scp/ScpTest.java b/sshd-scp/src/test/java/org/apache/sshd/client/scp/ScpTest.java index c17ae78..c1216c4 100644 --- a/sshd-scp/src/test/java/org/apache/sshd/client/scp/ScpTest.java +++ b/sshd-scp/src/test/java/org/apache/sshd/client/scp/ScpTest.java @@ -38,10 +38,6 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import com.jcraft.jsch.ChannelExec; -import com.jcraft.jsch.JSch; -import com.jcraft.jsch.JSchException; - import org.apache.sshd.client.SshClient; import org.apache.sshd.client.session.ClientSession; import org.apache.sshd.common.Factory; @@ -76,6 +72,10 @@ import org.junit.Ignore; import org.junit.Test; import org.junit.runners.MethodSorters; +import com.jcraft.jsch.ChannelExec; +import com.jcraft.jsch.JSch; +import com.jcraft.jsch.JSchException; + import ch.ethz.ssh2.Connection; import ch.ethz.ssh2.ConnectionInfo; import ch.ethz.ssh2.SCPClient; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9ef29e4e/sshd-sftp/src/test/java/org/apache/sshd/client/subsystem/sftp/SftpTest.java ---------------------------------------------------------------------- diff --git a/sshd-sftp/src/test/java/org/apache/sshd/client/subsystem/sftp/SftpTest.java b/sshd-sftp/src/test/java/org/apache/sshd/client/subsystem/sftp/SftpTest.java index 5b284a3..5e7b360 100644 --- a/sshd-sftp/src/test/java/org/apache/sshd/client/subsystem/sftp/SftpTest.java +++ b/sshd-sftp/src/test/java/org/apache/sshd/client/subsystem/sftp/SftpTest.java @@ -57,9 +57,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; -import com.jcraft.jsch.ChannelSftp; -import com.jcraft.jsch.JSch; - import org.apache.sshd.client.session.ClientSession; import org.apache.sshd.client.subsystem.sftp.SftpClient.Attributes; import org.apache.sshd.client.subsystem.sftp.SftpClient.CloseableHandle; @@ -111,6 +108,9 @@ import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runners.MethodSorters; +import com.jcraft.jsch.ChannelSftp; +import com.jcraft.jsch.JSch; + /** * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9ef29e4e/sshd-spring-sftp/src/test/java/org/apache/sshd/spring/integration/sftp/ApacheSshdSftpSessionFactoryTest.java ---------------------------------------------------------------------- diff --git a/sshd-spring-sftp/src/test/java/org/apache/sshd/spring/integration/sftp/ApacheSshdSftpSessionFactoryTest.java b/sshd-spring-sftp/src/test/java/org/apache/sshd/spring/integration/sftp/ApacheSshdSftpSessionFactoryTest.java index 6b343b0..e59ebd8 100644 --- a/sshd-spring-sftp/src/test/java/org/apache/sshd/spring/integration/sftp/ApacheSshdSftpSessionFactoryTest.java +++ b/sshd-spring-sftp/src/test/java/org/apache/sshd/spring/integration/sftp/ApacheSshdSftpSessionFactoryTest.java @@ -35,9 +35,6 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; -import com.jcraft.jsch.ChannelSftp.LsEntry; -import com.jcraft.jsch.SftpATTRS; - import org.apache.sshd.client.SshClient; import org.apache.sshd.client.session.ClientSession; import org.apache.sshd.client.subsystem.sftp.SftpClient; @@ -62,6 +59,9 @@ import org.springframework.integration.file.remote.session.Session; import org.springframework.integration.file.remote.session.SessionFactory; import org.springframework.integration.sftp.session.DefaultSftpSessionFactory; +import com.jcraft.jsch.ChannelSftp.LsEntry; +import com.jcraft.jsch.SftpATTRS; + /** * TODO Add javadoc *
