[mina-sshd] 06/10: Upgraded Spring integration version to 5.2.0

[lgoldstein]

This is an automated email from the ASF dual-hosted git repository.

lgoldstein pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git

commit 912f5c00c11dcb7c17f9326e9903511188ad1997
Author: Lyor Goldstein <lgoldst...@apache.org>
AuthorDate: Thu Oct 3 12:47:31 2019 +0300

    Upgraded Spring integration version to 5.2.0
---
 sshd-spring-sftp/pom.xml                           |  2 +-
 .../spring/integration/sftp/SpringSftpSession.java | 24 ++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/sshd-spring-sftp/pom.xml b/sshd-spring-sftp/pom.xml
index 967ea6c..51eeef0 100644
--- a/sshd-spring-sftp/pom.xml
+++ b/sshd-spring-sftp/pom.xml
@@ -32,7 +32,7 @@
 
     <properties>
         <projectRoot>${project.basedir}/..</projectRoot>
-        <spring.integration.version>5.1.7.RELEASE</spring.integration.version>
+        <spring.integration.version>5.2.0.RELEASE</spring.integration.version>
     </properties>
 
     <dependencyManagement>
diff --git 
a/sshd-spring-sftp/src/main/java/org/apache/sshd/spring/integration/sftp/SpringSftpSession.java
 
b/sshd-spring-sftp/src/main/java/org/apache/sshd/spring/integration/sftp/SpringSftpSession.java
index 63c0883..c806b88 100644
--- 
a/sshd-spring-sftp/src/main/java/org/apache/sshd/spring/integration/sftp/SpringSftpSession.java
+++ 
b/sshd-spring-sftp/src/main/java/org/apache/sshd/spring/integration/sftp/SpringSftpSession.java
@@ -21,6 +21,8 @@ package org.apache.sshd.spring.integration.sftp;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.Objects;
@@ -31,9 +33,11 @@ import org.apache.sshd.client.subsystem.sftp.SftpClient;
 import org.apache.sshd.client.subsystem.sftp.SftpClient.Attributes;
 import org.apache.sshd.client.subsystem.sftp.SftpClient.DirEntry;
 import org.apache.sshd.client.subsystem.sftp.SftpClient.OpenMode;
+import org.apache.sshd.common.io.IoSession;
 import org.apache.sshd.common.subsystem.sftp.SftpException;
 import org.apache.sshd.common.util.GenericUtils;
 import org.apache.sshd.common.util.logging.AbstractLoggingBean;
+import org.apache.sshd.common.util.net.SshdSocketAddress;
 import org.springframework.integration.file.remote.session.Session;
 import org.springframework.util.FileCopyUtils;
 
@@ -56,6 +60,26 @@ public class SpringSftpSession extends AbstractLoggingBean 
implements Session<Di
     }
 
     @Override
+    public String getHostPort() {
+        SftpClient client = getClientInstance();
+        @SuppressWarnings("resource")
+        org.apache.sshd.common.session.Session session =
+            (client == null) ? null : client.getSession();
+        @SuppressWarnings("resource")
+        IoSession ioSession = (session == null) ? null : 
session.getIoSession();
+        SocketAddress peerAddress = (ioSession == null) ? null : 
ioSession.getRemoteAddress();
+        if (peerAddress instanceof InetSocketAddress) {
+            InetSocketAddress inetAddress = (InetSocketAddress) peerAddress;
+            return inetAddress.getHostString() + ":" + inetAddress.getPort();
+        } else if (peerAddress instanceof SshdSocketAddress) {
+            SshdSocketAddress sshdAddress = (SshdSocketAddress) peerAddress;
+            return sshdAddress.getHostName() + ":" + sshdAddress.getPort();
+        } else {
+            return Objects.toString(peerAddress, null);
+        }
+    }
+
+    @Override
     public boolean isOpen() {
         SftpClient client = getClientInstance();
         return client.isOpen();