fix: use standard C# property naming structure, jsonproperties to conform to api

Main -> Development

src/PepperDash.Essentials.Core/Routing/Extensions.cs

@@ -1,11 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using Crestron.SimplSharpPro.Keypads;
+using Crestron.SimplSharpPro.Keypads;
 using PepperDash.Essentials.Core.Queues;
 using PepperDash.Essentials.Core.Routing;
 using Serilog.Events;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
 using Debug = PepperDash.Core.Debug;
 
 
@@ -115,7 +115,7 @@ namespace PepperDash.Essentials.Core
         public static (RouteDescriptor, RouteDescriptor) GetRouteToSource(this IRoutingInputs destination, IRoutingOutputs source, eRoutingSignalType signalType, RoutingInputPort destinationPort, RoutingOutputPort sourcePort)
         {
             // if it's a single signal type, find the route
-            if (!signalType.HasFlag(eRoutingSignalType.AudioVideo) &&
+            if (!signalType.HasFlag(eRoutingSignalType.AudioVideo) && 
                 !(signalType.HasFlag(eRoutingSignalType.Video) && signalType.HasFlag(eRoutingSignalType.SecondaryAudio)))
             {
                 var singleTypeRouteDescriptor = new RouteDescriptor(source, destination, destinationPort, signalType);
@@ -134,15 +134,14 @@ namespace PepperDash.Essentials.Core
             }
             // otherwise, audioVideo needs to be handled as two steps.
 
-            Debug.LogMessage(LogEventLevel.Debug, "Attempting to build source route from {destinationKey} to {sourceKey} of type {type}", destination, source.Key, signalType);
+            Debug.LogMessage(LogEventLevel.Debug, "Attempting to build source route from {sourceKey} of type {type}", destination, source.Key);
 
             RouteDescriptor audioRouteDescriptor;
 
             if (signalType.HasFlag(eRoutingSignalType.SecondaryAudio))
             {
                 audioRouteDescriptor = new RouteDescriptor(source, destination, destinationPort, eRoutingSignalType.SecondaryAudio);
-            }
-            else
+            } else
             {
                 audioRouteDescriptor = new RouteDescriptor(source, destination, destinationPort, eRoutingSignalType.Audio);
             }
@@ -200,13 +199,13 @@ namespace PepperDash.Essentials.Core
                 Source = source,
                 SourcePort = sourcePort,
                 SignalType = signalType
-            };
+            };            
 
             var coolingDevice = destination as IWarmingCooling;
 
             //We already have a route request for this device, and it's a cooling device and is cooling
             if (RouteRequests.TryGetValue(destination.Key, out RouteRequest existingRouteRequest) && coolingDevice != null && coolingDevice.IsCoolingDownFeedback.BoolValue == true)
-            {
+            {                
                 coolingDevice.IsCoolingDownFeedback.OutputChange -= existingRouteRequest.HandleCooldown;
 
                 coolingDevice.IsCoolingDownFeedback.OutputChange += routeRequest.HandleCooldown;
@@ -220,7 +219,7 @@ namespace PepperDash.Essentials.Core
 
             //New Request
             if (coolingDevice != null && coolingDevice.IsCoolingDownFeedback.BoolValue == true)
-            {
+            {               
                 coolingDevice.IsCoolingDownFeedback.OutputChange += routeRequest.HandleCooldown;
 
                 RouteRequests.Add(destination.Key, routeRequest);
@@ -240,9 +239,9 @@ namespace PepperDash.Essentials.Core
                 Debug.LogMessage(LogEventLevel.Information, "Device: {destination} is NOT cooling down.  Removing stored route request and routing to source key: {sourceKey}", null, destination.Key, routeRequest.Source.Key);
             }
 
-            routeRequestQueue.Enqueue(new ReleaseRouteQueueItem(ReleaseRouteInternal, destination, destinationPort?.Key ?? string.Empty, false));
+            routeRequestQueue.Enqueue(new ReleaseRouteQueueItem(ReleaseRouteInternal, destination,destinationPort?.Key ?? string.Empty, false));
 
-            routeRequestQueue.Enqueue(new RouteRequestQueueItem(RunRouteRequest, routeRequest));
+            routeRequestQueue.Enqueue(new RouteRequestQueueItem(RunRouteRequest, routeRequest));            
         }
 
         /// <summary>
@@ -273,8 +272,7 @@ namespace PepperDash.Essentials.Core
 
                 audioOrSingleRoute.ExecuteRoutes();
                 videoRoute?.ExecuteRoutes();
-            }
-            catch (Exception ex)
+            } catch(Exception ex)
             {
                 Debug.LogMessage(ex, "Exception Running Route Request {request}", null, request);
             }
