Generate GetBucketAnalyticsConfiguration

stack-info: PR: #4127, branch: peterrsongg/petesong/phase-3-pr-2-all/3

Author: peterrsongg

generator/ServiceClientGeneratorLib/ServiceModel.cs

@@ -548,7 +548,7 @@ public List<Operation> S3AllowListOperations
                         new Operation(this, "ListObjectsV2", DocumentRoot[OperationsKey]["ListObjectsV2"]),
                         // phase 3 (including those moved from phase 1)
                         new Operation(this, "CreateSession", DocumentRoot[OperationsKey]["CreateSession"]),
-                        //new Operation(this, "GetBucketAnalyticsConfiguration", DocumentRoot[OperationsKey]["GetBucketAnalyticsConfiguration"]),
+                        new Operation(this, "GetBucketAnalyticsConfiguration", DocumentRoot[OperationsKey]["GetBucketAnalyticsConfiguration"]),
 						//new Operation(this, "GetBucketIntelligentTieringConfiguration", DocumentRoot[OperationsKey]["GetBucketIntelligentTieringConfiguration"]),
                         //new Operation(this, "GetBucketInventoryConfiguration", DocumentRoot[OperationsKey]["GetBucketInventoryConfiguration"]),
 						//new Operation(this, "GetBucketLogging", DocumentRoot[OperationsKey]["GetBucketLogging"]),

generator/ServiceModels/s3/s3.customizations.json

@@ -933,6 +933,28 @@
                         "injectXmlMarshallCode": ["AnalyticsFilterCustomMarshall(publicRequest, xmlWriter);"]
                     }
                 }
+            ],
+            "predicateListUnmarshallers": [
+                {
+                    "AnalyticsFilter" :{
+                        "predicateListUnmarshallerName" : "AnalyticsPredicateListUnmarshaller",
+                        "filterPredicateName": "AnalyticsFilterPredicate"
+                    }
+                }
+            ]
+        },
+        "GetBucketAnalyticsConfigurationRequest":{
+            "modify" :[
+                {
+                    "Id" :{"emitPropertyName": "AnalyticsId"}
+                },
+                {
+                    "ExpectedBucketOwner":{
+                        "injectXmlIsSet":[
+                            "return !String.IsNullOrEmpty(this._expectedBucketOwner);"
+                        ]
+                    }
+                }
             ]
         },
         "AnalyticsS3BucketDestination" : {
@@ -951,6 +973,12 @@
                     "Prefix":{
                          "injectXmlIsSet": ["return !String.IsNullOrEmpty(this._prefix);"]
                     }
+                },
+                {
+                    "Format" :{
+                        "skipContextTestExpressionUnmarshallingLogic" : true,
+                        "injectXmlUnmarshallCode": ["FormatCustomUnmarshall(context, unmarshalledObject);"]
+                    }
                 }
             ]
         }

sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/AnalyticsS3BucketDestinationUnmarshaller.cs

@@ -12,87 +12,30 @@
  * express or implied. See the License for the specific language governing
  * permissions and limitations under the License.
  */
-using System.Collections.Generic;
 
-using Amazon.S3.Model;
+using Amazon.Runtime;
+using Amazon.Runtime.Internal;
 using Amazon.Runtime.Internal.Transform;
