addresses supporting byte[] in direct methods and making TwinProperties able to be directly converted to json

e2e/LongHaul/device/IotHub.cs

@@ -14,6 +14,7 @@
 using Azure.Storage.Blobs.Models;
 using Azure.Storage.Blobs.Specialized;
 using Mash.Logging;
+using Newtonsoft.Json;
 using Microsoft.Azure.Devices.Client;
 using static Microsoft.Azure.Devices.LongHaul.Device.LoggingConstants;
 
@@ -472,20 +473,20 @@ private Task<DirectMethodResponse> DirectMethodCallback(DirectMethodRequest meth
 
                             // Log the current time again and send the response back to the service app.
                             methodPayload.SentOnUtc = DateTimeOffset.UtcNow;
-                            return Task.FromResult(new DirectMethodResponse(200) { Payload = methodPayload });
+                            return Task.FromResult(new DirectMethodResponse(200) { Payload = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(methodPayload)) });
                         }
                     }
                     catch (Exception ex)
                     {
                         _logger.Trace($"Failed to parse the payload for direct method {methodRequest.MethodName} due to {ex}.", TraceSeverity.Error);
-                        return Task.FromResult(new DirectMethodResponse(400) { Payload = ex.Message });
+                        return Task.FromResult(new DirectMethodResponse(400) { Payload = Encoding.UTF8.GetBytes(ex.Message) });
                     }
                     break;
             }
 
             string unsupportedMessage = $"The direct method [{methodRequest.MethodName}] is not supported.";
             _logger.Trace(unsupportedMessage, TraceSeverity.Warning);
-            return Task.FromResult(new DirectMethodResponse(400) { Payload = unsupportedMessage });
+            return Task.FromResult(new DirectMethodResponse(400) { Payload = Encoding.UTF8.GetBytes(unsupportedMessage) });
         }
 
         private async Task DesiredPropertyUpdateCallbackAsync(DesiredProperties properties)

e2e/LongHaul/module/IotHub.cs

@@ -5,6 +5,7 @@
 using System.Diagnostics;
 using System.Text;
 using Mash.Logging;
+using Newtonsoft.Json;
 using Microsoft.Azure.Devices.Client;
 using static Microsoft.Azure.Devices.LongHaul.Module.LoggingConstants;
 
@@ -280,7 +281,7 @@ public async Task InvokeDirectMethodOnLeafClientAsync(string deviceId, string mo
                         CurrentTimeUtc = DateTimeOffset.UtcNow,
                     };
 
-                    var directMethodRequest = new EdgeModuleDirectMethodRequest(methodName, payload)
+                    var directMethodRequest = new EdgeModuleDirectMethodRequest(methodName, Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(payload)))
                     {
                         ResponseTimeout = TimeSpan.FromSeconds(30),
                     };
@@ -433,13 +434,13 @@ private Task<DirectMethodResponse> DirectMethodCallback(DirectMethodRequest meth
 
                             // Log the current time again and send the response back to the service app.
                             methodPayload.CurrentTimeUtc = DateTimeOffset.UtcNow;
-                            return Task.FromResult(new DirectMethodResponse(200) { Payload = methodPayload });
+                            return Task.FromResult(new DirectMethodResponse(200) { Payload = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(methodPayload)) });
                         }
                     }
                     catch (Exception ex)
                     {
                         _logger.Trace($"Failed to parse the payload for direct method {methodRequest.MethodName} due to {ex}.", TraceSeverity.Error);
-                        return Task.FromResult(new DirectMethodResponse(400) { Payload = ex.Message });
+                        return Task.FromResult(new DirectMethodResponse(400) { Payload = Encoding.UTF8.GetBytes(ex.Message) });
                     }
                     break;
 
@@ -456,20 +457,20 @@ private Task<DirectMethodResponse> DirectMethodCallback(DirectMethodRequest meth
 
                             // Log the current time again and send the response back to the service app.
                             methodPayload.CurrentTimeUtc = DateTimeOffset.UtcNow;
-                            return Task.FromResult(new DirectMethodResponse(200) { Payload = methodPayload });
+                            return Task.FromResult(new DirectMethodResponse(200) { Payload = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(methodPayload)) });
                         }
                     }
                     catch (Exception ex)
                     {
                         _logger.Trace($"Failed to parse the payload for direct method {methodRequest.MethodName} due to {ex}.", TraceSeverity.Error);
-                        return Task.FromResult(new DirectMethodResponse(400) { Payload = ex.Message });
+                        return Task.FromResult(new DirectMethodResponse(400) { Payload = Encoding.UTF8.GetBytes(ex.Message) });
                     }
                     break;
             }
 
             string unsupportedMessage = $"The direct method [{methodRequest.MethodName}] is not supported.";
             _logger.Trace(unsupportedMessage, TraceSeverity.Warning);
-            return Task.FromResult(new DirectMethodResponse(400) { Payload = unsupportedMessage });
+            return Task.FromResult(new DirectMethodResponse(400) { Payload = Encoding.UTF8.GetBytes(unsupportedMessage) });
         }
 
         private async Task DesiredPropertyUpdateCallbackAsync(DesiredProperties properties)

