Tweak public cosntructor to initialize collection-type properties (Azure#52535)

* Tweak public cosntructor to initialize collection-type properties

* Update eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Management/src/Visitors/FlattenPropertyVisitor.cs

Co-authored-by: Copilot <[email protected]>

---------

Co-authored-by: Copilot <[email protected]>

Author: live1206

eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Management/src/Utilities/PropertyHelpers.cs

@@ -107,30 +107,6 @@ public static MethodBodyStatement BuildGetter(bool? includeGetterNullCheck, Prop
             }
         }
 
-        public static MethodBodyStatement BuildGetterForCollectionProperty(IEnumerable<PropertyProvider> collectionTypeProperties, bool? includeGetterNullCheck, string initializationMethodName, PropertyProvider internalProperty, TypeProvider innerModel, PropertyProvider singleProperty)
-        {
-            var checkNullExpression = This.Property(internalProperty.Name).Is(Null);
-            if (includeGetterNullCheck == true)
-            {
-                return new List<MethodBodyStatement> {
-                    This.Invoke(initializationMethodName).Terminate(),
-                    Return(new MemberExpression(internalProperty, singleProperty.Name))
-                };
-            }
-            else if (includeGetterNullCheck == false)
-            {
-                return Return(new TernaryConditionalExpression(checkNullExpression, Default, new MemberExpression(internalProperty, singleProperty.Name)));
-            }
-            else
-            {
-                if (innerModel.Type.IsNullable)
-                {
-                    return Return(new MemberExpression(internalProperty.AsVariableExpression.NullConditional(), singleProperty.Name));
-                }
-                return Return(new MemberExpression(internalProperty, singleProperty.Name));
-            }
-        }
-
         public static MethodBodyStatement BuildSetterForPropertyFlatten(ModelProvider innerModel, PropertyProvider internalProperty, PropertyProvider innerProperty)
         {
             var isNullableValueType = innerProperty.Type.IsValueType && innerProperty.Type.IsNullable;
@@ -146,17 +122,6 @@ public static MethodBodyStatement BuildSetterForPropertyFlatten(ModelProvider in
             return setter;
         }
 
-        public static MethodBodyStatement BuildSetterForCollectionProperty(IEnumerable<PropertyProvider> collectionTypeProperties, string initializationMethodName, PropertyProvider internalProperty, PropertyProvider innerProperty)
-        {
-            var isNullableValueType = innerProperty.Type.IsValueType && innerProperty.Type.IsNullable;
-            var setter = new List<MethodBodyStatement>();
-            var internalPropertyExpression = This.Property(internalProperty.Name);
-
-            setter.Add(This.Invoke(initializationMethodName).Terminate());
-            setter.Add(internalPropertyExpression.Property(innerProperty.Name).Assign(isNullableValueType ? Value.Property(nameof(Nullable<int>.Value)) : Value).Terminate());
-            return setter;
-        }
-
         public static Dictionary<ValueExpression, ValueExpression> PopulateCollectionProperties(IEnumerable<PropertyProvider> collectionTypeProperties)
         {
             var result = new Dictionary<ValueExpression, ValueExpression>();

eng/packages/http-client-csharp-mgmt/generator/Azure.Generator.Management/src/Visitors/FlattenPropertyVisitor.cs

@@ -40,12 +40,21 @@ internal class FlattenPropertyVisitor : ScmLibraryVisitor
                 {
                     var innerCollectionProperties = collectionProperties.Select(x => x.InnerProperty);
                     var initializationMethod = BuildInitializationMethod(innerCollectionProperties, internalProperty, model);
-                    model.Update(methods: [.. model.Methods, initializationMethod]);
+                    var publicConstructor = model.Constructors.Single(m => m.Signature.Modifiers.HasFlag(MethodSignatureModifiers.Public));
+                    var invokeInitialization = This.Invoke(initializationMethod.Signature.Name).Terminate();
+
                     // If the property is a collection type, we need to ensure that it is initialized
-                    foreach (var (flattenedProperty, innerProperty) in collectionProperties)
-                        flattenedProperty.Update(body: new MethodPropertyBody(
-                                PropertyHelpers.BuildGetterForCollectionProperty(innerCollectionProperties, true, initializationMethod.Signature.Name, internalProperty, ManagementClientGenerator.Instance.TypeFactory.CSharpTypeMap[internalProperty.Type]!, innerProperty),
-                                PropertyHelpers.BuildSetterForCollectionProperty(innerCollectionProperties, initializationMethod.Signature.Name, internalProperty, innerProperty)));
+                    if (publicConstructor.BodyStatements is null)
+                    {
+                        publicConstructor.Update(bodyStatements: new List<MethodBodyStatement> { invokeInitialization });
+                    }
+                    else
+                    {
+                        var body = publicConstructor.BodyStatements.ToList();
+                        body.Add(invokeInitialization);
+                        publicConstructor.Update(bodyStatements: body);
+                    }
+                    model.Update(methods: [.. model.Methods, initializationMethod]);
                 }
             }
 
@@ -276,7 +285,7 @@ private void FlattenProperties(ModelProvider model)
                             var (_, includeGetterNullCheck, _) = PropertyHelpers.GetFlags(property, innerProperty);
                             var flattenPropertyName = innerProperty.Name; // TODO: handle name conflicts
                             var flattenPropertyBody = new MethodPropertyBody(
-                                PropertyHelpers.BuildGetter(includeGetterNullCheck, property, modelProvider, innerProperty),
+                                PropertyHelpers.BuildGetter(includeGetterNullCheck == true && !innerProperty.Type.IsCollection, property, modelProvider, innerProperty),
                                 !innerProperty.Body.HasSetter ? null : PropertyHelpers.BuildSetterForPropertyFlatten(modelProvider, property, innerProperty)
                             );