sync core, prepare release typespec-java 0.36.0 (#3208)

* core on main

* sync tests

* prepare release typespec-java

* changelog date

* changelog

* latest core

* remove invalid line

Author: XiaofeiCao

core

@@ -1,5 +1,11 @@
 # Release History
 
+## 0.36.0 (2025-10-20)
+
+Compatible with compiler 1.5.0.
+
+- Supported `customization-class` for mgmt libraries.
+
 ## 0.35.0 (2025-10-09)
 
 Compatible with compiler 1.5.0.

typespec-extension/changelog.md

@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-java",
-  "version": "0.35.0",
+  "version": "0.36.0",
   "description": "TypeSpec library for emitting Java client from the TypeSpec REST protocol binding",
   "keywords": [
     "TypeSpec"

typespec-extension/package-lock.json

@@ -96,6 +96,11 @@ $generateScript = {
     $tspOptions += " --option ""@azure-tools/typespec-java.property-include-always=FunctionConfiguration.input"""
     # enable client side validations
     $tspOptions += " --option ""@azure-tools/typespec-java.client-side-validations=true"""
+  } elseif ($tspFile -match "arm-customization.tsp") {
+    # for mgmt, do not generate tests due to random mock values
+    $tspOptions += " --option ""@azure-tools/typespec-java.generate-tests=false"""
+    # add customization code
+    $tspOptions += " --option ""@azure-tools/typespec-java.customization-class=../../customization/src/main/java/KeyVaultCustomization.java"""
   } elseif ($tspFile -match "subclient.tsp") {
     $tspOptions += " --option ""@azure-tools/typespec-java.enable-subclient=true"""
     # test for include-api-view-properties

typespec-extension/package.json

@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import com.azure.autorest.customization.ClassCustomization;
+import com.azure.autorest.customization.Customization;
+import com.azure.autorest.customization.LibraryCustomization;
+import com.azure.autorest.customization.PackageCustomization;
+import com.github.javaparser.ast.type.ClassOrInterfaceType;
+import org.slf4j.Logger;
+
+public class KeyVaultCustomization extends Customization {
+    @Override
+    public void customize(LibraryCustomization customization, Logger logger) {
+        PackageCustomization modelsPackage = customization.getPackage("tsptest.armcustomization.fluent.models");
+
+        customizeBaseResource(modelsPackage.getClass("VaultInner"));
+    }
+
+    private void customizeBaseResource(ClassCustomization customization) {
+        customization.customizeAst(ast -> {
+            ast.getClassByName(customization.getClassName()).ifPresent(clazz -> {
+                String resourceClassName = "com.azure.core.management.Resource";
+                ast.addImport(resourceClassName);
+                clazz.getExtendedTypes().clear();
+                clazz.addExtendedType(new ClassOrInterfaceType(null, "Resource"));
+            });
+        });
+    }
+}

typespec-tests/Generate.ps1

@@ -13,7 +13,7 @@
     "@typespec/spector": "0.1.0-alpha.19",
     "@typespec/http-specs": "0.1.0-alpha.27",
     "@azure-tools/azure-http-specs": "0.1.0-alpha.31",
-    "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.35.0.tgz"
+    "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.36.0.tgz"
   },
   "devDependencies": {
     "@typespec/prettier-plugin-typespec": "^1.5.0",

typespec-tests/customization/src/main/java/KeyVaultCustomization.java

@@ -0,0 +1,282 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package tsptest.armcustomization;
+
+import com.azure.core.credential.TokenCredential;
+import com.azure.core.http.HttpClient;
+import com.azure.core.http.HttpPipeline;
+import com.azure.core.http.HttpPipelineBuilder;
+import com.azure.core.http.HttpPipelinePosition;
+import com.azure.core.http.policy.AddDatePolicy;
+import com.azure.core.http.policy.AddHeadersFromContextPolicy;
+import com.azure.core.http.policy.BearerTokenAuthenticationPolicy;
+import com.azure.core.http.policy.HttpLogOptions;
+import com.azure.core.http.policy.HttpLoggingPolicy;
+import com.azure.core.http.policy.HttpPipelinePolicy;
+import com.azure.core.http.policy.HttpPolicyProviders;
+import com.azure.core.http.policy.RequestIdPolicy;
+import com.azure.core.http.policy.RetryOptions;
+import com.azure.core.http.policy.RetryPolicy;
+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 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;
+import tsptest.armcustomization.fluent.ArmCustomizationClient;
+import tsptest.armcustomization.implementation.ArmCustomizationClientBuilder;
+import tsptest.armcustomization.implementation.VaultsImpl;
+import tsptest.armcustomization.models.Vaults;
+
+/**
+ * Entry point to ArmCustomizationManager.
+ * Arm Resource Provider management API.
+ */
+public final class ArmCustomizationManager {
+    private Vaults vaults;
+
+    private final ArmCustomizationClient clientObject;
+
+    private ArmCustomizationManager(HttpPipeline httpPipeline, AzureProfile profile, Duration defaultPollInterval) {
+        Objects.requireNonNull(httpPipeline, "'httpPipeline' cannot be null.");
+        Objects.requireNonNull(profile, "'profile' cannot be null.");
+        this.clientObject = new ArmCustomizationClientBuilder().pipeline(httpPipeline)
+            .endpoint(profile.getEnvironment().getResourceManagerEndpoint())
+            .subscriptionId(profile.getSubscriptionId())
+            .defaultPollInterval(defaultPollInterval)
+            .buildClient();
+    }
+
+    /**
+     * Creates an instance of ArmCustomization service API entry point.
+     * 
+     * @param credential the credential to use.
+     * @param profile the Azure profile for client.
+     * @return the ArmCustomization service API instance.
+     */
+    public static ArmCustomizationManager 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 ArmCustomization service API entry point.
+     * 
+     * @param httpPipeline the {@link HttpPipeline} configured with Azure authentication credential.
+     * @param profile the Azure profile for client.
+     * @return the ArmCustomization service API instance.
+     */
+    public static ArmCustomizationManager authenticate(HttpPipeline httpPipeline, AzureProfile profile) {
+        Objects.requireNonNull(httpPipeline, "'httpPipeline' cannot be null.");
+        Objects.requireNonNull(profile, "'profile' cannot be null.");
+        return new ArmCustomizationManager(httpPipeline, profile, null);
+    }
+
+    /**
+     * Gets a Configurable instance that can be used to create ArmCustomizationManager with optional configuration.
+     * 
+     * @return the Configurable instance allowing configurations.
+     */
+    public static Configurable configure() {
+        return new ArmCustomizationManager.Configurable();
+    }
+
+    /**
+     * The Configurable allowing configurations to be set.
+     */
+    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-armcustomization-generated.properties");
+
+        private HttpClient httpClient;
+        private HttpLogOptions httpLogOptions;
+        private final List<HttpPipelinePolicy> policies = new ArrayList<>();
+        private final List<String> scopes = new ArrayList<>();
+        private RetryPolicy retryPolicy;
+        private RetryOptions retryOptions;
+        private Duration defaultPollInterval;
+
+        private Configurable() {
+        }
+
+        /**
+         * Sets the http client.
+         *
+         * @param httpClient the HTTP client.
+         * @return the configurable object itself.
+         */
+        public Configurable withHttpClient(HttpClient httpClient) {
+            this.httpClient = Objects.requireNonNull(httpClient, "'httpClient' cannot be null.");
+            return this;
+        }
+
+        /**
+         * Sets the logging options to the HTTP pipeline.
+         *
+         * @param httpLogOptions the HTTP log options.
+         * @return the configurable object itself.
+         */
+        public Configurable withLogOptions(HttpLogOptions httpLogOptions) {
+            this.httpLogOptions = Objects.requireNonNull(httpLogOptions, "'httpLogOptions' cannot be null.");
+            return this;
+        }
+
+        /**
+         * Adds the pipeline policy to the HTTP pipeline.
+         *
+         * @param policy the HTTP pipeline policy.
+         * @return the configurable object itself.
+         */
+        public Configurable withPolicy(HttpPipelinePolicy policy) {
+            this.policies.add(Objects.requireNonNull(policy, "'policy' cannot be null."));
+            return this;
+        }
+
+        /**
+         * Adds the scope to permission sets.
+         *
+         * @param scope the scope.
+         * @return the configurable object itself.
+         */
+        public Configurable withScope(String scope) {
+            this.scopes.add(Objects.requireNonNull(scope, "'scope' cannot be null."));
+            return this;
+        }
+
+        /**
+         * Sets the retry policy to the HTTP pipeline.
+         *
+         * @param retryPolicy the HTTP pipeline retry policy.
+         * @return the configurable object itself.
+         */
+        public Configurable withRetryPolicy(RetryPolicy retryPolicy) {
+            this.retryPolicy = Objects.requireNonNull(retryPolicy, "'retryPolicy' cannot be null.");
+            return this;
+        }
+
+        /**
+         * Sets the retry options for the HTTP pipeline retry policy.
+         * <p>
+         * This setting has no effect, if retry policy is set via {@link #withRetryPolicy(RetryPolicy)}.
+         *
+         * @param retryOptions the retry options for the HTTP pipeline retry policy.
+         * @return the configurable object itself.
+         */
+        public Configurable withRetryOptions(RetryOptions retryOptions) {
+            this.retryOptions = Objects.requireNonNull(retryOptions, "'retryOptions' cannot be null.");
+            return this;
+        }
+
+        /**
+         * Sets the default poll interval, used when service does not provide "Retry-After" header.
+         *
+         * @param defaultPollInterval the default poll interval.
+         * @return the configurable object itself.
+         */
+        public Configurable withDefaultPollInterval(Duration defaultPollInterval) {
+            this.defaultPollInterval
+                = Objects.requireNonNull(defaultPollInterval, "'defaultPollInterval' cannot be null.");
+            if (this.defaultPollInterval.isNegative()) {
+                throw LOGGER
+                    .logExceptionAsError(new IllegalArgumentException("'defaultPollInterval' cannot be negative"));
+            }
+            return this;
+        }
+
+        /**
+         * Creates an instance of ArmCustomization service API entry point.
+         *
+         * @param credential the credential to use.
+         * @param profile the Azure profile for client.
+         * @return the ArmCustomization service API instance.
+         */
+        public ArmCustomizationManager authenticate(TokenCredential credential, AzureProfile profile) {
+            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("tsptest.armcustomization")
+                .append("/")
+                .append(clientVersion);
+            if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) {
+                userAgentBuilder.append(" (")
+                    .append(Configuration.getGlobalConfiguration().get("java.version"))
+                    .append("; ")
+                    .append(Configuration.getGlobalConfiguration().get("os.name"))
+                    .append("; ")
+                    .append(Configuration.getGlobalConfiguration().get("os.version"))
+                    .append("; auto-generated)");
+            } else {
+                userAgentBuilder.append(" (auto-generated)");
+            }
+
+            if (scopes.isEmpty()) {
+                scopes.add(profile.getEnvironment().getManagementEndpoint() + "/.default");
+            }
+            if (retryPolicy == null) {
+                if (retryOptions != null) {
+                    retryPolicy = new RetryPolicy(retryOptions);
+                } else {
+                    retryPolicy = new RetryPolicy("Retry-After", ChronoUnit.SECONDS);
+                }
+            }
+            List<HttpPipelinePolicy> policies = new ArrayList<>();
+            policies.add(new UserAgentPolicy(userAgentBuilder.toString()));
+            policies.add(new AddHeadersFromContextPolicy());
+            policies.add(new RequestIdPolicy());
+            policies.addAll(this.policies.stream()
+                .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_CALL)
+                .collect(Collectors.toList()));
+            HttpPolicyProviders.addBeforeRetryPolicies(policies);
+            policies.add(retryPolicy);
+            policies.add(new AddDatePolicy());
+            policies.add(new BearerTokenAuthenticationPolicy(credential, scopes.toArray(new String[0])));
+            policies.addAll(this.policies.stream()
+                .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY)
+                .collect(Collectors.toList()));
+            HttpPolicyProviders.addAfterRetryPolicies(policies);
+            policies.add(new HttpLoggingPolicy(httpLogOptions));
+            HttpPipeline httpPipeline = new HttpPipelineBuilder().httpClient(httpClient)
+                .policies(policies.toArray(new HttpPipelinePolicy[0]))
+                .build();
+            return new ArmCustomizationManager(httpPipeline, profile, defaultPollInterval);
+        }
+    }
+
+    /**
+     * Gets the resource collection API of Vaults.
+     * 
+     * @return Resource collection API of Vaults.
+     */
+    public Vaults vaults() {
+        if (this.vaults == null) {
+            this.vaults = new VaultsImpl(clientObject.getVaults(), this);
+        }
+        return vaults;
+    }
+
+    /**
+     * Gets wrapped service client ArmCustomizationClient providing direct access to the underlying auto-generated API
+     * implementation, based on Azure REST API.
+     * 
+     * @return Wrapped service client ArmCustomizationClient.
+     */
+    public ArmCustomizationClient serviceClient() {
+        return this.clientObject;
+    }
+}