You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by gn...@apache.org on 2015/07/16 15:37:09 UTC
[2/6] mina-sshd git commit: Remove direct references to GenericUtils.EMPTY_XXX in non helper methods, add methods without the var args to avoid the creation of the empty array. This keeps readability and performances…
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/ec48d8b6/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 568019d..eee2c20 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
@@ -322,7 +322,7 @@ public final class GenericUtils {
*/
public static final <V> SortedSet<V> asSortedSet(Comparator<? super V> comp, Collection<? extends V> values) {
// TODO for JDK-8 return Collections.emptySortedSet()
- SortedSet<V> set=new TreeSet<V>(ValidateUtils.checkNotNull(comp, "No comparator", EMPTY_OBJECT_ARRAY));
+ SortedSet<V> set=new TreeSet<V>(ValidateUtils.checkNotNull(comp, "No comparator"));
if (size(values) > 0) {
set.addAll(values);
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/ec48d8b6/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 06a6070..68b1588 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
@@ -78,7 +78,7 @@ public interface Int2IntFunction {
if (factor == 1) {
return IDENTITY;
} else {
- ValidateUtils.checkTrue(factor != 0, "Zero division factor", GenericUtils.EMPTY_OBJECT_ARRAY);
+ ValidateUtils.checkTrue(factor != 0, "Zero division factor");
return new Int2IntFunction() {
@Override
public int apply(int value) {
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/ec48d8b6/sshd-core/src/main/java/org/apache/sshd/common/util/SecurityUtils.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/SecurityUtils.java b/sshd-core/src/main/java/org/apache/sshd/common/util/SecurityUtils.java
index aa80440..daa5b13 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/util/SecurityUtils.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/util/SecurityUtils.java
@@ -214,7 +214,7 @@ public class SecurityUtils {
// use a separate class in order to avoid direct dependency
private static class BouncyCastleFileKeyPairProvider extends AbstractFileKeyPairProvider {
private BouncyCastleFileKeyPairProvider() {
- ValidateUtils.checkTrue(isBouncyCastleRegistered(), "BouncyCastle not registered", GenericUtils.EMPTY_OBJECT_ARRAY);
+ ValidateUtils.checkTrue(isBouncyCastleRegistered(), "BouncyCastle not registered");
}
@Override
@@ -233,7 +233,7 @@ public class SecurityUtils {
private static class BouncyCastleClassLoadableResourceKeyPairProvider extends AbstractClassLoadableResourceKeyPairProvider {
private BouncyCastleClassLoadableResourceKeyPairProvider() {
- ValidateUtils.checkTrue(isBouncyCastleRegistered(), "BouncyCastle not registered", GenericUtils.EMPTY_OBJECT_ARRAY);
+ ValidateUtils.checkTrue(isBouncyCastleRegistered(), "BouncyCastle not registered");
}
@Override
@@ -252,7 +252,7 @@ public class SecurityUtils {
private static class BouncyCastleGeneratorHostKeyProvider extends AbstractGeneratorHostKeyProvider {
private BouncyCastleGeneratorHostKeyProvider(Path path) {
- ValidateUtils.checkTrue(isBouncyCastleRegistered(), "BouncyCastle not registered", GenericUtils.EMPTY_OBJECT_ARRAY);
+ ValidateUtils.checkTrue(isBouncyCastleRegistered(), "BouncyCastle not registered");
setPath(path);
}
@@ -318,7 +318,7 @@ public class SecurityUtils {
private final RandomGenerator random;
public BouncyCastleRandom() {
- ValidateUtils.checkTrue(isBouncyCastleRegistered(), "BouncyCastle not registered", GenericUtils.EMPTY_OBJECT_ARRAY);
+ ValidateUtils.checkTrue(isBouncyCastleRegistered(), "BouncyCastle not registered");
this.random = new VMPCRandomGenerator();
byte[] seed = new SecureRandom().generateSeed(8);
this.random.addSeedMaterial(seed);
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/ec48d8b6/sshd-core/src/main/java/org/apache/sshd/common/util/ValidateUtils.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/ValidateUtils.java b/sshd-core/src/main/java/org/apache/sshd/common/util/ValidateUtils.java
index 4432aa4..264e159 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/util/ValidateUtils.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/util/ValidateUtils.java
@@ -30,11 +30,13 @@ public final class ValidateUtils {
throw new UnsupportedOperationException("No instance");
}
+ public static final <T> T checkNotNull(T t, String message) {
+ checkTrue(t != null, message);
+ return t;
+ }
+
public static final <T> T checkNotNull(T t, String message, Object arg) {
- if (t == null) {
- throwIllegalArgumentException(message, arg);
- }
-
+ checkTrue(t != null, message, arg);
return t;
}
@@ -43,6 +45,12 @@ public final class ValidateUtils {
return t;
}
+ public static final String checkNotNullAndNotEmpty(String t, String message) {
+ t = checkNotNull(t, message).trim();
+ checkTrue(GenericUtils.length(t) > 0, message);
+ return t;
+ }
+
public static final String checkNotNullAndNotEmpty(String t, String message, Object arg) {
t = checkNotNull(t, message, arg).trim();
checkTrue(GenericUtils.length(t) > 0, message, arg);
@@ -79,9 +87,9 @@ public final class ValidateUtils {
return t;
}
- public static final void checkTrue(boolean flag, String message, long arg) {
+ public static final void checkTrue(boolean flag, String message) {
if (!flag) {
- throwIllegalArgumentException(message, Long.valueOf(arg));
+ throwIllegalArgumentException(message, GenericUtils.EMPTY_OBJECT_ARRAY);
}
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/ec48d8b6/sshd-core/src/main/java/org/apache/sshd/common/util/io/DERWriter.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/io/DERWriter.java b/sshd-core/src/main/java/org/apache/sshd/common/util/io/DERWriter.java
index 6d4dd51..b2d6ccf 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/util/io/DERWriter.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/util/io/DERWriter.java
@@ -49,11 +49,11 @@ public class DERWriter extends FilterOutputStream {
}
public DERWriter(OutputStream stream) {
- super(ValidateUtils.checkNotNull(stream, "No output stream", GenericUtils.EMPTY_OBJECT_ARRAY));
+ super(ValidateUtils.checkNotNull(stream, "No output stream"));
}
public void writeBigInteger(BigInteger value) throws IOException {
- writeBigInteger(ValidateUtils.checkNotNull(value, "No value", GenericUtils.EMPTY_OBJECT_ARRAY).toByteArray());
+ writeBigInteger(ValidateUtils.checkNotNull(value, "No value").toByteArray());
}
public void writeBigInteger(byte ... bytes) throws IOException {
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/ec48d8b6/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 c44cee0..584a241 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
@@ -46,7 +46,7 @@ public class ModifiableFileWatcher extends AbstractLoggingBean {
protected final LinkOption[] options;
public ModifiableFileWatcher(File file) {
- this(ValidateUtils.checkNotNull(file, "No file to watch", GenericUtils.EMPTY_OBJECT_ARRAY).toPath());
+ this(ValidateUtils.checkNotNull(file, "No file to watch").toPath());
}
public ModifiableFileWatcher(Path file) {
@@ -54,7 +54,7 @@ public class ModifiableFileWatcher extends AbstractLoggingBean {
}
public ModifiableFileWatcher(Path file, LinkOption ... options) {
- this.file = ValidateUtils.checkNotNull(file, "No path to watch", GenericUtils.EMPTY_OBJECT_ARRAY);
+ this.file = ValidateUtils.checkNotNull(file, "No path to watch");
// use a clone to avoid being sensitive to changes in the passed array
this.options = (options == null) ? IoUtils.EMPTY_LINK_OPTIONS : options.clone();
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/ec48d8b6/sshd-core/src/main/java/org/apache/sshd/server/SshServer.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/SshServer.java b/sshd-core/src/main/java/org/apache/sshd/server/SshServer.java
index be7f27d..c84a710 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/SshServer.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/SshServer.java
@@ -245,13 +245,13 @@ public class SshServer extends AbstractFactoryManager implements ServerFactoryMa
factories.add(DEFAULT_USER_AUTH_GSS_FACTORY);
}
- ValidateUtils.checkTrue(factories.size() > 0, "UserAuthFactories not set", GenericUtils.EMPTY_OBJECT_ARRAY);
+ ValidateUtils.checkTrue(factories.size() > 0, "UserAuthFactories not set");
setUserAuthFactories(factories);
}
- ValidateUtils.checkNotNullAndNotEmpty(getChannelFactories(), "ChannelFactories not set", GenericUtils.EMPTY_OBJECT_ARRAY);
- ValidateUtils.checkNotNull(getKeyPairProvider(), "HostKeyProvider not set", GenericUtils.EMPTY_OBJECT_ARRAY);
- ValidateUtils.checkNotNull(getFileSystemFactory(), "FileSystemFactory not set", GenericUtils.EMPTY_OBJECT_ARRAY);
+ ValidateUtils.checkNotNullAndNotEmpty(getChannelFactories(), "ChannelFactories not set");
+ ValidateUtils.checkNotNull(getKeyPairProvider(), "HostKeyProvider not set");
+ ValidateUtils.checkNotNull(getFileSystemFactory(), "FileSystemFactory not set");
if (GenericUtils.isEmpty(getServiceFactories())) {
setServiceFactories(DEFAULT_SERVICE_FACTORIES);
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/ec48d8b6/sshd-core/src/main/java/org/apache/sshd/server/auth/UserAuthPassword.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/auth/UserAuthPassword.java b/sshd-core/src/main/java/org/apache/sshd/server/auth/UserAuthPassword.java
index 77c73b3..2f6bd4f 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/auth/UserAuthPassword.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/auth/UserAuthPassword.java
@@ -53,8 +53,7 @@ public class UserAuthPassword extends AbstractUserAuth {
ServerFactoryManager manager = session.getFactoryManager();
PasswordAuthenticator auth = ValidateUtils.checkNotNull(
manager.getPasswordAuthenticator(),
- "No PasswordAuthenticator configured",
- GenericUtils.EMPTY_OBJECT_ARRAY);
+ "No PasswordAuthenticator configured");
return auth.authenticate(username, password, session);
}
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/ec48d8b6/sshd-core/src/main/java/org/apache/sshd/server/auth/UserAuthPublicKey.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/auth/UserAuthPublicKey.java b/sshd-core/src/main/java/org/apache/sshd/server/auth/UserAuthPublicKey.java
index 8c58463..87cd80c 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/auth/UserAuthPublicKey.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/auth/UserAuthPublicKey.java
@@ -43,7 +43,7 @@ public class UserAuthPublicKey extends AbstractUserAuth {
@Override
public Boolean doAuth(Buffer buffer, boolean init) throws Exception {
- ValidateUtils.checkTrue(init, "Instance not initialized", GenericUtils.EMPTY_OBJECT_ARRAY);
+ ValidateUtils.checkTrue(init, "Instance not initialized");
boolean hasSig = buffer.getBoolean();
String alg = buffer.getString();
@@ -63,7 +63,7 @@ public class UserAuthPublicKey extends AbstractUserAuth {
byte[] sig = hasSig ? buffer.getBytes() : null;
PublickeyAuthenticator authenticator =
- ValidateUtils.checkNotNull(manager.getPublickeyAuthenticator(), "No PublickeyAuthenticator configured", GenericUtils.EMPTY_OBJECT_ARRAY);
+ ValidateUtils.checkNotNull(manager.getPublickeyAuthenticator(), "No PublickeyAuthenticator configured");
if (!authenticator.authenticate(username, key, session)) {
return Boolean.FALSE;
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/ec48d8b6/sshd-core/src/main/java/org/apache/sshd/server/auth/gss/UserAuthGSS.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/auth/gss/UserAuthGSS.java b/sshd-core/src/main/java/org/apache/sshd/server/auth/gss/UserAuthGSS.java
index aab20d4..9ff8867 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/auth/gss/UserAuthGSS.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/auth/gss/UserAuthGSS.java
@@ -125,7 +125,7 @@ public class UserAuthGSS extends AbstractUserAuth {
Buffer msgbuf = new ByteArrayBuffer();
- msgbuf.putBytes(ValidateUtils.checkNotNullAndNotEmpty(session.getSessionId(), "No current session ID", GenericUtils.EMPTY_OBJECT_ARRAY));
+ msgbuf.putBytes(ValidateUtils.checkNotNullAndNotEmpty(session.getSessionId(), "No current session ID"));
msgbuf.putByte(SshConstants.SSH_MSG_USERAUTH_REQUEST);
msgbuf.putString(username);
msgbuf.putString(service);
@@ -213,7 +213,7 @@ public class UserAuthGSS extends AbstractUserAuth {
*/
protected GSSAuthenticator getAuthenticator(ServerSession session) throws Exception {
ServerFactoryManager manager = session.getFactoryManager();
- return ValidateUtils.checkNotNull(manager.getGSSAuthenticator(), "No GSSAuthenticator configured", GenericUtils.EMPTY_OBJECT_ARRAY);
+ return ValidateUtils.checkNotNull(manager.getGSSAuthenticator(), "No GSSAuthenticator configured");
}
/**
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/ec48d8b6/sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelSession.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelSession.java b/sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelSession.java
index a799598..c49c41f 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelSession.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/channel/ChannelSession.java
@@ -612,7 +612,7 @@ public class ChannelSession extends AbstractServerChannel {
}
protected boolean handleAgentForwarding(Buffer buffer) throws IOException {
- ValidateUtils.checkTrue(session instanceof ServerSession, "Session not a server one", GenericUtils.EMPTY_OBJECT_ARRAY);
+ ValidateUtils.checkTrue(session instanceof ServerSession, "Session not a server one");
FactoryManager manager = session.getFactoryManager();
ForwardingFilter filter = manager.getTcpipForwardingFilter();
SshAgentFactory factory = manager.getAgentFactory();
@@ -629,7 +629,7 @@ public class ChannelSession extends AbstractServerChannel {
}
protected boolean handleX11Forwarding(Buffer buffer) throws IOException {
- ValidateUtils.checkTrue(session instanceof ServerSession, "Session not a server one", GenericUtils.EMPTY_OBJECT_ARRAY);
+ ValidateUtils.checkTrue(session instanceof ServerSession, "Session not a server one");
FactoryManager manager = session.getFactoryManager();
ForwardingFilter filter = manager.getTcpipForwardingFilter();
if ((filter == null) || (!filter.canForwardX11(session))) {
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/ec48d8b6/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 e4781ce..d34b758 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
@@ -49,7 +49,7 @@ public class AuthorizedKeysAuthenticator extends ModifiableFileWatcher implement
new AtomicReference<PublickeyAuthenticator>(RejectAllPublickeyAuthenticator.INSTANCE);
public AuthorizedKeysAuthenticator(File file) {
- this(ValidateUtils.checkNotNull(file, "No file to watch", GenericUtils.EMPTY_OBJECT_ARRAY).toPath());
+ this(ValidateUtils.checkNotNull(file, "No file to watch").toPath());
}
public AuthorizedKeysAuthenticator(Path file) {
@@ -71,7 +71,7 @@ public class AuthorizedKeysAuthenticator extends ModifiableFileWatcher implement
try {
PublickeyAuthenticator delegate =
- ValidateUtils.checkNotNull(resolvePublickeyAuthenticator(username, session), "No delegate", GenericUtils.EMPTY_OBJECT_ARRAY);
+ ValidateUtils.checkNotNull(resolvePublickeyAuthenticator(username, session), "No delegate");
boolean accepted = delegate.authenticate(username, key, session);
if (log.isDebugEnabled()) {
log.debug("authenticate(" + username + ")[" + session + "][" + key.getAlgorithm() + "] accepted " + accepted + " from " + getPath());
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/ec48d8b6/sshd-core/src/main/java/org/apache/sshd/server/config/keys/DefaultAuthorizedKeysAuthenticator.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/config/keys/DefaultAuthorizedKeysAuthenticator.java b/sshd-core/src/main/java/org/apache/sshd/server/config/keys/DefaultAuthorizedKeysAuthenticator.java
index ad2a2c8..9989219 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/config/keys/DefaultAuthorizedKeysAuthenticator.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/config/keys/DefaultAuthorizedKeysAuthenticator.java
@@ -64,11 +64,11 @@ public class DefaultAuthorizedKeysAuthenticator extends AuthorizedKeysAuthentica
}
public DefaultAuthorizedKeysAuthenticator(File file, boolean strict) {
- this(ValidateUtils.checkNotNull(file, "No file provided", GenericUtils.EMPTY_OBJECT_ARRAY).toPath(), strict, IoUtils.getLinkOptions(false));
+ this(ValidateUtils.checkNotNull(file, "No file provided").toPath(), strict, IoUtils.getLinkOptions(false));
}
public DefaultAuthorizedKeysAuthenticator(String user, File file, boolean strict) {
- this(user, ValidateUtils.checkNotNull(file, "No file provided", GenericUtils.EMPTY_OBJECT_ARRAY).toPath(), strict, IoUtils.getLinkOptions(false));
+ this(user, ValidateUtils.checkNotNull(file, "No file provided").toPath(), strict, IoUtils.getLinkOptions(false));
}
public DefaultAuthorizedKeysAuthenticator(Path path, boolean strict, LinkOption ... options) {
@@ -77,7 +77,7 @@ public class DefaultAuthorizedKeysAuthenticator extends AuthorizedKeysAuthentica
public DefaultAuthorizedKeysAuthenticator(String user, Path path, boolean strict, LinkOption ... options) {
super(path, options);
- this.user = ValidateUtils.checkNotNullAndNotEmpty(user, "No username provided", GenericUtils.EMPTY_OBJECT_ARRAY);
+ this.user = ValidateUtils.checkNotNullAndNotEmpty(user, "No username provided");
this.strict = strict;
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/ec48d8b6/sshd-core/src/main/java/org/apache/sshd/server/kex/DHGEXServer.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/kex/DHGEXServer.java b/sshd-core/src/main/java/org/apache/sshd/server/kex/DHGEXServer.java
index 99512ac..732b22d 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/kex/DHGEXServer.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/kex/DHGEXServer.java
@@ -84,7 +84,7 @@ public class DHGEXServer extends AbstractDHServerKeyExchange {
}
protected DHGEXServer(DHFactory factory) {
- this.factory = ValidateUtils.checkNotNull(factory, "No factory", GenericUtils.EMPTY_OBJECT_ARRAY);
+ this.factory = ValidateUtils.checkNotNull(factory, "No factory");
}
@Override
@@ -158,7 +158,7 @@ public class DHGEXServer extends AbstractDHServerKeyExchange {
byte[] K_S;
- KeyPair kp = ValidateUtils.checkNotNull(session.getHostKey(), "No server key pair available", GenericUtils.EMPTY_OBJECT_ARRAY);
+ KeyPair kp = ValidateUtils.checkNotNull(session.getHostKey(), "No server key pair available");
String algo = session.getNegotiatedKexParameter(KexProposalOption.SERVERKEYS);
FactoryManager manager = session.getFactoryManager();
Signature sig = ValidateUtils.checkNotNull(
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/ec48d8b6/sshd-core/src/main/java/org/apache/sshd/server/kex/DHGServer.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/kex/DHGServer.java b/sshd-core/src/main/java/org/apache/sshd/server/kex/DHGServer.java
index 8edc61c..1c433f1 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/kex/DHGServer.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/kex/DHGServer.java
@@ -67,7 +67,7 @@ public class DHGServer extends AbstractDHServerKeyExchange {
}
protected DHGServer(DHFactory factory) {
- this.factory = ValidateUtils.checkNotNull(factory, "No factory", GenericUtils.EMPTY_OBJECT_ARRAY);
+ this.factory = ValidateUtils.checkNotNull(factory, "No factory");
}
@Override
@@ -92,7 +92,7 @@ public class DHGServer extends AbstractDHServerKeyExchange {
K = dh.getK();
byte[] K_S;
- KeyPair kp = ValidateUtils.checkNotNull(session.getHostKey(), "No server key pair available", GenericUtils.EMPTY_OBJECT_ARRAY);
+ KeyPair kp = ValidateUtils.checkNotNull(session.getHostKey(), "No server key pair available");
String algo = session.getNegotiatedKexParameter(KexProposalOption.SERVERKEYS);
FactoryManager manager = session.getFactoryManager();
Signature sig = ValidateUtils.checkNotNull(
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/ec48d8b6/sshd-core/src/main/java/org/apache/sshd/server/session/ServerConnectionService.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/session/ServerConnectionService.java b/sshd-core/src/main/java/org/apache/sshd/server/session/ServerConnectionService.java
index 51587c9..ddb15a7 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/session/ServerConnectionService.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/session/ServerConnectionService.java
@@ -36,7 +36,7 @@ public class ServerConnectionService extends AbstractConnectionService {
protected ServerConnectionService(Session s) throws SshException {
super(s);
- ValidateUtils.checkTrue(s instanceof ServerSession, "Server side service used on client side", GenericUtils.EMPTY_OBJECT_ARRAY);
+ ValidateUtils.checkTrue(s instanceof ServerSession, "Server side service used on client side");
if (!session.isAuthenticated()) {
throw new SshException("Session is not authenticated");
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/ec48d8b6/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSessionImpl.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSessionImpl.java b/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSessionImpl.java
index 800dbc3..e46f4b2 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSessionImpl.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/session/ServerSessionImpl.java
@@ -120,7 +120,7 @@ public class ServerSessionImpl extends AbstractSession implements ServerSession
@Override
protected void setKexSeed(byte... seed) {
- I_S = ValidateUtils.checkNotNullAndNotEmpty(seed, "No KEX seed", GenericUtils.EMPTY_OBJECT_ARRAY);
+ I_S = ValidateUtils.checkNotNullAndNotEmpty(seed, "No KEX seed");
}
@Override
@@ -209,7 +209,7 @@ public class ServerSessionImpl extends AbstractSession implements ServerSession
@Override
public KeyPair getHostKey() {
String value = getNegotiatedKexParameter(KexProposalOption.SERVERKEYS);
- KeyPairProvider provider = ValidateUtils.checkNotNull(factoryManager.getKeyPairProvider(), "No host keys provider", GenericUtils.EMPTY_OBJECT_ARRAY);
+ KeyPairProvider provider = ValidateUtils.checkNotNull(factoryManager.getKeyPairProvider(), "No host keys provider");
return provider.loadKey(value);
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/ec48d8b6/sshd-core/src/main/java/org/apache/sshd/server/session/ServerUserAuthService.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/session/ServerUserAuthService.java b/sshd-core/src/main/java/org/apache/sshd/server/session/ServerUserAuthService.java
index 39c2d16..c29663f 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/session/ServerUserAuthService.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/session/ServerUserAuthService.java
@@ -56,7 +56,7 @@ public class ServerUserAuthService extends CloseableUtils.AbstractCloseable impl
private int nbAuthRequests;
public ServerUserAuthService(Session s) throws SshException {
- ValidateUtils.checkTrue(s instanceof ServerSession, "Server side service used on client side", GenericUtils.EMPTY_OBJECT_ARRAY);
+ ValidateUtils.checkTrue(s instanceof ServerSession, "Server side service used on client side");
if (s.isAuthenticated()) {
throw new SshException("Session already authenticated");
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/ec48d8b6/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/SftpSubsystem.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/SftpSubsystem.java b/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/SftpSubsystem.java
index f4b652b..b62e0e1 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/SftpSubsystem.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/SftpSubsystem.java
@@ -899,7 +899,7 @@ public class SftpSubsystem extends AbstractLoggingBean implements Command, Runna
}
}
- ValidateUtils.checkNotNullAndNotEmpty(algos, "No hash algorithms specified", GenericUtils.EMPTY_OBJECT_ARRAY);
+ ValidateUtils.checkNotNullAndNotEmpty(algos, "No hash algorithms specified");
NamedFactory<? extends Digest> factory = null;
for (String a : algos) {
@@ -918,7 +918,7 @@ public class SftpSubsystem extends AbstractLoggingBean implements Command, Runna
ValidateUtils.checkTrue(startOffset >= 0L, "Invalid start offset: %d", startOffset);
ValidateUtils.checkTrue(length >= 0L, "Invalid length: %d", length);
ValidateUtils.checkTrue((blockSize == 0) || (blockSize >= SftpConstants.MIN_CHKFILE_BLOCKSIZE), "Invalid block size: %d", blockSize);
- ValidateUtils.checkNotNull(factory, "No digest factory provided", GenericUtils.EMPTY_OBJECT_ARRAY);
+ ValidateUtils.checkNotNull(factory, "No digest factory provided");
buffer.putString(factory.getName());
long effectiveLength = length;
@@ -1840,7 +1840,7 @@ public class SftpSubsystem extends AbstractLoggingBean implements Command, Runna
throw new EOFException("Empty directory");
}
- ValidateUtils.checkNotNull(reply, "No reply buffer created", GenericUtils.EMPTY_OBJECT_ARRAY);
+ ValidateUtils.checkNotNull(reply, "No reply buffer created");
} catch (IOException | RuntimeException e) {
sendStatus(BufferUtils.clear(buffer), id, e);
return;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/ec48d8b6/sshd-core/src/main/java/org/apache/sshd/server/x11/X11ForwardSupport.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/x11/X11ForwardSupport.java b/sshd-core/src/main/java/org/apache/sshd/server/x11/X11ForwardSupport.java
index f574a97..7e9b40d 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/x11/X11ForwardSupport.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/x11/X11ForwardSupport.java
@@ -96,9 +96,9 @@ public class X11ForwardSupport extends CloseableUtils.AbstractInnerCloseable imp
}
if (acceptor == null) {
- Session session = ValidateUtils.checkNotNull(service.getSession(), "No session", GenericUtils.EMPTY_OBJECT_ARRAY);
- FactoryManager manager = ValidateUtils.checkNotNull(session.getFactoryManager(), "No factory manager", GenericUtils.EMPTY_OBJECT_ARRAY);
- IoServiceFactory factory = ValidateUtils.checkNotNull(manager.getIoServiceFactory(), "No I/O service factory", GenericUtils.EMPTY_OBJECT_ARRAY);
+ Session session = ValidateUtils.checkNotNull(service.getSession(), "No session");
+ FactoryManager manager = ValidateUtils.checkNotNull(session.getFactoryManager(), "No factory manager");
+ IoServiceFactory factory = ValidateUtils.checkNotNull(manager.getIoServiceFactory(), "No I/O service factory");
acceptor = factory.createAcceptor(this);
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/ec48d8b6/sshd-core/src/test/java/org/apache/sshd/PortForwardingTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/PortForwardingTest.java b/sshd-core/src/test/java/org/apache/sshd/PortForwardingTest.java
index 24cd809..567a263 100644
--- a/sshd-core/src/test/java/org/apache/sshd/PortForwardingTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/PortForwardingTest.java
@@ -106,7 +106,7 @@ public class PortForwardingTest extends BaseTestSupport {
requestsQ.clear();
}
- final TcpipForwarderFactory factory = ValidateUtils.checkNotNull(sshd.getTcpipForwarderFactory(), "No TcpipForwarderFactory", GenericUtils.EMPTY_OBJECT_ARRAY);
+ final TcpipForwarderFactory factory = ValidateUtils.checkNotNull(sshd.getTcpipForwarderFactory(), "No TcpipForwarderFactory");
sshd.setTcpipForwarderFactory(new TcpipForwarderFactory() {
private final Class<?>[] interfaces = { TcpipForwarder.class };
private final Map<String,String> method2req = new TreeMap<String,String>(String.CASE_INSENSITIVE_ORDER) {
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/ec48d8b6/sshd-core/src/test/java/org/apache/sshd/common/signature/AbstractSignatureFactoryTestSupport.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/common/signature/AbstractSignatureFactoryTestSupport.java b/sshd-core/src/test/java/org/apache/sshd/common/signature/AbstractSignatureFactoryTestSupport.java
index 05c1b39..6376ccb 100644
--- a/sshd-core/src/test/java/org/apache/sshd/common/signature/AbstractSignatureFactoryTestSupport.java
+++ b/sshd-core/src/test/java/org/apache/sshd/common/signature/AbstractSignatureFactoryTestSupport.java
@@ -52,7 +52,7 @@ public abstract class AbstractSignatureFactoryTestSupport extends BaseTestSuppor
private final int keySize;
protected AbstractSignatureFactoryTestSupport(String keyType, int keySize) {
- this.keyType = ValidateUtils.checkNotNullAndNotEmpty(keyType, "No key type specified", GenericUtils.EMPTY_OBJECT_ARRAY);
+ this.keyType = ValidateUtils.checkNotNullAndNotEmpty(keyType, "No key type specified");
ValidateUtils.checkTrue(keySize > 0, "Invalid key size: %d", keySize);
this.keySize = keySize;
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/ec48d8b6/sshd-core/src/test/java/org/apache/sshd/common/util/ValidateUtilsTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/common/util/ValidateUtilsTest.java b/sshd-core/src/test/java/org/apache/sshd/common/util/ValidateUtilsTest.java
index d141a0c..ee60971 100644
--- a/sshd-core/src/test/java/org/apache/sshd/common/util/ValidateUtilsTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/common/util/ValidateUtilsTest.java
@@ -35,7 +35,7 @@ public class ValidateUtilsTest extends BaseTestSupport {
@Test(expected=IllegalArgumentException.class)
public void checkNotNull() {
- ValidateUtils.checkNotNull(getClass(), getCurrentTestName(), GenericUtils.EMPTY_OBJECT_ARRAY);
- ValidateUtils.checkNotNull(null, getCurrentTestName(), GenericUtils.EMPTY_OBJECT_ARRAY);
+ ValidateUtils.checkNotNull(getClass(), getCurrentTestName());
+ ValidateUtils.checkNotNull(null, getCurrentTestName());
}
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/ec48d8b6/sshd-core/src/test/java/org/apache/sshd/server/subsystem/sftp/SshFsMounter.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/server/subsystem/sftp/SshFsMounter.java b/sshd-core/src/test/java/org/apache/sshd/server/subsystem/sftp/SshFsMounter.java
index bb8e12a..11b97a6 100644
--- a/sshd-core/src/test/java/org/apache/sshd/server/subsystem/sftp/SshFsMounter.java
+++ b/sshd-core/src/test/java/org/apache/sshd/server/subsystem/sftp/SshFsMounter.java
@@ -74,11 +74,11 @@ public class SshFsMounter {
private Future<?> future;
public MounterCommand(String command) {
- this.command = ValidateUtils.checkNotNullAndNotEmpty(command, "No command", GenericUtils.EMPTY_OBJECT_ARRAY);
+ this.command = ValidateUtils.checkNotNullAndNotEmpty(command, "No command");
String[] comps = GenericUtils.split(this.command, ' ');
int numComps = GenericUtils.length(comps);
- cmdName = GenericUtils.trimToEmpty(ValidateUtils.checkNotNullAndNotEmpty(comps[0], "No command name", GenericUtils.EMPTY_OBJECT_ARRAY));
+ cmdName = GenericUtils.trimToEmpty(ValidateUtils.checkNotNullAndNotEmpty(comps[0], "No command name"));
if (numComps > 1) {
args = new ArrayList<String>(numComps - 1);
for (int index = 1; index < numComps; index++) {
@@ -298,7 +298,7 @@ public class SshFsMounter {
props.putAll(options);
sshd.setPort(port);
- File targetFolder = ValidateUtils.checkNotNull(Utils.detectTargetFolder(MounterCommandFactory.class), "Failed to detect target folder", GenericUtils.EMPTY_OBJECT_ARRAY);
+ File targetFolder = ValidateUtils.checkNotNull(Utils.detectTargetFolder(MounterCommandFactory.class), "Failed to detect target folder");
if (SecurityUtils.isBouncyCastleRegistered()) {
sshd.setKeyPairProvider(SecurityUtils.createGeneratorHostKeyProvider(new File(targetFolder, "key.pem").toPath()));
} else {
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/ec48d8b6/sshd-core/src/test/java/org/apache/sshd/util/BaseTestSupport.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/util/BaseTestSupport.java b/sshd-core/src/test/java/org/apache/sshd/util/BaseTestSupport.java
index d412786..805dca4 100644
--- a/sshd-core/src/test/java/org/apache/sshd/util/BaseTestSupport.java
+++ b/sshd-core/src/test/java/org/apache/sshd/util/BaseTestSupport.java
@@ -107,7 +107,7 @@ public abstract class BaseTestSupport extends Assert {
protected File detectTargetFolder() throws IllegalStateException {
synchronized(TEMP_SUBFOLDER_NAME) {
if (targetFolder == null) {
- targetFolder = ValidateUtils.checkNotNull(Utils.detectTargetFolder(getClass()), "Failed to detect target folder", GenericUtils.EMPTY_OBJECT_ARRAY);
+ targetFolder = ValidateUtils.checkNotNull(Utils.detectTargetFolder(getClass()), "Failed to detect target folder");
}
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/ec48d8b6/sshd-core/src/test/java/org/apache/sshd/util/Utils.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/util/Utils.java b/sshd-core/src/test/java/org/apache/sshd/util/Utils.java
index c37b147..ee8139a 100644
--- a/sshd-core/src/test/java/org/apache/sshd/util/Utils.java
+++ b/sshd-core/src/test/java/org/apache/sshd/util/Utils.java
@@ -62,7 +62,7 @@ public class Utils {
}
- File targetFolder = ValidateUtils.checkNotNull(detectTargetFolder(Utils.class), "Failed to detect target folder", GenericUtils.EMPTY_OBJECT_ARRAY);
+ File targetFolder = ValidateUtils.checkNotNull(detectTargetFolder(Utils.class), "Failed to detect target folder");
File file = new File(targetFolder, "hostkey." + DEFAULT_TEST_HOST_KEY_PROVIDER_ALGORITHM.toLowerCase());
SimpleGeneratorHostKeyProvider keyProvider = new SimpleGeneratorHostKeyProvider();
keyProvider.setFile(file);
@@ -100,12 +100,12 @@ public class Utils {
}
private static <P extends KeyPairProvider> P validateKeyPairProvider(P provider) {
- ValidateUtils.checkNotNull(provider, "No provider", GenericUtils.EMPTY_OBJECT_ARRAY);
+ ValidateUtils.checkNotNull(provider, "No provider");
// get the I/O out of the way
- Iterable<KeyPair> keys=ValidateUtils.checkNotNull(provider.loadKeys(), "No keys loaded", GenericUtils.EMPTY_OBJECT_ARRAY);
+ Iterable<KeyPair> keys=ValidateUtils.checkNotNull(provider.loadKeys(), "No keys loaded");
if (keys instanceof Collection<?>) {
- ValidateUtils.checkNotNullAndNotEmpty((Collection<?>) keys, "Empty keys loaded", GenericUtils.EMPTY_OBJECT_ARRAY);
+ ValidateUtils.checkNotNullAndNotEmpty((Collection<?>) keys, "Empty keys loaded");
}
return provider;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/ec48d8b6/sshd-git/src/main/java/org/apache/sshd/git/transport/GitSshdSessionFactory.java
----------------------------------------------------------------------
diff --git a/sshd-git/src/main/java/org/apache/sshd/git/transport/GitSshdSessionFactory.java b/sshd-git/src/main/java/org/apache/sshd/git/transport/GitSshdSessionFactory.java
index ec7a544..eeb8807 100644
--- a/sshd-git/src/main/java/org/apache/sshd/git/transport/GitSshdSessionFactory.java
+++ b/sshd-git/src/main/java/org/apache/sshd/git/transport/GitSshdSessionFactory.java
@@ -145,7 +145,7 @@ public class GitSshdSessionFactory extends SshSessionFactory {
@Override
public int exitValue() {
- Integer status = ValidateUtils.checkNotNull(channel.getExitStatus(), "No channel status available", GenericUtils.EMPTY_OBJECT_ARRAY);
+ Integer status = ValidateUtils.checkNotNull(channel.getExitStatus(), "No channel status available");
return status.intValue();
}