From 4ee904cbfd7b0988d908e95fcc5b12d530c5d695 Mon Sep 17 00:00:00 2001
From: William Kim <wkim@mitre.org>
Date: Fri, 14 Jun 2013 10:59:34 -0400
Subject: [PATCH] removed setter/getter from DefaultUserInfoUserDetailsService
 and updated test class with Mockito annotations.

---
 .../impl/DefaultUserInfoUserDetailsService.java  |  8 --------
 .../TestDefaultUserInfoUserDetailsService.java   | 16 ++++++++++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultUserInfoUserDetailsService.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultUserInfoUserDetailsService.java
index c7fa58102..ef49dbf07 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultUserInfoUserDetailsService.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultUserInfoUserDetailsService.java
@@ -85,12 +85,4 @@ public class DefaultUserInfoUserDetailsService implements UserDetailsService {
 		this.admins = admins;
 	}
 
-	public UserInfoRepository getUserInfoRepository() {
-		return repository;
-	}
-
-	public void setUserInfoRepository(UserInfoRepository repository) {
-		this.repository = repository;
-	}
-
 }
diff --git a/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultUserInfoUserDetailsService.java b/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultUserInfoUserDetailsService.java
index 3b50d1cde..f7e04ea20 100644
--- a/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultUserInfoUserDetailsService.java
+++ b/openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultUserInfoUserDetailsService.java
@@ -9,20 +9,29 @@ import java.util.ArrayList;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mitre.openid.connect.model.DefaultUserInfo;
 import org.mitre.openid.connect.model.UserInfo;
 import org.mitre.openid.connect.repository.UserInfoRepository;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
 import org.mockito.Mockito;
+import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 
 import com.google.common.collect.Lists;
 
+@RunWith(MockitoJUnitRunner.class)
 public class TestDefaultUserInfoUserDetailsService {
 
-	private DefaultUserInfoUserDetailsService service;
+	@InjectMocks
+	private DefaultUserInfoUserDetailsService service = new DefaultUserInfoUserDetailsService();
+	
+	@Mock
 	private UserInfoRepository userInfoRepository;
+	
 	private UserInfo userInfoAdmin;
 	private UserInfo userInfoRegular;
 	private String adminUsername = "username";
@@ -36,9 +45,8 @@ public class TestDefaultUserInfoUserDetailsService {
 	 */
 	@Before
 	public void prepare() {
-		userInfoRepository = Mockito.mock(UserInfoRepository.class);
-		service = new DefaultUserInfoUserDetailsService();
-		service.setUserInfoRepository(userInfoRepository);
+		
+		
 		service.setAdmins(Lists.newArrayList(adminUsername));
 		
 		userInfoAdmin = new DefaultUserInfo();