mgmt, use separate entry points for premium samples

.chronus/changes/java_mgmt_use_individual_entry_for_premium-2026-1-28-9-31-24.md

@@ -0,0 +1,8 @@
+---
+# Change versionKind to one of: internal, fix, dependencies, feature, deprecation, breaking
+changeKind: fix
+packages:
+  - "@typespec/http-client-java"
+---
+
+mgmt, use separate entry points for premium samples

packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/FluentType.java

@@ -34,9 +34,6 @@ public class FluentType {
     public static final ClassType SYSTEM_DATA
         = new ClassType.Builder().packageName("com.azure.core.management").name("SystemData").build();
 
-    public static final ClassType AZURE_RESOURCE_MANAGER
-        = new ClassType.Builder().packageName("com.azure.resourcemanager").name("AzureResourceManager").build();
-
     public static final ClassType ADDITIONAL_INFO
         = new ClassType.Builder().packageName("com.azure.core.management.exception").name("AdditionalInfo").build();
 

packages/http-client-java/generator/http-client-generator-mgmt/src/main/java/com/microsoft/typespec/http/client/generator/mgmt/model/clientmodel/examplemodel/FluentClientMethodExample.java

@@ -8,13 +8,13 @@
 import com.microsoft.typespec.http.client.generator.core.model.clientmodel.ClientMethod;
 import com.microsoft.typespec.http.client.generator.core.model.clientmodel.MethodGroupClient;
 import com.microsoft.typespec.http.client.generator.core.util.CodeNamer;
-import com.microsoft.typespec.http.client.generator.mgmt.model.FluentType;
+import com.microsoft.typespec.http.client.generator.mgmt.model.clientmodel.FluentStatic;
 import com.microsoft.typespec.http.client.generator.mgmt.model.clientmodel.ModelNaming;
+import com.microsoft.typespec.http.client.generator.mgmt.util.FluentUtils;
 import java.util.ArrayList;
-import java.util.LinkedHashMap;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.regex.Pattern;
 
 /**
  * Model of example for service client method (usually for Fluent Premium).
@@ -26,13 +26,21 @@ public class FluentClientMethodExample implements FluentMethodExample {
     private final MethodGroupClient methodGroup;
     private final ClientMethod clientMethod;
     private final List<ParameterExample> parameters = new ArrayList<>();
+    private final ClassType managerType;
 
     public FluentClientMethodExample(String name, String originalFileName, MethodGroupClient methodGroup,
         ClientMethod clientMethod) {
         this.name = name;
         this.originalFileName = originalFileName;
         this.methodGroup = methodGroup;
         this.clientMethod = clientMethod;
+
+        String clientName = FluentStatic.getClient().getServiceClient().getClientBaseName();
+        String serviceName = FluentUtils.getServiceName(clientName);
+        JavaSettings settings = JavaSettings.getInstance();
+        this.managerType = new ClassType.Builder().packageName(settings.getPackage())
+            .name(CodeNamer.toPascalCase(serviceName) + "Manager")
+            .build();
     }
 
     public MethodGroupClient getMethodGroup() {
@@ -55,17 +63,17 @@ public String getOriginalFileName() {
 
     @Override
     public ClassType getEntryType() {
-        return FluentType.AZURE_RESOURCE_MANAGER;
+        return managerType;
     }
 
     @Override
     public String getEntryName() {
-        return "azure";
+        return "manager";
     }
 
     @Override
     public String getEntryDescription() {
-        return "The entry point for accessing resource management APIs in Azure.";
+        return String.format("Entry point to %1$s.", managerType.getName());
     }
 
     @Override
@@ -76,54 +84,25 @@ public List<ParameterExample> getParameters() {
     @Override
     public String getMethodReference() {
         JavaSettings settings = JavaSettings.getInstance();
-
         String namespace = settings.getPackage();
-        String[] identifiers = namespace.split(Pattern.quote("."));
-        String lastIdentifier = identifiers[identifiers.length - 1];
+        String lastIdentifier = namespace.substring(namespace.lastIndexOf('.') + 1);
 
+        // Guard against accidental premium code generation for non-premium libraries
         if (!MANAGER_REFERENCE.containsKey(lastIdentifier)) {
             throw new IllegalStateException("Package '" + namespace + "' is not supported by Fluent Premium");
         }
 
-        String managerReference = MANAGER_REFERENCE.get(lastIdentifier) + "." + ModelNaming.METHOD_MANAGER + "()";
         String serviceClientReference = ModelNaming.METHOD_SERVICE_CLIENT + "()";
-        if ("authorization".equals(lastIdentifier)) {
-            serviceClientReference = "roleServiceClient()";
-        } else if ("resources".equals(lastIdentifier)) {
-            String tag = settings.getAutorestSettings().getTag();
-            if (tag.contains("feature")) {
-                serviceClientReference = "featureClient()";
-            } else if (tag.contains("policy")) {
-                serviceClientReference = "policyClient()";
-            } else if (tag.contains("subscriptions")) {
-                serviceClientReference = "subscriptionClient()";
-            } else if (tag.contains("locks")) {
-                serviceClientReference = "managementLockClient()";
-            } else if (tag.contains("changes")) {
-                serviceClientReference = "resourceChangeClient()";
-            } else if (tag.contains("databoundaries")) {
-                serviceClientReference = "dataBoundaryClient()";
-            } else if (!tag.contains("resources")) {
-                // OpenAPI source of deployments moved to a separate folder
-                serviceClientReference = "deploymentClient()";
-            }
-        } else if ("containerregistry".equals(lastIdentifier)) {
-            String title = settings.getAutorestSettings().getTitle();
-            if ("ContainerRegistryTasks".equals(title)) {
-                serviceClientReference = "taskClient()";
-            }
-        }
-
         String methodGroupReference = "get" + CodeNamer.toPascalCase(methodGroup.getVariableName()) + "()";
-        return managerReference + "." + serviceClientReference + "." + methodGroupReference;
+        return serviceClientReference + "." + methodGroupReference;
     }
 
     @Override
     public String getMethodName() {
         return clientMethod.getName();
     }
 
-    private final static Map<String, String> MANAGER_REFERENCE = new LinkedHashMap<>();
+    private static final Map<String, String> MANAGER_REFERENCE = new HashMap<>();
     static {
         MANAGER_REFERENCE.put("appplatform", "springServices()");
         MANAGER_REFERENCE.put("appservice", "webApps()");