Skip empty client (Azure#47859)

Author: live1206

eng/Packages.Data.props

@@ -258,7 +258,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(IsGeneratorLibrary)' == 'true'">
-    <PackageReference Update="Microsoft.Generator.CSharp.ClientModel" Version="1.0.0-alpha.20250114.2" />
+    <PackageReference Update="Microsoft.Generator.CSharp.ClientModel" Version="1.0.0-alpha.20250117.1" />
   </ItemGroup>
 
   <!--

eng/packages/http-client-csharp/generator/Azure.Generator/src/AzureClientPlugin.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+using Azure.Generator.Utilities;
 using Microsoft.CodeAnalysis;
 using Microsoft.Generator.CSharp;
 using Microsoft.Generator.CSharp.ClientModel;
@@ -29,6 +30,8 @@ public class AzureClientPlugin : ClientModelPlugin
     /// <inheritdoc/>
     public override AzureOutputLibrary OutputLibrary => _azureOutputLibrary ??= new();
 
+    internal ResourceDetection ResourceDetection { get; } = new();
+
     /// <summary>
     /// The Azure client plugin to generate the Azure client SDK.
     /// </summary>

eng/packages/http-client-csharp/generator/Azure.Generator/src/AzureOutputLibrary.cs

@@ -29,7 +29,7 @@ private Dictionary<string, HashSet<OperationSet>> EnsureResourceDataMap()
             var result = new Dictionary<string, HashSet<OperationSet>>();
             foreach (var operationSet in _pathToOperationSetMap.Values)
             {
-                if (operationSet.TryGetResourceDataSchema(out var resourceSpecName, out var resourceSchema))
+                if (AzureClientPlugin.Instance.ResourceDetection.TryGetResourceDataSchema(operationSet, out var resourceSpecName, out var resourceSchema))
                 {
                     // if this operation set corresponds to a SDK resource, we add it to the map
                     if (!result.TryGetValue(resourceSpecName!, out HashSet<OperationSet>? value))

eng/packages/http-client-csharp/generator/Azure.Generator/src/AzureTypeFactory.cs

@@ -109,8 +109,16 @@ public override MethodBodyStatement SerializeJsonValue(Type valueType, ValueExpr
         }
 
         /// <inheritdoc/>
-        protected override ClientProvider CreateClientCore(InputClient inputClient)
-            => AzureClientPlugin.Instance.IsAzureArm.Value ? base.CreateClientCore(InputClientTransformer.TransformInputClient(inputClient)) : base.CreateClientCore(inputClient);
+        protected override ClientProvider? CreateClientCore(InputClient inputClient)
+        {
+            if (!AzureClientPlugin.Instance.IsAzureArm.Value)
+            {
+                return base.CreateClientCore(inputClient);
+            }
+
+            var transformedClient = InputClientTransformer.TransformInputClient(inputClient);
+            return transformedClient is null ? null : base.CreateClientCore(transformedClient);
+        }
 
         /// <inheritdoc/>
         protected override IReadOnlyList<TypeProvider> CreateSerializationsCore(InputType inputType, TypeProvider typeProvider)

eng/packages/http-client-csharp/generator/Azure.Generator/src/InputTransformation/InputClientTransformer.cs

@@ -9,7 +9,7 @@ namespace Azure.Generator.InputTransformation
 {
     internal static class InputClientTransformer
     {
-        public static InputClient TransformInputClient(InputClient client)
+        public static InputClient? TransformInputClient(InputClient client)
         {
             var operationsToKeep = new List<InputOperation>();
             foreach (var operation in client.Operations)
@@ -21,6 +21,11 @@ public static InputClient TransformInputClient(InputClient client)
                     operationsToKeep.Add(transformedOperation);
                 }
             }
+
+            // We removed the list operation above, we should skip the empty client afterwards
+            // There is no need to check sub-clients or custom code since it is specific to handle the above removing
+            if (operationsToKeep.Count == 0) return null;
+
             return new InputClient(client.Name, client.Summary, client.Doc, operationsToKeep, client.Parameters, client.Parent);
         }
 

eng/packages/http-client-csharp/generator/Azure.Generator/src/Providers/RequestContextExtensionsDefinition.cs

@@ -14,7 +14,7 @@ namespace Azure.Generator.Providers
 {
     internal class RequestContextExtensionsDefinition : TypeProvider
     {
-        protected override TypeSignatureModifiers GetDeclarationModifiers() => TypeSignatureModifiers.Internal | TypeSignatureModifiers.Static;
+        protected override TypeSignatureModifiers BuildDeclarationModifiers() => TypeSignatureModifiers.Internal | TypeSignatureModifiers.Static;
 
         protected override string BuildName() => "RequestContextExtensions";
 

eng/packages/http-client-csharp/generator/Azure.Generator/src/Utilities/ResourceDetection.cs

@@ -11,20 +11,15 @@
 
 namespace Azure.Generator.Utilities
 {
-    internal static class ResourceDetection
+    internal class ResourceDetection
     {
         private const string ProvidersSegment = "/providers/";
-        private static ConcurrentDictionary<string, (string Name, InputModelType? InputModel)?> _resourceDataSchemaCache = new ConcurrentDictionary<string, (string Name, InputModelType? InputModel)?>();
-
-        public static bool IsResource(this OperationSet set)
-        {
-            return set.TryGetResourceDataSchema(out _, out _);
-        }
+        private ConcurrentDictionary<string, (string Name, InputModelType? InputModel)?> _resourceDataSchemaCache = new ConcurrentDictionary<string, (string Name, InputModelType? InputModel)?>();
 
         private static InputModelType? FindObjectSchemaWithName(string name)
             => AzureClientPlugin.Instance.InputLibrary.InputNamespace.Models.OfType<InputModelType>().FirstOrDefault(inputModel => inputModel.Name == name);
 
-        public static bool TryGetResourceDataSchema(this OperationSet set, [MaybeNullWhen(false)] out string resourceSpecName, out InputModelType? inputModel)
+        public bool TryGetResourceDataSchema(OperationSet set, [MaybeNullWhen(false)] out string resourceSpecName, out InputModelType? inputModel)
         {
             resourceSpecName = null;
             inputModel = null;
@@ -48,15 +43,15 @@ public static bool TryGetResourceDataSchema(this OperationSet set, [MaybeNullWhe
                 return false;
 
             // try put operation to get the resource name
-            if (set.TryOperationWithMethod(RequestMethod.Put, out inputModel))
+            if (TryOperationWithMethod(set, RequestMethod.Put, out inputModel))
             {
                 resourceSpecName = inputModel.Name;
                 _resourceDataSchemaCache.TryAdd(set.RequestPath, (resourceSpecName, inputModel));
                 return true;
             }
 
             // try get operation to get the resource name
-            if (set.TryOperationWithMethod(RequestMethod.Get, out inputModel))
+            if (TryOperationWithMethod(set, RequestMethod.Get, out inputModel))
             {
                 resourceSpecName = inputModel.Name;
                 _resourceDataSchemaCache.TryAdd(set.RequestPath, (resourceSpecName, inputModel));
@@ -80,7 +75,7 @@ private static bool CheckEvenSegments(string requestPath)
             return segments.Length % 2 == 0;
         }
 
-        private static bool TryOperationWithMethod(this OperationSet set, RequestMethod method, [MaybeNullWhen(false)] out InputModelType inputModel)
+        private bool TryOperationWithMethod(OperationSet set, RequestMethod method, [MaybeNullWhen(false)] out InputModelType inputModel)
         {
             inputModel = null;
 

eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/Abstractions/AzureClientResponseProviderTests.cs

@@ -51,7 +51,7 @@ private static ClientProvider CreateMockClientProvider()
         {
             var client = InputFactory.Client("TestClient", [InputFactory.Operation("foo")]);
             MockHelpers.LoadMockPlugin(clientResponseApi: AzureClientResponseProvider.Instance);
-            var clientProvider = AzureClientPlugin.Instance.TypeFactory.CreateClient(client);
+            var clientProvider = AzureClientPlugin.Instance.TypeFactory.CreateClient(client)!;
             return clientProvider;
         }
     }

eng/packages/http-client-csharp/generator/Azure.Generator/test/Providers/ClientProviderTests.cs

@@ -7,7 +7,6 @@
 using Microsoft.Generator.CSharp.Providers;
 using NUnit.Framework;
 using System;
-using System.ClientModel;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.CompilerServices;