[SSHD-698] Use <> when possible Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/195874b4 Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/195874b4 Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/195874b4
Branch: refs/heads/master Commit: 195874b47c807fee4c4a3fb84fd43eb5d04c0925 Parents: 8804691 Author: Guillaume Nodet <gno...@apache.org> Authored: Thu Sep 15 11:25:18 2016 +0200 Committer: Guillaume Nodet <gno...@apache.org> Committed: Thu Sep 15 21:06:31 2016 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/sshd/agent/unix/AgentClient.java | 2 +- .../sshd/client/auth/AuthenticationIdentitiesProvider.java | 2 +- .../sshd/client/auth/hostbased/HostKeyIdentityProvider.java | 2 +- .../sshd/client/auth/password/PasswordIdentityProvider.java | 2 +- .../client/config/hosts/ConfigFileHostEntryResolver.java | 2 +- .../org/apache/sshd/client/config/hosts/HostConfigEntry.java | 2 +- .../apache/sshd/client/config/hosts/HostPatternsHolder.java | 2 +- .../sshd/client/keyverifier/KnownHostsServerKeyVerifier.java | 4 ++-- .../sftp/extensions/helpers/AbstractCheckFileExtension.java | 2 +- .../main/java/org/apache/sshd/common/SyspropsMapWrapper.java | 2 +- .../apache/sshd/common/channel/BufferedIoOutputStream.java | 4 ++-- .../java/org/apache/sshd/common/channel/SttySupport.java | 6 +++--- .../java/org/apache/sshd/common/config/TimeValueConfig.java | 2 +- .../apache/sshd/common/config/keys/AuthorizedKeyEntry.java | 2 +- .../main/java/org/apache/sshd/common/forward/SocksProxy.java | 2 +- .../sshd/common/keyprovider/AbstractFileKeyPairProvider.java | 2 +- .../sshd/common/keyprovider/MappedKeyPairProvider.java | 2 +- .../sshd/common/session/helpers/SessionTimeoutListener.java | 2 +- .../org/apache/sshd/common/subsystem/sftp/SftpHelper.java | 4 ++-- .../common/subsystem/sftp/extensions/AclSupportedParser.java | 4 ++-- .../sshd/common/subsystem/sftp/extensions/ParserUtils.java | 2 +- .../main/java/org/apache/sshd/common/util/SelectorUtils.java | 2 +- .../java/org/apache/sshd/common/util/closeable/Builder.java | 4 ++-- .../apache/sshd/common/util/io/ModifiableFileWatcher.java | 4 ++-- .../org/apache/sshd/common/util/net/SshdSocketAddress.java | 2 +- .../org/apache/sshd/common/util/threads/ThreadUtils.java | 4 ++-- .../server/auth/keyboard/UserAuthKeyboardInteractive.java | 2 +- .../server/auth/pubkey/CachingPublicKeyAuthenticator.java | 2 +- .../sshd/server/config/keys/AuthorizedKeysAuthenticator.java | 2 +- .../src/main/java/org/apache/sshd/server/kex/Moduli.java | 2 +- .../main/java/org/apache/sshd/git/pack/GitPackCommand.java | 2 +- .../java/org/apache/sshd/git/pgm/EmbeddedCommandRunner.java | 2 +- .../apache/sshd/common/util/net/LdapNetworkConnector.java | 8 ++++---- .../sshd/server/auth/pubkey/LdapPublickeyAuthenticator.java | 2 +- 34 files changed, 46 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/195874b4/sshd-core/src/main/java/org/apache/sshd/agent/unix/AgentClient.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/agent/unix/AgentClient.java b/sshd-core/src/main/java/org/apache/sshd/agent/unix/AgentClient.java index ac9fab8..97acd90 100644 --- a/sshd-core/src/main/java/org/apache/sshd/agent/unix/AgentClient.java +++ b/sshd-core/src/main/java/org/apache/sshd/agent/unix/AgentClient.java @@ -67,7 +67,7 @@ public class AgentClient extends AbstractAgentProxy implements Runnable { throwException(result); } receiveBuffer = new ByteArrayBuffer(); - messages = new ArrayBlockingQueue<Buffer>(10); + messages = new ArrayBlockingQueue<>(10); ExecutorService service = getExecutorService(); pumper = service.submit(this); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/195874b4/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 56ef102..7afd266 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 @@ -128,7 +128,7 @@ public interface AuthenticationIdentitiesProvider extends KeyIdentityProvider, P } if (matches == null) { - matches = new LinkedList<T>(); + matches = new LinkedList<>(); } matches.add(type.cast(o)); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/195874b4/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 d7879b5..5362d8f 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 @@ -75,7 +75,7 @@ public interface HostKeyIdentityProvider { @Override public Pair<KeyPair, List<X509Certificate>> next() { KeyPair kp = iter.next(); - return new Pair<KeyPair, List<X509Certificate>>(kp, Collections.emptyList()); + return new Pair<>(kp, Collections.emptyList()); } @Override http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/195874b4/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 d126594..fe37f39 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 @@ -174,7 +174,7 @@ public interface PasswordIdentityProvider { return Collections.emptyList(); } - Collection<Supplier<Iterable<String>>> suppliers = new ArrayList<Supplier<Iterable<String>>>(providers.size()); + Collection<Supplier<Iterable<String>>> suppliers = new ArrayList<>(providers.size()); for (final PasswordIdentityProvider p : providers) { if (p == null) { continue; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/195874b4/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/ConfigFileHostEntryResolver.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/ConfigFileHostEntryResolver.java b/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/ConfigFileHostEntryResolver.java index b5d5372..70a4f33 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/ConfigFileHostEntryResolver.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/ConfigFileHostEntryResolver.java @@ -39,7 +39,7 @@ import org.apache.sshd.common.util.io.ModifiableFileWatcher; */ public class ConfigFileHostEntryResolver extends ModifiableFileWatcher implements HostConfigEntryResolver { private final AtomicReference<HostConfigEntryResolver> delegateHolder = // assumes initially empty - new AtomicReference<HostConfigEntryResolver>(HostConfigEntryResolver.EMPTY); + new AtomicReference<>(HostConfigEntryResolver.EMPTY); public ConfigFileHostEntryResolver(File file) { this(ValidateUtils.checkNotNull(file, "No file to watch").toPath()); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/195874b4/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/HostConfigEntry.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/HostConfigEntry.java b/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/HostConfigEntry.java index 4a9eda4..20e1f40 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/HostConfigEntry.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/HostConfigEntry.java @@ -717,7 +717,7 @@ public class HostConfigEntry extends HostPatternsHolder implements MutableUserHo Map<String, String> props = entry.getProperties(); if (GenericUtils.size(props) > 0) { - normal.setProperties(new TreeMap<String, String>(props)); + normal.setProperties(new TreeMap<>(props)); } Collection<String> ids = entry.getIdentities(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/195874b4/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/HostPatternsHolder.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/HostPatternsHolder.java b/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/HostPatternsHolder.java index e9d0269..e81d01c 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/HostPatternsHolder.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/config/hosts/HostPatternsHolder.java @@ -266,7 +266,7 @@ public abstract class HostPatternsHolder { } } - return new Pair<Pattern, Boolean>(Pattern.compile(sb.toString(), Pattern.CASE_INSENSITIVE), negated); + return new Pair<>(Pattern.compile(sb.toString(), Pattern.CASE_INSENSITIVE), negated); } /** http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/195874b4/sshd-core/src/main/java/org/apache/sshd/client/keyverifier/KnownHostsServerKeyVerifier.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/keyverifier/KnownHostsServerKeyVerifier.java b/sshd-core/src/main/java/org/apache/sshd/client/keyverifier/KnownHostsServerKeyVerifier.java index e62d4b3..93fa5eb 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/keyverifier/KnownHostsServerKeyVerifier.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/keyverifier/KnownHostsServerKeyVerifier.java @@ -117,7 +117,7 @@ public class KnownHostsServerKeyVerifier protected final Object updateLock = new Object(); private final ServerKeyVerifier delegate; private final AtomicReference<Collection<HostEntryPair>> keysHolder = - new AtomicReference<Collection<HostEntryPair>>(Collections.emptyList()); + new AtomicReference<>(Collections.emptyList()); private ModifiedServerKeyAcceptor modKeyAcceptor; public KnownHostsServerKeyVerifier(ServerKeyVerifier delegate, Path file) { @@ -733,7 +733,7 @@ public class KnownHostsServerKeyVerifier * NOTE !!! we do not resolve the fully-qualified name to avoid long DNS timeouts. * Instead we use the reported peer address and the original connection target host */ - Collection<String> candidates = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER); + Collection<String> candidates = new TreeSet<>(String.CASE_INSENSITIVE_ORDER); candidates.add(SshdSocketAddress.toAddressString(remoteAddress)); SocketAddress connectAddress = clientSession.getConnectAddress(); candidates.add(SshdSocketAddress.toAddressString(connectAddress)); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/195874b4/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/extensions/helpers/AbstractCheckFileExtension.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/extensions/helpers/AbstractCheckFileExtension.java b/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/extensions/helpers/AbstractCheckFileExtension.java index 61fe34a..640f5c0 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/extensions/helpers/AbstractCheckFileExtension.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/extensions/helpers/AbstractCheckFileExtension.java @@ -71,6 +71,6 @@ public abstract class AbstractCheckFileExtension extends AbstractSftpClientExten hashes.add(hashValue); } - return new Pair<String, Collection<byte[]>>(algo, hashes); + return new Pair<>(algo, hashes); } } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/195874b4/sshd-core/src/main/java/org/apache/sshd/common/SyspropsMapWrapper.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/SyspropsMapWrapper.java b/sshd-core/src/main/java/org/apache/sshd/common/SyspropsMapWrapper.java index 707cb81..757f709 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/SyspropsMapWrapper.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/SyspropsMapWrapper.java @@ -107,7 +107,7 @@ public final class SyspropsMapWrapper implements Map<String, Object> { Properties props = System.getProperties(); // return a copy in order to avoid concurrent modifications Set<Entry<String, Object>> entries = - new TreeSet<Entry<String, Object>>(Pair.byKeyEntryComparator()); + new TreeSet<>(Pair.byKeyEntryComparator()); for (String key : props.stringPropertyNames()) { if (!isMappedSyspropKey(key)) { continue; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/195874b4/sshd-core/src/main/java/org/apache/sshd/common/channel/BufferedIoOutputStream.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/channel/BufferedIoOutputStream.java b/sshd-core/src/main/java/org/apache/sshd/common/channel/BufferedIoOutputStream.java index d496e24..6bacdc8 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/channel/BufferedIoOutputStream.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/channel/BufferedIoOutputStream.java @@ -35,8 +35,8 @@ import org.apache.sshd.common.util.closeable.AbstractInnerCloseable; */ public class BufferedIoOutputStream extends AbstractInnerCloseable implements IoOutputStream { protected final IoOutputStream out; - protected final Queue<IoWriteFutureImpl> writes = new ConcurrentLinkedQueue<IoWriteFutureImpl>(); - protected final AtomicReference<IoWriteFutureImpl> currentWrite = new AtomicReference<IoWriteFutureImpl>(); + protected final Queue<IoWriteFutureImpl> writes = new ConcurrentLinkedQueue<>(); + protected final AtomicReference<IoWriteFutureImpl> currentWrite = new AtomicReference<>(); public BufferedIoOutputStream(IoOutputStream out) { this.out = out; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/195874b4/sshd-core/src/main/java/org/apache/sshd/common/channel/SttySupport.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/channel/SttySupport.java b/sshd-core/src/main/java/org/apache/sshd/common/channel/SttySupport.java index 355a469..b7ee317 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/channel/SttySupport.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/channel/SttySupport.java @@ -41,8 +41,8 @@ public final class SttySupport { public static final String DEFAULT_SSHD_STTY_COMMAND = "stty"; private static final AtomicReference<String> STTY_COMMAND_HOLDER = - new AtomicReference<String>(System.getProperty(SSHD_STTY_COMMAND_PROP, DEFAULT_SSHD_STTY_COMMAND)); - private static final AtomicReference<String> TTY_PROPS_HOLDER = new AtomicReference<String>(null); + new AtomicReference<>(System.getProperty(SSHD_STTY_COMMAND_PROP, DEFAULT_SSHD_STTY_COMMAND)); + private static final AtomicReference<String> TTY_PROPS_HOLDER = new AtomicReference<>(null); private static final AtomicLong TTY_PROPS_LAST_FETCHED_HOLDER = new AtomicLong(0L); private SttySupport() { @@ -54,7 +54,7 @@ public final class SttySupport { } public static Map<PtyMode, Integer> parsePtyModes(String stty) { - Map<PtyMode, Integer> modes = new TreeMap<PtyMode, Integer>(); + Map<PtyMode, Integer> modes = new TreeMap<>(); for (PtyMode mode : PtyMode.values()) { if (mode == PtyMode.TTY_OP_ISPEED || mode == PtyMode.TTY_OP_OSPEED) { // TODO ... http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/195874b4/sshd-core/src/main/java/org/apache/sshd/common/config/TimeValueConfig.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/config/TimeValueConfig.java b/sshd-core/src/main/java/org/apache/sshd/common/config/TimeValueConfig.java index 83e9003..9266ae9 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/config/TimeValueConfig.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/config/TimeValueConfig.java @@ -102,7 +102,7 @@ public enum TimeValueConfig { } int lastPos = 0; - Map<TimeValueConfig, Long> spec = new EnumMap<TimeValueConfig, Long>(TimeValueConfig.class); + Map<TimeValueConfig, Long> spec = new EnumMap<>(TimeValueConfig.class); for (int curPos = 0; curPos < s.length(); curPos++) { char ch = s.charAt(curPos); if ((ch >= '0') && (ch <= '9')) { http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/195874b4/sshd-core/src/main/java/org/apache/sshd/common/config/keys/AuthorizedKeyEntry.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/config/keys/AuthorizedKeyEntry.java b/sshd-core/src/main/java/org/apache/sshd/common/config/keys/AuthorizedKeyEntry.java index acf7e80..66d1aa3 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/config/keys/AuthorizedKeyEntry.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/config/keys/AuthorizedKeyEntry.java @@ -148,7 +148,7 @@ public class AuthorizedKeyEntry extends PublicKeyEntry { return Collections.emptyList(); } - List<PublicKey> keys = new ArrayList<PublicKey>(entries.size()); + List<PublicKey> keys = new ArrayList<>(entries.size()); for (AuthorizedKeyEntry e : entries) { PublicKey k = e.resolvePublicKey(fallbackResolver); if (k != null) { http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/195874b4/sshd-core/src/main/java/org/apache/sshd/common/forward/SocksProxy.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/forward/SocksProxy.java b/sshd-core/src/main/java/org/apache/sshd/common/forward/SocksProxy.java index fb581be..9a04394 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/forward/SocksProxy.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/forward/SocksProxy.java @@ -43,7 +43,7 @@ import org.apache.sshd.common.util.net.SshdSocketAddress; public class SocksProxy extends AbstractCloseable implements IoHandler { private final ConnectionService service; - private final Map<IoSession, Proxy> proxies = new ConcurrentHashMap<IoSession, Proxy>(); + private final Map<IoSession, Proxy> proxies = new ConcurrentHashMap<>(); public SocksProxy(ConnectionService service) { this.service = service; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/195874b4/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/AbstractFileKeyPairProvider.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/AbstractFileKeyPairProvider.java b/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/AbstractFileKeyPairProvider.java index 75d8e08..1991e99 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/AbstractFileKeyPairProvider.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/AbstractFileKeyPairProvider.java @@ -66,7 +66,7 @@ public abstract class AbstractFileKeyPairProvider extends AbstractResourceKeyPai public void setPaths(Collection<? extends Path> paths) { int numPaths = GenericUtils.size(paths); - Collection<Path> resolved = (numPaths <= 0) ? Collections.emptyList() : new ArrayList<Path>(paths.size()); + Collection<Path> resolved = (numPaths <= 0) ? Collections.emptyList() : new ArrayList<>(paths.size()); // use absolute path in order to have unique cache keys if (numPaths > 0) { for (Path p : paths) { http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/195874b4/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/MappedKeyPairProvider.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/MappedKeyPairProvider.java b/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/MappedKeyPairProvider.java index 0b316c0..60a2750 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/MappedKeyPairProvider.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/MappedKeyPairProvider.java @@ -90,7 +90,7 @@ public class MappedKeyPairProvider implements KeyPairProvider { return Collections.emptyMap(); } - Map<String, KeyPair> pairsMap = new TreeMap<String, KeyPair>(String.CASE_INSENSITIVE_ORDER); + Map<String, KeyPair> pairsMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); for (KeyPair kp : pairs) { String keyType = ValidateUtils.checkNotNullAndNotEmpty(KeyUtils.getKeyType(kp), "Cannot determine key type"); KeyPair prev = pairsMap.put(keyType, kp); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/195874b4/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/SessionTimeoutListener.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/SessionTimeoutListener.java b/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/SessionTimeoutListener.java index b1d95fa..98025d7 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/SessionTimeoutListener.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/SessionTimeoutListener.java @@ -32,7 +32,7 @@ import org.apache.sshd.common.util.logging.AbstractLoggingBean; * @see org.apache.sshd.common.session.helpers.AbstractSession#checkForTimeouts() */ public class SessionTimeoutListener extends AbstractLoggingBean implements SessionListener, Runnable { - private final Set<AbstractSession> sessions = new CopyOnWriteArraySet<AbstractSession>(); + private final Set<AbstractSession> sessions = new CopyOnWriteArraySet<>(); public SessionTimeoutListener() { super(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/195874b4/sshd-core/src/main/java/org/apache/sshd/common/subsystem/sftp/SftpHelper.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/subsystem/sftp/SftpHelper.java b/sshd-core/src/main/java/org/apache/sshd/common/subsystem/sftp/SftpHelper.java index 0333fd1..b0d6a21 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/subsystem/sftp/SftpHelper.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/subsystem/sftp/SftpHelper.java @@ -479,7 +479,7 @@ public final class SftpHelper { } public static Map<String, Object> readAttrs(Buffer buffer, int version) { - Map<String, Object> attrs = new TreeMap<String, Object>(String.CASE_INSENSITIVE_ORDER); + Map<String, Object> attrs = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); int flags = buffer.getInt(); if (version >= SftpConstants.SFTP_V4) { int type = buffer.getUByte(); @@ -592,7 +592,7 @@ public final class SftpHelper { public static Map<String, byte[]> readExtensions(Buffer buffer) { int count = buffer.getInt(); // NOTE - Map<String, byte[]> extended = new TreeMap<String, byte[]>(String.CASE_INSENSITIVE_ORDER); + Map<String, byte[]> extended = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); for (int i = 0; i < count; i++) { String key = buffer.getString(); byte[] val = buffer.getBytes(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/195874b4/sshd-core/src/main/java/org/apache/sshd/common/subsystem/sftp/extensions/AclSupportedParser.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/subsystem/sftp/extensions/AclSupportedParser.java b/sshd-core/src/main/java/org/apache/sshd/common/subsystem/sftp/extensions/AclSupportedParser.java index e9ccf97..2930f84 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/subsystem/sftp/extensions/AclSupportedParser.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/subsystem/sftp/extensions/AclSupportedParser.java @@ -150,7 +150,7 @@ public class AclSupportedParser extends AbstractParser<AclCapabilities> { return Collections.emptySet(); } - Set<String> caps = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER); + Set<String> caps = new TreeSet<>(String.CASE_INSENSITIVE_ORDER); Map<Integer, String> map = getAclCapabilityValuesMap(); for (Map.Entry<Integer, String> ae : map.entrySet()) { Integer value = ae.getKey(); @@ -182,7 +182,7 @@ public class AclSupportedParser extends AbstractParser<AclCapabilities> { } Map<Integer, String> map = getAclCapabilityValuesMap(); - Set<Integer> caps = new HashSet<Integer>(map.size()); + Set<Integer> caps = new HashSet<>(map.size()); for (Integer v : map.keySet()) { if ((mask & v) != 0) { caps.add(v); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/195874b4/sshd-core/src/main/java/org/apache/sshd/common/subsystem/sftp/extensions/ParserUtils.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/subsystem/sftp/extensions/ParserUtils.java b/sshd-core/src/main/java/org/apache/sshd/common/subsystem/sftp/extensions/ParserUtils.java index 243d299..ed39577 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/subsystem/sftp/extensions/ParserUtils.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/subsystem/sftp/extensions/ParserUtils.java @@ -132,7 +132,7 @@ public final class ParserUtils { if (PARSERS_MAP.isEmpty()) { return Collections.emptyList(); } else { // return a copy in order to avoid concurrent modification issues - return new ArrayList<ExtensionParser<?>>(PARSERS_MAP.values()); + return new ArrayList<>(PARSERS_MAP.values()); } } } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/195874b4/sshd-core/src/main/java/org/apache/sshd/common/util/SelectorUtils.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/SelectorUtils.java b/sshd-core/src/main/java/org/apache/sshd/common/util/SelectorUtils.java index 6c343c4..a02d553 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/util/SelectorUtils.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/util/SelectorUtils.java @@ -522,7 +522,7 @@ public final class SelectorUtils { } public static List<String> tokenizePath(String path, String separator) { - List<String> ret = new ArrayList<String>(); + List<String> ret = new ArrayList<>(); StringTokenizer st = new StringTokenizer(path, separator); while (st.hasMoreTokens()) { ret.add(st.nextToken()); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/195874b4/sshd-core/src/main/java/org/apache/sshd/common/util/closeable/Builder.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/closeable/Builder.java b/sshd-core/src/main/java/org/apache/sshd/common/util/closeable/Builder.java index 58c8819..9dad9b0 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/util/closeable/Builder.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/util/closeable/Builder.java @@ -34,7 +34,7 @@ import org.apache.sshd.common.util.ValidateUtils; public final class Builder implements ObjectBuilder<Closeable> { private final Object lock; - private final List<Closeable> closeables = new ArrayList<Closeable>(); + private final List<Closeable> closeables = new ArrayList<>(); public Builder(Object lock) { this.lock = ValidateUtils.checkNotNull(lock, "No lock"); @@ -69,7 +69,7 @@ public final class Builder implements ObjectBuilder<Closeable> { @SuppressWarnings("rawtypes") public <T extends SshFuture> Builder when(final Iterable<? extends SshFuture<T>> futures) { - return close(new FuturesCloseable<T>(lock, futures)); + return close(new FuturesCloseable<>(lock, futures)); } public Builder sequential(Closeable... closeables) { http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/195874b4/sshd-core/src/main/java/org/apache/sshd/common/util/io/ModifiableFileWatcher.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/io/ModifiableFileWatcher.java b/sshd-core/src/main/java/org/apache/sshd/common/util/io/ModifiableFileWatcher.java index ebca9f2..da3aace 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/util/io/ModifiableFileWatcher.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/util/io/ModifiableFileWatcher.java @@ -230,7 +230,7 @@ public class ModifiableFileWatcher extends AbstractLoggingBean { if (OsUtils.isUNIX()) { PosixFilePermission p = IoUtils.validateExcludedPermissions(perms, STRICTLY_PROHIBITED_FILE_PERMISSION); if (p != null) { - return new Pair<String, Object>(String.format("Permissions violation (%s)", p), p); + return new Pair<>(String.format("Permissions violation (%s)", p), p); } } @@ -251,7 +251,7 @@ public class ModifiableFileWatcher extends AbstractLoggingBean { } if (!expected.contains(owner)) { - return new Pair<String, Object>(String.format("Owner violation (%s)", owner), owner); + return new Pair<>(String.format("Owner violation (%s)", owner), owner); } return null; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/195874b4/sshd-core/src/main/java/org/apache/sshd/common/util/net/SshdSocketAddress.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/net/SshdSocketAddress.java b/sshd-core/src/main/java/org/apache/sshd/common/util/net/SshdSocketAddress.java index 65252a0..e56c290 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/util/net/SshdSocketAddress.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/util/net/SshdSocketAddress.java @@ -166,7 +166,7 @@ public class SshdSocketAddress extends SocketAddress { * or localhost sorted according to {@link #BY_HOST_ADDRESS} */ public static List<InetAddress> getExternalNetwork4Addresses() { - List<InetAddress> addresses = new ArrayList<InetAddress>(); + List<InetAddress> addresses = new ArrayList<>(); try { for (Enumeration<NetworkInterface> nets = NetworkInterface.getNetworkInterfaces(); (nets != null) && nets.hasMoreElements();) { NetworkInterface netint = nets.nextElement(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/195874b4/sshd-core/src/main/java/org/apache/sshd/common/util/threads/ThreadUtils.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/threads/ThreadUtils.java b/sshd-core/src/main/java/org/apache/sshd/common/util/threads/ThreadUtils.java index 777f14e..4f61d46 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/util/threads/ThreadUtils.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/util/threads/ThreadUtils.java @@ -139,7 +139,7 @@ public final class ThreadUtils { public static ExecutorService newFixedThreadPool(String poolName, int nThreads) { return new ThreadPoolExecutor(nThreads, nThreads, 0L, TimeUnit.MILLISECONDS, // TODO make this configurable - new LinkedBlockingQueue<Runnable>(), + new LinkedBlockingQueue<>(), new SshdThreadFactory(poolName), new ThreadPoolExecutor.CallerRunsPolicy()); } @@ -147,7 +147,7 @@ public final class ThreadUtils { public static ExecutorService newCachedThreadPool(String poolName) { return new ThreadPoolExecutor(0, Integer.MAX_VALUE, // TODO make this configurable 60L, TimeUnit.SECONDS, // TODO make this configurable - new SynchronousQueue<Runnable>(), + new SynchronousQueue<>(), new SshdThreadFactory(poolName), new ThreadPoolExecutor.CallerRunsPolicy()); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/195874b4/sshd-core/src/main/java/org/apache/sshd/server/auth/keyboard/UserAuthKeyboardInteractive.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/server/auth/keyboard/UserAuthKeyboardInteractive.java b/sshd-core/src/main/java/org/apache/sshd/server/auth/keyboard/UserAuthKeyboardInteractive.java index 9177966..08b0975 100644 --- a/sshd-core/src/main/java/org/apache/sshd/server/auth/keyboard/UserAuthKeyboardInteractive.java +++ b/sshd-core/src/main/java/org/apache/sshd/server/auth/keyboard/UserAuthKeyboardInteractive.java @@ -97,7 +97,7 @@ public class UserAuthKeyboardInteractive extends AbstractUserAuth { } int num = buffer.getInt(); - List<String> responses = (num <= 0) ? Collections.emptyList() : new ArrayList<String>(num); + List<String> responses = (num <= 0) ? Collections.emptyList() : new ArrayList<>(num); for (int index = 0; index < num; index++) { String value = buffer.getString(); if (log.isTraceEnabled()) { http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/195874b4/sshd-core/src/main/java/org/apache/sshd/server/auth/pubkey/CachingPublicKeyAuthenticator.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/server/auth/pubkey/CachingPublicKeyAuthenticator.java b/sshd-core/src/main/java/org/apache/sshd/server/auth/pubkey/CachingPublicKeyAuthenticator.java index 70cb3be..45af83f 100644 --- a/sshd-core/src/main/java/org/apache/sshd/server/auth/pubkey/CachingPublicKeyAuthenticator.java +++ b/sshd-core/src/main/java/org/apache/sshd/server/auth/pubkey/CachingPublicKeyAuthenticator.java @@ -38,7 +38,7 @@ import org.apache.sshd.server.session.ServerSession; public class CachingPublicKeyAuthenticator extends AbstractLoggingBean implements PublickeyAuthenticator, SessionListener { protected final PublickeyAuthenticator authenticator; - protected final Map<ServerSession, Map<PublicKey, Boolean>> cache = new ConcurrentHashMap<ServerSession, Map<PublicKey, Boolean>>(); + protected final Map<ServerSession, Map<PublicKey, Boolean>> cache = new ConcurrentHashMap<>(); public CachingPublicKeyAuthenticator(PublickeyAuthenticator authenticator) { this.authenticator = ValidateUtils.checkNotNull(authenticator, "No delegate authenticator"); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/195874b4/sshd-core/src/main/java/org/apache/sshd/server/config/keys/AuthorizedKeysAuthenticator.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/server/config/keys/AuthorizedKeysAuthenticator.java b/sshd-core/src/main/java/org/apache/sshd/server/config/keys/AuthorizedKeysAuthenticator.java index a978b06..050a0ab 100644 --- a/sshd-core/src/main/java/org/apache/sshd/server/config/keys/AuthorizedKeysAuthenticator.java +++ b/sshd-core/src/main/java/org/apache/sshd/server/config/keys/AuthorizedKeysAuthenticator.java @@ -64,7 +64,7 @@ public class AuthorizedKeysAuthenticator extends ModifiableFileWatcher implement } private final AtomicReference<PublickeyAuthenticator> delegateHolder = // assumes initially reject-all - new AtomicReference<PublickeyAuthenticator>(RejectAllPublickeyAuthenticator.INSTANCE); + new AtomicReference<>(RejectAllPublickeyAuthenticator.INSTANCE); public AuthorizedKeysAuthenticator(File file) { this(ValidateUtils.checkNotNull(file, "No file to watch").toPath()); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/195874b4/sshd-core/src/main/java/org/apache/sshd/server/kex/Moduli.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/server/kex/Moduli.java b/sshd-core/src/main/java/org/apache/sshd/server/kex/Moduli.java index c67b451..2a30525 100644 --- a/sshd-core/src/main/java/org/apache/sshd/server/kex/Moduli.java +++ b/sshd-core/src/main/java/org/apache/sshd/server/kex/Moduli.java @@ -47,7 +47,7 @@ public final class Moduli { } public static List<DhGroup> parseModuli(URL url) throws IOException { - List<DhGroup> groups = new ArrayList<DhGroup>(); + List<DhGroup> groups = new ArrayList<>(); try (BufferedReader r = new BufferedReader(new InputStreamReader(url.openStream()))) { String line; while ((line = r.readLine()) != null) { http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/195874b4/sshd-git/src/main/java/org/apache/sshd/git/pack/GitPackCommand.java ---------------------------------------------------------------------- diff --git a/sshd-git/src/main/java/org/apache/sshd/git/pack/GitPackCommand.java b/sshd-git/src/main/java/org/apache/sshd/git/pack/GitPackCommand.java index 071af07..3b92cc2 100644 --- a/sshd-git/src/main/java/org/apache/sshd/git/pack/GitPackCommand.java +++ b/sshd-git/src/main/java/org/apache/sshd/git/pack/GitPackCommand.java @@ -148,7 +148,7 @@ public class GitPackCommand implements Command, Runnable { value = ""; } - List<String> list = new ArrayList<String>(); + List<String> list = new ArrayList<>(); StringBuilder sb = new StringBuilder(); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/195874b4/sshd-git/src/main/java/org/apache/sshd/git/pgm/EmbeddedCommandRunner.java ---------------------------------------------------------------------- diff --git a/sshd-git/src/main/java/org/apache/sshd/git/pgm/EmbeddedCommandRunner.java b/sshd-git/src/main/java/org/apache/sshd/git/pgm/EmbeddedCommandRunner.java index dfcc6ab..0b1f3c7 100644 --- a/sshd-git/src/main/java/org/apache/sshd/git/pgm/EmbeddedCommandRunner.java +++ b/sshd-git/src/main/java/org/apache/sshd/git/pgm/EmbeddedCommandRunner.java @@ -64,7 +64,7 @@ public class EmbeddedCommandRunner { private TextBuiltin subcommand; @Argument(index = 1, metaVar = "metaVar_arg") - private List<String> arguments = new ArrayList<String>(); + private List<String> arguments = new ArrayList<>(); private String rootDir; http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/195874b4/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 04bfc0c..ed508d8 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 @@ -86,7 +86,7 @@ public class LdapNetworkConnector<C> extends NetworkConnector { + ",crossCertificatePair,x500UniqueIdentifier"; protected final SearchControls searchControls = new SearchControls(); - protected final Map<String, Object> ldapEnv = new TreeMap<String, Object>(String.CASE_INSENSITIVE_ORDER); + protected final Map<String, Object> ldapEnv = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); protected MessageFormat bindDNPattern = new MessageFormat(DEFAULT_LDAP_BIND_DN_PATTERN); protected MessageFormat bindPasswordPattern = new MessageFormat(DEFAULT_LDAP_BIND_PASSWORD_PATTERN); protected MessageFormat searchFilterPattern; @@ -347,7 +347,7 @@ public class LdapNetworkConnector<C> extends NetworkConnector { */ public Map<String, Object> resolveAttributes(String username, String password, C queryContext) throws NamingException { // create a copy of the original environment so we can change it - DirContext context = initializeDirContext(queryContext, new HashMap<String, Object>(ldapEnv), username, password); + DirContext context = initializeDirContext(queryContext, new HashMap<>(ldapEnv), username, password); try { return queryAttributes(queryContext, context, context.getEnvironment(), username, password); } finally { @@ -374,7 +374,7 @@ public class LdapNetworkConnector<C> extends NetworkConnector { ValidateUtils.checkNotNullAndNotEmpty(filter, "No filter"), searchControls); try { - Map<String, Object> attrsMap = new TreeMap<String, Object>(String.CASE_INSENSITIVE_ORDER); + Map<String, Object> attrsMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); String referralMode = Objects.toString(ldapConfig.get(Context.REFERRAL), null); for (int index = 0;; index++) { if (!result.hasMore()) { @@ -516,7 +516,7 @@ public class LdapNetworkConnector<C> extends NetworkConnector { if (prev instanceof List<?>) { values = (List<Object>) prev; } else { - values = new ArrayList<Object>(); + values = new ArrayList<>(); values.add(prev); attrsMap.put(attrID, values); } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/195874b4/sshd-ldap/src/main/java/org/apache/sshd/server/auth/pubkey/LdapPublickeyAuthenticator.java ---------------------------------------------------------------------- diff --git a/sshd-ldap/src/main/java/org/apache/sshd/server/auth/pubkey/LdapPublickeyAuthenticator.java b/sshd-ldap/src/main/java/org/apache/sshd/server/auth/pubkey/LdapPublickeyAuthenticator.java index 6a3d5a0..b0b07fb 100644 --- a/sshd-ldap/src/main/java/org/apache/sshd/server/auth/pubkey/LdapPublickeyAuthenticator.java +++ b/sshd-ldap/src/main/java/org/apache/sshd/server/auth/pubkey/LdapPublickeyAuthenticator.java @@ -165,7 +165,7 @@ public class LdapPublickeyAuthenticator extends LdapAuthenticator implements Pub // handle case of multi-valued attribute if (keyData instanceof Collection<?>) { Collection<?> values = (Collection<?>) keyData; - List<PublicKey> keys = new ArrayList<PublicKey>(values.size()); + List<PublicKey> keys = new ArrayList<>(values.size()); for (Object v : values) { PublicKey k = parsePublicKeyValue(username, expected, session, attrs, v); if (k == null) {
