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

DATAREDIS-824 - Polishing.

Browse Source 
Split and add integration tests.

Original Pull Request: #340
This commit is contained in:
Christoph Strobl
2018-05-04 13:05:46 +02:00
parent 2c1ee77b87
commit 90f0685cb7
2 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/springframework/data/redis/core/DefaultReactiveHashOperations.java
View File

@@ -265,7 +265,7 @@ class DefaultReactiveHashOperations<H, HK, HV> implements ReactiveHashOperations
@SuppressWarnings("unchecked")
private HV readHashValue(ByteBuffer value) {
return (HV) serializationContext.getHashValueSerializationPair().read(value);
return (HV) (value == null ? value : serializationContext.getHashValueSerializationPair().read(value));
}
private Map.Entry<HK, HV> deserializeHashEntry(Map.Entry<ByteBuffer, ByteBuffer> source) {
@@ -277,7 +277,7 @@ class DefaultReactiveHashOperations<H, HK, HV> implements ReactiveHashOperations
List<HV> values = new ArrayList<>(source.size());
for (ByteBuffer byteBuffer : source) {
values.add(byteBuffer == null ? null : readHashValue(byteBuffer));
values.add(readHashValue(byteBuffer));
}
return values;
}

28
src/test/java/org/springframework/data/redis/core/DefaultReactiveHashOperationsIntegrationTests.java
View File

@@ -166,6 +166,13 @@ public class DefaultReactiveHashOperationsIntegrationTests<K, HK, HV> {
.verifyComplete();
}
@Test // DATAREDIS-824
public void getAbsentKey() {
hashOperations.get(keyFactory.instance(), hashKeyFactory.instance()).as(StepVerifier::create) //
.verifyComplete();
}
@Test // DATAREDIS-602
public void multiGet() {
@@ -178,21 +185,28 @@ public class DefaultReactiveHashOperationsIntegrationTests<K, HK, HV> {
HK hashkey2 = hashKeyFactory.instance();
HV hashvalue2 = hashValueFactory.instance();
StepVerifier.create(hashOperations.multiGet(key, Arrays.asList(hashkey1, hashkey2))) //
.consumeNextWith(actual -> {
assertThat(actual).hasSize(2).containsSequence(null, null);
}) //
.verifyComplete();
putAll(key, hashkey1, hashvalue1, hashkey2, hashvalue2);
StepVerifier.create(hashOperations.multiGet(key, Arrays.asList(hashkey1, hashkey2))) //
hashOperations.multiGet(key, Arrays.asList(hashkey1, hashkey2)).as(StepVerifier::create) //
.consumeNextWith(actual -> {
assertThat(actual).hasSize(2).containsSequence(hashvalue1, hashvalue2);
}) //
.verifyComplete();
}
@Test // DATAREDIS-824
public void multiGetAbsentKeys() {
assumeTrue(hashKeyFactory instanceof StringObjectFactory && hashValueFactory instanceof StringObjectFactory);
hashOperations.multiGet(keyFactory.instance(), Arrays.asList(hashKeyFactory.instance(), hashKeyFactory.instance()))
.as(StepVerifier::create) //
.consumeNextWith(actual -> {
assertThat(actual).hasSize(2).containsSequence(null, null);
}) //
.verifyComplete();
}
@Test // DATAREDIS-602
public void increment() {