Edits

Author: gsteve88

articles/iot-hub/how-to-device-management.md

@@ -16,13 +16,13 @@ zone_pivot_groups: iot-hub-howto-c2d-1
 
 Back-end apps can use Azure IoT Hub primitives, such as [device twins](iot-hub-devguide-device-twins.md) and [direct methods](iot-hub-devguide-direct-methods.md), to remotely start and monitor device management actions on devices.
 
-Use a direct method to initiate device management actions (such as reboot, factory reset, and firmware update) from a back-end application.
+Use a direct method from a back-end application to initiate device management actions, such as reboot, factory reset, and firmware update.
 
 The device is responsible for:
 
-* Handling the method request sent from IoT Hub.
-* Initiating the corresponding device-specific action on the device.
-* Providing status updates through reported properties to IoT Hub.
+* Handling the direct method request sent from IoT Hub
+* Initiating the corresponding device-specific action on the device
+* Providing status updates through reported properties to IoT Hub
 
 This article shows you how a back-end app and a device app can work together to initiate and monitor a remote device action using a direct method.
 

includes/iot-hub-howto-device-management-dotnet.md

@@ -86,7 +86,9 @@ catch (Exception ex)
 }
 ```
 
-In this example, the `onReboot` callback method implements the direct method on the device. This code updates reported properties related to a device reboot. The reported properties can be read and verified by a IoT Hub or backend application, as demonstrated in the [Create a backend application](#create-a-backend-application) section of this article.
+Continuing the example, the `onReboot` callback method implements the direct method on the device.
+
+The handler function calls [MethodResponse](/dotnet/api/microsoft.azure.devices.client.methodresponse) to send a response acknowledgement to the calling application.
 
 ```csharp
 static Task<MethodResponse> onReboot(MethodRequest methodRequest, object userContext)
@@ -159,9 +161,9 @@ As a parameter to `CreateFromConnectionString`, supply the **service** shared ac
 [!INCLUDE [iot-authentication-service-connection-string.md](iot-authentication-service-connection-string.md)]
 
 ```csharp
-static ServiceClient client;
-static string connectionString = "{IoT hub service shared access policy connection string}";
-client = ServiceClient.CreateFromConnectionString(connectionString);
+ServiceClient serviceClient;
+string connectionString = "{IoT hub service shared access policy connection string}";
+serviceClient = ServiceClient.CreateFromConnectionString(connectionString);
 ```
 
 #### Connect using Microsoft Entra
