eng, update core, default flavor should be azure now (#2999)

Author: weidongxu-microsoft

Generate.ps1

@@ -146,6 +146,7 @@ $job = @(
     "$VANILLA_ARGUMENTS --input-file=vanilla-tests/swagger/client-default-value.json --namespace=fixtures.annotatedgettersandsetters --annotate-getters-and-setters-for-serialization=true --stream-style-serialization=false",
     "$VANILLA_ARGUMENTS --input-file=vanilla-tests/swagger/xml-tag-with-attribute-and-value.json --namespace=fixtures.complexxmltag --stream-style-serialization=false",
     "$VANILLA_ARGUMENTS --input-file=vanilla-tests/swagger/xml-tag-with-attribute-and-value.json --namespace=fixtures.complexstreamstylexmlserialization",
+    "$VANILLA_ARGUMENTS --input-file=vanilla-tests/swagger/xml-constant.json --namespace=fixtures.xmlconstant",
     "$VANILLA_ARGUMENTS --input-file=vanilla-tests/swagger/security-info.json --namespace=fixtures.securityinfo --use-key-credential",
     "$VANILLA_ARGUMENTS --input-file=vanilla-tests/swagger/special-header.json --namespace=fixtures.specialheader",
     "$VANILLA_ARGUMENTS --input-file=vanilla-tests/swagger/required-fields-as-ctor-args-transformation.json --namespace=fixtures.requiredfieldsascotrargstransformation --required-fields-as-ctor-args=true --output-model-immutable --null-byte-array-maps-to-empty-array",

core

@@ -1,21 +1,21 @@
 diff --git a/packages/http-client-java/emitter/src/code-model-builder.ts b/packages/http-client-java/emitter/src/code-model-builder.ts
-index 5375778e0..917a4a957 100644
+index 691af914b..436ae3c8c 100644
 --- a/packages/http-client-java/emitter/src/code-model-builder.ts
 +++ b/packages/http-client-java/emitter/src/code-model-builder.ts
-@@ -241,7 +241,7 @@ export class CodeModelBuilder {
-   }
+@@ -242,7 +242,7 @@ export class CodeModelBuilder {
+       return this.codeModel;
+     }
 
-   public async build(): Promise<CodeModel> {
 -    this.sdkContext = await createSdkContext(this.emitterContext, "@typespec/http-client-java", {
 +    this.sdkContext = await createSdkContext(this.emitterContext, "@azure-tools/typespec-java", {
        versioning: { previewStringRegex: /$/ },
      }); // include all versions and do the filter by ourselves
 
 diff --git a/packages/http-client-java/emitter/src/emitter.ts b/packages/http-client-java/emitter/src/emitter.ts
-index 317e746d2..848b46275 100644
+index ca4246c47..e4ec721eb 100644
 --- a/packages/http-client-java/emitter/src/emitter.ts
 +++ b/packages/http-client-java/emitter/src/emitter.ts
-@@ -98,7 +98,7 @@ const EmitterOptionsSchema: JSONSchemaType<EmitterOptions> = {
+@@ -107,7 +107,7 @@ const EmitterOptionsSchema: JSONSchemaType<EmitterOptions> = {
  };
 
  export const $lib = createTypeSpecLibrary({
@@ -25,7 +25,7 @@ index 317e746d2..848b46275 100644
    emitter: {
      options: EmitterOptionsSchema,
 diff --git a/packages/http-client-java/generator/http-client-generator-core/pom.xml b/packages/http-client-java/generator/http-client-generator-core/pom.xml
-index afa83e5c4..db70c748e 100644
+index b65210b56..cd015f70f 100644
 --- a/packages/http-client-java/generator/http-client-generator-core/pom.xml
 +++ b/packages/http-client-java/generator/http-client-generator-core/pom.xml
 @@ -21,6 +21,11 @@
@@ -57,7 +57,7 @@ index d44ce8ec4..7953870bc 100644
  import com.microsoft.typespec.http.client.generator.core.extension.plugin.JavaSettings;
  import com.microsoft.typespec.http.client.generator.core.extension.plugin.NewPlugin;
 diff --git a/packages/http-client-java/generator/http-client-generator/src/main/resources/readme/pom.xml b/packages/http-client-java/generator/http-client-generator/src/main/resources/readme/pom.xml
-index c99896650..358938595 100644
+index c99896650..fef2a4caf 100644
 --- a/packages/http-client-java/generator/http-client-generator/src/main/resources/readme/pom.xml
 +++ b/packages/http-client-java/generator/http-client-generator/src/main/resources/readme/pom.xml
 @@ -16,9 +16,9 @@

core.diff

@@ -1,5 +1,11 @@
 # Release History
 
+## 0.27.1 (2024-12-17)
+
+Compatible with compiler 0.63.
+
+- Default value for emitter option `flavor` is always `azure`.
+
 ## 0.27.0 (2024-12-11)
 
 Compatible with compiler 0.63.

typespec-extension/changelog.md

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

typespec-extension/package-lock.json

@@ -4,7 +4,7 @@ Install [Node.js](https://nodejs.org/en/download/) 20 or above. (Verify by runni
 
 Install [Java](https://docs.microsoft.com/java/openjdk/download) 11 or above. (Verify by running `java --version`)
 
-Install [Maven](https://maven.apache.org/install.html). (Verify by running `mvn --version`)
+Install [Maven](https://maven.apache.org/download.cgi). (Verify by running `mvn --version`)
 
 Install [TypeSpec](https://typespec.io/) 0.63.
 
@@ -36,23 +36,87 @@ emit:
 options:
   "@azure-tools/typespec-java":
     emitter-output-dir: "{project-root}/azure-ai-language-authoring"
-    namespace: "com.azure.ai.language.authoring"
     service-name: "Authoring"
     generate-samples: true
     generate-tests: true
     partial-update: false
     api-version: "2023-11-01"
 ```
 
+### SDK Related Configuration in Emitter options `tspconfig.yaml`
+
+#### `api-version`
+
+By default, the emitter generates code from the latest api-version in TypeSpec.
+
+In cases where a service needs to generate code from a previous api-version, set the value to that specific api-version.
+
+#### `service-name`
+
+This emitter option is for management-plane SDK.
+
+It is advised for the service to set an appropriate service name. E.g. `service-name: Standby Pool`.
+
+The name will appear in documentation (e.g. "README.md") that describes the service and the SDK. It would also affect the name of the entry class of the SDK.
+
+#### `partial-update`
+
+Default value is `false`.
+
+This emitter option is for data-plane SDK.
+
+In the case that the generated code is not good enough for the SDK, the developer can choose to customize the generated SDK via [Partial Update](https://github.com/Azure/azure-sdk-for-java/wiki/TypeSpec-Java-QuickStart#partial-update). Set the value to `true` to enable this feature.
+
+#### `generate-samples`
+
+Default value is `true`. The emitter generates code samples under the `generated` package.
+
+For data-plane SDK, the generated samples are for reference. The motivation is to show how samples can be written. It is expected that developers write correct and concise samples outside of the `generated` package.
+
+If there is customization of the generated SDK, the generated samples may not compile after customization. One can delete the `generated` package, and set the value to `false` to disable the generated samples.
+
+#### `generate-tests`
+
+Default value is `true`. The emitter generates tests under the `generated` package.
+
+For data-plane SDK, the generated tests are (disabled) live tests. The motivation is to show how test cases can be written in Java with JUnit. It is expected that developers write runnable tests outside of the `generated` package.
+
+For management-plane SDK, the generated tests are mock tests, for JSON serialization and API requests.
+
+If there is customization of the generated SDK, the generated tests may not compile after customization. One can delete the `generated` package, and set the value to `false` to disable the generated tests.
+
+### SDK Related Configuration in Client Customization `client.tsp`
+
+For Java SDK, it is required to provide a Java package name via `@clientNamespace`.
+
+Here is an example:
+
+```ts
+@@clientNamespace(Client, "com.azure.ai.openai", "java");
+@@clientNamespace(Azure.OpenAI, "com.azure.ai.openai", "java");
+```
+
+For management-plane SDK, one can provide a client name via `@clientName`.
+
+Here is an example:
+
+```ts
+@@clientNamespace(Microsoft.StandbyPool,
+  "com.azure.resourcemanager.standbypool",
+  "java"
+);
+@@clientName(Microsoft.StandbyPool, "StandbyPoolManagementClient", "java");
+```
+
 ## Convenience API
 
 By default, TypeSpec-Java generates all protocol APIs and convenience APIs.
 A few exceptions are API of JSON Merge Patch, and API of long-running operation with ambiguous response type.
 
 See "convenientAPI" decorator from [typespec-client-generator-core](https://github.com/Azure/typespec-azure/tree/main/packages/typespec-client-generator-core).
 
-
 # Customization
+
 All post-code customizations listed in this [documentation](https://github.com/Azure/autorest.java/tree/main/customization-base/README.md) are supported for code generated from TypeSpec.
 
 To configure customization with TypeSpec, Java's emitter options should include a `customization-class`. The `customization-class` option should specify the path to the file containing the customization code relative to `emitter-output-dir`. Note that the path should end with `src/main/java/<YourCustomizationClassName>.java`. The recommended practice is to place the customization class in `<output-dir>/customization/src/main/java/<YourCustomizationClassName>.java` and the `customization-class` option will have the value of `customization-class: customization/src/main/java/<YourCustomizationClassName>.java`. See example `tspconfig.yaml` below:

typespec-extension/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@typespec/http-specs": "0.1.0-alpha.5",
     "@azure-tools/azure-http-specs": "0.1.0-alpha.4",
-    "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.27.0.tgz"
+    "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.27.1.tgz"
   },
   "devDependencies": {
     "@typespec/prettier-plugin-typespec": "~0.63.0",

typespec-extension/readme.md

@@ -7,7 +7,6 @@ options:
     generate-samples: true
     generate-tests: true
     examples-dir: "{project-root}/tsp/examples"
-    flavor: "Azure"
     dev-options:
       generate-code-model: true
       loglevel: info

typespec-tests/package.json

@@ -0,0 +1,130 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package fixtures.xmlconstant.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.util.CoreUtils;
+import com.azure.xml.XmlReader;
+import com.azure.xml.XmlSerializable;
+import com.azure.xml.XmlToken;
+import com.azure.xml.XmlWriter;
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+
+/**
+ * Groups the set of query request settings.
+ */
+@Fluent
+public final class QueryRequest implements XmlSerializable<QueryRequest> {
+    /*
+     * Required. The type of the provided query expression.
+     */
+    private final String queryType = "SQL";
+
+    /*
+     * The query expression in SQL. The maximum size of the query expression is 256KiB.
+     */
+    private String expression;
+
+    /**
+     * Creates an instance of QueryRequest class.
+     */
+    public QueryRequest() {
+    }
+
+    /**
+     * Get the queryType property: Required. The type of the provided query expression.
+     * 
+     * @return the queryType value.
+     */
+    public String getQueryType() {
+        return this.queryType;
+    }
+
+    /**
+     * Get the expression property: The query expression in SQL. The maximum size of the query expression is 256KiB.
+     * 
+     * @return the expression value.
+     */
+    public String getExpression() {
+        return this.expression;
+    }
+
+    /**
+     * Set the expression property: The query expression in SQL. The maximum size of the query expression is 256KiB.
+     * 
+     * @param expression the expression value to set.
+     * @return the QueryRequest object itself.
+     */
+    public QueryRequest setExpression(String expression) {
+        this.expression = expression;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (getExpression() == null) {
+            throw new IllegalArgumentException("Missing required property expression in model QueryRequest");
+        }
+    }
+
+    @Override
+    public XmlWriter toXml(XmlWriter xmlWriter) throws XMLStreamException {
+        return toXml(xmlWriter, null);
+    }
+
+    @Override
+    public XmlWriter toXml(XmlWriter xmlWriter, String rootElementName) throws XMLStreamException {
+        rootElementName = CoreUtils.isNullOrEmpty(rootElementName) ? "QueryRequest" : rootElementName;
+        xmlWriter.writeStartElement(rootElementName);
+        xmlWriter.writeStringElement("QueryType", this.queryType);
+        xmlWriter.writeStringElement("Expression", this.expression);
+        return xmlWriter.writeEndElement();
+    }
+
+    /**
+     * Reads an instance of QueryRequest from the XmlReader.
+     * 
+     * @param xmlReader The XmlReader being read.
+     * @return An instance of QueryRequest if the XmlReader was pointing to an instance of it, or null if it was
+     * pointing to XML null.
+     * @throws XMLStreamException If an error occurs while reading the QueryRequest.
+     */
+    public static QueryRequest fromXml(XmlReader xmlReader) throws XMLStreamException {
+        return fromXml(xmlReader, null);
+    }
+
+    /**
+     * Reads an instance of QueryRequest from the XmlReader.
+     * 
+     * @param xmlReader The XmlReader being read.
+     * @param rootElementName Optional root element name to override the default defined by the model. Used to support
+     * cases where the model can deserialize from different root element names.
+     * @return An instance of QueryRequest if the XmlReader was pointing to an instance of it, or null if it was
+     * pointing to XML null.
+     * @throws XMLStreamException If an error occurs while reading the QueryRequest.
+     */
+    public static QueryRequest fromXml(XmlReader xmlReader, String rootElementName) throws XMLStreamException {
+        String finalRootElementName = CoreUtils.isNullOrEmpty(rootElementName) ? "QueryRequest" : rootElementName;
+        return xmlReader.readObject(finalRootElementName, reader -> {
+            QueryRequest deserializedQueryRequest = new QueryRequest();
+            while (reader.nextElement() != XmlToken.END_ELEMENT) {
+                QName elementName = reader.getElementName();
+
+                if ("Expression".equals(elementName.getLocalPart())) {
+                    deserializedQueryRequest.expression = reader.getStringElement();
+                } else {
+                    reader.skipElement();
+                }
+            }
+
+            return deserializedQueryRequest;
+        });
+    }
+}