Updated Java, dotnet, TOC, and redirect files

Author: gsteve88

articles/iot-hub/.openpublishing.redirection.iot-hub.json

@@ -1539,6 +1539,26 @@
       "source_path_from_root": "/articles/iot-hub/device-twins-node.md",
       "redirect_url": "/azure/iot-hub/how-to-device-twins",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/device-management-dotnet.md",
+      "redirect_url": "/azure/iot-hub/how-to-device-management",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/device-management-java.md",
+      "redirect_url": "/azure/iot-hub/how-to-device-management",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/device-management-python.md",
+      "redirect_url": "/azure/iot-hub/how-to-device-management",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/iot-hub/device-management-node.md",
+      "redirect_url": "/azure/iot-hub/how-to-device-management",
+      "redirect_document_id": false
     }
   ]
 }

articles/iot-hub/TOC.yml

@@ -301,22 +301,8 @@
               displayName: module twins, module identity
               href: module-twins-node.md
         - name: Get started with device management
-          items:
-            - name: New version
-              displayName: device management, status updates, device maintenance windows
-              href: how-to-device-management.md
-            - name: .NET
-              displayName: device management, status updates, device maintenance windows
-              href: device-management-dotnet.md
-            - name: Python
-              displayName: device management, status updates, device maintenance windows
-              href: device-management-python.md
-            - name: Node.js
-              displayName: device management, status updates, device maintenance windows
-              href: device-management-node.md
-            - name: Java
-              displayName: device management, status updates, device maintenance windows
-              href: device-management-java.md
+          displayName: device management, status updates, device maintenance windows
+          href: how-to-device-management.md
         - name: Schedule and broadcast jobs
           items:
             - name: CLI

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

