Minor tweaks

Author: gnodet

sshd-cli/src/main/java/org/apache/sshd/cli/client/CliClientModuleProperties.java

@@ -31,7 +31,7 @@ public final class CliClientModuleProperties {
      * Key used to retrieve the value of the timeout after which it will abort the connection if the connection has not
      * been established - in milliseconds.
      */
-    public static final Property<Duration> CONECT_TIMEOUT
+    public static final Property<Duration> CONNECT_TIMEOUT
             = Property.duration("cli-connect-timeout", Duration.ofMinutes(2));
 
     /**

sshd-cli/src/main/java/org/apache/sshd/cli/client/ScpCommandMain.java

@@ -351,10 +351,9 @@ public static void xferRemoteToRemote(
             HostConfigEntry entry = resolveHost(
                     manager, target.resolveUsername(), target.getHost(), target.resolvePort(), null);
             // TODO use a configurable wait time
-            ClientSession dstSession = manager.connect(entry, null, null)
-                    .verify(CliClientModuleProperties.CONECT_TIMEOUT.getRequired(srcSession))
-                    .getSession();
-            try {
+            try (ClientSession dstSession = manager.connect(entry, null, null)
+                    .verify(CliClientModuleProperties.CONNECT_TIMEOUT.getRequired(srcSession))
+                    .getSession()) {
                 // TODO see if there is a way to specify different password/key for target
                 // copy non-default identities from source session
                 AuthenticationIdentitiesProvider provider = srcSession.getRegisteredIdentities();
@@ -431,8 +430,6 @@ private void logEvent(String event, String src, String dst, Throwable thrown) {
                 } else {
                     helper.transferFile(source.getPath(), target.getPath(), preserveAttributes);
                 }
-            } finally {
-                dstSession.close();
             }
         } finally {
             srcSession.close();
@@ -488,7 +485,7 @@ public static void main(String[] args) throws Exception {
                         defaultOptions);
             }
         } finally {
-            if ((logStream != stdout) && (logStream != stderr)) {
+            if ((logStream != stdout) && (logStream != stderr) && (logStream != null)) {
                 logStream.close();
             }
         }

sshd-cli/src/main/java/org/apache/sshd/cli/client/SshClientCliSupport.java

@@ -268,7 +268,7 @@ public static ClientSession setupClientSession(
 
             HostConfigEntry entry = resolveHost(client, login, host, port, proxyJump);
             ClientSession session = client.connect(entry, null, null)
-                    .verify(CliClientModuleProperties.CONECT_TIMEOUT.getRequired(client))
+                    .verify(CliClientModuleProperties.CONNECT_TIMEOUT.getRequired(client))
                     .getSession();
             try {
                 if (GenericUtils.length(password) > 0) {
@@ -668,7 +668,7 @@ public static OutputStream resolveLoggingTargetStream(
 
                 String argVal = args[index + 1];
                 if ("--".equals(argVal)) {
-                    return stdout;
+                    return new NoCloseOutputStream(stdout);
                 }
 
                 try {
@@ -682,7 +682,7 @@ public static OutputStream resolveLoggingTargetStream(
             }
         }
 
-        return stderr;
+        return new NoCloseOutputStream(stderr);
     }
 
     public static Handler setupLogging(

sshd-core/src/main/java/org/apache/sshd/common/kex/extension/DefaultClientKexExtensionHandler.java

@@ -89,7 +89,7 @@ public boolean handleKexExtensionRequest(
                     log.debug("handleKexExtensionRequest({}) : ignoring unknown {} extension", session,
                             HostBoundPubkeyAuthentication.NAME);
                 }
-            } else if (version.intValue() != 0) {
+            } else if (version != 0) {
                 if (log.isDebugEnabled()) {
                     log.debug("handleKexExtensionRequest({}) : ignoring unknown {} version {}", session,
                             HostBoundPubkeyAuthentication.NAME, version);

sshd-core/src/main/java/org/apache/sshd/common/kex/extension/DefaultServerKexExtensionHandler.java

@@ -103,14 +103,14 @@ public void handleKexInitProposal(Session session, boolean initiator, Map<KexPro
     public void sendKexExtensions(Session session, KexPhase phase) throws Exception {
         if (phase == KexPhase.NEWKEYS) {
             Boolean alreadySent = session.getAttribute(EXT_INFO_SENT_AT_NEWKEYS);
-            if ((alreadySent != null) && alreadySent.booleanValue()) {
+            if (alreadySent != null && alreadySent) {
                 // It's not the first NEWKEYS.
                 return;
             }
             session.setAttribute(EXT_INFO_SENT_AT_NEWKEYS, Boolean.TRUE);
         }
         Boolean doExtInfo = session.getAttribute(CLIENT_REQUESTED_EXT_INFO);
-        if ((doExtInfo == null) || !doExtInfo.booleanValue()) {
+        if (doExtInfo == null || !doExtInfo) {
             if (log.isTraceEnabled()) {
                 log.trace("sendKexExtensions({})[{}]: client did not send ext-info-c; skipping sending SSH_MSG_EXT_INFO",
                         session, phase);

sshd-core/src/main/java/org/apache/sshd/common/session/helpers/AbstractSession.java

@@ -2675,7 +2675,7 @@ protected Map<KexProposalOption, String> doStrictKexProposal(Map<KexProposalOpti
             boolean changed = algorithms.remove(extType);
             changed |= algorithms.remove(askForStrictKex);
             if (changed) {
-                value = algorithms.stream().collect(Collectors.joining(","));
+                value = String.join(",", algorithms);
             }
         }
         proposal.put(KexProposalOption.ALGORITHMS, value);