CodeGen from PR 19888 in Azure/azure-rest-api-specs

Merge 2be0f35303c3d0ec22e8fec21089a8dd4ccbb2df into 402c7fb924c5c0a30650d1c11338d4d516585933

Author: SDKAuto

sdk/networkfunction/azure-resourcemanager-networkfunction/CHANGELOG.md

@@ -1,6 +1,8 @@
 # Release History
 
-## 1.0.0-beta.2 (Unreleased)
+## 1.0.0-beta.1 (2022-07-26)
+
+- Azure Resource Manager AzureTrafficCollector client library for Java. This package contains Microsoft Azure SDK for AzureTrafficCollector Management SDK. Azure Traffic Collector service. Package tag package-2022-08-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
 
 ### Features Added
 

sdk/networkfunction/azure-resourcemanager-networkfunction/README.md

@@ -2,7 +2,7 @@
 
 Azure Resource Manager AzureTrafficCollector client library for Java.
 
-This package contains Microsoft Azure SDK for AzureTrafficCollector Management SDK. Azure Traffic Collector service. Package tag package-2022-05-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
+This package contains Microsoft Azure SDK for AzureTrafficCollector Management SDK. Azure Traffic Collector service. Package tag package-2022-08-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
 
 ## We'd love to hear your feedback
 
@@ -32,7 +32,7 @@ Various documentation is available to help you get started
 <dependency>
     <groupId>com.azure.resourcemanager</groupId>
     <artifactId>azure-resourcemanager-networkfunction</artifactId>
-    <version>1.0.0-beta.1</version>
+    <version>1.0.0-beta.2</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})

sdk/networkfunction/azure-resourcemanager-networkfunction/SAMPLE.md

@@ -36,7 +36,7 @@ import java.util.Map;
 /** Samples for AzureTrafficCollectors CreateOrUpdate. */
 public final class AzureTrafficCollectorsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/networkfunction/resource-manager/Microsoft.NetworkFunction/stable/2022-05-01/examples/AzureTrafficCollectorCreate.json
