From c6c6beb40ca3fa380003756f0e55ad3f822740bc Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Thu, 22 Jun 2017 21:24:20 -0500 Subject: [PATCH] Session.delete -> deleteById Fixes gh-809 --- .../src/main/java/sample/mvc/IndexController.java | 2 +- .../org/springframework/session/MapSessionRepository.java | 4 ++-- .../org/springframework/session/SessionRepository.java | 2 +- .../session/web/http/SessionRepositoryFilter.java | 4 ++-- .../redis/RedisOperationsSessionRepositoryITests.java | 8 ++++---- .../data/redis/RedisOperationsSessionRepository.java | 2 +- .../data/redis/RedisOperationsSessionRepositoryTests.java | 4 ++-- .../hazelcast/AbstractHazelcastRepositoryITests.java | 2 +- .../web/http/EnableHazelcastHttpSessionEventsTests.java | 2 +- .../session/hazelcast/HazelcastSessionRepository.java | 4 ++-- .../hazelcast/HazelcastSessionRepositoryTests.java | 2 +- .../AbstractJdbcOperationsSessionRepositoryITests.java | 8 ++++---- .../session/jdbc/JdbcOperationsSessionRepository.java | 4 ++-- .../jdbc/JdbcOperationsSessionRepositoryTests.java | 2 +- 14 files changed, 25 insertions(+), 25 deletions(-) diff --git a/samples/boot/findbyusername/src/main/java/sample/mvc/IndexController.java b/samples/boot/findbyusername/src/main/java/sample/mvc/IndexController.java index ce15b9f1..944590d8 100644 --- a/samples/boot/findbyusername/src/main/java/sample/mvc/IndexController.java +++ b/samples/boot/findbyusername/src/main/java/sample/mvc/IndexController.java @@ -60,7 +60,7 @@ public class IndexController { FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME, principal.getName()).keySet(); if (usersSessionIds.contains(sessionIdToDelete)) { - this.sessions.delete(sessionIdToDelete); + this.sessions.deleteById(sessionIdToDelete); } return "redirect:/"; diff --git a/spring-session-core/src/main/java/org/springframework/session/MapSessionRepository.java b/spring-session-core/src/main/java/org/springframework/session/MapSessionRepository.java index b3f1d712..71bfe759 100644 --- a/spring-session-core/src/main/java/org/springframework/session/MapSessionRepository.java +++ b/spring-session-core/src/main/java/org/springframework/session/MapSessionRepository.java @@ -87,13 +87,13 @@ public class MapSessionRepository implements SessionRepository { return null; } if (saved.isExpired()) { - delete(saved.getId()); + deleteById(saved.getId()); return null; } return new MapSession(saved); } - public void delete(String id) { + public void deleteById(String id) { this.sessions.remove(id); } diff --git a/spring-session-core/src/main/java/org/springframework/session/SessionRepository.java b/spring-session-core/src/main/java/org/springframework/session/SessionRepository.java index b95cd169..b2233925 100644 --- a/spring-session-core/src/main/java/org/springframework/session/SessionRepository.java +++ b/spring-session-core/src/main/java/org/springframework/session/SessionRepository.java @@ -69,5 +69,5 @@ public interface SessionRepository { * if the {@link Session} is not found. * @param id the {@link org.springframework.session.Session#getId()} to delete */ - void delete(String id); + void deleteById(String id); } diff --git a/spring-session-core/src/main/java/org/springframework/session/web/http/SessionRepositoryFilter.java b/spring-session-core/src/main/java/org/springframework/session/web/http/SessionRepositoryFilter.java index 41d05f03..221183f1 100644 --- a/spring-session-core/src/main/java/org/springframework/session/web/http/SessionRepositoryFilter.java +++ b/spring-session-core/src/main/java/org/springframework/session/web/http/SessionRepositoryFilter.java @@ -284,7 +284,7 @@ public class SessionRepositoryFilter attrs.put(attrName, value); } - SessionRepositoryFilter.this.sessionRepository.delete(session.getId()); + SessionRepositoryFilter.this.sessionRepository.deleteById(session.getId()); HttpSessionWrapper original = getCurrentSession(); setCurrentSession(null); @@ -413,7 +413,7 @@ public class SessionRepositoryFilter super.invalidate(); SessionRepositoryRequestWrapper.this.requestedSessionInvalidated = true; setCurrentSession(null); - SessionRepositoryFilter.this.sessionRepository.delete(getId()); + SessionRepositoryFilter.this.sessionRepository.deleteById(getId()); } } } diff --git a/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/RedisOperationsSessionRepositoryITests.java b/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/RedisOperationsSessionRepositoryITests.java index abeea1d6..e7e78df7 100644 --- a/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/RedisOperationsSessionRepositoryITests.java +++ b/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/RedisOperationsSessionRepositoryITests.java @@ -92,7 +92,7 @@ public class RedisOperationsSessionRepositoryITests extends AbstractITests { this.registry.clear(); - this.repository.delete(toSave.getId()); + this.repository.deleteById(toSave.getId()); assertThat(this.repository.findById(toSave.getId())).isNull(); assertThat(this.registry.getEvent(toSave.getId())) @@ -123,7 +123,7 @@ public class RedisOperationsSessionRepositoryITests extends AbstractITests { assertThat(session.getAttribute("a")).isEqualTo(Optional.of("b")); assertThat(session.getAttribute("1")).isEqualTo(Optional.of("2")); - this.repository.delete(toSave.getId()); + this.repository.deleteById(toSave.getId()); } @Test @@ -140,7 +140,7 @@ public class RedisOperationsSessionRepositoryITests extends AbstractITests { assertThat(findByPrincipalName).hasSize(1); assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId()); - this.repository.delete(toSave.getId()); + this.repository.deleteById(toSave.getId()); assertThat(this.registry.receivedEvent(toSave.getId())).isTrue(); findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME, @@ -310,7 +310,7 @@ public class RedisOperationsSessionRepositoryITests extends AbstractITests { assertThat(findByPrincipalName).hasSize(1); assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId()); - this.repository.delete(toSave.getId()); + this.repository.deleteById(toSave.getId()); assertThat(this.registry.receivedEvent(toSave.getId())).isTrue(); findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME, diff --git a/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisOperationsSessionRepository.java b/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisOperationsSessionRepository.java index ed717a21..eb4a1449 100644 --- a/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisOperationsSessionRepository.java +++ b/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisOperationsSessionRepository.java @@ -466,7 +466,7 @@ public class RedisOperationsSessionRepository implements return loaded; } - public void delete(String sessionId) { + public void deleteById(String sessionId) { RedisSession session = getSession(sessionId, true); if (session == null) { return; diff --git a/spring-session-data-redis/src/test/java/org/springframework/session/data/redis/RedisOperationsSessionRepositoryTests.java b/spring-session-data-redis/src/test/java/org/springframework/session/data/redis/RedisOperationsSessionRepositoryTests.java index 85449223..e6af9bd0 100644 --- a/spring-session-data-redis/src/test/java/org/springframework/session/data/redis/RedisOperationsSessionRepositoryTests.java +++ b/spring-session-data-redis/src/test/java/org/springframework/session/data/redis/RedisOperationsSessionRepositoryTests.java @@ -344,7 +344,7 @@ public class RedisOperationsSessionRepositoryTests { .willReturn(this.boundSetOperations); String id = expected.getId(); - this.redisRepository.delete(id); + this.redisRepository.deleteById(id); assertThat(getDelta().get(RedisOperationsSessionRepository.MAX_INACTIVE_ATTR)) .isEqualTo(0); @@ -358,7 +358,7 @@ public class RedisOperationsSessionRepositoryTests { .willReturn(this.boundHashOperations); String id = "abc"; - this.redisRepository.delete(id); + this.redisRepository.deleteById(id); verify(this.redisOperations, times(0)).delete(anyString()); verify(this.redisOperations, times(0)).delete(anyString()); } diff --git a/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/AbstractHazelcastRepositoryITests.java b/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/AbstractHazelcastRepositoryITests.java index 9cd1fea5..c7d536f8 100644 --- a/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/AbstractHazelcastRepositoryITests.java +++ b/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/AbstractHazelcastRepositoryITests.java @@ -55,7 +55,7 @@ public abstract class AbstractHazelcastRepositoryITests { assertThat(hazelcastMap.size()).isEqualTo(1); assertThat(hazelcastMap.get(sessionId)).isEqualTo(sessionToSave); - this.repository.delete(sessionId); + this.repository.deleteById(sessionId); assertThat(hazelcastMap.size()).isEqualTo(0); } diff --git a/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/config/annotation/web/http/EnableHazelcastHttpSessionEventsTests.java b/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/config/annotation/web/http/EnableHazelcastHttpSessionEventsTests.java index b87e7443..a932ddf5 100644 --- a/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/config/annotation/web/http/EnableHazelcastHttpSessionEventsTests.java +++ b/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/config/annotation/web/http/EnableHazelcastHttpSessionEventsTests.java @@ -135,7 +135,7 @@ public class EnableHazelcastHttpSessionEventsTests { .isInstanceOf(SessionCreatedEvent.class); this.registry.clear(); - this.repository.delete(sessionToSave.getId()); + this.repository.deleteById(sessionToSave.getId()); assertThat(this.registry.receivedEvent(sessionToSave.getId())).isTrue(); assertThat(this.registry.getEvent(sessionToSave.getId())) diff --git a/spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/HazelcastSessionRepository.java b/spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/HazelcastSessionRepository.java index 70eaa432..55bec963 100644 --- a/spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/HazelcastSessionRepository.java +++ b/spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/HazelcastSessionRepository.java @@ -217,13 +217,13 @@ public class HazelcastSessionRepository implements return null; } if (saved.isExpired()) { - delete(saved.getId()); + deleteById(saved.getId()); return null; } return new HazelcastSession(saved); } - public void delete(String id) { + public void deleteById(String id) { this.sessions.remove(id); } diff --git a/spring-session-hazelcast/src/test/java/org/springframework/session/hazelcast/HazelcastSessionRepositoryTests.java b/spring-session-hazelcast/src/test/java/org/springframework/session/hazelcast/HazelcastSessionRepositoryTests.java index 8a5c5ac6..6d273551 100644 --- a/spring-session-hazelcast/src/test/java/org/springframework/session/hazelcast/HazelcastSessionRepositoryTests.java +++ b/spring-session-hazelcast/src/test/java/org/springframework/session/hazelcast/HazelcastSessionRepositoryTests.java @@ -280,7 +280,7 @@ public class HazelcastSessionRepositoryTests { public void delete() { String sessionId = "testSessionId"; - this.repository.delete(sessionId); + this.repository.deleteById(sessionId); verify(this.sessions, times(1)).remove(eq(sessionId)); } diff --git a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/AbstractJdbcOperationsSessionRepositoryITests.java b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/AbstractJdbcOperationsSessionRepositoryITests.java index 6e18f7a9..1dcf5587 100644 --- a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/AbstractJdbcOperationsSessionRepositoryITests.java +++ b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/AbstractJdbcOperationsSessionRepositoryITests.java @@ -109,7 +109,7 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests { assertThat(session.getAttribute(expectedAttributeName)) .isEqualTo(toSave.getAttribute(expectedAttributeName)); - this.repository.delete(toSave.getId()); + this.repository.deleteById(toSave.getId()); assertThat(this.repository.findById(toSave.getId())).isNull(); } @@ -142,7 +142,7 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests { assertThat(session.getAttribute("a")).isEqualTo(Optional.of("b")); assertThat(session.getAttribute("1")).isEqualTo(Optional.of("2")); - this.repository.delete(toSave.getId()); + this.repository.deleteById(toSave.getId()); } @Test @@ -180,7 +180,7 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests { assertThat(findByPrincipalName).hasSize(1); assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId()); - this.repository.delete(toSave.getId()); + this.repository.deleteById(toSave.getId()); findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME, principalName); @@ -354,7 +354,7 @@ public abstract class AbstractJdbcOperationsSessionRepositoryITests { assertThat(findByPrincipalName).hasSize(1); assertThat(findByPrincipalName.keySet()).containsOnly(toSave.getId()); - this.repository.delete(toSave.getId()); + this.repository.deleteById(toSave.getId()); findByPrincipalName = this.repository.findByIndexNameAndIndexValue(INDEX_NAME, getSecurityName()); diff --git a/spring-session-jdbc/src/main/java/org/springframework/session/jdbc/JdbcOperationsSessionRepository.java b/spring-session-jdbc/src/main/java/org/springframework/session/jdbc/JdbcOperationsSessionRepository.java index 86c3c81a..b3bc40b0 100644 --- a/spring-session-jdbc/src/main/java/org/springframework/session/jdbc/JdbcOperationsSessionRepository.java +++ b/spring-session-jdbc/src/main/java/org/springframework/session/jdbc/JdbcOperationsSessionRepository.java @@ -476,7 +476,7 @@ public class JdbcOperationsSessionRepository implements if (session != null) { if (session.isExpired()) { - delete(id); + deleteById(id); } else { return new JdbcSession(session); @@ -485,7 +485,7 @@ public class JdbcOperationsSessionRepository implements return null; } - public void delete(final String id) { + public void deleteById(final String id) { this.transactionOperations.execute(new TransactionCallbackWithoutResult() { protected void doInTransactionWithoutResult(TransactionStatus status) { diff --git a/spring-session-jdbc/src/test/java/org/springframework/session/jdbc/JdbcOperationsSessionRepositoryTests.java b/spring-session-jdbc/src/test/java/org/springframework/session/jdbc/JdbcOperationsSessionRepositoryTests.java index 5675c16a..04a5d671 100644 --- a/spring-session-jdbc/src/test/java/org/springframework/session/jdbc/JdbcOperationsSessionRepositoryTests.java +++ b/spring-session-jdbc/src/test/java/org/springframework/session/jdbc/JdbcOperationsSessionRepositoryTests.java @@ -455,7 +455,7 @@ public class JdbcOperationsSessionRepositoryTests { public void delete() { String sessionId = "testSessionId"; - this.repository.delete(sessionId); + this.repository.deleteById(sessionId); assertPropagationRequiresNew(); verify(this.jdbcOperations, times(1)).update(startsWith("DELETE"), eq(sessionId));