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 2016/09/15 19:34:41 UTC
[04/16] mina-sshd git commit: [SSHD-698] Remove unnecessary boxing /
unboxing
[SSHD-698] Remove unnecessary boxing / unboxing
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/83fc8d8a
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/83fc8d8a
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/83fc8d8a
Branch: refs/heads/master
Commit: 83fc8d8a8542bc93a1c5a2adff63bee68f85e413
Parents: 57f6a6b
Author: Guillaume Nodet <gn...@apache.org>
Authored: Thu Sep 15 11:24:14 2016 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Thu Sep 15 21:06:22 2016 +0200
----------------------------------------------------------------------
.../org/apache/sshd/agent/common/AbstractAgentClient.java | 4 ++--
.../java/org/apache/sshd/agent/unix/AgentServerProxy.java | 6 +++---
.../client/channel/exit/ExitStatusChannelRequestHandler.java | 2 +-
.../org/apache/sshd/client/config/hosts/HostConfigEntry.java | 6 +++---
.../apache/sshd/client/config/hosts/HostPatternsHolder.java | 6 +++---
.../org/apache/sshd/client/future/DefaultAuthFuture.java | 6 +++---
.../org/apache/sshd/client/future/DefaultOpenFuture.java | 4 ++--
.../java/org/apache/sshd/client/scp/AbstractScpClient.java | 4 ++--
.../apache/sshd/client/session/ClientConnectionService.java | 2 +-
.../java/org/apache/sshd/client/session/ClientSession.java | 2 +-
.../apache/sshd/client/subsystem/sftp/DefaultSftpClient.java | 2 +-
.../sshd/client/subsystem/sftp/SftpDirEntryIterator.java | 4 ++--
.../sshd/client/subsystem/sftp/SftpVersionSelector.java | 2 +-
.../java/org/apache/sshd/common/PropertyResolverUtils.java | 6 +++---
.../main/java/org/apache/sshd/common/channel/PtyMode.java | 4 ++--
.../main/java/org/apache/sshd/common/forward/SocksProxy.java | 2 +-
.../apache/sshd/common/future/DefaultKeyExchangeFuture.java | 2 +-
.../src/main/java/org/apache/sshd/common/scp/ScpHelper.java | 8 ++++----
.../common/session/helpers/AbstractConnectionService.java | 2 +-
.../apache/sshd/common/session/helpers/AbstractSession.java | 2 +-
.../org/apache/sshd/common/subsystem/sftp/SftpHelper.java | 6 +++---
.../common/subsystem/sftp/extensions/AclSupportedParser.java | 6 +++---
.../main/java/org/apache/sshd/common/util/NumberUtils.java | 8 ++++----
.../src/main/java/org/apache/sshd/common/util/OsUtils.java | 4 ++--
sshd-core/src/main/java/org/apache/sshd/server/Signal.java | 4 ++--
.../java/org/apache/sshd/server/channel/ChannelSession.java | 2 +-
.../src/main/java/org/apache/sshd/server/scp/ScpCommand.java | 2 +-
.../apache/sshd/server/session/ServerUserAuthService.java | 2 +-
.../org/apache/sshd/server/subsystem/sftp/FileHandle.java | 4 ++--
.../org/apache/sshd/server/subsystem/sftp/SftpSubsystem.java | 4 ++--
.../java/org/apache/sshd/git/pgm/EmbeddedCommandRunner.java | 2 +-
.../org/apache/sshd/git/transport/GitSshdSessionProcess.java | 2 +-
32 files changed, 61 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/83fc8d8a/sshd-core/src/main/java/org/apache/sshd/agent/common/AbstractAgentClient.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/agent/common/AbstractAgentClient.java b/sshd-core/src/main/java/org/apache/sshd/agent/common/AbstractAgentClient.java
index 3c90403..796cbdd 100644
--- a/sshd-core/src/main/java/org/apache/sshd/agent/common/AbstractAgentClient.java
+++ b/sshd-core/src/main/java/org/apache/sshd/agent/common/AbstractAgentClient.java
@@ -48,7 +48,7 @@ public abstract class AbstractAgentClient extends AbstractLoggingBean {
if (avail < 4) {
if (log.isTraceEnabled()) {
log.trace("Received message total length ({}) below minuimum ({})",
- Integer.valueOf(avail), Integer.valueOf(4));
+ avail, 4);
}
return;
}
@@ -61,7 +61,7 @@ public abstract class AbstractAgentClient extends AbstractLoggingBean {
if (avail < (len + 4)) {
if (log.isTraceEnabled()) {
log.trace("Received request length ({}) below minuimum ({})",
- Integer.valueOf(avail), Integer.valueOf(len + 4));
+ avail, len + 4);
}
return;
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/83fc8d8a/sshd-core/src/main/java/org/apache/sshd/agent/unix/AgentServerProxy.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/agent/unix/AgentServerProxy.java b/sshd-core/src/main/java/org/apache/sshd/agent/unix/AgentServerProxy.java
index e59265b..cd0f22b 100644
--- a/sshd-core/src/main/java/org/apache/sshd/agent/unix/AgentServerProxy.java
+++ b/sshd-core/src/main/java/org/apache/sshd/agent/unix/AgentServerProxy.java
@@ -169,7 +169,7 @@ public class AgentServerProxy extends AbstractLoggingBean implements SshAgentSer
if (connectResult != Status.APR_SUCCESS) {
if (isDebug) {
- log.debug("Unable to connect to socket PIPE {}. APR errcode {}", authSocket, Long.valueOf(connectResult));
+ log.debug("Unable to connect to socket PIPE {}. APR errcode {}", authSocket, connectResult);
}
}
@@ -177,7 +177,7 @@ public class AgentServerProxy extends AbstractLoggingBean implements SshAgentSer
int sendResult = Socket.send(tmpSocket, END_OF_STREAM_MESSAGE, 0, 1);
if (sendResult != 1) {
if (isDebug) {
- log.debug("Unable to send signal the EOS for {}. APR retcode {} != 1", authSocket, Integer.valueOf(sendResult));
+ log.debug("Unable to send signal the EOS for {}. APR retcode {} != 1", authSocket, sendResult);
}
}
} catch (Exception e) {
@@ -190,7 +190,7 @@ public class AgentServerProxy extends AbstractLoggingBean implements SshAgentSer
final int closeCode = Socket.close(handle);
if (closeCode != Status.APR_SUCCESS) {
- log.warn("Exceptions closing the PIPE: {}. APR error code: {} ", authSocket, Integer.valueOf(closeCode));
+ log.warn("Exceptions closing the PIPE: {}. APR error code: {} ", authSocket, closeCode);
}
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/83fc8d8a/sshd-core/src/main/java/org/apache/sshd/client/channel/exit/ExitStatusChannelRequestHandler.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/channel/exit/ExitStatusChannelRequestHandler.java b/sshd-core/src/main/java/org/apache/sshd/client/channel/exit/ExitStatusChannelRequestHandler.java
index 39954b1..9eb012d 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/channel/exit/ExitStatusChannelRequestHandler.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/channel/exit/ExitStatusChannelRequestHandler.java
@@ -50,6 +50,6 @@ public class ExitStatusChannelRequestHandler extends AbstractChannelExitRequestH
log.debug("processRequestValue({}) status={}", channel, exitStatus);
}
- return Integer.valueOf(exitStatus);
+ return exitStatus;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/83fc8d8a/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 1a18556..4a9eda4 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
@@ -249,11 +249,11 @@ public class HostConfigEntry extends HostPatternsHolder implements MutableUserHo
* @return {@code true} if must use only the identities in this entry
*/
public boolean isIdentitiesOnly() {
- return (exclusiveIdentites == null) ? DEFAULT_EXCLUSIVE_IDENTITIES : exclusiveIdentites.booleanValue();
+ return (exclusiveIdentites == null) ? DEFAULT_EXCLUSIVE_IDENTITIES : exclusiveIdentites;
}
public void setIdentitiesOnly(boolean identitiesOnly) {
- exclusiveIdentites = Boolean.valueOf(identitiesOnly);
+ exclusiveIdentites = identitiesOnly;
}
/**
@@ -560,7 +560,7 @@ public class HostConfigEntry extends HostPatternsHolder implements MutableUserHo
appendNonEmptyProperty(sb, USER_CONFIG_PROP, getUsername());
appendNonEmptyValues(sb, IDENTITY_FILE_CONFIG_PROP, getIdentities());
if (exclusiveIdentites != null) {
- appendNonEmptyProperty(sb, EXCLUSIVE_IDENTITIES_CONFIG_PROP, SshConfigFileReader.yesNoValueOf(exclusiveIdentites.booleanValue()));
+ appendNonEmptyProperty(sb, EXCLUSIVE_IDENTITIES_CONFIG_PROP, SshConfigFileReader.yesNoValueOf(exclusiveIdentites));
}
appendNonEmptyProperties(sb, getProperties());
return sb;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/83fc8d8a/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 58c95a1..e9d0269 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
@@ -167,7 +167,7 @@ public abstract class HostPatternsHolder {
/*
* If already found a match we are interested only in negations
*/
- if (matchFound && (!negated.booleanValue())) {
+ if (matchFound && (!negated)) {
continue;
}
@@ -181,7 +181,7 @@ public abstract class HostPatternsHolder {
* If a negated entry is matched, then the Host entry is ignored,
* regardless of whether any other patterns on the line match.
*/
- if (negated.booleanValue()) {
+ if (negated) {
return false;
}
@@ -266,7 +266,7 @@ public abstract class HostPatternsHolder {
}
}
- return new Pair<Pattern, Boolean>(Pattern.compile(sb.toString(), Pattern.CASE_INSENSITIVE), Boolean.valueOf(negated));
+ return new Pair<Pattern, Boolean>(Pattern.compile(sb.toString(), Pattern.CASE_INSENSITIVE), negated);
}
/**
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/83fc8d8a/sshd-core/src/main/java/org/apache/sshd/client/future/DefaultAuthFuture.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/future/DefaultAuthFuture.java b/sshd-core/src/main/java/org/apache/sshd/client/future/DefaultAuthFuture.java
index c41bed1..60089f6 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/future/DefaultAuthFuture.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/future/DefaultAuthFuture.java
@@ -38,7 +38,7 @@ public class DefaultAuthFuture extends DefaultVerifiableSshFuture<AuthFuture> im
@Override
public AuthFuture verify(long timeoutMillis) throws IOException {
Boolean result = verifyResult(Boolean.class, timeoutMillis);
- if (!result.booleanValue()) {
+ if (!result) {
throw new SshException("Authentication failed");
}
@@ -58,14 +58,14 @@ public class DefaultAuthFuture extends DefaultVerifiableSshFuture<AuthFuture> im
@Override
public boolean isSuccess() {
Object v = getValue();
- return (v instanceof Boolean) && ((Boolean) v).booleanValue();
+ return (v instanceof Boolean) && (Boolean) v;
}
@Override
public boolean isFailure() {
Object v = getValue();
if (v instanceof Boolean) {
- return !((Boolean) v).booleanValue();
+ return !(Boolean) v;
} else {
return true;
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/83fc8d8a/sshd-core/src/main/java/org/apache/sshd/client/future/DefaultOpenFuture.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/future/DefaultOpenFuture.java b/sshd-core/src/main/java/org/apache/sshd/client/future/DefaultOpenFuture.java
index 4034003..c2ee400 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/future/DefaultOpenFuture.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/future/DefaultOpenFuture.java
@@ -37,7 +37,7 @@ public class DefaultOpenFuture extends DefaultVerifiableSshFuture<OpenFuture> im
@Override
public OpenFuture verify(long timeoutMillis) throws IOException {
Boolean result = verifyResult(Boolean.class, timeoutMillis);
- if (!result.booleanValue()) {
+ if (!result) {
throw new SshException("Channel opening failed");
}
@@ -57,7 +57,7 @@ public class DefaultOpenFuture extends DefaultVerifiableSshFuture<OpenFuture> im
@Override
public boolean isOpened() {
Object value = getValue();
- return (value instanceof Boolean) && ((Boolean) value).booleanValue();
+ return (value instanceof Boolean) && (Boolean) value;
}
@Override
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/83fc8d8a/sshd-core/src/main/java/org/apache/sshd/client/scp/AbstractScpClient.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/scp/AbstractScpClient.java b/sshd-core/src/main/java/org/apache/sshd/client/scp/AbstractScpClient.java
index fa979c6..9a1dc57 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/scp/AbstractScpClient.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/scp/AbstractScpClient.java
@@ -105,7 +105,7 @@ public abstract class AbstractScpClient extends AbstractLoggingBean implements S
throw new SshException("Target directory " + local.toString() + " is probaly inaccesible");
}
- if (!status.booleanValue()) {
+ if (!status) {
throw new SshException("Target directory " + local.toString() + " does not exist");
}
@@ -220,7 +220,7 @@ public abstract class AbstractScpClient extends AbstractLoggingBean implements S
return;
}
- int statusCode = exitStatus.intValue();
+ int statusCode = exitStatus;
switch (statusCode) {
case ScpHelper.OK: // do nothing
break;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/83fc8d8a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientConnectionService.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientConnectionService.java b/sshd-core/src/main/java/org/apache/sshd/client/session/ClientConnectionService.java
index 6bd60ff..e55517d 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientConnectionService.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/session/ClientConnectionService.java
@@ -71,7 +71,7 @@ public class ClientConnectionService extends AbstractConnectionService<AbstractC
}
}, interval, interval, TimeUnit.MILLISECONDS);
if (log.isDebugEnabled()) {
- log.debug("startHeartbeat - started at interval={}", Long.valueOf(interval));
+ log.debug("startHeartbeat - started at interval={}", interval);
}
}
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/83fc8d8a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSession.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSession.java b/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSession.java
index b525032..a3c0d72 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSession.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSession.java
@@ -217,7 +217,7 @@ public interface ClientSession
}
Integer exitStatus = channel.getExitStatus();
- if ((exitStatus != null) && (exitStatus.intValue() != 0)) {
+ if ((exitStatus != null) && (exitStatus != 0)) {
throw new RemoteException("Remote command failed (" + exitStatus + "): " + command, new ServerException(exitStatus.toString()));
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/83fc8d8a/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/DefaultSftpClient.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/DefaultSftpClient.java b/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/DefaultSftpClient.java
index 8b715a1..f61d302 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/DefaultSftpClient.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/DefaultSftpClient.java
@@ -434,7 +434,7 @@ public class DefaultSftpClient extends AbstractSftpClient {
return current;
}
- if (!available.contains(Integer.valueOf(selected))) {
+ if (!available.contains(selected)) {
throw new StreamCorruptedException("Selected version (" + selected + ") not part of available: " + available);
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/83fc8d8a/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/SftpDirEntryIterator.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/SftpDirEntryIterator.java b/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/SftpDirEntryIterator.java
index e245589..564d1d9 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/SftpDirEntryIterator.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/subsystem/sftp/SftpDirEntryIterator.java
@@ -156,7 +156,7 @@ public class SftpDirEntryIterator extends AbstractLoggingBean implements Iterato
try {
// check if previous call yielded an end-of-list indication
Boolean eolReached = eolIndicator.getAndSet(null);
- if ((eolReached != null) && eolReached.booleanValue()) {
+ if ((eolReached != null) && eolReached) {
if (log.isTraceEnabled()) {
log.trace("load({})[{}] exhausted all entries on previous call", getPath(), handle);
}
@@ -165,7 +165,7 @@ public class SftpDirEntryIterator extends AbstractLoggingBean implements Iterato
List<DirEntry> entries = client.readDir(handle, eolIndicator);
eolReached = eolIndicator.get();
- if ((entries == null) || ((eolReached != null) && eolReached.booleanValue())) {
+ if ((entries == null) || ((eolReached != null) && eolReached)) {
if (log.isTraceEnabled()) {
log.trace("load({})[{}] exhausted all entries - EOL={}", getPath(), handle, eolReached);
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/83fc8d8a/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 c5fdaf0..a8fa062 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
@@ -174,7 +174,7 @@ public interface SftpVersionSelector {
}
for (Integer avail : available) {
- if (version == avail.intValue()) {
+ if (version == avail) {
return version;
}
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/83fc8d8a/sshd-core/src/main/java/org/apache/sshd/common/PropertyResolverUtils.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/PropertyResolverUtils.java b/sshd-core/src/main/java/org/apache/sshd/common/PropertyResolverUtils.java
index d5c767b..06fe537 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/PropertyResolverUtils.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/PropertyResolverUtils.java
@@ -133,7 +133,7 @@ public final class PropertyResolverUtils {
} else if (value instanceof Long) {
return (Long) value;
} else if (value instanceof Number) {
- return Long.valueOf(((Number) value).longValue());
+ return ((Number) value).longValue();
} else { // we parse the string in case it is not a valid long value
return Long.valueOf(value.toString());
}
@@ -233,7 +233,7 @@ public final class PropertyResolverUtils {
} else if (value instanceof Integer) {
return (Integer) value;
} else if (value instanceof Number) {
- return Integer.valueOf(((Number) value).intValue());
+ return ((Number) value).intValue();
} else { // we parse the string in case this is NOT an integer
return Integer.valueOf(value.toString());
}
@@ -259,7 +259,7 @@ public final class PropertyResolverUtils {
if (value == null) {
return defaultValue;
} else {
- return toBoolean(value).booleanValue();
+ return toBoolean(value);
}
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/83fc8d8a/sshd-core/src/main/java/org/apache/sshd/common/channel/PtyMode.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/channel/PtyMode.java b/sshd-core/src/main/java/org/apache/sshd/common/channel/PtyMode.java
index cae1595..82e3cbf 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/channel/PtyMode.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/channel/PtyMode.java
@@ -284,8 +284,8 @@ public enum PtyMode {
public static final byte TTY_OP_END = 0x00;
// objects that can be used to set {@link PtyMode}s as {@code true} or {@code false}
- public static final Integer FALSE_SETTING = Integer.valueOf(0);
- public static final Integer TRUE_SETTING = Integer.valueOf(1);
+ public static final Integer FALSE_SETTING = 0;
+ public static final Integer TRUE_SETTING = 1;
/**
* An un-modifiable {@link Set} of all defined {@link PtyMode}s
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/83fc8d8a/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 9ab9c10..fb581be 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
@@ -266,7 +266,7 @@ public class SocksProxy extends AbstractCloseable implements IoHandler {
}
int port = getUShort(buffer);
if (log.isDebugEnabled()) {
- log.debug("Received socks5 connection request to {}:{}", host, Integer.valueOf(port));
+ log.debug("Received socks5 connection request to {}:{}", host, port);
}
SshdSocketAddress remote = new SshdSocketAddress(host, port);
channel = new TcpipClientChannel(TcpipClientChannel.Type.Direct, session, remote);
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/83fc8d8a/sshd-core/src/main/java/org/apache/sshd/common/future/DefaultKeyExchangeFuture.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/future/DefaultKeyExchangeFuture.java b/sshd-core/src/main/java/org/apache/sshd/common/future/DefaultKeyExchangeFuture.java
index 548a0ae..68029c5 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/future/DefaultKeyExchangeFuture.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/future/DefaultKeyExchangeFuture.java
@@ -34,7 +34,7 @@ public class DefaultKeyExchangeFuture extends DefaultVerifiableSshFuture<KeyExch
@Override
public KeyExchangeFuture verify(long timeoutMillis) throws IOException {
Boolean result = verifyResult(Boolean.class, timeoutMillis);
- if (!result.booleanValue()) {
+ if (!result) {
throw new SshException("Key exchange failed");
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/83fc8d8a/sshd-core/src/main/java/org/apache/sshd/common/scp/ScpHelper.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/scp/ScpHelper.java b/sshd-core/src/main/java/org/apache/sshd/common/scp/ScpHelper.java
index 1b14e2b..9aaa83e 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/scp/ScpHelper.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/scp/ScpHelper.java
@@ -292,7 +292,7 @@ public class ScpHelper extends AbstractLoggingBean implements SessionHolder<Sess
throw new AccessDeniedException("Receive directory file existence status cannot be determined: " + file);
}
- if (!(status.booleanValue() && Files.isDirectory(file, options))) {
+ if (!(status && Files.isDirectory(file, options))) {
Files.createDirectory(file);
}
@@ -664,7 +664,7 @@ public class ScpHelper extends AbstractLoggingBean implements SessionHolder<Sess
case WARNING:
break;
default:
- throw new ScpException("Bad reply code (" + statusCode + ") for command='" + command + "' on " + location, Integer.valueOf(statusCode));
+ throw new ScpException("Bad reply code (" + statusCode + ") for command='" + command + "' on " + location, statusCode);
}
}
@@ -867,7 +867,7 @@ public class ScpHelper extends AbstractLoggingBean implements SessionHolder<Sess
return "null";
}
- switch (exitStatus.intValue()) {
+ switch (exitStatus) {
case OK:
return "OK";
case WARNING:
@@ -917,7 +917,7 @@ public class ScpHelper extends AbstractLoggingBean implements SessionHolder<Sess
if (log.isDebugEnabled()) {
log.debug("readAck({})[EOF={}] received error: {}", this, canEof, line);
}
- throw new ScpException("Received nack: " + line, Integer.valueOf(c));
+ throw new ScpException("Received nack: " + line, c);
}
default:
break;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/83fc8d8a/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/AbstractConnectionService.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/AbstractConnectionService.java b/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/AbstractConnectionService.java
index 8aea3a8..0eab031 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/AbstractConnectionService.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/AbstractConnectionService.java
@@ -618,7 +618,7 @@ public abstract class AbstractConnectionService<S extends AbstractSession>
boolean wantReply = buffer.getBoolean();
if (log.isDebugEnabled()) {
log.debug("globalRequest({}) received SSH_MSG_GLOBAL_REQUEST {} want-reply={}",
- this, req, Boolean.valueOf(wantReply));
+ this, req, wantReply);
}
Session session = getSession();
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/83fc8d8a/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/AbstractSession.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/AbstractSession.java b/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/AbstractSession.java
index 2ec5e7c..3f879e4 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/AbstractSession.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/AbstractSession.java
@@ -528,7 +528,7 @@ public abstract class AbstractSession extends AbstractKexFactoryManager implemen
if ((cmd >= SshConstants.SSH_MSG_KEX_FIRST) && (cmd <= SshConstants.SSH_MSG_KEX_LAST)) {
if (firstKexPacketFollows != null) {
try {
- if (!handleFirstKexPacketFollows(cmd, buffer, firstKexPacketFollows.booleanValue())) {
+ if (!handleFirstKexPacketFollows(cmd, buffer, firstKexPacketFollows)) {
break;
}
} finally {
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/83fc8d8a/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 3e0aa2a..0333fd1 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
@@ -91,7 +91,7 @@ public final class SftpHelper {
* @see <A HREF="https://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-9.3">SFTP v6 - section 9.3</A>
*/
public static Boolean getEndOfFileIndicatorValue(Buffer buffer, int version) {
- return (version < SftpConstants.SFTP_V6) || (buffer.available() < 1) ? null : Boolean.valueOf(buffer.getBoolean());
+ return (version < SftpConstants.SFTP_V6) || (buffer.available() < 1) ? null : buffer.getBoolean();
}
/**
@@ -105,7 +105,7 @@ public final class SftpHelper {
* @see #indicateEndOfNamesList(Buffer, int, PropertyResolver, Boolean)
*/
public static Boolean getEndOfListIndicatorValue(Buffer buffer, int version) {
- return (version < SftpConstants.SFTP_V6) || (buffer.available() < 1) ? null : Boolean.valueOf(buffer.getBoolean());
+ return (version < SftpConstants.SFTP_V6) || (buffer.available() < 1) ? null : buffer.getBoolean();
}
/**
@@ -144,7 +144,7 @@ public final class SftpHelper {
return null;
}
- buffer.putBoolean(indicatorValue.booleanValue());
+ buffer.putBoolean(indicatorValue);
return indicatorValue;
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/83fc8d8a/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 f218510..e9ccf97 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
@@ -155,7 +155,7 @@ public class AclSupportedParser extends AbstractParser<AclCapabilities> {
for (Map.Entry<Integer, String> ae : map.entrySet()) {
Integer value = ae.getKey();
String name = ae.getValue();
- if ((mask & value.intValue()) != 0) {
+ if ((mask & value) != 0) {
caps.add(name);
}
}
@@ -170,7 +170,7 @@ public class AclSupportedParser extends AbstractParser<AclCapabilities> {
int mask = 0;
for (Integer v : maskValues) {
- mask |= v.intValue();
+ mask |= v;
}
return mask;
@@ -184,7 +184,7 @@ public class AclSupportedParser extends AbstractParser<AclCapabilities> {
Map<Integer, String> map = getAclCapabilityValuesMap();
Set<Integer> caps = new HashSet<Integer>(map.size());
for (Integer v : map.keySet()) {
- if ((mask & v.intValue()) != 0) {
+ if ((mask & v) != 0) {
caps.add(v);
}
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/83fc8d8a/sshd-core/src/main/java/org/apache/sshd/common/util/NumberUtils.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/NumberUtils.java b/sshd-core/src/main/java/org/apache/sshd/common/util/NumberUtils.java
index e988f8a..51c321b 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/util/NumberUtils.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/util/NumberUtils.java
@@ -49,7 +49,7 @@ public final class NumberUtils {
{
long value = 1L;
for (int power = 0; power < Long.SIZE; power++, value <<= 1) {
- add(Long.valueOf(value));
+ add(value);
}
}
});
@@ -60,7 +60,7 @@ public final class NumberUtils {
public static boolean isPowerOf2(long value) {
for (Long l : POWERS_OF_TWO) {
- if (value == l.longValue()) {
+ if (value == l) {
return true;
}
}
@@ -140,7 +140,7 @@ public final class NumberUtils {
} else if (n instanceof Integer) {
return (Integer) n;
} else {
- return Integer.valueOf(n.intValue());
+ return n.intValue();
}
}
@@ -272,7 +272,7 @@ public final class NumberUtils {
List<Integer> l = new ArrayList<>(len);
for (int v : values) {
- l.add(Integer.valueOf(v));
+ l.add(v);
}
return l;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/83fc8d8a/sshd-core/src/main/java/org/apache/sshd/common/util/OsUtils.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/OsUtils.java b/sshd-core/src/main/java/org/apache/sshd/common/util/OsUtils.java
index 9edd772..f0b2c7e 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/util/OsUtils.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/util/OsUtils.java
@@ -83,7 +83,7 @@ public final class OsUtils {
synchronized (OS_TYPE_HOLDER) {
typeValue = OS_TYPE_HOLDER.get();
if (typeValue != null) { // is it the 1st time
- return typeValue.booleanValue();
+ return typeValue;
}
String value = System.getProperty(OS_TYPE_OVERRIDE_PROP, System.getProperty("os.name"));
@@ -91,7 +91,7 @@ public final class OsUtils {
OS_TYPE_HOLDER.set(typeValue);
}
- return typeValue.booleanValue();
+ return typeValue;
}
/**
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/83fc8d8a/sshd-core/src/main/java/org/apache/sshd/server/Signal.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/Signal.java b/sshd-core/src/main/java/org/apache/sshd/server/Signal.java
index 3d88580..ad4917e 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/Signal.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/Signal.java
@@ -96,7 +96,7 @@ public enum Signal {
{
for (Signal s : SIGNALS) {
- put(Integer.valueOf(s.getNumeric()), s);
+ put(s.getNumeric(), s);
}
}
});
@@ -132,6 +132,6 @@ public enum Signal {
* @see #getNumeric()
*/
public static Signal get(int num) {
- return NUMERIC_LOOKUP_TABLE.get(Integer.valueOf(num));
+ return NUMERIC_LOOKUP_TABLE.get(num);
}
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/83fc8d8a/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 a0ede0f..b09f1f7 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
@@ -172,7 +172,7 @@ public class ChannelSession extends AbstractServerChannel {
long timeout = PropertyResolverUtils.getLongProperty(
channel, ServerFactoryManager.COMMAND_EXIT_TIMEOUT, ServerFactoryManager.DEFAULT_COMMAND_EXIT_TIMEOUT);
if (log.isDebugEnabled()) {
- log.debug("Wait {} ms for shell to exit cleanly on {}", Long.valueOf(timeout), channel);
+ log.debug("Wait {} ms for shell to exit cleanly on {}", timeout, channel);
}
Session s = channel.getSession();
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/83fc8d8a/sshd-core/src/main/java/org/apache/sshd/server/scp/ScpCommand.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/scp/ScpCommand.java b/sshd-core/src/main/java/org/apache/sshd/server/scp/ScpCommand.java
index dfa0f60..e59a331 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/scp/ScpCommand.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/scp/ScpCommand.java
@@ -285,7 +285,7 @@ public class ScpCommand
if (e instanceof ScpException) {
statusCode = ((ScpException) e).getExitStatus();
}
- exitValue = (statusCode == null) ? ScpHelper.ERROR : statusCode.intValue();
+ exitValue = (statusCode == null) ? ScpHelper.ERROR : statusCode;
// this is an exception so status cannot be OK/WARNING
if ((exitValue == ScpHelper.OK) || (exitValue == ScpHelper.WARNING)) {
if (log.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/83fc8d8a/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 e31af32..22040fc 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
@@ -239,7 +239,7 @@ public class ServerUserAuthService extends AbstractCloseable implements Service,
if (authed == null) {
handleAuthenticationInProgress(cmd, buffer);
- } else if (authed.booleanValue()) {
+ } else if (authed) {
handleAuthenticationSuccess(cmd, buffer);
} else {
handleAuthenticationFailure(cmd, buffer);
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/83fc8d8a/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/FileHandle.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/FileHandle.java b/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/FileHandle.java
index 9299151..f6f1e8e 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/FileHandle.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/subsystem/sftp/FileHandle.java
@@ -209,12 +209,12 @@ public class FileHandle extends Handle {
public static FileAttribute<?> toFileAttribute(final String key, final Object val) {
// Some ignored attributes sent by the SFTP client
if ("isOther".equals(key)) {
- if (((Boolean) val).booleanValue()) {
+ if ((Boolean) val) {
throw new IllegalArgumentException("Not allowed to use " + key + "=" + val);
}
return null;
} else if ("isRegular".equals(key)) {
- if (!((Boolean) val).booleanValue()) {
+ if (!(Boolean) val) {
throw new IllegalArgumentException("Not allowed to use " + key + "=" + val);
}
return null;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/83fc8d8a/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 71d4379..8144252 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
@@ -1849,7 +1849,7 @@ public class SftpSubsystem
dh.markDone();
}
- Boolean indicator = SftpHelper.indicateEndOfNamesList(reply, getVersion(), session, Boolean.valueOf(dh.isDone()));
+ Boolean indicator = SftpHelper.indicateEndOfNamesList(reply, getVersion(), session, dh.isDone());
if (log.isDebugEnabled()) {
log.debug("doReadDir({})({})[{}] - seding {} entries - eol={}", session, handle, h, count, indicator);
}
@@ -2246,7 +2246,7 @@ public class SftpSubsystem
if (handles.containsKey(handle)) {
if (log.isTraceEnabled()) {
log.trace("generateFileHandle({})[{}] handle={} in use at round {}",
- getServerSession(), file, handle, Integer.valueOf(index));
+ getServerSession(), file, handle, index);
}
continue;
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/83fc8d8a/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 04cb8d3..dfcc6ab 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
@@ -154,7 +154,7 @@ public class EmbeddedCommandRunner {
set(cmd, "errs", err);
Boolean success = (Boolean) call(cmd, "requiresRepository");
- if (success.booleanValue()) {
+ if (success) {
call(cmd, "init", new Class[] {Repository.class, String.class}, new Object[] {openGitDir(gitdir), gitdir});
} else {
call(cmd, "init", new Class[] {Repository.class, String.class}, new Object[] {null, gitdir});
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/83fc8d8a/sshd-git/src/main/java/org/apache/sshd/git/transport/GitSshdSessionProcess.java
----------------------------------------------------------------------
diff --git a/sshd-git/src/main/java/org/apache/sshd/git/transport/GitSshdSessionProcess.java b/sshd-git/src/main/java/org/apache/sshd/git/transport/GitSshdSessionProcess.java
index 576712c..3e4ae13 100644
--- a/sshd-git/src/main/java/org/apache/sshd/git/transport/GitSshdSessionProcess.java
+++ b/sshd-git/src/main/java/org/apache/sshd/git/transport/GitSshdSessionProcess.java
@@ -87,7 +87,7 @@ public class GitSshdSessionProcess extends Process {
log.trace("exitValue({}) channel={}, timeout={} millis.: {}",
commandName, channel, waitTimeout, status);
}
- return status.intValue();
+ return status;
}
@Override