undo rename

Author: garethpotter

src/ThingSet.Client/ThingSetClient.cs

@@ -85,17 +85,17 @@ public IEnumerable<ThingSetNode> GetNodes(ThingSetNodeEnumerationOptions options
 
     public object? Get(uint id)
     {
-        return DoRequest(ThingSetBinaryRequestType.Get, cw => cw.WriteUInt32(id));
+        return DoRequest(ThingSetRequest.Get, cw => cw.WriteUInt32(id));
     }
 
     public object? Get(string path)
     {
-        return DoRequest(ThingSetBinaryRequestType.Get, cw => cw.WriteTextString(path));
+        return DoRequest(ThingSetRequest.Get, cw => cw.WriteTextString(path));
     }
 
     public object? Fetch(uint id, object arg)
     {
-        return DoRequest(ThingSetBinaryRequestType.Fetch, cw =>
+        return DoRequest(ThingSetRequest.Fetch, cw =>
         {
             cw.WriteUInt32(id);
             CborSerialiser.Write(cw, arg);
@@ -104,7 +104,7 @@ public IEnumerable<ThingSetNode> GetNodes(ThingSetNodeEnumerationOptions options
 
     public object? Fetch(uint id, params object[] args)
     {
-        return DoRequest(ThingSetBinaryRequestType.Fetch, cw =>
+        return DoRequest(ThingSetRequest.Fetch, cw =>
         {
             cw.WriteUInt32(id);
             if (args.Length == 0)
@@ -120,7 +120,7 @@ public IEnumerable<ThingSetNode> GetNodes(ThingSetNodeEnumerationOptions options
 
     public object? Fetch(string path)
     {
-        return DoRequest(ThingSetBinaryRequestType.Fetch, cw =>
+        return DoRequest(ThingSetRequest.Fetch, cw =>
         {
             cw.WriteTextString(path);
             cw.WriteNull();
@@ -129,7 +129,7 @@ public IEnumerable<ThingSetNode> GetNodes(ThingSetNodeEnumerationOptions options
 
     public object? Update(string fullyQualifiedName, object value)
     {
-        return DoRequest(ThingSetBinaryRequestType.Update, cw =>
+        return DoRequest(ThingSetRequest.Update, cw =>
         {
             int index = fullyQualifiedName.LastIndexOf('/');
             string pathToParent = index > 0 ? fullyQualifiedName.Substring(0, index) : String.Empty;
@@ -145,7 +145,7 @@ public IEnumerable<ThingSetNode> GetNodes(ThingSetNodeEnumerationOptions options
 
     public object? Exec(uint id, params object[] args)
     {
-        return DoRequest(ThingSetBinaryRequestType.Exec, cw =>
+        return DoRequest(ThingSetRequest.Exec, cw =>
         {
             cw.WriteUInt32(id);
             CborSerialiser.Write(cw, args);
@@ -154,22 +154,22 @@ public IEnumerable<ThingSetNode> GetNodes(ThingSetNodeEnumerationOptions options
 
     public object? Exec(string path, params object[] args)
     {
-        return DoRequest(ThingSetBinaryRequestType.Exec, cw =>
+        return DoRequest(ThingSetRequest.Exec, cw =>
         {
             cw.WriteTextString(path);
             CborSerialiser.Write(cw, args);
         });
     }
 
-    private object? DoRequest(ThingSetBinaryRequestType action, Action<CborWriter> write)
+    private object? DoRequest(ThingSetRequest action, Action<CborWriter> write)
     {
         byte[] buffer = new byte[4095];
         Span<byte> span = buffer;
         int length = 0;
         if (TargetNodeID.HasValue)
         {
             // prefix the request with node to forward to
-            span[0] = (byte)ThingSetBinaryRequestType.Forward;
+            span[0] = (byte)ThingSetRequest.Forward;
             CborWriter w = new CborWriter(CborConformanceMode.Lax);
             w.WriteTextString($"{TargetNodeID.Value:x}");
             w.Encode(span.Slice(1));

src/ThingSet.Common.Transports.Can/CanClientTransport.cs

@@ -197,7 +197,7 @@ private void RunSubscriptionThread()
                                 if (type == MultiFrameMessageType.Single || type == MultiFrameMessageType.Last)
                                 {
                                     ReadOnlyMemory<byte> memory = buffer.Buffer;
-                                    if (buffer.Buffer[0] == (byte)ThingSetBinaryRequestType.Report)
+                                    if (buffer.Buffer[0] == (byte)ThingSetRequest.Report)
                                     {
                                         NotifyReport(memory.Slice(1, buffer.Position - 1));
                                     }

src/ThingSet.Common.Transports.Ip/IpClientTransport.cs

@@ -118,7 +118,7 @@ private async void RunSubscriptionThread()
                     buffer.Append(result.Buffer);
                 }
                 if ((messageType == MessageType.Last || messageType == MessageType.Single) &&
-                    buffer.Buffer[0] == (byte)ThingSetBinaryRequestType.Report)
+                    buffer.Buffer[0] == (byte)ThingSetRequest.Report)
                 {
                     ReadOnlyMemory<byte> memory = buffer.Buffer;
                     var len = memory.Length;

…cols/Binary/ThingSetBinaryRequestType.cs …mmon/Protocols/Binary/ThingSetRequest.cssrc/ThingSet.Common/Protocols/Binary/ThingSetBinaryRequestType.cs renamed to src/ThingSet.Common/Protocols/Binary/ThingSetRequest.cs src/ThingSet.Common/Protocols/Binary/ThingSetBinaryRequestType.cs renamed to src/ThingSet.Common/Protocols/Binary/ThingSetRequest.cs

@@ -5,7 +5,7 @@
  */
 namespace ThingSet.Common.Protocols.Binary;
 
-public enum ThingSetBinaryRequestType : byte
+public enum ThingSetRequest : byte
 {
     Get     = 0x01,
     Exec    = 0x02,

…rotocols/Text/ThingSetTextRequestType.cs …Common/Protocols/Text/ThingSetRequest.cssrc/ThingSet.Common/Protocols/Text/ThingSetTextRequestType.cs renamed to src/ThingSet.Common/Protocols/Text/ThingSetRequest.cs src/ThingSet.Common/Protocols/Text/ThingSetTextRequestType.cs renamed to src/ThingSet.Common/Protocols/Text/ThingSetRequest.cs

@@ -5,7 +5,7 @@
  */
 namespace ThingSet.Common.Protocols.Text;
 
-public enum ThingSetTextRequestType : byte
+public enum ThingSetRequest : byte
 {
     GetFetch = (byte)'?', /**< Function code for GET and FETCH requests in text mode. */
     Exec     = (byte)'!', /**< Function code for EXEC request in text mode. */

src/ThingSet.Server/ThingSetServer.cs

@@ -328,12 +328,12 @@ protected ThingSetRequestContextBase(Memory<byte> request)
 
 internal class ThingSetBinaryRequestContext : ThingSetRequestContextBase
 {
-    private readonly ThingSetBinaryRequestType _requestType;
+    private readonly ThingSetRequest _requestType;
     private readonly CborReader _cborReader;
 
     internal ThingSetBinaryRequestContext(Memory<byte> request) : base(request)
     {
-        _requestType = (ThingSetBinaryRequestType)request.Span[0];
+        _requestType = (ThingSetRequest)request.Span[0];
         _cborReader = new CborReader(request.Slice(1), CborConformanceMode.Lax, allowMultipleRootLevelValues: true);
 
         CborReaderState state = _cborReader.PeekState();
@@ -370,8 +370,8 @@ internal ThingSetBinaryRequestContext(Memory<byte> request) : base(request)
         RequestBody = request.Slice(request.Length - _cborReader.BytesRemaining);
     }
 
-    public override bool IsGet => _requestType == ThingSetBinaryRequestType.Get;
-    public override bool IsFetch => _requestType == ThingSetBinaryRequestType.Fetch;
-    public override bool IsUpdate => _requestType == ThingSetBinaryRequestType.Update;
-    public override bool IsExec => _requestType == ThingSetBinaryRequestType.Exec;
+    public override bool IsGet => _requestType == ThingSetRequest.Get;
+    public override bool IsFetch => _requestType == ThingSetRequest.Fetch;
+    public override bool IsUpdate => _requestType == ThingSetRequest.Update;
+    public override bool IsExec => _requestType == ThingSetRequest.Exec;
 }