http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/977b7b52/sshd-core/src/test/java/org/apache/sshd/common/signature/SignatureFactoriesTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/signature/SignatureFactoriesTest.java b/sshd-core/src/test/java/org/apache/sshd/common/signature/SignatureFactoriesTest.java index 4896c5e..8b60bf0 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/signature/SignatureFactoriesTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/signature/SignatureFactoriesTest.java @@ -78,27 +78,22 @@ public class SignatureFactoriesTest extends BaseTestSupport { @Parameters(name = "type={0}, size={2}") public static List<Object[]> parameters() { - return Collections.unmodifiableList(new ArrayList<Object[]>() { - // Not serializing it - private static final long serialVersionUID = 1L; - - { - addTests(KeyPairProvider.SSH_DSS, BuiltinSignatures.dsa, DSS_SIZES, DSSPublicKeyEntryDecoder.INSTANCE); - addTests(KeyPairProvider.SSH_RSA, BuiltinSignatures.rsa, RSA_SIZES, RSAPublicKeyDecoder.INSTANCE); - if (SecurityUtils.hasEcc()) { - for (ECCurves curve : ECCurves.VALUES) { - BuiltinSignatures factory = BuiltinSignatures.fromFactoryName(curve.getKeyType()); - addTests(curve.getName(), factory, Collections.singletonList(curve.getKeySize()), ECDSAPublicKeyEntryDecoder.INSTANCE); - } - } + List<Object[]> list = new ArrayList<>(); + addTests(list, KeyPairProvider.SSH_DSS, BuiltinSignatures.dsa, DSS_SIZES, DSSPublicKeyEntryDecoder.INSTANCE); + addTests(list, KeyPairProvider.SSH_RSA, BuiltinSignatures.rsa, RSA_SIZES, RSAPublicKeyDecoder.INSTANCE); + if (SecurityUtils.hasEcc()) { + for (ECCurves curve : ECCurves.VALUES) { + BuiltinSignatures factory = BuiltinSignatures.fromFactoryName(curve.getKeyType()); + addTests(list, curve.getName(), factory, Collections.singletonList(curve.getKeySize()), ECDSAPublicKeyEntryDecoder.INSTANCE); } + } + return Collections.unmodifiableList(list); + } - private void addTests(String keyType, NamedFactory<Signature> factory, Collection<Integer> sizes, PublicKeyEntryDecoder<?, ?> decoder) { - for (Integer keySize : sizes) { - add(new Object[]{keyType, factory, keySize, decoder}); - } - } - }); + private static void addTests(List<Object[]> list, String keyType, NamedFactory<Signature> factory, Collection<Integer> sizes, PublicKeyEntryDecoder<?, ?> decoder) { + for (Integer keySize : sizes) { + list.add(new Object[]{keyType, factory, keySize, decoder}); + } } @BeforeClass @@ -146,16 +141,13 @@ public class SignatureFactoriesTest extends BaseTestSupport { protected void testKeyPairProvider( final String keyName, final int keySize, final PublicKeyEntryDecoder<?, ?> decoder, List<NamedFactory<Signature>> signatures) throws Exception { - testKeyPairProvider(keyName, new Factory<Iterable<KeyPair>>() { - @Override - public Iterable<KeyPair> create() { - try { - KeyPair kp = decoder.generateKeyPair(keySize); - outputDebugMessage("Generated key pair for %s - key size=%d", keyName, keySize); - return Collections.singletonList(kp); - } catch (Exception e) { - throw new RuntimeSshException(e); - } + testKeyPairProvider(keyName, () -> { + try { + KeyPair kp = decoder.generateKeyPair(keySize); + outputDebugMessage("Generated key pair for %s - key size=%d", keyName, keySize); + return Collections.singletonList(kp); + } catch (Exception e) { + throw new RuntimeSshException(e); } }, signatures); }
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/977b7b52/sshd-core/src/test/java/org/apache/sshd/common/signature/SignatureRSATest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/signature/SignatureRSATest.java b/sshd-core/src/test/java/org/apache/sshd/common/signature/SignatureRSATest.java index d12e7e3..b631be7 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/signature/SignatureRSATest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/signature/SignatureRSATest.java @@ -86,20 +86,15 @@ public class SignatureRSATest extends BaseTestSupport { @Test // see SSHD-642 public void testLeadingZeroesJCE() throws Throwable { - testLeadingZeroes(new Factory<SignatureRSA>() { + testLeadingZeroes(() -> new SignatureRSA() { @Override - public SignatureRSA create() { - return new SignatureRSA() { - @Override - protected java.security.Signature doInitSignature(String algo, boolean forSigning) throws GeneralSecurityException { - assertFalse("Signature not initialized for verification", forSigning); - java.security.Signature signature = java.security.Signature.getInstance(algo); - Provider provider = signature.getProvider(); - String name = provider.getName(); - assertNotEquals("BC provider used although not required", SecurityUtils.BOUNCY_CASTLE, name); - return signature; - } - }; + protected java.security.Signature doInitSignature(String algo, boolean forSigning) throws GeneralSecurityException { + assertFalse("Signature not initialized for verification", forSigning); + java.security.Signature signature = java.security.Signature.getInstance(algo); + Provider provider = signature.getProvider(); + String name = provider.getName(); + assertNotEquals("BC provider used although not required", SecurityUtils.BOUNCY_CASTLE, name); + return signature; } }); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/977b7b52/sshd-core/src/test/java/org/apache/sshd/common/util/EventListenerUtilsTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/util/EventListenerUtilsTest.java b/sshd-core/src/test/java/org/apache/sshd/common/util/EventListenerUtilsTest.java index 4db0e0a..7d9587c 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/util/EventListenerUtilsTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/util/EventListenerUtilsTest.java @@ -49,7 +49,7 @@ public class EventListenerUtilsTest extends BaseTestSupport { ProxyListener listener = EventListenerUtils.proxyWrapper(ProxyListener.class, impls); String expStr = getCurrentTestName(); - Number expNum = Long.valueOf(System.currentTimeMillis()); + Number expNum = System.currentTimeMillis(); listener.callMeWithString(expStr); listener.callMeWithNumber(expNum); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/977b7b52/sshd-core/src/test/java/org/apache/sshd/common/util/NumberUtilsTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/util/NumberUtilsTest.java b/sshd-core/src/test/java/org/apache/sshd/common/util/NumberUtilsTest.java index ed42e02..537d055 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/util/NumberUtilsTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/util/NumberUtilsTest.java @@ -39,14 +39,14 @@ public class NumberUtilsTest extends BaseTestSupport { long expected = 1L; for (int index = 0; index < Long.SIZE; index++, expected <<= 1) { Long actual = NumberUtils.POWERS_OF_TWO.get(index); - assertEquals("Mismatched value at index=" + index, Long.toHexString(expected), Long.toHexString(actual.longValue())); + assertEquals("Mismatched value at index=" + index, Long.toHexString(expected), Long.toHexString(actual)); } } @Test public void testNextPowerOf2() { for (Long v : NumberUtils.POWERS_OF_TWO) { - long expected = v.longValue(); + long expected = v; if (expected > 2L) { assertEquals("Mismatched lower bound value", expected, NumberUtils.getNextPowerOf2(expected - 1L)); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/977b7b52/sshd-core/src/test/java/org/apache/sshd/common/util/SecurityUtilsTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/util/SecurityUtilsTest.java b/sshd-core/src/test/java/org/apache/sshd/common/util/SecurityUtilsTest.java index f2f57d2..310fb79 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/util/SecurityUtilsTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/util/SecurityUtilsTest.java @@ -19,7 +19,6 @@ package org.apache.sshd.common.util; -import java.io.IOException; import java.nio.file.Path; import java.security.GeneralSecurityException; import java.security.KeyPair; @@ -56,12 +55,7 @@ import org.junit.runners.MethodSorters; @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class SecurityUtilsTest extends BaseTestSupport { private static final String DEFAULT_PASSWORD = "super secret passphrase"; - private static final FilePasswordProvider TEST_PASSWORD_PROVIDER = new FilePasswordProvider() { - @Override - public String getPassword(String file) throws IOException { - return DEFAULT_PASSWORD; - } - }; + private static final FilePasswordProvider TEST_PASSWORD_PROVIDER = file -> DEFAULT_PASSWORD; public SecurityUtilsTest() { super(); @@ -157,7 +151,7 @@ public class SecurityUtilsTest extends BaseTestSupport { Class<? extends PublicKey> pubType, Class<? extends PrivateKey> prvType) { provider.setPasswordFinder(TEST_PASSWORD_PROVIDER); Iterable<KeyPair> iterator = provider.loadKeys(); - List<KeyPair> pairs = new ArrayList<KeyPair>(); + List<KeyPair> pairs = new ArrayList<>(); for (KeyPair kp : iterator) { pairs.add(kp); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/977b7b52/sshd-core/src/test/java/org/apache/sshd/common/util/TransformerTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/util/TransformerTest.java b/sshd-core/src/test/java/org/apache/sshd/common/util/TransformerTest.java index a74d2e0..063112b 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/util/TransformerTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/util/TransformerTest.java @@ -59,14 +59,14 @@ public class TransformerTest extends BaseTestSupport { @Test public void testSingletonIdentityInstance() { - Transformer<Date, Date> dateTransformer = Transformer.Utils.identity(); - Transformer<String, String> stringTransformer = Transformer.Utils.identity(); + Transformer<Date, Date> dateTransformer = Transformer.identity(); + Transformer<String, String> stringTransformer = Transformer.identity(); assertSame("Mismatched identity instance", dateTransformer, stringTransformer); } @Test public void testIdentity() { - Transformer<Object, Object> identity = Transformer.Utils.identity(); + Transformer<Object, Object> identity = Transformer.identity(); for (Object expected : new Object[]{null, getClass(), getCurrentTestName()}) { Object actual = identity.transform(expected); assertSame("Mismatched identity result", expected, actual); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/977b7b52/sshd-core/src/test/java/org/apache/sshd/common/util/closeable/CloseableUtilsTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/util/closeable/CloseableUtilsTest.java b/sshd-core/src/test/java/org/apache/sshd/common/util/closeable/CloseableUtilsTest.java index 8605d2d..f8f5a0d 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/util/closeable/CloseableUtilsTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/util/closeable/CloseableUtilsTest.java @@ -142,14 +142,11 @@ public class CloseableUtilsTest extends BaseTestSupport { }; ExecutorService service = ThreadUtils.newSingleThreadExecutor(getCurrentTestName()); try { - Future<?> task = service.submit(new Runnable() { - @Override - public void run() { - try { - closeable.close(); - } catch (IOException e) { - throw new RuntimeException(e); - } + Future<?> task = service.submit((Runnable) () -> { + try { + closeable.close(); + } catch (IOException e) { + throw new RuntimeException(e); } }); future.setClosed(); // signal close complete http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/977b7b52/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthAgent.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthAgent.java b/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthAgent.java index 8907b2e..5f025cc 100644 --- a/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthAgent.java +++ b/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthAgent.java @@ -121,7 +121,7 @@ public class UserAuthAgent extends AbstractUserAuth { } } else { // TODO: check packets - log.info("Received unknown packet: {}", Integer.valueOf(cmd)); + log.info("Received unknown packet: {}", cmd); return Result.Continued; } } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/977b7b52/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthKeyboardInteractive.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthKeyboardInteractive.java b/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthKeyboardInteractive.java index bfa6a1d..f6f301e 100644 --- a/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthKeyboardInteractive.java +++ b/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthKeyboardInteractive.java @@ -113,7 +113,7 @@ public class UserAuthKeyboardInteractive extends AbstractUserAuth { return Result.Failure; } default: - log.debug("Received unknown packet {}", Integer.valueOf(cmd)); + log.debug("Received unknown packet {}", cmd); return Result.Continued; } } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/977b7b52/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthPassword.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthPassword.java b/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthPassword.java index df420b8..bb61fba 100644 --- a/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthPassword.java +++ b/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthPassword.java @@ -68,7 +68,7 @@ public class UserAuthPassword extends AbstractUserAuth { return Result.Failure; } else { if (log.isDebugEnabled()) { - log.debug("Received unkown packet {}", Integer.valueOf(cmd & 0xFF)); + log.debug("Received unkown packet {}", cmd & 0xFF); } // TODO: check packets return Result.Continued; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/977b7b52/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthPublicKey.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthPublicKey.java b/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthPublicKey.java index 6593c0a..dd73fbd 100644 --- a/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthPublicKey.java +++ b/sshd-core/src/test/java/org/apache/sshd/deprecated/UserAuthPublicKey.java @@ -62,7 +62,7 @@ public class UserAuthPublicKey extends AbstractUserAuth { buffer.putPublicKey(key.getPublic()); Signature verif = - ValidateUtils.checkNotNull(NamedFactory.Utils.create(session.getSignatureFactories(), alg), + ValidateUtils.checkNotNull(NamedFactory.create(session.getSignatureFactories(), alg), "No signature factory located for algorithm=%s", alg); verif.initSigner(key.getPrivate()); @@ -105,7 +105,7 @@ public class UserAuthPublicKey extends AbstractUserAuth { } return Result.Failure; } else { - log.debug("Received unknown packet {}", Integer.valueOf(cmd)); + log.debug("Received unknown packet {}", cmd); // TODO: check packets return Result.Continued; } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/977b7b52/sshd-core/src/test/java/org/apache/sshd/server/ServerAuthenticationManagerTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/server/ServerAuthenticationManagerTest.java b/sshd-core/src/test/java/org/apache/sshd/server/ServerAuthenticationManagerTest.java index 75d49ae..947f12c 100644 --- a/sshd-core/src/test/java/org/apache/sshd/server/ServerAuthenticationManagerTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/server/ServerAuthenticationManagerTest.java @@ -113,7 +113,7 @@ public class ServerAuthenticationManagerTest extends BaseTestSupport { }; assertEquals("Mismatched initial factories list", "", manager.getUserAuthFactoriesNameList()); - String expected = NamedResource.Utils.getNames(BuiltinUserAuthFactories.VALUES); + String expected = NamedResource.getNames(BuiltinUserAuthFactories.VALUES); manager.setUserAuthFactoriesNameList(expected); assertEquals("Mismatched updated factories names", expected, manager.getUserAuthFactoriesNameList()); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/977b7b52/sshd-core/src/test/java/org/apache/sshd/server/ServerProxyAcceptorTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/server/ServerProxyAcceptorTest.java b/sshd-core/src/test/java/org/apache/sshd/server/ServerProxyAcceptorTest.java index 8b37999..ae59e12 100644 --- a/sshd-core/src/test/java/org/apache/sshd/server/ServerProxyAcceptorTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/server/ServerProxyAcceptorTest.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import org.apache.sshd.client.SshClient; -import org.apache.sshd.client.session.ClientProxyConnector; import org.apache.sshd.client.session.ClientSession; import org.apache.sshd.common.io.IoSession; import org.apache.sshd.common.session.Session; @@ -129,12 +128,9 @@ public class ServerProxyAcceptorTest extends BaseTestSupport { }); sshd.start(); - client.setClientProxyConnector(new ClientProxyConnector() { - @Override - public void sendClientProxyMetadata(ClientSession session) throws Exception { - IoSession ioSession = session.getIoSession(); - ioSession.write(new ByteArrayBuffer(metaDataBytes)); - } + client.setClientProxyConnector(session -> { + IoSession ioSession = session.getIoSession(); + ioSession.write(new ByteArrayBuffer(metaDataBytes)); }); client.start(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/977b7b52/sshd-core/src/test/java/org/apache/sshd/server/ServerSessionListenerTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/server/ServerSessionListenerTest.java b/sshd-core/src/test/java/org/apache/sshd/server/ServerSessionListenerTest.java index 56122c8..5430e59 100644 --- a/sshd-core/src/test/java/org/apache/sshd/server/ServerSessionListenerTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/server/ServerSessionListenerTest.java @@ -43,7 +43,6 @@ import org.apache.sshd.common.session.SessionListener; import org.apache.sshd.common.util.GenericUtils; import org.apache.sshd.server.auth.keyboard.KeyboardInteractiveAuthenticator; import org.apache.sshd.server.auth.password.PasswordAuthenticator; -import org.apache.sshd.server.auth.password.PasswordChangeRequiredException; import org.apache.sshd.server.session.ServerSession; import org.apache.sshd.util.test.BaseTestSupport; import org.apache.sshd.util.test.Utils; @@ -199,12 +198,9 @@ public class ServerSessionListenerTest extends BaseTestSupport { public void testSessionListenerCanModifyAuthentication() throws Exception { final AtomicInteger passCount = new AtomicInteger(0); final PasswordAuthenticator defaultPassAuth = sshd.getPasswordAuthenticator(); - final PasswordAuthenticator passAuth = new PasswordAuthenticator() { - @Override - public boolean authenticate(String username, String password, ServerSession session) throws PasswordChangeRequiredException { - passCount.incrementAndGet(); - return defaultPassAuth.authenticate(username, password, session); - } + final PasswordAuthenticator passAuth = (username, password, session) -> { + passCount.incrementAndGet(); + return defaultPassAuth.authenticate(username, password, session); }; SessionListener listener = new SessionListener() { @Override @@ -214,7 +210,7 @@ public class ServerSessionListenerTest extends BaseTestSupport { serverSession.setPasswordAuthenticator(passAuth); serverSession.setUserAuthFactories( Collections.singletonList( - ServerAuthenticationManager.Utils.DEFAULT_USER_AUTH_PASSWORD_FACTORY)); + ServerAuthenticationManager.DEFAULT_USER_AUTH_PASSWORD_FACTORY)); } } }; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/977b7b52/sshd-core/src/test/java/org/apache/sshd/server/ServerTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/server/ServerTest.java b/sshd-core/src/test/java/org/apache/sshd/server/ServerTest.java index 7f75b01..7354c20 100644 --- a/sshd-core/src/test/java/org/apache/sshd/server/ServerTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/server/ServerTest.java @@ -32,7 +32,6 @@ import java.util.Collections; import java.util.EnumSet; import java.util.List; import java.util.Map; -import java.util.TreeMap; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Semaphore; @@ -515,46 +514,43 @@ public class ServerTest extends BaseTestSupport { @Test // see SSHD-645 public void testChannelStateChangeNotifications() throws Exception { final Semaphore exitSignal = new Semaphore(0); - sshd.setCommandFactory(new CommandFactory() { - @Override - public Command createCommand(final String command) { - ValidateUtils.checkTrue(String.CASE_INSENSITIVE_ORDER.compare(command, getCurrentTestName()) == 0, "Unexpected command: %s", command); + sshd.setCommandFactory(command -> { + ValidateUtils.checkTrue(String.CASE_INSENSITIVE_ORDER.compare(command, getCurrentTestName()) == 0, "Unexpected command: %s", command); - return new Command() { - private ExitCallback cb; + return new Command() { + private ExitCallback cb; - @Override - public void setOutputStream(OutputStream out) { - // ignored - } + @Override + public void setOutputStream(OutputStream out) { + // ignored + } - @Override - public void setInputStream(InputStream in) { - // ignored - } + @Override + public void setInputStream(InputStream in) { + // ignored + } - @Override - public void setExitCallback(ExitCallback callback) { - cb = callback; - } + @Override + public void setExitCallback(ExitCallback callback) { + cb = callback; + } - @Override - public void setErrorStream(OutputStream err) { - // ignored - } + @Override + public void setErrorStream(OutputStream err) { + // ignored + } - @Override - public void destroy() { - // ignored - } + @Override + public void destroy() { + // ignored + } - @Override - public void start(Environment env) throws IOException { - exitSignal.release(); - cb.onExit(0, command); - } - }; - } + @Override + public void start(Environment env) throws IOException { + exitSignal.release(); + cb.onExit(0, command); + } + }; }); sshd.start(); client.start(); @@ -591,49 +587,46 @@ public class ServerTest extends BaseTestSupport { @Test public void testEnvironmentVariablesPropagationToServer() throws Exception { final AtomicReference<Environment> envHolder = new AtomicReference<>(null); - sshd.setCommandFactory(new CommandFactory() { - @Override - public Command createCommand(final String command) { - ValidateUtils.checkTrue(String.CASE_INSENSITIVE_ORDER.compare(command, getCurrentTestName()) == 0, "Unexpected command: %s", command); - - return new Command() { - private ExitCallback cb; + sshd.setCommandFactory(command -> { + ValidateUtils.checkTrue(String.CASE_INSENSITIVE_ORDER.compare(command, getCurrentTestName()) == 0, "Unexpected command: %s", command); - @Override - public void setOutputStream(OutputStream out) { - // ignored - } + return new Command() { + private ExitCallback cb; - @Override - public void setInputStream(InputStream in) { - // ignored - } + @Override + public void setOutputStream(OutputStream out) { + // ignored + } - @Override - public void setExitCallback(ExitCallback callback) { - cb = callback; - } + @Override + public void setInputStream(InputStream in) { + // ignored + } - @Override - public void setErrorStream(OutputStream err) { - // ignored - } + @Override + public void setExitCallback(ExitCallback callback) { + cb = callback; + } - @Override - public void destroy() { - // ignored - } + @Override + public void setErrorStream(OutputStream err) { + // ignored + } - @Override - public void start(Environment env) throws IOException { - if (envHolder.getAndSet(env) != null) { - throw new StreamCorruptedException("Multiple starts for command=" + command); - } + @Override + public void destroy() { + // ignored + } - cb.onExit(0, command); + @Override + public void start(Environment env) throws IOException { + if (envHolder.getAndSet(env) != null) { + throw new StreamCorruptedException("Multiple starts for command=" + command); } - }; - } + + cb.onExit(0, command); + } + }; }); TestChannelListener channelListener = new TestChannelListener(); @@ -641,15 +634,12 @@ public class ServerTest extends BaseTestSupport { sshd.start(); @SuppressWarnings("synthetic-access") - Map<String, String> expected = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER) { - private static final long serialVersionUID = 1L; // we're not serializing it - - { - put("test", getCurrentTestName()); - put("port", Integer.toString(sshd.getPort())); - put("user", OsUtils.getCurrentUser()); - } - }; + Map<String, String> expected = + GenericUtils.<String, String>mapBuilder(String.CASE_INSENSITIVE_ORDER) + .put("test", getCurrentTestName()) + .put("port", Integer.toString(sshd.getPort())) + .put("user", OsUtils.getCurrentUser()) + .build(); client.start(); try (ClientSession s = createTestClientSession(sshd); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/977b7b52/sshd-core/src/test/java/org/apache/sshd/server/StandardEnvironmentTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/server/StandardEnvironmentTest.java b/sshd-core/src/test/java/org/apache/sshd/server/StandardEnvironmentTest.java index 171b361..d1eaaa2 100644 --- a/sshd-core/src/test/java/org/apache/sshd/server/StandardEnvironmentTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/server/StandardEnvironmentTest.java @@ -39,11 +39,8 @@ public class StandardEnvironmentTest extends BaseTestSupport { @Test public void testAddSignalListenerOnDuplicateSignals() { StandardEnvironment environ = new StandardEnvironment(); - SignalListener listener = new SignalListener() { - @Override - public void signal(Signal signal) { - // ignored - } + SignalListener listener = signal -> { + // ignored }; for (Signal s : Signal.SIGNALS) { http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/977b7b52/sshd-core/src/test/java/org/apache/sshd/server/auth/WelcomeBannerTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/server/auth/WelcomeBannerTest.java b/sshd-core/src/test/java/org/apache/sshd/server/auth/WelcomeBannerTest.java index e62e8de..04bf7d6 100644 --- a/sshd-core/src/test/java/org/apache/sshd/server/auth/WelcomeBannerTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/server/auth/WelcomeBannerTest.java @@ -109,12 +109,12 @@ public class WelcomeBannerTest extends BaseTestSupport { @Test public void testFileBanner() throws Exception { - testFileContentBanner(path -> path.toFile()); + testFileContentBanner(Path::toFile); } @Test public void testURIBanner() throws Exception { - testFileContentBanner(path -> path.toUri()); + testFileContentBanner(Path::toUri); } @Test http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/977b7b52/sshd-core/src/test/java/org/apache/sshd/server/channel/ChannelSessionTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/server/channel/ChannelSessionTest.java b/sshd-core/src/test/java/org/apache/sshd/server/channel/ChannelSessionTest.java index 4cc8fc5..7a077a4 100644 --- a/sshd-core/src/test/java/org/apache/sshd/server/channel/ChannelSessionTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/server/channel/ChannelSessionTest.java @@ -26,8 +26,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.sshd.common.PropertyResolverUtils; import org.apache.sshd.common.channel.ChannelAsyncOutputStream; import org.apache.sshd.common.channel.Window; -import org.apache.sshd.common.future.CloseFuture; -import org.apache.sshd.common.future.SshFutureListener; import org.apache.sshd.common.util.buffer.Buffer; import org.apache.sshd.common.util.buffer.ByteArrayBuffer; import org.apache.sshd.util.test.BaseTestSupport; @@ -78,12 +76,9 @@ public class ChannelSessionTest extends BaseTestSupport { wRemote.init(PropertyResolverUtils.toPropertyResolver(Collections.emptyMap())); } }) { - session.addCloseFutureListener(new SshFutureListener<CloseFuture>() { - @Override - public void operationComplete(CloseFuture future) { - assertTrue("Future not marted as closed", future.isClosed()); - assertEquals("Unexpected multiple call to callback", 1, closeCount.incrementAndGet()); - } + session.addCloseFutureListener(future -> { + assertTrue("Future not marted as closed", future.isClosed()); + assertEquals("Unexpected multiple call to callback", 1, closeCount.incrementAndGet()); }); session.close(); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/977b7b52/sshd-core/src/test/java/org/apache/sshd/server/config/keys/ServerIdentityTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/server/config/keys/ServerIdentityTest.java b/sshd-core/src/test/java/org/apache/sshd/server/config/keys/ServerIdentityTest.java index 2674244..7f654ba 100644 --- a/sshd-core/src/test/java/org/apache/sshd/server/config/keys/ServerIdentityTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/server/config/keys/ServerIdentityTest.java @@ -55,7 +55,7 @@ public class ServerIdentityTest extends BaseTestSupport { Assume.assumeTrue("BouncyCastle not registered", SecurityUtils.isBouncyCastleRegistered()); Path resFolder = getClassResourcesFolder(TEST_SUBFOLDER, getClass()); - Collection<Path> paths = new ArrayList<Path>(BuiltinIdentities.VALUES.size()); + Collection<Path> paths = new ArrayList<>(BuiltinIdentities.VALUES.size()); LinkOption[] options = IoUtils.getLinkOptions(false); Collection<BuiltinIdentities> expected = EnumSet.noneOf(BuiltinIdentities.class); for (BuiltinIdentities type : BuiltinIdentities.VALUES) { @@ -81,7 +81,7 @@ public class ServerIdentityTest extends BaseTestSupport { Map<String, KeyPair> ids = ServerIdentity.loadIdentities(props, options); assertEquals("Mismatched loaded ids count", GenericUtils.size(paths), GenericUtils.size(ids)); - Collection<KeyPair> pairs = new ArrayList<KeyPair>(ids.size()); + Collection<KeyPair> pairs = new ArrayList<>(ids.size()); for (BuiltinIdentities type : BuiltinIdentities.VALUES) { if (expected.contains(type)) { KeyPair kp = ids.get(type.getName()); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/977b7b52/sshd-core/src/test/java/org/apache/sshd/server/jaas/JaasPasswordAuthenticatorTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/server/jaas/JaasPasswordAuthenticatorTest.java b/sshd-core/src/test/java/org/apache/sshd/server/jaas/JaasPasswordAuthenticatorTest.java index 3ac6e28..a37ab85 100644 --- a/sshd-core/src/test/java/org/apache/sshd/server/jaas/JaasPasswordAuthenticatorTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/server/jaas/JaasPasswordAuthenticatorTest.java @@ -59,7 +59,7 @@ public class JaasPasswordAuthenticatorTest extends BaseTestSupport { return new AppConfigurationEntry[]{ new AppConfigurationEntry(DummyLoginModule.class.getName(), AppConfigurationEntry.LoginModuleControlFlag.REQUIRED, - new HashMap<String, Object>()) + new HashMap<>()) }; } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/977b7b52/sshd-core/src/test/java/org/apache/sshd/server/shell/TtyFilterInputStreamTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/server/shell/TtyFilterInputStreamTest.java b/sshd-core/src/test/java/org/apache/sshd/server/shell/TtyFilterInputStreamTest.java index b819984..58e4407 100644 --- a/sshd-core/src/test/java/org/apache/sshd/server/shell/TtyFilterInputStreamTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/server/shell/TtyFilterInputStreamTest.java @@ -23,7 +23,6 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.OutputStream; import java.nio.charset.StandardCharsets; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -31,6 +30,8 @@ import java.util.Date; import java.util.EnumSet; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; +import java.util.stream.Stream; import org.apache.sshd.common.channel.PtyMode; import org.apache.sshd.common.util.GenericUtils; @@ -51,17 +52,10 @@ import org.junit.runners.Parameterized.Parameters; @RunWith(Parameterized.class) // see https://github.com/junit-team/junit/wiki/Parameterized-tests public class TtyFilterInputStreamTest extends BaseTestSupport { private static final List<PtyMode> MODES = - Collections.unmodifiableList(new ArrayList<PtyMode>(TtyFilterInputStream.INPUT_OPTIONS.size() + 2) { - private static final long serialVersionUID = 1L; // we-re not serializing it - - { - add(PtyMode.ECHO); // NO-OP - - for (PtyMode m : TtyFilterInputStream.INPUT_OPTIONS) { - add(m); - } - } - }); + Collections.unmodifiableList( + Stream.concat(Stream.of(PtyMode.ECHO), + TtyFilterInputStream.INPUT_OPTIONS.stream()) + .collect(Collectors.toList())); private final PtyMode mode; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/977b7b52/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 3501208..76c9534 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 @@ -24,7 +24,6 @@ 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; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/977b7b52/sshd-core/src/test/java/org/apache/sshd/util/test/AsyncEchoShellFactory.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/util/test/AsyncEchoShellFactory.java b/sshd-core/src/test/java/org/apache/sshd/util/test/AsyncEchoShellFactory.java index 4623a52..8867f2e 100644 --- a/sshd-core/src/test/java/org/apache/sshd/util/test/AsyncEchoShellFactory.java +++ b/sshd-core/src/test/java/org/apache/sshd/util/test/AsyncEchoShellFactory.java @@ -26,11 +26,8 @@ import java.nio.charset.StandardCharsets; import org.apache.sshd.common.Factory; import org.apache.sshd.common.channel.BufferedIoOutputStream; import org.apache.sshd.common.channel.Window; -import org.apache.sshd.common.future.CloseFuture; -import org.apache.sshd.common.future.SshFutureListener; import org.apache.sshd.common.io.IoInputStream; import org.apache.sshd.common.io.IoOutputStream; -import org.apache.sshd.common.io.IoWriteFuture; import org.apache.sshd.common.session.Session; import org.apache.sshd.common.util.buffer.ByteArrayBuffer; import org.apache.sshd.server.AsyncCommand; @@ -122,13 +119,7 @@ public class AsyncEchoShellFactory implements Factory<Command> { @Override public void close() throws IOException { - out.close(false).addListener(new SshFutureListener<CloseFuture>() { - @SuppressWarnings("synthetic-access") - @Override - public void operationComplete(CloseFuture future) { - callback.onExit(0); - } - }); + out.close(false).addListener(future -> callback.onExit(0)); } @Override @@ -143,21 +134,18 @@ public class AsyncEchoShellFactory implements Factory<Command> { if (buffer.charAt(i) == '\n') { final String s = buffer.substring(0, i + 1); final byte[] bytes = s.getBytes(StandardCharsets.UTF_8); - out.write(new ByteArrayBuffer(bytes)).addListener(new SshFutureListener<IoWriteFuture>() { - @Override - public void operationComplete(IoWriteFuture future) { - Session session = channel.getSession(); - if (future.isWritten()) { - try { - Window wLocal = channel.getLocalWindow(); - wLocal.consumeAndCheck(bytes.length); - } catch (IOException e) { - session.exceptionCaught(e); - } - } else { - Throwable t = future.getException(); - session.exceptionCaught(t); + out.write(new ByteArrayBuffer(bytes)).addListener(future -> { + Session session1 = channel.getSession(); + if (future.isWritten()) { + try { + Window wLocal = channel.getLocalWindow(); + wLocal.consumeAndCheck(bytes.length); + } catch (IOException e) { + session1.exceptionCaught(e); } + } else { + Throwable t = future.getException(); + session1.exceptionCaught(t); } }); buffer = new StringBuilder(buffer.substring(i + 1)); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/977b7b52/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 7f4eaab..a0fd825 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 @@ -274,7 +274,7 @@ public abstract class BaseTestSupport extends Assert { return Collections.emptyList(); } - List<Object[]> result = new ArrayList<Object[]>(params.size()); + List<Object[]> result = new ArrayList<>(params.size()); for (Object p : params) { result.add(new Object[]{p}); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/977b7b52/sshd-core/src/test/java/org/apache/sshd/util/test/BogusPasswordAuthenticator.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/util/test/BogusPasswordAuthenticator.java b/sshd-core/src/test/java/org/apache/sshd/util/test/BogusPasswordAuthenticator.java index c3a247d..252863d 100644 --- a/sshd-core/src/test/java/org/apache/sshd/util/test/BogusPasswordAuthenticator.java +++ b/sshd-core/src/test/java/org/apache/sshd/util/test/BogusPasswordAuthenticator.java @@ -38,7 +38,7 @@ public class BogusPasswordAuthenticator extends AbstractLoggingBean implements P public boolean authenticate(String username, String password, ServerSession session) { boolean result = (username != null) && username.equals(password); if (log.isDebugEnabled()) { - log.debug("authenticate({}) {} / {} - sucess = {}", session, username, password, Boolean.valueOf(result)); + log.debug("authenticate({}) {} / {} - sucess = {}", session, username, password, result); } return result; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/977b7b52/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..bf84bff 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 @@ -20,7 +20,6 @@ package org.apache.sshd.util.test; import com.jcraft.jsch.JSch; import com.jcraft.jsch.Logger; - import org.slf4j.LoggerFactory; /** http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/977b7b52/sshd-core/src/test/java/org/apache/sshd/util/test/Utils.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/util/test/Utils.java b/sshd-core/src/test/java/org/apache/sshd/util/test/Utils.java index d349ed1..063badb 100644 --- a/sshd-core/src/test/java/org/apache/sshd/util/test/Utils.java +++ b/sshd-core/src/test/java/org/apache/sshd/util/test/Utils.java @@ -109,9 +109,9 @@ public final class Utils { public static final String DEFAULT_TEST_HOST_KEY_PROVIDER_ALGORITHM = KeyUtils.RSA_ALGORITHM; // uses a cached instance to avoid re-creating the keys as it is a time-consuming effort - private static final AtomicReference<KeyPairProvider> KEYPAIR_PROVIDER_HOLDER = new AtomicReference<KeyPairProvider>(); + private static final AtomicReference<KeyPairProvider> KEYPAIR_PROVIDER_HOLDER = new AtomicReference<>(); // uses a cached instance to avoid re-creating the keys as it is a time-consuming effort - private static final Map<String, AbstractFileKeyPairProvider> PROVIDERS_MAP = new ConcurrentHashMap<String, AbstractFileKeyPairProvider>(); + private static final Map<String, AbstractFileKeyPairProvider> PROVIDERS_MAP = new ConcurrentHashMap<>(); private Utils() { throw new UnsupportedOperationException("No instance"); @@ -586,10 +586,7 @@ public final class Utils { if (GenericUtils.isEmpty(name)) { return name; } else { - return new StringBuilder(name.length() + CLASS_FILE_SUFFIX.length()) - .append(name.replace('.', '/')) - .append(CLASS_FILE_SUFFIX) - .toString(); + return name.replace('.', '/') + CLASS_FILE_SUFFIX; } } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/977b7b52/sshd-ldap/src/main/java/org/apache/sshd/common/util/net/LdapNetworkConnector.java ---------------------------------------------------------------------- diff --git a/sshd-ldap/src/main/java/org/apache/sshd/common/util/net/LdapNetworkConnector.java b/sshd-ldap/src/main/java/org/apache/sshd/common/util/net/LdapNetworkConnector.java index ed508d8..24f8291 100644 --- a/sshd-ldap/src/main/java/org/apache/sshd/common/util/net/LdapNetworkConnector.java +++ b/sshd-ldap/src/main/java/org/apache/sshd/common/util/net/LdapNetworkConnector.java @@ -397,7 +397,7 @@ public class LdapNetworkConnector<C> extends NetworkConnector { protected DirContext initializeDirContext(C queryContext, Map<String, Object> env, String username, String password) throws NamingException { Map<String, ?> ldapConfig = setupDirContextEnvironment(queryContext, env, username, password); - return new InitialDirContext(new Hashtable<String, Object>(ldapConfig)); + return new InitialDirContext(new Hashtable<>(ldapConfig)); } /** http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/977b7b52/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 0d48b61..2d0d19e 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 @@ -171,7 +171,7 @@ public abstract class BaseAuthenticatorTest extends BaseTestSupport { throw e; } - return new Pair<LdapServer, DirectoryService>(ldapServer, directoryService); + return new Pair<>(ldapServer, directoryService); } // see http://users.directory.apache.narkive.com/GkyqAkot/how-to-import-ldif-file-programmatically
