You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tw...@apache.org on 2022/10/29 19:26:44 UTC
[mina-sshd] 01/03: Manual format fixes: spurious linebreak in constructors
This is an automated email from the ASF dual-hosted git repository.
twolf pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
commit 94fbbf056c3fdfabaeb8f8939ac9ac00636e18a4
Author: Thomas Wolf <tw...@apache.org>
AuthorDate: Sat Oct 29 18:27:59 2022 +0200
Manual format fixes: spurious linebreak in constructors
Remove linebreaks before the first argument. Instead of
SomeConstructor(
boolean firstParameter, ...)
always write
SomeConstructor(boolean firstParameter, ...)
---
.../cli/client/helper/SftpFileTransferProgressOutputStream.java | 3 +--
.../apache/sshd/client/config/keys/ClientIdentityFileWatcher.java | 6 ++----
.../sshd/client/config/keys/DefaultClientIdentitiesWatcher.java | 3 +--
.../sshd/client/config/keys/LazyClientKeyIdentityProvider.java | 3 +--
.../src/main/java/org/apache/sshd/common/cipher/BaseCipher.java | 3 +--
.../src/main/java/org/apache/sshd/common/cipher/BaseGCMCipher.java | 3 +--
.../common/config/keys/impl/AbstractIdentityResourceLoader.java | 3 +--
.../common/config/keys/loader/FileWatcherKeyPairResourceLoader.java | 3 +--
.../config/keys/loader/pem/AbstractPEMResourceKeyPairParser.java | 3 +--
.../common/config/keys/AuthorizedKeyEntryLoginOptionsParseTest.java | 3 +--
.../loader/openssh/OpenSSHKeyPairResourceParserPasswordTest.java | 3 +--
.../sshd/common/keyprovider/KeyIdentityProviderResolutionTest.java | 3 +--
.../client/auth/password/InteractivePasswordIdentityProvider.java | 3 +--
.../org/apache/sshd/client/channel/PtyCapableChannelSession.java | 3 +--
.../sshd/client/session/forward/DynamicPortForwardingTracker.java | 4 ++--
.../apache/sshd/client/session/forward/PortForwardingTracker.java | 3 +--
.../java/org/apache/sshd/common/channel/BufferedIoOutputStream.java | 3 +--
.../apache/sshd/common/global/AbstractOpenSshHostKeysHandler.java | 3 +--
.../src/main/java/org/apache/sshd/common/io/nio2/Nio2Connector.java | 3 +--
.../src/main/java/org/apache/sshd/common/io/nio2/Nio2Session.java | 3 +--
.../org/apache/sshd/common/session/helpers/AbstractSession.java | 3 +--
.../auth/pubkey/AuthorizedKeyEntriesPublickeyAuthenticator.java | 3 +--
.../org/apache/sshd/server/command/AbstractFileSystemCommand.java | 3 +--
.../java/org/apache/sshd/server/shell/AggregateShellFactory.java | 6 ++----
.../src/test/java/org/apache/sshd/common/cipher/CipherTest.java | 3 +--
.../forward/LocalForwardingEntryCombinedBoundAddressTest.java | 3 +--
.../org/apache/sshd/common/signature/SignatureFactoriesTest.java | 3 +--
sshd-git/src/main/java/org/apache/sshd/git/AbstractGitCommand.java | 3 +--
sshd-git/src/main/java/org/apache/sshd/git/pack/GitPackCommand.java | 3 +--
sshd-git/src/main/java/org/apache/sshd/git/pgm/GitPgmCommand.java | 3 +--
.../src/main/java/org/apache/sshd/scp/client/DefaultScpClient.java | 3 +--
.../java/org/apache/sshd/scp/client/DefaultScpStreamResolver.java | 3 +--
.../java/org/apache/sshd/sftp/client/impl/DefaultSftpClient.java | 3 +--
sshd-sftp/src/main/java/org/apache/sshd/sftp/server/FileHandle.java | 3 +--
34 files changed, 37 insertions(+), 72 deletions(-)
diff --git a/sshd-cli/src/main/java/org/apache/sshd/cli/client/helper/SftpFileTransferProgressOutputStream.java b/sshd-cli/src/main/java/org/apache/sshd/cli/client/helper/SftpFileTransferProgressOutputStream.java
index 127ff31d7..994372960 100644
--- a/sshd-cli/src/main/java/org/apache/sshd/cli/client/helper/SftpFileTransferProgressOutputStream.java
+++ b/sshd-cli/src/main/java/org/apache/sshd/cli/client/helper/SftpFileTransferProgressOutputStream.java
@@ -49,8 +49,7 @@ public class SftpFileTransferProgressOutputStream extends FilterOutputStream {
this(out, DEFAULT_MARKER_SIZE, DEFAULT_PROGRESS_CHAR, DEFAULT_MARKS_PER_LINE, stdout);
}
- public SftpFileTransferProgressOutputStream(
- OutputStream out, int markerSize, char markerChar, int markersPerLine,
+ public SftpFileTransferProgressOutputStream(OutputStream out, int markerSize, char markerChar, int markersPerLine,
Appendable stdout) {
super(Objects.requireNonNull(out, "No target stream"));
diff --git a/sshd-common/src/main/java/org/apache/sshd/client/config/keys/ClientIdentityFileWatcher.java b/sshd-common/src/main/java/org/apache/sshd/client/config/keys/ClientIdentityFileWatcher.java
index 7d5e04e9c..7324362eb 100644
--- a/sshd-common/src/main/java/org/apache/sshd/client/config/keys/ClientIdentityFileWatcher.java
+++ b/sshd-common/src/main/java/org/apache/sshd/client/config/keys/ClientIdentityFileWatcher.java
@@ -61,13 +61,11 @@ public class ClientIdentityFileWatcher
strict);
}
- public ClientIdentityFileWatcher(
- Path path, ClientIdentityLoaderHolder loader, FilePasswordProviderHolder provider) {
+ public ClientIdentityFileWatcher(Path path, ClientIdentityLoaderHolder loader, FilePasswordProviderHolder provider) {
this(path, loader, provider, true);
}
- public ClientIdentityFileWatcher(
- Path path, ClientIdentityLoaderHolder loader, FilePasswordProviderHolder provider,
+ public ClientIdentityFileWatcher(Path path, ClientIdentityLoaderHolder loader, FilePasswordProviderHolder provider,
boolean strict) {
super(path);
this.loaderHolder = Objects.requireNonNull(loader, "No client identity loader");
diff --git a/sshd-common/src/main/java/org/apache/sshd/client/config/keys/DefaultClientIdentitiesWatcher.java b/sshd-common/src/main/java/org/apache/sshd/client/config/keys/DefaultClientIdentitiesWatcher.java
index 67430ed09..51c5331da 100644
--- a/sshd-common/src/main/java/org/apache/sshd/client/config/keys/DefaultClientIdentitiesWatcher.java
+++ b/sshd-common/src/main/java/org/apache/sshd/client/config/keys/DefaultClientIdentitiesWatcher.java
@@ -39,8 +39,7 @@ public class DefaultClientIdentitiesWatcher extends BuiltinClientIdentitiesWatch
this(true, loader, provider, strict);
}
- public DefaultClientIdentitiesWatcher(
- boolean supportedOnly, ClientIdentityLoader loader, FilePasswordProvider provider,
+ public DefaultClientIdentitiesWatcher(boolean supportedOnly, ClientIdentityLoader loader, FilePasswordProvider provider,
boolean strict) {
this(supportedOnly,
ClientIdentityLoaderHolder.loaderHolderOf(Objects.requireNonNull(loader, "No client identity loader")),
diff --git a/sshd-common/src/main/java/org/apache/sshd/client/config/keys/LazyClientKeyIdentityProvider.java b/sshd-common/src/main/java/org/apache/sshd/client/config/keys/LazyClientKeyIdentityProvider.java
index 4d8fc5ac9..3c02d47ff 100644
--- a/sshd-common/src/main/java/org/apache/sshd/client/config/keys/LazyClientKeyIdentityProvider.java
+++ b/sshd-common/src/main/java/org/apache/sshd/client/config/keys/LazyClientKeyIdentityProvider.java
@@ -48,8 +48,7 @@ public class LazyClientKeyIdentityProvider
private final FilePasswordProvider passwordProvider;
private final boolean ignoreNonExisting;
- public LazyClientKeyIdentityProvider(
- ClientIdentityLoader loader, Collection<? extends NamedResource> locations,
+ public LazyClientKeyIdentityProvider(ClientIdentityLoader loader, Collection<? extends NamedResource> locations,
FilePasswordProvider passwordProvider, boolean ignoreNonExisting) {
this.clientIdentityLoader = Objects.requireNonNull(loader, "No client identity loader provided");
this.locations = locations;
diff --git a/sshd-common/src/main/java/org/apache/sshd/common/cipher/BaseCipher.java b/sshd-common/src/main/java/org/apache/sshd/common/cipher/BaseCipher.java
index 1288af030..aac2a5ce3 100644
--- a/sshd-common/src/main/java/org/apache/sshd/common/cipher/BaseCipher.java
+++ b/sshd-common/src/main/java/org/apache/sshd/common/cipher/BaseCipher.java
@@ -41,8 +41,7 @@ public class BaseCipher implements Cipher {
private final String transformation;
private String s;
- public BaseCipher(
- int ivsize, int authSize, int kdfSize, String algorithm,
+ public BaseCipher(int ivsize, int authSize, int kdfSize, String algorithm,
int keySize, String transformation, int blkSize) {
this.ivsize = ivsize;
this.authSize = authSize;
diff --git a/sshd-common/src/main/java/org/apache/sshd/common/cipher/BaseGCMCipher.java b/sshd-common/src/main/java/org/apache/sshd/common/cipher/BaseGCMCipher.java
index 501de142a..e9789774b 100644
--- a/sshd-common/src/main/java/org/apache/sshd/common/cipher/BaseGCMCipher.java
+++ b/sshd-common/src/main/java/org/apache/sshd/common/cipher/BaseGCMCipher.java
@@ -34,8 +34,7 @@ public class BaseGCMCipher extends BaseCipher {
protected CounterGCMParameterSpec parameters;
protected SecretKey secretKey;
- public BaseGCMCipher(
- int ivsize, int authSize, int kdfSize, String algorithm, int keySize, String transformation,
+ public BaseGCMCipher(int ivsize, int authSize, int kdfSize, String algorithm, int keySize, String transformation,
int blkSize) {
super(ivsize, authSize, kdfSize, algorithm, keySize, transformation, blkSize);
}
diff --git a/sshd-common/src/main/java/org/apache/sshd/common/config/keys/impl/AbstractIdentityResourceLoader.java b/sshd-common/src/main/java/org/apache/sshd/common/config/keys/impl/AbstractIdentityResourceLoader.java
index 7b3003685..6739551a2 100644
--- a/sshd-common/src/main/java/org/apache/sshd/common/config/keys/impl/AbstractIdentityResourceLoader.java
+++ b/sshd-common/src/main/java/org/apache/sshd/common/config/keys/impl/AbstractIdentityResourceLoader.java
@@ -42,8 +42,7 @@ public abstract class AbstractIdentityResourceLoader<PUB extends PublicKey, PRV
private final Class<PRV> prvType;
private final NavigableSet<String> types;
- protected AbstractIdentityResourceLoader(
- Class<PUB> pubType, Class<PRV> prvType, Collection<String> keyTypes) {
+ protected AbstractIdentityResourceLoader(Class<PUB> pubType, Class<PRV> prvType, Collection<String> keyTypes) {
this.pubType = Objects.requireNonNull(pubType, "No public key type specified");
this.prvType = Objects.requireNonNull(prvType, "No private key type specified");
this.types = Collections.unmodifiableNavigableSet(
diff --git a/sshd-common/src/main/java/org/apache/sshd/common/config/keys/loader/FileWatcherKeyPairResourceLoader.java b/sshd-common/src/main/java/org/apache/sshd/common/config/keys/loader/FileWatcherKeyPairResourceLoader.java
index 6cac03630..11734b398 100644
--- a/sshd-common/src/main/java/org/apache/sshd/common/config/keys/loader/FileWatcherKeyPairResourceLoader.java
+++ b/sshd-common/src/main/java/org/apache/sshd/common/config/keys/loader/FileWatcherKeyPairResourceLoader.java
@@ -53,8 +53,7 @@ public class FileWatcherKeyPairResourceLoader extends ModifiableFileWatcher impl
this(file, delegateLoader, IoUtils.getLinkOptions(true));
}
- public FileWatcherKeyPairResourceLoader(
- Path file, KeyPairResourceLoader delegateLoader, LinkOption... options) {
+ public FileWatcherKeyPairResourceLoader(Path file, KeyPairResourceLoader delegateLoader, LinkOption... options) {
super(file, options);
this.delegateLoader = Objects.requireNonNull(delegateLoader, "No delegate loader provided");
}
diff --git a/sshd-common/src/main/java/org/apache/sshd/common/config/keys/loader/pem/AbstractPEMResourceKeyPairParser.java b/sshd-common/src/main/java/org/apache/sshd/common/config/keys/loader/pem/AbstractPEMResourceKeyPairParser.java
index 79109c271..6588e85ed 100644
--- a/sshd-common/src/main/java/org/apache/sshd/common/config/keys/loader/pem/AbstractPEMResourceKeyPairParser.java
+++ b/sshd-common/src/main/java/org/apache/sshd/common/config/keys/loader/pem/AbstractPEMResourceKeyPairParser.java
@@ -61,8 +61,7 @@ public abstract class AbstractPEMResourceKeyPairParser
private final String algo;
private final String algId;
- protected AbstractPEMResourceKeyPairParser(
- String algo, String algId, List<String> beginners, List<String> enders) {
+ protected AbstractPEMResourceKeyPairParser(String algo, String algId, List<String> beginners, List<String> enders) {
super(beginners, enders);
this.algo = ValidateUtils.checkNotNullAndNotEmpty(algo, "No encryption algorithm provided");
this.algId = ValidateUtils.checkNotNullAndNotEmpty(algId, "No algorithm identifier provided");
diff --git a/sshd-common/src/test/java/org/apache/sshd/common/config/keys/AuthorizedKeyEntryLoginOptionsParseTest.java b/sshd-common/src/test/java/org/apache/sshd/common/config/keys/AuthorizedKeyEntryLoginOptionsParseTest.java
index ec3a9d460..c506da04f 100644
--- a/sshd-common/src/test/java/org/apache/sshd/common/config/keys/AuthorizedKeyEntryLoginOptionsParseTest.java
+++ b/sshd-common/src/test/java/org/apache/sshd/common/config/keys/AuthorizedKeyEntryLoginOptionsParseTest.java
@@ -49,8 +49,7 @@ public class AuthorizedKeyEntryLoginOptionsParseTest extends JUnitTestSupport {
private final String keyPart;
private final Map<String, String> options;
- public AuthorizedKeyEntryLoginOptionsParseTest(
- String value, String loginPart, String keyPart,
+ public AuthorizedKeyEntryLoginOptionsParseTest(String value, String loginPart, String keyPart,
Map<String, String> options) {
this.value = value;
this.loginPart = loginPart;
diff --git a/sshd-common/src/test/java/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserPasswordTest.java b/sshd-common/src/test/java/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserPasswordTest.java
index b5033c44d..0bac2aa76 100644
--- a/sshd-common/src/test/java/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserPasswordTest.java
+++ b/sshd-common/src/test/java/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParserPasswordTest.java
@@ -60,8 +60,7 @@ public class OpenSSHKeyPairResourceParserPasswordTest extends OpenSSHKeyPairReso
private final AtomicInteger retriesCount = new AtomicInteger(0);
private final FilePasswordProvider passwordProvider;
- public OpenSSHKeyPairResourceParserPasswordTest(
- BuiltinIdentities identity, ResourceDecodeResult reportedResult) {
+ public OpenSSHKeyPairResourceParserPasswordTest(BuiltinIdentities identity, ResourceDecodeResult reportedResult) {
super(identity);
this.decodeResult = reportedResult;
this.passwordProvider = new FilePasswordProvider() {
diff --git a/sshd-common/src/test/java/org/apache/sshd/common/keyprovider/KeyIdentityProviderResolutionTest.java b/sshd-common/src/test/java/org/apache/sshd/common/keyprovider/KeyIdentityProviderResolutionTest.java
index f79e4aa08..71286f310 100644
--- a/sshd-common/src/test/java/org/apache/sshd/common/keyprovider/KeyIdentityProviderResolutionTest.java
+++ b/sshd-common/src/test/java/org/apache/sshd/common/keyprovider/KeyIdentityProviderResolutionTest.java
@@ -49,8 +49,7 @@ public class KeyIdentityProviderResolutionTest extends JUnitTestSupport {
private final KeyIdentityProvider p2;
private final KeyIdentityProvider expected;
- public KeyIdentityProviderResolutionTest(
- KeyIdentityProvider p1, KeyIdentityProvider p2, KeyIdentityProvider expected) {
+ public KeyIdentityProviderResolutionTest(KeyIdentityProvider p1, KeyIdentityProvider p2, KeyIdentityProvider expected) {
this.p1 = p1;
this.p2 = p2;
this.expected = expected;
diff --git a/sshd-contrib/src/main/java/org/apache/sshd/contrib/client/auth/password/InteractivePasswordIdentityProvider.java b/sshd-contrib/src/main/java/org/apache/sshd/contrib/client/auth/password/InteractivePasswordIdentityProvider.java
index 7fd50ec55..6fbb2b156 100644
--- a/sshd-contrib/src/main/java/org/apache/sshd/contrib/client/auth/password/InteractivePasswordIdentityProvider.java
+++ b/sshd-contrib/src/main/java/org/apache/sshd/contrib/client/auth/password/InteractivePasswordIdentityProvider.java
@@ -75,8 +75,7 @@ public class InteractivePasswordIdentityProvider
private String prompt;
private AtomicReference<String> nextPassword = new AtomicReference<>();
- public InteractivePasswordIdentityProvider(
- ClientSession clientSession, UserInteraction userInteraction, String prompt) {
+ public InteractivePasswordIdentityProvider(ClientSession clientSession, UserInteraction userInteraction, String prompt) {
this.clientSession = Objects.requireNonNull(clientSession, "No client session provided");
this.userInteraction = Objects.requireNonNull(userInteraction, "No user interaction instance configured");
this.prompt = prompt;
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/channel/PtyCapableChannelSession.java b/sshd-core/src/main/java/org/apache/sshd/client/channel/PtyCapableChannelSession.java
index 5d231976a..459356ab5 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/channel/PtyCapableChannelSession.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/channel/PtyCapableChannelSession.java
@@ -84,8 +84,7 @@ public class PtyCapableChannelSession extends ChannelSession implements PtyChann
private boolean usePty;
private final PtyChannelConfiguration config;
- public PtyCapableChannelSession(
- boolean usePty, PtyChannelConfigurationHolder configHolder, Map<String, ?> env) {
+ public PtyCapableChannelSession(boolean usePty, PtyChannelConfigurationHolder configHolder, Map<String, ?> env) {
this.usePty = usePty;
this.config = PtyChannelConfigurationMutator.copyConfiguration(
configHolder, new PtyChannelConfiguration());
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/session/forward/DynamicPortForwardingTracker.java b/sshd-core/src/main/java/org/apache/sshd/client/session/forward/DynamicPortForwardingTracker.java
index 5c3ab4e7c..59ba53a9c 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/session/forward/DynamicPortForwardingTracker.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/session/forward/DynamicPortForwardingTracker.java
@@ -29,8 +29,8 @@ import org.apache.sshd.common.util.net.SshdSocketAddress;
* @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
*/
public class DynamicPortForwardingTracker extends PortForwardingTracker {
- public DynamicPortForwardingTracker(
- ClientSession session, SshdSocketAddress localAddress, SshdSocketAddress boundAddress) {
+
+ public DynamicPortForwardingTracker(ClientSession session, SshdSocketAddress localAddress, SshdSocketAddress boundAddress) {
super(session, localAddress, boundAddress);
}
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/session/forward/PortForwardingTracker.java b/sshd-core/src/main/java/org/apache/sshd/client/session/forward/PortForwardingTracker.java
index 89d96511a..e53c9f759 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/session/forward/PortForwardingTracker.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/session/forward/PortForwardingTracker.java
@@ -38,8 +38,7 @@ public abstract class PortForwardingTracker
private final SshdSocketAddress localAddress;
private final SshdSocketAddress boundAddress;
- protected PortForwardingTracker(
- ClientSession session, SshdSocketAddress localAddress, SshdSocketAddress boundAddress) {
+ protected PortForwardingTracker(ClientSession session, SshdSocketAddress localAddress, SshdSocketAddress boundAddress) {
this.session = Objects.requireNonNull(session, "No client session provided");
this.localAddress = Objects.requireNonNull(localAddress, "No local address specified");
this.boundAddress = Objects.requireNonNull(boundAddress, "No bound address specified");
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/channel/BufferedIoOutputStream.java b/sshd-core/src/main/java/org/apache/sshd/common/channel/BufferedIoOutputStream.java
index ad83c673a..53b477137 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/channel/BufferedIoOutputStream.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/channel/BufferedIoOutputStream.java
@@ -60,8 +60,7 @@ public class BufferedIoOutputStream extends AbstractInnerCloseable implements Io
CoreModuleProperties.BUFFERED_IO_OUTPUT_MAX_PENDING_WRITE_WAIT.getRequired(resolver));
}
- public BufferedIoOutputStream(
- Object id, long channelId, IoOutputStream out, int maxPendingBytesCount,
+ public BufferedIoOutputStream(Object id, long channelId, IoOutputStream out, int maxPendingBytesCount,
Duration maxWaitForPendingWrites) {
this.id = Objects.requireNonNull(id, "No stream identifier provided");
this.channelId = channelId;
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/global/AbstractOpenSshHostKeysHandler.java b/sshd-core/src/main/java/org/apache/sshd/common/global/AbstractOpenSshHostKeysHandler.java
index 32213228e..49a2cd8e1 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/global/AbstractOpenSshHostKeysHandler.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/global/AbstractOpenSshHostKeysHandler.java
@@ -43,8 +43,7 @@ public abstract class AbstractOpenSshHostKeysHandler extends AbstractConnectionS
this(request, BufferPublicKeyParser.DEFAULT);
}
- protected AbstractOpenSshHostKeysHandler(
- String request, BufferPublicKeyParser<? extends PublicKey> parser) {
+ protected AbstractOpenSshHostKeysHandler(String request, BufferPublicKeyParser<? extends PublicKey> parser) {
this.request = ValidateUtils.checkNotNullAndNotEmpty(request, "No request identifier");
this.parser = Objects.requireNonNull(parser, "No public keys extractor");
}
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/io/nio2/Nio2Connector.java b/sshd-core/src/main/java/org/apache/sshd/common/io/nio2/Nio2Connector.java
index 7af9e46ae..4ed5a2d0d 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/io/nio2/Nio2Connector.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/io/nio2/Nio2Connector.java
@@ -122,8 +122,7 @@ public class Nio2Connector extends Nio2Service implements IoConnector {
protected final PropertyResolver propertyResolver;
protected final IoHandler handler;
- protected ConnectionCompletionHandler(
- IoConnectFuture future, AsynchronousSocketChannel socket,
+ protected ConnectionCompletionHandler(IoConnectFuture future, AsynchronousSocketChannel socket,
AttributeRepository context, PropertyResolver propertyResolver,
IoHandler handler) {
this.future = future;
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/io/nio2/Nio2Session.java b/sshd-core/src/main/java/org/apache/sshd/common/io/nio2/Nio2Session.java
index ae42881b1..6249e85b3 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/io/nio2/Nio2Session.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/io/nio2/Nio2Session.java
@@ -78,8 +78,7 @@ public class Nio2Session extends AbstractCloseable implements IoSession {
private Thread readerThread;
- public Nio2Session(
- Nio2Service service, PropertyResolver propertyResolver, IoHandler handler,
+ public Nio2Session(Nio2Service service, PropertyResolver propertyResolver, IoHandler handler,
AsynchronousSocketChannel socket,
SocketAddress acceptanceAddress)
throws IOException {
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 09805c6fe..e35acdf47 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
@@ -287,8 +287,7 @@ public abstract class AbstractSession extends SessionHelper {
* @param factoryManager the factory manager
* @param ioSession the underlying I/O session
*/
- protected AbstractSession(
- boolean serverSession, FactoryManager factoryManager, IoSession ioSession) {
+ protected AbstractSession(boolean serverSession, FactoryManager factoryManager, IoSession ioSession) {
super(serverSession, factoryManager, ioSession);
this.decoderBuffer = new SessionWorkBuffer(this);
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/auth/pubkey/AuthorizedKeyEntriesPublickeyAuthenticator.java b/sshd-core/src/main/java/org/apache/sshd/server/auth/pubkey/AuthorizedKeyEntriesPublickeyAuthenticator.java
index de11dbda9..40a347ba4 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/auth/pubkey/AuthorizedKeyEntriesPublickeyAuthenticator.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/auth/pubkey/AuthorizedKeyEntriesPublickeyAuthenticator.java
@@ -48,8 +48,7 @@ public class AuthorizedKeyEntriesPublickeyAuthenticator extends AbstractLoggingB
private Map<AuthorizedKeyEntry, PublicKey> resolvedKeys;
private Object id;
- public AuthorizedKeyEntriesPublickeyAuthenticator(
- Object id, ServerSession session,
+ public AuthorizedKeyEntriesPublickeyAuthenticator(Object id, ServerSession session,
Collection<? extends AuthorizedKeyEntry> entries,
PublicKeyEntryResolver fallbackResolver)
throws IOException,
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/command/AbstractFileSystemCommand.java b/sshd-core/src/main/java/org/apache/sshd/server/command/AbstractFileSystemCommand.java
index 36e2e2fa6..970e39d3c 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/command/AbstractFileSystemCommand.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/command/AbstractFileSystemCommand.java
@@ -35,8 +35,7 @@ public abstract class AbstractFileSystemCommand extends AbstractCommandSupport i
protected FileSystem fileSystem;
- public AbstractFileSystemCommand(
- String command, CloseableExecutorService executorService) {
+ public AbstractFileSystemCommand(String command, CloseableExecutorService executorService) {
super(command, executorService);
}
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/shell/AggregateShellFactory.java b/sshd-core/src/main/java/org/apache/sshd/server/shell/AggregateShellFactory.java
index 0b839c440..b1da48d36 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/shell/AggregateShellFactory.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/shell/AggregateShellFactory.java
@@ -43,8 +43,7 @@ public class AggregateShellFactory extends AbstractLoggingBean implements ShellF
* {@code null} then the next in line is consulted. If no match found then the default
* {@link InteractiveProcessShellFactory} is used
*/
- public AggregateShellFactory(
- Collection<? extends ShellFactorySelector> selectors) {
+ public AggregateShellFactory(Collection<? extends ShellFactorySelector> selectors) {
this(selectors, InteractiveProcessShellFactory.INSTANCE);
}
@@ -54,8 +53,7 @@ public class AggregateShellFactory extends AbstractLoggingBean implements ShellF
* returns {@code null} then the next in line is consulted.
* @param defaultFactory The (mandatory) default {@link ShellFactory} to use if no selector matched
*/
- public AggregateShellFactory(
- Collection<? extends ShellFactorySelector> selectors, ShellFactory defaultFactory) {
+ public AggregateShellFactory(Collection<? extends ShellFactorySelector> selectors, ShellFactory defaultFactory) {
this.selectors = (selectors == null) ? Collections.emptyList() : selectors;
this.defaultFactory = Objects.requireNonNull(defaultFactory, "No default factory provided");
}
diff --git a/sshd-core/src/test/java/org/apache/sshd/common/cipher/CipherTest.java b/sshd-core/src/test/java/org/apache/sshd/common/cipher/CipherTest.java
index 9a8eadc09..f9c9f753a 100644
--- a/sshd-core/src/test/java/org/apache/sshd/common/cipher/CipherTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/common/cipher/CipherTest.java
@@ -95,8 +95,7 @@ public class CipherTest extends BaseTestSupport {
private final Class<? extends com.jcraft.jsch.Cipher> jschCipher;
private final int loadTestRounds;
- public CipherTest(
- BuiltinCiphers builtInCipher,
+ public CipherTest(BuiltinCiphers builtInCipher,
Class<? extends com.jcraft.jsch.Cipher> jschCipher,
int loadTestRounds) {
this.builtInCipher = builtInCipher;
diff --git a/sshd-core/src/test/java/org/apache/sshd/common/forward/LocalForwardingEntryCombinedBoundAddressTest.java b/sshd-core/src/test/java/org/apache/sshd/common/forward/LocalForwardingEntryCombinedBoundAddressTest.java
index cc5e431f5..6c378d848 100644
--- a/sshd-core/src/test/java/org/apache/sshd/common/forward/LocalForwardingEntryCombinedBoundAddressTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/common/forward/LocalForwardingEntryCombinedBoundAddressTest.java
@@ -47,8 +47,7 @@ public class LocalForwardingEntryCombinedBoundAddressTest extends JUnitTestSuppo
private final LocalForwardingEntry entry;
private final SshdSocketAddress expected;
- public LocalForwardingEntryCombinedBoundAddressTest(
- SshdSocketAddress local, SshdSocketAddress bound,
+ public LocalForwardingEntryCombinedBoundAddressTest(SshdSocketAddress local, SshdSocketAddress bound,
SshdSocketAddress expected) {
this.entry = new LocalForwardingEntry(local, bound);
this.expected = expected;
diff --git a/sshd-core/src/test/java/org/apache/sshd/common/signature/SignatureFactoriesTest.java b/sshd-core/src/test/java/org/apache/sshd/common/signature/SignatureFactoriesTest.java
index df918414b..b9b0bf483 100644
--- a/sshd-core/src/test/java/org/apache/sshd/common/signature/SignatureFactoriesTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/common/signature/SignatureFactoriesTest.java
@@ -75,8 +75,7 @@ public class SignatureFactoriesTest extends BaseTestSupport implements KeyTypeIn
private final NamedFactory<Signature> factory;
private final PublicKeyEntryDecoder<?, ?> pubKeyDecoder;
- public SignatureFactoriesTest(
- String keyType, NamedFactory<Signature> factory,
+ public SignatureFactoriesTest(String keyType, NamedFactory<Signature> factory,
int keySize, boolean supported, PublicKeyEntryDecoder<?, ?> decoder) {
this.keyType = ValidateUtils.checkNotNullAndNotEmpty(keyType, "No key type specified");
this.factory = supported ? Objects.requireNonNull(factory, "No signature factory provided") : factory;
diff --git a/sshd-git/src/main/java/org/apache/sshd/git/AbstractGitCommand.java b/sshd-git/src/main/java/org/apache/sshd/git/AbstractGitCommand.java
index 2db95fa6e..3e96e3f9e 100644
--- a/sshd-git/src/main/java/org/apache/sshd/git/AbstractGitCommand.java
+++ b/sshd-git/src/main/java/org/apache/sshd/git/AbstractGitCommand.java
@@ -45,8 +45,7 @@ public abstract class AbstractGitCommand
protected final GitLocationResolver rootDirResolver;
protected FileSystem fileSystem;
- protected AbstractGitCommand(
- GitLocationResolver rootDirResolver, String command,
+ protected AbstractGitCommand(GitLocationResolver rootDirResolver, String command,
CloseableExecutorService executorService) {
super(command, executorService);
this.rootDirResolver = Objects.requireNonNull(rootDirResolver, "No GIT root directory resolver provided");
diff --git a/sshd-git/src/main/java/org/apache/sshd/git/pack/GitPackCommand.java b/sshd-git/src/main/java/org/apache/sshd/git/pack/GitPackCommand.java
index 425b68b5b..e9f2de8eb 100644
--- a/sshd-git/src/main/java/org/apache/sshd/git/pack/GitPackCommand.java
+++ b/sshd-git/src/main/java/org/apache/sshd/git/pack/GitPackCommand.java
@@ -47,8 +47,7 @@ public class GitPackCommand extends AbstractGitCommand {
* {@code start(ChannelSession, Environment)}-ing execution. If {@code null} an ad-hoc
* single-threaded service is created and used.
*/
- public GitPackCommand(
- GitLocationResolver rootDirResolver, String command, CloseableExecutorService executorService) {
+ public GitPackCommand(GitLocationResolver rootDirResolver, String command, CloseableExecutorService executorService) {
super(rootDirResolver, command, executorService);
}
diff --git a/sshd-git/src/main/java/org/apache/sshd/git/pgm/GitPgmCommand.java b/sshd-git/src/main/java/org/apache/sshd/git/pgm/GitPgmCommand.java
index a33b2c189..73349e583 100644
--- a/sshd-git/src/main/java/org/apache/sshd/git/pgm/GitPgmCommand.java
+++ b/sshd-git/src/main/java/org/apache/sshd/git/pgm/GitPgmCommand.java
@@ -42,8 +42,7 @@ public class GitPgmCommand extends AbstractGitCommand {
* {@code start(ChannelSession, Environment)}-ing execution. If {@code null} an ad-hoc
* single-threaded service is created and used.
*/
- public GitPgmCommand(
- GitLocationResolver rootDirResolver, String command, CloseableExecutorService executorService) {
+ public GitPgmCommand(GitLocationResolver rootDirResolver, String command, CloseableExecutorService executorService) {
super(rootDirResolver, command, executorService);
}
diff --git a/sshd-scp/src/main/java/org/apache/sshd/scp/client/DefaultScpClient.java b/sshd-scp/src/main/java/org/apache/sshd/scp/client/DefaultScpClient.java
index 6a032e80f..ead682748 100644
--- a/sshd-scp/src/main/java/org/apache/sshd/scp/client/DefaultScpClient.java
+++ b/sshd-scp/src/main/java/org/apache/sshd/scp/client/DefaultScpClient.java
@@ -54,8 +54,7 @@ public class DefaultScpClient extends AbstractScpClient {
this(clientSession, DefaultScpFileOpener.INSTANCE, ScpTransferEventListener.EMPTY);
}
- public DefaultScpClient(
- ClientSession clientSession, ScpFileOpener fileOpener, ScpTransferEventListener eventListener) {
+ public DefaultScpClient(ClientSession clientSession, ScpFileOpener fileOpener, ScpTransferEventListener eventListener) {
this.clientSession = Objects.requireNonNull(clientSession, "No client session");
this.opener = (fileOpener == null) ? DefaultScpFileOpener.INSTANCE : fileOpener;
this.listener = (eventListener == null) ? ScpTransferEventListener.EMPTY : eventListener;
diff --git a/sshd-scp/src/main/java/org/apache/sshd/scp/client/DefaultScpStreamResolver.java b/sshd-scp/src/main/java/org/apache/sshd/scp/client/DefaultScpStreamResolver.java
index eb2137946..b4613d3eb 100644
--- a/sshd-scp/src/main/java/org/apache/sshd/scp/client/DefaultScpStreamResolver.java
+++ b/sshd-scp/src/main/java/org/apache/sshd/scp/client/DefaultScpStreamResolver.java
@@ -42,8 +42,7 @@ public class DefaultScpStreamResolver implements ScpSourceStreamResolver {
private final InputStream local;
private final String cmd;
- public DefaultScpStreamResolver(
- String name, Path mockPath, Collection<PosixFilePermission> perms,
+ public DefaultScpStreamResolver(String name, Path mockPath, Collection<PosixFilePermission> perms,
ScpTimestampCommandDetails time, long size, InputStream local, String cmd) {
this.name = name;
this.mockPath = mockPath;
diff --git a/sshd-sftp/src/main/java/org/apache/sshd/sftp/client/impl/DefaultSftpClient.java b/sshd-sftp/src/main/java/org/apache/sshd/sftp/client/impl/DefaultSftpClient.java
index 12c667b9f..3cee175ce 100644
--- a/sshd-sftp/src/main/java/org/apache/sshd/sftp/client/impl/DefaultSftpClient.java
+++ b/sshd-sftp/src/main/java/org/apache/sshd/sftp/client/impl/DefaultSftpClient.java
@@ -88,8 +88,7 @@ public class DefaultSftpClient extends AbstractSftpClient {
* - if {@code null} the data is silently ignored
* @throws IOException If failed to initialize
*/
- public DefaultSftpClient(
- ClientSession clientSession, SftpVersionSelector initialVersionSelector,
+ public DefaultSftpClient(ClientSession clientSession, SftpVersionSelector initialVersionSelector,
SftpErrorDataHandler errorDataHandler)
throws IOException {
super(errorDataHandler);
diff --git a/sshd-sftp/src/main/java/org/apache/sshd/sftp/server/FileHandle.java b/sshd-sftp/src/main/java/org/apache/sshd/sftp/server/FileHandle.java
index 945855596..1b1657bf8 100644
--- a/sshd-sftp/src/main/java/org/apache/sshd/sftp/server/FileHandle.java
+++ b/sshd-sftp/src/main/java/org/apache/sshd/sftp/server/FileHandle.java
@@ -52,8 +52,7 @@ public class FileHandle extends Handle {
private final Set<StandardOpenOption> openOptions;
private final Collection<FileAttribute<?>> fileAttributes;
- public FileHandle(
- SftpSubsystem subsystem, Path file, String handle, int flags, int access, Map<String, Object> attrs)
+ public FileHandle(SftpSubsystem subsystem, Path file, String handle, int flags, int access, Map<String, Object> attrs)
throws IOException {
super(subsystem, file, handle);