Extract UserManager from GitBlit singleton

Change-Id: I4885255ed63aa6c4e000c3e5501675440dca3958

1 files changed, 10 insertions, 3 deletions

diff --git a/src/main/java/com/gitblit/GitblitUserService.java b/src/main/java/com/gitblit/GitblitUserService.java
index 7278b222..715aed9d 100644
--- a/src/main/java/com/gitblit/GitblitUserService.java
+++ b/src/main/java/com/gitblit/GitblitUserService.java
@@ -126,6 +126,12 @@ public class GitblitUserService implements IUserService {
 		return serviceImpl.getCookie(model);

 	}

 

+	/**

+	 * Authenticate a user based on their cookie.

+	 *

+	 * @param cookie

+	 * @return a user object or null

+	 */

 	@Override

 	public UserModel authenticate(char[] cookie) {

 		UserModel user = serviceImpl.authenticate(cookie);

@@ -226,8 +232,8 @@ public class GitblitUserService implements IUserService {
 	}

 

 	@Override

-	public List<String> getTeamnamesForRepositoryRole(String role) {

-		return serviceImpl.getTeamnamesForRepositoryRole(role);

+	public List<String> getTeamNamesForRepositoryRole(String role) {

+		return serviceImpl.getTeamNamesForRepositoryRole(role);

 	}

 

 	@Override

@@ -312,7 +318,8 @@ public class GitblitUserService implements IUserService {
 		}

 	}

 

-	protected AccountType getAccountType() {

+	@Override

+	public AccountType getAccountType() {

 		return AccountType.LOCAL;

 	}

 }