github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

JSON Refactor - move EJson into text.json package

Browse Source
This commit is contained in:
Rob Bygrave
2014-11-12 22:56:42 +13:00
parent e649a70509
commit 00f85a42f8
8 changed files with 211 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/com/avaje/ebean/json/EJsonTests.java
+181 -108
View File
@@ -1,19 +1,20 @@
package com.avaje.ebean.json;
import java.io.IOException;
import java.util.Map;
import com.avaje.ebean.text.json.EJson;
import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonParser;
import org.junit.Assert;
import org.junit.Test;
import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.core.JsonParser;
import java.io.IOException;
import java.io.StringReader;
import java.util.List;
import java.util.Map;
public class EJsonTests {
@Test
public void test_map_simple() throws JsonParseException, IOException {
public void test_map_simple() throws IOException {
JsonFactory factory = new JsonFactory();
@@ -28,108 +29,180 @@ public class EJsonTests {
Assert.assertEquals("rob", map.get("name"));
Assert.assertEquals(12L, map.get("age"));
// String jsonOutput = EJson.write(result);
// Assert.assertEquals(jsonInput, jsonOutput);
String jsonOutput = EJson.write(result);
Assert.assertEquals(jsonInput, jsonOutput);
}
@Test
public void test_parseObject() throws IOException {
JsonFactory factory = new JsonFactory();
String jsonInput = "{\"name\":\"rob\",\"age\":12}";
JsonParser jsonParser = factory.createParser(jsonInput);
Object result = EJson.parseObject(jsonParser);
Assert.assertTrue(result instanceof Map);
Map<?,?> map = (Map<?,?>)result;
Assert.assertEquals("rob", map.get("name"));
Assert.assertEquals(12L, map.get("age"));
String jsonOutput = EJson.write(result);
Assert.assertEquals(jsonInput, jsonOutput);
}
@Test
public void test_parseObject_reader() throws IOException {
String jsonInput = "{\"name\":\"rob\",\"age\":12}";
StringReader reader = new StringReader(jsonInput);
Object result = EJson.parseObject(reader);
Assert.assertTrue(result instanceof Map);
Map<?,?> map = (Map<?,?>)result;
Assert.assertEquals("rob", map.get("name"));
Assert.assertEquals(12L, map.get("age"));
String jsonOutput = EJson.write(result);
Assert.assertEquals(jsonInput, jsonOutput);
}
@Test
public void test_map_nested() throws IOException {
String jsonInput = "{\"name\":\"rob\",\"age\":12,\"org\":{\"name\":\"superorg\",\"rating\":4},\"nums\":[1,2,3]}";
Object result = EJson.parse(jsonInput);
Assert.assertTrue(result instanceof Map);
Map<?,?> map = (Map<?,?>)result;
Assert.assertEquals(4, map.size());
Assert.assertEquals("rob", map.get("name"));
Assert.assertEquals(12L, map.get("age"));
Map<?,?> org = (Map<?,?>)map.get("org");
Assert.assertEquals("superorg", org.get("name"));
Assert.assertEquals(4L, org.get("rating"));
List<?> nums = (List<?>)map.get("nums");
Assert.assertEquals(3, nums.size());
Assert.assertEquals(1L, nums.get(0));
Assert.assertEquals(2L, nums.get(1));
Assert.assertEquals(3L, nums.get(2));
String jsonOutput = EJson.write(result);
Assert.assertEquals(jsonInput, jsonOutput);
}
@Test
public void test_map_withNull() throws IOException {
String jsonInput = "{\"name\":\"rob\",\"age\":null}";
Object result = EJson.parse(jsonInput);
Assert.assertTrue(result instanceof Map);
Map<?,?> map = (Map<?,?>)result;
Assert.assertEquals("rob", map.get("name"));
Assert.assertNull(map.get("age"));
String jsonOutput = EJson.write(result);
Assert.assertEquals(jsonInput, jsonOutput);
}
@Test
public void test_list_simple() throws IOException {
String jsonInput = "[\"name\",\"rob\",12,13]";
List<Object> list = EJson.parseList(jsonInput);
Assert.assertEquals(4, list.size());
Assert.assertEquals("name", list.get(0));
Assert.assertEquals("rob", list.get(1));
Assert.assertEquals(12L, list.get(2));
Assert.assertEquals(13L, list.get(3));
String jsonOutput = EJson.write(list);
Assert.assertEquals(jsonInput, jsonOutput);
}
@Test
public void test_list_reader() throws IOException {
String jsonInput = "[\"name\",\"rob\",12,13]";
StringReader reader = new StringReader(jsonInput);
List<Object> list = EJson.parseList(reader);
Assert.assertEquals(4, list.size());
Assert.assertEquals("name", list.get(0));
Assert.assertEquals("rob", list.get(1));
Assert.assertEquals(12L, list.get(2));
Assert.assertEquals(13L, list.get(3));
String jsonOutput = EJson.write(list);
Assert.assertEquals(jsonInput, jsonOutput);
}
@Test
public void test_list_jsonParser() throws IOException {
String jsonInput = "[\"name\",\"rob\",12,13]";
JsonFactory jsonFactory = new JsonFactory();
JsonParser parser = jsonFactory.createParser(jsonInput);
List<Object> list = EJson.parseList(parser);
Assert.assertEquals(4, list.size());
Assert.assertEquals("name", list.get(0));
Assert.assertEquals("rob", list.get(1));
Assert.assertEquals(12L, list.get(2));
Assert.assertEquals(13L, list.get(3));
String jsonOutput = EJson.write(list);
Assert.assertEquals(jsonInput, jsonOutput);
}
@SuppressWarnings("unchecked")
@Test
public void test_list_ofMaps() throws IOException {
String jsonInput = "[{\"name\":\"rob\",\"age\":12},{\"name\":\"mike\",\"age\":13}]";
Object result = EJson.parse(jsonInput);
Assert.assertTrue(result instanceof List);
List<Map<?,?>> list = (List<Map<?,?>>)result;
Assert.assertEquals(2, list.size());
Assert.assertEquals("rob", list.get(0).get("name"));
Assert.assertEquals(12L, list.get(0).get("age"));
Assert.assertEquals("mike", list.get(1).get("name"));
Assert.assertEquals(13L, list.get(1).get("age"));
String jsonOutput = EJson.write(result);
Assert.assertEquals(jsonInput, jsonOutput);
}
@Test
public void test_partial_read() throws IOException {
String jsonInput = "{\"name\":\"rob\",\"age\":null,\"friend\":{\"name\":\"mike\",\"age\":13}},some more json would follow...";
StringReader reader = new StringReader(jsonInput);
Object result = EJson.parse(reader);
Assert.assertTrue(result instanceof Map);
Map<?,?> map = (Map<?,?>)result;
Assert.assertEquals("rob", map.get("name"));
Assert.assertNull(map.get("age"));
Map<?,?> friend = (Map<?,?>)map.get("friend");
Assert.assertEquals("mike", friend.get("name"));
Assert.assertEquals(13L, friend.get("age"));
}
// @Test
// public void test_map_nested() {
//
// String jsonInput = "{\"name\":\"rob\",\"age\":12,\"org\":{\"name\":\"superorg\",\"rating\":4},\"nums\":[1,2,3]}";
// Object result = EJson.parse(jsonInput);
//
// Assert.assertTrue(result instanceof Map);
// Map<?,?> map = (Map<?,?>)result;
// Assert.assertEquals(4, map.size());
// Assert.assertEquals("rob", map.get("name"));
// Assert.assertEquals(12L, map.get("age"));
//
// Map<?,?> org = (Map<?,?>)map.get("org");
// Assert.assertEquals("superorg", org.get("name"));
// Assert.assertEquals(4L, org.get("rating"));
//
// List<?> nums = (List<?>)map.get("nums");
// Assert.assertEquals(3, nums.size());
// Assert.assertEquals(1L, nums.get(0));
// Assert.assertEquals(2L, nums.get(1));
// Assert.assertEquals(3L, nums.get(2));
//
// String jsonOutput = EJson.write(result);
// Assert.assertEquals(jsonInput, jsonOutput);
// }
//
// @Test
// public void test_map_withNull() {
//
// String jsonInput = "{\"name\":\"rob\",\"age\":null}";
// Object result = EJson.parse(jsonInput);
//
// Assert.assertTrue(result instanceof Map);
// Map<?,?> map = (Map<?,?>)result;
// Assert.assertEquals("rob", map.get("name"));
// Assert.assertNull(map.get("age"));
//
// String jsonOutput = EJson.write(result);
// Assert.assertEquals(jsonInput, jsonOutput);
// }
//
// @Test
// public void test_list_simple() {
//
// String jsonInput = "[\"name\",\"rob\",12,13]";
// Object result = EJson.parse(jsonInput);
//
// Assert.assertTrue(result instanceof List);
// List<?> list = (List<?>)result;
// Assert.assertEquals(4, list.size());
// Assert.assertEquals("name", list.get(0));
// Assert.assertEquals("rob", list.get(1));
// Assert.assertEquals(12L, list.get(2));
// Assert.assertEquals(13L, list.get(3));
//
// String jsonOutput = EJson.write(result);
// Assert.assertEquals(jsonInput, jsonOutput);
// }
//
// @SuppressWarnings("unchecked")
// @Test
// public void test_list_ofMaps() {
//
// String jsonInput = "[{\"name\":\"rob\",\"age\":12},{\"name\":\"mike\",\"age\":13}]";
// Object result = EJson.parse(jsonInput);
//
// Assert.assertTrue(result instanceof List);
//
// List<Map<?,?>> list = (List<Map<?,?>>)result;
// Assert.assertEquals(2, list.size());
// Assert.assertEquals("rob", list.get(0).get("name"));
// Assert.assertEquals(12L, list.get(0).get("age"));
// Assert.assertEquals("mike", list.get(1).get("name"));
// Assert.assertEquals(13L, list.get(1).get("age"));
//
// String jsonOutput = EJson.write(result);
// Assert.assertEquals(jsonInput, jsonOutput);
// }
//
// @Test
// public void test_partial_read() {
//
// String jsonInput = "{\"name\":\"rob\",\"age\":null,\"friend\":{\"name\":\"mike\",\"age\":13}},some more json would follow...";
// StringReader reader = new StringReader(jsonInput);
// JsonParser parser = Json.createParser(reader);
//
// Object result = EJson.parsePartial(parser);
//
// Assert.assertTrue(result instanceof Map);
// Map<?,?> map = (Map<?,?>)result;
// Assert.assertEquals("rob", map.get("name"));
// Assert.assertNull(map.get("age"));
//
// Map<?,?> friend = (Map<?,?>)map.get("friend");
// Assert.assertEquals("mike", friend.get("name"));
// Assert.assertEquals(13L, friend.get("age"));
//
// }
}
src/test/java/com/avaje/tests/text/json/TestJsonSimple.java
+2 -2
View File
@@ -14,7 +14,7 @@ import org.junit.Test;
import com.avaje.ebean.BaseTestCase;
import com.avaje.ebean.Ebean;
import com.avaje.ebean.json.EJson;
import com.avaje.ebean.text.json.EJson;
import com.avaje.ebean.text.json.JsonContext;
public class TestJsonSimple extends BaseTestCase {
@@ -28,7 +28,7 @@ public class TestJsonSimple extends BaseTestCase {
final Reader reader = new BufferedReader(new InputStreamReader(is, "UTF-8"));
LineNumberReader lineReader = new LineNumberReader(reader);
String readLine = null;
String readLine;
StringBuilder sb = new StringBuilder();
while ((readLine = lineReader.readLine()) != null) {