tsp, bug fix, remove SubNamespace from operation group name (#2899)

Author: weidongxu-microsoft

javagen/src/main/java/com/azure/autorest/Javagen.java

@@ -173,10 +173,12 @@ protected JavaPackage writeToTemplates(CodeModel codeModel, Client client, JavaS
             }
 
             // Method group
-            for (MethodGroupClient methodGroupClient : client.getServiceClient().getMethodGroupClients()) {
-                javaPackage.addMethodGroup(methodGroupClient.getPackage(), methodGroupClient.getClassName(), methodGroupClient);
-                if (settings.isGenerateClientInterfaces()) {
-                    javaPackage.addMethodGroupInterface(methodGroupClient.getInterfaceName(), methodGroupClient);
+            if (CoreUtils.isNullOrEmpty(client.getServiceClients())) {
+                writeMethodGroupClient(javaPackage, client.getServiceClient(), settings);
+            } else {
+                // multi-client from TypeSpec
+                for (ServiceClient serviceClient : client.getServiceClients()) {
+                    writeMethodGroupClient(javaPackage, serviceClient, settings);
                 }
             }
 
@@ -342,6 +344,15 @@ protected void writeClientModels(Client client, JavaPackage javaPackage, JavaSet
     protected void writeHelperClasses(Client client, CodeModel codeModel, JavaPackage javaPackage, JavaSettings settings) {
     }
 
+    private static void writeMethodGroupClient(JavaPackage javaPackage, ServiceClient serviceClient, JavaSettings settings) {
+        for (MethodGroupClient methodGroupClient : serviceClient.getMethodGroupClients()) {
+            javaPackage.addMethodGroup(methodGroupClient.getPackage(), methodGroupClient.getClassName(), methodGroupClient);
+            if (settings.isGenerateClientInterfaces()) {
+                javaPackage.addMethodGroupInterface(methodGroupClient.getInterfaceName(), methodGroupClient);
+            }
+        }
+    }
+
     private void clear() {
         ClientModels.getInstance().clear();
         UnionModels.getInstance().clear();

javagen/src/main/java/com/azure/autorest/template/example/ProtocolTestWriter.java

@@ -13,14 +13,11 @@
 import com.azure.autorest.model.javamodel.JavaClass;
 import com.azure.autorest.model.javamodel.JavaIfBlock;
 import com.azure.autorest.util.CodeNamer;
-import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
 import com.azure.core.http.policy.HttpLogDetailLevel;
 import com.azure.core.http.policy.HttpLogOptions;
 import com.azure.core.util.Configuration;
-import reactor.core.publisher.Mono;
 
-import java.time.OffsetDateTime;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -43,13 +40,11 @@ public ProtocolTestWriter(TestContext testContext) {
                 && serviceClient.getSecurityInfo().getSecurityTypes().contains(Scheme.SecuritySchemeType.OAUTH2);
 
         this.imports = new HashSet<>(Arrays.asList(
-                AccessToken.class.getName(),
                 HttpClient.class.getName(),
                 HttpLogDetailLevel.class.getName(),
                 HttpLogOptions.class.getName(),
                 Configuration.class.getName(),
-                OffsetDateTime.class.getName(),
-                Mono.class.getName(),
+                "com.azure.core.test.utils.MockTokenCredential",
                 "com.azure.identity.DefaultAzureCredentialBuilder",
                 "com.azure.core.test.TestProxyTestBase",
                 "com.azure.core.test.TestMode",
@@ -106,7 +101,7 @@ public ProtocolTestWriter(TestContext testContext) {
                 JavaIfBlock codeBlock = methodBlock.ifBlock("getTestMode() == TestMode.PLAYBACK", ifBlock -> {
                     if (isTokenCredential) {
                         ifBlock.line(String.format("%1$s.httpClient(interceptorManager.getPlaybackClient())", builderVarName));
-                        ifBlock.line(".credential(request -> Mono.just(new AccessToken(\"this_is_a_token\", OffsetDateTime.MAX)));");
+                        ifBlock.line(".credential(new MockTokenCredential());");
                     } else {
                         ifBlock.line(String.format("%1$s.httpClient(interceptorManager.getPlaybackClient());", builderVarName));
                     }

typespec-extension/changelog.md

@@ -1,5 +1,9 @@
 # Release History
 
+## 0.18.5 (2024-08-08)
+
+Compatible with compiler 0.58.
+
 ## 0.18.4 (2024-08-07)
 
 Compatible with compiler 0.58.

typespec-extension/package-lock.json

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

typespec-extension/package.json

@@ -524,13 +524,15 @@ export class CodeModelBuilder {
     this.options["group-etag-headers"] = this.options["group-etag-headers"] ?? true;
 
     for (const client of clients) {
-      let clientName = client.name;
+      let clientName: string = client.name;
+      let clientSubNamespace: string | undefined = undefined;
       let javaNamespace = this.getJavaNamespace(this.namespace);
       const clientFullName = client.name;
       const clientNameSegments = clientFullName.split(".");
       if (clientNameSegments.length > 1) {
         clientName = clientNameSegments.at(-1)!;
-        javaNamespace = this.getJavaNamespace(this.namespace + "." + clientNameSegments.slice(0, -1).join("."));
+        clientSubNamespace = clientNameSegments.slice(0, -1).join(".");
+        javaNamespace = this.getJavaNamespace(this.namespace + "." + clientSubNamespace);
       }
 
       const codeModelClient = new CodeModelClient(clientName, this.getDoc(client.type), {
@@ -608,14 +610,19 @@ export class CodeModelBuilder {
         const operations = listOperationsInOperationGroup(this.sdkContext, operationGroup);
         // operation group with no operation is skipped
         if (operations.length > 0) {
-          const groupPath = operationGroup.groupPath.split(".");
+          // groupPath would be in format of "[<SubNamespace>.]<ClientName>.Chat.Completions"
+          let operationGroupPath = operationGroup.groupPath;
+          if (clientSubNamespace && operationGroup.groupPath.startsWith(clientSubNamespace + ".")) {
+            // remove SubNamespace
+            operationGroupPath = operationGroupPath.slice((clientSubNamespace + ".").length);
+          }
+          const groupPath = operationGroupPath.split(".");
           let operationGroupName: string;
           if (groupPath.length > 1) {
-            // groupPath should be in format of "OpenAIClient.Chat.Completions"
+            // remove ClientName
             operationGroupName = groupPath.slice(1).join("");
           } else {
-            // protection
-            operationGroupName = operationGroup.type.name;
+            operationGroupName = groupPath[0];
           }
           codeModelGroup = new OperationGroup(operationGroupName);
           for (const operation of operations) {

typespec-extension/src/code-model-builder.ts

@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@azure-tools/cadl-ranch-specs": "0.35.2",
-    "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.18.4.tgz"
+    "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.18.5.tgz"
   },
   "devDependencies": {
     "@typespec/prettier-plugin-typespec": "~0.58.0",

typespec-tests/package.json

@@ -10,15 +10,13 @@
 
 import com.authentication.oauth2.OAuth2Client;
 import com.authentication.oauth2.OAuth2ClientBuilder;
-import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
 import com.azure.core.http.policy.HttpLogDetailLevel;
 import com.azure.core.http.policy.HttpLogOptions;
 import com.azure.core.test.TestMode;
 import com.azure.core.test.TestProxyTestBase;
+import com.azure.core.test.utils.MockTokenCredential;
 import com.azure.identity.DefaultAzureCredentialBuilder;
-import java.time.OffsetDateTime;
-import reactor.core.publisher.Mono;
 
 class OAuth2ClientTestBase extends TestProxyTestBase {
     protected OAuth2Client oAuth2Client;
@@ -29,7 +27,7 @@ protected void beforeTest() {
             .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC));
         if (getTestMode() == TestMode.PLAYBACK) {
             oAuth2Clientbuilder.httpClient(interceptorManager.getPlaybackClient())
-                .credential(request -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)));
+                .credential(new MockTokenCredential());
         } else if (getTestMode() == TestMode.RECORD) {
             oAuth2Clientbuilder.addPolicy(interceptorManager.getRecordPolicy())
                 .credential(new DefaultAzureCredentialBuilder().build());

typespec-tests/src/test/java/com/authentication/oauth2/generated/OAuth2ClientTestBase.java

@@ -10,15 +10,13 @@
 
 import com.authentication.union.UnionClient;
 import com.authentication.union.UnionClientBuilder;
-import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
 import com.azure.core.http.policy.HttpLogDetailLevel;
 import com.azure.core.http.policy.HttpLogOptions;
 import com.azure.core.test.TestMode;
 import com.azure.core.test.TestProxyTestBase;
+import com.azure.core.test.utils.MockTokenCredential;
 import com.azure.identity.DefaultAzureCredentialBuilder;
-import java.time.OffsetDateTime;
-import reactor.core.publisher.Mono;
 
 class UnionClientTestBase extends TestProxyTestBase {
     protected UnionClient unionClient;
@@ -28,8 +26,7 @@ protected void beforeTest() {
         UnionClientBuilder unionClientbuilder = new UnionClientBuilder().httpClient(HttpClient.createDefault())
             .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC));
         if (getTestMode() == TestMode.PLAYBACK) {
-            unionClientbuilder.httpClient(interceptorManager.getPlaybackClient())
-                .credential(request -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)));
+            unionClientbuilder.httpClient(interceptorManager.getPlaybackClient()).credential(new MockTokenCredential());
         } else if (getTestMode() == TestMode.RECORD) {
             unionClientbuilder.addPolicy(interceptorManager.getRecordPolicy())
                 .credential(new DefaultAzureCredentialBuilder().build());