You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2016/01/13 13:15:11 UTC
svn commit: r1724408 - in /jackrabbit/oak/branches/1.2: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/
Author: reschke
Date: Wed Jan 13 12:15:11 2016
New Revision: 1724408
URL: http://svn.apache.org/viewvc?rev=1724408&view=rev
Log:
OAK-3867: RDBDocumentStore: refactor JSON support (ported to 1.2)
Added:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJSONSupport.java
- copied unchanged from r1724401, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJSONSupport.java
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBExport.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializerTest.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 13 12:15:11 2016
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681921,1681955,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618
,1684669,1684820,1684868,1684894,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686003,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693050,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695420,1695457,1695482,1695492,1695507,1695
521,1695540,1695571,1695905,1696190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700718,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702387,1702405,1702423,1702860,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1705992,1705998,1706009,1706037,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707191,1707435,1707509,1708105,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710800,1
710811,1710816,1710972,1711248,1711282,1711296,1711498,1711654,1712018,1712042,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714213,1714229,1714238,1714519-1714520,1714543-1714544,1714730,1714739,1714779,1714956,1714961,1715010,1715191,1715346,1715767,1715771,1715888,1715898,1716178,1716426,1716576,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717277,1717462,1717632,1717784,1717789,1717988,1718626,1718646,1718801,1718895,1719111,1719288,1720335,1720350,1720354,1720500,1721160,1721172,1722141,1722832,1723227,1723239,1723333,1723713,1723731,1724026,1724057,1724186,1724210
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681921,1681955,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618
,1684669,1684820,1684868,1684894,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686003,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693050,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695420,1695457,1695482,1695492,1695507,1695
521,1695540,1695571,1695905,1696190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700718,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702387,1702405,1702423,1702860,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1705992,1705998,1706009,1706037,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707191,1707435,1707509,1708105,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710800,1
710811,1710816,1710972,1711248,1711282,1711296,1711498,1711654,1712018,1712042,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714213,1714229,1714238,1714519-1714520,1714543-1714544,1714730,1714739,1714779,1714956,1714961,1715010,1715191,1715346,1715767,1715771,1715888,1715898,1716178,1716426,1716576,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717277,1717462,1717632,1717784,1717789,1717988,1718626,1718646,1718801,1718895,1719111,1719288,1720335,1720350,1720354,1720500,1721160,1721172,1722141,1722832,1723227,1723239,1723333,1723713,1723731,1724026,1724057,1724186,1724210,1724401
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java?rev=1724408&r1=1724407&r2=1724408&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java Wed Jan 13 12:15:11 2016
@@ -16,9 +16,12 @@
*/
package org.apache.jackrabbit.oak.plugins.document.rdb;
+import static org.apache.jackrabbit.oak.plugins.document.rdb.RDBJSONSupport.appendJsonMember;
+import static org.apache.jackrabbit.oak.plugins.document.rdb.RDBJSONSupport.appendJsonString;
+import static org.apache.jackrabbit.oak.plugins.document.rdb.RDBJSONSupport.appendJsonValue;
+
import java.io.ByteArrayInputStream;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
@@ -27,10 +30,8 @@ import java.util.TreeMap;
import java.util.zip.GZIPInputStream;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import org.apache.commons.io.IOUtils;
-import org.apache.jackrabbit.oak.commons.json.JsopBuilder;
import org.apache.jackrabbit.oak.commons.json.JsopReader;
import org.apache.jackrabbit.oak.commons.json.JsopTokenizer;
import org.apache.jackrabbit.oak.plugins.document.Collection;
@@ -65,6 +66,8 @@ public class RDBDocumentSerializer {
private static final Logger LOG = LoggerFactory.getLogger(RDBDocumentSerializer.class);
+ private static final RDBJSONSupport JSON = new RDBJSONSupport(true);
+
public RDBDocumentSerializer(DocumentStore store, Set<String> columnProperties) {
this.store = store;
this.columnProperties = columnProperties;
@@ -84,7 +87,7 @@ public class RDBDocumentSerializer {
if (needComma) {
sb.append(",");
}
- appendMember(sb, key, entry.getValue());
+ appendJsonMember(sb, key, entry.getValue());
needComma = true;
}
}
@@ -122,61 +125,20 @@ public class RDBDocumentSerializer {
} else {
throw new DocumentStoreException("Can't serialize " + update.toString() + " for JSON append");
}
- appendString(sb, key.getName());
+ appendJsonString(sb, key.getName());
sb.append(",");
Revision rev = key.getRevision();
if (rev != null) {
- appendString(sb, rev.toString());
+ appendJsonString(sb, rev.toString());
sb.append(",");
}
- appendValue(sb, op.value);
+ appendJsonValue(sb, op.value);
sb.append("]");
needComma = true;
}
return sb.append("]").toString();
}
- private static void appendMember(StringBuilder sb, String key, Object value) {
- appendString(sb, key);
- sb.append(":");
- appendValue(sb, value);
- }
-
- private static void appendValue(StringBuilder sb, Object value) {
- if (value == null) {
- sb.append("null");
- } else if (value instanceof Number) {
- sb.append(value.toString());
- } else if (value instanceof Boolean) {
- sb.append(value.toString());
- } else if (value instanceof String) {
- appendString(sb, (String) value);
- } else if (value instanceof Map) {
- appendMap(sb, (Map<Object, Object>) value);
- } else {
- throw new DocumentStoreException("unexpected type: " + value.getClass());
- }
- }
-
- private static void appendMap(StringBuilder sb, Map<Object, Object> map) {
- sb.append("{");
- boolean needComma = false;
- for (Map.Entry<Object, Object> e : map.entrySet()) {
- if (needComma) {
- sb.append(",");
- }
- appendMember(sb, e.getKey().toString(), e.getValue());
- needComma = true;
- }
- sb.append("}");
- }
-
- private static void appendString(StringBuilder sb, String s) {
- sb.append('"');
- JsopBuilder.escape(s, sb);
- sb.append('"');
- }
-
/**
* Reconstructs a {@link Document) based on the persisted {@link RDBRow}.
*/
@@ -241,7 +203,7 @@ public class RDBDocumentSerializer {
next = json.read();
if (next == ',') {
do {
- Object ob = readValueFromJson(json);
+ Object ob = JSON.parse(json);
if (!(ob instanceof List)) {
throw new DocumentStoreException("expected array but got: " + ob);
}
@@ -336,56 +298,13 @@ public class RDBDocumentSerializer {
do {
String key = json.readString();
json.read(':');
- Object value = readValueFromJson(json);
+ Object value = JSON.parse(json);
doc.put(key, value);
} while (json.matches(','));
json.read('}');
}
}
- @Nullable
- private static Object readValueFromJson(@Nonnull JsopTokenizer json) {
- switch (json.read()) {
- case JsopReader.NULL:
- return null;
- case JsopReader.TRUE:
- return true;
- case JsopReader.FALSE:
- return false;
- case JsopReader.NUMBER:
- return Long.parseLong(json.getToken());
- case JsopReader.STRING:
- return json.getToken();
- case '{':
- TreeMap<Revision, Object> map = new TreeMap<Revision, Object>(StableRevisionComparator.REVERSE);
- while (true) {
- if (json.matches('}')) {
- break;
- }
- String k = json.readString();
- if (k == null) {
- throw new IllegalArgumentException("unexpected null revision");
- }
- json.read(':');
- map.put(Revision.fromString(k), readValueFromJson(json));
- json.matches(',');
- }
- return map;
- case '[':
- List<Object> list = new ArrayList<Object>();
- while (true) {
- if (json.matches(']')) {
- break;
- }
- list.add(readValueFromJson(json));
- json.matches(',');
- }
- return list;
- default:
- throw new IllegalArgumentException(json.readRawValue());
- }
- }
-
// low level operations
private static byte[] GZIPSIG = { 31, -117 };
Modified: jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBExport.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBExport.java?rev=1724408&r1=1724407&r2=1724408&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBExport.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBExport.java Wed Jan 13 12:15:11 2016
@@ -36,19 +36,15 @@ import java.sql.Types;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.oak.commons.json.JsopBuilder;
-import org.apache.jackrabbit.oak.commons.json.JsopReader;
-import org.apache.jackrabbit.oak.commons.json.JsopTokenizer;
import org.apache.jackrabbit.oak.plugins.document.Collection;
import org.apache.jackrabbit.oak.plugins.document.Document;
import org.apache.jackrabbit.oak.plugins.document.DocumentStoreException;
@@ -67,6 +63,8 @@ public class RDBExport {
JSON, JSONARRAY, CSV
};
+ private static final RDBJSONSupport JSON = new RDBJSONSupport(false);
+
public static void main(String[] args) throws ClassNotFoundException, SQLException, IOException {
String url = null, user = null, pw = null, table = "nodes", query = null, dumpfile = null, lobdir = null;
@@ -348,8 +346,7 @@ public class RDBExport {
if (fieldNames.isEmpty()) {
return fulljson;
} else {
- JsopTokenizer t = new JsopTokenizer(fulljson.toString());
- Map<String, Object> doc = (Map<String, Object>) readValueFromJson(t);
+ Map<String, Object> doc = (Map<String, Object>) JSON.parse(fulljson.toString());
StringBuilder buf = new StringBuilder();
buf.append('{');
String delim = "";
@@ -359,7 +356,7 @@ public class RDBExport {
String[] fn = field.split("\\.");
if (doc.containsKey(fn[0])) {
Object o = doc.get(fn[0]);
- appendJsonMember(buf, fn[0], o);
+ RDBJSONSupport.appendJsonMember(buf, fn[0], o);
}
}
buf.append('}');
@@ -367,51 +364,9 @@ public class RDBExport {
}
}
- private static void appendJsonMember(StringBuilder sb, String key, Object value) {
- appendJsonString(sb, key);
- sb.append(":");
- appendJsonValue(sb, value);
- }
-
- private static void appendJsonString(StringBuilder sb, String s) {
- sb.append('"');
- JsopBuilder.escape(s, sb);
- sb.append('"');
- }
-
- private static void appendJsonMap(StringBuilder sb, Map<Object, Object> map) {
- sb.append("{");
- boolean needComma = false;
- for (Map.Entry<Object, Object> e : map.entrySet()) {
- if (needComma) {
- sb.append(",");
- }
- appendJsonMember(sb, e.getKey().toString(), e.getValue());
- needComma = true;
- }
- sb.append("}");
- }
-
- private static void appendJsonValue(StringBuilder sb, Object value) {
- if (value == null) {
- sb.append("null");
- } else if (value instanceof Number) {
- sb.append(value.toString());
- } else if (value instanceof Boolean) {
- sb.append(value.toString());
- } else if (value instanceof String) {
- appendJsonString(sb, (String) value);
- } else if (value instanceof Map) {
- appendJsonMap(sb, (Map<Object, Object>) value);
- } else {
- throw new IllegalArgumentException("unexpected type: " + value.getClass());
- }
- }
-
@Nonnull
private static StringBuilder asCSV(List<String> csvFieldNames, StringBuilder fulljson) {
- JsopTokenizer t = new JsopTokenizer(fulljson.toString());
- Map<String, Object> doc = (Map<String, Object>) readValueFromJson(t);
+ Map<String, Object> doc = (Map<String, Object>) JSON.parse(fulljson.toString());
StringBuilder buf = new StringBuilder();
String delim = "";
for (String field : csvFieldNames) {
@@ -450,49 +405,6 @@ public class RDBExport {
}
}
- @Nullable
- private static Object readValueFromJson(@Nonnull JsopTokenizer json) {
- switch (json.read()) {
- case JsopReader.NULL:
- return null;
- case JsopReader.TRUE:
- return true;
- case JsopReader.FALSE:
- return false;
- case JsopReader.NUMBER:
- return Long.parseLong(json.getToken());
- case JsopReader.STRING:
- return json.getToken();
- case '{':
- Map<String, Object> map = new HashMap<String, Object>();
- while (true) {
- if (json.matches('}')) {
- break;
- }
- String k = json.readString();
- if (k == null) {
- throw new IllegalArgumentException();
- }
- json.read(':');
- map.put(k, readValueFromJson(json));
- json.matches(',');
- }
- return map;
- case '[':
- List<Object> list = new ArrayList<Object>();
- while (true) {
- if (json.matches(']')) {
- break;
- }
- list.add(readValueFromJson(json));
- json.matches(',');
- }
- return list;
- default:
- throw new IllegalArgumentException(json.readRawValue());
- }
- }
-
private static boolean isBinaryType(int sqlType) {
return sqlType == Types.VARBINARY || sqlType == Types.BINARY || sqlType == Types.LONGVARBINARY;
}
Modified: jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializerTest.java?rev=1724408&r1=1724407&r2=1724408&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializerTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializerTest.java Wed Jan 13 12:15:11 2016
@@ -16,11 +16,17 @@
*/
package org.apache.jackrabbit.oak.plugins.document.rdb;
+import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.UnsupportedEncodingException;
import java.util.Collections;
+import java.util.List;
+import java.util.Map;
import org.apache.jackrabbit.oak.plugins.document.Collection;
import org.apache.jackrabbit.oak.plugins.document.DocumentStore;
@@ -31,7 +37,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-public class RDBDocumentSerializerTest {
+public class RDBDocumentSerializerTest {
private DocumentStoreFixture fixture = DocumentStoreFixture.RDB_H2;
private DocumentStore store;
@@ -69,7 +75,8 @@ public class RDBDocumentSerializerTest
@Test
public void testSimpleBlob2() throws UnsupportedEncodingException {
- RDBRow row = new RDBRow("_foo", false, false, 1, 2, 3, "\"blob\"", "{\"s\":\"string\", \"b\":true, \"i\":1}".getBytes("UTF-8"));
+ RDBRow row = new RDBRow("_foo", false, false, 1, 2, 3, "\"blob\"",
+ "{\"s\":\"string\", \"b\":true, \"i\":1}".getBytes("UTF-8"));
NodeDocument doc = this.ser.fromRow(Collection.NODES, row);
assertEquals("_foo", doc.getId());
assertEquals(false, doc.hasBinary());
@@ -85,14 +92,15 @@ public class RDBDocumentSerializerTest
RDBRow row = new RDBRow("_foo", true, false, 1, 2, 3, "{}", "{}".getBytes("UTF-8"));
this.ser.fromRow(Collection.NODES, row);
fail("should fail");
- }
- catch (DocumentStoreException expected) {
+ } catch (DocumentStoreException expected) {
}
}
@Test
public void testBlobAndDiff() throws UnsupportedEncodingException {
- RDBRow row = new RDBRow("_foo", true, false, 1, 2, 3, "\"blob\", [[\"=\", \"foo\", \"bar\"],[\"M\", \"m1\", 1],[\"M\", \"m2\", 3]]", "{\"m1\":2, \"m2\":2}".getBytes("UTF-8"));
+ RDBRow row = new RDBRow("_foo", true, false, 1, 2, 3,
+ "\"blob\", [[\"=\", \"foo\", \"bar\"],[\"M\", \"m1\", 1],[\"M\", \"m2\", 3]]",
+ "{\"m1\":2, \"m2\":2}".getBytes("UTF-8"));
NodeDocument doc = this.ser.fromRow(Collection.NODES, row);
assertEquals("bar", doc.get("foo"));
assertEquals(2L, doc.get("m1"));
@@ -105,8 +113,7 @@ public class RDBDocumentSerializerTest
RDBRow row = new RDBRow("_foo", true, false, 1, 2, 3, "[[\"\", \"\", \"\"]]", "{}".getBytes("UTF-8"));
this.ser.fromRow(Collection.NODES, row);
fail("should fail");
- }
- catch (DocumentStoreException expected) {
+ } catch (DocumentStoreException expected) {
}
}
@@ -116,8 +123,7 @@ public class RDBDocumentSerializerTest
RDBRow row = new RDBRow("_foo", true, false, 1, 2, 3, "{ \"x\" : 1, }", null);
this.ser.fromRow(Collection.NODES, row);
fail("should fail");
- }
- catch (DocumentStoreException expected) {
+ } catch (DocumentStoreException expected) {
}
}
@@ -127,8 +133,7 @@ public class RDBDocumentSerializerTest
RDBRow row = new RDBRow("_foo", true, false, 1, 2, 3, "{ x : 1, }", null);
this.ser.fromRow(Collection.NODES, row);
fail("should fail");
- }
- catch (DocumentStoreException expected) {
+ } catch (DocumentStoreException expected) {
}
}
@@ -139,4 +144,46 @@ public class RDBDocumentSerializerTest
assertEquals("_foo", doc.getId());
assertEquals("\u20ac\uD834\uDD1E", doc.get("x"));
}
+
+ @Test
+ public void testValidJsonSimple() {
+ RDBJSONSupport json = new RDBJSONSupport(false);
+ assertNull(json.parse("null"));
+ assertTrue((Boolean) json.parse("true"));
+ assertFalse((Boolean) json.parse("false"));
+ assertEquals(123.45, (Number) json.parse("123.45"));
+ assertEquals("\r\n\t\u00e0", (String) json.parse("\"\r\n\t\u00e0\""));
+ }
+
+ @Test
+ public void testValidJsonArray() {
+ RDBJSONSupport json = new RDBJSONSupport(false);
+ assertArrayEquals("", new Object[] { Boolean.TRUE }, ((List<Object>) json.parse("[true]")).toArray());
+ assertArrayEquals("", new Object[] { Boolean.TRUE, null, 123L, "foobar" },
+ ((List<Object>) json.parse("[true, null, 123, \"foobar\"]")).toArray());
+ }
+
+ @Test
+ public void testValidJsonMap() {
+ RDBJSONSupport json = new RDBJSONSupport(false);
+ Map<String, Object> map = (Map<String, Object>)json.parse("{\"a\":true,\"b\":null,\"c\":123,\"d\":\"foobar\"}");
+ assertEquals(4, map.size());
+ assertTrue((Boolean)map.get("a"));
+ assertTrue(map.containsKey("b"));
+ assertNull(map.get("b"));
+ assertEquals(123l, ((Long)map.get("c")).longValue());
+ assertEquals("foobar", (String)map.get("d"));
+ }
+
+ @Test
+ public void testInvalidJson() {
+ RDBJSONSupport json = new RDBJSONSupport(false);
+ String tests[] = new String[] { "x", "\"", "{a:1}", "[false,]" };
+ for (String test : tests) {
+ try {
+ json.parse(test);
+ } catch (IllegalArgumentException expected) {
+ }
+ }
+ }
}