Merge branch 'main' into xmlClient

microsoft · Oct 17, 2024 · 8cb031e · 8cb031e
2 parents 13b7be2 + eab50b9
commit 8cb031e
Show file tree

Hide file tree

Showing 71 changed files with 664 additions and 651 deletions.
diff --git a/packages/http-client-csharp/package-lock.json b/packages/http-client-csharp/package-lock.json
diff --git a/packages/http-client-java/generator/http-client-generator-test/package.json b/packages/http-client-java/generator/http-client-generator-test/package.json
@@ -12,7 +12,7 @@
     "testserver-stop": "npx cadl-ranch server stop"
   },
   "dependencies": {
-    "@azure-tools/cadl-ranch-specs": "0.37.6",
+    "@azure-tools/cadl-ranch-specs": "0.38.0",
     "@typespec/http-client-java": "file:/../../typespec-http-client-java-0.1.0.tgz",
     "@typespec/http-client-java-tests": "file:"
   },

diff --git a/...nagedidentity/ManagedIdentityManager.java → ...onproperties/CommonPropertiesManager.java b/...nagedidentity/ManagedIdentityManager.java → ...onproperties/CommonPropertiesManager.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.commontypes.managedidentity;
+package com.azure.resourcemanager.commonproperties;
 
 import com.azure.core.credential.TokenCredential;
 import com.azure.core.http.HttpClient;
@@ -23,10 +23,10 @@
 import com.azure.core.management.profile.AzureProfile;
 import com.azure.core.util.Configuration;
 import com.azure.core.util.logging.ClientLogger;
-import com.azure.resourcemanager.models.commontypes.managedidentity.fluent.ManagedIdentityClient;
-import com.azure.resourcemanager.models.commontypes.managedidentity.implementation.ManagedIdentityClientBuilder;
-import com.azure.resourcemanager.models.commontypes.managedidentity.implementation.ManagedIdentityTrackedResourcesImpl;
-import com.azure.resourcemanager.models.commontypes.managedidentity.models.ManagedIdentityTrackedResources;
+import com.azure.resourcemanager.commonproperties.fluent.CommonPropertiesClient;
+import com.azure.resourcemanager.commonproperties.implementation.CommonPropertiesClientBuilder;
+import com.azure.resourcemanager.commonproperties.implementation.ManagedIdentitiesImpl;
+import com.azure.resourcemanager.commonproperties.models.ManagedIdentities;
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
@@ -35,57 +35,57 @@
 import java.util.stream.Collectors;
 
 /**
- * Entry point to ManagedIdentityManager.
+ * Entry point to CommonPropertiesManager.
  * Arm Managed Identity Provider management API.
  */
