* json formatting

Ladder99 · Jul 27, 2021 · abe26bc · abe26bc
1 parent 31c6ad6
commit abe26bc
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/fanuc/handlers/Native.cs b/fanuc/handlers/Native.cs
@@ -2,13 +2,16 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using l99.driver.@base;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using NJsonSchema;
 
 namespace l99.driver.fanuc.handlers
 {
     public class Native: Handler
     {
+        private readonly Formatting jsonFormatting = Formatting.None;
+
         private Dictionary<string,string> _publishedSchemas = new Dictionary<string, string>();
 
         public Native(Machine machine) : base(machine)
@@ -49,7 +52,7 @@ public Native(Machine machine) : base(machine)
         protected override async Task afterDataArrivalAsync(Veneers veneers, Veneer veneer, dynamic? onArrival)
         {
             var topic = $"fanuc/{veneers.Machine.Id}-all/{veneer.Name}{(veneer.SliceKey == null ? string.Empty : "/" + veneer.SliceKey.ToString())}";
-            string payload = JObject.FromObject(onArrival).ToString();
+            string payload = JObject.FromObject(onArrival).ToString(jsonFormatting);
             await veneers.Machine.Broker.PublishArrivalAsync(topic, payload);
         }
 
@@ -86,7 +89,7 @@ protected override async Task afterDataArrivalAsync(Veneers veneers, Veneer vene
         protected override async Task afterDataChangeAsync(Veneers veneers, Veneer veneer, dynamic? onChange)
         {
             var topic = $"fanuc/{veneers.Machine.Id}/{veneer.Name}{(veneer.SliceKey == null ? string.Empty : "/" + veneer.SliceKey.ToString())}";
-            string payload = JObject.FromObject(onChange).ToString();
+            string payload = JObject.FromObject(onChange).ToString(jsonFormatting);
             await veneers.Machine.Broker.PublishChangeAsync(topic, payload);
 
             if (!_publishedSchemas.ContainsKey(veneer.Name))
@@ -125,7 +128,7 @@ protected override async Task afterSweepCompleteAsync(Machine machine, dynamic?
         {
             string topic_all = $"fanuc/{machine.Id}-all/ping";
             string topic = $"fanuc/{machine.Id}/ping";
-            string payload = JObject.FromObject(onSweepComplete).ToString();
+            string payload = JObject.FromObject(onSweepComplete).ToString(jsonFormatting);
 
             await machine.Broker.PublishArrivalStatusAsync(topic_all, payload);
             await machine.Broker.PublishChangeStatusAsync(topic, payload);