@@ -178,13 +180,11 @@ To invoke a method on a device:
 This example calls the "reboot" method to initiate a reboot on the device. The "reboot" method is mapped to a listener on the device as described in the [Create a direct method callback](#create-a-direct-method-callback) section of this article.
 
 ```csharp
+static string targetDevice = "myDeviceId";
 CloudToDeviceMethod method = new CloudToDeviceMethod("reboot");
 method.ResponseTimeout = TimeSpan.FromSeconds(30);
 
-CloudToDeviceMethodResult result = await 
-
-static string targetDevice = "myDeviceId";
-client.InvokeDeviceMethodAsync(targetDevice, method);
+CloudToDeviceMethodResult response = await serviceClient.InvokeDeviceMethodAsync(targetDevice, method);
 
 Console.WriteLine("Invoked firmware update on device.");
 ```

includes/iot-hub-howto-device-management-java.md

@@ -33,7 +33,7 @@ import com.microsoft.azure.sdk.iot.device.*;
 
 ### Connect to a device
 
-The [DeviceClient](/java/api/com.microsoft.azure.sdk.iot.device.deviceclient) class exposes all the methods you require to interact with direct methods from the device.
+The [DeviceClient](/java/api/com.microsoft.azure.sdk.iot.device.deviceclient) class exposes all the methods you require to interact with direct methods on the device.
 
 To connect to a device:
 
@@ -106,7 +106,7 @@ As a parameter to the `DeviceMethod` constructor, supply the **service** shared
 For example:
 
 ```java
-public static final String iotHubConnectionString = "HostName=xxxxx.azure-devices.net;SharedAccessKeyName=service;SharedAccessKey=xxxxxxxxxxxxxxxxxxxxxxxx";
+String iotHubConnectionString = "HostName=xxxxx.azure-devices.net;SharedAccessKeyName=service;SharedAccessKey=xxxxxxxxxxxxxxxxxxxxxxxx";
 DeviceMethod methodClient = new DeviceMethod(iotHubConnectionString);
 ```
 
@@ -116,21 +116,32 @@ DeviceMethod methodClient = new DeviceMethod(iotHubConnectionString);
 
 ### Invoke a method on a device
 
-Call [invoke](/java/api/com.microsoft.azure.sdk.iot.service.devicetwin.devicemethod?#method-details) to invoke a method on a device and return its result.
+Call [invoke](/java/api/com.microsoft.azure.sdk.iot.service.devicetwin.devicemethod?#method-details) to invoke a method on a device and return the result status.
 
-This example calls the "reboot" method to initiate a reboot on the device. The "reboot" method is mapped to a listener on the device as described in the **Create a direct method callback** section of this article.
+This example calls the "reboot" method to initiate a reboot on the device. The "reboot" method is mapped to a listener on the device as described in the **Create a direct method callback listener** section of this article.
+
+The payload parameter is optional. Use `null` if there is no payload supplied. The payload parameter can take different data forms including string, byte array, and HashMap. For examples, see [Direct Method Tests](https://github.com/Azure/azure-iot-sdk-java/blob/main/iot-e2e-tests/common/src/test/java/tests/integration/com/microsoft/azure/sdk/iot/iothub/methods/DirectMethodsTests.java).
+
+For example:
 
 ```java
-public static final String deviceId = "myFirstDevice";
-private static final String methodName = "reboot";
-private static final Long responseTimeout = TimeUnit.SECONDS.toSeconds(30);
-private static final Long connectTimeout = TimeUnit.SECONDS.toSeconds(5);
-MethodResult result = methodClient.invoke(deviceId, methodName, responseTimeout, connectTimeout, null);
+String deviceId = "myFirstDevice";
+String methodName = "reboot";
+String payload = "Test payload";
+Long responseTimeout = TimeUnit.SECONDS.toSeconds(30);
+Long connectTimeout = TimeUnit.SECONDS.toSeconds(5);
+
+MethodResult result = methodClient.invoke(deviceId, methodName, responseTimeout, connectTimeout, payload);
+if (result == null)
+{
+    throw new IOException("Method invoke returns null");
+}
+System.out.println("Status=" + result.getStatus());
 ```
 
 ### SDK service samples
 
 The Azure IoT SDK for Java provides a working sample of service apps that handle direct method tasks. For more information, see:
 
-* [Direct Method Sample](https://github.com/Azure/azure-iot-service-sdk-java/tree/main/service/iot-service-samples/direct-method-sample).
-* [Thermostat service sample](https://github.com/Azure/azure-iot-service-sdk-java/blob/aeea7806be7e894d8a977c16b7e6618728267a94/service/iot-service-samples/pnp-service-sample/thermostat-service-sample/src/main/java/samples/com/microsoft/azure/sdk/iot/service/Thermostat.java#L69)
+* [Direct method sample](https://github.com/Azure/azure-iot-service-sdk-java/tree/main/service/iot-service-samples/direct-method-sample)
+* [Thermostat service sample](https://github.com/Azure/azure-iot-service-sdk-java/blob/aeea7806be7e894d8a977c16b7e6618728267a94/service/iot-service-samples/pnp-service-sample/thermostat-service-sample/src/main/java/samples/com/microsoft/azure/sdk/iot/service/Thermostat.java)

includes/iot-hub-howto-device-management-node.md

@@ -101,15 +101,17 @@ client.open(function(err) {
 
 ### Create a direct method callback
 
-Call [onDeviceMethod](/python/api/azure-iot-device/azure.iot.device.iothubdeviceclient?#azure-iot-device-iothubdeviceclient-on-method-request-received) to create a handler function or coroutine that is called when a direct method is received. The listener is associated with a method name keyword, such as "reboot". The method name can be used in an IoT Hub or backend application to trigger the callback method on the device.
+Call [onDeviceMethod](/javascript/api/azure-iot-device/client?view=azure-node-latest#azure-iot-device-client-ondevicemethod) to create a handler function or coroutine that is called when a direct method is received. The listener is associated with a method name keyword, such as "reboot". The method name can be used in an IoT Hub or backend application to trigger the callback method on the device.
+
+The callback handler function should call `send` to send a response acknowledgement message to the calling application.
 
 This example sets up a direct method handler named `onReboot`.
 
 ```javascript
 client.onDeviceMethod('reboot', onReboot);
 ```
 
-In this example, the `onReboot` callback method implements the direct method on the device. The code is executed when the "rebootDevice" direct method is called from a service application. This code updates reported properties related to a simulated device reboot. The reported properties can be read and verified by an IoT Hub or backend application, as demonstrated in the **Create a backend application** section of this article.
+In this example, the `onReboot` callback method implements the direct method on the device. The code is executed when the "reboot" direct method is called from a service application.
 
 ```javascript
 var onReboot = function(request, response) {
@@ -123,37 +125,14 @@ var onReboot = function(request, response) {
         }
     });
 
-    // Report the reboot before the physical restart
-    var date = new Date();
-    var patch = {
-        iothubDM : {
-            reboot : {
-                lastReboot : date.toISOString(),
-            }
-        }
-    };
-
-    // Get device Twin
-    client.getTwin(function(err, twin) {
-        if (err) {
-            console.error('could not get twin');
-        } else {
-            console.log('twin acquired');
-            twin.properties.reported.update(patch, function(err) {
-                if (err) throw err;
-                console.log('Device reboot twin state reported')
-            });  
-        }
-    });
-
     // Add your device's reboot API for physical restart.
     console.log('Rebooting!');
 };
 ```
 
 ### SDK device samples
 
-The Azure IoT SDK for Node.js provides working samples of device apps that handle device management tasks. For more information, see [The device management pattern samples](https://github.com/Azure/azure-iot-sdk-node/blob/a85e280350a12954f46672761b0b516d08d374b5/doc/dmpatterns.md).
+The Azure IoT SDK for Node.js provides working samples of device apps that handle device management tasks. For more information, see [Device management pattern samples](https://github.com/Azure/azure-iot-sdk-node/blob/a85e280350a12954f46672761b0b516d08d374b5/doc/dmpatterns.md).
 
 ## Create a backend application
 
@@ -167,10 +146,6 @@ Run this command to install **azure-iothub** on your development machine:
 npm install azure-iothub --save
 ```
 
-### Create a Registry object
-
-The [Registry](/javascript/api/azure-iothub/registry) class exposes all methods required to interact with direct methods from a backend application.
-
 ### Connect to IoT hub
 
 You can connect a backend service to IoT Hub using the following methods:
@@ -182,18 +157,16 @@ You can connect a backend service to IoT Hub using the following methods:
 
 #### Connect using a shared access policy
 
-Use [fromConnectionString](/javascript/api/azure-iothub/registry?#azure-iothub-registry-fromconnectionstring) to connect to IoT hub.
+Use [fromConnectionString](/javascript/api/azure-iothub/client?#azure-iothub-client-fromconnectionstring) to connect to IoT hub.
 
 To invoke a direct method on a device through IoT Hub, your service needs the **service connect** permission. By default, every IoT Hub is created with a shared access policy named **service** that grants this permission.
 
 As a parameter to `CreateFromConnectionString`, supply the **service** shared access policy connection string. For more information about shared access policies, see [Control access to IoT Hub with shared access signatures](/azure/iot-hub/authenticate-authorize-sas).
 
 ```javascript
-var Registry = require('azure-iothub').Registry;
 var Client = require('azure-iothub').Client;
 var connectionString = '{IoT hub shared access policy connection string}';
 var client = Client.fromConnectionString(connectionString);
-var registry = Registry.fromConnectionString(serviceConnectionString);
 ```
 
 #### Connect using Microsoft Entra
@@ -205,7 +178,7 @@ var registry = Registry.fromConnectionString(serviceConnectionString);
 Use [invokeDeviceMethod](/javascript/api/azure-iothub/client?#azure-iothub-client-invokedevicemethod) to invoke a direct method by name on a device. The method name parameter identifies the direct method. The method name is "reboot" in the examples within this article.
 
 ```javascript
-var startRebootDevice = function(twin) {
+var startRebootDevice = function(deviceToReboot) {
 
     var methodName = "reboot";
 
@@ -225,27 +198,6 @@ var startRebootDevice = function(twin) {
 };
 ```
 
-This example function uses device twin queries to discover the last reboot time for the device that was updated as described in the **Create a direct method callback** section of this article.
-
-```javascript
-var queryTwinLastReboot = function() {
-
-    registry.getTwin(deviceToReboot, function(err, twin){
-
-        if (twin.properties.reported.iothubDM != null)
-        {
-            if (err) {
-                console.error('Could not query twins: ' + err.constructor.name + ': ' + err.message);
-            } else {
-                var lastRebootTime = twin.properties.reported.iothubDM.reboot.lastReboot;
-                console.log('Last reboot time: ' + JSON.stringify(lastRebootTime, null, 2));
-            }
-        } else 
-            console.log('Waiting for device to report last reboot time.');
-    });
-};
-```
-
 ### SDK service samples
 
 The Azure IoT SDK for Node.js provides working samples of service apps that handle device management tasks. For more information, see [The device management pattern samples](https://github.com/Azure/azure-iot-sdk-node/blob/a85e280350a12954f46672761b0b516d08d374b5/doc/dmpatterns.md).