-public final class ManagedIdentityManager {
-    private ManagedIdentityTrackedResources managedIdentityTrackedResources;
+public final class CommonPropertiesManager {
+    private ManagedIdentities managedIdentities;
 
-    private final ManagedIdentityClient clientObject;
+    private final CommonPropertiesClient clientObject;
 
-    private ManagedIdentityManager(HttpPipeline httpPipeline, AzureProfile profile, Duration defaultPollInterval) {
+    private CommonPropertiesManager(HttpPipeline httpPipeline, AzureProfile profile, Duration defaultPollInterval) {
         Objects.requireNonNull(httpPipeline, "'httpPipeline' cannot be null.");
         Objects.requireNonNull(profile, "'profile' cannot be null.");
-        this.clientObject = new ManagedIdentityClientBuilder().pipeline(httpPipeline)
+        this.clientObject = new CommonPropertiesClientBuilder().pipeline(httpPipeline)
             .endpoint(profile.getEnvironment().getResourceManagerEndpoint())
             .subscriptionId(profile.getSubscriptionId())
             .defaultPollInterval(defaultPollInterval)
             .buildClient();
     }
 
     /**
-     * Creates an instance of ManagedIdentity service API entry point.
+     * Creates an instance of CommonProperties service API entry point.
      * 
      * @param credential the credential to use.
      * @param profile the Azure profile for client.
-     * @return the ManagedIdentity service API instance.
+     * @return the CommonProperties service API instance.
      */
-    public static ManagedIdentityManager authenticate(TokenCredential credential, AzureProfile profile) {
+    public static CommonPropertiesManager authenticate(TokenCredential credential, AzureProfile profile) {
         Objects.requireNonNull(credential, "'credential' cannot be null.");
         Objects.requireNonNull(profile, "'profile' cannot be null.");
         return configure().authenticate(credential, profile);
     }
 
     /**
-     * Creates an instance of ManagedIdentity service API entry point.
+     * Creates an instance of CommonProperties service API entry point.
      * 
      * @param httpPipeline the {@link HttpPipeline} configured with Azure authentication credential.
      * @param profile the Azure profile for client.
-     * @return the ManagedIdentity service API instance.
+     * @return the CommonProperties service API instance.
      */
-    public static ManagedIdentityManager authenticate(HttpPipeline httpPipeline, AzureProfile profile) {
+    public static CommonPropertiesManager authenticate(HttpPipeline httpPipeline, AzureProfile profile) {
         Objects.requireNonNull(httpPipeline, "'httpPipeline' cannot be null.");
         Objects.requireNonNull(profile, "'profile' cannot be null.");
-        return new ManagedIdentityManager(httpPipeline, profile, null);
+        return new CommonPropertiesManager(httpPipeline, profile, null);
     }
 
     /**
-     * Gets a Configurable instance that can be used to create ManagedIdentityManager with optional configuration.
+     * Gets a Configurable instance that can be used to create CommonPropertiesManager with optional configuration.
      * 
      * @return the Configurable instance allowing configurations.
      */
     public static Configurable configure() {
-        return new ManagedIdentityManager.Configurable();
+        return new CommonPropertiesManager.Configurable();
     }
 
     /**
@@ -190,20 +190,20 @@ public Configurable withDefaultPollInterval(Duration defaultPollInterval) {
         }
 
         /**
-         * Creates an instance of ManagedIdentity service API entry point.
+         * Creates an instance of CommonProperties service API entry point.
          *
          * @param credential the credential to use.
          * @param profile the Azure profile for client.
-         * @return the ManagedIdentity service API instance.
+         * @return the CommonProperties service API instance.
          */
-        public ManagedIdentityManager authenticate(TokenCredential credential, AzureProfile profile) {
+        public CommonPropertiesManager authenticate(TokenCredential credential, AzureProfile profile) {
             Objects.requireNonNull(credential, "'credential' cannot be null.");
             Objects.requireNonNull(profile, "'profile' cannot be null.");
 
             StringBuilder userAgentBuilder = new StringBuilder();
             userAgentBuilder.append("azsdk-java")
                 .append("-")
-                .append("com.azure.resourcemanager.models.commontypes.managedidentity")
+                .append("com.azure.resourcemanager.commonproperties")
                 .append("/")
                 .append("1.0.0-beta.1");
             if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) {
@@ -247,30 +247,29 @@ public ManagedIdentityManager authenticate(TokenCredential credential, AzureProf
             HttpPipeline httpPipeline = new HttpPipelineBuilder().httpClient(httpClient)
                 .policies(policies.toArray(new HttpPipelinePolicy[0]))
                 .build();
-            return new ManagedIdentityManager(httpPipeline, profile, defaultPollInterval);
+            return new CommonPropertiesManager(httpPipeline, profile, defaultPollInterval);
         }
     }
 
     /**
-     * Gets the resource collection API of ManagedIdentityTrackedResources. It manages ManagedIdentityTrackedResource.
+     * Gets the resource collection API of ManagedIdentities. It manages ManagedIdentityTrackedResource.
      * 
-     * @return Resource collection API of ManagedIdentityTrackedResources.
+     * @return Resource collection API of ManagedIdentities.
      */
-    public ManagedIdentityTrackedResources managedIdentityTrackedResources() {
-        if (this.managedIdentityTrackedResources == null) {
-            this.managedIdentityTrackedResources
-                = new ManagedIdentityTrackedResourcesImpl(clientObject.getManagedIdentityTrackedResources(), this);
+    public ManagedIdentities managedIdentities() {
+        if (this.managedIdentities == null) {
+            this.managedIdentities = new ManagedIdentitiesImpl(clientObject.getManagedIdentities(), this);
         }
-        return managedIdentityTrackedResources;
+        return managedIdentities;
     }
 
     /**
-     * Gets wrapped service client ManagedIdentityClient providing direct access to the underlying auto-generated API
+     * Gets wrapped service client CommonPropertiesClient providing direct access to the underlying auto-generated API
      * implementation, based on Azure REST API.
      * 
-     * @return Wrapped service client ManagedIdentityClient.
+     * @return Wrapped service client CommonPropertiesClient.
      */
-    public ManagedIdentityClient serviceClient() {
+    public CommonPropertiesClient serviceClient() {
         return this.clientObject;
     }
 }
diff --git a/...dentity/fluent/ManagedIdentityClient.java → ...erties/fluent/CommonPropertiesClient.java b/...dentity/fluent/ManagedIdentityClient.java → ...erties/fluent/CommonPropertiesClient.java
@@ -2,15 +2,15 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.commontypes.managedidentity.fluent;
+package com.azure.resourcemanager.commonproperties.fluent;
 
 import com.azure.core.http.HttpPipeline;
 import java.time.Duration;
 
 /**
- * The interface for ManagedIdentityClient class.
+ * The interface for CommonPropertiesClient class.
  */
-public interface ManagedIdentityClient {
+public interface CommonPropertiesClient {
     /**
      * Gets Service host.
      * 
@@ -47,9 +47,9 @@ public interface ManagedIdentityClient {
     Duration getDefaultPollInterval();
 
     /**
-     * Gets the ManagedIdentityTrackedResourcesClient object to access its operations.
+     * Gets the ManagedIdentitiesClient object to access its operations.
      * 
-     * @return the ManagedIdentityTrackedResourcesClient object.
+     * @return the ManagedIdentitiesClient object.
      */
-    ManagedIdentityTrackedResourcesClient getManagedIdentityTrackedResources();
+    ManagedIdentitiesClient getManagedIdentities();
 }
diff --git a/...anagedIdentityTrackedResourcesClient.java → ...rties/fluent/ManagedIdentitiesClient.java b/...anagedIdentityTrackedResourcesClient.java → ...rties/fluent/ManagedIdentitiesClient.java
@@ -2,18 +2,18 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.commontypes.managedidentity.fluent;
+package com.azure.resourcemanager.commonproperties.fluent;
 
 import com.azure.core.annotation.ReturnType;
 import com.azure.core.annotation.ServiceMethod;
 import com.azure.core.http.rest.Response;
 import com.azure.core.util.Context;
-import com.azure.resourcemanager.models.commontypes.managedidentity.fluent.models.ManagedIdentityTrackedResourceInner;
+import com.azure.resourcemanager.commonproperties.fluent.models.ManagedIdentityTrackedResourceInner;
 
 /**
- * An instance of this class provides access to all the operations defined in ManagedIdentityTrackedResourcesClient.
+ * An instance of this class provides access to all the operations defined in ManagedIdentitiesClient.
  */
-public interface ManagedIdentityTrackedResourcesClient {
+public interface ManagedIdentitiesClient {
     /**
      * Get a ManagedIdentityTrackedResource.
      * 

diff --git a/.../ManagedIdentityTrackedResourceInner.java → .../ManagedIdentityTrackedResourceInner.java b/.../ManagedIdentityTrackedResourceInner.java → .../ManagedIdentityTrackedResourceInner.java
@@ -2,16 +2,16 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.commontypes.managedidentity.fluent.models;
+package com.azure.resourcemanager.commonproperties.fluent.models;
 
 import com.azure.core.annotation.Fluent;
 import com.azure.core.management.Resource;
 import com.azure.core.management.SystemData;
 import com.azure.json.JsonReader;
 import com.azure.json.JsonToken;
 import com.azure.json.JsonWriter;
-import com.azure.resourcemanager.models.commontypes.managedidentity.models.ManagedIdentityTrackedResourceProperties;
-import com.azure.resourcemanager.models.commontypes.managedidentity.models.ManagedServiceIdentity;
+import com.azure.resourcemanager.commonproperties.models.ManagedIdentityTrackedResourceProperties;
+import com.azure.resourcemanager.commonproperties.models.ManagedServiceIdentity;
 import java.io.IOException;
 import java.util.Map;
 

diff --git a/.../managedidentity/models/package-info.java → ...roperties/fluent/models/package-info.java b/.../managedidentity/models/package-info.java → ...roperties/fluent/models/package-info.java
@@ -3,7 +3,7 @@
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
 /**
- * Package containing the data models for ManagedIdentity.
+ * Package containing the inner data models for CommonProperties.
  * Arm Managed Identity Provider management API.
  */
-package com.azure.resourcemanager.models.commontypes.managedidentity.models;
+package com.azure.resourcemanager.commonproperties.fluent.models;
diff --git a/...ontypes/managedidentity/package-info.java → ...commonproperties/fluent/package-info.java b/...ontypes/managedidentity/package-info.java → ...commonproperties/fluent/package-info.java
@@ -3,7 +3,7 @@
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
 /**
- * Package containing the classes for ManagedIdentity.
+ * Package containing the service clients for CommonProperties.
  * Arm Managed Identity Provider management API.
  */
-package com.azure.resourcemanager.models.commontypes.managedidentity;
+package com.azure.resourcemanager.commonproperties.fluent;
diff --git a/...ntation/ManagedIdentityClientBuilder.java → ...tation/CommonPropertiesClientBuilder.java b/...ntation/ManagedIdentityClientBuilder.java → ...tation/CommonPropertiesClientBuilder.java
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) TypeSpec Code Generator.
 
-package com.azure.resourcemanager.models.commontypes.managedidentity.implementation;
+package com.azure.resourcemanager.commonproperties.implementation;
 
 import com.azure.core.annotation.ServiceClientBuilder;
 import com.azure.core.http.HttpPipeline;
@@ -15,10 +15,10 @@
 import java.time.Duration;
 
 /**
- * A builder for creating a new instance of the ManagedIdentityClientImpl type.
+ * A builder for creating a new instance of the CommonPropertiesClientImpl type.
  */
-@ServiceClientBuilder(serviceClients = { ManagedIdentityClientImpl.class })
-public final class ManagedIdentityClientBuilder {
+@ServiceClientBuilder(serviceClients = { CommonPropertiesClientImpl.class })
+public final class CommonPropertiesClientBuilder {
     /*
      * Service host
      */
@@ -28,9 +28,9 @@ public final class ManagedIdentityClientBuilder {
      * Sets Service host.
      * 
      * @param endpoint the endpoint value.
-     * @return the ManagedIdentityClientBuilder.
+     * @return the CommonPropertiesClientBuilder.
      */
-    public ManagedIdentityClientBuilder endpoint(String endpoint) {
+    public CommonPropertiesClientBuilder endpoint(String endpoint) {
         this.endpoint = endpoint;
         return this;
     }
@@ -44,9 +44,9 @@ public ManagedIdentityClientBuilder endpoint(String endpoint) {
      * Sets The ID of the target subscription. The value must be an UUID.
      * 
      * @param subscriptionId the subscriptionId value.
-     * @return the ManagedIdentityClientBuilder.
+     * @return the CommonPropertiesClientBuilder.
      */
-    public ManagedIdentityClientBuilder subscriptionId(String subscriptionId) {
+    public CommonPropertiesClientBuilder subscriptionId(String subscriptionId) {
         this.subscriptionId = subscriptionId;
         return this;
     }
@@ -60,9 +60,9 @@ public ManagedIdentityClientBuilder subscriptionId(String subscriptionId) {
      * Sets The environment to connect to.
      * 
      * @param environment the environment value.
-     * @return the ManagedIdentityClientBuilder.
+     * @return the CommonPropertiesClientBuilder.
      */
-    public ManagedIdentityClientBuilder environment(AzureEnvironment environment) {
+    public CommonPropertiesClientBuilder environment(AzureEnvironment environment) {
         this.environment = environment;
         return this;
     }
@@ -76,9 +76,9 @@ public ManagedIdentityClientBuilder environment(AzureEnvironment environment) {
      * Sets The HTTP pipeline to send requests through.
      * 
      * @param pipeline the pipeline value.
-     * @return the ManagedIdentityClientBuilder.
+     * @return the CommonPropertiesClientBuilder.
      */
-    public ManagedIdentityClientBuilder pipeline(HttpPipeline pipeline) {
+    public CommonPropertiesClientBuilder pipeline(HttpPipeline pipeline) {
         this.pipeline = pipeline;
         return this;
     }
@@ -92,9 +92,9 @@ public ManagedIdentityClientBuilder pipeline(HttpPipeline pipeline) {
      * Sets The default poll interval for long-running operation.
      * 
      * @param defaultPollInterval the defaultPollInterval value.
-     * @return the ManagedIdentityClientBuilder.
+     * @return the CommonPropertiesClientBuilder.
      */
-    public ManagedIdentityClientBuilder defaultPollInterval(Duration defaultPollInterval) {
+    public CommonPropertiesClientBuilder defaultPollInterval(Duration defaultPollInterval) {
         this.defaultPollInterval = defaultPollInterval;
         return this;
     }
@@ -108,19 +108,19 @@ public ManagedIdentityClientBuilder defaultPollInterval(Duration defaultPollInte
      * Sets The serializer to serialize an object into a string.
      * 
      * @param serializerAdapter the serializerAdapter value.
-     * @return the ManagedIdentityClientBuilder.
+     * @return the CommonPropertiesClientBuilder.
      */
-    public ManagedIdentityClientBuilder serializerAdapter(SerializerAdapter serializerAdapter) {
+    public CommonPropertiesClientBuilder serializerAdapter(SerializerAdapter serializerAdapter) {
         this.serializerAdapter = serializerAdapter;
         return this;
     }
 
     /**
-     * Builds an instance of ManagedIdentityClientImpl with the provided parameters.
+     * Builds an instance of CommonPropertiesClientImpl with the provided parameters.
      * 
-     * @return an instance of ManagedIdentityClientImpl.
+     * @return an instance of CommonPropertiesClientImpl.
      */
-    public ManagedIdentityClientImpl buildClient() {
+    public CommonPropertiesClientImpl buildClient() {
         String localEndpoint = (endpoint != null) ? endpoint : "https://management.azure.com";
         AzureEnvironment localEnvironment = (environment != null) ? environment : AzureEnvironment.AZURE;
         HttpPipeline localPipeline = (pipeline != null)
@@ -131,7 +131,7 @@ public ManagedIdentityClientImpl buildClient() {
         SerializerAdapter localSerializerAdapter = (serializerAdapter != null)
             ? serializerAdapter
             : SerializerFactory.createDefaultManagementSerializerAdapter();
-        ManagedIdentityClientImpl client = new ManagedIdentityClientImpl(localPipeline, localSerializerAdapter,
+        CommonPropertiesClientImpl client = new CommonPropertiesClientImpl(localPipeline, localSerializerAdapter,
             localDefaultPollInterval, localEnvironment, localEndpoint, this.subscriptionId);
         return client;
     }