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 890b78240a5632a769385a3ee4b42385e5c023d7
Author: Lyor Goldstein <lgoldst...@apache.org>
AuthorDate: Mon Feb 15 18:56:08 2021 +0200

    [SSHD-1124] Using List<? extends ChannelFactory> method signature
---
 sshd-core/src/main/java/org/apache/sshd/client/SshClient.java       | 2 +-
 sshd-core/src/main/java/org/apache/sshd/common/FactoryManager.java  | 2 +-
 .../java/org/apache/sshd/common/helpers/AbstractFactoryManager.java | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java 
b/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java
index 9660510..e4cde28 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java
@@ -407,7 +407,7 @@ public class SshClient extends AbstractFactoryManager 
implements ClientFactoryMa
                     agentFactory.getChannelForwardingFactories(this),
                     "No agent channel forwarding factories for %s",
                     agentFactory);
-            List<ChannelFactory> factories = getChannelFactories();
+            List<? extends ChannelFactory> factories = getChannelFactories();
             if (GenericUtils.isEmpty(factories)) {
                 factories = forwarders;
             } else {
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/FactoryManager.java 
b/sshd-core/src/main/java/org/apache/sshd/common/FactoryManager.java
index 52df0a9..d229a41 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/FactoryManager.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/FactoryManager.java
@@ -91,7 +91,7 @@ public interface FactoryManager
      *
      * @return A list of {@link ChannelFactory}-ies, never {@code null}
      */
-    List<ChannelFactory> getChannelFactories();
+    List<? extends ChannelFactory> getChannelFactories();
 
     /**
      * Retrieve the agent factory for creating <code>SshAgent</code> objects.
diff --git 
a/sshd-core/src/main/java/org/apache/sshd/common/helpers/AbstractFactoryManager.java
 
b/sshd-core/src/main/java/org/apache/sshd/common/helpers/AbstractFactoryManager.java
index 3abf709..2a7758f 100644
--- 
a/sshd-core/src/main/java/org/apache/sshd/common/helpers/AbstractFactoryManager.java
+++ 
b/sshd-core/src/main/java/org/apache/sshd/common/helpers/AbstractFactoryManager.java
@@ -73,7 +73,7 @@ public abstract class AbstractFactoryManager extends 
AbstractKexFactoryManager i
     protected IoServiceFactoryFactory ioServiceFactoryFactory;
     protected IoServiceFactory ioServiceFactory;
     protected Factory<Random> randomFactory;
-    protected List<ChannelFactory> channelFactories;
+    protected List<? extends ChannelFactory> channelFactories;
     protected SshAgentFactory agentFactory;
     protected ScheduledExecutorService executor;
     protected boolean shutdownExecutor;
@@ -209,11 +209,11 @@ public abstract class AbstractFactoryManager extends 
AbstractKexFactoryManager i
     }
 
     @Override
-    public List<ChannelFactory> getChannelFactories() {
+    public List<? extends ChannelFactory> getChannelFactories() {
         return channelFactories;
     }
 
-    public void setChannelFactories(List<ChannelFactory> channelFactories) {
+    public void setChannelFactories(List<? extends ChannelFactory> 
channelFactories) {
         this.channelFactories = channelFactories;
     }
 

Reply via email to