Spring/spring-data-redis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAREDIS-1082 - Polishing.

Browse Source 
Tweak documentation wording. Remove trailing whitespaces. Remove unused methods. Improve method names. Return zero stats when stats do not get collected.

Original Pull Request: #545
This commit is contained in:
Mark Paluch
2020-07-10 14:26:41 +02:00
committed by Christoph Strobl
parent 72c20447b8
commit 1ceb7d4c8b
15 changed files with 119 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/java/org/springframework/data/redis/cache/DefaultCacheStatisticsCollectorUnitTests.java vendored
View File

@@ -21,6 +21,8 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
/**
* Unit tests for {@link DefaultCacheStatisticsCollector}.
*
* @author Christoph Strobl
*/
class DefaultCacheStatisticsCollectorUnitTests {

26
src/test/java/org/springframework/data/redis/cache/DefaultRedisCacheWriterTests.java vendored
View File

@@ -90,7 +90,8 @@ public class DefaultRedisCacheWriterTests {
@Test // DATAREDIS-481, DATAREDIS-1082
public void putShouldAddEternalEntry() {
RedisCacheWriter writer = nonLockingRedisCacheWriter(connectionFactory).with(CacheStatisticsCollector.instance());
RedisCacheWriter writer = nonLockingRedisCacheWriter(connectionFactory)
.withStatisticsCollector(CacheStatisticsCollector.create());
writer.put(CACHE_NAME, binaryCacheKey, binaryCacheValue, Duration.ZERO);
doWithConnection(connection -> {
@@ -147,7 +148,8 @@ public class DefaultRedisCacheWriterTests {
doWithConnection(connection -> connection.set(binaryCacheKey, binaryCacheValue));
RedisCacheWriter writer = nonLockingRedisCacheWriter(connectionFactory).with(CacheStatisticsCollector.instance());
RedisCacheWriter writer = nonLockingRedisCacheWriter(connectionFactory)
.withStatisticsCollector(CacheStatisticsCollector.create());
assertThat(writer.get(CACHE_NAME, binaryCacheKey))
.isEqualTo(binaryCacheValue);
@@ -164,7 +166,8 @@ public class DefaultRedisCacheWriterTests {
@Test // DATAREDIS-481, DATAREDIS-1082
public void putIfAbsentShouldAddEternalEntryWhenKeyDoesNotExist() {
RedisCacheWriter writer = nonLockingRedisCacheWriter(connectionFactory).with(CacheStatisticsCollector.instance());
RedisCacheWriter writer = nonLockingRedisCacheWriter(connectionFactory)
.withStatisticsCollector(CacheStatisticsCollector.create());
assertThat(writer.putIfAbsent(CACHE_NAME, binaryCacheKey, binaryCacheValue,
Duration.ZERO)).isNull();
@@ -180,7 +183,8 @@ public class DefaultRedisCacheWriterTests {
doWithConnection(connection -> connection.set(binaryCacheKey, binaryCacheValue));
RedisCacheWriter writer = nonLockingRedisCacheWriter(connectionFactory).with(CacheStatisticsCollector.instance());
RedisCacheWriter writer = nonLockingRedisCacheWriter(connectionFactory)
.withStatisticsCollector(CacheStatisticsCollector.create());
assertThat(writer.putIfAbsent(CACHE_NAME, binaryCacheKey, "foo".getBytes(), Duration.ZERO))
.isEqualTo(binaryCacheValue);
@@ -194,7 +198,8 @@ public class DefaultRedisCacheWriterTests {
@Test // DATAREDIS-481, DATAREDIS-1082
public void putIfAbsentShouldAddExpiringEntryWhenKeyDoesNotExist() {
RedisCacheWriter writer = nonLockingRedisCacheWriter(connectionFactory).with(CacheStatisticsCollector.instance());
RedisCacheWriter writer = nonLockingRedisCacheWriter(connectionFactory)
.withStatisticsCollector(CacheStatisticsCollector.create());
assertThat(writer.putIfAbsent(CACHE_NAME, binaryCacheKey, binaryCacheValue, Duration.ofSeconds(5))).isNull();
doWithConnection(connection -> {
@@ -208,7 +213,8 @@ public class DefaultRedisCacheWriterTests {
doWithConnection(connection -> connection.set(binaryCacheKey, binaryCacheValue));
RedisCacheWriter writer = nonLockingRedisCacheWriter(connectionFactory).with(CacheStatisticsCollector.instance());
RedisCacheWriter writer = nonLockingRedisCacheWriter(connectionFactory)
.withStatisticsCollector(CacheStatisticsCollector.create());
writer.remove(CACHE_NAME, binaryCacheKey);
doWithConnection(connection -> assertThat(connection.exists(binaryCacheKey)).isFalse());
@@ -223,7 +229,8 @@ public class DefaultRedisCacheWriterTests {
connection.set("foo".getBytes(), "bar".getBytes());
});
RedisCacheWriter writer = nonLockingRedisCacheWriter(connectionFactory).with(CacheStatisticsCollector.instance());
RedisCacheWriter writer = nonLockingRedisCacheWriter(connectionFactory)
.withStatisticsCollector(CacheStatisticsCollector.create());
writer.clean(CACHE_NAME, (CACHE_NAME + "::*").getBytes(Charset.forName("UTF-8")));
doWithConnection(connection -> {
@@ -261,7 +268,8 @@ public class DefaultRedisCacheWriterTests {
@Test // DATAREDIS-481, DATAREDIS-1082
public void lockingCacheWriterShouldWaitForLockRelease() throws InterruptedException {
DefaultRedisCacheWriter writer = (DefaultRedisCacheWriter) lockingRedisCacheWriter(connectionFactory).with(CacheStatisticsCollector.instance());
DefaultRedisCacheWriter writer = (DefaultRedisCacheWriter) lockingRedisCacheWriter(connectionFactory)
.withStatisticsCollector(CacheStatisticsCollector.create());
writer.lock(CACHE_NAME);
CountDownLatch beforeWrite = new CountDownLatch(1);
@@ -347,7 +355,7 @@ public class DefaultRedisCacheWriterTests {
cw.putIfAbsent(CACHE_NAME, binaryCacheKey, binaryCacheValue, Duration.ofSeconds(5));
assertThat(stats).isNotNull();
assertThat(stats.getPuts()).isNegative();
assertThat(stats.getPuts()).isZero();
}
private void doWithConnection(Consumer<RedisConnection> callback) {

2
src/test/java/org/springframework/data/redis/cache/MutableCacheStatisticsUnitTests.java vendored
View File

@@ -73,7 +73,7 @@ class MutableCacheStatisticsUnitTests {
assertThat(statistics.getDeletes()).isZero();
statistics.incDeletes();
statistics.incDeletes(1);
assertThat(statistics.getDeletes()).isOne();
}

6
src/test/java/org/springframework/data/redis/cache/RedisCacheManagerUnitTests.java vendored
View File

@@ -175,10 +175,10 @@ class RedisCacheManagerUnitTests {
@Test // DATAREDIS-1082
void builderSetsStatisticsCollectorWhenEnabled() {
when(cacheWriter.with(any())).thenReturn(cacheWriter);
when(cacheWriter.withStatisticsCollector(any())).thenReturn(cacheWriter);
RedisCacheManager.builder(cacheWriter).enableStatistics().build();
verify(cacheWriter).with(any(DefaultCacheStatisticsCollector.class));
verify(cacheWriter).withStatisticsCollector(any(DefaultCacheStatisticsCollector.class));
}
@Test // DATAREDIS-1082
@@ -186,6 +186,6 @@ class RedisCacheManagerUnitTests {
RedisCacheManager.builder(cacheWriter).build();
verify(cacheWriter, never()).with(any());
verify(cacheWriter, never()).withStatisticsCollector(any());
}
}