Merge pull request #919 from AArnott/removeAddedAPIs

Remove properties inadvertently made public
microsoft · May 16, 2023 · 5c5f52e · 5c5f52e
2 parents 3d86350 + 1452083
commit 5c5f52e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/src/StreamJsonRpc/FormatterBase.cs b/src/StreamJsonRpc/FormatterBase.cs
@@ -45,6 +45,12 @@ public abstract class FormatterBase : IJsonRpcFormatterState, IJsonRpcInstanceCo
     /// </summary>
     private MessageFormatterRpcMarshaledContextTracker? rpcMarshaledContextTracker;
 
+    private RequestId serializingMessageWithId;
+
+    private RequestId deserializingMessageWithId;
+
+    private bool serializingRequest;
+
     /// <summary>
     /// Initializes a new instance of the <see cref="FormatterBase"/> class.
     /// </summary>
@@ -64,13 +70,13 @@ protected interface IMessageWithTopLevelPropertyBag
     }
 
     /// <inheritdoc  />
-    public RequestId SerializingMessageWithId { get; private set; }
+    RequestId IJsonRpcFormatterState.SerializingMessageWithId => this.serializingMessageWithId;
 
     /// <inheritdoc  />
-    public RequestId DeserializingMessageWithId { get; private set; }
+    RequestId IJsonRpcFormatterState.DeserializingMessageWithId => this.deserializingMessageWithId;
 
     /// <inheritdoc  />
-    public bool SerializingRequest { get; private set; }
+    bool IJsonRpcFormatterState.SerializingRequest => this.serializingRequest;
 
     /// <inheritdoc/>
     JsonRpc IJsonRpcInstanceContainer.Rpc
