JSON fixes for '\/'

Author: mikera

convex-core/src/main/java/convex/core/data/Strings.java

@@ -92,6 +92,9 @@ public class Strings {
 
 	public static final StringShort SYMBOL = StringShort.intern("symbol");
 
+	public static final StringShort SOURCE = StringShort.intern("source");
+
+	
 	public static final Comparator<AString> lengthComparator = (a,b)->{
 		return Long.signum(a.count()-b.count());
 	};
@@ -100,6 +103,7 @@ public class Strings {
 
 
 
+
 	/**
 	 * Reads a String from a Blob encoding.
 	 * 

convex-core/src/main/java/convex/core/json/JSONReader.java

@@ -160,7 +160,8 @@ public static AMap<AString,ACell> readObject(java.io.Reader r) throws IOExceptio
 	}
 
 	public static AMap<AString,ACell> readObject(InputStream is) throws IOException {
-		return readObject(CharStreams.fromStream(is));
+		CharStream cs=CharStreams.fromStream(is);
+		return readObject(cs);
 	}
 
 	@SuppressWarnings("unchecked")

convex-core/src/main/java/convex/core/text/Text.java

@@ -263,6 +263,9 @@ public static String unescapeJava(String st) {
 		            case '\'':
 		                ch = '\'';
 		                break;
+		            case '/': // this is for JSON compatibility, a bit permissive in Java?
+		                ch = '/';
+		                break;
 		            // Hex Unicode: u????
 		            case 'u':
 		                if (i+6 > n) {

convex-core/src/test/java/convex/core/util/JSONTest.java

@@ -126,6 +126,11 @@ public void testEscape() {
 	@Test
 	public void testPrettyJSON() {
 		assertEquals("{\n  \"foo\": \"bar\"\n}",JSON.printPretty(Maps.of("foo","bar")).toString());
+		
+		// special case regression test
+		assertEquals("\"\\\\/\"",JSON.toStringPretty(Strings.create("\\/")));
+		assertEquals(Strings.create("\"\\\\/\""),JSON.printPretty(Strings.create("\\/")));
+
 	}
 
 	@Test
@@ -170,6 +175,11 @@ public void testJSONObjects() {
 
 	@Test 
 	public void testStrings() {
+		assertEquals(Strings.intern("\n"),JSONReader.read("\"\\n\"")); 
+
+		// '\/' is valid JSON, you can unnecessarily escape a slash. WTF JSON?
+		assertEquals(Strings.intern("/"),JSONReader.read("\"\\/\"")); 
+		
 		assertEquals("\\",JSON.parse("\"\\\\\"").toString()); // i.e. '\'
 
 		doStringTest("");

convex-restapi/src/main/java/convex/restapi/api/ChainAPI.java

@@ -1082,12 +1082,12 @@ public void query(Context ctx) throws InterruptedException {
 				addr=Address.parse(RT.get(req, Keywords.ADDRESS));
 				form=RT.get(req, Keywords.SOURCE);
 			} else {
-				Map<String, Object> req = getJSONBody(ctx);
+				AMap<AString, ACell> req = readJSONBody(ctx);
 				// System.out.println("query data: "+req+ " of type "+Utils.getClassName(req));
-				addr = Address.parse(req.get("address"));
-				Object srcValue = req.get("source");
+				addr = Address.parse(req.get(Strings.ADDRESS));
+				AString srcValue = RT.ensureString(req.get(Strings.SOURCE));
 				// System.out.println("query source: "+srcValue);
-				form = readCode(srcValue);
+				form = Reader.read(srcValue);
 			}
 
 			Result r = convex.querySync(form, addr);

convex-restapi/src/test/java/convex/restapi/test/RESTAPITest.java

@@ -160,6 +160,21 @@ private void assertCad3RoundTrip(String cvxLiteral, String expectedHex) throws I
 	}
 
 	@Test public void testQuery() throws IOException, InterruptedException {
+//		{ // Edge case with \/ in JSON
+//			String query=JSON.toStringPretty(Maps.of("address",11,"source","#8\\/count"));
+//			System.out.println("testQuery:"+query);
+//			HttpResponse<String> res = post(API_PATH+"/query", query);
+//			String r=res.body();
+//			System.out.println(r);
+//			AMap<AString,ACell> json=JSON.parse(r);
+//			ACell value=json.getIn("value");
+//			
+//			assertEquals(200, res.statusCode());
+//			assertTrue(value instanceof AString);
+//			assertNull(json.getIn("errorCode"));
+//		}
+		
+		
 		{ // should be a bad request with bad JSON
 			HttpResponse<String> res = post(API_PATH+"/query", "fddfgb");
 			assertEquals(400, res.statusCode());