Align type of UserInfo with what is in the custom attributes

cloudfoundry · Dec 16, 2016 · e16caa5 · e16caa5
1 parent 8b02b30
commit e16caa5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/user/JdbcUaaUserDatabase.java b/server/src/main/java/org/cloudfoundry/identity/uaa/user/JdbcUaaUserDatabase.java
@@ -142,7 +142,6 @@ public UserInfo storeUserInfo(String id, UserInfo info) {
         if (info == null) {
             info = new UserInfo();
         }
-        info.setUserId(id);
         jdbcTemplate.update(insertUserInfoSQL, id, JsonUtils.writeValueAsString(info));
         return getUserInfo(id);
     }

diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/user/UserInfo.java b/server/src/main/java/org/cloudfoundry/identity/uaa/user/UserInfo.java
@@ -16,18 +16,24 @@
 package org.cloudfoundry.identity.uaa.user;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.springframework.util.LinkedMultiValueMap;
 
-import java.util.HashMap;
+import java.util.Arrays;
 
-public class UserInfo extends HashMap<String,Object> {
+public class UserInfo extends LinkedMultiValueMap<String,String> {
     @JsonIgnore
     public String getUserId() {
-        return (String) get("user_id");
+        return (String) getFirst("user_id");
     }
 
     @JsonIgnore
     public void setUserId(String id) {
-        put("user_id", id);
+        put("user_id", Arrays.asList(id));
+    }
+
+    @JsonIgnore
+    public void put(String name, String value) {
+        put(name, Arrays.asList(value));
     }
 
 

diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/user/JdbcUaaUserDatabaseTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/user/JdbcUaaUserDatabaseTests.java
@@ -133,7 +133,6 @@ public void testStoreUserInfoOverridesID() {
         info.setUserId(id);
         info.put("family_name","Somelastname");
         info.put("given_name","Somefirstname");
-        info.put("some int", 4);
         db.storeUserInfo(id1, info);
         UserInfo info2 = db.getUserInfo(id1);
         info.setUserId(id1);
@@ -148,7 +147,6 @@ public void testStoreUserInfo() {
         info.setUserId(id);
         info.put("family_name","Somelastname");
         info.put("given_name","Somefirstname");
-        info.put("some int", 4);
         db.storeUserInfo(id, info);
         UserInfo info2 = db.getUserInfo(id);
         assertEquals(info, info2);