Simplify InMemoryUaaUserDatabase and MockUaaUserDatabase

Signed-off-by: Jonathan Lo <jlo@us.ibm.com>

server/src/main/java/org/cloudfoundry/identity/uaa/user/InMemoryUaaUserDatabase.java

@@ -14,6 +14,7 @@
 
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -29,12 +30,12 @@ public class InMemoryUaaUserDatabase implements UaaUserDatabase {
     private final Map<String, UaaUser> users;
     private final Map<String, UaaUser> ids;
 
-    public InMemoryUaaUserDatabase(Map<String, UaaUser> users) {
+    public InMemoryUaaUserDatabase(Collection<UaaUser> users) {
         this.users = new HashMap<>();
         this.ids = new HashMap<>();
-        for (Map.Entry<String,UaaUser> entry : users.entrySet()) {
-            this.ids.put(entry.getValue().getId(), entry.getValue());
-            this.users.put(entry.getKey()+"-"+entry.getValue().getOrigin(), entry.getValue());
+        for (UaaUser user : users) {
+            this.ids.put(user.getId(), user);
+            this.users.put(user.getUsername()+"-"+user.getOrigin(), user);
         }
     }
 

server/src/test/java/org/cloudfoundry/identity/uaa/authentication/SessionResetFilterTests.java

@@ -36,10 +36,10 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import java.lang.reflect.Field;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.List;
 
 import static org.mockito.Matchers.anyBoolean;
 import static org.mockito.Matchers.anyString;
@@ -61,7 +61,6 @@ public class SessionResetFilterTests {
     Date yesterday;
     UaaUser user;
     UaaUser userWithNoPasswordModification;
-    Map<String,UaaUser> users;
 
     @Before
     public void setUpFilter() throws Exception {
@@ -119,9 +118,9 @@ private void addUsersToInMemoryDb() {
             null
         );
 
-        users = new HashMap<>();
-        users.put(user.getId(), user);
-        users.put(userWithNoPasswordModification.getId(), userWithNoPasswordModification);
+        List<UaaUser> users = new ArrayList<>();
+        users.add(user);
+        users.add(userWithNoPasswordModification);
         userDatabase = new InMemoryUaaUserDatabase(users);
     }
 

server/src/test/java/org/cloudfoundry/identity/uaa/oauth/UaaTokenServicesTests.java

@@ -169,10 +169,7 @@ public class UaaTokenServicesTests {
     // the token IAT is in seconds and the token
     // expiry
     // skew will not be long enough
-    private InMemoryUaaUserDatabase userDatabase =
-        new InMemoryUaaUserDatabase(
-            new HashMap<>(Collections.singletonMap(username, defaultUser))
-        );
+    private InMemoryUaaUserDatabase userDatabase = new InMemoryUaaUserDatabase(Collections.singleton(defaultUser));
 
     private Authentication defaultUserAuthentication = new UsernamePasswordAuthenticationToken(new UaaPrincipal(defaultUser), "n/a", null);
 

server/src/test/java/org/cloudfoundry/identity/uaa/openid/UserInfoEndpointTests.java

@@ -36,8 +36,7 @@ public class UserInfoEndpointTests {
 
     private UserInfoEndpoint endpoint = new UserInfoEndpoint();
 
-    private InMemoryUaaUserDatabase userDatabase = new InMemoryUaaUserDatabase(Collections.singletonMap("olds",
-                    UaaUserTestFactory.getUser("12345", "olds", "olds@vmware.com", "Dale", "Olds")));
+    private InMemoryUaaUserDatabase userDatabase = new InMemoryUaaUserDatabase(Collections.singleton(UaaUserTestFactory.getUser("12345", "olds", "olds@vmware.com", "Dale", "Olds")));
 
     public UserInfoEndpointTests() {
         endpoint.setUserDatabase(userDatabase);

server/src/test/java/org/cloudfoundry/identity/uaa/user/InMemoryUaaUserDatabaseTests.java

@@ -6,6 +6,7 @@
 import org.junit.Test;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -19,9 +20,7 @@ public class InMemoryUaaUserDatabaseTests {
     InMemoryUaaUserDatabase db;
     @Before
     public void setUp() {
-        Map<String, UaaUser> users = new HashMap<>();
-        users.put(user.getUsername(), user);
-        db = new InMemoryUaaUserDatabase(users);
+        db = new InMemoryUaaUserDatabase(Collections.singleton(user));
     }
 
 

server/src/test/java/org/cloudfoundry/identity/uaa/user/MockUaaUserDatabase.java

@@ -16,61 +16,20 @@
 import org.cloudfoundry.identity.uaa.zone.IdentityZoneHolder;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 
+import java.util.Collections;
 import java.util.Date;
 
 /**
  * @author Luke Taylor
  */
-public class MockUaaUserDatabase implements UaaUserDatabase {
-    UaaUser user;
+public class MockUaaUserDatabase extends InMemoryUaaUserDatabase {
 
     public MockUaaUserDatabase(String id, String name, String email, String givenName, String familyName) {
-        user = new UaaUser(id, name, "", email, UaaAuthority.USER_AUTHORITIES, givenName, familyName,
-                        new Date(), new Date(), OriginKeys.UAA, "externalId", false, IdentityZoneHolder.get().getId(), id, new Date());
-    }
-
-    public MockUaaUserDatabase(String id, String name, String email, String givenName, String familyName,
-                    Date createdAt, Date updatedAt) {
-        user = new UaaUser(id, name, "", email, UaaAuthority.USER_AUTHORITIES, givenName, familyName,
-                        createdAt, updatedAt, OriginKeys.UAA, "externalId", false, IdentityZoneHolder.get().getId(), id, new Date());
-    }
-
-    @Override
-    public UaaUser retrieveUserByName(String username, String origin) throws UsernameNotFoundException {
-        if (user.getUsername().equals(username) && user.getOrigin().equals(origin)) {
-            return user;
-        }
-        else {
-            throw new UsernameNotFoundException(username);
-        }
+        super(Collections.singleton(createUser(id, name, email, givenName, familyName)));
     }
 
-    @Override
-    public UaaUser retrieveUserById(String id) throws UsernameNotFoundException {
-        if (user.getId().equals(id)) {
-            return user;
-        }
-        else {
-            throw new UsernameNotFoundException(id);
-        }
-    }
-
-    @Override
-    public UaaUser retrieveUserByEmail(String email, String origin) throws UsernameNotFoundException {
-        if (email.equals(user.getEmail()) && origin.equals(user.getOrigin())) {
-            return user;
-        }
-        else {
-            throw new UsernameNotFoundException(email);
-        }
-    }
-
-    public UaaUser updateUser(String userId, UaaUser user) throws UsernameNotFoundException {
-        if (user.getId().equals(userId)) {
-            this.user = user;
-            return user;
-        } else {
-            throw new UsernameNotFoundException(userId);
-        }
+    private static UaaUser createUser(String id, String name, String email, String givenName, String familyName) {
+        return new UaaUser(id, name, "", email, UaaAuthority.USER_AUTHORITIES, givenName, familyName,
+                        new Date(), new Date(), OriginKeys.UAA, "externalId", false, IdentityZoneHolder.get().getId(), id, new Date());
     }
 }