@@ -254,10 +260,10 @@ public DeserializationTracking(FormatterBase formatter, JsonRpcMessage message,
 
             // Deserialization of messages should never occur concurrently for a single instance of a formatter.
             // But we may be nested in another, in which case, this should do nothing.
-            if (formatter.DeserializingMessageWithId.IsEmpty)
+            if (formatter.deserializingMessageWithId.IsEmpty)
             {
                 formatter.DeserializingMessage = message;
-                formatter.DeserializingMessageWithId = (message as IJsonRpcMessageWithId)?.RequestId ?? default;
+                formatter.deserializingMessageWithId = (message as IJsonRpcMessageWithId)?.RequestId ?? default;
 
                 // Consider the attribute applied to the particular overload that we're considering right now.
                 formatter.ApplicableMethodAttributeOnDeserializingMethod = message is JsonRpcRequest { Method: not null } request ? formatter.JsonRpc?.GetJsonRpcMethodAttribute(request.Method, parameters) : null;
@@ -273,7 +279,7 @@ public void Dispose()
         {
             if (this.formatter is not null)
             {
-                this.formatter.DeserializingMessageWithId = default;
+                this.formatter.deserializingMessageWithId = default;
                 this.formatter.DeserializingMessage = null;
                 this.formatter.ApplicableMethodAttributeOnDeserializingMethod = null;
             }
@@ -297,17 +303,17 @@ public SerializationTracking(FormatterBase formatter, JsonRpcMessage message)
             Requires.NotNull(formatter);
 
             this.formatter = formatter;
-            this.formatter.SerializingMessageWithId = (message as IJsonRpcMessageWithId)?.RequestId ?? default;
-            this.formatter.SerializingRequest = message is JsonRpcRequest;
+            this.formatter.serializingMessageWithId = (message as IJsonRpcMessageWithId)?.RequestId ?? default;
+            this.formatter.serializingRequest = message is JsonRpcRequest;
         }
 
         /// <summary>
         /// Clears serialization state.
         /// </summary>
         public void Dispose()
         {
-            this.formatter.SerializingMessageWithId = default;
-            this.formatter.SerializingRequest = false;
+            this.formatter.serializingMessageWithId = default;
+            this.formatter.serializingRequest = false;
         }
     }
 

diff --git a/src/StreamJsonRpc/SystemTextJsonFormatter.cs b/src/StreamJsonRpc/SystemTextJsonFormatter.cs
@@ -24,7 +24,7 @@ namespace StreamJsonRpc;
 /// <summary>
 /// A formatter that emits UTF-8 encoded JSON where user data should be serializable via the <see cref="JsonSerializer"/>.
 /// </summary>
-public class SystemTextJsonFormatter : FormatterBase, IJsonRpcMessageFormatter, IJsonRpcMessageTextFormatter, IJsonRpcInstanceContainer, IJsonRpcFormatterState, IJsonRpcMessageFactory, IJsonRpcFormatterTracingCallbacks
+public class SystemTextJsonFormatter : FormatterBase, IJsonRpcMessageFormatter, IJsonRpcMessageTextFormatter, IJsonRpcInstanceContainer, IJsonRpcMessageFactory, IJsonRpcFormatterTracingCallbacks
 {
     private static readonly JsonWriterOptions WriterOptions = new() { };
 

diff --git a/src/StreamJsonRpc/netstandard2.0/PublicAPI.Unshipped.txt b/src/StreamJsonRpc/netstandard2.0/PublicAPI.Unshipped.txt
@@ -16,7 +16,6 @@ StreamJsonRpc.FormatterBase.DeserializationTracking
 StreamJsonRpc.FormatterBase.DeserializationTracking.DeserializationTracking() -> void
 StreamJsonRpc.FormatterBase.DeserializationTracking.DeserializationTracking(StreamJsonRpc.FormatterBase! formatter, StreamJsonRpc.Protocol.JsonRpcMessage! message, System.ReadOnlySpan<System.Reflection.ParameterInfo!> parameters) -> void
 StreamJsonRpc.FormatterBase.DeserializationTracking.Dispose() -> void
-StreamJsonRpc.FormatterBase.DeserializingMessageWithId.get -> StreamJsonRpc.RequestId
 StreamJsonRpc.FormatterBase.Dispose() -> void
 StreamJsonRpc.FormatterBase.DuplexPipeTracker.get -> StreamJsonRpc.Reflection.MessageFormatterDuplexPipeTracker!
 StreamJsonRpc.FormatterBase.EnumerableTracker.get -> StreamJsonRpc.Reflection.MessageFormatterEnumerableTracker!
@@ -44,8 +43,6 @@ StreamJsonRpc.FormatterBase.SerializationTracking
 StreamJsonRpc.FormatterBase.SerializationTracking.Dispose() -> void
 StreamJsonRpc.FormatterBase.SerializationTracking.SerializationTracking() -> void
 StreamJsonRpc.FormatterBase.SerializationTracking.SerializationTracking(StreamJsonRpc.FormatterBase! formatter, StreamJsonRpc.Protocol.JsonRpcMessage! message) -> void
-StreamJsonRpc.FormatterBase.SerializingMessageWithId.get -> StreamJsonRpc.RequestId
-StreamJsonRpc.FormatterBase.SerializingRequest.get -> bool
 StreamJsonRpc.FormatterBase.TopLevelPropertyBagBase
 StreamJsonRpc.FormatterBase.TopLevelPropertyBagBase.OutboundProperties.get -> System.Collections.Generic.Dictionary<string!, (System.Type! DeclaredType, object? Value)>!
 StreamJsonRpc.FormatterBase.TopLevelPropertyBagBase.TopLevelPropertyBagBase(bool isOutbound) -> void

diff --git a/src/StreamJsonRpc/netstandard2.1/PublicAPI.Unshipped.txt b/src/StreamJsonRpc/netstandard2.1/PublicAPI.Unshipped.txt
@@ -16,7 +16,6 @@ StreamJsonRpc.FormatterBase.DeserializationTracking
 StreamJsonRpc.FormatterBase.DeserializationTracking.DeserializationTracking() -> void
 StreamJsonRpc.FormatterBase.DeserializationTracking.DeserializationTracking(StreamJsonRpc.FormatterBase! formatter, StreamJsonRpc.Protocol.JsonRpcMessage! message, System.ReadOnlySpan<System.Reflection.ParameterInfo!> parameters) -> void
 StreamJsonRpc.FormatterBase.DeserializationTracking.Dispose() -> void
-StreamJsonRpc.FormatterBase.DeserializingMessageWithId.get -> StreamJsonRpc.RequestId
 StreamJsonRpc.FormatterBase.Dispose() -> void
 StreamJsonRpc.FormatterBase.DuplexPipeTracker.get -> StreamJsonRpc.Reflection.MessageFormatterDuplexPipeTracker!
 StreamJsonRpc.FormatterBase.EnumerableTracker.get -> StreamJsonRpc.Reflection.MessageFormatterEnumerableTracker!
@@ -44,8 +43,6 @@ StreamJsonRpc.FormatterBase.SerializationTracking
 StreamJsonRpc.FormatterBase.SerializationTracking.Dispose() -> void
 StreamJsonRpc.FormatterBase.SerializationTracking.SerializationTracking() -> void
 StreamJsonRpc.FormatterBase.SerializationTracking.SerializationTracking(StreamJsonRpc.FormatterBase! formatter, StreamJsonRpc.Protocol.JsonRpcMessage! message) -> void
-StreamJsonRpc.FormatterBase.SerializingMessageWithId.get -> StreamJsonRpc.RequestId
-StreamJsonRpc.FormatterBase.SerializingRequest.get -> bool
 StreamJsonRpc.FormatterBase.TopLevelPropertyBagBase
 StreamJsonRpc.FormatterBase.TopLevelPropertyBagBase.OutboundProperties.get -> System.Collections.Generic.Dictionary<string!, (System.Type! DeclaredType, object? Value)>!
 StreamJsonRpc.FormatterBase.TopLevelPropertyBagBase.TopLevelPropertyBagBase(bool isOutbound) -> void