e2e/LongHaul/service/DeviceOperations.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Diagnostics;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Mash.Logging;
@@ -49,7 +50,7 @@ public async Task InvokeDirectMethodAsync(Logger logger, CancellationToken ct)
 
                 var methodInvocation = new DirectMethodServiceRequest("EchoPayload")
                 {
-                    Payload = payload,
+                    Payload = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(payload)),
                     ResponseTimeout = TimeSpan.FromSeconds(30),
                 };
 

e2e/LongHaul/service/ModuleOperations.cs

@@ -5,6 +5,7 @@
 using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Text;
 using Mash.Logging;
 using Newtonsoft.Json;
 using static Microsoft.Azure.Devices.LongHaul.Service.LoggingConstants;
@@ -49,7 +50,7 @@ public async Task InvokeDirectMethodAsync(Logger logger, CancellationToken ct)
 
                 var methodInvocation = new DirectMethodServiceRequest("EchoPayload")
                 {
-                    Payload = payload,
+                    Payload = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(payload)),
                     ResponseTimeout = TimeSpan.FromSeconds(30),
                 };
 

e2e/Tests/helpers/TestDeviceCallbackHandler.cs

@@ -68,7 +68,7 @@ public void Dispose()
         }
 
         // Set a direct method callback that expects a request with payload of type T.
