Code cleanup: Removed references to deprecated methods

Change-Id: I7d2509e69c468b3f049f644f7a0c50f6fc96968f
Signed-off-by: Gert Scholten <gscholt@gmail.com>

5 files changed, 10 insertions, 9 deletions

diff --git a/src/main/java/com/google/gwtjsonrpc/client/impl/ser/JavaLangString_JsonSerializer.java b/src/main/java/com/google/gwtjsonrpc/client/impl/ser/JavaLangString_JsonSerializer.java
index fa59e82..f3b30b6 100644
--- a/src/main/java/com/google/gwtjsonrpc/client/impl/ser/JavaLangString_JsonSerializer.java
+++ b/src/main/java/com/google/gwtjsonrpc/client/impl/ser/JavaLangString_JsonSerializer.java
@@ -15,6 +15,7 @@
 package com.google.gwtjsonrpc.client.impl.ser;
 
 import com.google.gwt.core.client.JavaScriptObject;
+import com.google.gwt.core.client.JsonUtils;
 import com.google.gwtjsonrpc.client.impl.JsonSerializer;
 import com.google.gwtjsonrpc.client.impl.ResultDeserializer;
 
@@ -32,7 +33,7 @@ public final class JavaLangString_JsonSerializer extends
 
   @Override
   public void printJson(final StringBuilder sb, final java.lang.String o) {
-    sb.append(escapeString(o));
+    sb.append(JsonUtils.escapeValue(o));
   }
 
   @Override
diff --git a/src/main/java/com/google/gwtjsonrpc/client/impl/ser/PrimitiveArraySerializer.java b/src/main/java/com/google/gwtjsonrpc/client/impl/ser/PrimitiveArraySerializer.java
index c427483..a7202df 100644
--- a/src/main/java/com/google/gwtjsonrpc/client/impl/ser/PrimitiveArraySerializer.java
+++ b/src/main/java/com/google/gwtjsonrpc/client/impl/ser/PrimitiveArraySerializer.java
@@ -15,6 +15,7 @@
 package com.google.gwtjsonrpc.client.impl.ser;
 
 import com.google.gwt.core.client.JavaScriptObject;
+import com.google.gwt.core.client.JsonUtils;
 import com.google.gwtjsonrpc.client.impl.JsonSerializer;
 
 public class PrimitiveArraySerializer {
@@ -48,9 +49,7 @@ public class PrimitiveArraySerializer {
         sb.append(',');
       }
       if (o[i] != null) {
-        sb.append('"');
-        sb.append(JsonSerializer.escapeChar(o[i]));
-        sb.append('"');
+        sb.append(JsonUtils.escapeValue(String.valueOf(o[i])));
       } else
         sb.append(JsonSerializer.JS_NULL);
     }
diff --git a/src/main/java/com/google/gwtjsonrpc/client/impl/ser/StringMapSerializer.java b/src/main/java/com/google/gwtjsonrpc/client/impl/ser/StringMapSerializer.java
index d89caae..88a4035 100644
--- a/src/main/java/com/google/gwtjsonrpc/client/impl/ser/StringMapSerializer.java
+++ b/src/main/java/com/google/gwtjsonrpc/client/impl/ser/StringMapSerializer.java
@@ -15,6 +15,7 @@
 package com.google.gwtjsonrpc.client.impl.ser;
 
 import com.google.gwt.core.client.JavaScriptObject;
+import com.google.gwt.core.client.JsonUtils;
 import com.google.gwtjsonrpc.client.impl.JsonSerializer;
 import com.google.gwtjsonrpc.client.impl.ResultDeserializer;
 
@@ -49,7 +50,7 @@ public class StringMapSerializer<V> extends
       } else {
         sb.append(',');
       }
-      sb.append(escapeString(e.getKey()));
+      sb.append(JsonUtils.escapeValue(e.getKey()));
       sb.append(':');
       encode(sb, valueSerializer, e.getValue());
     }
diff --git a/src/main/java/com/google/gwtjsonrpc/client/impl/v1_1/JsonCall11HttpPost.java b/src/main/java/com/google/gwtjsonrpc/client/impl/v1_1/JsonCall11HttpPost.java
index ff762b7..8d8bc08 100644
--- a/src/main/java/com/google/gwtjsonrpc/client/impl/v1_1/JsonCall11HttpPost.java
+++ b/src/main/java/com/google/gwtjsonrpc/client/impl/v1_1/JsonCall11HttpPost.java
@@ -15,6 +15,7 @@
 package com.google.gwtjsonrpc.client.impl.v1_1;
 
 import com.google.gwt.core.client.JavaScriptObject;
+import com.google.gwt.core.client.JsonUtils;
 import com.google.gwt.http.client.Request;
 import com.google.gwt.http.client.RequestBuilder;
 import com.google.gwt.http.client.Response;
@@ -27,7 +28,6 @@ import com.google.gwtjsonrpc.client.RemoteJsonException;
 import com.google.gwtjsonrpc.client.event.RpcCompleteEvent;
 import com.google.gwtjsonrpc.client.impl.AbstractJsonProxy;
 import com.google.gwtjsonrpc.client.impl.JsonCall;
-import com.google.gwtjsonrpc.client.impl.JsonSerializer;
 import com.google.gwtjsonrpc.client.impl.ResultDeserializer;
 
 /** JsonCall implementation for JsonRPC version 1.1 over HTTP POST */
@@ -50,7 +50,7 @@ public class JsonCall11HttpPost<T> extends JsonCall<T> {
     final String xsrfKey = proxy.getXsrfManager().getToken(proxy);
     if (xsrfKey != null) {
       body.append(",\"xsrfKey\":");
-      body.append(JsonSerializer.escapeString(xsrfKey));
+      body.append(JsonUtils.escapeValue(xsrfKey));
     }
     body.append("}");
 
diff --git a/src/main/java/com/google/gwtjsonrpc/client/impl/v2_0/JsonCall20HttpPost.java b/src/main/java/com/google/gwtjsonrpc/client/impl/v2_0/JsonCall20HttpPost.java
index 8e10aa0..17a6be9 100644
--- a/src/main/java/com/google/gwtjsonrpc/client/impl/v2_0/JsonCall20HttpPost.java
+++ b/src/main/java/com/google/gwtjsonrpc/client/impl/v2_0/JsonCall20HttpPost.java
@@ -14,11 +14,11 @@
 
 package com.google.gwtjsonrpc.client.impl.v2_0;
 
+import com.google.gwt.core.client.JsonUtils;
 import com.google.gwt.http.client.RequestBuilder;
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwtjsonrpc.client.JsonUtil;
 import com.google.gwtjsonrpc.client.impl.AbstractJsonProxy;
-import com.google.gwtjsonrpc.client.impl.JsonSerializer;
 import com.google.gwtjsonrpc.client.impl.ResultDeserializer;
 
 /** JsonCall implementation for JsonRPC version 2.0 over HTTP POST */
@@ -42,7 +42,7 @@ public class JsonCall20HttpPost<T> extends JsonCall20<T> {
     final String xsrfKey = proxy.getXsrfManager().getToken(proxy);
     if (xsrfKey != null) {
       body.append(",\"xsrfKey\":");
-      body.append(JsonSerializer.escapeString(xsrfKey));
+      body.append(JsonUtils.escapeValue(xsrfKey));
     }
     body.append("}");