DATAREDIS-423 - Add support for Jackson2 based HashMapper.
Added FasterXML Jackson `ObjectMapper` based `HashMapper` implementation that allows flattening.
```java
class Person {
String firstname;
String lastname;
Address address;
}
class Address {
String city;
String country;
}
```
```bash
firstname:Jon
lastname:Snow
address:{ city : Castle Black, country : The North }
firstname:Jon
lastname:Snow
address.city:Castle Black
address.country:The North
```
Original pull request: #197.
This commit is contained in:
Christoph Strobl
committed by
Mark Paluch
Mark Paluch
parent
b1a3559db1
commit
568e41f8dd
@@ -0,0 +1,99 @@
|
||||
/*
|
||||
* Copyright 2016 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package org.springframework.data.redis.mapping;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
|
||||
import org.hamcrest.core.Is;
|
||||
import org.junit.AfterClass;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.junit.runners.Parameterized;
|
||||
import org.junit.runners.Parameterized.Parameters;
|
||||
import org.springframework.beans.factory.InitializingBean;
|
||||
import org.springframework.data.redis.Address;
|
||||
import org.springframework.data.redis.ConnectionFactoryTracker;
|
||||
import org.springframework.data.redis.Person;
|
||||
import org.springframework.data.redis.connection.RedisConnectionFactory;
|
||||
import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
|
||||
import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
|
||||
import org.springframework.data.redis.core.RedisTemplate;
|
||||
import org.springframework.data.redis.hash.Jackson2HashMapper;
|
||||
|
||||
/**
|
||||
* Integration tests for {@link Jackson2HashMapper}.
|
||||
*
|
||||
* @author Christoph Strobl
|
||||
*/
|
||||
@RunWith(Parameterized.class)
|
||||
public class Jackson2HashMapperTests {
|
||||
|
||||
RedisTemplate<String, Object> template;
|
||||
RedisConnectionFactory factory;
|
||||
Jackson2HashMapper mapper;
|
||||
|
||||
public Jackson2HashMapperTests(RedisConnectionFactory factory) throws Exception {
|
||||
|
||||
this.factory = factory;
|
||||
if (factory instanceof InitializingBean) {
|
||||
((InitializingBean) factory).afterPropertiesSet();
|
||||
}
|
||||
|
||||
ConnectionFactoryTracker.add(factory);
|
||||
}
|
||||
|
||||
@Parameters
|
||||
public static Collection<RedisConnectionFactory> params() {
|
||||
return Arrays.<RedisConnectionFactory> asList(new JedisConnectionFactory(), new LettuceConnectionFactory());
|
||||
}
|
||||
|
||||
@AfterClass
|
||||
public static void cleanUp() {
|
||||
ConnectionFactoryTracker.cleanUp();
|
||||
}
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
|
||||
this.template = new RedisTemplate<String, Object>();
|
||||
this.template.setConnectionFactory(factory);
|
||||
template.afterPropertiesSet();
|
||||
|
||||
this.mapper = new Jackson2HashMapper(true);
|
||||
}
|
||||
|
||||
/**
|
||||
* @see DATAREDIS-423
|
||||
*/
|
||||
@Test
|
||||
public void shouldWriteReadHashCorrtectly() {
|
||||
|
||||
Person jon = new Person("jon", "snow", 19);
|
||||
Address adr = new Address();
|
||||
adr.setStreet("the wall");
|
||||
adr.setNumber(100);
|
||||
jon.setAddress(adr);
|
||||
|
||||
template.opsForHash().putAll("JON-SNOW", mapper.toHash(jon));
|
||||
|
||||
Person result = (Person) mapper.fromHash(template.<String, Object> opsForHash().entries("JON-SNOW"));
|
||||
Assert.assertThat(result, Is.is(jon));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,204 @@
|
||||
/*
|
||||
* Copyright 2016 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package org.springframework.data.redis.mapping;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.junit.runners.Parameterized;
|
||||
import org.junit.runners.Parameterized.Parameters;
|
||||
import org.springframework.data.redis.Address;
|
||||
import org.springframework.data.redis.Person;
|
||||
import org.springframework.data.redis.hash.HashMapper;
|
||||
import org.springframework.data.redis.hash.Jackson2HashMapper;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* Unit tests for {@link Jackson2HashMapper}.
|
||||
*
|
||||
* @author Christoph Strobl
|
||||
*/
|
||||
@RunWith(Parameterized.class)
|
||||
public class Jackson2HashMapperUnitTests extends AbstractHashMapperTest {
|
||||
|
||||
private final Jackson2HashMapper mapper;
|
||||
|
||||
public Jackson2HashMapperUnitTests(Jackson2HashMapper mapper) {
|
||||
this.mapper = mapper;
|
||||
}
|
||||
|
||||
@Parameters
|
||||
public static Collection<Jackson2HashMapper> params() {
|
||||
return Arrays.asList(new Jackson2HashMapper(true), new Jackson2HashMapper(false));
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("rawtypes")
|
||||
protected <T> HashMapper mapperFor(Class<T> t) {
|
||||
return this.mapper;
|
||||
}
|
||||
|
||||
/**
|
||||
* @see DATAREDIS-423
|
||||
*/
|
||||
@Test
|
||||
public void shouldMapTypedListOfSimpleType() {
|
||||
|
||||
WithList source = new WithList();
|
||||
source.strings = Arrays.asList("spring", "data", "redis");
|
||||
assertBackAndForwardMapping(source);
|
||||
}
|
||||
|
||||
/**
|
||||
* @see DATAREDIS-423
|
||||
*/
|
||||
@Test
|
||||
public void shouldMapTypledListOfComplexType() {
|
||||
|
||||
WithList source = new WithList();
|
||||
|
||||
source.persons = Arrays.asList(new Person("jon", "snow", 19), new Person("tyrion", "lannister", 27));
|
||||
assertBackAndForwardMapping(source);
|
||||
}
|
||||
|
||||
/**
|
||||
* @see DATAREDIS-423
|
||||
*/
|
||||
@Test
|
||||
public void shouldMapTypedListOfComplexObjectWihtNestedElements() {
|
||||
|
||||
WithList source = new WithList();
|
||||
|
||||
Person jon = new Person("jon", "snow", 19);
|
||||
Address adr = new Address();
|
||||
adr.setStreet("the wall");
|
||||
adr.setNumber(100);
|
||||
jon.setAddress(adr);
|
||||
|
||||
source.persons = Arrays.asList(jon, new Person("tyrion", "lannister", 27));
|
||||
assertBackAndForwardMapping(source);
|
||||
}
|
||||
|
||||
/**
|
||||
* @see DATAREDIS-423
|
||||
*/
|
||||
@Test
|
||||
public void shouldMapNestedObject() {
|
||||
|
||||
Person jon = new Person("jon", "snow", 19);
|
||||
Address adr = new Address();
|
||||
adr.setStreet("the wall");
|
||||
adr.setNumber(100);
|
||||
jon.setAddress(adr);
|
||||
|
||||
assertBackAndForwardMapping(jon);
|
||||
}
|
||||
|
||||
/**
|
||||
* @see DATAREDIS-423
|
||||
*/
|
||||
@Test
|
||||
public void shouldMapUntypedList() {
|
||||
|
||||
WithList source = new WithList();
|
||||
source.objects = Arrays.<Object> asList(Integer.valueOf(100), "foo", new Person("jon", "snow", 19));
|
||||
assertBackAndForwardMapping(source);
|
||||
}
|
||||
|
||||
/**
|
||||
* @see DATAREDIS-423
|
||||
*/
|
||||
@Test
|
||||
public void shouldMapTypedMapOfSimpleTypes() {
|
||||
|
||||
WithMap source = new WithMap();
|
||||
source.strings = new LinkedHashMap<String, String>();
|
||||
source.strings.put("1", "spring");
|
||||
source.strings.put("2", "data");
|
||||
source.strings.put("3", "redis");
|
||||
assertBackAndForwardMapping(source);
|
||||
}
|
||||
|
||||
/**
|
||||
* @see DATAREDIS-423
|
||||
*/
|
||||
@Test
|
||||
public void shouldMapTypedMapOfComplexTypes() {
|
||||
|
||||
WithMap source = new WithMap();
|
||||
source.persons = new LinkedHashMap<String, Person>();
|
||||
source.persons.put("1", new Person("jon", "snow", 19));
|
||||
source.persons.put("2", new Person("tyrion", "lannister", 19));
|
||||
assertBackAndForwardMapping(source);
|
||||
}
|
||||
|
||||
/**
|
||||
* @see DATAREDIS-423
|
||||
*/
|
||||
@Test
|
||||
public void shouldMapUntypedMap() {
|
||||
|
||||
WithMap source = new WithMap();
|
||||
source.objects = new LinkedHashMap<String, Object>();
|
||||
source.objects.put("1", "spring");
|
||||
source.objects.put("2", Integer.valueOf(100));
|
||||
source.objects.put("3", "redis");
|
||||
assertBackAndForwardMapping(source);
|
||||
}
|
||||
|
||||
/**
|
||||
* @see DATAREDIS-423
|
||||
*/
|
||||
@Test
|
||||
public void nestedStuff() {
|
||||
|
||||
WithList nestedList = new WithList();
|
||||
nestedList.objects = new ArrayList<Object>();
|
||||
|
||||
WithMap deepNestedMap = new WithMap();
|
||||
deepNestedMap.persons = new LinkedHashMap<String, Person>();
|
||||
deepNestedMap.persons.put("jon", new Person("jon", "snow", 24));
|
||||
|
||||
nestedList.objects.add(deepNestedMap);
|
||||
|
||||
WithMap outer = new WithMap();
|
||||
outer.objects = new LinkedHashMap<String, Object>();
|
||||
outer.objects.put("1", nestedList);
|
||||
|
||||
assertBackAndForwardMapping(outer);
|
||||
}
|
||||
|
||||
@Data
|
||||
public static class WithList {
|
||||
List<String> strings;
|
||||
List<Object> objects;
|
||||
List<Person> persons;
|
||||
}
|
||||
|
||||
@Data
|
||||
public static class WithMap {
|
||||
Map<String, String> strings;
|
||||
Map<String, Object> objects;
|
||||
Map<String, Person> persons;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user