+using Amazon.Runtime.Internal.Util;
+using Amazon.S3.Model;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Net;
+using System.Text;
+using System.Xml.Serialization;
 
 namespace Amazon.S3.Model.Internal.MarshallTransformations
 {
     /// <summary>
-    ///   AnalyticsS3BucketDestination Unmarshaller
+    /// Custom unmarshaller for AnalyticsS3BucketDestination Object
     /// </summary>
-    public class AnalyticsS3BucketDestinationUnmarshaller : IXmlUnmarshaller<AnalyticsS3BucketDestination, XmlUnmarshallerContext>
+    public partial class AnalyticsS3BucketDestinationUnmarshaller : IXmlUnmarshaller<AnalyticsS3BucketDestination, XmlUnmarshallerContext>
     {
-        /// <summary>
-        /// Unmarshaller the response from the service to the response class.
-        /// </summary>
-        /// <param name="context"></param>
-        /// <returns></returns>
-        public AnalyticsS3BucketDestination Unmarshall(XmlUnmarshallerContext context)
-        {
-            AnalyticsS3BucketDestination AnalyticsS3BucketDestination = new AnalyticsS3BucketDestination();
-            int originalDepth = context.CurrentDepth;
-            int targetDepth = originalDepth + 1;
-
-            if (context.IsStartOfDocument)
-                targetDepth += 2;
-
-            while (context.Read())
-            {
-                if (context.IsStartElement || context.IsAttribute)
-                {
-                    if (context.TestExpression("Format", targetDepth))
-                    {
-                        AnalyticsS3BucketDestination.Format = AnalyticsS3ExportFileFormat.FindValue(StringUnmarshaller.Instance.Unmarshall(context));
-
-                        continue;
-                    }
-                    if (context.TestExpression("BucketAccountId", targetDepth))
-                    {
-                        AnalyticsS3BucketDestination.BucketAccountId = StringUnmarshaller.Instance.Unmarshall(context);
-
-                        continue;
-                    }
-                    if (context.TestExpression("Bucket", targetDepth))
-                    {
-                        AnalyticsS3BucketDestination.BucketName = StringUnmarshaller.Instance.Unmarshall(context);
-
-                        continue;
-                    }
-                    if (context.TestExpression("Prefix", targetDepth))
-                    {
-                        AnalyticsS3BucketDestination.Prefix = StringUnmarshaller.Instance.Unmarshall(context);
-
-                        continue;
-                    }
-                }
-                else if (context.IsEndElement && context.CurrentDepth < originalDepth)
-                {
-                    return AnalyticsS3BucketDestination;
-                }
-            }
-
-
-
-            return AnalyticsS3BucketDestination;
-        }
-
-        private static AnalyticsS3BucketDestinationUnmarshaller _instance;
-
-        /// <summary>
-        /// Singleton for the unmarshaller
-        /// </summary>
-        public static AnalyticsS3BucketDestinationUnmarshaller Instance
+        void FormatCustomUnmarshall(XmlUnmarshallerContext context, AnalyticsS3BucketDestination unmarshalledObject)
         {
-            get
-            {
-                if (_instance == null)
-                {
-                    _instance = new AnalyticsS3BucketDestinationUnmarshaller();
-                }
-                return _instance;
-            }
+            unmarshalledObject.Format = AnalyticsS3ExportFileFormat.FindValue(StringUnmarshaller.Instance.Unmarshall(context));
         }
     }
 }

sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetBucketAnalyticsConfigurationRequestMarshaller.cs

@@ -24,49 +24,11 @@ namespace Amazon.S3.Model.Internal.MarshallTransformations
     /// <summary>
     /// Get BucketAnalyticsConfiguration Request Marshaller
     /// </summary>    
-    public class GetBucketAnalyticsConfigurationRequestMarshaller : IMarshaller<IRequest, GetBucketAnalyticsConfigurationRequest>, IMarshaller<IRequest, Amazon.Runtime.AmazonWebServiceRequest>
+    public partial class GetBucketAnalyticsConfigurationRequestMarshaller : IMarshaller<IRequest, GetBucketAnalyticsConfigurationRequest>, IMarshaller<IRequest, Amazon.Runtime.AmazonWebServiceRequest>
     {
-        public IRequest Marshall(Amazon.Runtime.AmazonWebServiceRequest input)
+        partial void PreMarshallCustomization(DefaultRequest defaultRequest, GetBucketAnalyticsConfigurationRequest publicRequest)
         {
-            return this.Marshall((GetBucketAnalyticsConfigurationRequest)input);
-        }
-
-        public IRequest Marshall(GetBucketAnalyticsConfigurationRequest getAnalyticsConfigurationRequest)
-        {
-            IRequest request = new DefaultRequest(getAnalyticsConfigurationRequest, "Amazon.S3");
-
-            request.Suppress404Exceptions = true;
-            request.HttpMethod = "GET";
-
-            if (getAnalyticsConfigurationRequest.IsSetExpectedBucketOwner())
-                request.Headers.Add(S3Constants.AmzHeaderExpectedBucketOwner, S3Transforms.ToStringValue(getAnalyticsConfigurationRequest.ExpectedBucketOwner));
-
-            if (string.IsNullOrEmpty(getAnalyticsConfigurationRequest.BucketName))
-                throw new System.ArgumentException("BucketName is a required property and must be set before making this call.", "GetBucketAnalyticsConfigurationRequest.BucketName");
-
-            request.ResourcePath = "/";
-            request.AddSubResource("analytics");
-            request.AddSubResource("id", getAnalyticsConfigurationRequest.AnalyticsId);
-            request.UseQueryString = true;
-
-            return request;
-        }
-
-        private static GetBucketAnalyticsConfigurationRequestMarshaller _instance;
-
-        /// <summary>
-        /// Singleton for marshaller
-        /// </summary>
-        public static GetBucketAnalyticsConfigurationRequestMarshaller Instance
-        {
-            get
-            {
-                if (_instance == null)
-                {
-                    _instance = new GetBucketAnalyticsConfigurationRequestMarshaller();
-                }
-                return _instance;
-            }
+            defaultRequest.Suppress404Exceptions = true;
         }
     }
 }