Merge branch 'main' into fix/servicebus-batch-size-cap-ICM51000000793879

Author: EldertGrootenboer

eng/versioning/version_client.txt

@@ -320,7 +320,7 @@ com.azure.resourcemanager:azure-resourcemanager-netapp;2.2.0;2.3.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-storagecache;1.2.0;1.3.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-redisenterprise;2.1.0;2.2.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-hybridkubernetes;1.0.0;1.1.0-beta.2
-com.azure.resourcemanager:azure-resourcemanager-iothub;1.3.0;1.4.0-beta.2
+com.azure.resourcemanager:azure-resourcemanager-iothub;1.3.0;1.4.0-beta.3
 com.azure.resourcemanager:azure-resourcemanager-datadog;1.1.0;1.2.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-communication;2.3.0;2.4.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-apimanagement;2.0.0;2.1.0-beta.1
@@ -466,7 +466,7 @@ com.azure.resourcemanager:azure-resourcemanager-migrationdiscoverysap;1.0.0-beta
 com.azure.resourcemanager:azure-resourcemanager-storageactions;1.0.0;1.1.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-deviceregistry;1.1.0;1.2.0-beta.2
 com.azure.resourcemanager:azure-resourcemanager-standbypool;1.1.0;1.2.0
-com.azure.resourcemanager:azure-resourcemanager-edgezones;1.0.0-beta.2;1.0.0-beta.3
+com.azure.resourcemanager:azure-resourcemanager-edgezones;1.0.0-beta.3;1.0.0-beta.4
 com.azure.resourcemanager:azure-resourcemanager-devopsinfrastructure;1.0.0;1.1.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-oracledatabase;1.2.0;1.3.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-informaticadatamanagement;1.0.0;1.1.0-beta.1

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

@@ -1,6 +1,6 @@
 # Release History
 
-## 1.0.0-beta.3 (Unreleased)
+## 1.0.0-beta.4 (Unreleased)
 
 ### Features Added
 
@@ -10,6 +10,30 @@
 
 ### Other Changes
 
+## 1.0.0-beta.3 (2026-05-08)
+
+- Azure Resource Manager Edge Zones client library for Java. This package contains Microsoft Azure SDK for Edge Zones Management SDK.  Package api-version 2024-04-01-preview. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
+
+### Breaking Changes
+
+#### `models.ExtendedZoneListResult` was removed
+
+#### `models.OperationListResult` was removed
+
+#### `EdgeZonesManager` was modified
+
+* `fluent.MicrosoftEdgeZones serviceClient()` -> `fluent.EdgeZonesManagementClient serviceClient()`
+
+#### `models.OperationDisplay` was modified
+
+* `OperationDisplay()` was changed to private access
+* `validate()` was removed
+
+#### `models.ExtendedZoneProperties` was modified
+
+* `ExtendedZoneProperties()` was changed to private access
+* `validate()` was removed
+
 ## 1.0.0-beta.2 (2024-12-04)
 
 - Azure Resource Manager Edge Zones client library for Java. This package contains Microsoft Azure SDK for Edge Zones Management SDK.  Package tag package-2024-04-01-preview. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).

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

@@ -2,7 +2,7 @@
 
 Azure Resource Manager Edge Zones client library for Java.
 
-This package contains Microsoft Azure SDK for Edge Zones Management SDK.  Package tag package-2024-04-01-preview. 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 Edge Zones Management SDK.  Package api-version 2024-04-01-preview. 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
 
@@ -52,15 +52,15 @@ Azure subscription ID can be configured via `AZURE_SUBSCRIPTION_ID` environment
 Assuming the use of the `DefaultAzureCredential` credential class, the client can be authenticated using the following code:
 
 ```java
-AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
+AzureProfile profile = new AzureProfile(AzureCloud.AZURE_PUBLIC_CLOUD);
 TokenCredential credential = new DefaultAzureCredentialBuilder()
     .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint())
     .build();
 EdgeZonesManager manager = EdgeZonesManager
     .authenticate(credential, profile);
 ```
 
-The sample code assumes global Azure. Please change `AzureEnvironment.AZURE` variable if otherwise.
+The sample code assumes global Azure. Please change the `AzureCloud.AZURE_PUBLIC_CLOUD` variable if otherwise.
 
 See [Authentication][authenticate] for more options.
 