+     * x-ms-original-file: specification/networkfunction/resource-manager/Microsoft.NetworkFunction/stable/2022-08-01/examples/AzureTrafficCollectorCreate.json
      */
     /**
      * Sample code: Create a traffic collector.
@@ -76,7 +76,7 @@ import com.azure.core.util.Context;
 /** Samples for AzureTrafficCollectors Delete. */
 public final class AzureTrafficCollectorsDeleteSamples {
     /*
-     * x-ms-original-file: specification/networkfunction/resource-manager/Microsoft.NetworkFunction/stable/2022-05-01/examples/AzureTrafficCollectorDelete.json
+     * x-ms-original-file: specification/networkfunction/resource-manager/Microsoft.NetworkFunction/stable/2022-08-01/examples/AzureTrafficCollectorDelete.json
      */
     /**
      * Sample code: Delete Traffic Collector.
@@ -98,7 +98,7 @@ import com.azure.core.util.Context;
 /** Samples for AzureTrafficCollectors GetByResourceGroup. */
 public final class AzureTrafficCollectorsGetByResourceGroupSamples {
     /*
-     * x-ms-original-file: specification/networkfunction/resource-manager/Microsoft.NetworkFunction/stable/2022-05-01/examples/AzureTrafficCollectorGet.json
+     * x-ms-original-file: specification/networkfunction/resource-manager/Microsoft.NetworkFunction/stable/2022-08-01/examples/AzureTrafficCollectorGet.json
      */
     /**
      * Sample code: Get Traffic Collector.
@@ -123,7 +123,7 @@ import java.util.Map;
 /** Samples for AzureTrafficCollectors UpdateTags. */
 public final class AzureTrafficCollectorsUpdateTagsSamples {
     /*
-     * x-ms-original-file: specification/networkfunction/resource-manager/Microsoft.NetworkFunction/stable/2022-05-01/examples/AzureTrafficCollectorUpdateTags.json
+     * x-ms-original-file: specification/networkfunction/resource-manager/Microsoft.NetworkFunction/stable/2022-08-01/examples/AzureTrafficCollectorUpdateTags.json
      */
     /**
      * Sample code: Update Traffic Collector tags.
@@ -158,7 +158,7 @@ import com.azure.core.util.Context;
 /** Samples for AzureTrafficCollectorsByResourceGroup ListByResourceGroup. */
 public final class AzureTrafficCollectorsByResourceGroupListByResourceGroupSamples {
     /*
-     * x-ms-original-file: specification/networkfunction/resource-manager/Microsoft.NetworkFunction/stable/2022-05-01/examples/AzureTrafficCollectorsByResourceGroupList.json
+     * x-ms-original-file: specification/networkfunction/resource-manager/Microsoft.NetworkFunction/stable/2022-08-01/examples/AzureTrafficCollectorsByResourceGroupList.json
      */
     /**
      * Sample code: List of Traffic Collectors by ResourceGroup.
@@ -180,7 +180,7 @@ import com.azure.core.util.Context;
 /** Samples for AzureTrafficCollectorsBySubscription List. */
 public final class AzureTrafficCollectorsBySubscriptionListSamples {
     /*
-     * x-ms-original-file: specification/networkfunction/resource-manager/Microsoft.NetworkFunction/stable/2022-05-01/examples/AzureTrafficCollectorsBySubscriptionList.json
+     * x-ms-original-file: specification/networkfunction/resource-manager/Microsoft.NetworkFunction/stable/2022-08-01/examples/AzureTrafficCollectorsBySubscriptionList.json
      */
     /**
      * Sample code: List of Traffic Collectors by Subscription.
@@ -210,7 +210,7 @@ import java.util.Arrays;
 /** Samples for CollectorPolicies CreateOrUpdate. */
 public final class CollectorPoliciesCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/networkfunction/resource-manager/Microsoft.NetworkFunction/stable/2022-05-01/examples/CollectorPolicyCreate.json
+     * x-ms-original-file: specification/networkfunction/resource-manager/Microsoft.NetworkFunction/stable/2022-08-01/examples/CollectorPolicyCreate.json
      */
     /**
      * Sample code: Create a collection policy.
@@ -222,6 +222,7 @@ public final class CollectorPoliciesCreateOrUpdateSamples {
         manager
             .collectorPolicies()
             .define("cp1")
+            .withRegion("West US")
             .withExistingAzureTrafficCollector("rg1", "atc")
             .withIngestionPolicy(
                 new IngestionPolicyPropertiesFormat()
@@ -256,7 +257,7 @@ import com.azure.core.util.Context;
 /** Samples for CollectorPolicies Delete. */
 public final class CollectorPoliciesDeleteSamples {
     /*
-     * x-ms-original-file: specification/networkfunction/resource-manager/Microsoft.NetworkFunction/stable/2022-05-01/examples/CollectorPolicyDelete.json
+     * x-ms-original-file: specification/networkfunction/resource-manager/Microsoft.NetworkFunction/stable/2022-08-01/examples/CollectorPolicyDelete.json
      */
     /**
      * Sample code: Delete Collection Policy.
@@ -278,7 +279,7 @@ import com.azure.core.util.Context;
 /** Samples for CollectorPolicies Get. */
 public final class CollectorPoliciesGetSamples {
     /*
-     * x-ms-original-file: specification/networkfunction/resource-manager/Microsoft.NetworkFunction/stable/2022-05-01/examples/CollectorPolicyGet.json
+     * x-ms-original-file: specification/networkfunction/resource-manager/Microsoft.NetworkFunction/stable/2022-08-01/examples/CollectorPolicyGet.json
      */
     /**
      * Sample code: Get Collection Policy.
@@ -300,7 +301,7 @@ import com.azure.core.util.Context;
 /** Samples for CollectorPolicies List. */
 public final class CollectorPoliciesListSamples {
     /*
-     * x-ms-original-file: specification/networkfunction/resource-manager/Microsoft.NetworkFunction/stable/2022-05-01/examples/CollectorPoliciesList.json
+     * x-ms-original-file: specification/networkfunction/resource-manager/Microsoft.NetworkFunction/stable/2022-08-01/examples/CollectorPoliciesList.json
      */
     /**
      * Sample code: List of Collection Policies.
@@ -322,7 +323,7 @@ import com.azure.core.util.Context;
 /** Samples for NetworkFunction ListOperations. */
 public final class NetworkFunctionListOperationsSamples {
     /*
-     * x-ms-original-file: specification/networkfunction/resource-manager/Microsoft.NetworkFunction/stable/2022-05-01/examples/OperationsList.json
+     * x-ms-original-file: specification/networkfunction/resource-manager/Microsoft.NetworkFunction/stable/2022-08-01/examples/OperationsList.json
      */
     /**
      * Sample code: OperationsList.

sdk/networkfunction/azure-resourcemanager-networkfunction/pom.xml

@@ -13,7 +13,7 @@
   <packaging>jar</packaging>
 
   <name>Microsoft Azure SDK for AzureTrafficCollector Management</name>
-  <description>This package contains Microsoft Azure SDK for AzureTrafficCollector Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. Azure Traffic Collector service. Package tag package-2022-05-01.</description>
+  <description>This package contains Microsoft Azure SDK for AzureTrafficCollector Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. Azure Traffic Collector service. Package tag package-2022-08-01.</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
   <licenses>

sdk/networkfunction/azure-resourcemanager-networkfunction/src/main/java/com/azure/resourcemanager/networkfunction/fluent/models/CollectorPolicyInner.java

@@ -5,17 +5,18 @@
 package com.azure.resourcemanager.networkfunction.fluent.models;
 
 import com.azure.core.annotation.Fluent;
-import com.azure.core.management.ProxyResource;
+import com.azure.core.management.Resource;
 import com.azure.core.management.SystemData;
 import com.azure.resourcemanager.networkfunction.models.EmissionPoliciesPropertiesFormat;
 import com.azure.resourcemanager.networkfunction.models.IngestionPolicyPropertiesFormat;
 import com.azure.resourcemanager.networkfunction.models.ProvisioningState;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;
+import java.util.Map;
 
 /** Collector policy resource. */
 @Fluent
-public final class CollectorPolicyInner extends ProxyResource {
+public final class CollectorPolicyInner extends Resource {
     /*
      * Properties of the Collector Policy.
      */
@@ -61,6 +62,20 @@ public SystemData systemData() {
         return this.systemData;
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public CollectorPolicyInner withLocation(String location) {
+        super.withLocation(location);
+        return this;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public CollectorPolicyInner withTags(Map<String, String> tags) {
+        super.withTags(tags);
+        return this;
+    }
+
     /**
      * Get the ingestionPolicy property: Ingestion policies.
      *

sdk/networkfunction/azure-resourcemanager-networkfunction/src/main/java/com/azure/resourcemanager/networkfunction/implementation/AzureTrafficCollectorManagementClientImpl.java

@@ -194,7 +194,7 @@ public CollectorPoliciesClient getCollectorPolicies() {
         this.defaultPollInterval = defaultPollInterval;
         this.subscriptionId = subscriptionId;
         this.endpoint = endpoint;
-        this.apiVersion = "2022-05-01";
+        this.apiVersion = "2022-08-01";
         this.networkFunctions = new NetworkFunctionsClientImpl(this);
         this.azureTrafficCollectorsBySubscriptions = new AzureTrafficCollectorsBySubscriptionsClientImpl(this);
         this.azureTrafficCollectorsByResourceGroups = new AzureTrafficCollectorsByResourceGroupsClientImpl(this);

sdk/networkfunction/azure-resourcemanager-networkfunction/src/main/java/com/azure/resourcemanager/networkfunction/implementation/CollectorPolicyImpl.java

@@ -4,6 +4,7 @@
 
 package com.azure.resourcemanager.networkfunction.implementation;
 
+import com.azure.core.management.Region;
 import com.azure.core.management.SystemData;
 import com.azure.core.util.Context;
 import com.azure.resourcemanager.networkfunction.fluent.models.CollectorPolicyInner;
@@ -13,6 +14,7 @@
 import com.azure.resourcemanager.networkfunction.models.ProvisioningState;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 public final class CollectorPolicyImpl implements CollectorPolicy, CollectorPolicy.Definition, CollectorPolicy.Update {
     private CollectorPolicyInner innerObject;
@@ -31,6 +33,19 @@ public String type() {
         return this.innerModel().type();
     }
 
+    public String location() {
+        return this.innerModel().location();
+    }
+
+    public Map<String, String> tags() {
+        Map<String, String> inner = this.innerModel().tags();
+        if (inner != null) {
+            return Collections.unmodifiableMap(inner);
+        } else {
+            return Collections.emptyMap();
+        }
+    }
+
     public String etag() {
         return this.innerModel().etag();
     }
@@ -56,6 +71,14 @@ public ProvisioningState provisioningState() {
         return this.innerModel().provisioningState();
     }
 
+    public Region region() {
+        return Region.fromName(this.regionName());
+    }
+
+    public String regionName() {
+        return this.location();
+    }
+
     public String resourceGroupName() {
         return resourceGroupName;
     }
@@ -162,6 +185,21 @@ public CollectorPolicy refresh(Context context) {
         return this;
     }
 
+    public CollectorPolicyImpl withRegion(Region location) {
+        this.innerModel().withLocation(location.toString());
+        return this;
+    }
+
+    public CollectorPolicyImpl withRegion(String location) {
+        this.innerModel().withLocation(location);
+        return this;
+    }
+
+    public CollectorPolicyImpl withTags(Map<String, String> tags) {
+        this.innerModel().withTags(tags);
+        return this;
+    }
+
     public CollectorPolicyImpl withIngestionPolicy(IngestionPolicyPropertiesFormat ingestionPolicy) {
         this.innerModel().withIngestionPolicy(ingestionPolicy);
         return this;