Merge branch 'feature/v3' of https://github.com/Azure/autorest.csharp into SyncMGC4031

Author: chunyu3

package-lock.json

@@ -17,23 +17,6 @@ internal class ExampleMockValueBuilder
 
         private readonly static ConcurrentDictionary<InputType, InputExampleValue> _cache = new();
 
-        public static InputClientExample BuildClientExample(InputClient client, bool useAllParameters)
-        {
-            _cache.Clear();
-            var clientParameterExamples = new List<InputParameterExample>();
-            foreach (var parameter in client.Parameters)
-            {
-                if (!useAllParameters && !parameter.IsRequired)
-                {
-                    continue;
-                }
-                var parameterExample = BuildParameterExample(parameter, useAllParameters);
-                clientParameterExamples.Add(parameterExample);
-            }
-
-            return new(client, clientParameterExamples);
-        }
-
         public static InputOperationExample BuildOperationExample(InputOperation operation, bool useAllParameters)
         {
             _cache.Clear();

src/AutoRest.CSharp/Common/Input/InputTypes/Examples/ExampleMockValueBuilder.cs

@@ -3,18 +3,13 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using AutoRest.CSharp.Common.Input.Examples;
 
 namespace AutoRest.CSharp.Common.Input;
 
 internal record InputClient(string Name, string Description, IReadOnlyList<InputOperation> Operations, IReadOnlyList<InputParameter> Parameters, string? Parent, IReadOnlyList<InputDecoratorInfo>? Decorators = null)
 {
     private readonly string? _key;
 
-    // No field in record can be lazy initialized - it breaks discovery in dictionary
-    private readonly Dictionary<string, InputClientExample> _examples = new();
-
     public string Key
     {
         get => _key ?? Name;
@@ -24,17 +19,4 @@ public string Key
     public IReadOnlyList<InputOperation> Operations { get; internal set; } = Operations ?? Array.Empty<InputOperation>();
 
     public InputClient() : this(string.Empty, string.Empty, Array.Empty<InputOperation>(), Array.Empty<InputParameter>(), null) { }
-
-    public IReadOnlyDictionary<string, InputClientExample> Examples => EnsureExamples();
-
-    private IReadOnlyDictionary<string, InputClientExample> EnsureExamples()
-    {
-        if (!_examples.Any())
-        {
-            _examples[ExampleMockValueBuilder.ShortVersionMockExampleKey] = ExampleMockValueBuilder.BuildClientExample(this, false);
-            _examples[ExampleMockValueBuilder.MockExampleAllParameterKey] = ExampleMockValueBuilder.BuildClientExample(this, true);
-        }
-
-        return _examples;
-    }
 }

src/AutoRest.CSharp/Common/Input/InputTypes/Examples/InputClientExample.cs

@@ -265,12 +265,12 @@ private static ClientInfo CreateClientInfo(InputClient ns, SourceInputModel? sou
             INamedTypeSymbol? existingType;
             if (sourceInputModel == null || (existingType = sourceInputModel.FindForType(clientNamespace, clientName)) == null)
             {
-                return new ClientInfo(ns.Name, clientName, clientNamespace, clientDescription, operations, clientParameters, resourceParameters, ns.Examples);
+                return new ClientInfo(ns.Name, clientName, clientNamespace, clientDescription, operations, clientParameters, resourceParameters);
             }
 
             clientName = existingType.Name;
             clientNamespace = existingType.ContainingNamespace.ToDisplayString();
-            return new ClientInfo(ns.Name, clientName, clientNamespace, clientDescription, existingType, operations, clientParameters, resourceParameters, ns.Examples);
+            return new ClientInfo(ns.Name, clientName, clientNamespace, clientDescription, existingType, operations, clientParameters, resourceParameters);
         }
 
         private IReadOnlyList<ClientInfo> SetHierarchy(IReadOnlyDictionary<string, ClientInfo> clientInfosByName)
@@ -297,9 +297,8 @@ private IReadOnlyList<ClientInfo> SetHierarchy(IReadOnlyDictionary<string, Clien
                 var infoForEndpoint = topLevelClients.FirstOrDefault(c => c.ClientParameters.Any(p => p.IsEndpoint));
                 var endpointParameter = infoForEndpoint?.ClientParameters.FirstOrDefault(p => p.IsEndpoint);
                 var clientParameters = topLevelClients.SelectMany(c => c.ClientParameters.Where(p => !p.IsRequired || p.IsApiVersion || p.IsEndpoint)).Distinct().ToArray();
-                var clientExamples = infoForEndpoint?.Examples ?? new Dictionary<string, InputClientExample>();
 
-                topLevelClientInfo = new ClientInfo(clientName, clientNamespace, clientParameters, clientExamples);
+                topLevelClientInfo = new ClientInfo(clientName, clientNamespace, clientParameters);
             }
 
             foreach (var clientInfo in topLevelClients)
@@ -438,7 +437,6 @@ private IEnumerable<LowLevelClient> CreateClients(IEnumerable<ClientInfo> client
                     _rootNamespace.Auth,
                     _sourceInputModel,
                     clientOptions,
-                    clientInfo.Examples,
                     typeFactory)
                 {
                     SubClients = subClients
@@ -461,31 +459,6 @@ private class ClientInfo
             public INamedTypeSymbol? ExistingType { get; }
             public IReadOnlyList<InputOperation> Operations { get; }
 
-            private IReadOnlyDictionary<string, InputClientExample> _initialExamples;
-            private IReadOnlyDictionary<string, InputClientExample>? _examples;
-            public IReadOnlyDictionary<string, InputClientExample> Examples => _examples ??= EnsureExamples();
-
-            private IReadOnlyDictionary<string, InputClientExample> EnsureExamples()
-            {
-                // pick up all examples from child client infos here, since we might promote some parameters from child clients
-                var examples = new Dictionary<string, InputClientExample>();
-                foreach (var (key, example) in _initialExamples)
-                {
-                    var clientParameterExamples = new List<InputParameterExample>(example.ClientParameters);
-                    foreach (var child in Children)
-                    {
-                        if (child.Examples.TryGetValue(key, out var childExamples))
-                        {
-                            clientParameterExamples.AddRange(childExamples.ClientParameters);
-                        }
-                    }
-
-                    examples.Add(key, new(example.Client, clientParameterExamples));
-                }
-
-                return examples;
-            }
-
             private IReadOnlyList<InputParameter>? _clientParameters;
             private IReadOnlyList<InputParameter> _initClientParameters;
             public IReadOnlyList<InputParameter> ClientParameters => _clientParameters ??= EnsureClientParameters();
@@ -506,12 +479,12 @@ private IReadOnlyList<InputParameter> EnsureClientParameters()
             public IList<ClientInfo> Children { get; }
             public IList<InputOperation> Requests { get; }
 
-            public ClientInfo(string operationGroupKey, string clientName, string clientNamespace, string clientDescription, IReadOnlyList<InputOperation> operations, IReadOnlyList<InputParameter> clientParameters, ISet<InputParameter> resourceParameters, IReadOnlyDictionary<string, InputClientExample> examples)
-                : this(operationGroupKey, clientName, clientNamespace, clientDescription, null, operations, clientParameters, resourceParameters, examples)
+            public ClientInfo(string operationGroupKey, string clientName, string clientNamespace, string clientDescription, IReadOnlyList<InputOperation> operations, IReadOnlyList<InputParameter> clientParameters, ISet<InputParameter> resourceParameters)
+                : this(operationGroupKey, clientName, clientNamespace, clientDescription, null, operations, clientParameters, resourceParameters)
             {
             }
 
-            public ClientInfo(string operationGroupKey, string clientName, string clientNamespace, string clientDescription, INamedTypeSymbol? existingType, IReadOnlyList<InputOperation> operations, IReadOnlyList<InputParameter> clientParameters, ISet<InputParameter> resourceParameters, IReadOnlyDictionary<string, InputClientExample> examples)
+            public ClientInfo(string operationGroupKey, string clientName, string clientNamespace, string clientDescription, INamedTypeSymbol? existingType, IReadOnlyList<InputOperation> operations, IReadOnlyList<InputParameter> clientParameters, ISet<InputParameter> resourceParameters)
             {
                 OperationGroupKey = operationGroupKey;
                 Name = clientName;
@@ -523,10 +496,9 @@ public ClientInfo(string operationGroupKey, string clientName, string clientName
                 ResourceParameters = resourceParameters;
                 Children = new List<ClientInfo>();
                 Requests = new List<InputOperation>();
-                _initialExamples = examples;
             }
 
-            public ClientInfo(string clientName, string clientNamespace, IReadOnlyList<InputParameter> clientParameters, IReadOnlyDictionary<string, InputClientExample> examples)
+            public ClientInfo(string clientName, string clientNamespace, IReadOnlyList<InputParameter> clientParameters)
             {
                 OperationGroupKey = string.Empty;
                 Name = clientName;
@@ -538,7 +510,6 @@ public ClientInfo(string clientName, string clientNamespace, IReadOnlyList<Input
                 ResourceParameters = new HashSet<InputParameter>();
                 Children = new List<ClientInfo>();
                 Requests = new List<InputOperation>();
-                _initialExamples = examples;
             }
         }
     }

src/AutoRest.CSharp/Common/Input/InputTypes/InputClient.cs

@@ -27,7 +27,6 @@ internal class LowLevelClient : TypeProvider
         private readonly string _libraryName;
         private readonly TypeFactory _typeFactory;
         private readonly IEnumerable<InputParameter> _clientParameters;
-        private readonly IReadOnlyDictionary<string, InputClientExample> _clientParameterExamples;
         private readonly InputAuth _authorization;
         private readonly IEnumerable<InputOperation> _operations;
 
@@ -60,7 +59,7 @@ private LowLevelClient GetTopLevelClient(LowLevelClient client)
             return GetTopLevelClient(client.ParentClient);
         }
 
-        public LowLevelClient(string name, string ns, string description, string libraryName, LowLevelClient? parentClient, IEnumerable<InputOperation> operations, IEnumerable<InputParameter> clientParameters, InputAuth authorization, SourceInputModel? sourceInputModel, ClientOptionsTypeProvider clientOptions, IReadOnlyDictionary<string, InputClientExample> examples, TypeFactory typeFactory)
+        public LowLevelClient(string name, string ns, string description, string libraryName, LowLevelClient? parentClient, IEnumerable<InputOperation> operations, IEnumerable<InputParameter> clientParameters, InputAuth authorization, SourceInputModel? sourceInputModel, ClientOptionsTypeProvider clientOptions, TypeFactory typeFactory)
             : base(ns, sourceInputModel)
         {
             _libraryName = libraryName;
@@ -73,7 +72,6 @@ public LowLevelClient(string name, string ns, string description, string library
             ClientOptions = clientOptions;
 
             _clientParameters = clientParameters;
-            _clientParameterExamples = examples;
             _authorization = authorization;
             _operations = operations;
 
@@ -120,7 +118,7 @@ public IEnumerable<LowLevelClientMethod> CustomMethods()
 
         public static IEnumerable<LowLevelClientMethod> BuildMethods(LowLevelClient? client, TypeFactory typeFactory, IEnumerable<InputOperation> operations, ClientFields fields, string namespaceName, string clientName, SourceInputModel? sourceInputModel)
         {
-            var builders = operations.ToDictionary(o => o, o => new OperationMethodChainBuilder(client, o, namespaceName, clientName, fields, typeFactory, sourceInputModel, client?._clientParameterExamples));
+            var builders = operations.ToDictionary(o => o, o => new OperationMethodChainBuilder(client, o, namespaceName, clientName, fields, typeFactory, sourceInputModel));
             foreach (var (_, builder) in builders)
             {
                 builder.BuildNextPageMethod(builders);

src/AutoRest.CSharp/LowLevel/Output/DpgOutputLibraryBuilder.cs

@@ -40,7 +40,6 @@ internal class OperationMethodChainBuilder
         private readonly string _clientName;
         private readonly LowLevelClient? _client;
         private readonly ClientFields _fields;
-        private readonly IReadOnlyDictionary<string, InputClientExample>? _clientParameterExamples;
         private readonly TypeFactory _typeFactory;
         private readonly SourceInputModel? _sourceInputModel;
         private readonly List<ParameterChain> _orderedParameters;
@@ -54,13 +53,12 @@ internal class OperationMethodChainBuilder
 
         private InputOperation Operation { get; }
 
-        public OperationMethodChainBuilder(LowLevelClient? client, InputOperation operation, string namespaceName, string clientName, ClientFields fields, TypeFactory typeFactory, SourceInputModel? sourceInputModel, IReadOnlyDictionary<string, InputClientExample>? clientParameterExamples)
+        public OperationMethodChainBuilder(LowLevelClient? client, InputOperation operation, string namespaceName, string clientName, ClientFields fields, TypeFactory typeFactory, SourceInputModel? sourceInputModel)
         {
             _client = client;
             _namespaceName = namespaceName;
             _clientName = clientName;
             _fields = fields;
-            _clientParameterExamples = clientParameterExamples;
             _typeFactory = typeFactory;
             _sourceInputModel = sourceInputModel;
             _orderedParameters = new List<ParameterChain>();
@@ -126,7 +124,7 @@ private void BuildSamples(LowLevelClientMethod method, List<DpgOperationSample>
         {
             // we do not generate any sample if these variables are null
             // they are only null when HLC calling methods in this class
-            if (_clientParameterExamples == null || _client == null)
+            if (_client == null)
                 return;
             var shouldGenerateSample = DpgOperationSample.ShouldGenerateSample(_client, method.ProtocolMethodSignature);
 
@@ -136,35 +134,30 @@ private void BuildSamples(LowLevelClientMethod method, List<DpgOperationSample>
             // short version samples
             var shouldGenerateShortVersion = DpgOperationSample.ShouldGenerateShortVersion(_client, method);
 
-            foreach (var (exampleKey, clientExample) in _clientParameterExamples)
+            foreach (var (exampleKey, operationExample) in Operation.Examples)
             {
                 if (!shouldGenerateShortVersion && exampleKey != ExampleMockValueBuilder.ShortVersionMockExampleKey)
                     continue; // skip the short example when we decide not to generate it
 
-                if (Operation.Examples.TryGetValue(exampleKey, out var operationExample))
+                // add protocol method sample
+                samples.Add(new(
+                    _client,
+                    _typeFactory,
+                    method,
+                    operationExample,
+                    false,
+                    exampleKey));
+
+                // add convenience method sample
+                if (method.ConvenienceMethod != null && method.ConvenienceMethod.Signature.Modifiers.HasFlag(Public))
                 {
-                    // add protocol method sample
                     samples.Add(new(
                         _client,
                         _typeFactory,
                         method,
-                        clientExample.ClientParameters,
                         operationExample,
-                        false,
+                        true,
                         exampleKey));
-
-                    // add convenience method sample
-                    if (method.ConvenienceMethod != null && method.ConvenienceMethod.Signature.Modifiers.HasFlag(Public))
-                    {
-                        samples.Add(new(
-                            _client,
-                            _typeFactory,
-                            method,
-                            clientExample.ClientParameters,
-                            operationExample,
-                            true,
-                            exampleKey));
-                    }
                 }
             }
         }