@@ -307,10 +305,9 @@ namespace PepperDash.Essentials.Core
                     Debug.LogMessage(LogEventLevel.Information, "Releasing current route: {0}", destination, current.Source.Key);
                     current.ReleaseRoutes(clearRoute);
                 }
-            }
-            catch (Exception ex)
+            } catch (Exception ex)
             {
-                Debug.LogMessage(ex, "Exception releasing route for '{destination}':'{inputPortKey}'", null, destination?.Key ?? null, string.IsNullOrEmpty(inputPortKey) ? "auto" : inputPortKey);
+                Debug.LogMessage(ex, "Exception releasing route for '{destination}':'{inputPortKey}'",null, destination?.Key ?? null, string.IsNullOrEmpty(inputPortKey) ? "auto" : inputPortKey);
             }
         }
 

src/PepperDash.Essentials.Core/UDMApi/CustomProperties.cs

@@ -0,0 +1,15 @@
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.UDMApi
+{
+
+    internal class CustomProperties
+    {
+        [JsonProperty("label")]
+        public string Label { get; set; }
+
+        [JsonProperty("value")]
+        public string Value { get; set; }
+    }
+
+}

src/PepperDash.Essentials.Core/UDMApi/DeviceStatus.cs

@@ -0,0 +1,29 @@
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.UDMApi
+{
+    internal class DeviceStatus
+    {
+        [JsonProperty("label")]
+        public string Label { get; set; }
+
+        [JsonProperty("status")]
+        public string Status { get; set; }
+
+        [JsonProperty("description")]
+        public string Description { get; set; }
+
+        [JsonProperty("videoSource")]
+        public string VideoSource { get; set; }
+
+        [JsonProperty("audioSource")]
+        public string AudioSource { get; set; }
+
+        [JsonProperty("usage")]
+        public int Usage { get; set; }
+
+        [JsonProperty("error")]
+        public string Error { get; set; }
+    }
+
+}

src/PepperDash.Essentials.Core/UDMApi/RoomResponse.cs

@@ -0,0 +1,35 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.UDMApi
+{
+    /// <summary>
+    /// Represents the complete room response for UDM API
+    /// </summary>
+    internal class RoomResponse
+    {
+        /// <summary>
+        /// API version string
+        /// </summary>
+        [JsonProperty("apiVersion")]
+        public string ApiVersion { get; set; }
+
+        /// <summary>
+        /// Standard room properties
+        /// </summary>
+        [JsonProperty("standard")]
+        public StandardProperties Standard { get; set; }
+
+        /// <summary>
+        /// Status information including devices
+        /// </summary>
+        [JsonProperty("status")]
+        public StatusProperties Status { get; set; }
+
+        /// <summary>
+        /// Custom properties dictionary
+        /// </summary>
+        [JsonProperty("custom")]
+        public Dictionary<string, CustomProperties> Custom { get; set; }
+    }
+}

src/PepperDash.Essentials.Core/UDMApi/StandardProperties.cs

@@ -0,0 +1,26 @@
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.UDMApi
+{
+    internal class StandardProperties
+    {
+        [JsonProperty("version")]
+        public string Version { get; set; }
+
+        [JsonProperty("state")]
+        public string State { get; set; }
+
+        [JsonProperty("error")]
+        public string Error { get; set; }
+
+        [JsonProperty("occupancy")]
+        public bool Occupancy { get; set; }
+
+        [JsonProperty("helpRequest")]
+        public string HelpRequest { get; set; }
+
+        [JsonProperty("activity")]
+        public string Activity { get; set; }
+    }
+
+}

src/PepperDash.Essentials.Core/UDMApi/StatusProperties.cs

@@ -0,0 +1,14 @@
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace PepperDash.Essentials.Core.UDMApi
+{
+    internal class StatusProperties
+    {
+        /// <summary>
+        /// Dictionary of device statuses keyed by device identifier
+        /// </summary>
+        [JsonProperty("devices")]
+        public Dictionary<string, DeviceStatus> Devices { get; set; }
+    }
+}

