Repository: mina-sshd Updated Branches: refs/heads/master f56963c44 -> f2d3e6ff4
[SSHD-698] Removed deprecated Utils classes Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/f2d3e6ff Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/f2d3e6ff Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/f2d3e6ff Branch: refs/heads/master Commit: f2d3e6ff4a934f4e805fc4249eb266b36bd2ff9f Parents: f56963c Author: Lyor Goldstein <[email protected]> Authored: Mon Oct 3 10:24:11 2016 +0300 Committer: Lyor Goldstein <[email protected]> Committed: Mon Oct 3 10:24:11 2016 +0300 ---------------------------------------------------------------------- .../auth/AuthenticationIdentitiesProvider.java | 26 --------- .../auth/hostbased/HostKeyIdentityProvider.java | 29 +--------- .../auth/password/PasswordIdentityProvider.java | 53 ----------------- .../subsystem/sftp/SftpVersionSelector.java | 26 --------- .../org/apache/sshd/common/BuiltinFactory.java | 17 ------ .../org/apache/sshd/common/NamedFactory.java | 27 --------- .../org/apache/sshd/common/NamedResource.java | 29 ---------- .../org/apache/sshd/common/OptionalFeature.java | 29 +--------- .../org/apache/sshd/common/ServiceFactory.java | 17 ------ .../org/apache/sshd/common/cipher/Cipher.java | 17 ------ .../org/apache/sshd/common/kex/KeyExchange.java | 38 ++---------- .../common/keyprovider/KeyIdentityProvider.java | 53 ----------------- .../common/keyprovider/KeyPairProvider.java | 21 ------- .../common/subsystem/sftp/SftpConstants.java | 21 ++++--- .../apache/sshd/common/util/GenericUtils.java | 5 +- .../sshd/common/util/Int2IntFunction.java | 26 --------- .../apache/sshd/common/util/Transformer.java | 24 +------- .../util/buffer/keys/BufferPublicKeyParser.java | 22 +------ .../common/util/closeable/CloseableUtils.java | 61 -------------------- .../server/ServerAuthenticationManager.java | 31 ---------- .../common/forward/PortForwardingLoadTest.java | 3 +- .../apache/sshd/common/kex/KeyExchangeTest.java | 5 +- .../ReservedSessionMessagesHandlerTest.java | 2 + 23 files changed, 32 insertions(+), 550 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2d3e6ff/sshd-core/src/main/java/org/apache/sshd/client/auth/AuthenticationIdentitiesProvider.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/auth/AuthenticationIdentitiesProvider.java b/sshd-core/src/main/java/org/apache/sshd/client/auth/AuthenticationIdentitiesProvider.java index edba4e3..9bac5c3 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/auth/AuthenticationIdentitiesProvider.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/auth/AuthenticationIdentitiesProvider.java @@ -68,32 +68,6 @@ public interface AuthenticationIdentitiesProvider extends KeyIdentityProvider, P */ Iterable<?> loadIdentities(); - /** - * A helper class for identity provider related operations - * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> - */ - // CHECKSTYLE:OFF - @Deprecated - final class Utils { - // CHECKSTYLE:ON - - public static final Comparator<Object> PASSWORD_IDENTITY_COMPARATOR = AuthenticationIdentitiesProvider.PASSWORD_IDENTITY_COMPARATOR; - - public static final Comparator<Object> KEYPAIR_IDENTITY_COMPARATOR = AuthenticationIdentitiesProvider.KEYPAIR_IDENTITY_COMPARATOR; - - private Utils() { - throw new UnsupportedOperationException("No instance allowed"); - } - - public static int findIdentityIndex(List<?> identities, Comparator<? super Object> comp, Object target) { - return AuthenticationIdentitiesProvider.findIdentityIndex(identities, comp, target); - } - - public static AuthenticationIdentitiesProvider wrap(final Iterable<?> identities) { - return AuthenticationIdentitiesProvider.wrap(identities); - } - } - static int findIdentityIndex(List<?> identities, Comparator<? super Object> comp, Object target) { for (int index = 0; index < identities.size(); index++) { Object value = identities.get(index); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2d3e6ff/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 0e37e57..4b6c531 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 @@ -37,31 +37,6 @@ public interface HostKeyIdentityProvider { */ Iterable<Pair<KeyPair, List<X509Certificate>>> loadHostKeys(); - /** - * A helper class for key identity provider related operations - * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> - */ - // CHECKSTYLE:OFF - @Deprecated - final class Utils { - // CHECKSTYLE:ON - private Utils() { - throw new UnsupportedOperationException("No instance allowed"); - } - - public static Iterator<Pair<KeyPair, List<X509Certificate>>> iteratorOf(HostKeyIdentityProvider provider) { - return HostKeyIdentityProvider.iteratorOf(provider); - } - - public static HostKeyIdentityProvider wrap(KeyPair ... pairs) { - return HostKeyIdentityProvider.wrap(pairs); - } - - public static HostKeyIdentityProvider wrap(final Iterable<? extends KeyPair> pairs) { - return HostKeyIdentityProvider.wrap(pairs); - } - } - static Iterator<Pair<KeyPair, List<X509Certificate>>> iteratorOf(HostKeyIdentityProvider provider) { return GenericUtils.iteratorOf((provider == null) ? null : provider.loadHostKeys()); } @@ -70,9 +45,9 @@ public interface HostKeyIdentityProvider { return wrap(GenericUtils.asList(pairs)); } - static HostKeyIdentityProvider wrap(final Iterable<? extends KeyPair> pairs) { + static HostKeyIdentityProvider wrap(Iterable<? extends KeyPair> pairs) { return () -> () -> { - final Iterator<? extends KeyPair> iter = GenericUtils.iteratorOf(pairs); + Iterator<? extends KeyPair> iter = GenericUtils.iteratorOf(pairs); return GenericUtils.wrapIterator(iter, kp -> new Pair<>(kp, Collections.<X509Certificate>emptyList())); }; } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2d3e6ff/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 3c428cb..5dbc27e 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 @@ -62,59 +62,6 @@ public interface PasswordIdentityProvider { Iterable<String> loadPasswords(); /** - * A helper class for password identity provider related operations - * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> - */ - // CHECKSTYLE:OFF - @Deprecated - final class Utils { - // CHECKSTYLE:ON - - public static final Transformer<PasswordIdentityProvider, Iterable<String>> LOADER = - PasswordIdentityProvider.LOADER; - - private Utils() { - throw new UnsupportedOperationException("No instance allowed"); - } - - public static Iterator<String> iteratorOf(ClientSession session) { - return PasswordIdentityProvider.iteratorOf(session); - } - - public static Iterator<String> iteratorOf(PasswordIdentityProvider identities, PasswordIdentityProvider passwords) { - return PasswordIdentityProvider.iteratorOf(identities, passwords); - } - - public static Iterator<String> iteratorOf(PasswordIdentityProvider provider) { - return PasswordIdentityProvider.iteratorOf(provider); - } - - public static PasswordIdentityProvider resolvePasswordIdentityProvider(PasswordIdentityProvider identities, PasswordIdentityProvider passwords) { - return PasswordIdentityProvider.resolvePasswordIdentityProvider(identities, passwords); - } - - public static PasswordIdentityProvider multiProvider(PasswordIdentityProvider ... providers) { - return PasswordIdentityProvider.multiProvider(providers); - } - - public static PasswordIdentityProvider multiProvider(Collection<? extends PasswordIdentityProvider> providers) { - return PasswordIdentityProvider.multiProvider(providers); - } - - public static Iterable<String> iterableOf(Collection<? extends PasswordIdentityProvider> providers) { - return PasswordIdentityProvider.iterableOf(providers); - } - - public static PasswordIdentityProvider wrap(String ... passwords) { - return PasswordIdentityProvider.wrap(passwords); - } - - public static PasswordIdentityProvider wrap(final Iterable<String> passwords) { - return PasswordIdentityProvider.wrap(passwords); - } - } - - /** * Creates a "unified" {@link Iterator} of passwords out of the registered * passwords and the extra available ones as a single iterator of passwords * http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2d3e6ff/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 a0d80e7..efa5dbe 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 @@ -61,32 +61,6 @@ public interface SftpVersionSelector { int selectVersion(ClientSession session, int current, List<Integer> available); /** - * Utility class to help using {@link SftpVersionSelector}s - */ - // CHECKSTYLE:OFF - @Deprecated - final class Utils { - // CHECKSTYLE:ON - - private Utils() { - throw new UnsupportedOperationException("No instance allowed"); - } - - public static SftpVersionSelector fixedVersionSelector(final int version) { - return SftpVersionSelector.fixedVersionSelector(version); - } - - public static SftpVersionSelector preferredVersionSelector(final int ... preferred) { - return SftpVersionSelector.preferredVersionSelector(preferred); - - } - - public static SftpVersionSelector preferredVersionSelector(final Iterable<? extends Number> preferred) { - return SftpVersionSelector.preferredVersionSelector(preferred); - } - } - - /** * Creates a selector the always returns the requested (fixed version) regardless * of what the current or reported available versions are. If the requested version * is not reported as available then an exception will be eventually thrown by the http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2d3e6ff/sshd-core/src/main/java/org/apache/sshd/common/BuiltinFactory.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/BuiltinFactory.java b/sshd-core/src/main/java/org/apache/sshd/common/BuiltinFactory.java index 1e436c6..33b53a9 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/BuiltinFactory.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/BuiltinFactory.java @@ -31,27 +31,10 @@ import org.apache.sshd.common.util.GenericUtils; * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ public interface BuiltinFactory<T> extends NamedFactory<T>, OptionalFeature { - - // CHECKSTYLE:OFF - @Deprecated - final class Utils { - // CHECKSTYLE:ON - - private Utils() { - throw new UnsupportedOperationException("No instance allowed"); - } - - public static <T, E extends BuiltinFactory<T>> List<NamedFactory<T>> setUpFactories( - boolean ignoreUnsupported, Collection<? extends E> preferred) { - return BuiltinFactory.setUpFactories(ignoreUnsupported, preferred); - } - } - static <T, E extends BuiltinFactory<T>> List<NamedFactory<T>> setUpFactories( boolean ignoreUnsupported, Collection<? extends E> preferred) { return GenericUtils.stream(preferred) .filter(f -> ignoreUnsupported || f.isSupported()) .collect(Collectors.toList()); } - } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2d3e6ff/sshd-core/src/main/java/org/apache/sshd/common/NamedFactory.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/NamedFactory.java b/sshd-core/src/main/java/org/apache/sshd/common/NamedFactory.java index dccb426..cd99d59 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/NamedFactory.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/NamedFactory.java @@ -33,33 +33,6 @@ import org.apache.sshd.common.util.Transformer; */ public interface NamedFactory<T> extends Factory<T>, NamedResource { /** - * Utility class to help using NamedFactories - */ - // CHECKSTYLE:OFF - @Deprecated - final class Utils { - // CHECKSTYLE:ON - - private Utils() { - throw new UnsupportedOperationException("No instance allowed"); - } - - public static <T> T create(Collection<? extends NamedFactory<T>> factories, String name) { - return NamedFactory.create(factories, name); - } - - public static <S extends OptionalFeature, T, E extends NamedFactory<T>> List<NamedFactory<T>> setUpTransformedFactories( - boolean ignoreUnsupported, Collection<? extends S> preferred, Transformer<? super S, ? extends E> xform) { - return NamedFactory.setUpTransformedFactories(ignoreUnsupported, preferred, xform); - } - - public static <T, E extends NamedFactory<T> & OptionalFeature> List<NamedFactory<T>> setUpBuiltinFactories( - boolean ignoreUnsupported, Collection<? extends E> preferred) { - return NamedFactory.setUpBuiltinFactories(ignoreUnsupported, preferred); - } - } - - /** * Create an instance of the specified name by looking up the needed factory * in the list. * http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2d3e6ff/sshd-core/src/main/java/org/apache/sshd/common/NamedResource.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/NamedResource.java b/sshd-core/src/main/java/org/apache/sshd/common/NamedResource.java index 6aab4409..6099ff8 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/NamedResource.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/NamedResource.java @@ -49,35 +49,6 @@ public interface NamedResource { String getName(); /** - * Utility class to help using {@link NamedResource}s - */ - // CHECKSTYLE:OFF - @Deprecated - final class Utils { - // CHECKSTYLE:ON - - private Utils() { - throw new UnsupportedOperationException("No instance allowed"); - } - - public static List<String> getNameList(Collection<? extends NamedResource> resources) { - return NamedResource.getNameList(resources); - } - - public static String getNames(Collection<? extends NamedResource> resources) { - return NamedResource.getNames(resources); - } - - public static <R extends NamedResource> R removeByName(String name, Comparator<? super String> c, Collection<? extends R> resources) { - return NamedResource.removeByName(name, c, resources); - } - - public static <R extends NamedResource> R findByName(String name, Comparator<? super String> c, Collection<? extends R> resources) { - return NamedResource.findByName(name, c, resources); - } - } - - /** * @param resources The named resources * @return A {@link List} of all the factories names - in same order * as they appear in the input collection http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2d3e6ff/sshd-core/src/main/java/org/apache/sshd/common/OptionalFeature.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/OptionalFeature.java b/sshd-core/src/main/java/org/apache/sshd/common/OptionalFeature.java index 6bc6eac..1afa864 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/OptionalFeature.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/OptionalFeature.java @@ -54,36 +54,11 @@ public interface OptionalFeature { boolean isSupported(); - /** - * Utility class to help using {@link OptionalFeature}s - */ - // CHECKSTYLE:OFF - @Deprecated - final class Utils { - // CHECKSTYLE:ON - - private Utils() { - throw new UnsupportedOperationException("No instance allowed"); - } - - public static OptionalFeature of(boolean supported) { - return OptionalFeature.of(supported); - } - - public static OptionalFeature all(final Collection<? extends OptionalFeature> features) { - return OptionalFeature.all(features); - } - - public static OptionalFeature any(final Collection<? extends OptionalFeature> features) { - return OptionalFeature.any(features); - } - } - static OptionalFeature of(boolean supported) { return supported ? TRUE : FALSE; } - static OptionalFeature all(final Collection<? extends OptionalFeature> features) { + static OptionalFeature all(Collection<? extends OptionalFeature> features) { return () -> { if (GenericUtils.isEmpty(features)) { return false; @@ -99,7 +74,7 @@ public interface OptionalFeature { }; } - static OptionalFeature any(final Collection<? extends OptionalFeature> features) { + static OptionalFeature any(Collection<? extends OptionalFeature> features) { return () -> { if (GenericUtils.isEmpty(features)) { return false; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2d3e6ff/sshd-core/src/main/java/org/apache/sshd/common/ServiceFactory.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/ServiceFactory.java b/sshd-core/src/main/java/org/apache/sshd/common/ServiceFactory.java index 2335074..50562e5 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/ServiceFactory.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/ServiceFactory.java @@ -27,23 +27,6 @@ public interface ServiceFactory extends NamedResource { Service create(Session session) throws IOException; /** - * Utility class to help using NamedFactories - */ - // CHECKSTYLE:OFF - @Deprecated - final class Utils { - // CHECKSTYLE:ON - - private Utils() { - throw new UnsupportedOperationException("No instance allowed"); - } - - public static Service create(Collection<? extends ServiceFactory> factories, String name, Session session) throws IOException { - return ServiceFactory.create(factories, name, session); - } - } - - /** * Create an instance of the specified name by looking up the needed factory * in the list (case <U>insensitive</U>. * http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2d3e6ff/sshd-core/src/main/java/org/apache/sshd/common/cipher/Cipher.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/cipher/Cipher.java b/sshd-core/src/main/java/org/apache/sshd/common/cipher/Cipher.java index dbf7f94..868e983 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/cipher/Cipher.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/cipher/Cipher.java @@ -66,23 +66,6 @@ public interface Cipher extends CipherInformation { void update(byte[] input, int inputOffset, int inputLen) throws Exception; /** - * Utility class to help using {@link Cipher}s - */ - // CHECKSTYLE:OFF - @Deprecated - final class Utils { - // CHECKSTYLE:ON - - private Utils() { - throw new UnsupportedOperationException("No instance allowed"); - } - - public static boolean checkSupported(String xform, int keyLength) { - return Cipher.checkSupported(xform, keyLength); - } - } - - /** * @param xform The full cipher transformation - e.g., AES/CBC/NoPadding - * never {@code null}/empty * @param keyLength The required key length in bits - always positive http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2d3e6ff/sshd-core/src/main/java/org/apache/sshd/common/kex/KeyExchange.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/kex/KeyExchange.java b/sshd-core/src/main/java/org/apache/sshd/common/kex/KeyExchange.java index 7930f69..05f7863 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/kex/KeyExchange.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/kex/KeyExchange.java @@ -19,6 +19,7 @@ package org.apache.sshd.common.kex; import java.security.PublicKey; +import java.util.Collections; import java.util.Map; import org.apache.sshd.common.NamedResource; @@ -35,12 +36,11 @@ import org.apache.sshd.common.util.logging.LoggingUtils; * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ public interface KeyExchange extends NamedResource { - Map<Integer, String> GROUP_KEX_OPCODES_MAP = - LoggingUtils.generateMnemonicMap(SshConstants.class, "SSH_MSG_KEX_DH_GEX_"); + Collections.unmodifiableMap(LoggingUtils.generateMnemonicMap(SshConstants.class, "SSH_MSG_KEX_DH_GEX_")); Map<Integer, String> SIMPLE_KEX_OPCODES_MAP = - LoggingUtils.generateMnemonicMap(SshConstants.class, "SSH_MSG_KEXDH_"); + Collections.unmodifiableMap(LoggingUtils.generateMnemonicMap(SshConstants.class, "SSH_MSG_KEXDH_")); /** * Initialize the key exchange algorithm. @@ -48,8 +48,8 @@ public interface KeyExchange extends NamedResource { * @param session the session using this algorithm * @param v_s the server identification string * @param v_c the client identification string - * @param i_s the server key init packet - * @param i_c the client key init packet + * @param i_s the server key initialization packet + * @param i_c the client key initialization packet * @throws Exception if an error occurs */ void init(Session session, byte[] v_s, byte[] v_c, byte[] i_s, byte[] i_c) throws Exception; @@ -92,34 +92,6 @@ public interface KeyExchange extends NamedResource { */ PublicKey getServerKey(); - /** - * A helper class for key exchange related operations - * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> - */ - // CHECKSTYLE:OFF - @Deprecated - final class Utils { - // CHECKSTYLE:ON - - public static final Map<Integer, String> GROUP_KEX_OPCODES_MAP = - KeyExchange.GROUP_KEX_OPCODES_MAP; - - public static final Map<Integer, String> SIMPLE_KEX_OPCODES_MAP = - KeyExchange.SIMPLE_KEX_OPCODES_MAP; - - private Utils() { - throw new UnsupportedOperationException("No instance allowed"); - } - - public static String getGroupKexOpcodeName(int cmd) { - return KeyExchange.getGroupKexOpcodeName(cmd); - } - - public static String getSimpleKexOpcodeName(int cmd) { - return KeyExchange.getSimpleKexOpcodeName(cmd); - } - } - static String getGroupKexOpcodeName(int cmd) { String name = GROUP_KEX_OPCODES_MAP.get(cmd); if (GenericUtils.isEmpty(name)) { http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2d3e6ff/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 0e809f9..1633b3e 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 @@ -65,59 +65,6 @@ public interface KeyIdentityProvider { Iterable<KeyPair> loadKeys(); /** - * A helper class for key identity provider related operations - * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> - */ - // CHECKSTYLE:OFF - @Deprecated - final class Utils { - // CHECKSTYLE:ON - - public static final Transformer<KeyIdentityProvider, Iterable<KeyPair>> LOADER = - KeyIdentityProvider.LOADER; - - private Utils() { - throw new UnsupportedOperationException("No instance allowed"); - } - - public static Iterator<KeyPair> iteratorOf(ClientSession session) { - return KeyIdentityProvider.iteratorOf(session); - } - - public static Iterator<KeyPair> iteratorOf(KeyIdentityProvider identities, KeyIdentityProvider keys) { - return KeyIdentityProvider.iteratorOf(identities, keys); - } - - public static Iterator<KeyPair> iteratorOf(KeyIdentityProvider provider) { - return KeyIdentityProvider.iteratorOf(provider); - } - - public static KeyIdentityProvider resolveKeyIdentityProvider(KeyIdentityProvider identities, KeyIdentityProvider keys) { - return KeyIdentityProvider.resolveKeyIdentityProvider(identities, keys); - } - - public static KeyIdentityProvider multiProvider(KeyIdentityProvider ... providers) { - return KeyIdentityProvider.multiProvider(providers); - } - - public static KeyIdentityProvider multiProvider(Collection<? extends KeyIdentityProvider> providers) { - return KeyIdentityProvider.multiProvider(providers); - } - - public static Iterable<KeyPair> iterableOf(Collection<? extends KeyIdentityProvider> providers) { - return KeyIdentityProvider.iterableOf(providers); - } - - public static KeyIdentityProvider wrap(KeyPair ... pairs) { - return KeyIdentityProvider.wrap(pairs); - } - - public static KeyIdentityProvider wrap(final Iterable<KeyPair> pairs) { - return KeyIdentityProvider.wrap(pairs); - } - } - - /** * Creates a "unified" {@link Iterator} of key pairs out of the registered * {@link KeyPair} identities and the extra available ones as a single iterator * of key pairs http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2d3e6ff/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 84d52ca..4634589 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 @@ -122,27 +122,6 @@ public interface KeyPairProvider extends KeyIdentityProvider { } /** - * A helper class for key-pair providers - * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> - */ - // CHECKSTYLE:OFF - @Deprecated - final class Utils { - // CHECKSTYLE:ON - private Utils() { - throw new UnsupportedOperationException("No instance allowed"); - } - - public static KeyPairProvider wrap(KeyPair ... pairs) { - return KeyPairProvider.wrap(pairs); - } - - public static KeyPairProvider wrap(final Iterable<KeyPair> pairs) { - return KeyPairProvider.wrap(pairs); - } - } - - /** * Wrap the provided {@link KeyPair}s into a {@link KeyPairProvider} * * @param pairs The available pairs - ignored if {@code null}/empty (i.e., http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2d3e6ff/sshd-core/src/main/java/org/apache/sshd/common/subsystem/sftp/SftpConstants.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/subsystem/sftp/SftpConstants.java b/sshd-core/src/main/java/org/apache/sshd/common/subsystem/sftp/SftpConstants.java index ac2764a..39ca03d 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/subsystem/sftp/SftpConstants.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/subsystem/sftp/SftpConstants.java @@ -18,6 +18,7 @@ */ package org.apache.sshd.common.subsystem.sftp; +import java.util.Collections; import java.util.Map; import org.apache.sshd.common.util.GenericUtils; @@ -277,14 +278,15 @@ public final class SftpConstants { private static class LazyCommandNameHolder { private static final Map<Integer, String> NAMES_MAP = - LoggingUtils.generateMnemonicMap(SftpConstants.class, f -> { - String name = f.getName(); - return name.startsWith("SSH_FXP_") - // exclude the rename modes which are not opcodes - && (!name.startsWith("SSH_FXP_RENAME_")) - // exclude the realpath modes wich are not opcodes - && (!name.startsWith("SSH_FXP_REALPATH_")); - }); + Collections.unmodifiableMap( + LoggingUtils.generateMnemonicMap(SftpConstants.class, f -> { + String name = f.getName(); + return name.startsWith("SSH_FXP_") + // exclude the rename modes which are not opcodes + && (!name.startsWith("SSH_FXP_RENAME_")) + // exclude the realpath modes wich are not opcodes + && (!name.startsWith("SSH_FXP_REALPATH_")); + })); } /** @@ -305,7 +307,8 @@ public final class SftpConstants { } private static class LazyStatusNameHolder { - private static final Map<Integer, String> STATUS_MAP = LoggingUtils.generateMnemonicMap(SftpConstants.class, "SSH_FX_"); + private static final Map<Integer, String> STATUS_MAP = + Collections.unmodifiableMap(LoggingUtils.generateMnemonicMap(SftpConstants.class, "SSH_FX_")); } /** http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2d3e6ff/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 6aab184..0f7fa1b 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 @@ -331,15 +331,14 @@ public final class GenericUtils { }; } - public static <T> - Collector<T, ?, SortedSet<T>> toSortedSet(Comparator<T> comparator) { + public static <T> Collector<T, ?, SortedSet<T>> toSortedSet(Comparator<T> comparator) { return Collectors.toCollection(() -> new TreeSet<>(comparator)); } public static <T> Stream<T> stream(Iterable<T> values) { if (isEmpty(values)) { return Stream.empty(); - } else if (values instanceof Collection) { + } else if (values instanceof Collection<?>) { return ((Collection<T>) values).stream(); } else { return StreamSupport.stream(values.spliterator(), false); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2d3e6ff/sshd-core/src/main/java/org/apache/sshd/common/util/Int2IntFunction.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/Int2IntFunction.java b/sshd-core/src/main/java/org/apache/sshd/common/util/Int2IntFunction.java index ea2962e..70e6b31 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/util/Int2IntFunction.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/util/Int2IntFunction.java @@ -36,32 +36,6 @@ public interface Int2IntFunction { */ int apply(int value); - // CHECKSTYLE:OFF - @Deprecated - final class Utils { - // CHECKSTYLE:ON - - private Utils() { - throw new UnsupportedOperationException("No instance allowed"); - } - - public static Int2IntFunction sub(int delta) { - return Int2IntFunction.sub(delta); - } - - public static Int2IntFunction add(final int delta) { - return Int2IntFunction.add(delta); - } - - public static Int2IntFunction mul(final int factor) { - return Int2IntFunction.mul(factor); - } - - public static Int2IntFunction div(final int factor) { - return Int2IntFunction.div(factor); - } - } - static Int2IntFunction sub(int delta) { return add(0 - delta); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2d3e6ff/sshd-core/src/main/java/org/apache/sshd/common/util/Transformer.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/Transformer.java b/sshd-core/src/main/java/org/apache/sshd/common/util/Transformer.java index 2d025b8..af3e4cc 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/util/Transformer.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/util/Transformer.java @@ -38,40 +38,20 @@ public interface Transformer<I, O> extends Function<I, O> { /** * Returns {@link Enum#name()} or {@code null} if argument is {@code null} */ - Transformer<Enum<?>, String> ENUM_NAME_EXTRACTOR = input -> { - if (input == null) { - return null; - } else { - return input.name(); - } - }; + Transformer<Enum<?>, String> ENUM_NAME_EXTRACTOR = input -> (input == null) ? null : input.name(); @Override default O apply(I input) { return transform(input); } + /** * @param input Input value * @return Transformed output value */ O transform(I input); - // CHECKSTYLE:OFF - @Deprecated - final class Utils { - // CHECKSTYLE:ON - - private Utils() { - throw new UnsupportedOperationException("No instance allowed"); - } - - public static <U extends V, V> Transformer<U, V> identity() { - return Transformer.identity(); - } - } - static <U extends V, V> Transformer<U, V> identity() { return input -> input; } - } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2d3e6ff/sshd-core/src/main/java/org/apache/sshd/common/util/buffer/keys/BufferPublicKeyParser.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/buffer/keys/BufferPublicKeyParser.java b/sshd-core/src/main/java/org/apache/sshd/common/util/buffer/keys/BufferPublicKeyParser.java index 6d05868..8b5ccc6 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/util/buffer/keys/BufferPublicKeyParser.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/util/buffer/keys/BufferPublicKeyParser.java @@ -73,27 +73,7 @@ public interface BufferPublicKeyParser<PUB extends PublicKey> { */ PUB getRawPublicKey(String keyType, Buffer buffer) throws GeneralSecurityException; - /** - * A helper class for {@link BufferPublicKeyParser} related operations - * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> - */ - // CHECKSTYLE:OFF - @Deprecated - final class Utils { - // CHECKSTYLE:ON - - public static final BufferPublicKeyParser<PublicKey> DEFAULT = BufferPublicKeyParser.DEFAULT; - - private Utils() { - throw new UnsupportedOperationException("No instance"); - } - - public static BufferPublicKeyParser<PublicKey> aggregate(final Collection<? extends BufferPublicKeyParser<? extends PublicKey>> parsers) { - return BufferPublicKeyParser.aggregate(parsers); - } - } - - static BufferPublicKeyParser<PublicKey> aggregate(final Collection<? extends BufferPublicKeyParser<? extends PublicKey>> parsers) { + static BufferPublicKeyParser<PublicKey> aggregate(Collection<? extends BufferPublicKeyParser<? extends PublicKey>> parsers) { if (GenericUtils.isEmpty(parsers)) { return EMPTY; } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2d3e6ff/sshd-core/src/main/java/org/apache/sshd/common/util/closeable/CloseableUtils.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/closeable/CloseableUtils.java b/sshd-core/src/main/java/org/apache/sshd/common/util/closeable/CloseableUtils.java deleted file mode 100644 index 2309c7d..0000000 --- a/sshd-core/src/main/java/org/apache/sshd/common/util/closeable/CloseableUtils.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.sshd.common.util.closeable; - -import java.io.IOException; - -import org.apache.sshd.common.Closeable; -import org.apache.sshd.common.PropertyResolver; -import org.apache.sshd.common.future.CloseFuture; - -/** - * Utility class to help with {@link Closeable}s. - * - * @deprecated Use Closeable static methods instead - * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> - */ -@Deprecated -public final class CloseableUtils { - /** - * Timeout (milliseconds) for waiting on a {@link CloseFuture} to successfully - * complete its action. - * @see #DEFAULT_CLOSE_WAIT_TIMEOUT - */ - public static final String CLOSE_WAIT_TIMEOUT = Closeable.CLOSE_WAIT_TIMEOUT; - - /** - * Default value for {@link #CLOSE_WAIT_TIMEOUT} if none specified - */ - public static final long DEFAULT_CLOSE_WAIT_TIMEOUT = Closeable.DEFAULT_CLOSE_WAIT_TIMEOUT; - - /** - * Private Constructor - */ - private CloseableUtils() { - throw new UnsupportedOperationException("No instance allowed"); - } - - public static long getMaxCloseWaitTime(PropertyResolver resolver) { - return Closeable.getMaxCloseWaitTime(resolver); - } - - public static void close(Closeable closeable) throws IOException { - Closeable.close(closeable); - } -} http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2d3e6ff/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 d954d81..66ea9ff 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 @@ -235,37 +235,6 @@ public interface ServerAuthenticationManager { HostBasedAuthenticator getHostBasedAuthenticator(); void setHostBasedAuthenticator(HostBasedAuthenticator hostBasedAuthenticator); - // CHECKSTYLE:OFF - @Deprecated - final class Utils { - // CHECKSTYLE:ON - - public static final UserAuthPublicKeyFactory DEFAULT_USER_AUTH_PUBLIC_KEY_FACTORY = - ServerAuthenticationManager.DEFAULT_USER_AUTH_PUBLIC_KEY_FACTORY; - - public static final UserAuthGSSFactory DEFAULT_USER_AUTH_GSS_FACTORY = - ServerAuthenticationManager.DEFAULT_USER_AUTH_GSS_FACTORY; - - public static final UserAuthPasswordFactory DEFAULT_USER_AUTH_PASSWORD_FACTORY = - ServerAuthenticationManager.DEFAULT_USER_AUTH_PASSWORD_FACTORY; - - public static final UserAuthKeyboardInteractiveFactory DEFAULT_USER_AUTH_KB_INTERACTIVE_FACTORY = - ServerAuthenticationManager.DEFAULT_USER_AUTH_KB_INTERACTIVE_FACTORY; - - private Utils() { - throw new UnsupportedOperationException("No instance allowed"); - } - - public static List<NamedFactory<UserAuth>> resolveUserAuthFactories(ServerAuthenticationManager manager) { - return ServerAuthenticationManager.resolveUserAuthFactories(manager); - } - - public static List<NamedFactory<UserAuth>> resolveUserAuthFactories( - ServerAuthenticationManager manager, List<NamedFactory<UserAuth>> userFactories) { - return ServerAuthenticationManager.resolveUserAuthFactories(manager, userFactories); - } - } - /** * If user authentication factories already set, then simply returns them. Otherwise, * builds the factories list from the individual authenticators available for http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2d3e6ff/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 79e3a8d..0287f75 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 @@ -73,7 +73,8 @@ import org.slf4j.LoggerFactory; @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class PortForwardingLoadTest extends BaseTestSupport { private final Logger log; - @SuppressWarnings("checkstyle:anoninnerlength") + + @SuppressWarnings({ "checkstyle:anoninnerlength", "synthetic-access" }) private final PortForwardingEventListener serverSideListener = new PortForwardingEventListener() { @Override public void establishingExplicitTunnel(org.apache.sshd.common.session.Session session, SshdSocketAddress local, http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2d3e6ff/sshd-core/src/test/java/org/apache/sshd/common/kex/KeyExchangeTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/kex/KeyExchangeTest.java b/sshd-core/src/test/java/org/apache/sshd/common/kex/KeyExchangeTest.java index db7c408..deff783 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/kex/KeyExchangeTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/kex/KeyExchangeTest.java @@ -22,7 +22,6 @@ package org.apache.sshd.common.kex; import java.util.Map; import org.apache.sshd.common.SshConstants; -import org.apache.sshd.common.kex.KeyExchange.Utils; import org.apache.sshd.common.util.Transformer; import org.apache.sshd.util.test.BaseTestSupport; import org.junit.FixMethodOrder; @@ -40,12 +39,12 @@ public class KeyExchangeTest extends BaseTestSupport { @Test public void testSimpleKexOpcodeName() { - testKexOpcodeName(KeyExchange.SIMPLE_KEX_OPCODES_MAP, Utils::getSimpleKexOpcodeName); + testKexOpcodeName(KeyExchange.SIMPLE_KEX_OPCODES_MAP, KeyExchange::getSimpleKexOpcodeName); } @Test public void testGroupKexOpcodeName() { - testKexOpcodeName(KeyExchange.GROUP_KEX_OPCODES_MAP, Utils::getGroupKexOpcodeName); + testKexOpcodeName(KeyExchange.GROUP_KEX_OPCODES_MAP, KeyExchange::getGroupKexOpcodeName); } private static void testKexOpcodeName(Map<Integer, String> opsMap, Transformer<Integer, String> xformer) { http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/f2d3e6ff/sshd-core/src/test/java/org/apache/sshd/common/session/ReservedSessionMessagesHandlerTest.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/test/java/org/apache/sshd/common/session/ReservedSessionMessagesHandlerTest.java b/sshd-core/src/test/java/org/apache/sshd/common/session/ReservedSessionMessagesHandlerTest.java index e4f8e3d..5e966d9 100644 --- a/sshd-core/src/test/java/org/apache/sshd/common/session/ReservedSessionMessagesHandlerTest.java +++ b/sshd-core/src/test/java/org/apache/sshd/common/session/ReservedSessionMessagesHandlerTest.java @@ -96,6 +96,7 @@ public class ReservedSessionMessagesHandlerTest extends BaseTestSupport { try { final Semaphore signal = new Semaphore(0); sshd.addSessionListener(new SessionListener() { + @SuppressWarnings("synthetic-access") @Override public void sessionEvent(final Session session, Event event) { if (Event.Authenticated.equals(event)) { @@ -127,6 +128,7 @@ public class ReservedSessionMessagesHandlerTest extends BaseTestSupport { } } } + private void testReservedSessionMessagesHandler(Session session, AccumulatingHandler handler) throws Exception { testIgnoredMessages(session, handler); testDebugMessages(session, handler);