@@ -100,5 +100,3 @@ This project has adopted the [Microsoft Open Source Code of Conduct][coc]. For m
 [cg]: https://github.com/Azure/azure-sdk-for-java/blob/main/CONTRIBUTING.md
 [coc]: https://opensource.microsoft.com/codeofconduct/
 [coc_faq]: https://opensource.microsoft.com/codeofconduct/faq/
-
-

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

@@ -19,9 +19,7 @@
  */
 public final class ExtendedZonesGetSamples {
     /*
-     * x-ms-original-file:
-     * specification/edgezones/resource-manager/Microsoft.EdgeZones/preview/2024-04-01-preview/examples/
-     * ExtendedZones_Get.json
+     * x-ms-original-file: 2024-04-01-preview/ExtendedZones_Get.json
      */
     /**
      * Sample code: GetExtendedZone.
@@ -42,9 +40,7 @@ public final class ExtendedZonesGetSamples {
  */
 public final class ExtendedZonesListSamples {
     /*
-     * x-ms-original-file:
-     * specification/edgezones/resource-manager/Microsoft.EdgeZones/preview/2024-04-01-preview/examples/
-     * ExtendedZones_ListBySubscription.json
+     * x-ms-original-file: 2024-04-01-preview/ExtendedZones_ListBySubscription.json
      */
     /**
      * Sample code: ListExtendedZones.
@@ -65,9 +61,7 @@ public final class ExtendedZonesListSamples {
  */
 public final class ExtendedZonesRegisterSamples {
     /*
-     * x-ms-original-file:
-     * specification/edgezones/resource-manager/Microsoft.EdgeZones/preview/2024-04-01-preview/examples/
-     * ExtendedZones_Register.json
+     * x-ms-original-file: 2024-04-01-preview/ExtendedZones_Register.json
      */
     /**
      * Sample code: RegisterExtendedZone.
@@ -88,9 +82,7 @@ public final class ExtendedZonesRegisterSamples {
  */
 public final class ExtendedZonesUnregisterSamples {
     /*
-     * x-ms-original-file:
-     * specification/edgezones/resource-manager/Microsoft.EdgeZones/preview/2024-04-01-preview/examples/
-     * ExtendedZones_Unregister.json
+     * x-ms-original-file: 2024-04-01-preview/ExtendedZones_Unregister.json
      */
     /**
      * Sample code: UnregisterExtendedZone.
@@ -111,9 +103,7 @@ public final class ExtendedZonesUnregisterSamples {
  */
 public final class OperationsListSamples {
     /*
-     * x-ms-original-file:
-     * specification/edgezones/resource-manager/Microsoft.EdgeZones/preview/2024-04-01-preview/examples/Operations_List.
-     * json
+     * x-ms-original-file: 2024-04-01-preview/Operations_List.json
      */
     /**
      * Sample code: ListOperations.

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

@@ -1,9 +1,9 @@
 <!--
  ~ Copyright (c) Microsoft Corporation. All rights reserved.
  ~ Licensed under the MIT License.
- ~ Code generated by Microsoft (R) AutoRest Code Generator.
+ ~ Code generated by Microsoft (R) TypeSpec Code Generator.
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>com.azure</groupId>
@@ -14,11 +14,11 @@
 
   <groupId>com.azure.resourcemanager</groupId>
   <artifactId>azure-resourcemanager-edgezones</artifactId>
-  <version>1.0.0-beta.3</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-edgezones;current} -->
+  <version>1.0.0-beta.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-edgezones;current} -->
   <packaging>jar</packaging>
 
   <name>Microsoft Azure SDK for Edge Zones Management</name>
-  <description>This package contains Microsoft Azure SDK for Edge Zones Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt.  Package tag package-2024-04-01-preview.</description>
+  <description>This package contains Microsoft Azure SDK for Edge Zones Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt.  Package api-version 2024-04-01-preview.</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
   <licenses>
@@ -46,7 +46,6 @@
     <jacoco.min.linecoverage>0</jacoco.min.linecoverage>
     <jacoco.min.branchcoverage>0</jacoco.min.branchcoverage>
     <revapi.skip>true</revapi.skip>
-    <spotless.skip>false</spotless.skip>
   </properties>
   <dependencies>
     <dependency>

sdk/edgezones/azure-resourcemanager-edgezones/src/main/java/com/azure/resourcemanager/edgezones/EdgeZonesManager.java

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
 
 package com.azure.resourcemanager.edgezones;
 
@@ -22,17 +22,19 @@
 import com.azure.core.http.policy.UserAgentPolicy;
 import com.azure.core.management.profile.AzureProfile;
 import com.azure.core.util.Configuration;
+import com.azure.core.util.CoreUtils;
 import com.azure.core.util.logging.ClientLogger;
-import com.azure.resourcemanager.edgezones.fluent.MicrosoftEdgeZones;
+import com.azure.resourcemanager.edgezones.fluent.EdgeZonesManagementClient;
+import com.azure.resourcemanager.edgezones.implementation.EdgeZonesManagementClientBuilder;
 import com.azure.resourcemanager.edgezones.implementation.ExtendedZonesImpl;
-import com.azure.resourcemanager.edgezones.implementation.MicrosoftEdgeZonesBuilder;
 import com.azure.resourcemanager.edgezones.implementation.OperationsImpl;
 import com.azure.resourcemanager.edgezones.models.ExtendedZones;
 import com.azure.resourcemanager.edgezones.models.Operations;
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
@@ -44,12 +46,12 @@ public final class EdgeZonesManager {
 
     private ExtendedZones extendedZones;
 
-    private final MicrosoftEdgeZones clientObject;
+    private final EdgeZonesManagementClient clientObject;
 
     private EdgeZonesManager(HttpPipeline httpPipeline, AzureProfile profile, Duration defaultPollInterval) {
         Objects.requireNonNull(httpPipeline, "'httpPipeline' cannot be null.");
         Objects.requireNonNull(profile, "'profile' cannot be null.");
-        this.clientObject = new MicrosoftEdgeZonesBuilder().pipeline(httpPipeline)
+        this.clientObject = new EdgeZonesManagementClientBuilder().pipeline(httpPipeline)
             .endpoint(profile.getEnvironment().getResourceManagerEndpoint())
             .subscriptionId(profile.getSubscriptionId())
             .defaultPollInterval(defaultPollInterval)
@@ -96,6 +98,9 @@ public static Configurable configure() {
      */
     public static final class Configurable {
         private static final ClientLogger LOGGER = new ClientLogger(Configurable.class);
+        private static final String SDK_VERSION = "version";
+        private static final Map<String, String> PROPERTIES
+            = CoreUtils.getProperties("azure-resourcemanager-edgezones.properties");
 
         private HttpClient httpClient;
         private HttpLogOptions httpLogOptions;
@@ -203,12 +208,14 @@ public EdgeZonesManager authenticate(TokenCredential credential, AzureProfile pr
             Objects.requireNonNull(credential, "'credential' cannot be null.");
             Objects.requireNonNull(profile, "'profile' cannot be null.");
 
+            String clientVersion = PROPERTIES.getOrDefault(SDK_VERSION, "UnknownVersion");
+
             StringBuilder userAgentBuilder = new StringBuilder();
             userAgentBuilder.append("azsdk-java")
                 .append("-")
                 .append("com.azure.resourcemanager.edgezones")
                 .append("/")
-                .append("1.0.0-beta.2");
+                .append(clientVersion);
             if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) {
                 userAgentBuilder.append(" (")
                     .append(Configuration.getGlobalConfiguration().get("java.version"))
@@ -279,12 +286,12 @@ public ExtendedZones extendedZones() {
     }
 
     /**
-     * Gets wrapped service client MicrosoftEdgeZones providing direct access to the underlying auto-generated API
-     * implementation, based on Azure REST API.
+     * Gets wrapped service client EdgeZonesManagementClient providing direct access to the underlying auto-generated
+     * API implementation, based on Azure REST API.
      * 
-     * @return Wrapped service client MicrosoftEdgeZones.
+     * @return Wrapped service client EdgeZonesManagementClient.
      */
-    public MicrosoftEdgeZones serviceClient() {
+    public EdgeZonesManagementClient serviceClient() {
         return this.clientObject;
     }
 }

…edgezones/fluent/MicrosoftEdgeZones.java …es/fluent/EdgeZonesManagementClient.javasdk/edgezones/azure-resourcemanager-edgezones/src/main/java/com/azure/resourcemanager/edgezones/fluent/MicrosoftEdgeZones.java renamed to sdk/edgezones/azure-resourcemanager-edgezones/src/main/java/com/azure/resourcemanager/edgezones/fluent/EdgeZonesManagementClient.java sdk/edgezones/azure-resourcemanager-edgezones/src/main/java/com/azure/resourcemanager/edgezones/fluent/MicrosoftEdgeZones.java renamed to sdk/edgezones/azure-resourcemanager-edgezones/src/main/java/com/azure/resourcemanager/edgezones/fluent/EdgeZonesManagementClient.java

@@ -1,37 +1,37 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
 
 package com.azure.resourcemanager.edgezones.fluent;
 
 import com.azure.core.http.HttpPipeline;
 import java.time.Duration;
 
 /**
- * The interface for MicrosoftEdgeZones class.
+ * The interface for EdgeZonesManagementClient class.
  */
-public interface MicrosoftEdgeZones {
+public interface EdgeZonesManagementClient {
     /**
-     * Gets The ID of the target subscription. The value must be an UUID.
-     * 
-     * @return the subscriptionId value.
-     */
-    String getSubscriptionId();
-
-    /**
-     * Gets server parameter.
+     * Gets Service host.
      * 
      * @return the endpoint value.
      */
     String getEndpoint();
 
     /**
-     * Gets Api Version.
+     * Gets Version parameter.
      * 
      * @return the apiVersion value.
      */
     String getApiVersion();
 
+    /**
+     * Gets The ID of the target subscription. The value must be an UUID.
+     * 
+     * @return the subscriptionId value.
+     */
+    String getSubscriptionId();
+
     /**
      * Gets The HTTP pipeline to send requests through.
      * 

sdk/edgezones/azure-resourcemanager-edgezones/src/main/java/com/azure/resourcemanager/edgezones/fluent/ExtendedZonesClient.java

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
 
 package com.azure.resourcemanager.edgezones.fluent;
 
@@ -16,51 +16,51 @@
  */
 public interface ExtendedZonesClient {
     /**
-     * Lists the Azure Extended Zones available to a subscription.
+     * Gets an Azure Extended Zone for a subscription.
      * 
+     * @param extendedZoneName The name of the ExtendedZone.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the response of a ExtendedZone list operation as paginated response with {@link PagedIterable}.
+     * @return an Azure Extended Zone for a subscription along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    PagedIterable<ExtendedZoneInner> list();
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Response<ExtendedZoneInner> getWithResponse(String extendedZoneName, Context context);
 
     /**
-     * Lists the Azure Extended Zones available to a subscription.
+     * Gets an Azure Extended Zone for a subscription.
      * 
-     * @param context The context to associate with this operation.
+     * @param extendedZoneName The name of the ExtendedZone.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the response of a ExtendedZone list operation as paginated response with {@link PagedIterable}.
+     * @return an Azure Extended Zone for a subscription.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    PagedIterable<ExtendedZoneInner> list(Context context);
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    ExtendedZoneInner get(String extendedZoneName);
 
     /**
-     * Gets an Azure Extended Zone for a subscription.
+     * Lists the Azure Extended Zones available to a subscription.
      * 
-     * @param extendedZoneName The name of the ExtendedZone.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an Azure Extended Zone for a subscription along with {@link Response}.
+     * @return the response of a ExtendedZone list operation as paginated response with {@link PagedIterable}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<ExtendedZoneInner> getWithResponse(String extendedZoneName, Context context);
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<ExtendedZoneInner> list();
 
     /**
-     * Gets an Azure Extended Zone for a subscription.
+     * Lists the Azure Extended Zones available to a subscription.
      * 
-     * @param extendedZoneName The name of the ExtendedZone.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an Azure Extended Zone for a subscription.
+     * @return the response of a ExtendedZone list operation as paginated response with {@link PagedIterable}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    ExtendedZoneInner get(String extendedZoneName);
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<ExtendedZoneInner> list(Context context);
 
     /**
      * Registers a subscription for an Extended Zone.