fix fluent

weidongxu-microsoft · Aug 2, 2024 · 4fed2c3 · 4fed2c3
1 parent 1b4be56
commit 4fed2c3
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/javagen/src/main/java/com/azure/autorest/util/ClientModelUtil.java b/javagen/src/main/java/com/azure/autorest/util/ClientModelUtil.java
@@ -262,12 +262,14 @@ public static String getBuilderSuffix() {
     public static String getServiceClientBuilderPackageName(ServiceClient serviceClient) {
         JavaSettings settings = JavaSettings.getInstance();
         String builderPackage = serviceClient.getPackage();
-        if (serviceClient.getBuilderPackageName() != null) {
-            builderPackage = serviceClient.getBuilderPackageName();
-        } else if (settings.isFluent()) {
+        if (settings.isFluent()) {
             builderPackage = settings.getPackage(settings.getImplementationSubpackage());
         } else if (settings.isGenerateSyncAsyncClients() || settings.isDataPlaneClient()) {
-            builderPackage = settings.getPackage();
+            if (serviceClient.getBuilderPackageName() != null) {
+                builderPackage = serviceClient.getBuilderPackageName();
+            } else {
+                builderPackage = settings.getPackage();
+            }
         }
         return builderPackage;
     }