-        internal async Task SetDeviceReceiveMethodAndRespondAsync<T>(object deviceResponsePayload, CancellationToken ct = default)
+        internal async Task SetDeviceReceiveMethodAndRespondAsync<T>(byte[] deviceResponsePayload, CancellationToken ct = default)
         {
             await _deviceClient.SetDirectMethodCallbackAsync(
                 (request) =>
@@ -78,7 +78,7 @@ await _deviceClient.SetDirectMethodCallbackAsync(
                     {
                         request.MethodName.Should().Be(ExpectedDirectMethodRequest.MethodName, "The expected method name should match what was sent from service");
 
-                        var expectedRequestPayload = (T)ExpectedDirectMethodRequest.Payload;
+                        byte[] expectedRequestPayload = ExpectedDirectMethodRequest.Payload;
                         request.TryGetPayload(out T actualRequestPayload).Should().BeTrue();
                         actualRequestPayload.Should().BeEquivalentTo(expectedRequestPayload, "The expected method data should match what was sent from service");
 

e2e/Tests/helpers/TestModuleCallbackHandler.cs

@@ -44,7 +44,7 @@ public void Dispose()
             _methodCallbackSemaphore?.Dispose();
         }
 
-        internal async Task SetModuleReceiveMethodAndRespondAsync<T>(object moduleResponsePayload, CancellationToken ct)
+        internal async Task SetModuleReceiveMethodAndRespondAsync<T>(byte[] moduleResponsePayload, CancellationToken ct)
         {
             await _moduleClient.SetDirectMethodCallbackAsync(
                 (request) =>
@@ -54,7 +54,7 @@ await _moduleClient.SetDirectMethodCallbackAsync(
                     {
                         request.MethodName.Should().Be(ExpectedDirectMethodRequest.MethodName, "The expected method name should match what was sent from service");
 
-                        var expectedRequestPayload = (T)ExpectedDirectMethodRequest.Payload;
+                        byte[] expectedRequestPayload = ExpectedDirectMethodRequest.Payload;
                         request.TryGetPayload(out T actualRequestPayload).Should().BeTrue();
                         actualRequestPayload.Should().BeEquivalentTo(expectedRequestPayload, "The expected method data should match what was sent from service");
 

e2e/Tests/iothub/device/CombinedClientOperationsPoolAmqpTests.cs

@@ -5,12 +5,14 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Text;
 using Microsoft.Azure.Devices.Client;
 using Microsoft.Azure.Devices.E2ETests.Helpers;
 using Microsoft.Azure.Devices.E2ETests.Helpers.Templates;
 using Microsoft.Azure.Devices.E2ETests.Methods;
 using Microsoft.Azure.Devices.E2ETests.Twins;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Newtonsoft.Json;
 
 namespace Microsoft.Azure.Devices.E2ETests
 {
@@ -64,7 +66,8 @@ async Task InitOperationAsync(TestDevice testDevice, TestDeviceCallbackHandler t
 
                 // Set method handler
                 VerboseTestLogger.WriteLine($"{nameof(CombinedClientOperationsPoolAmqpTests)}: Set direct method {MethodName} for device={testDevice.Id}");
-                Task methodCallbackSet = testDeviceCallbackHandler.SetDeviceReceiveMethodAndRespondAsync<DirectMethodRequestPayload>(s_deviceResponsePayload, ct);
+                Task methodCallbackSet = testDeviceCallbackHandler.SetDeviceReceiveMethodAndRespondAsync<DirectMethodRequestPayload>(
+                    Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(s_deviceResponsePayload)), ct);
                 initOperations.Add(methodCallbackSet);
 
                 // Set the twin desired properties callback
@@ -103,7 +106,7 @@ async Task TestOperationAsync(TestDevice testDevice, TestDeviceCallbackHandler t
                 VerboseTestLogger.WriteLine($"{nameof(CombinedClientOperationsPoolAmqpTests)}: Operation 3: Direct methods test for device={testDevice.Id}");
                 var directMethodRequest = new DirectMethodServiceRequest(MethodName)
                 {
-                    Payload = s_serviceRequestPayload,
+                    Payload = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(s_serviceRequestPayload)),
                     ResponseTimeout = s_defaultMethodResponseTimeout,
                 };
                 testDeviceCallbackHandler.ExpectedDirectMethodRequest = directMethodRequest;

e2e/Tests/iothub/device/DirectMethodE2eCustomPayloadTests.cs

@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Text;
 using FluentAssertions;
 using Microsoft.Azure.Devices.Client;
 using Microsoft.Azure.Devices.E2ETests.Helpers;
@@ -146,12 +147,13 @@ private async Task SendMethodAndRespondAsync<T>(
             await testDevice.OpenWithRetryAsync(ct).ConfigureAwait(false);
 
             using var testDeviceCallbackHandler = new TestDeviceCallbackHandler(deviceClient, testDevice.Id);
-            await testDeviceCallbackHandler.SetDeviceReceiveMethodAndRespondAsync<T>(directMethodResponseFromClient, ct);
+            await testDeviceCallbackHandler.SetDeviceReceiveMethodAndRespondAsync<T>(
+                Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(directMethodResponseFromClient)), ct);
 
             var directMethodRequest = new DirectMethodServiceRequest(MethodName)
             {
                 ResponseTimeout = s_defaultMethodResponseTimeout,
-                Payload = directMethodRequestFromService,
+                Payload = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(directMethodRequestFromService)),
             };
             testDeviceCallbackHandler.ExpectedDirectMethodRequest = directMethodRequest;
 

e2e/Tests/iothub/device/FaultInjectionPoolAmqpTests.MethodFaultInjectionPoolAmqpTests.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Text;
 using FluentAssertions;
 using Microsoft.Azure.Devices.Client;
 using Microsoft.Azure.Devices.E2ETests.Helpers;
@@ -103,7 +104,8 @@ private async Task SendMethodAndRespondRecoveryPoolOverAmqpAsync(
             async Task InitOperationAsync(TestDevice _, TestDeviceCallbackHandler testDeviceCallbackHandler, CancellationToken ct)
             {
                 await testDeviceCallbackHandler
-                    .SetDeviceReceiveMethodAndRespondAsync<DirectMethodRequestPayload>(s_deviceResponsePayload, ct)
+                    .SetDeviceReceiveMethodAndRespondAsync<DirectMethodRequestPayload>(
+                        Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(s_deviceResponsePayload)), ct)
                     .ConfigureAwait(false);
             }
 
@@ -114,7 +116,7 @@ async Task TestOperationAsync(TestDevice testDevice, TestDeviceCallbackHandler t
 
                 var directMethodRequest = new DirectMethodServiceRequest(MethodName)
                 {
-                    Payload = s_serviceRequestPayload,
+                    Payload = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(s_serviceRequestPayload)),
                     ResponseTimeout = s_defaultMethodResponseTimeout,
                 };
                 testDeviceCallbackHandler.ExpectedDirectMethodRequest = directMethodRequest;

e2e/Tests/iothub/device/MethodE2EPoolAmqpTests.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Text;
 using FluentAssertions;
 using Microsoft.Azure.Devices.Client;
 using Microsoft.Azure.Devices.E2ETests.Helpers;
@@ -57,15 +58,15 @@ private async Task SendMethodAndRespondPoolOverAmqp(
             async Task InitOperationAsync(TestDevice testDevice, TestDeviceCallbackHandler testDeviceCallbackHandler, CancellationToken ct)
             {
                 VerboseTestLogger.WriteLine($"{nameof(MethodE2EPoolAmqpTests)}: Setting method for device {testDevice.Id}");
-                await testDeviceCallbackHandler.SetDeviceReceiveMethodAndRespondAsync<DirectMethodRequestPayload>(s_deviceResponsePayload, ct).ConfigureAwait(false);
+                await testDeviceCallbackHandler.SetDeviceReceiveMethodAndRespondAsync<DirectMethodRequestPayload>(Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(s_deviceResponsePayload)), ct).ConfigureAwait(false);
             }
 
             async Task TestOperationAsync(TestDevice testDevice, TestDeviceCallbackHandler testDeviceCallbackHandler, CancellationToken ct)
             {
                 VerboseTestLogger.WriteLine($"{nameof(MethodE2EPoolAmqpTests)}: Preparing to receive method for device {testDevice.Id}");
                 var directMethodRequest = new DirectMethodServiceRequest(MethodName)
                 {
-                    Payload = s_serviceRequestPayload,
+                    Payload = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(s_serviceRequestPayload)),
                     ResponseTimeout = s_defaultMethodResponseTimeout,
                 };
                 testDeviceCallbackHandler.ExpectedDirectMethodRequest = directMethodRequest;