mindol1004/spring-session
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unnecessary Redis commands in RedisIndexedSessionRepository#save

Browse Source 
See: #1331
This commit is contained in:
Vedran Pavic
2020-10-01 18:44:36 +02:00
committed by Eleftheria Stein-Kousathana
parent 090a10fb10
commit 301e65c2b9
2 changed files with 3 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/RedisIndexedSessionRepositoryITests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2014-2019 the original author or authors. * Copyright 2014-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@ package org.springframework.session.data.redis;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.UUID; import java.util.UUID;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
@@ -135,22 +134,6 @@ class RedisIndexedSessionRepositoryITests extends AbstractRedisITests {
.isEqualTo(expectedAttributeValue); .isEqualTo(expectedAttributeValue);
} }
@Test
void removeAttributeRemovedAttributeKey() {
RedisSession toSave = this.repository.createSession();
toSave.setAttribute("a", "b");
this.repository.save(toSave);
toSave.removeAttribute("a");
this.repository.save(toSave);
String id = toSave.getId();
String key = "RedisIndexedSessionRepositoryITests:sessions:" + id;
Set<Map.Entry<Object, Object>> entries = this.redis.boundHashOps(key).entries().entrySet();
assertThat(entries).extracting(Map.Entry::getKey).doesNotContain("sessionAttr:a");
}
@Test @Test
void putAllOnSingleAttrDoesNotRemoveOld() { void putAllOnSingleAttrDoesNotRemoveOld() {
RedisSession toSave = this.repository.createSession(); RedisSession toSave = this.repository.createSession();

10
spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisIndexedSessionRepository.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2014-2019 the original author or authors. * Copyright 2014-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -792,8 +792,7 @@ public class RedisIndexedSessionRepository
return; return;
} }
String sessionId = getId(); String sessionId = getId();
BoundHashOperations<Object, Object, Object> boundHashOperations = getSessionBoundHashOperations(sessionId); getSessionBoundHashOperations(sessionId).putAll(this.delta);
boundHashOperations.putAll(this.delta);
String principalSessionKey = getSessionAttrNameKey( String principalSessionKey = getSessionAttrNameKey(
FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME); FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME);
String securityPrincipalSessionKey = getSessionAttrNameKey(SPRING_SECURITY_CONTEXT); String securityPrincipalSessionKey = getSessionAttrNameKey(SPRING_SECURITY_CONTEXT);
@@ -812,11 +811,6 @@ public class RedisIndexedSessionRepository
.add(sessionId); .add(sessionId);
} }
} }
for (final Map.Entry<String, Object> attribute : this.delta.entrySet()) {
if (attribute.getValue() == null) {
boundHashOperations.delete(attribute.getKey());
}
}
this.delta = new HashMap<>(this.delta.size()); this.delta = new HashMap<>(this.delta.size());