@@ -19,11 +19,7 @@ This article describes how to use the [Azure IoT SDK for .NET](https://github.co
 
 ## Create a device application
 
-This section describes how to use device application code to:
-
-* Respond to a direct method called by the cloud
-* Trigger a simulated device reboot
-* Use the reported properties to enable device twin queries to identify devices and when they were last rebooted
+This section describes how to use device application code to create a direct method callback listener.
 
 [!INCLUDE [iot-authentication-device-connection-string.md](iot-authentication-device-connection-string.md)]
 
@@ -50,17 +46,13 @@ The `CreateFromConnectionString` [TransportType](/dotnet/api/microsoft.azure.dev
 This example connects to a device using the `Mqtt` transport protocol.
 
 ```csharp
-using Microsoft.Azure.Devices.Client;
-using Microsoft.Azure.Devices.Shared;
-using Newtonsoft.Json;
-
 static string DeviceConnectionString = "{IoT hub device connection string}";
 static deviceClient = null;
 deviceClient = DeviceClient.CreateFromConnectionString(DeviceConnectionString, 
    TransportType.Mqtt);
 ```
 
-### Create a direct method callback
+### Create a direct method callback listener
 
 Use [SetMethodHandlerAsync](/dotnet/api/microsoft.azure.devices.client.deviceclient.setmethodhandlerasync) to initialize a direct method callback listener. 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.
 
@@ -99,16 +91,6 @@ static Task<MethodResponse> onReboot(MethodRequest methodRequest, object userCon
       try
       {
          Console.WriteLine("Rebooting!");
-
-         // Update device twin with reboot time. 
-         TwinCollection reportedProperties, reboot, lastReboot;
-         lastReboot = new TwinCollection();
-         reboot = new TwinCollection();
-         reportedProperties = new TwinCollection();
-         lastReboot["lastReboot"] = DateTime.Now;
-         reboot["reboot"] = lastReboot;
-         reportedProperties["iothubDM"] = reboot;
-         Client.UpdateReportedPropertiesAsync(reportedProperties).Wait();
       }
       catch (Exception ex)
       {
@@ -135,23 +117,14 @@ The Azure IoT SDK for .NET provides working samples of device apps that handle d
 
 ## Create a backend application
 
-This section describes how to trigger a direct method on a device and then use device twin queries to monitor the status of that device.
+This section describes how to trigger a direct method on a device.
 
 The [ServiceClient](/dotnet/api/microsoft.azure.devices.serviceclient) class exposes all methods required to create a backend application to send direct method calls to devices.
 
 ### Required service NuGet package
 
 Backend service applications require the **Microsoft.Azure.Devices** NuGet package.
 
-### Using statements
-
-Add the following `using` statements.
-
-   ```csharp
-   using Microsoft.Azure.Devices;
-   using Microsoft.Azure.Devices.Shared;
-   ```
-
 ### Connect to IoT hub
 
 Connect a backend application using [CreateFromConnectionString](/dotnet/api/microsoft.azure.devices.serviceclient.createfromconnectionstring?#microsoft-azure-devices-serviceclient-createfromconnectionstring(system-string-microsoft-azure-devices-serviceclientoptions)).
@@ -163,7 +136,6 @@ As a parameter to `CreateFromConnectionString`, supply the **service** shared ac
 [!INCLUDE [iot-authentication-service-connection-string.md](iot-authentication-service-connection-string.md)]
 
 ```csharp
-using Microsoft.Azure.Devices;
 static ServiceClient client;
 static string connectionString = "{IoT hub service shared access policy connection string}";
 client = ServiceClient.CreateFromConnectionString(connectionString);
@@ -190,16 +162,6 @@ client.InvokeDeviceMethodAsync(targetDevice, method);
 Console.WriteLine("Invoked firmware update on device.");
 ```
 
-This example gets the device twin for the rebooting device and outputs the reported properties. This output shows that the `onReboot` callback method updated the `lastReboot`, `Reboot`, and `iothubDM` reported properties.
-
-```csharp
-public static async Task QueryTwinRebootReported()
-{
-      Twin twin = await registryManager.GetTwinAsync(targetDevice);
-      Console.WriteLine(twin.Properties.Reported.ToJson());
-}
-```
-
 ### SDK service samples
 
 The Azure IoT SDK for .NET provides working samples of service apps that handle message tasks. For more information, see:

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

@@ -61,44 +61,19 @@ To connect to a device:
 
 ### Create a direct method callback
 
-Call [subscribeToDeviceMethod](/java/api/com.microsoft.azure.sdk.iot.device.deviceclient?#com-microsoft-azure-sdk-iot-device-deviceclient-subscribetodevicemethod(com-microsoft-azure-sdk-iot-device-devicetwin-devicemethodcallback-java-lang-object-com-microsoft-azure-sdk-iot-device-iothubeventcallback-java-lang-object)) to initialize a direct method callback listener. 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 [subscribeToMethods](https://azure.github.io/azure-iot-sdk-java/master/device/com/microsoft/azure/sdk/iot/device/InternalClient.html#subscribeToMethods-com.microsoft.azure.sdk.iot.device.twin.MethodCallback-java.lang.Object-int-) to initialize a direct method callback listener. `subscribeToMethods` listens for incoming direct methods until the connection is terminated. The method name and payload is received for each direct method call.
 
-This example sets up a callback listener named `reboot` that will trigger when the "reboot" direct method name is called.
-
-```java
-client.subscribeToDeviceMethod(new DirectMethodCallback(), null, new DirectMethodStatusCallback(), null);
-```
-
-In this example, the `DirectMethodCallback` callback method implements the direct method on the device.
+For example:
 
 ```java
-    protected static class DirectMethodCallback implements com.microsoft.azure.sdk.iot.device.DeviceTwin.DeviceMethodCallback
-        {
-        @Override
-        public DeviceMethodData call(String methodName, Object methodData, Object context)
-        {
-            DeviceMethodData deviceMethodData;
-            switch (methodName)
-            {
-            case "reboot" :
-            {
-                int status = METHOD_SUCCESS;
-                System.out.println("Received reboot request");
-                deviceMethodData = new DeviceMethodData(status, "Started reboot");
-                RebootDeviceThread rebootThread = new RebootDeviceThread();
-                Thread t = new Thread(rebootThread);
-                t.start();
-                break;
-            }
-            default:
-            {
-                int status = METHOD_NOT_DEFINED;
-                deviceMethodData = new DeviceMethodData(status, "Not defined direct method " + methodName);
-            }
-            }
-            return deviceMethodData;
-        }
-        }
+client.subscribeToMethods(
+    (methodName, methodData, context) ->
+    {
+        System.out.println("Received a direct method invocation with name " + methodName + " and payload " + methodData.getPayloadAsJsonString());
+        return new DirectMethodResponse(200, methodData);
+    },
+    null);
+System.out.println("Successfully subscribed to direct methods");
 ```
 
 > [!NOTE]
@@ -114,15 +89,6 @@ This section describes how to initiate a remote reboot on a device using a direc
 
 The `ServiceClient` [DeviceMethod](/java/api/com.microsoft.azure.sdk.iot.service.devicetwin.devicemethod) class contains methods that services can use to access device twins.
 
-### Service import statements
-
-Use the following service import statements to access the Azure IoT SDK for Java.
-
-```java
-import com.microsoft.azure.sdk.iot.service.devicetwin.*;
-import com.microsoft.azure.sdk.iot.service.exceptions.IotHubException;
-```
-
 ### Connect to IoT hub
 
 Use the [DeviceMethod](/java/api/com.microsoft.azure.sdk.iot.service.devicetwin.devicemethod?#com-microsoft-azure-sdk-iot-service-devicetwin-devicemethod-devicemethod(java-lang-string)) constructor to add the service primary connection string and connect to IoT Hub.