From 97535bbcae11593d786ca9214f9c864fadf29255 Mon Sep 17 00:00:00 2001 From: David Kocher Date: Wed, 7 May 2014 10:37:14 +0200 Subject: [PATCH] Merge interfaces. --- .../userauth/keyprovider/FileKeyProvider.java | 5 +++++ .../sshj/userauth/keyprovider/OpenSSHKeyFile.java | 4 ++-- .../sshj/userauth/keyprovider/PKCS8KeyFile.java | 6 +++--- .../userauth/keyprovider/ReaderKeyProvider.java | 15 --------------- 4 files changed, 10 insertions(+), 20 deletions(-) delete mode 100644 src/main/java/net/schmizz/sshj/userauth/keyprovider/ReaderKeyProvider.java diff --git a/src/main/java/net/schmizz/sshj/userauth/keyprovider/FileKeyProvider.java b/src/main/java/net/schmizz/sshj/userauth/keyprovider/FileKeyProvider.java index 8f4183c2..ad8a7739 100644 --- a/src/main/java/net/schmizz/sshj/userauth/keyprovider/FileKeyProvider.java +++ b/src/main/java/net/schmizz/sshj/userauth/keyprovider/FileKeyProvider.java @@ -18,6 +18,7 @@ package net.schmizz.sshj.userauth.keyprovider; import net.schmizz.sshj.userauth.password.PasswordFinder; import java.io.File; +import java.io.Reader; /** A file key provider is initialized with a location of */ public interface FileKeyProvider @@ -27,6 +28,10 @@ public interface FileKeyProvider void init(File location, PasswordFinder pwdf); + void init(Reader location); + + void init(Reader location, PasswordFinder pwdf); + void init(String privateKey, String publicKey); void init(String privateKey, String publicKey, PasswordFinder pwdf); diff --git a/src/main/java/net/schmizz/sshj/userauth/keyprovider/OpenSSHKeyFile.java b/src/main/java/net/schmizz/sshj/userauth/keyprovider/OpenSSHKeyFile.java index 19d2c733..5e0b615a 100644 --- a/src/main/java/net/schmizz/sshj/userauth/keyprovider/OpenSSHKeyFile.java +++ b/src/main/java/net/schmizz/sshj/userauth/keyprovider/OpenSSHKeyFile.java @@ -39,10 +39,10 @@ public class OpenSSHKeyFile extends PKCS8KeyFile { public static class Factory - implements net.schmizz.sshj.common.Factory.Named { + implements net.schmizz.sshj.common.Factory.Named { @Override - public KeyProvider create() { + public FileKeyProvider create() { return new OpenSSHKeyFile(); } diff --git a/src/main/java/net/schmizz/sshj/userauth/keyprovider/PKCS8KeyFile.java b/src/main/java/net/schmizz/sshj/userauth/keyprovider/PKCS8KeyFile.java index ce7d8833..e2f64210 100644 --- a/src/main/java/net/schmizz/sshj/userauth/keyprovider/PKCS8KeyFile.java +++ b/src/main/java/net/schmizz/sshj/userauth/keyprovider/PKCS8KeyFile.java @@ -43,13 +43,13 @@ import org.slf4j.LoggerFactory; /** Represents a PKCS8-encoded key file. This is the format used by OpenSSH and OpenSSL. */ public class PKCS8KeyFile - implements FileKeyProvider, ReaderKeyProvider { + implements FileKeyProvider { public static class Factory - implements net.schmizz.sshj.common.Factory.Named { + implements net.schmizz.sshj.common.Factory.Named { @Override - public KeyProvider create() { + public FileKeyProvider create() { return new PKCS8KeyFile(); } diff --git a/src/main/java/net/schmizz/sshj/userauth/keyprovider/ReaderKeyProvider.java b/src/main/java/net/schmizz/sshj/userauth/keyprovider/ReaderKeyProvider.java deleted file mode 100644 index abf4f8f5..00000000 --- a/src/main/java/net/schmizz/sshj/userauth/keyprovider/ReaderKeyProvider.java +++ /dev/null @@ -1,15 +0,0 @@ -package net.schmizz.sshj.userauth.keyprovider; - -import java.io.Reader; - -import net.schmizz.sshj.userauth.password.PasswordFinder; - -/** - * @version $Id:$ - */ -public interface ReaderKeyProvider extends KeyProvider { - - void init(Reader location); - - void init(Reader location, PasswordFinder pwdf); -}