commit 2ff952b0af4035bcb71d8d73d9eb75df31983544
author Jens Geyer <jensg@apache.org> Sat Apr 13 19:46:54 2019 +0200
committer Jens Geyer <jensg@apache.org> Fri Apr 19 16:07:29 2019 +0200
tree 0443b4a9d2e0856f4d721300433c6103c3715e5a
parent e26269e7b3f64a59a699baab841d11f1c03fed50

THRIFT-4816 JSONTransports Context.WriteAsync/ReadAsync are badly named
Client: netstd
Patch: Jens Geyer

This closes #1779

lib/netstd/Thrift/Protocol/TJSONProtocol.cs

diff --git a/lib/netstd/Thrift/Protocol/TJSONProtocol.cs b/lib/netstd/Thrift/Protocol/TJSONProtocol.cs
index 8e40c48..1298052 100644
--- a/lib/netstd/Thrift/Protocol/TJSONProtocol.cs
+++ b/lib/netstd/Thrift/Protocol/TJSONProtocol.cs
@@ -102,7 +102,7 @@
         /// </summary>
         private async Task WriteJsonStringAsync(byte[] bytes, CancellationToken cancellationToken)
         {
-            await Context.WriteAsync(cancellationToken);
+            await Context.WriteConditionalDelimiterAsync(cancellationToken);
             await Trans.WriteAsync(TJSONProtocolConstants.Quote, cancellationToken);
 
             var len = bytes.Length;
@@ -150,7 +150,7 @@
         /// </summary>
         private async Task WriteJsonIntegerAsync(long num, CancellationToken cancellationToken)
         {
-            await Context.WriteAsync(cancellationToken);
+            await Context.WriteConditionalDelimiterAsync(cancellationToken);
             var str = num.ToString();
 
             var escapeNum = Context.EscapeNumbers();
@@ -174,7 +174,7 @@
         /// </summary>
         private async Task WriteJsonDoubleAsync(double num, CancellationToken cancellationToken)
         {
-            await Context.WriteAsync(cancellationToken);
+            await Context.WriteConditionalDelimiterAsync(cancellationToken);
             var str = num.ToString("G17", CultureInfo.InvariantCulture);
             var special = false;
 
@@ -214,7 +214,7 @@
         /// </summary>
         private async Task WriteJsonBase64Async(byte[] bytes, CancellationToken cancellationToken)
         {
-            await Context.WriteAsync(cancellationToken);
+            await Context.WriteConditionalDelimiterAsync(cancellationToken);
             await Trans.WriteAsync(TJSONProtocolConstants.Quote, cancellationToken);
 
             var len = bytes.Length;
@@ -241,7 +241,7 @@
 
         private async Task WriteJsonObjectStartAsync(CancellationToken cancellationToken)
         {
-            await Context.WriteAsync(cancellationToken);
+            await Context.WriteConditionalDelimiterAsync(cancellationToken);
             await Trans.WriteAsync(TJSONProtocolConstants.LeftBrace, cancellationToken);
             PushContext(new JSONPairContext(this));
         }
@@ -254,7 +254,7 @@
 
         private async Task WriteJsonArrayStartAsync(CancellationToken cancellationToken)
         {
-            await Context.WriteAsync(cancellationToken);
+            await Context.WriteConditionalDelimiterAsync(cancellationToken);
             await Trans.WriteAsync(TJSONProtocolConstants.LeftBracket, cancellationToken);
             PushContext(new JSONListContext(this));
         }
@@ -405,7 +405,7 @@
 
                 if (!skipContext)
                 {
-                    await Context.ReadAsync(cancellationToken);
+                    await Context.ReadConditionalDelimiterAsync(cancellationToken);
                 }
 
                 await ReadJsonSyntaxCharAsync(TJSONProtocolConstants.Quote, cancellationToken);
@@ -516,7 +516,7 @@
         /// </summary>
         private async Task<long> ReadJsonIntegerAsync(CancellationToken cancellationToken)
         {
-            await Context.ReadAsync(cancellationToken);
+            await Context.ReadConditionalDelimiterAsync(cancellationToken);
             if (Context.EscapeNumbers())
             {
                 await ReadJsonSyntaxCharAsync(TJSONProtocolConstants.Quote, cancellationToken);
@@ -544,7 +544,7 @@
         /// </summary>
         private async Task<double> ReadJsonDoubleAsync(CancellationToken cancellationToken)
         {
-            await Context.ReadAsync(cancellationToken);
+            await Context.ReadConditionalDelimiterAsync(cancellationToken);
             if (await Reader.PeekAsync(cancellationToken) == TJSONProtocolConstants.Quote[0])
             {
                 var arr = await ReadJsonStringAsync(true, cancellationToken);
@@ -618,7 +618,7 @@
 
         private async Task ReadJsonObjectStartAsync(CancellationToken cancellationToken)
         {
-            await Context.ReadAsync(cancellationToken);
+            await Context.ReadConditionalDelimiterAsync(cancellationToken);
             await ReadJsonSyntaxCharAsync(TJSONProtocolConstants.LeftBrace, cancellationToken);
             PushContext(new JSONPairContext(this));
         }
@@ -631,7 +631,7 @@
 
         private async Task ReadJsonArrayStartAsync(CancellationToken cancellationToken)
         {
-            await Context.ReadAsync(cancellationToken);
+            await Context.ReadConditionalDelimiterAsync(cancellationToken);
             await ReadJsonSyntaxCharAsync(TJSONProtocolConstants.LeftBracket, cancellationToken);
             PushContext(new JSONListContext(this));
         }
@@ -807,7 +807,7 @@
                 Proto = proto;
             }
 
-            public virtual async Task WriteAsync(CancellationToken cancellationToken)
+            public virtual async Task WriteConditionalDelimiterAsync(CancellationToken cancellationToken)
             {
                 if (cancellationToken.IsCancellationRequested)
                 {
@@ -815,7 +815,7 @@
                 }
             }
 
-            public virtual async Task ReadAsync(CancellationToken cancellationToken)
+            public virtual async Task ReadConditionalDelimiterAsync(CancellationToken cancellationToken)
             {
                 if (cancellationToken.IsCancellationRequested)
                 {
@@ -842,7 +842,7 @@
             {
             }
 
-            public override async Task WriteAsync(CancellationToken cancellationToken)
+            public override async Task WriteConditionalDelimiterAsync(CancellationToken cancellationToken)
             {
                 if (_first)
                 {
@@ -854,7 +854,7 @@
                 }
             }
 
-            public override async Task ReadAsync(CancellationToken cancellationToken)
+            public override async Task ReadConditionalDelimiterAsync(CancellationToken cancellationToken)
             {
                 if (_first)
                 {
@@ -885,7 +885,7 @@
             {
             }
 
-            public override async Task WriteAsync(CancellationToken cancellationToken)
+            public override async Task WriteConditionalDelimiterAsync(CancellationToken cancellationToken)
             {
                 if (_first)
                 {
@@ -899,7 +899,7 @@
                 }
             }
 
-            public override async Task ReadAsync(CancellationToken cancellationToken)
+            public override async Task ReadConditionalDelimiterAsync(CancellationToken cancellationToken)
             {
                 if (_first)
                 {