Fix deleteAllKeys method signature

diff --git a/src/main/java/com/gitblit/transport/ssh/FileKeyManager.java b/src/main/java/com/gitblit/transport/ssh/FileKeyManager.java
index f590ab2f75a355294e6771b92e066415c6e1406f..04b42fc8429f93b3167c5e88dca269035a41d88d 100644 (file)
--- a/src/main/java/com/gitblit/transport/ssh/FileKeyManager.java
+++ b/src/main/java/com/gitblit/transport/ssh/FileKeyManager.java
@@ -147,7 +147,7 @@ public class FileKeyManager implements IKeyManager {
        }
 
        @Override
-       public boolean removeAllKey(String username) {
+       public boolean removeAllKeys(String username) {
                return FileUtils.delete(getKeystore(username));
        }
 

diff --git a/src/main/java/com/gitblit/transport/ssh/IKeyManager.java b/src/main/java/com/gitblit/transport/ssh/IKeyManager.java
index 3528bf19028ede6c205a2cff74df7bbcc67b6431..cb32a020ef1274cfac7779dfaf1c18835ec62ea7 100644 (file)
--- a/src/main/java/com/gitblit/transport/ssh/IKeyManager.java
+++ b/src/main/java/com/gitblit/transport/ssh/IKeyManager.java
@@ -37,5 +37,5 @@ public interface IKeyManager {
        
        boolean removeKey(String username, String data);
 
-       boolean removeAllKey(String username);
+       boolean removeAllKeys(String username);
 }

diff --git a/src/main/java/com/gitblit/transport/ssh/NullKeyManager.java b/src/main/java/com/gitblit/transport/ssh/NullKeyManager.java
index 6990d0de4849c26de74f0bc8bf4a96384ba5d6dd..454d3cfcc786b9eab49f6c541bee88546c74c361 100644 (file)
--- a/src/main/java/com/gitblit/transport/ssh/NullKeyManager.java
+++ b/src/main/java/com/gitblit/transport/ssh/NullKeyManager.java
@@ -65,7 +65,7 @@ public class NullKeyManager implements IKeyManager {
        }
 
        @Override
-       public boolean removeAllKey(String username) {
+       public boolean removeAllKeys(String username) {
                return false;
        }
 }

diff --git a/src/main/java/com/gitblit/transport/ssh/commands/SetAccountCommand.java b/src/main/java/com/gitblit/transport/ssh/commands/SetAccountCommand.java
index 98d9aba2469f63c37c70f0ecfb74794e4acc0c2f..767f3cb41829947da21f270faa5585a6a07f11f4 100644 (file)
--- a/src/main/java/com/gitblit/transport/ssh/commands/SetAccountCommand.java
+++ b/src/main/java/com/gitblit/transport/ssh/commands/SetAccountCommand.java
@@ -84,7 +84,7 @@ public class SetAccountCommand extends SshCommand {
        private void deleteSshKeys(List<String> sshKeys) {
                IKeyManager keyManager = authenticator.getKeyManager();
                if (sshKeys.contains(ALL)) {
-                       keyManager.removeAllKey(user);
+                       keyManager.removeAllKeys(user);
                } else {
                        for (String sshKey : sshKeys) {
                                keyManager.removeKey(user, sshKey);