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

DATAGEODE-82 - Review, refactor and polish related JSON/Region support and utility classes.

Browse Source
This commit is contained in:
John Blum
2018-02-12 18:41:57 -08:00
parent 16b6071e59
commit 5a36dc3a99
4 changed files with 273 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
src/test/java/org/springframework/data/gemfire/serialization/json/JSONRegionAdviceTest.java → src/test/java/org/springframework/data/gemfire/serialization/json/JSONRegionAdviceIntegrationTests.java
View File

@@ -18,10 +18,10 @@
package org.springframework.data.gemfire.serialization.json;
import static org.junit.Assert.assertEquals;
import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newIllegalArgumentException;
import java.io.IOException;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import javax.annotation.Resource;
@@ -37,12 +37,13 @@ import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.gemfire.GemfireOperations;
import org.springframework.data.gemfire.repository.sample.Person;
import org.springframework.data.gemfire.test.support.MapBuilder;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
/**
* Integration test to test SDG support for storing and reading JSON data to/from
* a GemFire Cache {@link Region} by (un)marshalled JSON data using Jackson.
* Integration test to test SDG support for storing and reading JSON data to/from a {@link Region}
* by (un)marshalling JSON data using Jackson.
*
* @author David Turanski
* @author John Blum
@@ -51,11 +52,12 @@ import org.springframework.test.context.junit4.SpringRunner;
* @see org.springframework.data.gemfire.serialization.json.JSONRegionAdvice
* @see org.springframework.test.context.ContextConfiguration
* @see org.springframework.test.context.junit4.SpringRunner
* @see com.fasterxml.jackson.databind.ObjectMapper
*/
@RunWith(SpringRunner.class)
@ContextConfiguration
@SuppressWarnings({ "unchecked", "unused" })
public class JSONRegionAdviceTest {
public class JSONRegionAdviceIntegrationTests {
// TODO figure out why auto-proxying the Region for JSON support prevents the GemfireTemplate from being "auto-wired",
// as a GemfireTemplate rather than GemfireOperations, resulting in a NoSuchBeanDefinitionException thrown by the
@@ -63,7 +65,7 @@ public class JSONRegionAdviceTest {
@Autowired
private GemfireOperations template;
@Resource(name = "jsonRegion")
@Resource(name = "JsonRegion")
private Region jsonRegion;
@Before
@@ -71,74 +73,101 @@ public class JSONRegionAdviceTest {
jsonRegion.clear();
}
protected static String toJson(Object bean) {
private static String toJson(Object bean) {
try {
return new ObjectMapper().writeValueAsString(bean);
}
catch (JsonProcessingException e) {
throw new IllegalArgumentException(String.format("Failed to convert object (%1$s) into JSON", bean), e);
catch (JsonProcessingException cause) {
throw newIllegalArgumentException(cause, "Failed to convert object (%1$s) into JSON", bean);
}
}
@Test
public void testPutString() {
public void putAndCreate() {
String json = "{\"hello\":\"world\"}";
jsonRegion.put("key", json);
this.jsonRegion.put("keyOne", json);
assertEquals(json, jsonRegion.put("key", json));
assertEquals(json, this.jsonRegion.put("keyOne", json));
jsonRegion.create("key2", json);
this.jsonRegion.create("keyTwo", json);
assertEquals(json, jsonRegion.get("key"));
assertEquals(json, this.jsonRegion.get("keyTwo"));
}
@Test
@SuppressWarnings("unchecked")
public void testPutAll() {
Map<String, String> map = new HashMap<String, String>();
map.put("key1", "{\"hello1\":\"world1\"}");
map.put("key2", "{\"hello2\":\"world2\"}");
public void putAll() {
jsonRegion.putAll(map);
Map<String, String> map = MapBuilder.<String, String>newMapBuilder()
.put("key1", "{\"hello1\":\"world1\"}")
.put("key2", "{\"hello2\":\"world2\"}")
.build();
Map<String, String> results = jsonRegion.getAll(Arrays.asList("key1", "key2"));
this.jsonRegion.putAll(map);
Map<String, String> results = this.jsonRegion.getAll(Arrays.asList("key1", "key2"));
assertEquals("{\"hello1\":\"world1\"}", results.get("key1"));
assertEquals("{\"hello2\":\"world2\"}", results.get("key2"));
}
@Test
public void testObjectToJSon() throws IOException {
Person daveTuranski = new Person(1L, "Dave", "Turanski");
jsonRegion.put("dave", daveTuranski);
String json = String.valueOf(jsonRegion.get("dave"));
assertEquals(json, toJson(daveTuranski), json);
Object result = jsonRegion.put("dave", daveTuranski);
assertEquals(toJson(daveTuranski), result);
public void objectToJSon() throws IOException {
Person davidTuranski = new Person(1L, "David", "Turanski");
this.jsonRegion.put("dave", davidTuranski);
String json = String.valueOf(this.jsonRegion.get("dave"));
System.out.printf("JSON [%s]%n", json);
assertEquals(json, toJson(davidTuranski));
Object result = jsonRegion.put("dave", davidTuranski);
assertEquals(toJson(davidTuranski), result);
}
@Test
public void testTemplateFindUnique() {
Person daveTuranski = new Person(1L, "Dave", "Turanski");
jsonRegion.put("dave", daveTuranski);
String json = template.findUnique("SELECT * FROM /jsonRegion WHERE firstname=$1", "Dave");
assertEquals(toJson(daveTuranski), json);
public void templateFind() {
Person davidTuranski = new Person(1L, "David", "Turanski");
this.jsonRegion.put("dave", davidTuranski);
SelectResults<String> results = this.template.find(String.format("SELECT * FROM %s WHERE firstname=$1",
this.jsonRegion.getFullPath()), davidTuranski.getFirstname());
assertEquals(toJson(davidTuranski), results.iterator().next());
}
@Test
public void testTemplateFind() {
Person daveTuranski = new Person(1L, "Dave", "Turanski");
jsonRegion.put("dave", daveTuranski);
SelectResults<String> results = template.find("SELECT * FROM /jsonRegion WHERE firstname=$1", "Dave");
assertEquals(toJson(daveTuranski), results.iterator().next());
public void templateFindUnique() {
Person davidTuranski = new Person(1L, "David", "Turanski");
this.jsonRegion.put("dave", davidTuranski);
String json = this.template.findUnique(String.format("SELECT * FROM %s WHERE firstname=$1",
this.jsonRegion.getFullPath()), davidTuranski.getFirstname());
assertEquals(toJson(davidTuranski), json);
}
@Test
public void testTemplateQuery() {
Person daveTuranski = new Person(1L, "Dave", "Turanski");
jsonRegion.put("dave", daveTuranski);
SelectResults<String> results = template.query("firstname='Dave'");
assertEquals(toJson(daveTuranski), results.iterator().next());
public void templateQuery() {
Person davidTuranski = new Person(1L, "David", "Turanski");
this.jsonRegion.put("dave", davidTuranski);
SelectResults<String> results =
this.template.query(String.format("firstname='%s'", davidTuranski.getFirstname()));
assertEquals(toJson(davidTuranski), results.iterator().next());
}
}