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 106a2ce91ee9c1bcfdd585862e6a2d9b4e4652d2
Author: Lyor Goldstein <lgoldst...@apache.org>
AuthorDate: Mon Feb 15 18:52:16 2021 +0200
[SSHD-1124] Using List<? extends SubsytemFactory> method signature
---
.../main/java/org/apache/sshd/server/ServerFactoryManager.java | 2 +-
sshd-core/src/main/java/org/apache/sshd/server/SshServer.java | 8 ++++----
.../main/java/org/apache/sshd/server/channel/ChannelSession.java | 2 +-
sshd-sftp/src/test/java/org/apache/sshd/sftp/client/SftpTest.java | 8 ++++----
.../test/java/org/apache/sshd/sftp/client/SftpVersionsTest.java | 4 ++--
.../extensions/helpers/SpaceAvailableExtensionImplTest.java | 2 +-
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git
a/sshd-core/src/main/java/org/apache/sshd/server/ServerFactoryManager.java
b/sshd-core/src/main/java/org/apache/sshd/server/ServerFactoryManager.java
index 40d49d3..bd7788e 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/ServerFactoryManager.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/ServerFactoryManager.java
@@ -57,5 +57,5 @@ public interface ServerFactoryManager
* @return a list of named {@link SubsystemFactory}-ies or {@code
null}/empty if subsystems are not supported on
* this server
*/
- List<SubsystemFactory> getSubsystemFactories();
+ List<? extends SubsystemFactory> getSubsystemFactories();
}
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 2c383dd..1bb2ffa 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
@@ -100,7 +100,7 @@ public class SshServer extends AbstractFactoryManager
implements ServerFactoryMa
private ShellFactory shellFactory;
private SessionFactory sessionFactory;
private CommandFactory commandFactory;
- private List<SubsystemFactory> subsystemFactories;
+ private List<? extends SubsystemFactory> subsystemFactories;
private List<UserAuthFactory> userAuthFactories;
private KeyPairProvider keyPairProvider;
private HostKeyCertificateProvider hostKeyCertificateProvider;
@@ -191,11 +191,11 @@ public class SshServer extends AbstractFactoryManager
implements ServerFactoryMa
}
@Override
- public List<SubsystemFactory> getSubsystemFactories() {
+ public List<? extends SubsystemFactory> getSubsystemFactories() {
return subsystemFactories;
}
- public void setSubsystemFactories(List<SubsystemFactory>
subsystemFactories) {
+ public void setSubsystemFactories(List<? extends SubsystemFactory>
subsystemFactories) {
this.subsystemFactories = subsystemFactories;
}
@@ -350,7 +350,7 @@ public class SshServer extends AbstractFactoryManager
implements ServerFactoryMa
/**
* Stop the SSH server. This method will block until all resources are
actually disposed.
- *
+ *
* @throws IOException if stopping failed somehow
*/
public void stop() throws IOException {
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 0d05d7a..1124953 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
@@ -617,7 +617,7 @@ public class ChannelSession extends AbstractServerChannel {
protected RequestHandler.Result handleSubsystemParsed(String request,
String subsystem) throws IOException {
ServerFactoryManager manager =
Objects.requireNonNull(getServerSession(), "No server
session").getFactoryManager();
- Collection<SubsystemFactory> factories
+ Collection<? extends SubsystemFactory> factories
= Objects.requireNonNull(manager, "No server factory
manager").getSubsystemFactories();
if (GenericUtils.isEmpty(factories)) {
log.warn("handleSubsystem({}) No factories for subsystem: {}",
this, subsystem);
diff --git a/sshd-sftp/src/test/java/org/apache/sshd/sftp/client/SftpTest.java
b/sshd-sftp/src/test/java/org/apache/sshd/sftp/client/SftpTest.java
index c920cf5..8739088 100644
--- a/sshd-sftp/src/test/java/org/apache/sshd/sftp/client/SftpTest.java
+++ b/sshd-sftp/src/test/java/org/apache/sshd/sftp/client/SftpTest.java
@@ -565,7 +565,7 @@ public class SftpTest extends AbstractSftpClientTestSupport
{
@Test
public void testSftpFileSystemAccessor() throws Exception {
- List<SubsystemFactory> factories = sshd.getSubsystemFactories();
+ List<? extends SubsystemFactory> factories =
sshd.getSubsystemFactories();
assertEquals("Mismatched subsystem factories count", 1,
GenericUtils.size(factories));
SubsystemFactory f = factories.get(0);
@@ -654,7 +654,7 @@ public class SftpTest extends AbstractSftpClientTestSupport
{
@Test
@SuppressWarnings({ "checkstyle:anoninnerlength",
"checkstyle:methodlength" })
public void testClient() throws Exception {
- List<SubsystemFactory> factories = sshd.getSubsystemFactories();
+ List<? extends SubsystemFactory> factories =
sshd.getSubsystemFactories();
assertEquals("Mismatched subsystem factories count", 1,
GenericUtils.size(factories));
SubsystemFactory f = factories.get(0);
@@ -1270,7 +1270,7 @@ public class SftpTest extends
AbstractSftpClientTestSupport {
@Test // see SSHD-621
public void testServerDoesNotSupportSftp() throws Exception {
- List<SubsystemFactory> factories = sshd.getSubsystemFactories();
+ List<? extends SubsystemFactory> factories =
sshd.getSubsystemFactories();
assertEquals("Mismatched subsystem factories count", 1,
GenericUtils.size(factories));
sshd.setSubsystemFactories(null);
@@ -1386,7 +1386,7 @@ public class SftpTest extends
AbstractSftpClientTestSupport {
public void testCreateSymbolicLink() throws Exception {
// Do not execute on windows as the file system does not support
symlinks
Assume.assumeTrue("Skip non-Unix O/S", OsUtils.isUNIX());
- List<SubsystemFactory> factories = sshd.getSubsystemFactories();
+ List<? extends SubsystemFactory> factories =
sshd.getSubsystemFactories();
assertEquals("Mismatched subsystem factories count", 1,
GenericUtils.size(factories));
SubsystemFactory f = factories.get(0);
diff --git
a/sshd-sftp/src/test/java/org/apache/sshd/sftp/client/SftpVersionsTest.java
b/sshd-sftp/src/test/java/org/apache/sshd/sftp/client/SftpVersionsTest.java
index 8e04aa1..c23dc5c 100644
--- a/sshd-sftp/src/test/java/org/apache/sshd/sftp/client/SftpVersionsTest.java
+++ b/sshd-sftp/src/test/java/org/apache/sshd/sftp/client/SftpVersionsTest.java
@@ -303,7 +303,7 @@ public class SftpVersionsTest extends
AbstractSftpClientTestSupport {
String remotePath =
CommonTestSupportUtils.resolveRelativeRemotePath(parentPath, lclSftp);
int numInvoked = 0;
- List<SubsystemFactory> factories = sshd.getSubsystemFactories();
+ List<? extends SubsystemFactory> factories =
sshd.getSubsystemFactories();
sshd.setSubsystemFactories(Collections.singletonList(factory));
try (ClientSession session = createAuthenticatedClientSession();
SftpClient sftp = createSftpClient(session, getTestedVersion())) {
@@ -425,7 +425,7 @@ public class SftpVersionsTest extends
AbstractSftpClientTestSupport {
String remotePath =
CommonTestSupportUtils.resolveRelativeRemotePath(parentPath, lclSftp);
int numInvoked = 0;
- List<SubsystemFactory> factories = sshd.getSubsystemFactories();
+ List<? extends SubsystemFactory> factories =
sshd.getSubsystemFactories();
sshd.setSubsystemFactories(Collections.singletonList(factory));
try (ClientSession session = createAuthenticatedClientSession();
SftpClient sftp = createSftpClient(session, getTestedVersion())) {
diff --git
a/sshd-sftp/src/test/java/org/apache/sshd/sftp/client/extensions/helpers/SpaceAvailableExtensionImplTest.java
b/sshd-sftp/src/test/java/org/apache/sshd/sftp/client/extensions/helpers/SpaceAvailableExtensionImplTest.java
index a18f17e..3fa070c 100644
---
a/sshd-sftp/src/test/java/org/apache/sshd/sftp/client/extensions/helpers/SpaceAvailableExtensionImplTest.java
+++
b/sshd-sftp/src/test/java/org/apache/sshd/sftp/client/extensions/helpers/SpaceAvailableExtensionImplTest.java
@@ -67,7 +67,7 @@ public class SpaceAvailableExtensionImplTest extends
AbstractSftpClientTestSuppo
final String queryPath =
CommonTestSupportUtils.resolveRelativeRemotePath(parentPath, lclSftp);
final SpaceAvailableExtensionInfo expected = new
SpaceAvailableExtensionInfo(store);
- List<SubsystemFactory> factories = sshd.getSubsystemFactories();
+ List<? extends SubsystemFactory> factories =
sshd.getSubsystemFactories();
sshd.setSubsystemFactories(Collections.singletonList(new
SftpSubsystemFactory() {
@Override
public Command createSubsystem(ChannelSession channel) throws
IOException {
