move list to set

fix test code

Author: charsyam

spring-security-oauth2/src/main/java/org/springframework/security/oauth2/provider/token/store/redis/RedisTokenStore.java

@@ -2,6 +2,8 @@
 
 import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.Cursor;
+import org.springframework.data.redis.core.ScanOptions;
 import org.springframework.security.oauth2.common.ExpiringOAuth2RefreshToken;
 import org.springframework.security.oauth2.common.OAuth2AccessToken;
 import org.springframework.security.oauth2.common.OAuth2RefreshToken;
@@ -188,9 +190,9 @@ public void storeAccessToken(OAuth2AccessToken token, OAuth2Authentication authe
 				conn.set(authToAccessKey, serializedAccessToken);
 			}
 			if (!authentication.isClientOnly()) {
-				conn.rPush(approvalKey, serializedAccessToken);
+				conn.sAdd(approvalKey, serializedAccessToken);
 			}
-			conn.rPush(clientId, serializedAccessToken);
+			conn.sAdd(clientId, serializedAccessToken);
 			if (token.getExpiration() != null) {
 				int seconds = token.getExpiresIn();
 				conn.expire(accessKey, seconds);
@@ -287,8 +289,8 @@ public void removeAccessToken(String tokenValue) {
 				byte[] clientId = serializeKey(CLIENT_ID_TO_ACCESS + authentication.getOAuth2Request().getClientId());
 				conn.openPipeline();
 				conn.del(authToAccessKey);
-				conn.lRem(unameKey, 1, access);
-				conn.lRem(clientId, 1, access);
+				conn.sRem(unameKey, access);
+				conn.sRem(clientId, access);
 				conn.del(serialize(ACCESS + key));
 				conn.closePipeline();
 			}
@@ -396,13 +398,24 @@ private void removeAccessTokenUsingRefreshToken(String refreshToken) {
 		}
 	}
 
+	private List<byte[]> getByteLists(byte[] approvalKey, RedisConnection conn) {
+		List<byte[]> byteList;
+		Long size = conn.sCard(approvalKey);
+		byteList = new ArrayList<byte[]>(size.intValue());
+		Cursor<byte[]> cursor = conn.sScan(approvalKey, ScanOptions.NONE);
+		while(cursor.hasNext()) {
+			byteList.add(cursor.next());
+		}
+		return byteList;
+	}
+
 	@Override
 	public Collection<OAuth2AccessToken> findTokensByClientIdAndUserName(String clientId, String userName) {
 		byte[] approvalKey = serializeKey(UNAME_TO_ACCESS + getApprovalKey(clientId, userName));
 		List<byte[]> byteList = null;
 		RedisConnection conn = getConnection();
 		try {
-			byteList = conn.lRange(approvalKey, 0, -1);
+			byteList = getByteLists(approvalKey, conn);
 		} finally {
 			conn.close();
 		}
@@ -423,7 +436,7 @@ public Collection<OAuth2AccessToken> findTokensByClientId(String clientId) {
 		List<byte[]> byteList = null;
 		RedisConnection conn = getConnection();
 		try {
-			byteList = conn.lRange(key, 0, -1);
+			byteList = getByteLists(key, conn);
 		} finally {
 			conn.close();
 		}

spring-security-oauth2/src/test/java/org/springframework/security/oauth2/provider/token/store/redis/RedisTokenStoreMockTests.java

@@ -93,16 +93,16 @@ public void storeAccessTokenWithoutRefreshTokenRemoveAccessTokenVerifyKeysRemove
 		ArgumentCaptor<byte[]> setKeyArgs = ArgumentCaptor.forClass(byte[].class);
 		verify(connection, times(3)).set(setKeyArgs.capture(), any(byte[].class));
 
-		ArgumentCaptor<byte[]> rPushKeyArgs = ArgumentCaptor.forClass(byte[].class);
-		verify(connection, times(2)).rPush(rPushKeyArgs.capture(), any(byte[].class));
+		ArgumentCaptor<byte[]> sAddKeyArgs = ArgumentCaptor.forClass(byte[].class);
+		verify(connection, times(2)).sAdd(sAddKeyArgs.capture(), any(byte[].class));
 
 		tokenStore.removeAccessToken(oauth2AccessToken);
 
 		for (byte[] key : setKeyArgs.getAllValues()) {
 			verify(connection).del(key);
 		}
-		for (byte[] key : rPushKeyArgs.getAllValues()) {
-			verify(connection).lRem(eq(key), eq(1L), any(byte[].class));
+		for (byte[] key : sAddKeyArgs.getAllValues()) {
+			verify(connection).sRem(eq(key), any(byte[].class));
 		}
 	}