Release azure-resourcemanager 2.0.0

Azure-Fluent · Azure-Fluent · commit 696373d66c96 · 2020-10-26T13:11:05.000+08:00
diff --git a/README.md b/README.md
@@ -5,27 +5,27 @@ languages:
 products:
 - azure
 extensions:
-  services: virtual-network
+  services: Network
   platforms: java
 ---
 
 # Getting Started with Network - Manage Express Route - in Java #
 
 
   Azure Network sample for managing express route circuits.
-   - Create Express Route circuit
-   - Create Express Route circuit peering. Please note: express route circuit should be provisioned by connectivity provider before this step.
-   - Adding authorization to express route circuit
-   - Create virtual network to be associated with virtual network gateway
-   - Create virtual network gateway
-   - Create virtual network gateway connection
+  - Create Express Route circuit
+  - Create Express Route circuit peering. Please note: express route circuit should be provisioned by connectivity provider before this step.
+  - Adding authorization to express route circuit
+  - Create virtual network to be associated with virtual network gateway
+  - Create virtual network gateway
+  - Create virtual network gateway connection
  
 
 ## Running this Sample ##
 
 To run this sample:
 
-Set the environment variable `AZURE_AUTH_LOCATION` with the full path for an auth file. See [how to create an auth file](https://github.com/Azure/azure-libraries-for-java/blob/master/AUTH.md).
+See [DefaultAzureCredential](https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/identity/azure-identity#defaultazurecredential) and prepare the authentication works best for you. For more details on authentication, please refer to [AUTH.md](https://github.com/Azure/azure-sdk-for-java/blob/master/sdk/resourcemanager/docs/AUTH.md).
 
     git clone https://github.com/Azure-Samples/network-java-manage-express-route.git
 
@@ -35,9 +35,11 @@ Set the environment variable `AZURE_AUTH_LOCATION` with the full path for an aut
 
 ## More information ##
 
-[http://azure.com/java](http://azure.com/java)
+For general documentation as well as quickstarts on how to use Azure Management Libraries for Java, please see [here](https://aka.ms/azsdk/java/mgmt).
 
-If you don't have a Microsoft Azure subscription you can get a FREE trial account [here](http://go.microsoft.com/fwlink/?LinkId=330212)
+Start to develop applications with Java on Azure [here](http://azure.com/java).
+
+If you don't have a Microsoft Azure subscription you can get a FREE trial account [here](http://go.microsoft.com/fwlink/?LinkId=330212).
 
 ---
 
diff --git a/pom.xml b/pom.xml
@@ -15,15 +15,16 @@
         <artifactId>exec-maven-plugin</artifactId>
         <version>1.4.0</version>
         <configuration>
-          <mainClass>com.microsoft.azure.management.network.samples.ManageExpressRoute</mainClass>
+          <mainClass>com.azure.resourcemanager.network.samples.ManageExpressRoute</mainClass>
+          <cleanupDaemonThreads>false</cleanupDaemonThreads>
         </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.0</version>
+        <version>3.8.1</version>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
       <plugin>
@@ -40,7 +41,7 @@
               </descriptorRefs>
               <archive>
                 <manifest>
-                  <mainClass>com.microsoft.azure.management.network.samples.ManageExpressRoute.java</mainClass>
+                  <mainClass>com.azure.resourcemanager.network.samples.ManageExpressRoute.java</mainClass>
                 </manifest>
               </archive>
             </configuration>
@@ -51,24 +52,19 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
-      <artifactId>azure</artifactId>
-      <version>1.36.3</version>
+      <groupId>com.azure.resourcemanager</groupId>
+      <artifactId>azure-resourcemanager</artifactId>
+      <version>2.0.0</version>
     </dependency>
     <dependency>
-      <groupId>commons-net</groupId>
-      <artifactId>commons-net</artifactId>
-      <version>3.3</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.6</version>
+      <groupId>com.azure</groupId>
+      <artifactId>azure-identity</artifactId>
+      <version>1.1.3</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <version>3.7</version>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+      <version>3.6</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/src/main/java/com/azure/resourcemanager/network/samples/ManageExpressRoute.java b/src/main/java/com/azure/resourcemanager/network/samples/ManageExpressRoute.java
@@ -1,51 +1,52 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
-package com.microsoft.azure.management.network.samples;
-
-import com.microsoft.azure.management.Azure;
-import com.microsoft.azure.management.network.ExpressRouteCircuit;
-import com.microsoft.azure.management.network.ExpressRouteCircuitSkuType;
-import com.microsoft.azure.management.network.Network;
-import com.microsoft.azure.management.network.VirtualNetworkGateway;
-import com.microsoft.azure.management.network.VirtualNetworkGatewaySkuName;
-import com.microsoft.azure.management.resources.fluentcore.arm.Region;
-import com.microsoft.azure.management.resources.fluentcore.utils.SdkContext;
-import com.microsoft.rest.LogLevel;
-
-import java.io.File;
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+package com.azure.resourcemanager.network.samples;
+
+
+import com.azure.core.credential.TokenCredential;
+import com.azure.core.http.policy.HttpLogDetailLevel;
+import com.azure.core.management.AzureEnvironment;
+import com.azure.identity.DefaultAzureCredentialBuilder;
+import com.azure.resourcemanager.AzureResourceManager;
+import com.azure.resourcemanager.network.models.ExpressRouteCircuit;
+import com.azure.resourcemanager.network.models.ExpressRouteCircuitSkuType;
+import com.azure.resourcemanager.network.models.Network;
+import com.azure.resourcemanager.network.models.VirtualNetworkGateway;
+import com.azure.resourcemanager.network.models.VirtualNetworkGatewaySkuName;
+import com.azure.core.management.Region;
+import com.azure.core.management.profile.AzureProfile;
+import com.azure.resourcemanager.samples.Utils;
 
 /**
  * Azure Network sample for managing express route circuits.
- *  - Create Express Route circuit
- *  - Create Express Route circuit peering. Please note: express route circuit should be provisioned by connectivity provider before this step.
- *  - Adding authorization to express route circuit
- *  - Create virtual network to be associated with virtual network gateway
- *  - Create virtual network gateway
- *  - Create virtual network gateway connection
+ * - Create Express Route circuit
+ * - Create Express Route circuit peering. Please note: express route circuit should be provisioned by connectivity provider before this step.
+ * - Adding authorization to express route circuit
+ * - Create virtual network to be associated with virtual network gateway
+ * - Create virtual network gateway
+ * - Create virtual network gateway connection
  */
 public final class ManageExpressRoute {
 
     /**
      * Main function which runs the actual sample.
-     * @param azure instance of the azure client
+     *
+     * @param azureResourceManager instance of the azure client
      * @return true if sample runs successfully
      */
-    public static boolean runSample(Azure azure) {
+    public static boolean runSample(AzureResourceManager azureResourceManager) {
         final Region region = Region.US_NORTH_CENTRAL;
-        final String rgName = SdkContext.randomResourceName("rg", 20);
-        final String ercName = SdkContext.randomResourceName("erc", 20);
-        final String gatewayName = SdkContext.randomResourceName("gtw", 20);
-        final String connectionName = SdkContext.randomResourceName("con", 20);
-        final String vnetName = SdkContext.randomResourceName("vnet", 20);
+        final String rgName = Utils.randomResourceName(azureResourceManager, "rg", 20);
+        final String ercName = Utils.randomResourceName(azureResourceManager, "erc", 20);
+        final String gatewayName = Utils.randomResourceName(azureResourceManager, "gtw", 20);
+        final String connectionName = Utils.randomResourceName(azureResourceManager, "con", 20);
+        final String vnetName = Utils.randomResourceName(azureResourceManager, "vnet", 20);
 
         try {
             //============================================================
             // create Express Route Circuit
             System.out.println("Creating express route circuit...");
-            ExpressRouteCircuit erc = azure.expressRouteCircuits().define(ercName)
+            ExpressRouteCircuit erc = azureResourceManager.expressRouteCircuits().define(ercName)
                     .withRegion(region)
                     .withNewResourceGroup(rgName)
                     .withServiceProvider("Equinix")
@@ -75,7 +76,7 @@ public static boolean runSample(Azure azure) {
             //============================================================
             // Create virtual network to be associated with virtual network gateway
             System.out.println("Creating virtual network...");
-            Network network = azure.networks().define(vnetName)
+            Network network = azureResourceManager.networks().define(vnetName)
                     .withRegion(region)
                     .withExistingResourceGroup(rgName)
                     .withAddressSpace("192.168.0.0/16")
@@ -86,7 +87,7 @@ public static boolean runSample(Azure azure) {
             //============================================================
             // Create virtual network gateway
             System.out.println("Creating virtual network gateway...");
-            VirtualNetworkGateway vngw1 = azure.virtualNetworkGateways().define(gatewayName)
+            VirtualNetworkGateway vngw1 = azureResourceManager.virtualNetworkGateways().define(gatewayName)
                     .withRegion(region)
                     .withNewResourceGroup(rgName)
                     .withExistingNetwork(network)
@@ -106,41 +107,42 @@ public static boolean runSample(Azure azure) {
             System.out.println("Created virtual network gateway connection");
 
             return true;
-        } catch (Exception e) {
-            System.err.println(e.getMessage());
-            e.printStackTrace();
         } finally {
             try {
                 System.out.println("Deleting Resource Group: " + rgName);
-                azure.resourceGroups().beginDeleteByName(rgName);
+                azureResourceManager.resourceGroups().beginDeleteByName(rgName);
             } catch (NullPointerException npe) {
                 System.out.println("Did not create any resources in Azure. No clean up is necessary");
             } catch (Exception g) {
                 g.printStackTrace();
             }
         }
-        return false;
     }
 
     /**
      * Main entry point.
+     *
      * @param args the parameters
      */
     public static void main(String[] args) {
         try {
             //=============================================================
             // Authenticate
-            final File credFile = new File(System.getenv("AZURE_AUTH_LOCATION"));
+            final AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
+            final TokenCredential credential = new DefaultAzureCredentialBuilder()
+                .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint())
+                .build();
 
-            Azure azure = Azure.configure()
-                    .withLogLevel(LogLevel.BODY)
-                    .authenticate(credFile)
-                    .withDefaultSubscription();
+            AzureResourceManager azureResourceManager = AzureResourceManager
+                .configure()
+                .withLogLevel(HttpLogDetailLevel.BASIC)
+                .authenticate(credential, profile)
+                .withDefaultSubscription();
 
             // Print selected subscription
-            System.out.println("Selected subscription: " + azure.subscriptionId());
+            System.out.println("Selected subscription: " + azureResourceManager.subscriptionId());
 
-            runSample(azure);
+            runSample(azureResourceManager);
         } catch (Exception e) {
             System.out.println(e.getMessage());
             e.printStackTrace();
diff --git a/src/main/java/com/azure/resourcemanager/samples/Utils.java b/src/main/java/com/azure/resourcemanager/samples/Utils.java
