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

DATAREDIS-492 - Polishing.

Browse Source 
Added some more tests and fix read operation.

Original Pull Request: #189
This commit is contained in:
Christoph Strobl
2016-04-15 09:23:23 +02:00
parent 2492fbe332
commit 14e44880c7
3 changed files with 148 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/test/java/org/springframework/data/redis/core/convert/ConversionTestEntities.java
View File

@@ -160,4 +160,11 @@ public class ConversionTestEntities {
int length;
}
public static class WithArrays {
Object[] arrayOfObject;
String[] arrayOfSimpleTypes;
Species[] arrayOfCompexTypes;
}
}

130
src/test/java/org/springframework/data/redis/core/convert/MappingRedisConverterUnitTests.java
View File

@@ -47,6 +47,7 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
import org.hamcrest.core.IsEqual;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -66,6 +67,7 @@ import org.springframework.data.redis.core.convert.ConversionTestEntities.Person
import org.springframework.data.redis.core.convert.ConversionTestEntities.Species;
import org.springframework.data.redis.core.convert.ConversionTestEntities.TaVeren;
import org.springframework.data.redis.core.convert.ConversionTestEntities.TheWheelOfTime;
import org.springframework.data.redis.core.convert.ConversionTestEntities.WithArrays;
import org.springframework.data.redis.core.convert.KeyspaceConfiguration.KeyspaceSettings;
import org.springframework.data.redis.core.mapping.RedisMappingContext;
import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
@@ -437,27 +439,6 @@ public class MappingRedisConverterUnitTests {
.containingUtf8String("physicalAttributes.[eye-color]", "grey"));
}
/**
* @see DATAREDIS-492
*/
@Test
public void writeHandlesArraysProperly() {
this.converter = new MappingRedisConverter(null, null, resolverMock);
this.converter
.setCustomConversions(new CustomConversions(Collections.singletonList(new ListToByteConverter())));
this.converter.afterPropertiesSet();
Map<String, Object> innerMap = new LinkedHashMap<String, Object>();
innerMap.put("address", "tyrionl@netflix.com");
innerMap.put("when", new String[]{"pipeline.failed"});
Map<String, Object> map = new LinkedHashMap<String, Object>();
map.put("email", Collections.singletonList(innerMap));
RedisData target = write(map);
}
/**
* @see DATAREDIS-425
*/
@@ -1348,6 +1329,104 @@ public class MappingRedisConverterUnitTests {
assertThat(target.species.get(0).name, is("trolloc"));
}
/**
* @see DATAREDIS-492
*/
@Test
public void writeHandlesArraysProperly() {
this.converter = new MappingRedisConverter(null, null, resolverMock);
this.converter.setCustomConversions(new CustomConversions(Collections.singletonList(new ListToByteConverter())));
this.converter.afterPropertiesSet();
Map<String, Object> innerMap = new LinkedHashMap<String, Object>();
innerMap.put("address", "tyrionl@netflix.com");
innerMap.put("when", new String[] { "pipeline.failed" });
Map<String, Object> map = new LinkedHashMap<String, Object>();
map.put("email", Collections.singletonList(innerMap));
RedisData target = write(map);
}
/**
* @see DATAREDIS-492
*/
@Test
public void writeHandlesArraysOfSimpleTypeProperly() {
WithArrays source = new WithArrays();
source.arrayOfSimpleTypes = new String[] { "rand", "mat", "perrin" };
assertThat(write(source).getBucket(),
isBucket().containingUtf8String("arrayOfSimpleTypes.[0]", "rand")
.containingUtf8String("arrayOfSimpleTypes.[1]", "mat")
.containingUtf8String("arrayOfSimpleTypes.[2]", "perrin"));
}
/**
* @see DATAREDIS-492
*/
@Test
public void readHandlesArraysOfSimpleTypeProperly() {
Map<String, String> source = new LinkedHashMap<String, String>();
source.put("arrayOfSimpleTypes.[0]", "rand");
source.put("arrayOfSimpleTypes.[1]", "mat");
source.put("arrayOfSimpleTypes.[2]", "perrin");
WithArrays target = read(WithArrays.class, source);
assertThat(target.arrayOfSimpleTypes, IsEqual.equalTo(new String[] { "rand", "mat", "perrin" }));
}
/**
* @see DATAREDIS-492
*/
@Test
public void writeHandlesArraysOfComplexTypeProperly() {
WithArrays source = new WithArrays();
Species trolloc = new Species();
trolloc.name = "trolloc";
Species myrddraal = new Species();
myrddraal.name = "myrddraal";
myrddraal.alsoKnownAs = Arrays.asList("halfmen", "fades", "neverborn");
source.arrayOfCompexTypes = new Species[] { trolloc, myrddraal };
assertThat(write(source).getBucket(),
isBucket().containingUtf8String("arrayOfCompexTypes.[0].name", "trolloc") //
.containingUtf8String("arrayOfCompexTypes.[1].name", "myrddraal") //
.containingUtf8String("arrayOfCompexTypes.[1].alsoKnownAs.[0]", "halfmen") //
.containingUtf8String("arrayOfCompexTypes.[1].alsoKnownAs.[1]", "fades") //
.containingUtf8String("arrayOfCompexTypes.[1].alsoKnownAs.[2]", "neverborn"));
}
/**
* @see DATAREDIS-492
*/
@Test
public void readHandlesArraysOfComplexTypeProperly() {
Map<String, String> source = new LinkedHashMap<String, String>();
source.put("arrayOfCompexTypes.[0].name", "trolloc");
source.put("arrayOfCompexTypes.[1].name", "myrddraal");
source.put("arrayOfCompexTypes.[1].alsoKnownAs.[0]", "halfmen");
source.put("arrayOfCompexTypes.[1].alsoKnownAs.[1]", "fades");
source.put("arrayOfCompexTypes.[1].alsoKnownAs.[2]", "neverborn");
WithArrays target = read(WithArrays.class, source);
assertThat(target.arrayOfCompexTypes[0], notNullValue());
assertThat(target.arrayOfCompexTypes[0].name, is("trolloc"));
assertThat(target.arrayOfCompexTypes[1], notNullValue());
assertThat(target.arrayOfCompexTypes[1].name, is("myrddraal"));
assertThat(target.arrayOfCompexTypes[1].alsoKnownAs, contains("halfmen", "fades", "neverborn"));
}
private RedisData write(Object source) {
RedisData rdo = new RedisData();
@@ -1355,6 +1434,10 @@ public class MappingRedisConverterUnitTests {
return rdo;
}
private <T> T read(Class<T> type, Map<String, String> source) {
return converter.read(type, new RedisData(Bucket.newBucketFromStringMap(source)));
}
@WritingConverter
static class AddressToBytesConverter implements Converter<Address, byte[]> {
@@ -1408,8 +1491,8 @@ public class MappingRedisConverterUnitTests {
mapper = new ObjectMapper();
mapper.setVisibility(mapper.getSerializationConfig().getDefaultVisibilityChecker()
.withFieldVisibility(Visibility.ANY).withGetterVisibility(Visibility.NONE)
.withSetterVisibility(Visibility.NONE).withCreatorVisibility(Visibility.NONE));
.withFieldVisibility(Visibility.ANY).withGetterVisibility(Visibility.NONE)
.withSetterVisibility(Visibility.NONE).withCreatorVisibility(Visibility.NONE));
serializer = new Jackson2JsonRedisSerializer<List>(List.class);
serializer.setObjectMapper(mapper);
@@ -1426,7 +1509,6 @@ public class MappingRedisConverterUnitTests {
}
}
@ReadingConverter
static class MapToSpeciesConverter implements Converter<Map<String, byte[]>, Species> {