src/PepperDash.Essentials.Devices.Common/Generic/GenericSink.cs

@@ -1,10 +1,8 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using PepperDash.Core;
 using PepperDash.Core.Logging;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
-using PepperDash.Essentials.Core.Routing;
 using Serilog.Events;
 
 namespace PepperDash.Essentials.Devices.Common.Generic
@@ -12,17 +10,8 @@ namespace PepperDash.Essentials.Devices.Common.Generic
     /// <summary>
     /// Represents a GenericSink
     /// </summary>
-    public class GenericSink : EssentialsDevice, IRoutingSinkWithSwitchingWithInputPort, ICurrentSources
+    public class GenericSink : EssentialsDevice, IRoutingSinkWithSwitchingWithInputPort
     {
-        /// <inheritdoc/> 
-		public Dictionary<eRoutingSignalType, SourceListItem> CurrentSources { get; private set; }
-
-        /// <inheritdoc/>
-        public Dictionary<eRoutingSignalType, string> CurrentSourceKeys { get; private set; }
-
-        /// <inheritdoc />
-        public event EventHandler CurrentSourcesChanged;
-
         /// <summary>
         /// Initializes a new instance of the GenericSink class
         /// </summary>
@@ -35,49 +24,6 @@ namespace PepperDash.Essentials.Devices.Common.Generic
             var inputPort = new RoutingInputPort(RoutingPortNames.AnyVideoIn, eRoutingSignalType.AudioVideo | eRoutingSignalType.SecondaryAudio, eRoutingPortConnectionType.Hdmi, null, this);
 
             InputPorts.Add(inputPort);
-
-            CurrentSources = new Dictionary<eRoutingSignalType, SourceListItem>
-            {
-                { eRoutingSignalType.Audio, null },
-                { eRoutingSignalType.Video, null },
-            };
-
-            CurrentSourceKeys = new Dictionary<eRoutingSignalType, string>
-            {
-                { eRoutingSignalType.Audio, string.Empty },
-                { eRoutingSignalType.Video, string.Empty },
-            };
-        }
-
-        /// <inheritdoc />
-		public void SetCurrentSource(eRoutingSignalType signalType, string sourceListKey, SourceListItem sourceListItem)
-        {
-            foreach (eRoutingSignalType type in Enum.GetValues(typeof(eRoutingSignalType)))
-            {
-                var flagValue = Convert.ToInt32(type);
-                // Skip if flagValue is 0 or not a power of two (i.e., not a single-bit flag).
-                // (flagValue & (flagValue - 1)) != 0 checks if more than one bit is set.
-                if (flagValue == 0 || (flagValue & (flagValue - 1)) != 0)
-                {
-                    this.LogDebug("Skipping {type}", type);
-                    continue;
-                }
-
-                this.LogDebug("setting {type}", type);
-
-                if (signalType.HasFlag(type))
-                {
-                    UpdateCurrentSources(type, sourceListKey, sourceListItem);
-                }
-            }
-            // Raise the CurrentSourcesChanged event
-            CurrentSourcesChanged?.Invoke(this, EventArgs.Empty);
-        }
-
-        private void UpdateCurrentSources(eRoutingSignalType signalType, string sourceListKey, SourceListItem sourceListItem)
-        {
-            CurrentSources[signalType] = sourceListItem;
-            CurrentSourceKeys[signalType] = sourceListKey;
         }
 
         /// <summary>

src/PepperDash.Essentials.MobileControl.Messengers/Messengers/CurrentSourcesMessenger.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Linq;
@@ -40,14 +39,10 @@ namespace PepperDash.Essentials.AppServer.Messengers
 
       sourceDevice.CurrentSourcesChanged += (sender, e) =>
       {
-        // need to copy the dictionaries to avoid enumeration issues
-        var currentSourceKeys = sourceDevice.CurrentSourceKeys.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
-        var currentSources = sourceDevice.CurrentSources.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
-        
         PostStatusMessage(JToken.FromObject(new
         {
-          currentSourceKeys,
-          currentSources,
+          currentSourceKeys = sourceDevice.CurrentSourceKeys,
+          currentSources = sourceDevice.CurrentSources
         }));
       };
     }