From 8884a550237eb5f854fe495ea75f80fcb5d3ab00 Mon Sep 17 00:00:00 2001 From: Bo Blodgett Date: Fri, 6 Dec 2024 09:09:18 -0800 Subject: [PATCH 1/7] DateTime handling DevConfig file. --- .../460d1afb-6912-4244-82e2-cfb811a84743.json | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 generator/.DevConfigs/460d1afb-6912-4244-82e2-cfb811a84743.json diff --git a/generator/.DevConfigs/460d1afb-6912-4244-82e2-cfb811a84743.json b/generator/.DevConfigs/460d1afb-6912-4244-82e2-cfb811a84743.json new file mode 100644 index 000000000000..d169802698d4 --- /dev/null +++ b/generator/.DevConfigs/460d1afb-6912-4244-82e2-cfb811a84743.json @@ -0,0 +1,9 @@ +{ + "core": { + "changeLogMessages": [ + "Updated DateTime handling." + ], + "type": "patch", + "updateMinimum": true + } + } \ No newline at end of file From cb4f74d744253439422feb57ba53d79666b276d1 Mon Sep 17 00:00:00 2001 From: Bo Blodgett Date: Sun, 8 Dec 2024 19:39:10 -0800 Subject: [PATCH 2/7] DateTime handling adjustments. --- buildtools/CustomTasks/TimingTask.cs | 4 +- .../AutoScaling.GeneratedSamples.cs | 4 +- .../EC2/EC2.GeneratedSamples.cs | 6 +- .../ElastiCache.GeneratedSamples.cs | 2 +- .../AmazonCloudFrontCookieSigner.cs | 2 +- .../AmazonCloudFrontUrlSigner.cs | 6 +- .../CloudFront.SignersTests/URLSignerTest.cs | 2 +- .../Customizations.cs | 41 - .../ServiceClientGeneratorLib/Example.cs | 4 +- .../Generators/Marshallers/BaseMarshaller.cs | 830 +++++------ .../Marshallers/BaseResponseUnmarshaller.cs | 426 +++--- .../Marshallers/BaseResponseUnmarshaller.tt | 8 +- .../Marshallers/JsonRPCStructureMarshaller.cs | 406 +++--- .../Marshallers/JsonRPCStructureMarshaller.tt | 4 +- .../Marshallers/RestXmlRequestMarshaller.cs | 1242 ++++++++--------- .../Marshallers/RestXmlRequestMarshaller.tt | 2 +- .../SourceFiles/StructureGenerator.cs | 539 ++----- .../SourceFiles/StructureGenerator.tt | 92 +- generator/ServiceClientGeneratorLib/Member.cs | 43 +- generator/ServiceClientGeneratorLib/Shape.cs | 4 +- .../autoscaling.customizations.json | 19 - .../ServiceModels/ec2/ec2.customizations.json | 74 +- .../elasticache.customizations.json | 6 - .../elasticbeanstalk.customizations.json | 15 +- .../email/email.customizations.json | 14 +- .../glacier/glacier.customizations.json | 14 +- .../iot/iot-2015-05-28.customizations.json | 12 - .../iot1click-devices.customizations.json | 10 - .../iotanalytics.customizations.json | 10 - .../logs/logs.customizations.json | 22 +- .../mobileanalytics.customizations.json | 21 +- .../monitoring/monitoring.customizations.json | 27 +- .../neptune/neptune.customizations.json | 11 - .../ServiceModels/rds/rds.customizations.json | 23 - .../redshift/redshift.customizations.json | 12 - .../workdocs/workdocs.customizations.json | 6 - .../Amazon.Runtime/CSM/MonitoringAPICall.cs | 2 +- .../InstanceProfileAWSCredentials.cs | 8 +- .../_bcl+netstandard/SSOTokenManager.cs | 4 - .../_bcl+netstandard/SsoTokenUtils.cs | 8 - .../Credentials/ProcessAWSCredentials.cs | 9 + .../Credentials/ProcessCredentialVersion1.cs | 2 +- .../Credentials/RefreshingAWSCredentials.cs | 4 +- .../Credentials/SAMLImmutableCredentials.cs | 2 +- .../CustomMarshallTransformations.cs | 16 - .../Transform/SimpleTypeUnmarshaller.cs | 6 +- .../Internal/Util/Logger.Console.cs | 2 +- .../Amazon.Runtime/Internal/Util/LruCache.cs | 2 - .../Internal/Util/MultiValueHeaderParser.cs | 4 +- .../Amazon.Runtime/Internal/Util/SdkCache.cs | 18 +- .../Internal/Util/StringUtils.cs | 23 +- .../CSMHandler/CSMCallAttemptHandler.cs | 4 +- .../Pipeline/RetryHandler/RetryPolicy.cs | 4 +- sdk/src/Core/Amazon.Runtime/TokenBucket.cs | 2 +- .../Tokens/StaticTokenProvider.cs | 3 - .../Amazon.Util/AWSPublicIpAddressRanges.cs | 2 +- sdk/src/Core/Amazon.Util/AWSSDKUtils.cs | 47 +- .../Internal/CustomMarshallTransformations.cs | 63 - .../S3/Custom/AmazonS3Client.Extensions.cs | 2 +- .../S3/Custom/Model/CopyObjectRequest.cs | 110 +- .../Services/S3/Custom/Model/Expiration.cs | 19 +- .../Custom/Model/GetObjectMetadataRequest.cs | 94 +- .../Custom/Model/GetObjectMetadataResponse.cs | 45 +- .../S3/Custom/Model/GetObjectRequest.cs | 139 +- .../S3/Custom/Model/HeadersCollection.cs | 19 +- .../CopyObjectRequestMarshaller.cs | 8 +- .../ExpirationUnmarshaller.cs | 2 +- .../GetObjectMetadataRequestMarshaller.cs | 8 +- .../GetObjectRequestMarshaller.cs | 12 +- ...LifecycleConfigurationRequestMarshaller.cs | 8 +- .../PutObjectRetentionRequestMarshaller.cs | 2 +- .../MarshallTransformations/S3Transforms.cs | 1 - .../TransitionUnmarshaller.cs | 2 +- .../Custom/Model/LifecycleRuleExpiration.cs | 32 +- .../S3/Custom/Model/LifecycleTransition.cs | 30 +- .../S3/Custom/Transfer/BaseDownloadRequest.cs | 80 +- .../Custom/Transfer/Internal/BaseCommand.cs | 8 +- .../Internal/DownloadDirectoryCommand.cs | 12 +- ...TransferUtilityDownloadDirectoryRequest.cs | 58 - .../Services/S3/Custom/Util/AmazonS3Util.cs | 2 +- .../S3/Custom/Util/BucketRegionDetector.cs | 2 +- .../S3/Custom/Util/S3EventNotification.cs | 4 +- .../Util/_bcl/AmazonS3Util.Operations.cs | 2 +- .../S3/Custom/_bcl/IO/S3DirectoryInfo.cs | 3 +- .../Services/S3/Custom/_bcl/IO/S3FileInfo.cs | 12 +- .../Custom/Util/AmazonSimpleDBUtil.cs | 3 +- sdk/test/Common/Utils/Servlet.cs | 4 +- sdk/test/IntegrationTests/Tests/General.cs | 5 +- .../Utils/ConsoleTraceListener.cs | 1 + .../IntegrationTests/Utils/UtilityMethods.cs | 6 +- .../Framework/UtilityMethods.cs | 8 +- .../IntegrationTests/Beanstalk.cs | 2 +- .../IntegrationTests/CloudFormation.cs | 6 +- .../IntegrationTests/CloudWatchLogs.cs | 10 +- .../IntegrationTests/Common/WaitUtils.cs | 4 +- .../DynamoDB/DataModelTests.cs | 3 +- .../DynamoDB/DocumentTests.cs | 4 +- .../DynamoDB/DynamoDBTestsBase.cs | 2 +- .../IntegrationTests/DynamoDBTruncateError.cs | 2 +- .../IntegrationTests/IAM/AccessKeyTests.cs | 4 +- .../IntegrationTests/IAM/Util.cs | 2 +- .../IntegrationTests/ProtocolTests.cs | 6 +- .../IntegrationTests/Route53.cs | 8 +- .../IntegrationTests/S3/MetadataTests.cs | 2 +- .../IntegrationTests/S3/PutObjectTests.cs | 2 +- .../S3/S3ServiceClientTests.cs | 2 +- .../IntegrationTests/IntegrationTests/SNS.cs | 4 +- .../SecurityToken/GetFederationToken.cs | 4 +- .../SecurityToken/GetSessionToken.cs | 6 +- .../IntegrationTests/SimpleEmail.cs | 4 +- .../NetStandard/IntegrationTests/SQSTests.cs | 2 +- .../CloudwatchLogsBenchmarks.cs | 2 +- .../EC2PerformanceBenchmarks/S3Benchmarks.cs | 2 +- .../EC2PerformanceBenchmarks/Utils.cs | 2 +- .../APIGateway/IntegrationTests/APIGateway.cs | 12 +- .../AWSMarketplaceCommerceAnalytics.cs | 6 +- .../IntegrationTests/CloudFormation.cs | 6 +- .../CloudTrail/IntegrationTests/CloudTrail.cs | 4 +- .../CloudWatch/IntegrationTests/CloudWatch.cs | 28 +- .../IntegrationTests/CloudWatchLogs.cs | 10 +- .../IntegrationTests/DataPipeline.cs | 4 +- .../IntegrationTests/DirectConnect.cs | 2 +- .../IntegrationTests/DataModelTests.cs | 14 +- .../IntegrationTests/DocumentTests.cs | 4 +- .../IntegrationTests/DynamoDBTestsBase.cs | 2 +- .../DynamoDBv2/IntegrationTests/JSONTests.cs | 5 +- .../DynamoDBv2/IntegrationTests/TTLTests.cs | 2 +- .../UnitTests/Custom/DynamoDBTests.cs | 2 +- .../IntegrationTests/Beanstalk.cs | 4 +- .../IntegrationTests/ElasticLoadBalancing.cs | 4 +- .../ElasticLoadBalancingV2.cs | 2 +- .../GameLift/IntegrationTests/GameLift.cs | 2 +- .../Glacier/IntegrationTests/Glacier.cs | 6 +- .../IntegrationTests/AccessKeyTests.cs | 4 +- .../IntegrationTests/AccountAliasTests.cs | 2 +- .../AssumeRoleAWSCredentialsTest.cs | 4 +- .../IntegrationTests/GroupTests.cs | 56 +- .../IntegrationTests/PolicyTests.cs | 44 +- .../IntegrationTests/UserTests.cs | 22 +- .../IntegrationTests/Util.cs | 2 +- .../IntegrationTests/ImportExport.cs | 2 +- .../IntegrationTests/KeyManagementService.cs | 6 +- .../Kinesis/IntegrationTests/Kinesis.cs | 2 +- .../IntegrationTests/KinesisFirehose.cs | 12 +- .../Lambda/IntegrationTests/LambdaTests.cs | 8 +- .../RDS/IntegrationTests/DBParameters.cs | 2 +- .../Redshift/IntegrationTests/Redshift.cs | 4 +- .../Route53/IntegrationTests/Route53.cs | 8 +- .../S3/IntegrationTests/AccessPointTests.cs | 2 +- .../BucketRegionTestRunner.cs | 6 +- .../GeneratePreSignedUrlTests.cs | 8 +- .../Services/S3/IntegrationTests/KMSTests.cs | 4 +- .../S3/IntegrationTests/LifecycleTests.cs | 2 +- .../S3/IntegrationTests/MetadataTests.cs | 2 +- .../S3/IntegrationTests/NotificationTests.cs | 4 +- .../ObjectLockConfigurationTests.cs | 4 +- .../PutBucketS3ExpressTests.cs | 6 +- .../S3/IntegrationTests/PutObjectTests.cs | 19 +- .../S3/IntegrationTests/RequesterPaysTests.cs | 2 +- .../S3/IntegrationTests/S3ExpressTests.cs | 2 +- .../S3/IntegrationTests/S3TestUtils.cs | 8 +- .../S3/IntegrationTests/ServerSideBYOK.cs | 2 +- .../IntegrationTests/TransferUtilityTests.cs | 2 +- .../S3/UnitTests/Custom/S3AccessPointTests.cs | 2 +- .../Custom/S3EventNotificationTests.cs | 2 +- .../Custom/S3ExpiresUnmarshallTest.cs | 13 +- .../UnitTests/Custom/S3ObjectLambdaTests.cs | 4 +- .../S3/UnitTests/Custom/S3OutpostsTests.cs | 2 +- sdk/test/Services/SQS/IntegrationTests/SQS.cs | 2 +- .../_bcl+netstandard/CoreAmazonSSOOIDCTest.cs | 20 +- .../IntegrationTests/AssumeRole.cs | 2 +- .../IntegrationTests/GetFederationToken.cs | 4 +- .../IntegrationTests/GetSessionToken.cs | 6 +- .../Custom/RolePrincipalFormatTests.cs | 2 +- .../SimpleDB/IntegrationTests/SimpleDB.cs | 2 +- .../IntegrationTests/SimpleEmail.cs | 4 +- .../IntegrationTests/SNS.cs | 18 +- sdk/test/Services/WAF/IntegrationTests/WAF.cs | 2 +- ...CompatibilityForDateTimePropertiesTests.cs | 92 +- .../SimpleTypeUnmarshallerTests.cs | 18 +- .../Custom/Runtime/CompressionHandlerTests.cs | 12 +- .../InstanceProfileAWSCredentialsTest.cs | 2 +- .../Credentials/ProcessAWSCredentialsTest.cs | 6 +- .../Runtime/HttpWebRequestFactoryTests.cs | 2 +- .../Runtime/ProtocolTests/HttpLabelTests.cs | 2 +- .../Custom/Runtime/StringUtilsTests.cs | 8 +- .../UnitTests/Custom/TestTools/Comparer.cs | 6 +- .../Custom/TestTools/ComparerTests.cs | 12 +- .../Custom/TestTools/JsonSampleGenerator.cs | 2 +- .../Custom/TestTools/RequestValidator.cs | 2 +- .../Custom/TestTools/ValidatorUtils.cs | 4 +- .../Custom/TestTools/XmlSampleGenerator.cs | 2 +- .../UnitTests/Custom/Util/AWSSDKUtilsTests.cs | 14 +- .../Util/MultiValueHeaderParserTests.cs | 12 +- 194 files changed, 2159 insertions(+), 3518 deletions(-) delete mode 100644 generator/ServiceModels/iot1click-devices/iot1click-devices.customizations.json delete mode 100644 generator/ServiceModels/iotanalytics/iotanalytics.customizations.json delete mode 100644 sdk/src/Core/Amazon.Runtime/Internal/Transform/CustomMarshallTransformations.cs delete mode 100644 sdk/src/Services/EC2/Custom/Internal/CustomMarshallTransformations.cs diff --git a/buildtools/CustomTasks/TimingTask.cs b/buildtools/CustomTasks/TimingTask.cs index e3d6a9f7b2c9..fcc9178d869e 100644 --- a/buildtools/CustomTasks/TimingTask.cs +++ b/buildtools/CustomTasks/TimingTask.cs @@ -15,14 +15,14 @@ public override bool Execute() if (ShouldInit) { ShouldInit = false; - StartTime = DateTime.Now; + StartTime = DateTime.UtcNow; MainThread = new Thread(() => { try { while (true) { - var elapsed = DateTime.Now - StartTime; + var elapsed = DateTime.UtcNow - StartTime; Console.WriteLine(">>>>> ELAPSED TIME = " + elapsed.ToString("h'h 'm'm 's's'")); Thread.Sleep(SleepTime); } diff --git a/docgenerator/AWSSDKDocSamples/AutoScaling/AutoScaling.GeneratedSamples.cs b/docgenerator/AWSSDKDocSamples/AutoScaling/AutoScaling.GeneratedSamples.cs index 1dd385805b74..f4204677dd02 100644 --- a/docgenerator/AWSSDKDocSamples/AutoScaling/AutoScaling.GeneratedSamples.cs +++ b/docgenerator/AWSSDKDocSamples/AutoScaling/AutoScaling.GeneratedSamples.cs @@ -957,11 +957,11 @@ public void AutoScalingPutScheduledUpdateGroupAction() { AutoScalingGroupName = "my-auto-scaling-group", DesiredCapacity = 4, - EndTimeUtc = new DateTime(2014, 5, 12, 8, 0, 0, DateTimeKind.Utc), + EndTime = new DateTime(2014, 5, 12, 8, 0, 0, DateTimeKind.Utc), MaxSize = 6, MinSize = 2, ScheduledActionName = "my-scheduled-action", - StartTimeUtc = new DateTime(2014, 5, 12, 8, 0, 0, DateTimeKind.Utc) + StartTime = new DateTime(2014, 5, 12, 8, 0, 0, DateTimeKind.Utc) }); diff --git a/docgenerator/AWSSDKDocSamples/EC2/EC2.GeneratedSamples.cs b/docgenerator/AWSSDKDocSamples/EC2/EC2.GeneratedSamples.cs index 9a145d2c2bca..010282badfd7 100644 --- a/docgenerator/AWSSDKDocSamples/EC2/EC2.GeneratedSamples.cs +++ b/docgenerator/AWSSDKDocSamples/EC2/EC2.GeneratedSamples.cs @@ -1827,7 +1827,7 @@ public void EC2DescribeSpotFleetRequestHistory() var response = client.DescribeSpotFleetRequestHistory(new DescribeSpotFleetRequestHistoryRequest { SpotFleetRequestId = "sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE", - StartTimeUtc = new DateTime(2015, 5, 26, 12, 0, 0, DateTimeKind.Utc) + StartTime = new DateTime(2015, 5, 26, 12, 0, 0, DateTimeKind.Utc) }); List historyRecords = response.HistoryRecords; @@ -1879,14 +1879,14 @@ public void EC2DescribeSpotPriceHistory() var client = new AmazonEC2Client(); var response = client.DescribeSpotPriceHistory(new DescribeSpotPriceHistoryRequest { - EndTimeUtc = new DateTime(2014, 1, 6, 8, 9, 10, DateTimeKind.Utc), + EndTime = new DateTime(2014, 1, 6, 8, 9, 10, DateTimeKind.Utc), InstanceTypes = new List { "m1.xlarge" }, ProductDescriptions = new List { "Linux/UNIX (Amazon VPC)" }, - StartTimeUtc = new DateTime(2014, 1, 6, 7, 8, 9, DateTimeKind.Utc) + StartTime = new DateTime(2014, 1, 6, 7, 8, 9, DateTimeKind.Utc) }); List spotPriceHistory = response.SpotPriceHistory; diff --git a/docgenerator/AWSSDKDocSamples/ElastiCache/ElastiCache.GeneratedSamples.cs b/docgenerator/AWSSDKDocSamples/ElastiCache/ElastiCache.GeneratedSamples.cs index ad30512636d8..d268fc88e99a 100644 --- a/docgenerator/AWSSDKDocSamples/ElastiCache/ElastiCache.GeneratedSamples.cs +++ b/docgenerator/AWSSDKDocSamples/ElastiCache/ElastiCache.GeneratedSamples.cs @@ -534,7 +534,7 @@ public void ElastiCacheDescribeEvents() var client = new AmazonElastiCacheClient(); var response = client.DescribeEvents(new DescribeEventsRequest { - StartTimeUtc = new DateTime(2016, 12, 22, 3, 0, 0, DateTimeKind.Utc) + StartTime = new DateTime(2016, 12, 22, 3, 0, 0, DateTimeKind.Utc) }); List events = response.Events; diff --git a/extensions/src/AWSSDK.Extensions.CloudFront.Signers/AmazonCloudFrontCookieSigner.cs b/extensions/src/AWSSDK.Extensions.CloudFront.Signers/AmazonCloudFrontCookieSigner.cs index 31073b9e0b45..2673a9b186f9 100644 --- a/extensions/src/AWSSDK.Extensions.CloudFront.Signers/AmazonCloudFrontCookieSigner.cs +++ b/extensions/src/AWSSDK.Extensions.CloudFront.Signers/AmazonCloudFrontCookieSigner.cs @@ -155,7 +155,7 @@ public static CookiesForCannedPolicy GetCookiesForCannedPolicy(string resourceUr { var cookies = new CookiesForCannedPolicy(); - string epochSeconds = AWSSDKUtils.ConvertToUnixEpochSecondsString(expiresOn.ToUniversalTime()); + string epochSeconds = AWSSDKUtils.ConvertToUnixEpochSecondsString(expiresOn); cookies.Expires = new KeyValuePair( ExpiresKey, epochSeconds); diff --git a/extensions/src/AWSSDK.Extensions.CloudFront.Signers/AmazonCloudFrontUrlSigner.cs b/extensions/src/AWSSDK.Extensions.CloudFront.Signers/AmazonCloudFrontUrlSigner.cs index d1ad65c1fcce..89c6eb8491df 100644 --- a/extensions/src/AWSSDK.Extensions.CloudFront.Signers/AmazonCloudFrontUrlSigner.cs +++ b/extensions/src/AWSSDK.Extensions.CloudFront.Signers/AmazonCloudFrontUrlSigner.cs @@ -329,7 +329,7 @@ public static String SignUrlCanned(string resourceUrlOrPath, TextReader privateKey, DateTime expiresOn) { - string epochSeconds = AWSSDKUtils.ConvertToUnixEpochSecondsString(expiresOn.ToUniversalTime()); + string epochSeconds = AWSSDKUtils.ConvertToUnixEpochSecondsString(expiresOn); RSAParameters rsaParameters = ConvertPEMToRSAParameters(privateKey); string cannedPolicy = "{\"Statement\":[{\"Resource\":\"" + resourceUrlOrPath + "\",\"Condition\":{\"DateLessThan\":{\"AWS:EpochTime\":" + epochSeconds @@ -408,7 +408,7 @@ public static string BuildPolicyForSignedUrl(string resourcePath, + "\"" + ",\"Condition\":{" + "\"DateLessThan\":{\"AWS:EpochTime\":" - + AWSSDKUtils.ConvertToUnixEpochSecondsString(expiresOn.ToUniversalTime()) + + AWSSDKUtils.ConvertToUnixEpochSecondsString(expiresOn) + "}" // omitting IpAddress parameter indicates any ip address access + (string.IsNullOrEmpty(limitToIpAddressCIDR) @@ -416,7 +416,7 @@ public static string BuildPolicyForSignedUrl(string resourcePath, : ",\"IpAddress\":{\"AWS:SourceIp\":\"" + limitToIpAddressCIDR + "\"}") // Ignore epochDateGreaterThan if its value is DateTime.MinValue, the default value of DateTime. + (activeFrom > DateTime.MinValue ? ",\"DateGreaterThan\":{\"AWS:EpochTime\":" - + AWSSDKUtils.ConvertToUnixEpochSecondsString(activeFrom.ToUniversalTime()) + "}" + + AWSSDKUtils.ConvertToUnixEpochSecondsString(activeFrom) + "}" : string.Empty) + "}}]}"; return policy; diff --git a/extensions/test/CloudFront.SignersTests/URLSignerTest.cs b/extensions/test/CloudFront.SignersTests/URLSignerTest.cs index ad5c28ca50c9..318c782092eb 100644 --- a/extensions/test/CloudFront.SignersTests/URLSignerTest.cs +++ b/extensions/test/CloudFront.SignersTests/URLSignerTest.cs @@ -163,7 +163,7 @@ public void TestGetCannedSignedUrlWithOpenSSL3() -----END PRIVATE KEY----- "); - Assert.NotNull(AmazonCloudFrontUrlSigner.GetCannedSignedURL("http://example.com", reader, "keyPairId", DateTime.Now)); + Assert.NotNull(AmazonCloudFrontUrlSigner.GetCannedSignedURL("http://example.com", reader, "keyPairId", DateTime.UtcNow)); } } diff --git a/generator/ServiceClientGeneratorLib/Customizations.cs b/generator/ServiceClientGeneratorLib/Customizations.cs index fdf3ce5c7b69..7721c6b269e9 100644 --- a/generator/ServiceClientGeneratorLib/Customizations.cs +++ b/generator/ServiceClientGeneratorLib/Customizations.cs @@ -857,10 +857,8 @@ public class ShapeModifier public const string InjectKey = "inject"; public const string CustomMarshallKey = "customMarshall"; public const string DeprecatedMessageKey = "deprecatedMessage"; - public const string BackwardsCompatibleDateTimeKey = "backwardsCompatibleDateTimeProperties"; private readonly HashSet _excludedProperties; - private readonly HashSet _backwardsCompatibleDateTimeProperties; private readonly Dictionary _modifiedProperties; private readonly Dictionary _injectedProperties; @@ -871,7 +869,6 @@ public ShapeModifier(JsonData data) DeprecationMessage = data[DeprecatedMessageKey].CastToString(); _excludedProperties = ParseExclusions(data); - _backwardsCompatibleDateTimeProperties = ParseBackwardsCompatibleDateTimeProperties(data); _modifiedProperties = ParseModifiers(data); // Process additions after rename to allow for models where we // add a 'convenience' member (for backwards compatibility) using @@ -931,25 +928,6 @@ public bool IsExcludedProperty(string propertyName) #endregion - #region Backwards Compatible DateTime Properties - - // Backwards Compatible DateTime Properties modifier is a simple array of property names. - // "backwardsCompatibleDateTimeProperties": [ "propName1", "propName2" ] - private static HashSet ParseBackwardsCompatibleDateTimeProperties(JsonData data) - { - var exclusions = data[ShapeModifier.BackwardsCompatibleDateTimeKey] - ?.Cast() - .Select(exclusion => exclusion.ToString()); - return new HashSet(exclusions ?? new string[0]); - } - - public bool IsBackwardsCompatibleDateTimeProperty(string propertyName) - { - return _backwardsCompatibleDateTimeProperties.Contains(propertyName); - } - - #endregion - #region Property Modifiers // A modifier is an array of objects, each object being the original @@ -1237,25 +1215,6 @@ public bool IsExcludedProperty(string propertyName, string shapeName = null) return false; } - /// - /// Returns true if the specified property name is marked as requiring backwards compatible handling - /// of DateTime values at global or per-shape scope. - /// - /// - /// - /// - public bool IsBackwardsCompatibleDateTimeProperty(string propertyName, string shapeName = null) - { - if (shapeName != null) - { - var shapeModifier = GetShapeModifier(shapeName); - if (shapeModifier != null) - return shapeModifier.IsBackwardsCompatibleDateTimeProperty(propertyName); - } - - return false; - } - public OperationModifiers GetOperationModifiers(string operationName) { var data = _documentRoot[OperationModifiers.OperationModifiersKey]; diff --git a/generator/ServiceClientGeneratorLib/Example.cs b/generator/ServiceClientGeneratorLib/Example.cs index 7c801629d1de..f4eaa457f51a 100644 --- a/generator/ServiceClientGeneratorLib/Example.cs +++ b/generator/ServiceClientGeneratorLib/Example.cs @@ -314,7 +314,7 @@ public void GetSampleLiteral(Shape shape, JsonData data, CodeBuilder cb) cb.AppendFormat("new {0}({1})", ShapeType(shape), data.ToString()); } - else if (shape.IsDateTime) + else if (shape.IsTimeStamp) { string exampleValue = null; @@ -363,7 +363,7 @@ private string ShapeType(Shape shape) return "float"; if (shape.IsDouble) return "double"; - if (shape.IsDateTime) + if (shape.IsTimeStamp) return "DateTime"; if (shape.IsMemoryStream) return "MemoryStream"; diff --git a/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseMarshaller.cs b/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseMarshaller.cs index 5d4cd8e6950a..8dc5ac12ae85 100644 --- a/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseMarshaller.cs +++ b/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseMarshaller.cs @@ -20,7 +20,7 @@ namespace ServiceClientGenerator.Generators.Marshallers /// Class to produce the template output /// - #line 1 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 1 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")] public partial class BaseMarshaller : Generators.BaseGenerator { @@ -34,7 +34,7 @@ public override string TransformText() return this.GenerationEnvironment.ToString(); } - #line 9 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 9 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" // Adds the neccesary namespaces for the marshaller protected void AddCommonUsingStatements() @@ -44,7 +44,7 @@ protected void AddCommonUsingStatements() #line default #line hidden - #line 13 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 13 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("using System;\r\nusing System.Collections.Generic;\r\nusing System.Globalization;\r\nus" + "ing System.IO;\r\nusing System.Text;\r\nusing System.Xml.Serialization;\r\n\r\nusing "); @@ -52,14 +52,14 @@ protected void AddCommonUsingStatements() #line default #line hidden - #line 21 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 21 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.Namespace)); #line default #line hidden - #line 21 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 21 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(".Model;\r\nusing Amazon.Runtime;\r\nusing Amazon.Runtime.Internal;\r\nusing Amazon.Runt" + "ime.Internal.Transform;\r\nusing Amazon.Runtime.Internal.Util;\r\n"); @@ -67,7 +67,7 @@ protected void AddCommonUsingStatements() #line default #line hidden - #line 26 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 26 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" } @@ -75,7 +75,7 @@ protected void AddCommonUsingStatements() #line default #line hidden - #line 30 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 30 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" // Only applicable for rest-json and rest-xml // Generates code to add members to the header of the request @@ -89,42 +89,42 @@ protected void ProcessHeaderMembers(string variableName, IEnumerable mem #line default #line hidden - #line 38 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 38 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\t\t\r\n if ("); #line default #line hidden - #line 39 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 39 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 39 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 39 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(".IsSet"); #line default #line hidden - #line 39 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 39 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 39 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 39 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("()) \r\n {\r\n"); #line default #line hidden - #line 41 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 41 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" if (member.CustomMarshallerTransformation != null) { @@ -133,70 +133,70 @@ protected void ProcessHeaderMembers(string variableName, IEnumerable mem #line default #line hidden - #line 44 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 44 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\t\t\t\trequest.Headers[\""); #line default #line hidden - #line 45 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 45 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 45 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 45 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\"] = "); #line default #line hidden - #line 45 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 45 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.CustomMarshallerTransformation)); #line default #line hidden - #line 45 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 45 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("("); #line default #line hidden - #line 45 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 45 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 45 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 45 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("."); #line default #line hidden - #line 45 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 45 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 45 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 45 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(");\r\n"); #line default #line hidden - #line 46 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 46 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" } else if (member.IsJsonValue) @@ -206,56 +206,56 @@ protected void ProcessHeaderMembers(string variableName, IEnumerable mem #line default #line hidden - #line 50 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 50 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\t\t\t\trequest.Headers[\""); #line default #line hidden - #line 51 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 51 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 51 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 51 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\"] = Convert.ToBase64String(Encoding.UTF8.GetBytes("); #line default #line hidden - #line 51 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 51 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 51 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 51 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("."); #line default #line hidden - #line 51 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 51 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 51 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 51 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("));\r\n"); #line default #line hidden - #line 52 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 52 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" } else @@ -275,56 +275,56 @@ protected void ProcessHeaderMembers(string variableName, IEnumerable mem #line default #line hidden - #line 66 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 66 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(" request.Headers[\""); #line default #line hidden - #line 67 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 67 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 67 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 67 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\"] = StringUtils.FromList("); #line default #line hidden - #line 67 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 67 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 67 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 67 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("."); #line default #line hidden - #line 67 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 67 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 67 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 67 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(");\r\n"); #line default #line hidden - #line 68 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 68 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" } else @@ -334,56 +334,56 @@ protected void ProcessHeaderMembers(string variableName, IEnumerable mem #line default #line hidden - #line 72 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 72 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(" request.Headers[\""); #line default #line hidden - #line 73 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 73 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 73 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 73 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\"] = StringUtils.FromValueTypeList("); #line default #line hidden - #line 73 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 73 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 73 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 73 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("."); #line default #line hidden - #line 73 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 73 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 73 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 73 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(");\r\n"); #line default #line hidden - #line 74 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 74 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" } } @@ -394,70 +394,70 @@ protected void ProcessHeaderMembers(string variableName, IEnumerable mem #line default #line hidden - #line 79 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 79 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(" //Map of headers with prefix \""); #line default #line hidden - #line 80 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 80 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 80 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 80 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\".\r\n foreach (var kvp"); #line default #line hidden - #line 81 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 81 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 81 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 81 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(" in "); #line default #line hidden - #line 81 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 81 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 81 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 81 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("."); #line default #line hidden - #line 81 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 81 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 81 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 81 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(")\r\n {\r\n"); #line default #line hidden - #line 83 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 83 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" // Dictionary if (member.ModelShape.ValueShape.IsString) @@ -467,56 +467,56 @@ protected void ProcessHeaderMembers(string variableName, IEnumerable mem #line default #line hidden - #line 87 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 87 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(" request.Headers[$\""); #line default #line hidden - #line 88 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 88 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 88 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 88 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("{kvp"); #line default #line hidden - #line 88 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 88 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 88 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 88 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(".Key}\"] = kvp"); #line default #line hidden - #line 88 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 88 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 88 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 88 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(".Value;\r\n"); #line default #line hidden - #line 89 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 89 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" } // Dictionary> @@ -527,56 +527,56 @@ protected void ProcessHeaderMembers(string variableName, IEnumerable mem #line default #line hidden - #line 94 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 94 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(" request.Headers[$\""); #line default #line hidden - #line 95 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 95 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 95 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 95 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("{kvp"); #line default #line hidden - #line 95 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 95 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 95 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 95 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(".Key}\"] = string.Join(\",\", kvp"); #line default #line hidden - #line 95 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 95 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 95 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 95 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(".Value.ToArray());\r\n"); #line default #line hidden - #line 96 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 96 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" } else @@ -588,14 +588,14 @@ protected void ProcessHeaderMembers(string variableName, IEnumerable mem #line default #line hidden - #line 102 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 102 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(" }\r\n"); #line default #line hidden - #line 104 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 104 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" } else if(member.Shape.IsString) @@ -605,56 +605,56 @@ protected void ProcessHeaderMembers(string variableName, IEnumerable mem #line default #line hidden - #line 108 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 108 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\t\t\t\trequest.Headers[\""); #line default #line hidden - #line 109 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 109 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 109 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 109 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\"] = "); #line default #line hidden - #line 109 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 109 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 109 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 109 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("."); #line default #line hidden - #line 109 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 109 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 109 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 109 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(";\r\n"); #line default #line hidden - #line 110 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 110 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" } else @@ -664,70 +664,70 @@ protected void ProcessHeaderMembers(string variableName, IEnumerable mem #line default #line hidden - #line 114 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 114 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\t\t\t\trequest.Headers[\""); #line default #line hidden - #line 115 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 115 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 115 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 115 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\"] = "); #line default #line hidden - #line 115 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 115 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PrimitiveMarshaller)); #line default #line hidden - #line 115 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 115 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("("); #line default #line hidden - #line 115 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 115 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 115 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 115 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("."); #line default #line hidden - #line 115 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 115 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 115 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 115 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(");\r\n"); #line default #line hidden - #line 116 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 116 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" } } @@ -736,14 +736,14 @@ protected void ProcessHeaderMembers(string variableName, IEnumerable mem #line default #line hidden - #line 119 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 119 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(" }\r\n"); #line default #line hidden - #line 121 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 121 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" } } @@ -766,98 +766,98 @@ protected void ProcessUriMembers(string variableName, Operation operation) #line default #line hidden - #line 138 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 138 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\t\t\trequest.AddPathResource(\""); #line default #line hidden - #line 139 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 139 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(marshallLocationName)); #line default #line hidden - #line 139 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 139 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\", "); #line default #line hidden - #line 139 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 139 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 139 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 139 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(".IsSet"); #line default #line hidden - #line 139 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 139 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 139 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 139 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("() ? "); #line default #line hidden - #line 139 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 139 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.PrimitiveMarshaller(MarshallLocation.Uri))); #line default #line hidden - #line 139 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 139 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("("); #line default #line hidden - #line 139 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 139 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 139 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 139 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("."); #line default #line hidden - #line 139 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 139 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 139 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 139 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(".TrimStart(\'/\')) : string.Empty);\r\n"); #line default #line hidden - #line 140 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 140 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" } else @@ -867,98 +867,98 @@ protected void ProcessUriMembers(string variableName, Operation operation) #line default #line hidden - #line 144 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 144 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\t\t\trequest.AddPathResource(\""); #line default #line hidden - #line 145 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 145 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(marshallLocationName)); #line default #line hidden - #line 145 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 145 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\", "); #line default #line hidden - #line 145 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 145 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 145 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 145 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(".IsSet"); #line default #line hidden - #line 145 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 145 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 145 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 145 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("() ? "); #line default #line hidden - #line 145 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 145 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.PrimitiveMarshaller(MarshallLocation.Uri))); #line default #line hidden - #line 145 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 145 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("("); #line default #line hidden - #line 145 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 145 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 145 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 145 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("."); #line default #line hidden - #line 145 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 145 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 145 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 145 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(") : string.Empty);\r\n"); #line default #line hidden - #line 146 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 146 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" } @@ -970,70 +970,70 @@ protected void ProcessUriMembers(string variableName, Operation operation) #line default #line hidden - #line 152 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 152 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(" if (!"); #line default #line hidden - #line 153 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 153 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 153 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 153 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(".IsSet"); #line default #line hidden - #line 153 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 153 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 153 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 153 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("())\r\n throw new "); #line default #line hidden - #line 154 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 154 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.BaseException)); #line default #line hidden - #line 154 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 154 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("(\"Request object does not have required field "); #line default #line hidden - #line 154 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 154 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 154 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 154 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(" set\");\r\n"); #line default #line hidden - #line 155 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 155 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" if(isGreedy) { @@ -1042,70 +1042,70 @@ protected void ProcessUriMembers(string variableName, Operation operation) #line default #line hidden - #line 158 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 158 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\t\t\trequest.AddPathResource(\""); #line default #line hidden - #line 159 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 159 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(marshallLocationName)); #line default #line hidden - #line 159 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 159 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\", "); #line default #line hidden - #line 159 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 159 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.PrimitiveMarshaller(MarshallLocation.Uri))); #line default #line hidden - #line 159 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 159 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("("); #line default #line hidden - #line 159 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 159 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 159 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 159 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("."); #line default #line hidden - #line 159 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 159 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 159 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 159 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(".TrimStart(\'/\')));\r\n"); #line default #line hidden - #line 160 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 160 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" } else @@ -1115,70 +1115,70 @@ protected void ProcessUriMembers(string variableName, Operation operation) #line default #line hidden - #line 164 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 164 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\t\t\trequest.AddPathResource(\""); #line default #line hidden - #line 165 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 165 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(marshallLocationName)); #line default #line hidden - #line 165 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 165 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\", "); #line default #line hidden - #line 165 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 165 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.PrimitiveMarshaller(MarshallLocation.Uri))); #line default #line hidden - #line 165 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 165 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("("); #line default #line hidden - #line 165 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 165 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 165 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 165 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("."); #line default #line hidden - #line 165 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 165 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 165 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 165 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("));\r\n"); #line default #line hidden - #line 166 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 166 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" } } @@ -1196,42 +1196,42 @@ protected void ProcessRequestUri(Operation operation) #line default #line hidden - #line 178 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 178 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\t\t\trequest.AddSubResource(\""); #line default #line hidden - #line 179 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 179 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(staticQueryParam.Key)); #line default #line hidden - #line 179 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 179 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\", \""); #line default #line hidden - #line 179 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 179 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(staticQueryParam.Value)); #line default #line hidden - #line 179 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 179 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 180 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 180 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" } else @@ -1241,28 +1241,28 @@ protected void ProcessRequestUri(Operation operation) #line default #line hidden - #line 184 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 184 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\t\t\trequest.AddSubResource(\""); #line default #line hidden - #line 185 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 185 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(staticQueryParam.Key)); #line default #line hidden - #line 185 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 185 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 186 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 186 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" } } @@ -1272,7 +1272,7 @@ protected void ProcessRequestUri(Operation operation) #line default #line hidden - #line 191 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 191 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" // Only applicable for rest-json and rest-xml // Generates code to add any operation query members to the query string for the request @@ -1302,7 +1302,7 @@ protected void ProcessQueryStringMembers(string variableName, Operation operatio #line default #line hidden - #line 216 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 216 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" } } @@ -1312,7 +1312,7 @@ protected void ProcessQueryStringMembers(string variableName, Operation operatio #line default #line hidden - #line 221 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 221 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" // Only applicable for rest-json and rest-xml // Generates code to add any operation query members to the query string for the request @@ -1328,42 +1328,42 @@ protected void ProcessQueryStringMembersNoMap(string variableName, Operation ope #line default #line hidden - #line 231 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 231 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\t\t\t\r\n\t\t\tif ("); #line default #line hidden - #line 232 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 232 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 232 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 232 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(".IsSet"); #line default #line hidden - #line 232 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 232 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 232 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 232 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("())\r\n"); #line default #line hidden - #line 233 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 233 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" if (member.CustomMarshallerTransformation != null) { @@ -1372,70 +1372,70 @@ protected void ProcessQueryStringMembersNoMap(string variableName, Operation ope #line default #line hidden - #line 236 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 236 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\t\t\t\trequest.Parameters.Add(\""); #line default #line hidden - #line 237 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 237 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 237 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 237 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\", "); #line default #line hidden - #line 237 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 237 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.CustomMarshallerTransformation)); #line default #line hidden - #line 237 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 237 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("("); #line default #line hidden - #line 237 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 237 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 237 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 237 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("."); #line default #line hidden - #line 237 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 237 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 237 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 237 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("));\r\n"); #line default #line hidden - #line 238 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 238 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" } else if (member.IsList) @@ -1454,56 +1454,56 @@ protected void ProcessQueryStringMembersNoMap(string variableName, Operation ope #line default #line hidden - #line 251 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 251 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(" request.ParameterCollection.Add(\""); #line default #line hidden - #line 252 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 252 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 252 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 252 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\", "); #line default #line hidden - #line 252 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 252 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 252 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 252 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("."); #line default #line hidden - #line 252 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 252 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 252 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 252 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(");\r\n"); #line default #line hidden - #line 253 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 253 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" } else @@ -1513,70 +1513,70 @@ protected void ProcessQueryStringMembersNoMap(string variableName, Operation ope #line default #line hidden - #line 257 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 257 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(" request.ParameterCollection.Add(\""); #line default #line hidden - #line 258 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 258 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 258 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 258 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\", "); #line default #line hidden - #line 258 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 258 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 258 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 258 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("."); #line default #line hidden - #line 258 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 258 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 258 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 258 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(".ConvertAll(item => "); #line default #line hidden - #line 258 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 258 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ListShape.PrimitiveMarshaller(MarshallLocation.QueryString))); #line default #line hidden - #line 258 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 258 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("(item)));\r\n"); #line default #line hidden - #line 259 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 259 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" } } @@ -1587,70 +1587,70 @@ protected void ProcessQueryStringMembersNoMap(string variableName, Operation ope #line default #line hidden - #line 264 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 264 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\t\t\t\trequest.Parameters.Add(\""); #line default #line hidden - #line 265 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 265 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 265 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 265 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\", "); #line default #line hidden - #line 265 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 265 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PrimitiveMarshaller)); #line default #line hidden - #line 265 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 265 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("("); #line default #line hidden - #line 265 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 265 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 265 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 265 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("."); #line default #line hidden - #line 265 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 265 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 265 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 265 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("));\r\n"); #line default #line hidden - #line 266 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 266 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" } if(member.IsIdempotent) @@ -1660,28 +1660,28 @@ protected void ProcessQueryStringMembersNoMap(string variableName, Operation ope #line default #line hidden - #line 270 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 270 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(" else \r\n request.Parameters.Add(\""); #line default #line hidden - #line 272 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 272 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 272 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 272 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\", System.Guid.NewGuid().ToString());\r\n \r\n"); #line default #line hidden - #line 274 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 274 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" } } @@ -1692,7 +1692,7 @@ protected void ProcessQueryStringMembersNoMap(string variableName, Operation ope #line default #line hidden - #line 283 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 283 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" protected void ProcessQueryStringMemberWithMap(int level, Member member, string variableName) { @@ -1701,63 +1701,63 @@ protected void ProcessQueryStringMemberWithMap(int level, Member member, string #line default #line hidden - #line 287 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 287 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 287 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 287 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("if ("); #line default #line hidden - #line 287 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 287 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 287 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 287 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(".IsSet"); #line default #line hidden - #line 287 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 287 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 287 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 287 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("())\r\n"); #line default #line hidden - #line 288 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 288 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 288 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 288 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("{\r\n"); #line default #line hidden - #line 289 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 289 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" if (member.CustomMarshallerTransformation != null) { @@ -1766,147 +1766,147 @@ protected void ProcessQueryStringMemberWithMap(int level, Member member, string #line default #line hidden - #line 293 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 293 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 1) * 4))); #line default #line hidden - #line 293 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 293 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("if (request.Parameters.ContainsKey(\""); #line default #line hidden - #line 293 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 293 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 293 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 293 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\"))\r\n"); #line default #line hidden - #line 294 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 294 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 1) * 4))); #line default #line hidden - #line 294 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 294 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(" request.Parameters.Remove(\""); #line default #line hidden - #line 294 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 294 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 294 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 294 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\"));\r\n"); #line default #line hidden - #line 295 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 295 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 1) * 4))); #line default #line hidden - #line 295 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 295 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("request.Parameters.Add(\""); #line default #line hidden - #line 295 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 295 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 295 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 295 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\", "); #line default #line hidden - #line 295 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 295 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.CustomMarshallerTransformation)); #line default #line hidden - #line 295 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 295 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("("); #line default #line hidden - #line 295 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 295 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 295 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 295 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("."); #line default #line hidden - #line 295 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 295 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 295 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 295 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("));\r\n"); #line default #line hidden - #line 296 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 296 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 296 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 296 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("}\r\n"); #line default #line hidden - #line 297 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 297 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" } //end curly brace for if(member.CustomMarshallerTransformation!=null @@ -1914,7 +1914,7 @@ protected void ProcessQueryStringMemberWithMap(int level, Member member, string #line default #line hidden - #line 300 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 300 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" else if (member.IsMap) { @@ -1929,63 +1929,63 @@ protected void ProcessQueryStringMemberWithMap(int level, Member member, string #line default #line hidden - #line 310 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 310 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 1) * 4))); #line default #line hidden - #line 310 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 310 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("foreach(var kvp in "); #line default #line hidden - #line 310 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 310 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 310 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 310 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("."); #line default #line hidden - #line 310 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 310 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 310 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 310 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(")\r\n"); #line default #line hidden - #line 311 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 311 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 1) * 4))); #line default #line hidden - #line 311 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 311 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("{\r\n"); #line default #line hidden - #line 312 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 312 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" if(member.Shape.ValueShape.IsList) { @@ -1996,63 +1996,63 @@ protected void ProcessQueryStringMemberWithMap(int level, Member member, string #line default #line hidden - #line 318 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 318 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 2) * 4))); #line default #line hidden - #line 318 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 318 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("if(request.ParameterCollection.ContainsKey(kvp.Key))\r\n"); #line default #line hidden - #line 319 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 319 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 2) * 4))); #line default #line hidden - #line 319 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 319 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(" continue;\r\n"); #line default #line hidden - #line 320 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 320 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 2) * 4))); #line default #line hidden - #line 320 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 320 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("else\r\n"); #line default #line hidden - #line 321 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 321 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 2) * 4))); #line default #line hidden - #line 321 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 321 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(" request.ParameterCollection.Add(kvp.Key, kvp.Value);\r\n"); #line default #line hidden - #line 322 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 322 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" }//ending closing brace for (if(member.Shape.ValueShape.ListShape.IsString) else { @@ -2061,56 +2061,56 @@ protected void ProcessQueryStringMemberWithMap(int level, Member member, string #line default #line hidden - #line 326 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 326 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 2) * 4))); #line default #line hidden - #line 326 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 326 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("if(request.ParameterCollection.ContainsKey(kvp.Key))\r\n"); #line default #line hidden - #line 327 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 327 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 2) * 4))); #line default #line hidden - #line 327 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 327 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(" continue;\r\n"); #line default #line hidden - #line 328 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 328 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 2) * 4))); #line default #line hidden - #line 328 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 328 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("else\r\n"); #line default #line hidden - #line 329 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 329 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 2) * 4))); #line default #line hidden - #line 329 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 329 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(" request.ParameterCollection.Add(kvp.Key, kvp.Value.ConvertAll(item => " + ""); @@ -2118,21 +2118,21 @@ protected void ProcessQueryStringMemberWithMap(int level, Member member, string #line default #line hidden - #line 329 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 329 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueShape.ListShape.PrimitiveMarshaller(MarshallLocation.QueryString))); #line default #line hidden - #line 329 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 329 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("(item)));\r\n"); #line default #line hidden - #line 330 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 330 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" }//ending closing brace for else }//ending closing brach for if(member.Shape.ValueShape.IsList @@ -2143,77 +2143,77 @@ protected void ProcessQueryStringMemberWithMap(int level, Member member, string #line default #line hidden - #line 336 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 336 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 2) * 4))); #line default #line hidden - #line 336 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 336 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("if(request.Parameters.ContainsKey(kvp.Key))\r\n"); #line default #line hidden - #line 337 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 337 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 2) * 4))); #line default #line hidden - #line 337 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 337 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(" continue;\r\n"); #line default #line hidden - #line 338 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 338 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 2) * 4))); #line default #line hidden - #line 338 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 338 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("else\r\n"); #line default #line hidden - #line 339 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 339 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 2) * 4))); #line default #line hidden - #line 339 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 339 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(" request.Parameters.Add(kvp.Key, "); #line default #line hidden - #line 339 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 339 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueShape.PrimitiveMarshaller(MarshallLocation.QueryString))); #line default #line hidden - #line 339 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 339 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("(kvp.Value));\r\n"); #line default #line hidden - #line 340 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 340 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" }//closing brace for else @@ -2221,35 +2221,35 @@ protected void ProcessQueryStringMemberWithMap(int level, Member member, string #line default #line hidden - #line 343 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 343 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 1) * 4))); #line default #line hidden - #line 343 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 343 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("}\r\n"); #line default #line hidden - #line 344 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 344 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 344 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 344 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("}\r\n"); #line default #line hidden - #line 345 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 345 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" } //ending closing brace for member.IsMap @@ -2257,7 +2257,7 @@ protected void ProcessQueryStringMemberWithMap(int level, Member member, string #line default #line hidden - #line 348 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 348 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" else if (member.IsList) { @@ -2274,119 +2274,119 @@ protected void ProcessQueryStringMemberWithMap(int level, Member member, string #line default #line hidden - #line 360 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 360 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 1) * 4))); #line default #line hidden - #line 360 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 360 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("if(request.ParameterCollection.ContainsKey(\""); #line default #line hidden - #line 360 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 360 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 360 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 360 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\"))\r\n"); #line default #line hidden - #line 361 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 361 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 1) * 4))); #line default #line hidden - #line 361 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 361 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(" request.ParameterCollection.Remove(\""); #line default #line hidden - #line 361 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 361 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 361 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 361 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 362 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 362 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 1) * 4))); #line default #line hidden - #line 362 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 362 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("request.ParameterCollection.Add(\""); #line default #line hidden - #line 362 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 362 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 362 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 362 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\", "); #line default #line hidden - #line 362 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 362 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 362 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 362 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("."); #line default #line hidden - #line 362 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 362 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 362 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 362 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(");\r\n"); #line default #line hidden - #line 363 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 363 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" }//end of member.Shape.ListShape.IsString else { @@ -2395,154 +2395,154 @@ protected void ProcessQueryStringMemberWithMap(int level, Member member, string #line default #line hidden - #line 367 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 367 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 1) * 4))); #line default #line hidden - #line 367 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 367 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("if(request.ParameterCollection.ContainsKey(\""); #line default #line hidden - #line 367 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 367 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 367 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 367 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\"))\r\n"); #line default #line hidden - #line 368 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 368 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 1) * 4))); #line default #line hidden - #line 368 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 368 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(" request.ParameterCollection.Remove(\""); #line default #line hidden - #line 368 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 368 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 368 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 368 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 369 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 369 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 1) * 4))); #line default #line hidden - #line 369 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 369 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("request.ParameterCollection.Add(\""); #line default #line hidden - #line 369 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 369 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 369 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 369 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\", "); #line default #line hidden - #line 369 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 369 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 369 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 369 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("."); #line default #line hidden - #line 369 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 369 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 369 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 369 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(".ConvertAll(item => "); #line default #line hidden - #line 369 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 369 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ListShape.PrimitiveMarshaller(MarshallLocation.QueryString))); #line default #line hidden - #line 369 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 369 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("(item)));\r\n\r\n"); #line default #line hidden - #line 371 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 371 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" }//end of else #line default #line hidden - #line 373 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 373 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 373 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 373 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("}\r\n"); #line default #line hidden - #line 374 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 374 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" }//end of (member.isList) else // not a map or a list @@ -2552,147 +2552,147 @@ protected void ProcessQueryStringMemberWithMap(int level, Member member, string #line default #line hidden - #line 379 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 379 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 1) * 4))); #line default #line hidden - #line 379 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 379 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("if(request.Parameters.ContainsKey(\""); #line default #line hidden - #line 379 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 379 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 379 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 379 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\"))\r\n"); #line default #line hidden - #line 380 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 380 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 1) * 4))); #line default #line hidden - #line 380 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 380 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(" request.Parameters.Remove(\""); #line default #line hidden - #line 380 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 380 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 380 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 380 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 381 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 381 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 1) * 4))); #line default #line hidden - #line 381 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 381 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("request.Parameters.Add(\""); #line default #line hidden - #line 381 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 381 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 381 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 381 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\", "); #line default #line hidden - #line 381 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 381 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PrimitiveMarshaller)); #line default #line hidden - #line 381 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 381 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("("); #line default #line hidden - #line 381 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 381 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 381 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 381 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("."); #line default #line hidden - #line 381 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 381 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 381 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 381 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("));\r\n"); #line default #line hidden - #line 382 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 382 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 382 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 382 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("}\r\n"); #line default #line hidden - #line 383 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 383 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" }//end of else if(member.IsIdempotent) @@ -2702,49 +2702,49 @@ protected void ProcessQueryStringMemberWithMap(int level, Member member, string #line default #line hidden - #line 388 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 388 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 1) * 4))); #line default #line hidden - #line 388 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 388 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(" else\r\n"); #line default #line hidden - #line 389 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 389 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 1) * 4))); #line default #line hidden - #line 389 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 389 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(" request.Parameters.Add(\""); #line default #line hidden - #line 389 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 389 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 389 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 389 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\", System.Guid.NewGuid().ToString());\r\n"); #line default #line hidden - #line 390 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 390 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" }//end of member.IsIdempotent @@ -2752,7 +2752,7 @@ protected void ProcessQueryStringMemberWithMap(int level, Member member, string #line default #line hidden - #line 393 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 393 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" //end of ProcessQueryStringMember function } @@ -2760,7 +2760,7 @@ protected void ProcessQueryStringMemberWithMap(int level, Member member, string #line default #line hidden - #line 397 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 397 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" // Only applicable for rest-json and rest-xml // Generates code to add the operation's hostPrefixMembers to the request's HostPrefix @@ -2773,42 +2773,42 @@ protected void ProcessEndpointHostPrefixMembers(int level, string variableName, #line default #line hidden - #line 404 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 404 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\r\n"); #line default #line hidden - #line 406 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 406 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level) * 4))); #line default #line hidden - #line 406 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 406 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("var hostPrefixLabels = new\r\n"); #line default #line hidden - #line 407 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 407 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level) * 4))); #line default #line hidden - #line 407 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 407 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("{\r\n"); #line default #line hidden - #line 408 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 408 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" foreach(var member in operation.RequestHostPrefixMembers) { @@ -2818,70 +2818,70 @@ protected void ProcessEndpointHostPrefixMembers(int level, string variableName, #line default #line hidden - #line 412 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 412 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 1) * 4))); #line default #line hidden - #line 412 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 412 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.ModeledName)); #line default #line hidden - #line 412 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 412 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(" = "); #line default #line hidden - #line 412 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 412 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PrimitiveMarshaller)); #line default #line hidden - #line 412 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 412 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("("); #line default #line hidden - #line 412 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 412 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 412 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 412 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("."); #line default #line hidden - #line 412 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 412 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 412 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 412 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("),\r\n"); #line default #line hidden - #line 413 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 413 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" } @@ -2889,21 +2889,21 @@ protected void ProcessEndpointHostPrefixMembers(int level, string variableName, #line default #line hidden - #line 416 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 416 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level) * 4))); #line default #line hidden - #line 416 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 416 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("};\r\n\r\n"); #line default #line hidden - #line 418 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 418 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" foreach(var member in operation.RequestHostPrefixMembers) { @@ -2912,70 +2912,70 @@ protected void ProcessEndpointHostPrefixMembers(int level, string variableName, #line default #line hidden - #line 422 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 422 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level) * 4))); #line default #line hidden - #line 422 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 422 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("if (!HostPrefixUtils.IsValidLabelValue(hostPrefixLabels."); #line default #line hidden - #line 422 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 422 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.ModeledName)); #line default #line hidden - #line 422 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 422 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("))\r\n"); #line default #line hidden - #line 423 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 423 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 1) * 4))); #line default #line hidden - #line 423 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 423 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("throw new "); #line default #line hidden - #line 423 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 423 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.BaseException)); #line default #line hidden - #line 423 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 423 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("(\""); #line default #line hidden - #line 423 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 423 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.ModeledName)); #line default #line hidden - #line 423 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 423 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(" can only contain alphanumeric characters and dashes and must be between 1 and 63" + " characters long.\");\t\t\r\n"); @@ -2983,7 +2983,7 @@ protected void ProcessEndpointHostPrefixMembers(int level, string variableName, #line default #line hidden - #line 424 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 424 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" } } @@ -2992,42 +2992,42 @@ protected void ProcessEndpointHostPrefixMembers(int level, string variableName, #line default #line hidden - #line 427 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 427 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(" \r\n"); #line default #line hidden - #line 428 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 428 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level) * 4))); #line default #line hidden - #line 428 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 428 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("request.HostPrefix = $\""); #line default #line hidden - #line 428 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 428 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(operation.EndpointHostPrefix.Replace("{", "{hostPrefixLabels."))); #line default #line hidden - #line 428 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 428 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("\";\r\n"); #line default #line hidden - #line 429 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 429 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" } @@ -3045,21 +3045,21 @@ protected void GenerateRequestChecksumHandling(Operation operation, string reque #line default #line hidden - #line 441 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 441 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(" if (publicRequest.IsSet"); #line default #line hidden - #line 442 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 442 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 442 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 442 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write("())\r\n request.Headers[Amazon.Util.HeaderKeys.ContentMD5Header]" + " = publicRequest."); @@ -3067,21 +3067,21 @@ protected void GenerateRequestChecksumHandling(Operation operation, string reque #line default #line hidden - #line 443 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 443 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 443 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 443 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(";\r\n"); #line default #line hidden - #line 444 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 444 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" } } @@ -3095,42 +3095,42 @@ protected void GenerateRequestChecksumHandling(Operation operation, string reque #line default #line hidden - #line 452 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 452 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(" ChecksumUtils.SetChecksumData(request, publicRequest."); #line default #line hidden - #line 453 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 453 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(operation.ChecksumConfiguration.RequestAlgorithmMember)); #line default #line hidden - #line 453 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 453 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(", fallbackToMD5: "); #line default #line hidden - #line 453 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 453 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(operation.HttpChecksumRequired.ToString().ToLower())); #line default #line hidden - #line 453 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 453 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(");\r\n"); #line default #line hidden - #line 454 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 454 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" } else if (operation.HttpChecksumRequired) // no flexible checksum, just MD5 @@ -3140,14 +3140,14 @@ protected void GenerateRequestChecksumHandling(Operation operation, string reque #line default #line hidden - #line 458 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 458 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(" ChecksumUtils.SetChecksumData(request);\r\n"); #line default #line hidden - #line 460 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 460 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" } } @@ -3170,7 +3170,7 @@ protected void SetCompressionAlgorithmEncoding(Operation operation) #line default #line hidden - #line 477 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 477 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(" CompressionAlgorithmUtils.SetCompressionAlgorithm(request, Compressio" + "nEncodingAlgorithm."); @@ -3178,21 +3178,21 @@ protected void SetCompressionAlgorithmEncoding(Operation operation) #line default #line hidden - #line 478 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 478 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(encoding.ToString())); #line default #line hidden - #line 478 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 478 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" this.Write(");\r\n"); #line default #line hidden - #line 479 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" + #line 479 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseMarshaller.tt" } } diff --git a/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseResponseUnmarshaller.cs b/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseResponseUnmarshaller.cs index f8eaa7dd7e74..774d0d79fcca 100644 --- a/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseResponseUnmarshaller.cs +++ b/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseResponseUnmarshaller.cs @@ -19,7 +19,7 @@ namespace ServiceClientGenerator.Generators.Marshallers /// Class to produce the template output /// - #line 1 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 1 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")] public partial class BaseResponseUnmarshaller : Generators.BaseGenerator { @@ -33,7 +33,7 @@ public override string TransformText() return this.GenerationEnvironment.ToString(); } - #line 8 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 8 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" protected void GenerateAWSQueryCompatibleBlock() { @@ -42,7 +42,7 @@ protected void GenerateAWSQueryCompatibleBlock() #line default #line hidden - #line 11 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 11 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(@" var errorCode = errorResponse.Code; var errorType = errorResponse.Type; var queryHeaderKey = Amazon.Util.HeaderKeys.XAmzQueryError; @@ -69,7 +69,7 @@ protected void GenerateAWSQueryCompatibleBlock() #line default #line hidden - #line 32 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 32 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } @@ -77,7 +77,7 @@ protected void GenerateAWSQueryCompatibleBlock() #line default #line hidden - #line 36 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 36 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" protected void AddCommonUsingStatements() { @@ -86,7 +86,7 @@ protected void AddCommonUsingStatements() #line default #line hidden - #line 39 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 39 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("using System;\r\nusing System.Collections.Generic;\r\nusing System.Globalization;\r\nus" + "ing System.IO;\r\nusing System.Net;\r\nusing System.Text;\r\nusing System.Xml.Serializ" + "ation;\r\n\r\nusing "); @@ -95,14 +95,14 @@ protected void AddCommonUsingStatements() #line default #line hidden - #line 48 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 48 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.Namespace)); #line default #line hidden - #line 48 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 48 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(".Model;\r\nusing Amazon.Runtime;\r\nusing Amazon.Runtime.Internal;\r\nusing Amazon.Runt" + "ime.Internal.Transform;\r\nusing Amazon.Runtime.Internal.Util;\r\n"); @@ -110,7 +110,7 @@ protected void AddCommonUsingStatements() #line default #line hidden - #line 53 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 53 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } @@ -167,49 +167,49 @@ protected void AddResponseSingletonMethod() #line default #line hidden - #line 104 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 104 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" private static "); #line default #line hidden - #line 105 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 105 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.UnmarshallerBaseName)); #line default #line hidden - #line 105 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 105 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("ResponseUnmarshaller _instance = new "); #line default #line hidden - #line 105 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 105 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.UnmarshallerBaseName)); #line default #line hidden - #line 105 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 105 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("ResponseUnmarshaller(); \r\n\r\n\t\tinternal static "); #line default #line hidden - #line 107 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 107 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.UnmarshallerBaseName)); #line default #line hidden - #line 107 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 107 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("ResponseUnmarshaller GetInstance()\r\n\t\t{\r\n\t\t\treturn _instance;\r\n\t\t}\r\n\r\n ///" + " \r\n /// Gets the singleton.\r\n /// \r\n\t\tpublic " + "static "); @@ -218,14 +218,14 @@ protected void AddResponseSingletonMethod() #line default #line hidden - #line 115 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 115 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.UnmarshallerBaseName)); #line default #line hidden - #line 115 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 115 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("ResponseUnmarshaller Instance\r\n\t\t{\r\n\t\t\tget\r\n\t\t\t{\r\n\t\t\t\treturn _instance;\r\n\t\t\t}\r\n\t\t" + "}\r\n\r\n"); @@ -233,7 +233,7 @@ protected void AddResponseSingletonMethod() #line default #line hidden - #line 123 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 123 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } @@ -244,35 +244,35 @@ protected void AddStructureSingletonMethod() #line default #line hidden - #line 128 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 128 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" private static "); #line default #line hidden - #line 129 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 129 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.UnmarshallerBaseName)); #line default #line hidden - #line 129 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 129 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("Unmarshaller _instance = new "); #line default #line hidden - #line 129 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 129 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.UnmarshallerBaseName)); #line default #line hidden - #line 129 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 129 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("Unmarshaller(); \r\n\r\n /// \r\n /// Gets the singleton." + "\r\n /// \r\n\t\tpublic static "); @@ -280,21 +280,21 @@ protected void AddStructureSingletonMethod() #line default #line hidden - #line 134 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 134 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.UnmarshallerBaseName)); #line default #line hidden - #line 134 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 134 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("Unmarshaller Instance\r\n\t\t{\r\n\t\t\tget\r\n\t\t\t{\r\n\t\t\t\treturn _instance;\r\n\t\t\t}\r\n\t\t}\r\n"); #line default #line hidden - #line 141 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 141 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } @@ -313,28 +313,28 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 154 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 154 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\t\t\t//Map of headers with prefix \""); #line default #line hidden - #line 155 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 155 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 155 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 155 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\".\r\n"); #line default #line hidden - #line 156 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 156 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" // Dictionary if (member.ModelShape.ValueShape.IsString) @@ -344,182 +344,182 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 160 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 160 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" var headersFor"); #line default #line hidden - #line 161 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 161 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 161 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 161 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" = new Dictionary();\r\n\t\t\tforeach (var name"); #line default #line hidden - #line 162 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 162 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 162 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 162 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" in context.ResponseData.GetHeaderNames())\r\n\t\t\t{\r\n\t\t\t\tvar keyToUse = name"); #line default #line hidden - #line 164 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 164 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 164 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 164 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(";\r\n\t\t\t\tif(\""); #line default #line hidden - #line 165 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 165 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 165 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 165 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\".Length > 0 && keyToUse.StartsWith(\""); #line default #line hidden - #line 165 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 165 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 165 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 165 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\")) {\r\n\t\t\t\t\tkeyToUse = keyToUse.Substring(\""); #line default #line hidden - #line 166 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 166 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 166 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 166 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\".Length);\r\n\t\t\t\t}\r\n\r\n\t\t\t\tif (context.ResponseData.IsHeaderPresent($\""); #line default #line hidden - #line 169 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 169 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 169 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 169 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("{keyToUse}\"))\r\n\t\t\t\t{\r\n\t\t\t\t\theadersFor"); #line default #line hidden - #line 171 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 171 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 171 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 171 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(".Add(\r\n\t\t\t\t\t\tkeyToUse,\r\n\t\t\t\t\t\tcontext.ResponseData.GetHeaderValue($\""); #line default #line hidden - #line 173 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 173 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 173 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 173 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("{keyToUse}\")\r\n\t\t\t\t\t);\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t\tif(headersFor"); #line default #line hidden - #line 177 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 177 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 177 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 177 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(".Count > 0)\r\n\t\t\t\tresponse."); #line default #line hidden - #line 178 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 178 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 178 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 178 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" = headersFor"); #line default #line hidden - #line 178 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 178 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 178 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 178 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(";\r\n"); #line default #line hidden - #line 179 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 179 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } // Dictionary> @@ -530,182 +530,182 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 184 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 184 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\t\t\t var headersFor"); #line default #line hidden - #line 185 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 185 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 185 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 185 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" = new Dictionary>();\r\n\t\t\tforeach (var name"); #line default #line hidden - #line 186 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 186 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 186 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 186 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" in context.ResponseData.GetHeaderNames())\r\n\t\t\t{\r\n\t\t\t\tvar keyToUse = name"); #line default #line hidden - #line 188 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 188 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 188 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 188 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(";\r\n\t\t\t\tif(\""); #line default #line hidden - #line 189 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 189 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 189 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 189 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\".Length > 0 && keyToUse.StartsWith(\""); #line default #line hidden - #line 189 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 189 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 189 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 189 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\")) {\r\n\t\t\t\t\tkeyToUse = keyToUse.Substring(\""); #line default #line hidden - #line 190 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 190 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 190 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 190 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\".Length);\r\n\t\t\t\t}\r\n\r\n\t\t\t\tif (context.ResponseData.IsHeaderPresent($\""); #line default #line hidden - #line 193 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 193 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 193 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 193 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("{keyToUse}\"))\r\n\t\t\t\t{\r\n\t\t\t\t\theadersFor"); #line default #line hidden - #line 195 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 195 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 195 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 195 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(".Add(\r\n\t\t\t\t\t\tkeyToUse,\r\n\t\t\t\t\t\tcontext.ResponseData.GetHeaderValue($\""); #line default #line hidden - #line 197 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 197 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 197 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 197 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("{keyToUse}\").Split(\',\').ToList()\r\n\t\t\t\t\t);\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t\tif(headersFor"); #line default #line hidden - #line 201 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 201 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 201 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 201 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(".Count > 0)\r\n\t\t\t\tresponse."); #line default #line hidden - #line 202 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 202 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 202 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 202 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" = headersFor"); #line default #line hidden - #line 202 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 202 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 202 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 202 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(";\r\n"); #line default #line hidden - #line 203 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 203 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } else @@ -717,7 +717,7 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 210 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 210 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" continue; } @@ -726,28 +726,28 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 213 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 213 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\t\t\tif (context.ResponseData.IsHeaderPresent(\""); #line default #line hidden - #line 214 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 214 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 214 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 214 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\"))\r\n"); #line default #line hidden - #line 215 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 215 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" if (member.Shape.IsString) { @@ -758,7 +758,7 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 220 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 220 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\t\t\t{\r\n\t\t\t\tvar headerBytes = Convert.FromBase64String(context.ResponseData.GetHead" + "erValue(\""); @@ -766,35 +766,35 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 222 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 222 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 222 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 222 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\"));\r\n\t\t\t\tresponse."); #line default #line hidden - #line 223 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 223 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 223 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 223 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" = Encoding.UTF8.GetString(headerBytes, 0, headerBytes.Length);\r\n\t\t\t}\r\n"); #line default #line hidden - #line 225 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 225 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } else @@ -804,42 +804,42 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 229 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 229 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\t\t\t\tresponse."); #line default #line hidden - #line 230 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 230 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 230 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 230 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" = context.ResponseData.GetHeaderValue(\""); #line default #line hidden - #line 230 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 230 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 230 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 230 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 231 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 231 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } } @@ -850,28 +850,28 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 236 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 236 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\t\t\t//Map of headers with prefix \""); #line default #line hidden - #line 237 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 237 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 237 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 237 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\".\r\n\r\n"); #line default #line hidden - #line 239 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 239 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" // Dictionary if (member.ModelShape.ValueShape.IsString) @@ -881,182 +881,182 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 243 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 243 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" var headersFor"); #line default #line hidden - #line 244 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 244 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 244 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 244 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" = new Dictionary();\r\n\t\t\tforeach (var name"); #line default #line hidden - #line 245 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 245 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 245 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 245 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" in context.ResponseData.GetHeaderNames())\r\n\t\t\t{\r\n\t\t\t\tvar keyToUse = name"); #line default #line hidden - #line 247 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 247 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 247 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 247 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(";\r\n\t\t\t\tif(\""); #line default #line hidden - #line 248 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 248 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 248 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 248 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\".Length > 0 && keyToUse.StartsWith(\""); #line default #line hidden - #line 248 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 248 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 248 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 248 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\")) {\r\n\t\t\t\t\tkeyToUse = keyToUse.Substring(\""); #line default #line hidden - #line 249 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 249 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 249 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 249 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\".Length);\r\n\t\t\t\t}\r\n\r\n\t\t\t\tif (context.ResponseData.IsHeaderPresent($\""); #line default #line hidden - #line 252 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 252 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 252 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 252 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("{keyToUse}\"))\r\n\t\t\t\t{\r\n\t\t\t\t\theadersFor"); #line default #line hidden - #line 254 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 254 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 254 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 254 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(".Add(\r\n\t\t\t\t\t\tkeyToUse,\r\n\t\t\t\t\t\tcontext.ResponseData.GetHeaderValue($\""); #line default #line hidden - #line 256 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 256 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 256 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 256 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("{keyToUse}\")\r\n\t\t\t\t\t);\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t\tif(headersFor"); #line default #line hidden - #line 260 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 260 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 260 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 260 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(".Count > 0)\r\n\t\t\t\tresponse."); #line default #line hidden - #line 261 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 261 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 261 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 261 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" = headersFor"); #line default #line hidden - #line 261 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 261 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 261 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 261 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(";\r\n"); #line default #line hidden - #line 262 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 262 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } // Dictionary> @@ -1067,182 +1067,182 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 267 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 267 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\t\t\t var headersFor"); #line default #line hidden - #line 268 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 268 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 268 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 268 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" = new Dictionary>();\r\n\t\t\tforeach (var name"); #line default #line hidden - #line 269 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 269 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 269 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 269 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" in context.ResponseData.GetHeaderNames())\r\n\t\t\t{\r\n\t\t\t\tvar keyToUse = name"); #line default #line hidden - #line 271 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 271 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 271 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 271 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(";\r\n\t\t\t\tif(\""); #line default #line hidden - #line 272 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 272 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 272 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 272 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\".Length > 0 && keyToUse.StartsWith(\""); #line default #line hidden - #line 272 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 272 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 272 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 272 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\")) {\r\n\t\t\t\t\tkeyToUse = keyToUse.Substring(\""); #line default #line hidden - #line 273 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 273 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 273 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 273 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\".Length);\r\n\t\t\t\t}\r\n\r\n\t\t\t\tif (context.ResponseData.IsHeaderPresent($\""); #line default #line hidden - #line 276 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 276 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 276 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 276 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("{keyToUse}\"))\r\n\t\t\t\t{\r\n\t\t\t\t\theadersFor"); #line default #line hidden - #line 278 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 278 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 278 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 278 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(".Add(\r\n\t\t\t\t\t\tkeyToUse,\r\n\t\t\t\t\t\tcontext.ResponseData.GetHeaderValue($\""); #line default #line hidden - #line 280 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 280 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 280 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 280 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("{keyToUse}\").Split(\',\').ToList()\r\n\t\t\t\t\t);\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t\tif(headersFor"); #line default #line hidden - #line 284 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 284 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 284 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 284 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(".Count > 0)\r\n\t\t\t\tresponse."); #line default #line hidden - #line 285 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 285 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 285 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 285 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" = headersFor"); #line default #line hidden - #line 285 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 285 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 285 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 285 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(";\r\n"); #line default #line hidden - #line 286 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 286 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } else @@ -1254,7 +1254,7 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 294 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 294 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } else if (member.Shape.IsList) @@ -1270,45 +1270,45 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 304 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 304 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\t\t\t\tresponse."); #line default #line hidden - #line 305 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 305 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 305 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 305 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" = MultiValueHeaderParser.ToStringList(context.ResponseData.GetHeaderValue(\""); #line default #line hidden - #line 305 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 305 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 305 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 305 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\"));\r\n"); #line default #line hidden - #line 306 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 306 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } - else if(member.Shape.ListShape.IsDateTime) + else if(member.Shape.ListShape.IsTimeStamp) { var timestampFormat = member.Shape.ListShape.GetTimestampFormat(MarshallLocation.Headers); if(timestampFormat == TimestampFormat.ISO8601 || timestampFormat == TimestampFormat.RFC822 || timestampFormat == TimestampFormat.UnixTimestamp) @@ -1318,56 +1318,56 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 313 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 313 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\t\t\t\tresponse."); #line default #line hidden - #line 314 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 314 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 314 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 314 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" = MultiValueHeaderParser.ToDateTimeList(context.ResponseData.GetHeaderValue(\""); #line default #line hidden - #line 314 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 314 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 314 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 314 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\"), \""); #line default #line hidden - #line 314 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 314 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(timestampFormat)); #line default #line hidden - #line 314 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 314 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 315 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 315 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } else @@ -1383,56 +1383,56 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 325 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 325 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\t\t\t\tresponse."); #line default #line hidden - #line 326 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 326 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 326 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 326 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" = MultiValueHeaderParser.ToValueTypeList<"); #line default #line hidden - #line 326 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 326 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ListShape.GetPrimitiveType().ToLower())); #line default #line hidden - #line 326 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 326 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(">(context.ResponseData.GetHeaderValue(\""); #line default #line hidden - #line 326 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 326 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 326 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 326 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\"));\r\n"); #line default #line hidden - #line 327 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 327 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } else @@ -1440,7 +1440,7 @@ protected void UnmarshallHeaders() throw new Exception(string.Format("ListShape of {0}, type {1} is not supported within a List for response headers.", member.Shape.ListShape.Name, member.Shape.ListShape.Type)); } } - else if (member.Shape.IsDateTime) + else if (member.Shape.IsTimeStamp) { if( member.TimestampFormat == TimestampFormat.ISO8601 || member.TimestampFormat == TimestampFormat.RFC822) @@ -1450,42 +1450,43 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 339 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 339 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\t\t\t\tresponse."); #line default #line hidden - #line 340 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 340 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 340 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 340 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" = DateTime.Parse(context.ResponseData.GetHeaderValue(\""); #line default #line hidden - #line 340 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 340 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 340 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" -this.Write("\"), CultureInfo.InvariantCulture);\r\n"); + #line 340 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" +this.Write("\"), CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles" + + ".AdjustToUniversal);\r\n"); #line default #line hidden - #line 341 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 341 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } else if(member.TimestampFormat == TimestampFormat.UnixTimestamp) @@ -1495,21 +1496,21 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 345 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 345 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\t\t\t\tresponse."); #line default #line hidden - #line 346 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 346 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 346 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 346 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" = Amazon.Util.AWSSDKUtils.ConvertFromUnixEpochSeconds(int.Parse(context.Response" + "Data.GetHeaderValue(\""); @@ -1517,21 +1518,21 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 346 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 346 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 346 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 346 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\"), CultureInfo.InvariantCulture));\r\n"); #line default #line hidden - #line 347 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 347 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } else @@ -1546,70 +1547,77 @@ protected void UnmarshallHeaders() #line default #line hidden - #line 356 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 356 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\t\t\t\tresponse."); #line default #line hidden - #line 357 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 357 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 357 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 357 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" = "); #line default #line hidden - #line 357 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 357 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.GetPrimitiveType().ToLower())); #line default #line hidden - #line 357 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 357 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(".Parse(context.ResponseData.GetHeaderValue(\""); #line default #line hidden - #line 357 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 357 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallLocationName)); #line default #line hidden - #line 357 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 357 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\")"); #line default #line hidden - #line 357 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 357 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture((member.Shape.IsBoolean)?"":", CultureInfo.InvariantCulture")); #line default #line hidden - #line 357 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 357 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" +this.Write(this.ToStringHelper.ToStringWithCulture((!member.Shape.IsTimeStamp)?"":", DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal")); + + + #line default + #line hidden + + #line 357 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(");\r\n"); #line default #line hidden - #line 358 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 358 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } else @@ -1630,28 +1638,28 @@ protected void ProcessStatusCode() #line default #line hidden - #line 373 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 373 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write("\t\t\tresponse."); #line default #line hidden - #line 374 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 374 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Operation.ResponseStatusCodeMember.PropertyName)); #line default #line hidden - #line 374 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 374 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" this.Write(" = (int)context.ResponseData.StatusCode;\r\n"); #line default #line hidden - #line 375 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 375 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" } } @@ -1660,7 +1668,7 @@ protected void ProcessStatusCode() #line default #line hidden - #line 379 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" + #line 379 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\BaseResponseUnmarshaller.tt" /* The rules for determining the marshallName for xml-based services is different than json services. Xml based services are defined as any service which marshalls/unmarshalls an xml document. This includes AWSQueryResponse, diff --git a/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseResponseUnmarshaller.tt b/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseResponseUnmarshaller.tt index 638510d6f98d..ee71762c112d 100644 --- a/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseResponseUnmarshaller.tt +++ b/generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseResponseUnmarshaller.tt @@ -305,7 +305,7 @@ using Amazon.Runtime.Internal.Util; response.<#=member.PropertyName#> = MultiValueHeaderParser.ToStringList(context.ResponseData.GetHeaderValue("<#=member.MarshallLocationName#>")); <#+ } - else if(member.Shape.ListShape.IsDateTime) + else if(member.Shape.ListShape.IsTimeStamp) { var timestampFormat = member.Shape.ListShape.GetTimestampFormat(MarshallLocation.Headers); if(timestampFormat == TimestampFormat.ISO8601 || timestampFormat == TimestampFormat.RFC822 || timestampFormat == TimestampFormat.UnixTimestamp) @@ -331,13 +331,13 @@ using Amazon.Runtime.Internal.Util; throw new Exception(string.Format("ListShape of {0}, type {1} is not supported within a List for response headers.", member.Shape.ListShape.Name, member.Shape.ListShape.Type)); } } - else if (member.Shape.IsDateTime) + else if (member.Shape.IsTimeStamp) { if( member.TimestampFormat == TimestampFormat.ISO8601 || member.TimestampFormat == TimestampFormat.RFC822) { #> - response.<#=member.PropertyName#> = DateTime.Parse(context.ResponseData.GetHeaderValue("<#=member.MarshallLocationName#>"), CultureInfo.InvariantCulture); + response.<#=member.PropertyName#> = DateTime.Parse(context.ResponseData.GetHeaderValue("<#=member.MarshallLocationName#>"), CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal); <#+ } else if(member.TimestampFormat == TimestampFormat.UnixTimestamp) @@ -354,7 +354,7 @@ using Amazon.Runtime.Internal.Util; else if (member.Shape.IsPrimitiveType) { #> - response.<#=member.PropertyName#> = <#=member.Shape.GetPrimitiveType().ToLower()#>.Parse(context.ResponseData.GetHeaderValue("<#=member.MarshallLocationName#>")<#=(member.Shape.IsBoolean)?"":", CultureInfo.InvariantCulture"#>); + response.<#=member.PropertyName#> = <#=member.Shape.GetPrimitiveType().ToLower()#>.Parse(context.ResponseData.GetHeaderValue("<#=member.MarshallLocationName#>")<#=(member.Shape.IsBoolean)?"":", CultureInfo.InvariantCulture"#><#=(!member.Shape.IsTimeStamp)?"":", DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal"#>); <#+ } else diff --git a/generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCStructureMarshaller.cs b/generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCStructureMarshaller.cs index deab2cd86e96..9b1e700366d8 100644 --- a/generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCStructureMarshaller.cs +++ b/generator/ServiceClientGeneratorLib/Generators/Marshallers/JsonRPCStructureMarshaller.cs @@ -18,7 +18,7 @@ namespace ServiceClientGenerator.Generators.Marshallers /// Class to produce the template output /// - #line 1 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCStructureMarshaller.tt" + #line 1 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCStructureMarshaller.tt" [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")] public partial class JsonRPCStructureMarshaller : BaseRequestMarshaller { @@ -29,7 +29,7 @@ public partial class JsonRPCStructureMarshaller : BaseRequestMarshaller public override string TransformText() { - #line 6 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCStructureMarshaller.tt" + #line 6 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCStructureMarshaller.tt" AddLicenseHeader(); @@ -41,28 +41,28 @@ public override string TransformText() this.Write("using ThirdParty.Json.LitJson;\r\n\r\n#pragma warning disable CS0612,CS0618\r\nnamespac" + "e "); - #line 14 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCStructureMarshaller.tt" + #line 14 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCStructureMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.Namespace)); #line default #line hidden this.Write(".Model.Internal.MarshallTransformations\r\n{\r\n\t/// \r\n\t/// "); - #line 17 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCStructureMarshaller.tt" + #line 17 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCStructureMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default #line hidden this.Write(" Marshaller\r\n\t/// \r\n\tpublic class "); - #line 19 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCStructureMarshaller.tt" + #line 19 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCStructureMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default #line hidden this.Write("Marshaller : IRequestMarshaller<"); - #line 19 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCStructureMarshaller.tt" + #line 19 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCStructureMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default @@ -77,7 +77,7 @@ public override string TransformText() /// public void Marshall("); - #line 27 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCStructureMarshaller.tt" + #line 27 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCStructureMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default @@ -85,7 +85,7 @@ public override string TransformText() this.Write(" requestObject, JsonMarshallerContext context)\r\n\t\t{\r\n\t\t\tif(requestObject == null)" + "\r\n\t\t\t\treturn;\r\n"); - #line 31 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCStructureMarshaller.tt" + #line 31 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCStructureMarshaller.tt" ProcessMembers(0, "requestObject", this.Structure.Members); @@ -95,14 +95,14 @@ public override string TransformText() this.Write("\t\t}\r\n\r\n /// \r\n /// Singleton Marshaller.\r\n /// \r\n\t\tpublic readonly static "); - #line 39 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCStructureMarshaller.tt" + #line 39 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCStructureMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default #line hidden this.Write("Marshaller Instance = new "); - #line 39 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCStructureMarshaller.tt" + #line 39 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCStructureMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default @@ -111,7 +111,7 @@ public override string TransformText() return this.GenerationEnvironment.ToString(); } - #line 44 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCStructureMarshaller.tt" + #line 44 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\JsonRPCStructureMarshaller.tt" protected void ProcessMembers(int level, string variableName, IEnumerable members) { @@ -122,91 +122,91 @@ protected void ProcessMembers(int level, string variableName, IEnumerable - #line 1 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 1 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")] public partial class RestXmlRequestMarshaller : BaseRequestMarshaller { @@ -30,7 +30,7 @@ public partial class RestXmlRequestMarshaller : BaseRequestMarshaller public override string TransformText() { - #line 7 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 7 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" AddLicenseHeader(); @@ -41,28 +41,28 @@ public override string TransformText() #line hidden this.Write("using System.Xml;\r\n\r\n#pragma warning disable CS0612,CS0618\r\nnamespace "); - #line 15 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 15 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.Namespace)); #line default #line hidden this.Write(".Model.Internal.MarshallTransformations\r\n{\r\n\t/// \r\n\t/// "); - #line 18 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 18 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Operation.Name)); #line default #line hidden this.Write(" Request Marshaller\r\n\t/// \r\n\tpublic class "); - #line 20 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 20 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Operation.Name)); #line default #line hidden this.Write("RequestMarshaller : IMarshaller\r\n /// \r\n\t\tpublic IReque" + "st Marshall("); - #line 37 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 37 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Operation.Name)); #line default @@ -96,14 +96,14 @@ public IRequest Marshall(AmazonWebServiceRequest input) this.Write("Request publicRequest)\r\n\t\t{\r\n\t\t\tvar request = new DefaultRequest(publicRequest, \"" + ""); - #line 39 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 39 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.Namespace)); #line default #line hidden this.Write("\");\r\n"); - #line 40 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 40 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" // Assign HttpMethod if present or default to POST if(!string.IsNullOrWhiteSpace(this.Operation.HttpMethod)){ @@ -113,14 +113,14 @@ public IRequest Marshall(AmazonWebServiceRequest input) #line hidden this.Write("\t\t\trequest.HttpMethod = \""); - #line 44 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 44 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Operation.HttpMethod)); #line default #line hidden this.Write("\";\r\n"); - #line 45 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 45 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } var requestStructure = this.Operation.RequestStructure; @@ -141,14 +141,14 @@ public IRequest Marshall(AmazonWebServiceRequest input) #line hidden this.Write("\t\t\trequest.ResourcePath = \""); - #line 60 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 60 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Operation.RequestUri)); #line default #line hidden this.Write("\";\r\n\r\n"); - #line 62 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 62 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" // Process any members which are marshalled as part of the request body if(this.Operation.RequestHasBodyMembers || shouldMarshallPayload) @@ -165,7 +165,7 @@ public IRequest Marshall(AmazonWebServiceRequest input) #line hidden this.Write("\r\n"); - #line 74 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 74 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" // If there aren't any members that are marshalled as part of the body or streamed if(this.Operation.UseQueryString) @@ -176,7 +176,7 @@ public IRequest Marshall(AmazonWebServiceRequest input) #line hidden this.Write("\t\t\trequest.UseQueryString = true;\r\n"); - #line 80 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 80 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } // We skip endpoint host prefix handling for S3 and S3 Control as it's implemented by endpoint rules. @@ -190,7 +190,7 @@ public IRequest Marshall(AmazonWebServiceRequest input) #line hidden this.Write("\t\t\treturn request;\r\n\t\t}\r\n"); - #line 90 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 90 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.AddRequestSingletonMethod(); @@ -201,7 +201,7 @@ public IRequest Marshall(AmazonWebServiceRequest input) return this.GenerationEnvironment.ToString(); } - #line 96 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 96 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" void ProcessRequestBodyMembers(string variableName, Operation operation) @@ -212,7 +212,7 @@ void ProcessRequestBodyMembers(string variableName, Operation operation) #line default #line hidden - #line 101 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 101 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(@" var stringWriter = new XMLEncodedStringWriter(CultureInfo.InvariantCulture); using (var xmlWriter = XmlWriter.Create(stringWriter, new XmlWriterSettings() { Encoding = System.Text.Encoding.UTF8, OmitXmlDeclaration = true, NewLineHandling = NewLineHandling.Entitize })) { @@ -222,7 +222,7 @@ void ProcessRequestBodyMembers(string variableName, Operation operation) #line default #line hidden - #line 105 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 105 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" if(operation.RequestPayloadMember==null) { @@ -233,42 +233,42 @@ void ProcessRequestBodyMembers(string variableName, Operation operation) #line default #line hidden - #line 110 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 110 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\txmlWriter.WriteStartElement(\""); #line default #line hidden - #line 111 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 111 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(operation.RequestStructure.MarshallName)); #line default #line hidden - #line 111 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 111 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\", \""); #line default #line hidden - #line 111 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 111 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(operation.XmlNamespace)); #line default #line hidden - #line 111 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 111 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 112 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 112 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } else @@ -278,56 +278,56 @@ void ProcessRequestBodyMembers(string variableName, Operation operation) #line default #line hidden - #line 116 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 116 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\txmlWriter.WriteStartElement(\""); #line default #line hidden - #line 117 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 117 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(operation.RequestStructure.MarshallName)); #line default #line hidden - #line 117 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 117 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\r\n\t\t\t\txmlWriter.WriteAttributeString(\"xmlns\", \""); #line default #line hidden - #line 118 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 118 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(operation.XmlNamespacePrefix)); #line default #line hidden - #line 118 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 118 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\", null, \""); #line default #line hidden - #line 118 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 118 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(operation.XmlNamespace)); #line default #line hidden - #line 118 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 118 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 119 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 119 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } var requestStructureAttributes = operation.RequestStructure.Members.Where(x => x.IsXmlAttribute); @@ -338,28 +338,28 @@ void ProcessRequestBodyMembers(string variableName, Operation operation) #line default #line hidden - #line 124 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 124 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\tif("); #line default #line hidden - #line 125 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 125 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName + ".IsSet" + member.PropertyName)); #line default #line hidden - #line 125 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 125 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("())\r\n"); #line default #line hidden - #line 126 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 126 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" WriteXmlAttributeString(level, member, variableName, isPayload: false); @@ -367,7 +367,7 @@ void ProcessRequestBodyMembers(string variableName, Operation operation) #line default #line hidden - #line 129 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 129 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } } @@ -380,56 +380,56 @@ void ProcessRequestBodyMembers(string variableName, Operation operation) #line default #line hidden - #line 136 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 136 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\tif ("); #line default #line hidden - #line 137 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 137 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName + ".IsSet" + operation.RequestPayloadMember.PropertyName)); #line default #line hidden - #line 137 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 137 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("())\r\n\t\t\t\t{\r\n\t\t\t\t\txmlWriter.WriteStartElement(\""); #line default #line hidden - #line 139 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 139 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(operation.RequestPayloadMember.LocationName != operation.RequestStructure.PayloadMemberName ? operation.RequestPayloadMember.LocationName : operation.RequestPayloadMember.Shape.MarshallName)); #line default #line hidden - #line 139 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 139 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\", \""); #line default #line hidden - #line 139 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 139 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(operation.XmlNamespace)); #line default #line hidden - #line 139 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 139 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 140 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 140 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } else @@ -441,56 +441,56 @@ void ProcessRequestBodyMembers(string variableName, Operation operation) #line default #line hidden - #line 146 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 146 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\tif ("); #line default #line hidden - #line 147 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 147 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName + ".IsSet" + operation.RequestPayloadMember.PropertyName)); #line default #line hidden - #line 147 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 147 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("())\r\n\t\t\t\t{\r\n\t\t\t\t\txmlWriter.WriteStartElement(\""); #line default #line hidden - #line 149 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 149 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(operation.RequestPayloadMember.LocationName != operation.RequestStructure.PayloadMemberName ? operation.RequestPayloadMember.LocationName : operation.RequestPayloadMember.Shape.MarshallName)); #line default #line hidden - #line 149 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 149 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\", \""); #line default #line hidden - #line 149 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 149 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(operation.XmlNamespace)); #line default #line hidden - #line 149 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 149 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 150 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 150 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } else @@ -500,70 +500,70 @@ void ProcessRequestBodyMembers(string variableName, Operation operation) #line default #line hidden - #line 154 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 154 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\tif ("); #line default #line hidden - #line 155 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 155 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName + ".IsSet" + operation.RequestPayloadMember.PropertyName)); #line default #line hidden - #line 155 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 155 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("())\r\n\t\t\t\t{\r\n\t\t\t\t\txmlWriter.WriteStartElement(\""); #line default #line hidden - #line 157 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 157 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(operation.RequestPayloadMember.LocationName != operation.RequestStructure.PayloadMemberName ? operation.RequestPayloadMember.LocationName : operation.RequestPayloadMember.Shape.MarshallName)); #line default #line hidden - #line 157 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 157 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\r\n\t\t\t\t\txmlWriter.WriteAttributeString(\"xmlns\",\""); #line default #line hidden - #line 158 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 158 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(operation.XmlNamespacePrefix)); #line default #line hidden - #line 158 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 158 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\",null,\""); #line default #line hidden - #line 158 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 158 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(operation.XmlNamespace)); #line default #line hidden - #line 158 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 158 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 159 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 159 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } @@ -571,7 +571,7 @@ void ProcessRequestBodyMembers(string variableName, Operation operation) #line default #line hidden - #line 162 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 162 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } var requestPayloadAttributes = operation.RequestPayloadMember.Shape.Members.Where(x => x.IsXmlAttribute); @@ -582,28 +582,28 @@ void ProcessRequestBodyMembers(string variableName, Operation operation) #line default #line hidden - #line 167 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 167 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\tif("); #line default #line hidden - #line 168 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 168 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName + "." + operation.RequestPayloadMember.PropertyName + ".IsSet" + member.PropertyName)); #line default #line hidden - #line 168 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 168 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("())\r\n"); #line default #line hidden - #line 169 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 169 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" WriteXmlAttributeString(level + 1, member, variableName, isPayload: true, operation); @@ -611,7 +611,7 @@ void ProcessRequestBodyMembers(string variableName, Operation operation) #line default #line hidden - #line 172 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 172 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } level++; @@ -635,63 +635,63 @@ void ProcessRequestBodyMembers(string variableName, Operation operation) #line default #line hidden - #line 191 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 191 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 4) * 4))); #line default #line hidden - #line 191 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 191 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("if("); #line default #line hidden - #line 191 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 191 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 191 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 191 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(".IsSet"); #line default #line hidden - #line 191 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 191 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 191 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 191 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("())\r\n"); #line default #line hidden - #line 192 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 192 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 4) * 4))); #line default #line hidden - #line 192 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 192 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("{\r\n"); #line default #line hidden - #line 193 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 193 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" if(member.IsFlattened) { @@ -706,21 +706,21 @@ void ProcessRequestBodyMembers(string variableName, Operation operation) #line default #line hidden - #line 203 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 203 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 4) * 4))); #line default #line hidden - #line 203 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 203 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("}\r\n"); #line default #line hidden - #line 204 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 204 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } else @@ -730,49 +730,49 @@ void ProcessRequestBodyMembers(string variableName, Operation operation) #line default #line hidden - #line 209 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 209 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 209 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 209 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\tif("); #line default #line hidden - #line 209 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 209 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 209 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 209 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(".IsSet"); #line default #line hidden - #line 209 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 209 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 209 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 209 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("())\r\n"); #line default #line hidden - #line 210 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 210 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" if(string.IsNullOrEmpty(member.XmlNamespace)) { @@ -781,84 +781,84 @@ void ProcessRequestBodyMembers(string variableName, Operation operation) #line default #line hidden - #line 214 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 214 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 214 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 214 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteElementString(\""); #line default #line hidden - #line 214 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 214 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallName)); #line default #line hidden - #line 214 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 214 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\", "); #line default #line hidden - #line 214 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 214 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PrimitiveMarshaller)); #line default #line hidden - #line 214 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 214 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("("); #line default #line hidden - #line 214 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 214 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 214 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 214 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("."); #line default #line hidden - #line 214 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 214 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 214 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 214 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture((member.IsNullable ? ".Value" : string.Empty))); #line default #line hidden - #line 214 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 214 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("));\r\n"); #line default #line hidden - #line 215 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 215 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } else @@ -869,112 +869,112 @@ void ProcessRequestBodyMembers(string variableName, Operation operation) #line default #line hidden - #line 221 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 221 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 221 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 221 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteElementString("); #line default #line hidden - #line 221 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 221 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(prefix)); #line default #line hidden - #line 221 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 221 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(",\""); #line default #line hidden - #line 221 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 221 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallName)); #line default #line hidden - #line 221 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 221 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\",\""); #line default #line hidden - #line 221 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 221 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.XmlNamespace)); #line default #line hidden - #line 221 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 221 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\", "); #line default #line hidden - #line 221 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 221 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PrimitiveMarshaller)); #line default #line hidden - #line 221 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 221 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("("); #line default #line hidden - #line 221 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 221 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 221 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 221 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("."); #line default #line hidden - #line 221 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 221 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 221 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 221 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture((member.IsNullable ? ".Value" : string.Empty))); #line default #line hidden - #line 221 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 221 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("));\r\n"); #line default #line hidden - #line 222 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 222 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } if(member.IsIdempotent) @@ -984,42 +984,42 @@ void ProcessRequestBodyMembers(string variableName, Operation operation) #line default #line hidden - #line 226 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 226 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\telse\t\t\t\t\r\n"); #line default #line hidden - #line 228 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 228 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 228 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 228 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteElementString(\""); #line default #line hidden - #line 228 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 228 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallName)); #line default #line hidden - #line 228 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 228 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\", Guid.NewGuid().ToString());\t\t\t\t\r\n"); #line default #line hidden - #line 229 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 229 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } @@ -1027,21 +1027,21 @@ void ProcessRequestBodyMembers(string variableName, Operation operation) #line default #line hidden - #line 232 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 232 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture("")); #line default #line hidden - #line 232 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 232 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\r\n"); #line default #line hidden - #line 233 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 233 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } @@ -1051,28 +1051,28 @@ void ProcessRequestBodyMembers(string variableName, Operation operation) #line default #line hidden - #line 237 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 237 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\r\n"); #line default #line hidden - #line 239 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 239 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 239 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 239 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\txmlWriter.WriteEndElement();\r\n"); #line default #line hidden - #line 240 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 240 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" if(operation.RequestPayloadMember!=null) { @@ -1081,21 +1081,21 @@ void ProcessRequestBodyMembers(string variableName, Operation operation) #line default #line hidden - #line 244 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 244 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 244 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 244 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t}\r\n"); #line default #line hidden - #line 245 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 245 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" level--; } @@ -1104,7 +1104,7 @@ void ProcessRequestBodyMembers(string variableName, Operation operation) #line default #line hidden - #line 248 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 248 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t}\r\n\t\t\ttry \r\n\t\t\t{\r\n\t\t\t\tstring content = stringWriter.ToString();\r\n\t\t\t\trequest.C" + "ontent = System.Text.Encoding.UTF8.GetBytes(content);\r\n\t\t\t\trequest.Headers[\"Cont" + "ent-Type\"] = \"application/xml\";\r\n"); @@ -1113,7 +1113,7 @@ void ProcessRequestBodyMembers(string variableName, Operation operation) #line default #line hidden - #line 255 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 255 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" GenerateRequestChecksumHandling(operation, "content"); @@ -1121,21 +1121,21 @@ void ProcessRequestBodyMembers(string variableName, Operation operation) #line default #line hidden - #line 257 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 257 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t request.Headers[Amazon.Util.HeaderKeys.XAmzApiVersion] = \""); #line default #line hidden - #line 258 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 258 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ServiceModel.APIVersion)); #line default #line hidden - #line 258 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 258 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\"; \r\n\t\t\t} \r\n\t\t\tcatch (EncoderFallbackException e) \r\n\t\t\t{\r\n\t\t\t\tthrow ne" + "w AmazonServiceException(\"Unable to marshall request to XML\", e);\r\n\t\t\t}\r\n"); @@ -1143,7 +1143,7 @@ void ProcessRequestBodyMembers(string variableName, Operation operation) #line default #line hidden - #line 264 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 264 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } @@ -1166,63 +1166,63 @@ void ProcessMembers(int level, string variableName, IEnumerable members, #line default #line hidden - #line 282 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 282 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 4) * 4))); #line default #line hidden - #line 282 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 282 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("if ("); #line default #line hidden - #line 282 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 282 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 282 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 282 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(".IsSet"); #line default #line hidden - #line 282 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 282 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 282 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 282 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("())\r\n"); #line default #line hidden - #line 283 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 283 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 4) * 4))); #line default #line hidden - #line 283 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 283 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("{\r\n"); #line default #line hidden - #line 284 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 284 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" if(member.IsFlattened) { @@ -1237,21 +1237,21 @@ void ProcessMembers(int level, string variableName, IEnumerable members, #line default #line hidden - #line 294 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 294 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level + 4) * 4))); #line default #line hidden - #line 294 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 294 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("}\r\n"); #line default #line hidden - #line 295 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 295 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } // we're processing members of a structure as a map's value @@ -1262,126 +1262,126 @@ void ProcessMembers(int level, string variableName, IEnumerable members, #line default #line hidden - #line 301 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 301 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 301 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 301 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\tif("); #line default #line hidden - #line 301 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 301 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 301 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 301 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(".IsSet"); #line default #line hidden - #line 301 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 301 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 301 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 301 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("())\r\n"); #line default #line hidden - #line 302 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 302 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 302 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 302 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteElementString(\""); #line default #line hidden - #line 302 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 302 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.ModeledName)); #line default #line hidden - #line 302 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 302 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\", "); #line default #line hidden - #line 302 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 302 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PrimitiveMarshaller)); #line default #line hidden - #line 302 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 302 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("("); #line default #line hidden - #line 302 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 302 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 302 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 302 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("."); #line default #line hidden - #line 302 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 302 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 302 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 302 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture((member.IsNullable ? ".Value" : string.Empty))); #line default #line hidden - #line 302 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 302 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("));\r\n"); #line default #line hidden - #line 303 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 303 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } else @@ -1391,49 +1391,49 @@ void ProcessMembers(int level, string variableName, IEnumerable members, #line default #line hidden - #line 308 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 308 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 308 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 308 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\tif("); #line default #line hidden - #line 308 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 308 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 308 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 308 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(".IsSet"); #line default #line hidden - #line 308 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 308 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 308 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 308 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("())\r\n"); #line default #line hidden - #line 309 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 309 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" if (!member.IsXmlAttribute) { @@ -1442,84 +1442,84 @@ void ProcessMembers(int level, string variableName, IEnumerable members, #line default #line hidden - #line 313 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 313 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 313 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 313 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteElementString(\""); #line default #line hidden - #line 313 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 313 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallName)); #line default #line hidden - #line 313 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 313 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\", "); #line default #line hidden - #line 313 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 313 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PrimitiveMarshaller)); #line default #line hidden - #line 313 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 313 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("("); #line default #line hidden - #line 313 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 313 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 313 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 313 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("."); #line default #line hidden - #line 313 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 313 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 313 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 313 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture((member.IsNullable ? ".Value" : string.Empty))); #line default #line hidden - #line 313 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 313 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("));\r\n"); #line default #line hidden - #line 314 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 314 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } @@ -1527,7 +1527,7 @@ void ProcessMembers(int level, string variableName, IEnumerable members, #line default #line hidden - #line 317 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 317 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" else { @@ -1546,56 +1546,56 @@ void ProcessStructure(int level, string variableName, Shape shape) #line default #line hidden - #line 330 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 330 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\r\n"); #line default #line hidden - #line 331 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 331 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 331 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 331 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\tif ("); #line default #line hidden - #line 331 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 331 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 331 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 331 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(" != null) \r\n"); #line default #line hidden - #line 332 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 332 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 332 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 332 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t{\r\n"); #line default #line hidden - #line 333 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 333 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" if(string.IsNullOrEmpty(shape.XmlNamespace)) { @@ -1604,35 +1604,35 @@ void ProcessStructure(int level, string variableName, Shape shape) #line default #line hidden - #line 337 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 337 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 337 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 337 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteStartElement(\""); #line default #line hidden - #line 337 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 337 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(marshallName)); #line default #line hidden - #line 337 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 337 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 338 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 338 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } else @@ -1644,49 +1644,49 @@ void ProcessStructure(int level, string variableName, Shape shape) #line default #line hidden - #line 345 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 345 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 345 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 345 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteStartElement(\""); #line default #line hidden - #line 345 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 345 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(marshallName)); #line default #line hidden - #line 345 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 345 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\", \""); #line default #line hidden - #line 345 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 345 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(shape.XmlNamespace)); #line default #line hidden - #line 345 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 345 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 346 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 346 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } else @@ -1696,77 +1696,77 @@ void ProcessStructure(int level, string variableName, Shape shape) #line default #line hidden - #line 351 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 351 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 351 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 351 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteStartElement(\""); #line default #line hidden - #line 351 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 351 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(marshallName)); #line default #line hidden - #line 351 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 351 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 352 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 352 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 352 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 352 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteAttributeString(\"xmlns\", \""); #line default #line hidden - #line 352 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 352 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(marshallName)); #line default #line hidden - #line 352 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 352 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\","); #line default #line hidden - #line 352 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 352 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(shape.XmlNamespace)); #line default #line hidden - #line 352 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 352 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(", null );\r\n"); #line default #line hidden - #line 353 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 353 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } } @@ -1776,35 +1776,35 @@ void ProcessStructure(int level, string variableName, Shape shape) #line default #line hidden - #line 358 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 358 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 358 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 358 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteEndElement();\r\n"); #line default #line hidden - #line 359 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 359 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 359 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 359 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t}\r\n"); #line default #line hidden - #line 360 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 360 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } // Only namespaces at the top level Shape matter for a structure, so there is no logic for namespaces here. @@ -1822,84 +1822,84 @@ void ProcessStructure(int level, string variableName, Member member) #line default #line hidden - #line 373 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 373 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 373 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 373 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\tif ("); #line default #line hidden - #line 373 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 373 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 373 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 373 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(" != null)\r\n"); #line default #line hidden - #line 374 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 374 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 374 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 374 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t{\r\n"); #line default #line hidden - #line 375 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 375 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 375 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 375 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteStartElement(\""); #line default #line hidden - #line 375 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 375 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(marshallName)); #line default #line hidden - #line 375 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 375 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 376 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 376 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" #line default #line hidden - #line 378 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 378 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" ProcessMembers(level + 1, variableName, shape.Members); @@ -1907,35 +1907,35 @@ void ProcessStructure(int level, string variableName, Member member) #line default #line hidden - #line 381 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 381 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 381 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 381 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteEndElement();\r\n"); #line default #line hidden - #line 382 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 382 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 382 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 382 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t}\r\n"); #line default #line hidden - #line 383 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 383 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } void ProcessList(int level, string variableName, Member member) @@ -1947,119 +1947,119 @@ void ProcessList(int level, string variableName, Member member) #line default #line hidden - #line 390 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 390 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 390 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 390 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\tvar "); #line default #line hidden - #line 390 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 390 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(listVariable)); #line default #line hidden - #line 390 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 390 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(" = "); #line default #line hidden - #line 390 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 390 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 390 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 390 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("."); #line default #line hidden - #line 390 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 390 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 390 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 390 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(";\r\n"); #line default #line hidden - #line 391 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 391 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 391 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 391 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\tif ("); #line default #line hidden - #line 391 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 391 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(listVariable)); #line default #line hidden - #line 391 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 391 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(" != null && ("); #line default #line hidden - #line 391 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 391 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(listVariable)); #line default #line hidden - #line 391 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 391 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(".Count > 0 || !AWSConfigs.InitializeCollections)) \r\n"); #line default #line hidden - #line 392 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 392 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 392 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 392 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t{\r\n"); #line default #line hidden - #line 393 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 393 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" if (!member.IsFlattened) { @@ -2070,35 +2070,35 @@ void ProcessList(int level, string variableName, Member member) #line default #line hidden - #line 399 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 399 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 399 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 399 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteStartElement(\""); #line default #line hidden - #line 399 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 399 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallName)); #line default #line hidden - #line 399 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 399 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 400 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 400 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } else @@ -2110,49 +2110,49 @@ void ProcessList(int level, string variableName, Member member) #line default #line hidden - #line 407 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 407 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 407 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 407 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteStartElement(\""); #line default #line hidden - #line 407 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 407 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallName)); #line default #line hidden - #line 407 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 407 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\", \""); #line default #line hidden - #line 407 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 407 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.XmlNamespace)); #line default #line hidden - #line 407 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 407 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 408 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 408 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } else @@ -2162,77 +2162,77 @@ void ProcessList(int level, string variableName, Member member) #line default #line hidden - #line 413 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 413 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 413 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 413 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteStartElement(\""); #line default #line hidden - #line 413 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 413 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallName)); #line default #line hidden - #line 413 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 413 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 414 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 414 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 414 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 414 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteAttributeString(\"xmlns\",\""); #line default #line hidden - #line 414 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 414 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.XmlNamespacePrefix)); #line default #line hidden - #line 414 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 414 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\",null,\""); #line default #line hidden - #line 414 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 414 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.XmlNamespace)); #line default #line hidden - #line 414 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 414 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 415 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 415 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } } @@ -2242,63 +2242,63 @@ void ProcessList(int level, string variableName, Member member) #line default #line hidden - #line 420 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 420 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 420 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 420 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\tforeach (var "); #line default #line hidden - #line 420 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 420 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(listItemVariable)); #line default #line hidden - #line 420 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 420 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(" in "); #line default #line hidden - #line 420 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 420 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(listVariable)); #line default #line hidden - #line 420 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 420 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(") \r\n"); #line default #line hidden - #line 421 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 421 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 421 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 421 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t{\r\n"); #line default #line hidden - #line 422 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 422 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" if(member.Shape.ListShape.IsStructure) { @@ -2310,7 +2310,7 @@ void ProcessList(int level, string variableName, Member member) // see https://smithy.io/2.0/spec/protocol-traits.html#xmlflattened-trait if(member.IsFlattened) listMarshallName = member.LocationName ?? member.ModeledName; - if(member.Shape.ListShape.IsDateTime) + if(member.Shape.ListShape.IsTimeStamp) { // Use shape's ListMarshallName as it's a list structure. @@ -2318,91 +2318,91 @@ void ProcessList(int level, string variableName, Member member) #line default #line hidden - #line 437 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 437 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 437 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 437 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteStartElement(\""); #line default #line hidden - #line 437 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 437 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(listMarshallName)); #line default #line hidden - #line 437 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 437 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 438 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 438 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 438 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 438 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteValue("); #line default #line hidden - #line 438 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 438 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ListShape.PrimitiveMarshaller(MarshallLocation.Body))); #line default #line hidden - #line 438 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 438 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("("); #line default #line hidden - #line 438 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 438 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(listItemVariable)); #line default #line hidden - #line 438 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 438 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("));\r\n"); #line default #line hidden - #line 439 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 439 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 439 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 439 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteEndElement();\r\n"); #line default #line hidden - #line 440 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 440 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } @@ -2422,35 +2422,35 @@ void ProcessList(int level, string variableName, Member member) #line default #line hidden - #line 455 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 455 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 455 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 455 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteStartElement(\""); #line default #line hidden - #line 455 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 455 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(listMarshallName)); #line default #line hidden - #line 455 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 455 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 456 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 456 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } else @@ -2464,49 +2464,49 @@ void ProcessList(int level, string variableName, Member member) #line default #line hidden - #line 465 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 465 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 465 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 465 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteStartElement(\""); #line default #line hidden - #line 465 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 465 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(listMarshallName)); #line default #line hidden - #line 465 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 465 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\", \""); #line default #line hidden - #line 465 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 465 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(listMemberXmlNamespaceNode)); #line default #line hidden - #line 465 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 465 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\r\n\r\n"); #line default #line hidden - #line 467 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 467 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } else @@ -2516,77 +2516,77 @@ void ProcessList(int level, string variableName, Member member) #line default #line hidden - #line 472 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 472 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 472 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 472 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteStartElement(\""); #line default #line hidden - #line 472 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 472 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(listMarshallName)); #line default #line hidden - #line 472 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 472 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 473 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 473 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 473 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 473 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteAttributeString(\"xmlns\",\""); #line default #line hidden - #line 473 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 473 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(listMemberXmlNamespaceNode[ServiceModel.XmlNamespacePrefixKey])); #line default #line hidden - #line 473 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 473 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\",null,\""); #line default #line hidden - #line 473 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 473 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(listMemberXmlNamespaceNode[ServiceModel.XmlNamespaceUriKey])); #line default #line hidden - #line 473 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 473 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 474 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 474 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } } @@ -2599,7 +2599,7 @@ void ProcessList(int level, string variableName, Member member) #line default #line hidden - #line 482 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 482 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" if (innerShape == null || (innerShape != null && !innerShape.Shape.IsList)) { @@ -2608,35 +2608,35 @@ void ProcessList(int level, string variableName, Member member) #line default #line hidden - #line 486 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 486 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 486 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 486 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteValue("); #line default #line hidden - #line 486 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 486 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(listItemVariable)); #line default #line hidden - #line 486 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 486 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(");\r\n"); #line default #line hidden - #line 487 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 487 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } @@ -2644,21 +2644,21 @@ void ProcessList(int level, string variableName, Member member) #line default #line hidden - #line 490 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 490 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 490 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 490 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteEndElement();\r\n"); #line default #line hidden - #line 491 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 491 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } } @@ -2667,21 +2667,21 @@ void ProcessList(int level, string variableName, Member member) #line default #line hidden - #line 495 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 495 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 495 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 495 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t}\t\t\t\r\n"); #line default #line hidden - #line 496 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 496 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" if (!member.IsFlattened) { @@ -2690,21 +2690,21 @@ void ProcessList(int level, string variableName, Member member) #line default #line hidden - #line 500 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 500 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 500 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 500 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteEndElement();\t\t\t\r\n"); #line default #line hidden - #line 501 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 501 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } @@ -2712,21 +2712,21 @@ void ProcessList(int level, string variableName, Member member) #line default #line hidden - #line 504 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 504 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 504 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 504 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t}\r\n"); #line default #line hidden - #line 505 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 505 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } @@ -2739,35 +2739,35 @@ void ProcessMap(int level, string variableName, Member member) #line default #line hidden - #line 513 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 513 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 513 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 513 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteStartElement(\""); #line default #line hidden - #line 513 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 513 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallName)); #line default #line hidden - #line 513 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 513 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 514 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 514 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } else @@ -2779,49 +2779,49 @@ void ProcessMap(int level, string variableName, Member member) #line default #line hidden - #line 521 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 521 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 521 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 521 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteStartElement(\""); #line default #line hidden - #line 521 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 521 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallName)); #line default #line hidden - #line 521 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 521 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\",\""); #line default #line hidden - #line 521 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 521 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.XmlNamespace)); #line default #line hidden - #line 521 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 521 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\r\n\r\n"); #line default #line hidden - #line 523 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 523 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } else @@ -2831,77 +2831,77 @@ void ProcessMap(int level, string variableName, Member member) #line default #line hidden - #line 528 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 528 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 528 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 528 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteStartElement(\""); #line default #line hidden - #line 528 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 528 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallName)); #line default #line hidden - #line 528 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 528 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 529 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 529 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 529 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 529 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteAttributeString(\"xmlns\",\""); #line default #line hidden - #line 529 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 529 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.XmlNamespacePrefix)); #line default #line hidden - #line 529 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 529 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\",null,\""); #line default #line hidden - #line 529 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 529 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.XmlNamespace)); #line default #line hidden - #line 529 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 529 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 530 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 530 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } } @@ -2910,77 +2910,77 @@ void ProcessMap(int level, string variableName, Member member) #line default #line hidden - #line 534 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 534 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 534 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 534 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\tforeach (var kvp in "); #line default #line hidden - #line 534 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 534 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 534 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 534 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("."); #line default #line hidden - #line 534 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 534 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 534 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 534 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(")\r\n"); #line default #line hidden - #line 535 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 535 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 535 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 535 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t{\r\n"); #line default #line hidden - #line 536 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 536 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 536 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 536 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteStartElement(\"entry\");\r\n"); #line default #line hidden - #line 537 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 537 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" if(string.IsNullOrEmpty(member.Shape.KeyShapeXmlNamespace)) { @@ -2989,42 +2989,42 @@ void ProcessMap(int level, string variableName, Member member) #line default #line hidden - #line 540 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 540 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\r\n"); #line default #line hidden - #line 542 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 542 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 542 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 542 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\""); #line default #line hidden - #line 542 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 542 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.KeyMarshallName)); #line default #line hidden - #line 542 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 542 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\", kvp.Key);\r\n"); #line default #line hidden - #line 543 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 543 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } else @@ -3037,49 +3037,49 @@ void ProcessMap(int level, string variableName, Member member) #line default #line hidden - #line 551 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 551 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 551 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 551 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\""); #line default #line hidden - #line 551 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 551 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.KeyMarshallName)); #line default #line hidden - #line 551 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 551 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\",\""); #line default #line hidden - #line 551 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 551 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.KeyShapeXmlNamespace)); #line default #line hidden - #line 551 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 551 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\",kvp.Key);\r\n"); #line default #line hidden - #line 552 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 552 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } else @@ -3089,63 +3089,63 @@ void ProcessMap(int level, string variableName, Member member) #line default #line hidden - #line 557 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 557 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 557 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 557 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\""); #line default #line hidden - #line 557 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 557 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(keyNode[ServiceModel.XmlNamespaceKey][ServiceModel.XmlNamespacePrefixKey])); #line default #line hidden - #line 557 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 557 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\",\""); #line default #line hidden - #line 557 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 557 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.KeyMarshallName)); #line default #line hidden - #line 557 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 557 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\",\""); #line default #line hidden - #line 557 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 557 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.KeyShapeXmlNamespace)); #line default #line hidden - #line 557 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 557 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\",kvp.Key);\r\n\r\n"); #line default #line hidden - #line 559 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 559 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } } @@ -3160,35 +3160,35 @@ void ProcessMap(int level, string variableName, Member member) #line default #line hidden - #line 569 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 569 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 569 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 569 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteStartElement(\""); #line default #line hidden - #line 569 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 569 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueMarshallName)); #line default #line hidden - #line 569 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 569 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 570 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 570 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" ProcessStructureAsMapValue(level + 2, "kvp.Value", member.Shape.ValueShape); @@ -3196,21 +3196,21 @@ void ProcessMap(int level, string variableName, Member member) #line default #line hidden - #line 573 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 573 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 573 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 573 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteEndElement();\r\n"); #line default #line hidden - #line 574 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 574 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } else @@ -3222,49 +3222,49 @@ void ProcessMap(int level, string variableName, Member member) #line default #line hidden - #line 581 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 581 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 581 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 581 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\""); #line default #line hidden - #line 581 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 581 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueMarshallName)); #line default #line hidden - #line 581 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 581 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\", kvp.Value"); #line default #line hidden - #line 581 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 581 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueShape.IsString ? "" : ".ToString()")); #line default #line hidden - #line 581 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 581 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(");\r\n"); #line default #line hidden - #line 582 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 582 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } else @@ -3277,63 +3277,63 @@ void ProcessMap(int level, string variableName, Member member) #line default #line hidden - #line 590 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 590 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 590 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 590 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\""); #line default #line hidden - #line 590 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 590 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueMarshallName)); #line default #line hidden - #line 590 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 590 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\", \""); #line default #line hidden - #line 590 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 590 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueShapeXmlNamespace)); #line default #line hidden - #line 590 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 590 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\",kvp.Value"); #line default #line hidden - #line 590 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 590 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueShape.IsString ? "" : ".ToString()")); #line default #line hidden - #line 590 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 590 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(");\r\n"); #line default #line hidden - #line 591 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 591 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } else { @@ -3342,77 +3342,77 @@ void ProcessMap(int level, string variableName, Member member) #line default #line hidden - #line 595 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 595 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 595 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 595 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\""); #line default #line hidden - #line 595 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 595 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(valueNode[ServiceModel.XmlNamespaceKey][ServiceModel.XmlNamespacePrefixKey])); #line default #line hidden - #line 595 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 595 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\",\""); #line default #line hidden - #line 595 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 595 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueMarshallName)); #line default #line hidden - #line 595 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 595 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\", \""); #line default #line hidden - #line 595 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 595 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueShapeXmlNamespace)); #line default #line hidden - #line 595 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 595 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\",kvp.Value"); #line default #line hidden - #line 595 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 595 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueShape.IsString ? "" : ".ToString()")); #line default #line hidden - #line 595 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 595 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(");\r\n"); #line default #line hidden - #line 596 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 596 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } } @@ -3422,49 +3422,49 @@ void ProcessMap(int level, string variableName, Member member) #line default #line hidden - #line 601 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 601 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 601 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 601 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteEndElement();\r\n"); #line default #line hidden - #line 602 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 602 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 602 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 602 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t}\r\n"); #line default #line hidden - #line 603 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 603 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 603 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 603 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteEndElement();\r\n"); #line default #line hidden - #line 604 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 604 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } @@ -3472,7 +3472,7 @@ void ProcessMap(int level, string variableName, Member member) #line default #line hidden - #line 607 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 607 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" // Separating the processing of a flattened map and a regular map for maintability void ProcessFlattenedMap(int level, string variableName, Member member) @@ -3482,91 +3482,91 @@ void ProcessFlattenedMap(int level, string variableName, Member member) #line default #line hidden - #line 612 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 612 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 612 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 612 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\tforeach (var kvp in "); #line default #line hidden - #line 612 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 612 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 612 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 612 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("."); #line default #line hidden - #line 612 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 612 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 612 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 612 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(")\r\n"); #line default #line hidden - #line 613 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 613 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 613 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 613 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t{\r\n"); #line default #line hidden - #line 614 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 614 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 614 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 614 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteStartElement(\""); #line default #line hidden - #line 614 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 614 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallName)); #line default #line hidden - #line 614 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 614 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 615 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 615 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" if(string.IsNullOrEmpty(member.Shape.KeyShapeXmlNamespace)) { @@ -3575,35 +3575,35 @@ void ProcessFlattenedMap(int level, string variableName, Member member) #line default #line hidden - #line 619 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 619 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 619 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 619 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\""); #line default #line hidden - #line 619 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 619 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.KeyMarshallName)); #line default #line hidden - #line 619 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 619 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\", kvp.Key);\r\n"); #line default #line hidden - #line 620 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 620 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } else @@ -3613,49 +3613,49 @@ void ProcessFlattenedMap(int level, string variableName, Member member) #line default #line hidden - #line 625 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 625 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 625 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 625 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\""); #line default #line hidden - #line 625 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 625 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.KeyMarshallName)); #line default #line hidden - #line 625 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 625 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\",\""); #line default #line hidden - #line 625 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 625 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.KeyShapeXmlNamespace)); #line default #line hidden - #line 625 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 625 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\", kvp.Key);\r\n"); #line default #line hidden - #line 626 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 626 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } if(member.Shape.ValueShape.IsMap) @@ -3669,35 +3669,35 @@ void ProcessFlattenedMap(int level, string variableName, Member member) #line default #line hidden - #line 635 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 635 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 635 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 635 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteStartElement(\""); #line default #line hidden - #line 635 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 635 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueMarshallName)); #line default #line hidden - #line 635 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 635 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 636 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 636 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" ProcessStructureAsMapValue(level + 2, "kvp.Value", member.Shape.ValueShape); @@ -3705,21 +3705,21 @@ void ProcessFlattenedMap(int level, string variableName, Member member) #line default #line hidden - #line 639 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 639 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 639 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 639 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteEndElement();\r\n"); #line default #line hidden - #line 640 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 640 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } else @@ -3731,63 +3731,63 @@ void ProcessFlattenedMap(int level, string variableName, Member member) #line default #line hidden - #line 647 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 647 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 647 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 647 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\""); #line default #line hidden - #line 647 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 647 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueMarshallName)); #line default #line hidden - #line 647 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 647 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\", kvp.Value"); #line default #line hidden - #line 647 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 647 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueShape.IsString ? "" : ".ToString()")); #line default #line hidden - #line 647 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 647 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(");\r\n"); #line default #line hidden - #line 648 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 648 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 648 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 648 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteEndElement();\r\n"); #line default #line hidden - #line 649 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 649 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } else @@ -3797,77 +3797,77 @@ void ProcessFlattenedMap(int level, string variableName, Member member) #line default #line hidden - #line 654 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 654 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 654 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 654 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\""); #line default #line hidden - #line 654 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 654 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueMarshallName)); #line default #line hidden - #line 654 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 654 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\", \""); #line default #line hidden - #line 654 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 654 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueShapeXmlNamespace)); #line default #line hidden - #line 654 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 654 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\", kvp.Value"); #line default #line hidden - #line 654 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 654 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.Shape.ValueShape.IsString ? "" : ".ToString()")); #line default #line hidden - #line 654 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 654 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(");\r\n"); #line default #line hidden - #line 655 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 655 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 655 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 655 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteEndElement();\r\n"); #line default #line hidden - #line 656 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 656 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } } @@ -3876,21 +3876,21 @@ void ProcessFlattenedMap(int level, string variableName, Member member) #line default #line hidden - #line 660 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 660 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 660 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 660 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t}\t\r\n"); #line default #line hidden - #line 661 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 661 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } @@ -3898,7 +3898,7 @@ void ProcessFlattenedMap(int level, string variableName, Member member) #line default #line hidden - #line 664 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 664 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" void ProcessSubMap(int level, Shape shape, string parentVariableName) { @@ -3907,133 +3907,133 @@ void ProcessSubMap(int level, Shape shape, string parentVariableName) #line default #line hidden - #line 668 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 668 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 668 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 668 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteStartElement(\"value\");\r\n"); #line default #line hidden - #line 669 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 669 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 669 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 669 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\tforeach (var kvp"); #line default #line hidden - #line 669 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 669 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(level)); #line default #line hidden - #line 669 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 669 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(" in "); #line default #line hidden - #line 669 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 669 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(parentVariableName)); #line default #line hidden - #line 669 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 669 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(".Value) \r\n"); #line default #line hidden - #line 670 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 670 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 670 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 670 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t{\r\n"); #line default #line hidden - #line 671 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 671 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 671 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 671 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteStartElement(\"entry\");\r\n"); #line default #line hidden - #line 672 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 672 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 672 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 672 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\""); #line default #line hidden - #line 672 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 672 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(shape.KeyMarshallName)); #line default #line hidden - #line 672 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 672 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\", kvp"); #line default #line hidden - #line 672 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 672 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(level)); #line default #line hidden - #line 672 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 672 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(".Key);\r\n"); #line default #line hidden - #line 673 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 673 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" if(shape.ValueShape.IsMap) { @@ -4046,49 +4046,49 @@ void ProcessSubMap(int level, Shape shape, string parentVariableName) #line default #line hidden - #line 681 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 681 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 681 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 681 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteElementString(\""); #line default #line hidden - #line 681 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 681 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(shape.ValueMarshallName)); #line default #line hidden - #line 681 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 681 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\", kvp"); #line default #line hidden - #line 681 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 681 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(level)); #line default #line hidden - #line 681 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 681 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(".Value);\r\n"); #line default #line hidden - #line 682 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 682 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } @@ -4096,49 +4096,49 @@ void ProcessSubMap(int level, Shape shape, string parentVariableName) #line default #line hidden - #line 685 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 685 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 685 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 685 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteEndElement();\r\n"); #line default #line hidden - #line 686 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 686 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 686 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 686 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t}\t\t\t\r\n"); #line default #line hidden - #line 687 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 687 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 687 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 687 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteEndElement();\t\t\t\t\r\n"); #line default #line hidden - #line 688 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 688 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } @@ -4146,7 +4146,7 @@ void ProcessSubMap(int level, Shape shape, string parentVariableName) #line default #line hidden - #line 691 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 691 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" protected void ProcessNonStructurePayload(Member payload, int level) { @@ -4157,63 +4157,63 @@ protected void ProcessNonStructurePayload(Member payload, int level) #line default #line hidden - #line 697 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 697 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 697 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 697 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("request.Content = Encoding.UTF8.GetBytes("); #line default #line hidden - #line 697 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 697 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Operation.RequestPayloadMember.PrimitiveMarshaller)); #line default #line hidden - #line 697 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 697 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("(publicRequest."); #line default #line hidden - #line 697 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 697 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Operation.RequestPayloadMember.PropertyName)); #line default #line hidden - #line 697 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 697 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("));\r\n"); #line default #line hidden - #line 698 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 698 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 698 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 698 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("request.Headers[\"Content-Type\"] = \"text/plain\";\r\n"); #line default #line hidden - #line 699 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 699 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } else if(payload.Shape.IsMemoryStream) @@ -4223,49 +4223,49 @@ protected void ProcessNonStructurePayload(Member payload, int level) #line default #line hidden - #line 704 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 704 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 704 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 704 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("request.ContentStream = publicRequest."); #line default #line hidden - #line 704 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 704 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Operation.RequestPayloadMember.PropertyName)); #line default #line hidden - #line 704 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 704 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(";\r\n"); #line default #line hidden - #line 705 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 705 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 705 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 705 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("request.Headers[\"Content-Type\"] = \"application/octet-stream\";\r\n"); #line default #line hidden - #line 706 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 706 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } } @@ -4274,7 +4274,7 @@ protected void ProcessNonStructurePayload(Member payload, int level) #line default #line hidden - #line 710 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 710 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" protected void ProcessStructureAsMapValue(int level, string variableName, Shape shape) { @@ -4284,49 +4284,49 @@ protected void ProcessStructureAsMapValue(int level, string variableName, Shape #line default #line hidden - #line 715 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 715 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 715 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 715 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\tif ("); #line default #line hidden - #line 715 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 715 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 715 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 715 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(" != null) \r\n"); #line default #line hidden - #line 716 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 716 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 716 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 716 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t{\r\n"); #line default #line hidden - #line 717 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 717 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" ProcessMembers(level + 1, variableName, shape.Members, insideMap: true); @@ -4334,21 +4334,21 @@ protected void ProcessStructureAsMapValue(int level, string variableName, Shape #line default #line hidden - #line 720 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 720 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 720 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 720 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t}\r\n"); #line default #line hidden - #line 721 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 721 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } @@ -4356,7 +4356,7 @@ protected void ProcessStructureAsMapValue(int level, string variableName, Shape #line default #line hidden - #line 724 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 724 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" protected void ProcessNestedList(int level, string variableName, Member innerMember, Member owningMember) { @@ -4376,133 +4376,133 @@ protected void ProcessNestedList(int level, string variableName, Member innerMem #line default #line hidden - #line 739 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 739 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level) * 4))); #line default #line hidden - #line 739 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 739 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\tforeach (var "); #line default #line hidden - #line 739 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 739 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(innerListItemVariable)); #line default #line hidden - #line 739 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 739 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(" in "); #line default #line hidden - #line 739 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 739 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(listItemVariable)); #line default #line hidden - #line 739 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 739 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(")\r\n"); #line default #line hidden - #line 740 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 740 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level) * 4))); #line default #line hidden - #line 740 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 740 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t{\r\n"); #line default #line hidden - #line 741 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 741 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level) * 4))); #line default #line hidden - #line 741 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 741 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteStartElement(\""); #line default #line hidden - #line 741 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 741 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(listMarshallName)); #line default #line hidden - #line 741 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 741 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\");\r\n"); #line default #line hidden - #line 742 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 742 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level) * 4))); #line default #line hidden - #line 742 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 742 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteValue("); #line default #line hidden - #line 742 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 742 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(innerListItemVariable)); #line default #line hidden - #line 742 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 742 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(");\r\n"); #line default #line hidden - #line 743 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 743 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level) * 4))); #line default #line hidden - #line 743 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 743 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t\txmlWriter.WriteEndElement();\r\n"); #line default #line hidden - #line 744 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 744 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" if (innerShape != null && innerShape.Shape.IsList) { @@ -4513,21 +4513,21 @@ protected void ProcessNestedList(int level, string variableName, Member innerMem #line default #line hidden - #line 750 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 750 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', (level) * 4))); #line default #line hidden - #line 750 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 750 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\t}\r\n"); #line default #line hidden - #line 751 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 751 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } @@ -4535,7 +4535,7 @@ protected void ProcessNestedList(int level, string variableName, Member innerMem #line default #line hidden - #line 754 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 754 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" // xsi is a common prefix in attributes, but it cannot be included in the local name itself as the xmlWriter class will throw an exception. // Some services may model the xmlName, with the xsi prefix included like it is here https://github.com/smithy-lang/smithy/blob/7813acbfee4e90b589996ffcfa02fbe73785f654/smithy-aws-protocol-tests/model/restXmlWithNamespace/main.smithy#L147 @@ -4561,7 +4561,7 @@ protected void WriteXmlAttributeString(int level, Member member, string variable #line default #line hidden - #line 775 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 775 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" if(isPayload) { @@ -4570,119 +4570,119 @@ protected void WriteXmlAttributeString(int level, Member member, string variable #line default #line hidden - #line 779 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 779 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 779 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 779 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteAttributeString(\""); #line default #line hidden - #line 779 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 779 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(prefix)); #line default #line hidden - #line 779 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 779 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\",\""); #line default #line hidden - #line 779 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 779 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(localName)); #line default #line hidden - #line 779 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 779 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\",\""); #line default #line hidden - #line 779 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 779 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.XmlNamespace)); #line default #line hidden - #line 779 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 779 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\","); #line default #line hidden - #line 779 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 779 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PrimitiveMarshaller)); #line default #line hidden - #line 779 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 779 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("("); #line default #line hidden - #line 779 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 779 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 779 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 779 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("."); #line default #line hidden - #line 779 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 779 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(operation.RequestPayloadMember.PropertyName)); #line default #line hidden - #line 779 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 779 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("."); #line default #line hidden - #line 779 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 779 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 779 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 779 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("));\r\n"); #line default #line hidden - #line 780 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 780 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } else @@ -4692,105 +4692,105 @@ protected void WriteXmlAttributeString(int level, Member member, string variable #line default #line hidden - #line 785 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 785 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(new string(' ', level * 4))); #line default #line hidden - #line 785 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 785 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\t\t\t\t\txmlWriter.WriteAttributeString(\""); #line default #line hidden - #line 785 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 785 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(prefix)); #line default #line hidden - #line 785 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 785 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\",\""); #line default #line hidden - #line 785 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 785 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(localName)); #line default #line hidden - #line 785 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 785 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\", \""); #line default #line hidden - #line 785 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 785 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.XmlNamespace)); #line default #line hidden - #line 785 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 785 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("\","); #line default #line hidden - #line 785 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 785 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PrimitiveMarshaller)); #line default #line hidden - #line 785 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 785 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("("); #line default #line hidden - #line 785 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 785 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(variableName)); #line default #line hidden - #line 785 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 785 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("."); #line default #line hidden - #line 785 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 785 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden - #line 785 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 785 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" this.Write("));\r\n"); #line default #line hidden - #line 786 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" + #line 786 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlRequestMarshaller.tt" } } diff --git a/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlRequestMarshaller.tt b/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlRequestMarshaller.tt index 248d157b3c23..2e8f8261609b 100644 --- a/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlRequestMarshaller.tt +++ b/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlRequestMarshaller.tt @@ -430,7 +430,7 @@ WriteXmlAttributeString(level + 1, member, variableName, isPayload: true, operat // see https://smithy.io/2.0/spec/protocol-traits.html#xmlflattened-trait if(member.IsFlattened) listMarshallName = member.LocationName ?? member.ModeledName; - if(member.Shape.ListShape.IsDateTime) + if(member.Shape.ListShape.IsTimeStamp) { // Use shape's ListMarshallName as it's a list structure. #> diff --git a/generator/ServiceClientGeneratorLib/Generators/SourceFiles/StructureGenerator.cs b/generator/ServiceClientGeneratorLib/Generators/SourceFiles/StructureGenerator.cs index e4274b8ccab0..e2d4572a6af7 100644 --- a/generator/ServiceClientGeneratorLib/Generators/SourceFiles/StructureGenerator.cs +++ b/generator/ServiceClientGeneratorLib/Generators/SourceFiles/StructureGenerator.cs @@ -18,7 +18,7 @@ namespace ServiceClientGenerator.Generators.SourceFiles /// Class to produce the template output /// - #line 1 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 1 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")] public partial class StructureGenerator : BaseGenerator { @@ -30,7 +30,7 @@ public override string TransformText() { this.Write("\r\n"); - #line 7 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 7 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" AddLicenseHeader(); @@ -41,7 +41,7 @@ public override string TransformText() "\r\nusing System.Text;\r\nusing System.IO;\r\nusing System.Net;\r\n\r\nusing Amazon.Runtim" + "e;\r\nusing Amazon.Runtime.Internal;\r\n"); - #line 19 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 19 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" bool structureIsNotEventStream = this.Structure != null && !this.Structure.IsEventStream; bool structureIsEventStream = this.Structure != null && this.Structure.IsEventStream; @@ -54,7 +54,7 @@ public override string TransformText() #line hidden this.Write("using Amazon.Runtime.Internal.Auth;\r\n"); - #line 27 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 27 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } @@ -62,7 +62,7 @@ public override string TransformText() #line default #line hidden - #line 30 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 30 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" if(structureIsEvent || structureIsEventStream) { @@ -73,7 +73,7 @@ public override string TransformText() this.Write("using Amazon.Runtime.EventStreams;\r\nusing Amazon.Runtime.EventStreams.Internal;\r\n" + "using "); - #line 36 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 36 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.Namespace)); #line default @@ -81,7 +81,7 @@ public override string TransformText() this.Write(".Model.Internal.MarshallTransformations;\r\nusing Amazon.Runtime.EventStreams.Utils" + ";\r\n"); - #line 38 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 38 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } @@ -90,14 +90,14 @@ public override string TransformText() #line hidden this.Write("\r\n#pragma warning disable CS0612,CS0618,CS1570\r\nnamespace "); - #line 43 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 43 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.Namespace)); #line default #line hidden this.Write(".Model\r\n{\r\n"); - #line 45 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 45 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" if(this.StructureType == StructureType.Request) this.FormatOperationRequestDocumentation(this.Operation); @@ -111,14 +111,14 @@ public override string TransformText() #line hidden this.Write(" /// \r\n /// This is the response object from the "); - #line 54 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 54 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Operation.Name)); #line default #line hidden this.Write(" operation.\r\n /// \r\n"); - #line 56 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 56 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } else @@ -128,7 +128,7 @@ public override string TransformText() #line default #line hidden - #line 61 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 61 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" if(this.Structure != null && this.Structure.IsDeprecated) { @@ -138,14 +138,14 @@ public override string TransformText() #line hidden this.Write(" [Obsolete(\""); - #line 65 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 65 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.DeprecationMessage)); #line default #line hidden this.Write("\")]\r\n"); - #line 66 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 66 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } if(this.Structure is ExceptionShape) @@ -156,7 +156,7 @@ public override string TransformText() #line hidden this.Write(" #if !NETSTANDARD\r\n [Serializable]\r\n #endif\r\n"); - #line 74 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 74 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } @@ -164,7 +164,7 @@ public override string TransformText() #line default #line hidden - #line 77 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 77 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" if(this.Structure != null && this.Structure.IsEventStream) @@ -181,14 +181,14 @@ public override string TransformText() #line hidden this.Write(" "); - #line 88 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 88 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(EventStreamOutput)); #line default #line hidden this.Write("\r\n"); - #line 89 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 89 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } @@ -196,7 +196,7 @@ public override string TransformText() #line default #line hidden - #line 92 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 92 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" bool hasStreamingMember = this.Structure?.Members.Any(member => member.Shape.IsStreaming) ?? false; @@ -214,20 +214,20 @@ public override string TransformText() #line hidden this.Write(" public partial class "); - #line 104 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 104 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.ClassName)); #line default #line hidden - #line 104 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 104 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.BaseClassString)); #line default #line hidden this.Write(", IDisposable\r\n {\r\n"); - #line 106 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 106 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } else @@ -237,7 +237,7 @@ public override string TransformText() #line default #line hidden - #line 111 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 111 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" if( (this.Structure == null) || (structureIsNotEventStream)) { @@ -247,20 +247,20 @@ public override string TransformText() #line hidden this.Write(" public partial class "); - #line 115 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 115 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.ClassName)); #line default #line hidden - #line 115 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 115 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.BaseClassString)); #line default #line hidden this.Write("\r\n"); - #line 116 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 116 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" if(structureIsEvent) { @@ -270,7 +270,7 @@ public override string TransformText() #line hidden this.Write(" : IEventStreamEvent\r\n"); - #line 121 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 121 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } @@ -279,7 +279,7 @@ public override string TransformText() #line hidden this.Write(" {\r\n"); - #line 125 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 125 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } @@ -287,7 +287,7 @@ public override string TransformText() #line default #line hidden - #line 128 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 128 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } @@ -295,7 +295,7 @@ public override string TransformText() #line default #line hidden - #line 131 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 131 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" if(structureIsNotEventStream) { @@ -307,28 +307,28 @@ public override string TransformText() #line hidden this.Write(" private "); - #line 137 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 137 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default #line hidden this.Write(" _response;\r\n\r\n /// \r\n /// Gets and sets the "); - #line 140 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 140 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default #line hidden this.Write(" property.\r\n /// \r\n public "); - #line 142 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 142 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default #line hidden this.Write(" "); - #line 142 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 142 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default @@ -336,7 +336,7 @@ public override string TransformText() this.Write("\r\n {\r\n get { return this._response; }\r\n set { this._" + "response = value; }\r\n }\r\n"); - #line 147 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 147 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } else @@ -359,27 +359,27 @@ public override string TransformText() #line hidden this.Write(" private "); - #line 164 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 164 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.DetermineType())); #line default #line hidden this.Write(" "); - #line 164 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 164 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.VariableName)); #line default #line hidden - #line 164 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 164 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.IsCollection ? string.Format(" = AWSConfigs.InitializeCollections ? new {0}() : null;", member.DetermineType()) : ";")); #line default #line hidden this.Write("\r\n"); - #line 165 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 165 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } @@ -388,7 +388,7 @@ public override string TransformText() #line hidden this.Write("\r\n"); - #line 169 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 169 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" AddSimpleRequestConstructors(this.ClassName, this.Structure, this.Config.Namespace); @@ -403,14 +403,14 @@ public override string TransformText() #line hidden this.Write(" private RetryableDetails _retryableDetails = new RetryableDetails("); - #line 178 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 178 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(exceptionShape.Throttling.ToString().ToLower())); #line default #line hidden this.Write(");\r\n"); - #line 179 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 179 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" @@ -418,7 +418,7 @@ public override string TransformText() #line hidden this.Write("\r\n"); - #line 182 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 182 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } @@ -427,7 +427,7 @@ public override string TransformText() #line hidden this.Write(" /// \r\n /// Constructs a new "); - #line 2 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" + #line 2 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default @@ -436,7 +436,7 @@ public override string TransformText() "/// \r\n /// Describes the error encountered.\r\n " + " /// \r\n public "); - #line 8 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" + #line 8 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default @@ -444,7 +444,7 @@ public override string TransformText() this.Write("(string message) \r\n : base(message) {}\r\n\r\n /// \r\n " + " /// Construct instance of "); - #line 12 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" + #line 12 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default @@ -452,7 +452,7 @@ public override string TransformText() this.Write("\r\n /// \r\n /// \r\n ///" + " \r\n public "); - #line 16 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" + #line 16 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default @@ -460,7 +460,7 @@ public override string TransformText() this.Write("(string message, Exception innerException) \r\n : base(message, innerExc" + "eption) {}\r\n\r\n /// \r\n /// Construct instance of "); - #line 20 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" + #line 20 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default @@ -468,7 +468,7 @@ public override string TransformText() this.Write("\r\n /// \r\n /// \r\n " + " public "); - #line 23 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" + #line 23 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default @@ -476,7 +476,7 @@ public override string TransformText() this.Write("(Exception innerException) \r\n : base(innerException) {}\r\n\r\n ///" + " \r\n /// Construct instance of "); - #line 27 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" + #line 27 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default @@ -491,7 +491,7 @@ public override string TransformText() /// public "); - #line 35 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" + #line 35 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default @@ -502,7 +502,7 @@ public override string TransformText() /// /// Construct instance of "); - #line 39 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" + #line 39 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default @@ -516,7 +516,7 @@ public override string TransformText() /// public "); - #line 46 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" + #line 46 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default @@ -528,7 +528,7 @@ public override string TransformText() this.Write("#if !NETSTANDARD\r\n /// \r\n /// Constructs a new instance of" + " the "); - #line 3 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" + #line 3 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default @@ -541,7 +541,7 @@ public override string TransformText() /// The class name is null or is zero (0). protected "); - #line 9 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" + #line 9 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default @@ -549,7 +549,7 @@ public override string TransformText() this.Write("(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serializatio" + "n.StreamingContext context)\r\n : base(info, context)\r\n {\r\n"); - #line 12 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" + #line 12 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" foreach(var member in this.Structure.Members) { @@ -559,35 +559,35 @@ public override string TransformText() #line hidden this.Write(" this."); - #line 16 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" + #line 16 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden this.Write(" = ("); - #line 16 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" + #line 16 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" this.Write(this.ToStringHelper.ToStringWithCulture(member.DetermineType())); #line default #line hidden this.Write(")info.GetValue(\""); - #line 16 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" + #line 16 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden this.Write("\", typeof("); - #line 16 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" + #line 16 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" this.Write(this.ToStringHelper.ToStringWithCulture(member.DetermineType())); #line default #line hidden this.Write("));\r\n"); - #line 17 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" + #line 17 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" } @@ -611,7 +611,7 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf base.GetObjectData(info, context); "); - #line 35 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" + #line 35 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" foreach(var member in this.Structure.Members) { @@ -621,21 +621,21 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf #line hidden this.Write(" info.AddValue(\""); - #line 39 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" + #line 39 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden this.Write("\", this."); - #line 39 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" + #line 39 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden this.Write(");\r\n"); - #line 40 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" + #line 40 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" } @@ -645,7 +645,7 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf this.Write(" }\r\n#endif\r\n"); this.Write("\r\n"); - #line 187 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 187 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } foreach(var member in this.Structure.Members) @@ -665,13 +665,13 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf #line default #line hidden - #line 202 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 202 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.FormatPropertyDocumentation(member); #line default #line hidden - #line 203 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 203 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" if(member.IsDeprecated) { @@ -681,14 +681,14 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf #line hidden this.Write(" [Obsolete(\""); - #line 207 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 207 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.DeprecationMessage)); #line default #line hidden this.Write("\")]\r\n"); - #line 208 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 208 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } @@ -717,14 +717,14 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf #line hidden this.Write(" [AWSProperty("); - #line 231 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 231 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(string.Join(", ", propertyAttributes))); #line default #line hidden this.Write(")]\r\n"); - #line 232 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 232 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } @@ -736,55 +736,48 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf #line hidden this.Write(" "); - #line 238 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 238 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.AccessModifier)); #line default #line hidden this.Write(" "); - #line 238 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 238 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName.Equals("Equals") || (this.Structure is ExceptionShape && member.PropertyName.Equals("Retryable")) ? "new " : "")); #line default #line hidden - #line 238 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 238 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.DetermineType())); #line default #line hidden this.Write(" "); - #line 238 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 238 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden this.Write("\r\n {\r\n get { return this."); - #line 240 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 240 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.VariableName)); #line default #line hidden - this.Write("; }\r\n set { "); + this.Write("; }\r\n set { this."); - #line 241 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(member.IsBackwardsCompatibleDateTimeProperty ? "this." + member.BackwardCompatibilityVariableName + " = " : "")); - - #line default - #line hidden - this.Write("this."); - - #line 241 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 241 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.VariableName)); #line default #line hidden this.Write(" = value; }\r\n }\r\n\r\n"); - #line 244 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 244 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" if (member.EmitIsSetProperties) { @@ -795,7 +788,7 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf this.Write(" /// \r\n /// This property is set to true if the property <" + "seealso cref=\""); - #line 249 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 249 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default @@ -811,7 +804,7 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf /// "); - #line 258 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 258 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" if(member.IsDeprecated) { @@ -821,14 +814,14 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf #line hidden this.Write(" [Obsolete(\""); - #line 262 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 262 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.DeprecationMessage)); #line default #line hidden this.Write("\")]\r\n"); - #line 263 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 263 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } @@ -837,7 +830,7 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf #line hidden this.Write(" public bool Is"); - #line 266 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 266 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default @@ -845,7 +838,7 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf this.Write("Set\r\n {\r\n get\r\n {\r\n return Amazon.Uti" + "l.Internal.InternalSDKUtils.GetIsSet(this."); - #line 270 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 270 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.VariableName)); #line default @@ -853,41 +846,14 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf this.Write(");\r\n }\r\n set\r\n {\r\n Amazon.Util.In" + "ternal.InternalSDKUtils.SetIsSet(value, ref this."); - #line 274 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 274 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.VariableName)); #line default #line hidden - this.Write(");\r\n"); + this.Write(");\r\n }\r\n }\r\n\r\n"); - #line 275 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" - - if(member.IsBackwardsCompatibleDateTimeProperty) - { - - - #line default - #line hidden - this.Write(" \r\n Amazon.Util.Internal.InternalSDKUtils.SetIsSet(value, ref thi" + - "s."); - - #line 279 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(member.BackwardCompatibilityVariableName)); - - #line default - #line hidden - this.Write(");\r\n"); - - #line 280 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" - - } - - - #line default - #line hidden - this.Write(" }\r\n }\r\n\r\n"); - - #line 286 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 278 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } @@ -896,21 +862,21 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf #line hidden this.Write(" // Check to see if "); - #line 289 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 281 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden this.Write(" property is set\r\n internal bool IsSet"); - #line 290 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 282 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden this.Write("()\r\n {\r\n"); - #line 292 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 284 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" if (member.EmitIsSetProperties) { @@ -920,14 +886,14 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf #line hidden this.Write(" return this.Is"); - #line 296 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 288 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden this.Write("Set; \r\n"); - #line 297 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 289 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } else if (member.IsNullable) @@ -938,14 +904,14 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf #line hidden this.Write(" return this."); - #line 302 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 294 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.VariableName)); #line default #line hidden this.Write(".HasValue; \r\n"); - #line 303 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 295 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } else if (member.IsList && (member.MarshallLocation == MarshallLocation.Header || member.MarshallLocation == MarshallLocation.Headers)) @@ -958,21 +924,21 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf #line hidden this.Write(" return this."); - #line 310 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 302 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.VariableName)); #line default #line hidden this.Write(" != null && this."); - #line 310 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 302 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.VariableName)); #line default #line hidden this.Write(".Count > 0;\r\n"); - #line 311 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 303 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } else if (member.IsMap || member.IsList) @@ -983,21 +949,21 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf #line hidden this.Write(" return this."); - #line 316 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 308 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.VariableName)); #line default #line hidden this.Write(" != null && (this."); - #line 316 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 308 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.VariableName)); #line default #line hidden this.Write(".Count > 0 || !AWSConfigs.InitializeCollections); \r\n"); - #line 317 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 309 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } else if (member.IsDocument) @@ -1008,14 +974,14 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf #line hidden this.Write(" return !this."); - #line 322 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 314 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.VariableName)); #line default #line hidden this.Write(".IsNull();\r\n"); - #line 323 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 315 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } else @@ -1030,14 +996,14 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf #line hidden this.Write(" return !string.IsNullOrEmpty(this."); - #line 332 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 324 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.VariableName)); #line default #line hidden this.Write(");\r\n"); - #line 333 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 325 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } else @@ -1048,14 +1014,14 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf #line hidden this.Write(" return this."); - #line 338 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 330 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.VariableName)); #line default #line hidden this.Write(" != null;\r\n"); - #line 339 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 331 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } } @@ -1065,7 +1031,7 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf #line hidden this.Write(" }\r\n\r\n"); - #line 345 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 337 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } @@ -1079,7 +1045,7 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf " /// \r\n /// A signer for this request.\r\n " + " override protected AbstractAWSSigner CreateSigner()\r\n {\r\n"); - #line 357 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 349 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" switch (this.Operation.AuthType.Value) { @@ -1090,7 +1056,7 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf #line hidden this.Write(" return new NullSigner();\r\n"); - #line 363 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 355 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" break; case OperationAuthType.V4: @@ -1100,7 +1066,7 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf #line hidden this.Write(" return new AWS4Signer();\r\n"); - #line 368 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 360 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" break; case OperationAuthType.V4UnsignedBody: @@ -1110,7 +1076,7 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf #line hidden this.Write(" return new AWS4Signer(false);\r\n"); - #line 373 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 365 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" break; case OperationAuthType.Bearer: @@ -1120,7 +1086,7 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf #line hidden this.Write(" return new BearerTokenSigner();\r\n"); - #line 378 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 370 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" break; default: @@ -1132,7 +1098,7 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf #line hidden this.Write(" }\r\n"); - #line 385 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 377 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } // Flexible checksum overrides to allow response validation configuration on the request @@ -1153,7 +1119,7 @@ protected override CoreChecksumResponseBehavior CoreChecksumMode { if (IsSet"); - #line 399 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 391 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Operation.ChecksumConfiguration.RequestValidationModeMember)); #line default @@ -1161,7 +1127,7 @@ protected override CoreChecksumResponseBehavior CoreChecksumMode this.Write("())\r\n {\r\n return (CoreChecksumResponseBehavior)" + "Enum.Parse(typeof(CoreChecksumResponseBehavior), this."); - #line 401 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 393 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Operation.ChecksumConfiguration.RequestValidationModeMember)); #line default @@ -1171,7 +1137,7 @@ protected override CoreChecksumResponseBehavior CoreChecksumMode "ithm> _supportedChecksumAlgorithms = new List\r\n {\r" + "\n "); - #line 410 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 402 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(string.Join(", ", Operation.ChecksumConfiguration?.ResponseAlgorithms?.Select(s => $"CoreChecksumAlgorithm.{s}").ToArray()))); #line default @@ -1186,261 +1152,10 @@ protected override CoreChecksumResponseBehavior CoreChecksumMode #endregion "); - #line 418 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 410 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } - if (this.Structure.Members.Any(m => !m.IsExcluded && m.IsBackwardsCompatibleDateTimeProperty)) - { - - - #line default - #line hidden - this.Write("#region Backwards compatible properties\r\n"); - - #line 425 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" - - foreach(var member in this.Structure.Members) - { - if (member.IsExcluded || !member.IsBackwardsCompatibleDateTimeProperty) - continue; - - - #line default - #line hidden - this.Write(" private "); - - #line 431 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(member.DetermineType())); - - #line default - #line hidden - this.Write(" "); - - #line 431 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(member.BackwardCompatibilityVariableName)); - - #line default - #line hidden - - #line 431 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(member.IsCollection ? string.Format(" = AWSConfigs.InitializeCollections ? new {0}() : null;", member.DetermineType()) : ";")); - - #line default - #line hidden - this.Write("\r\n"); - - #line 432 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" - - } - - - #line default - #line hidden - this.Write("\r\n"); - - #line 436 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" - - foreach(var member in this.Structure.Members) - { - if (member.IsExcluded || !member.IsBackwardsCompatibleDateTimeProperty) - continue; - - - #line default - #line hidden - - #line 442 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" - this.FormatPropertyDocumentation(member, "This property is deprecated. Setting this property results in non-UTC DateTimes " + - "not being marshalled correctly. Use " + member.PropertyName + " instead. Setting either " + member.BackwardCompatibilityPropertyName + - " or " + member.PropertyName + " results in both " + member.BackwardCompatibilityPropertyName + " and " + - member.PropertyName + " being assigned, the latest assignment to either one of the two property is reflected in " + - "the value of both. " + member.BackwardCompatibilityPropertyName + " is provided for backwards compatibility only " + - "and assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service."); - - #line default - #line hidden - this.Write(" [Obsolete(\"Setting this property results in non-UTC DateTimes not being m" + - "arshalled correctly. \" +\r\n \"Use "); - - #line 449 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); - - #line default - #line hidden - this.Write(" instead. Setting either "); - - #line 449 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(member.BackwardCompatibilityPropertyName)); - - #line default - #line hidden - this.Write(" or "); - - #line 449 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); - - #line default - #line hidden - this.Write(" results in both "); - - #line 449 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(member.BackwardCompatibilityPropertyName)); - - #line default - #line hidden - this.Write(" and \" +\r\n \""); - - #line 450 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); - - #line default - #line hidden - this.Write(" being assigned, the latest assignment to either one of the two property is \" + \r" + - "\n \"reflected in the value of both. "); - - #line 451 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(member.BackwardCompatibilityPropertyName)); - - #line default - #line hidden - this.Write(" is provided for backwards compatibility only and \" +\r\n \"assigning a n" + - "on-Utc DateTime to it results in the wrong timestamp being passed to the service" + - ".\", false)]\r\n "); - - #line 453 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(member.AccessModifier)); - - #line default - #line hidden - this.Write(" "); - - #line 453 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(member.DetermineType())); - - #line default - #line hidden - - #line 453 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(member.UseNullable ? "?" : "")); - - #line default - #line hidden - this.Write(" "); - - #line 453 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(member.BackwardCompatibilityPropertyName)); - - #line default - #line hidden - this.Write("\r\n {\r\n get { return this."); - - #line 455 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(member.BackwardCompatibilityVariableName)); - - #line default - #line hidden - this.Write(".GetValueOrDefault(); }\r\n set\r\n {\r\n this."); - - #line 458 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(member.BackwardCompatibilityVariableName)); - - #line default - #line hidden - this.Write(" = value;\r\n if (value != null)\r\n {\r\n " + - " this."); - - #line 461 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(member.VariableName)); - - #line default - #line hidden - this.Write(" = new DateTime(value.Value.Ticks, DateTimeKind.Utc);\r\n }\r\n " + - " else\r\n {\r\n this."); - - #line 465 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(member.VariableName)); - - #line default - #line hidden - this.Write(" = null;\r\n }\r\n }\r\n }\r\n"); - - #line 469 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" - - if (member.EmitIsSetProperties) - { - - - #line default - #line hidden - this.Write(" /// \r\n /// This property is set to true if the property <" + - "seealso cref=\""); - - #line 474 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(member.BackwardCompatibilityPropertyName)); - - #line default - #line hidden - this.Write(@"""/> - /// is set; false otherwise. - /// This property can be used to determine if the related property - /// was returned by a service response or if the related property - /// should be sent to the service during a service call. - /// - /// - /// True if the related property was set or will be sent to a service; false otherwise. - /// - [Obsolete(""Setting "); - - #line 483 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(member.BackwardCompatibilityPropertyName)); - - #line default - #line hidden - this.Write(" results in non-UTC DateTimes not being marshalled correctly. Use "); - - #line 483 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); - - #line default - #line hidden - this.Write(" instead.\", false)]\r\n public bool Is"); - - #line 484 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(member.BackwardCompatibilityPropertyName)); - - #line default - #line hidden - this.Write("Set\r\n {\r\n get\r\n {\r\n return this.Is"); - - #line 488 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); - - #line default - #line hidden - this.Write("Set;\r\n }\r\n set\r\n {\r\n this.Is"); - - #line 492 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" - this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); - - #line default - #line hidden - this.Write("Set = value;;\r\n }\r\n }\r\n"); - - #line 495 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" - - } - } - - - - #line default - #line hidden - this.Write("#endregion\r\n"); - - #line 501 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" - - } if (this.Structure is ExceptionShape) { var exceptionShape = (ExceptionShape)this.Structure; @@ -1463,7 +1178,7 @@ public override RetryableDetails Retryable } "); - #line 520 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 430 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } } @@ -1478,7 +1193,7 @@ public override RetryableDetails Retryable #line hidden this.Write("\r\n"); - #line 530 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 440 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } if (this.StructureType == StructureType.Response && hasStreamingMember) @@ -1512,7 +1227,7 @@ protected virtual void Dispose(bool disposing) { "); - #line 558 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 468 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" if (this.Structure != null) { @@ -1526,21 +1241,21 @@ protected virtual void Dispose(bool disposing) #line hidden this.Write(" this."); - #line 566 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 476 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.VariableName)); #line default #line hidden this.Write("?.Dispose();\r\n this."); - #line 567 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 477 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.VariableName)); #line default #line hidden this.Write(" = null;\r\n"); - #line 568 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 478 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } } @@ -1552,7 +1267,7 @@ protected virtual void Dispose(bool disposing) this.Write(" }\r\n\r\n this._disposed = true;\r\n }\r\n\r\n #endr" + "egion\r\n"); - #line 579 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 489 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } @@ -1563,7 +1278,7 @@ protected virtual void Dispose(bool disposing) return this.GenerationEnvironment.ToString(); } - #line 585 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 495 "C:\Dev\worktrees\fixdatetimes\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" // Set to true when the service model specifies a shape that should be wrapped in a response. ElastiCache CreateCacheCluster is an example of this. public bool IsWrapped { get; set; } diff --git a/generator/ServiceClientGeneratorLib/Generators/SourceFiles/StructureGenerator.tt b/generator/ServiceClientGeneratorLib/Generators/SourceFiles/StructureGenerator.tt index b8c5175b92d0..1798cf27ebfd 100644 --- a/generator/ServiceClientGeneratorLib/Generators/SourceFiles/StructureGenerator.tt +++ b/generator/ServiceClientGeneratorLib/Generators/SourceFiles/StructureGenerator.tt @@ -238,7 +238,7 @@ namespace <#=this.Config.Namespace#>.Model <#=member.AccessModifier#> <#=member.PropertyName.Equals("Equals") || (this.Structure is ExceptionShape && member.PropertyName.Equals("Retryable")) ? "new " : ""#><#=member.DetermineType()#> <#=member.PropertyName#> { get { return this.<#=member.VariableName#>; } - set { <#=member.IsBackwardsCompatibleDateTimeProperty ? "this." + member.BackwardCompatibilityVariableName + " = " : ""#>this.<#=member.VariableName#> = value; } + set { this.<#=member.VariableName#> = value; } } <# @@ -272,14 +272,6 @@ namespace <#=this.Config.Namespace#>.Model set { Amazon.Util.Internal.InternalSDKUtils.SetIsSet(value, ref this.<#=member.VariableName#>); -<# - if(member.IsBackwardsCompatibleDateTimeProperty) - { -#> - Amazon.Util.Internal.InternalSDKUtils.SetIsSet(value, ref this.<#=member.BackwardCompatibilityVariableName#>); -<# - } -#> } } @@ -418,88 +410,6 @@ namespace <#=this.Config.Namespace#>.Model <# } - if (this.Structure.Members.Any(m => !m.IsExcluded && m.IsBackwardsCompatibleDateTimeProperty)) - { -#> -#region Backwards compatible properties -<# - foreach(var member in this.Structure.Members) - { - if (member.IsExcluded || !member.IsBackwardsCompatibleDateTimeProperty) - continue; -#> - private <#=member.DetermineType()#> <#=member.BackwardCompatibilityVariableName#><#= member.IsCollection ? string.Format(" = AWSConfigs.InitializeCollections ? new {0}() : null;", member.DetermineType()) : ";"#> -<# - } -#> - -<# - foreach(var member in this.Structure.Members) - { - if (member.IsExcluded || !member.IsBackwardsCompatibleDateTimeProperty) - continue; -#> -<# this.FormatPropertyDocumentation(member, "This property is deprecated. Setting this property results in non-UTC DateTimes " + - "not being marshalled correctly. Use " + member.PropertyName + " instead. Setting either " + member.BackwardCompatibilityPropertyName + - " or " + member.PropertyName + " results in both " + member.BackwardCompatibilityPropertyName + " and " + - member.PropertyName + " being assigned, the latest assignment to either one of the two property is reflected in " + - "the value of both. " + member.BackwardCompatibilityPropertyName + " is provided for backwards compatibility only " + - "and assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.");#> - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use <#=member.PropertyName#> instead. Setting either <#=member.BackwardCompatibilityPropertyName#> or <#=member.PropertyName#> results in both <#=member.BackwardCompatibilityPropertyName#> and " + - "<#=member.PropertyName#> being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. <#=member.BackwardCompatibilityPropertyName#> is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - <#=member.AccessModifier#> <#=member.DetermineType()#><#=member.UseNullable ? "?" : ""#> <#=member.BackwardCompatibilityPropertyName#> - { - get { return this.<#=member.BackwardCompatibilityVariableName#>.GetValueOrDefault(); } - set - { - this.<#=member.BackwardCompatibilityVariableName#> = value; - if (value != null) - { - this.<#=member.VariableName#> = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this.<#=member.VariableName#> = null; - } - } - } -<# - if (member.EmitIsSetProperties) - { -#> - /// - /// This property is set to true if the property - /// is set; false otherwise. - /// This property can be used to determine if the related property - /// was returned by a service response or if the related property - /// should be sent to the service during a service call. - /// - /// - /// True if the related property was set or will be sent to a service; false otherwise. - /// - [Obsolete("Setting <#=member.BackwardCompatibilityPropertyName#> results in non-UTC DateTimes not being marshalled correctly. Use <#=member.PropertyName#> instead.", false)] - public bool Is<#=member.BackwardCompatibilityPropertyName#>Set - { - get - { - return this.Is<#=member.PropertyName#>Set; - } - set - { - this.Is<#=member.PropertyName#>Set = value;; - } - } -<# - } - } - -#> -#endregion -<# - } if (this.Structure is ExceptionShape) { var exceptionShape = (ExceptionShape)this.Structure; diff --git a/generator/ServiceClientGeneratorLib/Member.cs b/generator/ServiceClientGeneratorLib/Member.cs index 61e10b02ca97..8098ef115b11 100644 --- a/generator/ServiceClientGeneratorLib/Member.cs +++ b/generator/ServiceClientGeneratorLib/Member.cs @@ -28,8 +28,6 @@ public class Member : BaseModel public const string XmlAttributeKey = "xmlAttribute"; private const string UnhandledTypeDecimalErrorMessage = "Unhandled type 'decimal' : using .net's decimal type for modeled decimal type may result in loss of data. decimal type members should explicitly opt-in via shape customization."; - private const string BackwardsCompatibleDateTimePropertySuffix = "Utc"; - private readonly string _name; private string _newType; readonly string _defaultMarshallName; @@ -109,25 +107,10 @@ public string VariableName { get { - if (IsBackwardsCompatibleDateTimeProperty) - return BaseVariableName + BackwardsCompatibleDateTimePropertySuffix; return BaseVariableName; } } - /// - /// The name of the property's backing to be used in backwards compatibility property names - /// - public string BackwardCompatibilityVariableName - { - get - { - if (IsBackwardsCompatibleDateTimeProperty) - return BaseVariableName; - throw new Exception("Property " + BasePropertyName + " is not marked as requiring backward compatibility"); - } - } - /// /// The name of the member with the first character lower and begins with an underscore: _nameHere. /// This doesn't include the backward compatibility suffix. @@ -207,31 +190,15 @@ public bool EmitIsSetProperties /// /// The name of the member as the first character upper: NameHere /// Uses the custom name instead if it exists. - /// It includes the backward compatibility suffix if required. /// public string PropertyName { get { - if (IsBackwardsCompatibleDateTimeProperty) - return BasePropertyName + BackwardsCompatibleDateTimePropertySuffix; return BasePropertyName; } } - /// - /// The name of the member to be used in backwards compatibility property names - /// - public string BackwardCompatibilityPropertyName - { - get - { - if (IsBackwardsCompatibleDateTimeProperty) - return BasePropertyName; - throw new Exception("Property " + BasePropertyName + " is not marked as requiring backward compatibility"); - } - } - /// /// The name of the member as the first character upper: NameHere /// Uses the custom name instead if it exists. @@ -985,10 +952,6 @@ public bool IsEventHeader return false; } } - public bool IsBackwardsCompatibleDateTimeProperty - { - get { return this.model.Customizations.IsBackwardsCompatibleDateTimeProperty(this.BasePropertyName, this.OwningShape.Name); } - } /// /// Determines if the member is a type that needs to be instantiated, such as a list or map @@ -1059,7 +1022,7 @@ public TimestampFormat TimestampFormat { get { - if (!this.IsDateTime) + if (!this.IsTimeStamp) { throw new InvalidOperationException(string.Format( CultureInfo.InvariantCulture, @@ -1081,7 +1044,7 @@ public TimestampFormat TimestampFormat /// /// Returns if the member's type is timestamp. /// - public bool IsDateTime + public bool IsTimeStamp { get { @@ -1097,7 +1060,7 @@ public string PrimitiveMarshaller { get { - if (this.IsDateTime) + if (this.IsTimeStamp) { string formatAppend = string.Empty; if (this.TimestampFormat == TimestampFormat.ISO8601) diff --git a/generator/ServiceClientGeneratorLib/Shape.cs b/generator/ServiceClientGeneratorLib/Shape.cs index 22d8aaa55628..d3d027f24d7a 100644 --- a/generator/ServiceClientGeneratorLib/Shape.cs +++ b/generator/ServiceClientGeneratorLib/Shape.cs @@ -438,7 +438,7 @@ public bool IsString /// /// Determines if the shape's type is a timestamp /// - public bool IsDateTime + public bool IsTimeStamp { get { return this.Type == "timestamp"; } } @@ -818,7 +818,7 @@ public string RelatedOperationName /// public string PrimitiveMarshaller(MarshallLocation marshallLocation) { - if (this.IsDateTime) + if (this.IsTimeStamp) { var timestampFormat = GetTimestampFormat(marshallLocation); string formatAppend = string.Empty; diff --git a/generator/ServiceModels/autoscaling/autoscaling.customizations.json b/generator/ServiceModels/autoscaling/autoscaling.customizations.json index a7305899a719..ea86f690bd6f 100644 --- a/generator/ServiceModels/autoscaling/autoscaling.customizations.json +++ b/generator/ServiceModels/autoscaling/autoscaling.customizations.json @@ -23,27 +23,8 @@ } ] }, - "DescribeScheduledActionsType": { - "backwardsCompatibleDateTimeProperties": [ - "EndTime", - "StartTime" - ] - }, "MinAdjustmentStep": { "deprecatedMessage": "Available for backward compatibility. Use MinAdjustmentMagnitude instead." - }, - "PutScheduledUpdateGroupActionType": { - "backwardsCompatibleDateTimeProperties": [ - "EndTime", - "StartTime", - "Time" - ] - }, - "ScheduledUpdateGroupActionRequest": { - "backwardsCompatibleDateTimeProperties": [ - "EndTime", - "StartTime" - ] } } } diff --git a/generator/ServiceModels/ec2/ec2.customizations.json b/generator/ServiceModels/ec2/ec2.customizations.json index 3b9538eedc03..3a30ce91513c 100644 --- a/generator/ServiceModels/ec2/ec2.customizations.json +++ b/generator/ServiceModels/ec2/ec2.customizations.json @@ -111,17 +111,17 @@ "SpotFleetRequestConfigData": { "ValidFrom": { "Type": "DateTime?", - "Marshaller": "Amazon.EC2.Internal.CustomMarshallTransformations.ConvertDateTimeISOWithoutMillisecondsUtc" + "Marshaller": "Amazon.Runtime.Internal.Util.StringUtils.FromDateTimeToISO8601NoMs" }, "ValidUntil": { "Type": "DateTime?", - "Marshaller": "Amazon.EC2.Internal.CustomMarshallTransformations.ConvertDateTimeISOWithoutMillisecondsUtc" + "Marshaller": "Amazon.Runtime.Internal.Util.StringUtils.FromDateTimeToISO8601NoMs" } }, "DescribeSpotFleetRequestHistoryRequest": { "StartTime": { "Type": "DateTime?", - "Marshaller": "Amazon.EC2.Internal.CustomMarshallTransformations.ConvertDateTimeISOWithoutMillisecondsUtc" + "Marshaller": "Amazon.Runtime.Internal.Util.StringUtils.FromDateTimeToISO8601NoMs" } } }, @@ -165,12 +165,6 @@ } ] }, - "ClientData": { - "backwardsCompatibleDateTimeProperties": [ - "UploadEnd", - "UploadStart" - ] - }, "CopySnapshotRequest": { "modify": [ { @@ -178,31 +172,9 @@ } ] }, - "CreateFleetRequest": { - "backwardsCompatibleDateTimeProperties": [ - "ValidFrom", - "ValidUntil" - ] - }, "DeleteVpcPeeringConnectionResponse": { "exclude": [ "Return" ] }, - "DescribeFleetHistoryRequest": { - "backwardsCompatibleDateTimeProperties": [ - "StartTime" - ] - }, - "DescribeSpotFleetRequestHistoryRequest": { - "backwardsCompatibleDateTimeProperties": [ - "StartTime" - ] - }, - "DescribeSpotPriceHistoryRequest": { - "backwardsCompatibleDateTimeProperties": [ - "EndTime", - "StartTime" - ] - }, "DetachVolumeResponse": { "modify": [ { @@ -264,11 +236,6 @@ } ] }, - "LaunchTemplateSpotMarketOptionsRequest": { - "backwardsCompatibleDateTimeProperties": [ - "ValidUntil" - ] - }, "ModifyVpcEndpointResult": { "exclude": [ "Return" ] }, @@ -279,12 +246,6 @@ } ] }, - "RequestSpotInstancesRequest": { - "backwardsCompatibleDateTimeProperties": [ - "ValidFrom", - "ValidUntil" - ] - }, "RequestSpotLaunchSpecification": { "modify": [ { @@ -328,12 +289,6 @@ } ] }, - "ReportInstanceStatusRequest": { - "backwardsCompatibleDateTimeProperties": [ - "EndTime", - "StartTime" - ] - }, "RevokeSecurityGroupEgressRequest": { "exclude": [ "SourceSecurityGroupName", @@ -344,12 +299,6 @@ "CidrIp" ] }, - "SpotFleetRequestConfigData": { - "backwardsCompatibleDateTimeProperties": [ - "ValidFrom", - "ValidUntil" - ] - }, "SpotPrice": { "modify": [ { @@ -367,29 +316,12 @@ "CidrIp" ] }, - "SlotDateTimeRangeRequest": { - "backwardsCompatibleDateTimeProperties": [ - "EarliestTime", - "LatestTime" - ] - }, - "SlotStartTimeRangeRequest": { - "backwardsCompatibleDateTimeProperties": [ - "EarliestTime", - "LatestTime" - ] - }, "SpotFleetRequestConfig": { "modify": [ { "SpotFleetRequestConfig": { "emitPropertyName": "ConfigData" } } ] - }, - "SpotMarketOptions": { - "backwardsCompatibleDateTimeProperties": [ - "ValidUntil" - ] } }, "operationModifiers": { diff --git a/generator/ServiceModels/elasticache/elasticache.customizations.json b/generator/ServiceModels/elasticache/elasticache.customizations.json index cf602d6a041c..08e248827350 100644 --- a/generator/ServiceModels/elasticache/elasticache.customizations.json +++ b/generator/ServiceModels/elasticache/elasticache.customizations.json @@ -12,12 +12,6 @@ "DescribeSnapshots" ], "shapeModifiers": { - "DescribeEventsMessage": { - "backwardsCompatibleDateTimeProperties": [ - "StartTime", - "EndTime" - ] - }, "ModifyReplicationGroupMessage": { "modify": [ { diff --git a/generator/ServiceModels/elasticbeanstalk/elasticbeanstalk.customizations.json b/generator/ServiceModels/elasticbeanstalk/elasticbeanstalk.customizations.json index a3135c383b32..088c9d96a435 100644 --- a/generator/ServiceModels/elasticbeanstalk/elasticbeanstalk.customizations.json +++ b/generator/ServiceModels/elasticbeanstalk/elasticbeanstalk.customizations.json @@ -7,18 +7,5 @@ "DescribeEnvironments", "DescribeEvents", "ListAvailableSolutionStacks" - ], - "shapeModifiers": { - "DescribeEnvironmentsMessage": { - "backwardsCompatibleDateTimeProperties": [ - "IncludedDeletedBackTo" - ] - }, - "DescribeEventsMessage": { - "backwardsCompatibleDateTimeProperties": [ - "StartTime", - "EndTime" - ] - } - } + ] } diff --git a/generator/ServiceModels/email/email.customizations.json b/generator/ServiceModels/email/email.customizations.json index 2e9e0f9813bf..fc6fe8ed032a 100644 --- a/generator/ServiceModels/email/email.customizations.json +++ b/generator/ServiceModels/email/email.customizations.json @@ -4,17 +4,5 @@ "GetSendStatistics", "ListIdentities", "ListVerifiedEmailAddresses" - ], - "shapeModifiers": { - "MessageDsn": { - "backwardsCompatibleDateTimeProperties": [ - "ArrivalDate" - ] - }, - "RecipientDsnFields": { - "backwardsCompatibleDateTimeProperties": [ - "LastAttemptDate" - ] - } - } + ] } diff --git a/generator/ServiceModels/glacier/glacier.customizations.json b/generator/ServiceModels/glacier/glacier.customizations.json index 02e360193397..01a4d2a6e65b 100644 --- a/generator/ServiceModels/glacier/glacier.customizations.json +++ b/generator/ServiceModels/glacier/glacier.customizations.json @@ -23,24 +23,24 @@ "DescribeVaultOutput" : { "CreationDate": { "Type": "DateTime?", - "Marshaller": "Amazon.Runtime.Internal.Util.StringUtils.FromDateTimeToISO8601", + "Marshaller": "Amazon.Runtime.Internal.Util.StringUtils.FromDateTimeToISO8601WithOptionalMs", "Unmarshaller": "Amazon.Runtime.Internal.Transform.NullableDateTimeUnmarshaller" }, "LastInventoryDate": { "Type": "DateTime?", - "Marshaller": "Amazon.Runtime.Internal.Util.StringUtils.FromDateTimeToISO8601", + "Marshaller": "Amazon.Runtime.Internal.Util.StringUtils.FromDateTimeToISO8601WithOptionalMs", "Unmarshaller": "Amazon.Runtime.Internal.Transform.DateTimeUnmarshaller" } }, "GlacierJobDescription" : { "CreationDate": { "Type": "DateTime?", - "Marshaller": "Amazon.Runtime.Internal.Util.StringUtils.FromDateTimeToISO8601", + "Marshaller": "Amazon.Runtime.Internal.Util.StringUtils.FromDateTimeToISO8601WithOptionalMs", "Unmarshaller": "Amazon.Runtime.Internal.Transform.NullableDateTimeUnmarshaller" }, "CompletionDate": { "Type": "DateTime?", - "Marshaller": "Amazon.Runtime.Internal.Util.StringUtils.FromDateTimeToISO8601", + "Marshaller": "Amazon.Runtime.Internal.Util.StringUtils.FromDateTimeToISO8601WithOptionalMs", "Unmarshaller": "Amazon.Runtime.Internal.Transform.NullableDateTimeUnmarshaller" } }, @@ -80,12 +80,12 @@ "ListPartsOutput" : { "CreationDate": { "Type": "DateTime?", - "Marshaller": "Amazon.Runtime.Internal.Util.StringUtils.FromDateTimeToISO8601", + "Marshaller": "Amazon.Runtime.Internal.Util.StringUtils.FromDateTimeToISO8601WithOptionalMs", "Unmarshaller": "Amazon.Runtime.Internal.Transform.NullableDateTimeUnmarshaller" }, "CompletionDate": { "Type": "DateTime?", - "Marshaller": "Amazon.Runtime.Internal.Util.StringUtils.FromDateTimeToISO8601", + "Marshaller": "Amazon.Runtime.Internal.Util.StringUtils.FromDateTimeToISO8601WithOptionalMs", "Unmarshaller": "Amazon.Runtime.Internal.Transform.NullableDateTimeUnmarshaller" } }, @@ -99,7 +99,7 @@ "UploadListElement" : { "CreationDate": { "Type": "DateTime?", - "Marshaller": "Amazon.Runtime.Internal.Util.StringUtils.FromDateTimeToISO8601", + "Marshaller": "Amazon.Runtime.Internal.Util.StringUtils.FromDateTimeToISO8601WithOptionalMs", "Unmarshaller": "Amazon.Runtime.Internal.Transform.NullableDateTimeUnmarshaller" } } diff --git a/generator/ServiceModels/iot/iot-2015-05-28.customizations.json b/generator/ServiceModels/iot/iot-2015-05-28.customizations.json index e76e2666b305..52b84b9213e9 100644 --- a/generator/ServiceModels/iot/iot-2015-05-28.customizations.json +++ b/generator/ServiceModels/iot/iot-2015-05-28.customizations.json @@ -1,11 +1,5 @@ { "shapeModifiers": { - "ListAuditTasksRequest": { - "backwardsCompatibleDateTimeProperties": [ - "EndTime", - "StartTime" - ] - }, "ListPrincipalThingsRequest": { "modify": [ { @@ -48,12 +42,6 @@ } ] }, - "ListViolationEventsRequest": { - "backwardsCompatibleDateTimeProperties": [ - "EndTime", - "StartTime" - ] - }, "RegisterCertificateRequest": { "modify": [ { diff --git a/generator/ServiceModels/iot1click-devices/iot1click-devices.customizations.json b/generator/ServiceModels/iot1click-devices/iot1click-devices.customizations.json deleted file mode 100644 index e523c0b3fdbd..000000000000 --- a/generator/ServiceModels/iot1click-devices/iot1click-devices.customizations.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "shapeModifiers": { - "ListDeviceEventsRequest": { - "backwardsCompatibleDateTimeProperties": [ - "FromTimeStamp", - "ToTimeStamp" - ] - } - } -} diff --git a/generator/ServiceModels/iotanalytics/iotanalytics.customizations.json b/generator/ServiceModels/iotanalytics/iotanalytics.customizations.json deleted file mode 100644 index ccd34e0633d6..000000000000 --- a/generator/ServiceModels/iotanalytics/iotanalytics.customizations.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "shapeModifiers": { - "SampleChannelDataRequest": { - "backwardsCompatibleDateTimeProperties": [ - "StartTime", - "EndTime" - ] - } - } -} diff --git a/generator/ServiceModels/logs/logs.customizations.json b/generator/ServiceModels/logs/logs.customizations.json index 14ef5cada7b9..cd5f89c46c79 100644 --- a/generator/ServiceModels/logs/logs.customizations.json +++ b/generator/ServiceModels/logs/logs.customizations.json @@ -11,67 +11,67 @@ "InputLogEvent" : { "timestamp" : { "Type" : "DateTime?", - "Marshaller" : "Amazon.Runtime.Internal.Transform.CustomMarshallTransformations.ConvertDateTimeToEpochMilliseconds", + "Marshaller" : "Amazon.Util.AWSSDKUtils.ConvertToUnixEpochMilliseconds", "Unmarshaller" : "NullableDateTimeEpochLongMillisecondsUnmarshaller" } }, "OutputLogEvent" : { "timestamp" : { "Type" : "DateTime?", - "Marshaller" : "Amazon.Runtime.Internal.Transform.CustomMarshallTransformations.ConvertDateTimeToEpochMilliseconds", + "Marshaller" : "Amazon.Util.AWSSDKUtils.ConvertToUnixEpochMilliseconds", "Unmarshaller" : "NullableDateTimeEpochLongMillisecondsUnmarshaller" }, "ingestionTime" : { "Type" : "DateTime?", - "Marshaller" : "Amazon.Runtime.Internal.Transform.CustomMarshallTransformations.ConvertDateTimeToEpochMilliseconds", + "Marshaller" : "Amazon.Util.AWSSDKUtils.ConvertToUnixEpochMilliseconds", "Unmarshaller" : "NullableDateTimeEpochLongMillisecondsUnmarshaller" } }, "GetLogEventsRequest" : { "startTime" : { "Type" : "DateTime?", - "Marshaller" : "Amazon.Runtime.Internal.Transform.CustomMarshallTransformations.ConvertDateTimeToEpochMilliseconds", + "Marshaller" : "Amazon.Util.AWSSDKUtils.ConvertToUnixEpochMilliseconds", "Unmarshaller" : "NullableDateTimeEpochLongMillisecondsUnmarshaller" }, "endTime" : { "Type" : "DateTime?", - "Marshaller" : "Amazon.Runtime.Internal.Transform.CustomMarshallTransformations.ConvertDateTimeToEpochMilliseconds", + "Marshaller" : "Amazon.Util.AWSSDKUtils.ConvertToUnixEpochMilliseconds", "Unmarshaller" : "NullableDateTimeEpochLongMillisecondsUnmarshaller" } }, "LogGroup" : { "creationTime" : { "Type" : "DateTime?", - "Marshaller" : "Amazon.Runtime.Internal.Transform.CustomMarshallTransformations.ConvertDateTimeToEpochMilliseconds", + "Marshaller" : "Amazon.Util.AWSSDKUtils.ConvertToUnixEpochMilliseconds", "Unmarshaller" : "NullableDateTimeEpochLongMillisecondsUnmarshaller" } }, "LogStream" : { "creationTime" : { "Type" : "DateTime?", - "Marshaller" : "Amazon.Runtime.Internal.Transform.CustomMarshallTransformations.ConvertDateTimeToEpochMilliseconds", + "Marshaller" : "Amazon.Util.AWSSDKUtils.ConvertToUnixEpochMilliseconds", "Unmarshaller" : "NullableDateTimeEpochLongMillisecondsUnmarshaller" }, "firstEventTimestamp" : { "Type" : "DateTime?", - "Marshaller" : "Amazon.Runtime.Internal.Transform.CustomMarshallTransformations.ConvertDateTimeToEpochMilliseconds", + "Marshaller" : "Amazon.Util.AWSSDKUtils.ConvertToUnixEpochMilliseconds", "Unmarshaller" : "NullableDateTimeEpochLongMillisecondsUnmarshaller" }, "lastEventTimestamp" : { "Type" : "DateTime?", - "Marshaller" : "Amazon.Runtime.Internal.Transform.CustomMarshallTransformations.ConvertDateTimeToEpochMilliseconds", + "Marshaller" : "Amazon.Util.AWSSDKUtils.ConvertToUnixEpochMilliseconds", "Unmarshaller" : "NullableDateTimeEpochLongMillisecondsUnmarshaller" }, "lastIngestionTime" : { "Type" : "DateTime?", - "Marshaller" : "Amazon.Runtime.Internal.Transform.CustomMarshallTransformations.ConvertDateTimeToEpochMilliseconds", + "Marshaller" : "Amazon.Util.AWSSDKUtils.ConvertToUnixEpochMilliseconds", "Unmarshaller" : "NullableDateTimeEpochLongMillisecondsUnmarshaller" } }, "MetricFilter" : { "creationTime" : { "Type" : "DateTime?", - "Marshaller" : "Amazon.Runtime.Internal.Transform.CustomMarshallTransformations.ConvertDateTimeToEpochMilliseconds", + "Marshaller" : "Amazon.Util.AWSSDKUtils.ConvertToUnixEpochMilliseconds", "Unmarshaller" : "NullableDateTimeEpochLongMillisecondsUnmarshaller" }, } diff --git a/generator/ServiceModels/mobileanalytics/mobileanalytics.customizations.json b/generator/ServiceModels/mobileanalytics/mobileanalytics.customizations.json index 01d2c99f8ada..14a1854d66f6 100644 --- a/generator/ServiceModels/mobileanalytics/mobileanalytics.customizations.json +++ b/generator/ServiceModels/mobileanalytics/mobileanalytics.customizations.json @@ -3,19 +3,19 @@ "Session": { "startTimestamp": { "Type": "DateTime?", - "Marshaller": "Amazon.Runtime.Internal.Util.StringUtils.FromDateTimeToISO8601", + "Marshaller": "Amazon.Runtime.Internal.Util.StringUtils.FromDateTimeToISO8601WithOptionalMs", "Unmarshaller": "Amazon.Runtime.Internal.Transform.NullableDateTimeUnmarshaller" }, "stopTimestamp": { "Type": "DateTime?", - "Marshaller": "Amazon.Runtime.Internal.Util.StringUtils.FromDateTimeToISO8601", + "Marshaller": "Amazon.Runtime.Internal.Util.StringUtils.FromDateTimeToISO8601WithOptionalMs", "Unmarshaller": "Amazon.Runtime.Internal.Transform.NullableDateTimeUnmarshaller" } }, "Event": { "timestamp": { "Type": "DateTime?", - "Marshaller": "Amazon.Runtime.Internal.Util.StringUtils.FromDateTimeToISO8601", + "Marshaller": "Amazon.Runtime.Internal.Util.StringUtils.FromDateTimeToISO8601WithOptionalMs", "Unmarshaller": "Amazon.Runtime.Internal.Transform.NullableDateTimeUnmarshaller" } } @@ -23,18 +23,5 @@ "generateUnmarshaller": [ "Event", "Session" - ], - "shapeModifiers": { - "Event": { - "backwardsCompatibleDateTimeProperties": [ - "Timestamp" - ] - }, - "Session": { - "backwardsCompatibleDateTimeProperties": [ - "StartTimestamp", - "StopTimestamp" - ] - } - } + ] } \ No newline at end of file diff --git a/generator/ServiceModels/monitoring/monitoring.customizations.json b/generator/ServiceModels/monitoring/monitoring.customizations.json index 3c72979a2a5b..9d69d46d30ab 100644 --- a/generator/ServiceModels/monitoring/monitoring.customizations.json +++ b/generator/ServiceModels/monitoring/monitoring.customizations.json @@ -3,30 +3,5 @@ "DescribeAlarmHistory", "DescribeAlarms", "ListMetrics" - ], - "shapeModifiers": { - "DescribeAlarmHistoryInput": { - "backwardsCompatibleDateTimeProperties": [ - "StartDate", - "EndDate" - ] - }, - "GetMetricDataInput": { - "backwardsCompatibleDateTimeProperties": [ - "StartTime", - "EndTime" - ] - }, - "GetMetricStatisticsInput": { - "backwardsCompatibleDateTimeProperties": [ - "StartTime", - "EndTime" - ] - }, - "MetricDatum": { - "backwardsCompatibleDateTimeProperties": [ - "Timestamp" - ] - } - } + ] } diff --git a/generator/ServiceModels/neptune/neptune.customizations.json b/generator/ServiceModels/neptune/neptune.customizations.json index 1bb78afe3574..fcbfc8150a74 100644 --- a/generator/ServiceModels/neptune/neptune.customizations.json +++ b/generator/ServiceModels/neptune/neptune.customizations.json @@ -14,23 +14,12 @@ } ] }, - "DescribeEventsMessage": { - "backwardsCompatibleDateTimeProperties": [ - "StartTime", - "EndTime" - ] - }, "ModifyDBInstanceMessage": { "modify": [ { "PubliclyAccessible": { "deprecatedMessage": "This parameter is not supported" } } ] - }, - "RestoreDBClusterToPointInTimeMessage": { - "backwardsCompatibleDateTimeProperties": [ - "RestoreToTime" - ] } }, diff --git a/generator/ServiceModels/rds/rds.customizations.json b/generator/ServiceModels/rds/rds.customizations.json index 7c5554733b5d..ff14f90a0fef 100644 --- a/generator/ServiceModels/rds/rds.customizations.json +++ b/generator/ServiceModels/rds/rds.customizations.json @@ -23,28 +23,5 @@ "constructorInput": "this.Credentials" } ] - }, - "shapeModifiers": { - "BacktrackDBClusterMessage": { - "backwardsCompatibleDateTimeProperties": [ - "BacktrackTo" - ] - }, - "DescribeEventsMessage": { - "backwardsCompatibleDateTimeProperties": [ - "StartTime", - "EndTime" - ] - }, - "RestoreDBClusterToPointInTimeMessage": { - "backwardsCompatibleDateTimeProperties": [ - "RestoreToTime" - ] - }, - "RestoreDBInstanceToPointInTimeMessage": { - "backwardsCompatibleDateTimeProperties": [ - "RestoreTime" - ] - } } } diff --git a/generator/ServiceModels/redshift/redshift.customizations.json b/generator/ServiceModels/redshift/redshift.customizations.json index ff8685d26266..65c14db89d2e 100644 --- a/generator/ServiceModels/redshift/redshift.customizations.json +++ b/generator/ServiceModels/redshift/redshift.customizations.json @@ -22,18 +22,6 @@ "ClusterVersion": { "emitPropertyName": "Version" } } ] - }, - "DescribeClusterSnapshotsMessage": { - "backwardsCompatibleDateTimeProperties": [ - "StartTime", - "EndTime" - ] - }, - "DescribeEventsMessage": { - "backwardsCompatibleDateTimeProperties": [ - "StartTime", - "EndTime" - ] } } } diff --git a/generator/ServiceModels/workdocs/workdocs.customizations.json b/generator/ServiceModels/workdocs/workdocs.customizations.json index a51e711c84f1..99cb95fbf312 100644 --- a/generator/ServiceModels/workdocs/workdocs.customizations.json +++ b/generator/ServiceModels/workdocs/workdocs.customizations.json @@ -1,11 +1,5 @@ { "shapeModifiers": { - "DescribeActivitiesRequest": { - "backwardsCompatibleDateTimeProperties": [ - "StartTime", - "EndTime" - ] - }, "DescribeUsersResponse": { "modify": [ { diff --git a/sdk/src/Core/Amazon.Runtime/CSM/MonitoringAPICall.cs b/sdk/src/Core/Amazon.Runtime/CSM/MonitoringAPICall.cs index d89eb2d1846a..1cc7601e9e84 100644 --- a/sdk/src/Core/Amazon.Runtime/CSM/MonitoringAPICall.cs +++ b/sdk/src/Core/Amazon.Runtime/CSM/MonitoringAPICall.cs @@ -37,7 +37,7 @@ public MonitoringAPICall(IRequestContext requestContext) } public MonitoringAPICall() { - Timestamp = AWSSDKUtils.ConvertDateTimetoMilliseconds(DateTime.UtcNow); + Timestamp = AWSSDKUtils.ConvertToUnixEpochMilliseconds(DateTime.UtcNow); ClientId = DeterminedCSMConfiguration.Instance.CSMConfiguration.ClientId; } diff --git a/sdk/src/Core/Amazon.Runtime/Credentials/InstanceProfileAWSCredentials.cs b/sdk/src/Core/Amazon.Runtime/Credentials/InstanceProfileAWSCredentials.cs index 1deb4d18da88..19c0cec295e2 100644 --- a/sdk/src/Core/Amazon.Runtime/Credentials/InstanceProfileAWSCredentials.cs +++ b/sdk/src/Core/Amazon.Runtime/Credentials/InstanceProfileAWSCredentials.cs @@ -92,7 +92,7 @@ protected override CredentialsRefreshState GenerateNewCredentials() if (null != _currentRefreshState) { #pragma warning disable CS0612, CS0618 // Type or member is obsolete - var newExpiryTime = AWSSDKUtils.CorrectedUtcNow.ToLocalTime() + TimeSpan.FromMinutes(2); + var newExpiryTime = AWSSDKUtils.CorrectedUtcNow + TimeSpan.FromMinutes(2); #pragma warning restore CS0612,CS0618 // Type or member is obsolete _currentRefreshState = new CredentialsRefreshState(_currentRefreshState.Credentials.Copy(), newExpiryTime); @@ -108,7 +108,7 @@ protected override CredentialsRefreshState GenerateNewCredentials() // use a custom refresh time #pragma warning disable CS0612, CS0618 // Type or member is obsolete - var newExpiryTime = AWSSDKUtils.CorrectedUtcNow.ToLocalTime() + TimeSpan.FromMinutes(new Random().Next(5, 11)); + var newExpiryTime = AWSSDKUtils.CorrectedUtcNow + TimeSpan.FromMinutes(new Random().Next(5, 11)); #pragma warning restore CS0612, CS0618 // Type or member is obsolete _currentRefreshState = new CredentialsRefreshState(newState.Credentials.Copy(), newExpiryTime); @@ -285,11 +285,11 @@ private CredentialsRefreshState GetEarlyRefreshState(CredentialsRefreshState sta { // New expiry time = Now + _refreshAttemptPeriod + PreemptExpiryTime #pragma warning disable CS0612,CS0618 // Type or member is obsolete - var newExpiryTime = AWSSDKUtils.CorrectedUtcNow.ToLocalTime() + _refreshAttemptPeriod + PreemptExpiryTime; + DateTime newExpiryTime = AWSSDKUtils.CorrectedUtcNow + _refreshAttemptPeriod + PreemptExpiryTime; #pragma warning restore CS0612, CS0618 // Type or member is obsolete // Use this only if the time is earlier than the default expiration time - if (newExpiryTime.ToUniversalTime() > state.Expiration.ToUniversalTime()) + if (newExpiryTime > state.Expiration) newExpiryTime = state.Expiration; return new CredentialsRefreshState(state.Credentials.Copy(), newExpiryTime); diff --git a/sdk/src/Core/Amazon.Runtime/Credentials/Internal/_bcl+netstandard/SSOTokenManager.cs b/sdk/src/Core/Amazon.Runtime/Credentials/Internal/_bcl+netstandard/SSOTokenManager.cs index c847a46fc50e..06fd4df534ba 100644 --- a/sdk/src/Core/Amazon.Runtime/Credentials/Internal/_bcl+netstandard/SSOTokenManager.cs +++ b/sdk/src/Core/Amazon.Runtime/Credentials/Internal/_bcl+netstandard/SSOTokenManager.cs @@ -118,9 +118,7 @@ public bool IsInRefreshCoolDown() if (!BlockRefreshUntil.HasValue) return false; -#pragma warning disable CS0618 // Type or member is obsolete return BlockRefreshUntil.Value < AWSSDKUtils.CorrectedUtcNow; -#pragma warning restore CS0618 // Type or member is obsolete } } @@ -712,9 +710,7 @@ private static GetSsoTokenResponse MapSsoTokenToGetSsoTokenResponse(SsoToken tok /// A Client Name to use in the internal SSO flow private static string GetSsoClientName(string clientName) { -#pragma warning disable CS0618 // Type or member is obsolete var dateStamp = AWSSDKUtils.ConvertToUnixEpochSecondsString(AWSSDKUtils.CorrectedUtcNow); -#pragma warning restore CS0618 // Type or member is obsolete return $"{clientName}-{dateStamp}"; } } diff --git a/sdk/src/Core/Amazon.Runtime/Credentials/Internal/_bcl+netstandard/SsoTokenUtils.cs b/sdk/src/Core/Amazon.Runtime/Credentials/Internal/_bcl+netstandard/SsoTokenUtils.cs index f914076bd155..ddd7d614d210 100644 --- a/sdk/src/Core/Amazon.Runtime/Credentials/Internal/_bcl+netstandard/SsoTokenUtils.cs +++ b/sdk/src/Core/Amazon.Runtime/Credentials/Internal/_bcl+netstandard/SsoTokenUtils.cs @@ -51,10 +51,7 @@ public static bool IsExpired(this SsoToken token) if (null == token) throw new ArgumentNullException(nameof(token)); -#pragma warning disable CS0618 // Type or member is obsolete var currentTime = AWSSDKUtils.CorrectedUtcNow; -#pragma warning restore CS0618 // Type or member is obsolete - return token.ExpiresAt < currentTime; } @@ -66,10 +63,7 @@ public static bool IsExpired(this SsoToken token) /// public static bool NeedsRefresh(this SsoToken token) { -#pragma warning disable CS0618 // Type or member is obsolete var currentTime = AWSSDKUtils.CorrectedUtcNow; -#pragma warning restore CS0618 // Type or member is obsolete - return token.ExpiresAt <= currentTime.AddMinutes(6); } @@ -107,9 +101,7 @@ public static bool RegisteredClientExpired(this SsoToken token) if (null == token) throw new ArgumentNullException(nameof(token)); DateTime dateTime = ConvertRFC3339StringToDateTime(token.RegistrationExpiresAt); -#pragma warning disable CS0618 // Type or member is obsolete return AWSSDKUtils.CorrectedUtcNow >= dateTime.AddMinutes(-5); -#pragma warning restore CS0618 // Type or member is obsolete } #endregion diff --git a/sdk/src/Core/Amazon.Runtime/Credentials/ProcessAWSCredentials.cs b/sdk/src/Core/Amazon.Runtime/Credentials/ProcessAWSCredentials.cs index e2eb75733fef..5d3d59b99345 100644 --- a/sdk/src/Core/Amazon.Runtime/Credentials/ProcessAWSCredentials.cs +++ b/sdk/src/Core/Amazon.Runtime/Credentials/ProcessAWSCredentials.cs @@ -176,6 +176,15 @@ private CredentialsRefreshState SetCredentialsRefreshState(ProcessExecutionResul try { processCredentialDataV1 = JsonSerializerHelper.Deserialize(processInfo.StandardOutput, ProcessCredentialVersion1JsonSerializerContexts.Default); + if (processCredentialDataV1.Expiration == DateTime.MaxValue && processCredentialDataV1.Expiration.Kind != DateTimeKind.Utc) + { + processCredentialDataV1.Expiration = DateTime.SpecifyKind(processCredentialDataV1.Expiration, DateTimeKind.Utc); + } + else + { + processCredentialDataV1.Expiration = processCredentialDataV1.Expiration.ToUniversalTime(); + } + } catch (Exception e) { diff --git a/sdk/src/Core/Amazon.Runtime/Credentials/ProcessCredentialVersion1.cs b/sdk/src/Core/Amazon.Runtime/Credentials/ProcessCredentialVersion1.cs index c7eb4cd12973..2ef891fb137d 100644 --- a/sdk/src/Core/Amazon.Runtime/Credentials/ProcessCredentialVersion1.cs +++ b/sdk/src/Core/Amazon.Runtime/Credentials/ProcessCredentialVersion1.cs @@ -47,6 +47,6 @@ public class ProcessCredentialVersion1 /// /// ISO8601 formatted timestamp till when the credential is valid. /// - public DateTime Expiration { get; set; } = DateTime.MaxValue; + public DateTime Expiration { get; set; } = DateTime.SpecifyKind(DateTime.MaxValue, DateTimeKind.Utc); } } \ No newline at end of file diff --git a/sdk/src/Core/Amazon.Runtime/Credentials/RefreshingAWSCredentials.cs b/sdk/src/Core/Amazon.Runtime/Credentials/RefreshingAWSCredentials.cs index 1f24d4941ee7..0f69c41a2332 100644 --- a/sdk/src/Core/Amazon.Runtime/Credentials/RefreshingAWSCredentials.cs +++ b/sdk/src/Core/Amazon.Runtime/Credentials/RefreshingAWSCredentials.cs @@ -175,7 +175,7 @@ private static void UpdateToGeneratedCredentials(CredentialsRefreshState state, errorMessage = string.Format(CultureInfo.InvariantCulture, "The retrieved credentials have already expired: Now = {0}, Credentials expiration = {1}", #pragma warning disable CS0612,CS0618 // Type or member is obsolete - AWSSDKUtils.CorrectedUtcNow.ToLocalTime(), state.Expiration); + AWSSDKUtils.CorrectedUtcNow, state.Expiration); #pragma warning restore CS0612,CS0618 // Type or member is obsolete } @@ -194,7 +194,7 @@ private static void UpdateToGeneratedCredentials(CredentialsRefreshState state, logger.InfoFormat( "The preempt expiry time is set too high: Current time = {0}, Credentials expiry time = {1}, Preempt expiry time = {2}.", #pragma warning disable CS0612,CS0618 // Type or member is obsolete - AWSSDKUtils.CorrectedUtcNow.ToLocalTime(), + AWSSDKUtils.CorrectedUtcNow, #pragma warning restore CS0612,CS0618 // Type or member is obsolete state.Expiration, preemptExpiryTime); } diff --git a/sdk/src/Core/Amazon.Runtime/Credentials/SAMLImmutableCredentials.cs b/sdk/src/Core/Amazon.Runtime/Credentials/SAMLImmutableCredentials.cs index 280678eb0b75..66ff1455b722 100644 --- a/sdk/src/Core/Amazon.Runtime/Credentials/SAMLImmutableCredentials.cs +++ b/sdk/src/Core/Amazon.Runtime/Credentials/SAMLImmutableCredentials.cs @@ -154,7 +154,7 @@ internal static SAMLImmutableCredentials FromJson(string json) // get the expiry first - if the credentials have expired we can then // ignore the data - var expires = DateTime.Parse((string)o[ExpiresProperty], CultureInfo.InvariantCulture).ToUniversalTime(); + var expires = DateTime.Parse((string)o[ExpiresProperty], CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal); #pragma warning disable CS0612,CS0618 // Type or member is obsolete if (expires <= AWSSDKUtils.CorrectedUtcNow) #pragma warning restore CS0612,CS0618 // Type or member is obsolete diff --git a/sdk/src/Core/Amazon.Runtime/Internal/Transform/CustomMarshallTransformations.cs b/sdk/src/Core/Amazon.Runtime/Internal/Transform/CustomMarshallTransformations.cs deleted file mode 100644 index c1846b63371f..000000000000 --- a/sdk/src/Core/Amazon.Runtime/Internal/Transform/CustomMarshallTransformations.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Amazon.Runtime.Internal.Transform -{ - public static class CustomMarshallTransformations - { - public static long ConvertDateTimeToEpochMilliseconds(DateTime dateTime) - { - TimeSpan ts = new TimeSpan(dateTime.ToUniversalTime().Ticks - Amazon.Util.AWSSDKUtils.EPOCH_START.Ticks); - return (long)ts.TotalMilliseconds; - } - } -} diff --git a/sdk/src/Core/Amazon.Runtime/Internal/Transform/SimpleTypeUnmarshaller.cs b/sdk/src/Core/Amazon.Runtime/Internal/Transform/SimpleTypeUnmarshaller.cs index 5bf888fb8198..7a75f894fb4f 100644 --- a/sdk/src/Core/Amazon.Runtime/Internal/Transform/SimpleTypeUnmarshaller.cs +++ b/sdk/src/Core/Amazon.Runtime/Internal/Transform/SimpleTypeUnmarshaller.cs @@ -599,7 +599,7 @@ public DateTime Unmarshall(JsonUnmarshallerContext context) /// /// Value to be parsed /// If true, the method will return null if text is null. - /// If false, the method will return default(DateTime), if text is null. + /// If false, the method will return DateTime.SpecifyKind(default, DateTimeKind.Utc), if text is null. /// internal static DateTime? UnmarshallInternal(string text, bool treatAsNullable) { @@ -613,10 +613,10 @@ public DateTime Unmarshall(JsonUnmarshallerContext context) if (text == null) { if (treatAsNullable) { return null; } - else { return default(DateTime); } + else { return DateTime.SpecifyKind(default, DateTimeKind.Utc); } } - return DateTime.Parse(text, CultureInfo.InvariantCulture); + return DateTime.Parse(text, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal); } } } diff --git a/sdk/src/Core/Amazon.Runtime/Internal/Util/Logger.Console.cs b/sdk/src/Core/Amazon.Runtime/Internal/Util/Logger.Console.cs index a8d5f014a047..85058bcce6f2 100644 --- a/sdk/src/Core/Amazon.Runtime/Internal/Util/Logger.Console.cs +++ b/sdk/src/Core/Amazon.Runtime/Internal/Util/Logger.Console.cs @@ -85,7 +85,7 @@ private void Log(LogLevel logLevel, string message, Exception ex) string formatted = null; long sequence = Interlocked.Increment(ref _sequanceId); #pragma warning disable CS0612,CS0618 // Type or member is obsolete - string dt = AWSSDKUtils.CorrectedUtcNow.ToLocalTime().ToString(AWSSDKUtils.ISO8601DateFormat, CultureInfo.InvariantCulture); + string dt = AWSSDKUtils.CorrectedUtcNow.ToString(AWSSDKUtils.ISO8601DateFormat, CultureInfo.InvariantCulture); #pragma warning restore CS0612,CS0618 // Type or member is obsolete string asString = logLevel.ToString().ToUpper(CultureInfo.InvariantCulture); diff --git a/sdk/src/Core/Amazon.Runtime/Internal/Util/LruCache.cs b/sdk/src/Core/Amazon.Runtime/Internal/Util/LruCache.cs index 5d93ba6930d1..7514aac7693b 100644 --- a/sdk/src/Core/Amazon.Runtime/Internal/Util/LruCache.cs +++ b/sdk/src/Core/Amazon.Runtime/Internal/Util/LruCache.cs @@ -96,9 +96,7 @@ public void EvictExpiredLRUListItems(int validityInSeconds) while (Count != 0) { var item = FindOldestItem(); -#pragma warning disable CS0618 // Type or member is obsolete var timeSpan = AWSSDKUtils.CorrectedUtcNow - item.LastTouchedTimestamp; -#pragma warning restore CS0618 // Type or member is obsolete if (timeSpan.TotalSeconds > validityInSeconds) Evict(item.Key); else diff --git a/sdk/src/Core/Amazon.Runtime/Internal/Util/MultiValueHeaderParser.cs b/sdk/src/Core/Amazon.Runtime/Internal/Util/MultiValueHeaderParser.cs index deb779700d55..c80675f4cbda 100644 --- a/sdk/src/Core/Amazon.Runtime/Internal/Util/MultiValueHeaderParser.cs +++ b/sdk/src/Core/Amazon.Runtime/Internal/Util/MultiValueHeaderParser.cs @@ -104,7 +104,7 @@ public static List ToDateTimeList(string header, string format) if (format == "ISO8601") { //"2019-12-16T23:48:18Z, 2019-12-16T23:48:18Z" - return value.Split(Delimiter).Select(item => DateTime.Parse(item.Trim(), CultureInfo.InvariantCulture)).ToList(); + return value.Split(Delimiter).Select(item => DateTime.Parse(item.Trim(), CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal)).ToList(); } else if (format == "RFC822") { @@ -129,7 +129,7 @@ public static List ToDateTimeList(string header, string format) startIndex = index + 1; } - return dateStringList.Select(item => DateTime.Parse(item.Trim(), CultureInfo.InvariantCulture)).ToList(); + return dateStringList.Select(item => DateTime.Parse(item.Trim(), CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal)).ToList(); } else if (format == "UnixTimestamp") diff --git a/sdk/src/Core/Amazon.Runtime/Internal/Util/SdkCache.cs b/sdk/src/Core/Amazon.Runtime/Internal/Util/SdkCache.cs index c87013bca13e..c638ff221bc4 100644 --- a/sdk/src/Core/Amazon.Runtime/Internal/Util/SdkCache.cs +++ b/sdk/src/Core/Amazon.Runtime/Internal/Util/SdkCache.cs @@ -326,7 +326,7 @@ public void Clear() lock (CacheLock) { Contents.Clear(); - LastCacheClean = GetCorrectedLocalTime(); + LastCacheClean = GetCorrectedTime(); } } public List Keys @@ -454,7 +454,7 @@ private bool IsValidItem(CacheItem item) { if (item == null) return false; - var cutoff = GetCorrectedLocalTime() - this.MaximumItemLifespan; + var cutoff = GetCorrectedTime() - this.MaximumItemLifespan; if (item.LastUseTime < cutoff) return false; @@ -462,13 +462,13 @@ private bool IsValidItem(CacheItem item) } private void RemoveOldItems_Locked() { - if (LastCacheClean + CacheClearPeriod > AWSConfigs.utcNowSource().ToLocalTime()) + if (LastCacheClean + CacheClearPeriod > AWSConfigs.utcNowSource()) return; // Remove all items that were not accessed since the cutoff. // Using a cutoff is more optimal than item.Age, as we only need // to do DateTime calculation once, not for each item. - var cutoff = GetCorrectedLocalTime() - MaximumItemLifespan; + var cutoff = GetCorrectedTime() - MaximumItemLifespan; var keysToRemove = new List(); foreach (var kvp in Contents) @@ -483,7 +483,7 @@ private void RemoveOldItems_Locked() foreach (var key in keysToRemove) Contents.Remove(key); - LastCacheClean = GetCorrectedLocalTime(); + LastCacheClean = GetCorrectedTime(); } private class CacheItem @@ -494,7 +494,7 @@ public T Value { get { - LastUseTime = GetCorrectedLocalTime(); + LastUseTime = GetCorrectedTime(); return _value; } private set @@ -507,14 +507,14 @@ private set public CacheItem(T value) { Value = value; - LastUseTime = GetCorrectedLocalTime(); + LastUseTime = GetCorrectedTime(); } } - private static DateTime GetCorrectedLocalTime() + private static DateTime GetCorrectedTime() { #pragma warning disable CS0612,CS0618 // Type or member is obsolete - return AWSSDKUtils.CorrectedUtcNow.ToLocalTime(); + return AWSSDKUtils.CorrectedUtcNow; #pragma warning restore CS0612,CS0618 // Type or member is obsolete } diff --git a/sdk/src/Core/Amazon.Runtime/Internal/Util/StringUtils.cs b/sdk/src/Core/Amazon.Runtime/Internal/Util/StringUtils.cs index 403354b00348..7c6134e0d365 100644 --- a/sdk/src/Core/Amazon.Runtime/Internal/Util/StringUtils.cs +++ b/sdk/src/Core/Amazon.Runtime/Internal/Util/StringUtils.cs @@ -181,7 +181,7 @@ public static string FromDateTimeToISO8601(DateTime value) } /// - /// Converts a DateTime to ISO8601 formatted string without milliseconds. + /// Converts a nullable DateTime to ISO8601 formatted string. /// public static string FromDateTimeToISO8601(DateTime? value) { @@ -194,13 +194,26 @@ public static string FromDateTimeToISO8601(DateTime? value) } /// - /// Converts a DateTime to ISO8601 formatted string. + /// Converts a DateTime to ISO8601 formatted string without milliseconds. /// public static string FromDateTimeToISO8601NoMs(DateTime value) { return value.ToUniversalTime().ToString(AWSSDKUtils.ISO8601DateFormatNoMS, CultureInfo.InvariantCulture); } + /// + /// Converts a nullable DateTime to ISO8601 formatted string without milliseconds. + /// + public static string FromDateTimeToISO8601NoMs(DateTime? value) + { + if (!value.HasValue) + { + return null; + } + + return value.Value.ToUniversalTime().ToString(AWSSDKUtils.ISO8601DateFormatNoMS, CultureInfo.InvariantCulture); + } + /// /// Converts a DateTime to ISO8601 formatted string with milliseconds /// if they are not zero. @@ -214,7 +227,7 @@ public static string FromDateTimeToISO8601WithOptionalMs(DateTime value) } /// - /// Converts a DateTime to ISO8601 formatted string with milliseconds + /// Converts a nullable DateTime to ISO8601 formatted string with milliseconds /// if they are not zero. /// public static string FromDateTimeToISO8601WithOptionalMs(DateTime? value) @@ -240,7 +253,7 @@ public static string FromDateTimeToRFC822(DateTime value) } /// - /// Converts a DateTime to RFC822 formatted string. + /// Converts a nullable DateTime to RFC822 formatted string. /// public static string FromDateTimeToRFC822(DateTime? value) { @@ -262,7 +275,7 @@ public static string FromDateTimeToUnixTimestamp(DateTime value) } /// - /// Converts a DateTime to Unix epoch time formatted string. + /// Converts a nullable DateTime to Unix epoch time formatted string. /// public static string FromDateTimeToUnixTimestamp(DateTime? value) { diff --git a/sdk/src/Core/Amazon.Runtime/Pipeline/Handlers/CSMHandler/CSMCallAttemptHandler.cs b/sdk/src/Core/Amazon.Runtime/Pipeline/Handlers/CSMHandler/CSMCallAttemptHandler.cs index 1049bcb90baa..43779ab8411e 100644 --- a/sdk/src/Core/Amazon.Runtime/Pipeline/Handlers/CSMHandler/CSMCallAttemptHandler.cs +++ b/sdk/src/Core/Amazon.Runtime/Pipeline/Handlers/CSMHandler/CSMCallAttemptHandler.cs @@ -107,9 +107,9 @@ protected static void CSMCallAttemptMetricsCapture(IRequestContext requestContex requestContext.CSMCallAttempt.AccessKey = requestContext.ImmutableCredentials.AccessKey; - requestContext.CSMCallAttempt.AttemptLatency = AWSSDKUtils.ConvertTimeSpanToMilliseconds(requestContext + requestContext.CSMCallAttempt.AttemptLatency = (long)requestContext .Metrics.StopEvent(Metric.CSMAttemptLatency) - .ElapsedTime); + .ElapsedTime.TotalMilliseconds; if (responseContext.HttpResponse != null) { diff --git a/sdk/src/Core/Amazon.Runtime/Pipeline/RetryHandler/RetryPolicy.cs b/sdk/src/Core/Amazon.Runtime/Pipeline/RetryHandler/RetryPolicy.cs index 2c6d69f524da..3a46106426d8 100644 --- a/sdk/src/Core/Amazon.Runtime/Pipeline/RetryHandler/RetryPolicy.cs +++ b/sdk/src/Core/Amazon.Runtime/Pipeline/RetryHandler/RetryPolicy.cs @@ -504,7 +504,7 @@ private static bool TryParseDateHeader(AmazonServiceException ase, out DateTime dateValue, AWSSDKUtils.GMTDateFormat, CultureInfo.InvariantCulture, - DateTimeStyles.AssumeUniversal, + DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal, out serverTime)) { return true; @@ -540,7 +540,7 @@ private static bool TryParseExceptionMessage(AmazonServiceException ase, out Dat timestamp, AWSSDKUtils.ISO8601BasicDateTimeFormat, CultureInfo.InvariantCulture, - DateTimeStyles.AssumeUniversal, + DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal, out serverTime)) { return true; diff --git a/sdk/src/Core/Amazon.Runtime/TokenBucket.cs b/sdk/src/Core/Amazon.Runtime/TokenBucket.cs index 743d79bf45cc..ca35adac0598 100644 --- a/sdk/src/Core/Amazon.Runtime/TokenBucket.cs +++ b/sdk/src/Core/Amazon.Runtime/TokenBucket.cs @@ -33,7 +33,7 @@ public class TokenBucket private readonly double _beta; private readonly double _scaleConstant; private readonly double _smooth; - private static readonly DateTime _epoch = new DateTime(1970, 1, 1); + private static readonly DateTime _epoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc); /// /// The rate at which token are replenished. diff --git a/sdk/src/Core/Amazon.Runtime/Tokens/StaticTokenProvider.cs b/sdk/src/Core/Amazon.Runtime/Tokens/StaticTokenProvider.cs index 7b8eecbfb16d..c0757ba8ce8f 100644 --- a/sdk/src/Core/Amazon.Runtime/Tokens/StaticTokenProvider.cs +++ b/sdk/src/Core/Amazon.Runtime/Tokens/StaticTokenProvider.cs @@ -66,10 +66,7 @@ public Task> TryResolveTokenAsync(CancellationToken cancel private bool IsTokenUnexpired() { -#pragma warning disable CS0618 // Type or member is obsolete return (!_expiration.HasValue || _expiration.Value < AWSSDKUtils.CorrectedUtcNow); -#pragma warning restore CS0618 // Type or member is obsolete - } } } \ No newline at end of file diff --git a/sdk/src/Core/Amazon.Util/AWSPublicIpAddressRanges.cs b/sdk/src/Core/Amazon.Util/AWSPublicIpAddressRanges.cs index 0438921ca4f5..925ec0a4592e 100644 --- a/sdk/src/Core/Amazon.Util/AWSPublicIpAddressRanges.cs +++ b/sdk/src/Core/Amazon.Util/AWSPublicIpAddressRanges.cs @@ -167,7 +167,7 @@ private static AWSPublicIpAddressRanges Parse(string fileContent) try { var createdAt = (string) json[createDateKey]; - creationDateTime = DateTime.ParseExact(createdAt, createDateFormatString, null); + creationDateTime = DateTime.ParseExact(createdAt, createDateFormatString, null, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal); } catch (FormatException) { diff --git a/sdk/src/Core/Amazon.Util/AWSSDKUtils.cs b/sdk/src/Core/Amazon.Util/AWSSDKUtils.cs index 773ad7449c16..0bdce825572d 100644 --- a/sdk/src/Core/Amazon.Util/AWSSDKUtils.cs +++ b/sdk/src/Core/Amazon.Util/AWSSDKUtils.cs @@ -617,21 +617,21 @@ public static string DetermineService(string url) /// /// Utility method for converting Unix epoch seconds to DateTime structure. /// - /// The number of seconds since January 1, 1970. + /// The number of seconds that have elapsed since 00:00:00 Coordinated Universal Time (UTC), Thursday, 1 January 1970. /// Converted DateTime structure public static DateTime ConvertFromUnixEpochSeconds(int seconds) { - return new DateTime(seconds * 10000000L + EPOCH_START.Ticks, DateTimeKind.Utc).ToLocalTime(); + return new DateTime(seconds * 10000000L + EPOCH_START.Ticks, DateTimeKind.Utc); } /// /// Utility method for converting Unix epoch milliseconds to DateTime structure. /// - /// The number of milliseconds since January 1, 1970. + /// The number of milliseconds that have elapsed since 00:00:00 Coordinated Universal Time (UTC), Thursday, 1 January 1970. /// Converted DateTime structure public static DateTime ConvertFromUnixEpochMilliseconds(long milliseconds) { - return new DateTime(milliseconds * 10000L + EPOCH_START.Ticks, DateTimeKind.Utc).ToLocalTime(); + return new DateTime(milliseconds * 10000L + EPOCH_START.Ticks, DateTimeKind.Utc); } public static int ConvertToUnixEpochSeconds(DateTime dateTime) @@ -639,6 +639,11 @@ public static int ConvertToUnixEpochSeconds(DateTime dateTime) return Convert.ToInt32(GetTimeSpanInTicks(dateTime).TotalSeconds); } + public static long ConvertToUnixEpochMilliseconds(DateTime dateTime) + { + return Convert.ToInt64(GetTimeSpanInTicks(dateTime).TotalMilliseconds); + } + public static string ConvertToUnixEpochSecondsString(DateTime dateTime) { return Convert.ToInt64(GetTimeSpanInTicks(dateTime).TotalSeconds).ToString(CultureInfo.InvariantCulture); @@ -650,21 +655,17 @@ public static double ConvertToUnixEpochSecondsDouble(DateTime dateTime) return Math.Round(GetTimeSpanInTicks(dateTime).TotalMilliseconds, 0) / 1000.0; } + /// + /// This method ensures the passed in DateTime is in UTC format then gets the numbers of ticks from that UTC time + /// minus the number of ticks from the UTC Epoch start time. + /// + /// The DateTime used to determine the TimeSpan from the Epoch start time. + /// Returns the TimeSpan of the passed DateTime minus the Epoch start time. public static TimeSpan GetTimeSpanInTicks(DateTime dateTime) { return new TimeSpan(dateTime.ToUniversalTime().Ticks - EPOCH_START.Ticks); } - public static long ConvertDateTimetoMilliseconds(DateTime dateTime) - { - return ConvertTimeSpanToMilliseconds(GetTimeSpanInTicks(dateTime)); - } - - public static long ConvertTimeSpanToMilliseconds(TimeSpan timeSpan) - { - return timeSpan.Ticks / TimeSpan.TicksPerMillisecond; - } - /// /// Helper function to format a byte array into string /// @@ -861,9 +862,7 @@ public static string FormattedCurrentTimestampGMT { get { -#pragma warning disable CS0618 // Type or member is obsolete DateTime dateTime = AWSSDKUtils.CorrectedUtcNow; -#pragma warning restore CS0618 // Type or member is obsolete return dateTime.ToString(GMTDateFormat, CultureInfo.InvariantCulture); } } @@ -893,9 +892,7 @@ public static string FormattedCurrentTimestampISO8601 /// The ISO8601 formatted future timestamp. public static string GetFormattedTimestampISO8601(int minutesFromNow) { -#pragma warning disable CS0618 // Type or member is obsolete return GetFormattedTimestampISO8601(AWSSDKUtils.CorrectedUtcNow.AddMinutes(minutesFromNow)); -#pragma warning restore CS0618 // Type or member is obsolete } internal static string GetFormattedTimestampISO8601(IClientConfig config, AmazonWebServiceRequest request) @@ -908,17 +905,9 @@ internal static string GetFormattedTimestampISO8601(IClientConfig config, Amazon private static string GetFormattedTimestampISO8601(DateTime dateTime) { - DateTime formatted = new DateTime( - dateTime.Year, - dateTime.Month, - dateTime.Day, - dateTime.Hour, - dateTime.Minute, - dateTime.Second, - dateTime.Millisecond, - DateTimeKind.Local - ); - return formatted.ToString( + // In this private method in all cases where it is called the dateTime is already a UTC date but + // we will ensure it is one before formatting as a UTC ISO8601 datetime string. + return dateTime.ToUniversalTime().ToString( AWSSDKUtils.ISO8601DateFormat, CultureInfo.InvariantCulture ); diff --git a/sdk/src/Services/EC2/Custom/Internal/CustomMarshallTransformations.cs b/sdk/src/Services/EC2/Custom/Internal/CustomMarshallTransformations.cs deleted file mode 100644 index 944c6e60da6d..000000000000 --- a/sdk/src/Services/EC2/Custom/Internal/CustomMarshallTransformations.cs +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at - * - * http://aws.amazon.com/apache2.0 - * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -using Amazon.Util; -using System; -using System.Globalization; - -namespace Amazon.EC2.Internal -{ - /// - /// Custom type serializers for EC2 - /// - public static class CustomMarshallTransformations - { - /// - /// Convert the DateTime to ISO8601DateFormatNoMS - /// - /// - /// - [Obsolete("This method doesn't handle correctly non-UTC DateTimes. Use ConvertDateTimeISOWithoutMillisecondsUtc instead.", false)] - public static String ConvertDateTimeISOWithoutMilliseconds(DateTime dateTime) - { - return dateTime.ToString(AWSSDKUtils.ISO8601DateFormatNoMS, DateTimeFormatInfo.InvariantInfo); - } - - /// - /// Custom DateTime serializer for EC2. - /// - /// The DateTime to serialize - /// ISO formatted string with no miliseconds - public static String ConvertDateTimeISOWithoutMillisecondsUtc(DateTime dateTime) - { - return dateTime.ToUniversalTime().ToString(AWSSDKUtils.ISO8601DateFormatNoMS, DateTimeFormatInfo.InvariantInfo); - } - - /// - /// Custom DateTime serializer for EC2. - /// - /// The DateTime to serialize - /// ISO formatted string with no miliseconds - public static String ConvertDateTimeISOWithoutMillisecondsUtc(DateTime? dateTime) - { - if (!dateTime.HasValue) - { - return null; - } - - return dateTime.Value.ToUniversalTime().ToString(AWSSDKUtils.ISO8601DateFormatNoMS, DateTimeFormatInfo.InvariantInfo); - } - } -} diff --git a/sdk/src/Services/S3/Custom/AmazonS3Client.Extensions.cs b/sdk/src/Services/S3/Custom/AmazonS3Client.Extensions.cs index d824b3e9b46a..6dfd4ee61532 100644 --- a/sdk/src/Services/S3/Custom/AmazonS3Client.Extensions.cs +++ b/sdk/src/Services/S3/Custom/AmazonS3Client.Extensions.cs @@ -435,7 +435,7 @@ private static long GetSecondsUntilExpiration(IClientConfig config, GetPreSigned DateTime baselineTime; if (signatureVersion == SignatureVersion.SigV2) { - baselineTime = new DateTime(1970, 1, 1); + baselineTime = AWSSDKUtils.EPOCH_START; } else // SigV4 or SigV4a { diff --git a/sdk/src/Services/S3/Custom/Model/CopyObjectRequest.cs b/sdk/src/Services/S3/Custom/Model/CopyObjectRequest.cs index cb0cc3773227..86299b7cc540 100644 --- a/sdk/src/Services/S3/Custom/Model/CopyObjectRequest.cs +++ b/sdk/src/Services/S3/Custom/Model/CopyObjectRequest.cs @@ -219,9 +219,7 @@ public partial class CopyObjectRequest : PutWithACLRequest private string etagToNotMatch; private DateTime? modifiedSinceDate; private DateTime? unmodifiedSinceDate; - private DateTime? modifiedSinceDateUtc; - private DateTime? unmodifiedSinceDateUtc; - + private List tagset = AWSConfigs.InitializeCollections ? new List() : null; private S3MetadataDirective metadataDirective; @@ -309,14 +307,6 @@ public string ContentType } /// - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use ModifiedSinceDateUtc instead. Setting either ModifiedSinceDate or - /// ModifiedSinceDateUtc results in both ModifiedSinceDate and ModifiedSinceDateUtc being assigned, - /// the latest assignment to either one of the two property is reflected in the value of both. - /// ModifiedSinceDate is provided for backwards compatibility only and assigning a non-Utc DateTime - /// to it results in the wrong timestamp being passed to the service. - /// /// Copies the object if it has been modified since the specified time, otherwise returns a PreconditionFailed. /// /// @@ -325,74 +315,32 @@ public string ContentType /// Constraints: This property can be used with ETagToNotMatch, /// but cannot be used with other conditional copy properties. /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use ModifiedSinceDateUtc instead. Setting either ModifiedSinceDate or ModifiedSinceDateUtc results in both ModifiedSinceDate and " + - "ModifiedSinceDateUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. ModifiedSinceDate is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] public DateTime? ModifiedSinceDate { - get { return this.modifiedSinceDate; } - set - { - if(value == null) - { - this.modifiedSinceDate = null; - this.modifiedSinceDateUtc = null; - } - else - { - this.modifiedSinceDate = value; - this.modifiedSinceDateUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - } - } - - /// - /// Copies the object if it has been modified since the specified time, otherwise returns a PreconditionFailed. - /// - /// - /// Copies the object if it has been modified since the - /// specified time; otherwise returns a 412 (failed condition). - /// Constraints: This property can be used with ETagToNotMatch, - /// but cannot be used with other conditional copy properties. - /// - public DateTime? ModifiedSinceDateUtc - { - get { return this.modifiedSinceDateUtc ?? default(DateTime); } + get { return this.modifiedSinceDate ?? DateTime.SpecifyKind(default, DateTimeKind.Utc); } set { if (value == null) { - this.modifiedSinceDate = null; - this.modifiedSinceDateUtc = null; + this.modifiedSinceDate = null; } else { - this.modifiedSinceDateUtc = value; this.modifiedSinceDate = value; } } } /// - /// Checks if ModifiedSinceDateUtc property is set. + /// Checks if ModifiedSinceDate property is set. /// - /// true if ModifiedSinceDateUtc property is set. - internal bool IsSetModifiedSinceDateUtc() + /// true if ModifiedSinceDate property is set. + internal bool IsSetModifiedSinceDate() { - return this.modifiedSinceDateUtc.HasValue; + return this.modifiedSinceDate.HasValue; } /// - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use UnmodifiedSinceDateUtc instead. Setting either UnmodifiedSinceDate or - /// UnmodifiedSinceDateUtc results in both UnmodifiedSinceDate and UnmodifiedSinceDateUtc being assigned, - /// the latest assignment to either one of the two property is reflected in the value of both. - /// UnmodifiedSinceDate is provided for backwards compatibility only and assigning a non-Utc DateTime - /// to it results in the wrong timestamp being passed to the service. - /// /// Copies the object if it has not been modified since the specified time, otherwise returns a PreconditionFailed. /// /// @@ -401,63 +349,29 @@ internal bool IsSetModifiedSinceDateUtc() /// Constraints: This property can be used with ETagToMatch, /// but cannot be used with other conditional copy properties. /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use UnmodifiedSinceDateUtc instead. Setting either UnmodifiedSinceDate or UnmodifiedSinceDateUtc results in both UnmodifiedSinceDate and " + - "UnmodifiedSinceDateUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. UnmodifiedSinceDate is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] public DateTime? UnmodifiedSinceDate { - get { return this.unmodifiedSinceDate ?? default(DateTime); } - set - { - if (value == null) - { - this.unmodifiedSinceDate = null; - this.unmodifiedSinceDateUtc = null; - } - else - { - this.unmodifiedSinceDate = value; - this.unmodifiedSinceDateUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - } - } - - /// - /// Copies the object if it has not been modified since the specified time, otherwise returns a PreconditionFailed. - /// - /// - /// Copies the object if it hasn't been modified since the - /// specified time; otherwise returns a 412 (precondition failed). - /// Constraints: This property can be used with ETagToMatch, - /// but cannot be used with other conditional copy properties. - /// - public DateTime? UnmodifiedSinceDateUtc - { - get { return this.unmodifiedSinceDateUtc ?? default(DateTime); } + get { return this.unmodifiedSinceDate ?? DateTime.SpecifyKind(default, DateTimeKind.Utc); } set { if (value == null) { this.unmodifiedSinceDate = null; - this.unmodifiedSinceDateUtc = null; } else { - this.unmodifiedSinceDateUtc = value; this.unmodifiedSinceDate = value; } } } /// - /// Checks if UnmodifiedSinceDateUtc property is set. + /// Checks if UnmodifiedSinceDate property is set. /// - /// true if UnmodifiedSinceDateUtc property is set. - internal bool IsSetUnmodifiedSinceDateUtc() + /// true if UnmodifiedSinceDate property is set. + internal bool IsSetUnmodifiedSinceDate() { - return this.unmodifiedSinceDateUtc.HasValue; + return this.unmodifiedSinceDate.HasValue; } /// diff --git a/sdk/src/Services/S3/Custom/Model/Expiration.cs b/sdk/src/Services/S3/Custom/Model/Expiration.cs index 3301b59a47e9..1652b96c0817 100644 --- a/sdk/src/Services/S3/Custom/Model/Expiration.cs +++ b/sdk/src/Services/S3/Custom/Model/Expiration.cs @@ -31,30 +31,18 @@ namespace Amazon.S3.Model /// public partial class Expiration { - private DateTime expiryDate; - private DateTime expiryDateUtc; + private DateTime expiryDate; private string ruleId; /// - /// This property is deprecated. This property exposes a DateTime of kind Unspecified. Use ExpiryDateUtc instead. /// The date and time for expiry. /// - [Obsolete("This property returns a DateTime of kind Unspecified. Use ExpiryDateUtc instead.", false)] public DateTime ExpiryDate { get { return this.expiryDate; } set { this.expiryDate = value; } } - /// - /// The date and time for expiry. - /// - public DateTime ExpiryDateUtc - { - get { return this.expiryDateUtc; } - set { this.expiryDateUtc = value; } - } - /// /// Id of the configuration rule for this expiry. /// @@ -105,9 +93,8 @@ internal Expiration(string headerValue) if (!expiryMatches.Success || !expiryMatches.Groups[1].Success) throw new InvalidOperationException("No Expiry Date match"); string expiryDateValue = expiryMatches.Groups[1].Value; - this.expiryDateUtc = DateTime.ParseExact(expiryDateValue, Amazon.Util.AWSSDKUtils.RFC822DateFormat, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal); - this.expiryDate = new DateTime(this.expiryDateUtc.Ticks, DateTimeKind.Unspecified); - + this.expiryDate = DateTime.ParseExact(expiryDateValue, Amazon.Util.AWSSDKUtils.RFC822DateFormat, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal); + var ruleMatches = RuleRegex().Match(headerValue); if (!ruleMatches.Success || !ruleMatches.Groups[1].Success) throw new InvalidOperationException("No Rule Id match"); diff --git a/sdk/src/Services/S3/Custom/Model/GetObjectMetadataRequest.cs b/sdk/src/Services/S3/Custom/Model/GetObjectMetadataRequest.cs index 1ad372ec409d..c6ca8a48257c 100644 --- a/sdk/src/Services/S3/Custom/Model/GetObjectMetadataRequest.cs +++ b/sdk/src/Services/S3/Custom/Model/GetObjectMetadataRequest.cs @@ -179,8 +179,6 @@ public partial class GetObjectMetadataRequest : AmazonWebServiceRequest private ChecksumMode _checksumMode; DateTime? modifiedSinceDate; DateTime? unmodifiedSinceDate; - DateTime? modifiedSinceDateUtc; - DateTime? unmodifiedSinceDateUtc; string etagToMatch; string etagToNotMatch; private string key; @@ -297,66 +295,29 @@ internal bool IsSetEtagToMatch() } /// - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use ModifiedSinceDateUtc instead. Setting either ModifiedSinceDate or - /// ModifiedSinceDateUtc results in both ModifiedSinceDate and ModifiedSinceDateUtc being assigned, - /// the latest assignment to either one of the two property is reflected in the value of both. - /// ModifiedSinceDate is provided for backwards compatibility only and assigning a non-Utc DateTime - /// to it results in the wrong timestamp being passed to the service. - /// /// Returns the object only if it has been modified since the specified time, /// otherwise returns a PreconditionFailed. /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use ModifiedSinceDateUtc instead. Setting either ModifiedSinceDate or ModifiedSinceDateUtc results in both ModifiedSinceDate and " + - "ModifiedSinceDateUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. ModifiedSinceDate is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] public DateTime? ModifiedSinceDate { - get { return this.modifiedSinceDate; } - set - { - if (value == null) - { - this.modifiedSinceDate = null; - this.modifiedSinceDateUtc = null; - } - else - { - this.modifiedSinceDate = value; - this.modifiedSinceDateUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - } - } - - /// - /// Returns the object only if it has been modified since the specified time, - /// otherwise returns a PreconditionFailed. - /// - public DateTime? ModifiedSinceDateUtc - { - get { return this.modifiedSinceDateUtc ?? default(DateTime); } + get { return this.modifiedSinceDate ?? DateTime.SpecifyKind(default, DateTimeKind.Utc); } set { if (value == null) { - this.modifiedSinceDate = null; - this.modifiedSinceDateUtc = null; + this.modifiedSinceDate = null; } else { - this.modifiedSinceDateUtc = value; this.modifiedSinceDate = value; } } } - // Check to see if ModifiedSinceDateUtc property is set - internal bool IsSetModifiedSinceDateUtc() + // Check to see if ModifiedSinceDate property is set + internal bool IsSetModifiedSinceDate() { - return this.modifiedSinceDateUtc.HasValue; + return this.modifiedSinceDate.HasValue; } /// @@ -376,66 +337,29 @@ internal bool IsSetEtagToNotMatch() } /// - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use UnmodifiedSinceDateUtc instead. Setting either UnmodifiedSinceDate or - /// UnmodifiedSinceDateUtc results in both UnmodifiedSinceDate and UnmodifiedSinceDateUtc being assigned, - /// the latest assignment to either one of the two property is reflected in the value of both. - /// UnmodifiedSinceDate is provided for backwards compatibility only and assigning a non-Utc DateTime - /// to it results in the wrong timestamp being passed to the service. - /// /// Returns the object only if it has not been modified since the specified time, /// otherwise returns a PreconditionFailed. /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use UnmodifiedSinceDateUtc instead. Setting either UnmodifiedSinceDate or UnmodifiedSinceDateUtc results in both UnmodifiedSinceDate and " + - "UnmodifiedSinceDateUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. UnmodifiedSinceDate is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] public DateTime? UnmodifiedSinceDate { - get { return this.unmodifiedSinceDate ?? default(DateTime); } - set - { - if (value == null) - { - this.unmodifiedSinceDate = null; - this.unmodifiedSinceDateUtc = null; - } - else - { - this.unmodifiedSinceDate = value; - this.unmodifiedSinceDateUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - } - } - - /// - /// Returns the object only if it has not been modified since the specified time, - /// otherwise returns a PreconditionFailed. - /// - public DateTime? UnmodifiedSinceDateUtc - { - get { return this.unmodifiedSinceDateUtc ?? default(DateTime); } + get { return this.unmodifiedSinceDate ?? DateTime.SpecifyKind(default, DateTimeKind.Utc); } set { if (value == null) { this.unmodifiedSinceDate = null; - this.unmodifiedSinceDateUtc = null; } else { - this.unmodifiedSinceDateUtc = value; this.unmodifiedSinceDate = value; } } } - // Check to see if IfUnmodifiedSinceUtc property is set - internal bool IsSetUnmodifiedSinceDateUtc() + // Check to see if IfUnmodifiedSince property is set + internal bool IsSetUnmodifiedSinceDate() { - return this.unmodifiedSinceDateUtc.HasValue; + return this.unmodifiedSinceDate.HasValue; } /// diff --git a/sdk/src/Services/S3/Custom/Model/GetObjectMetadataResponse.cs b/sdk/src/Services/S3/Custom/Model/GetObjectMetadataResponse.cs index 4bce79fe5fb7..7f5621ded213 100644 --- a/sdk/src/Services/S3/Custom/Model/GetObjectMetadataResponse.cs +++ b/sdk/src/Services/S3/Custom/Model/GetObjectMetadataResponse.cs @@ -38,7 +38,6 @@ public class GetObjectMetadataResponse : AmazonWebServiceResponse private string eTag; private int? missingMeta; private string versionId; - private DateTime? expires; private string websiteRedirectLocation; private string serverSideEncryptionKeyManagementServiceKeyId; private ServerSideEncryptionMethod serverSideEncryption; @@ -58,13 +57,7 @@ public class GetObjectMetadataResponse : AmazonWebServiceResponse private string _checksumCRC32C; private string _checksumSHA1; private string _checksumSHA256; - - /// - /// Flag which returns true if the Expires property has been unmarshalled - /// from the raw value or set by user code. - /// - private bool isExpiresUnmarshalled; - + /// /// The date and time at which the object is no longer cacheable. /// @@ -288,42 +281,6 @@ internal bool IsSetVersionId() return this.versionId != null; } - /// - /// The date and time at which the object is no longer cacheable. - /// - /// - [Obsolete("This property is deprecated for handling cases where Expires cannot be parsed as a DateTime. Instead, use ExpiresString, which returns the unparsed value from S3.")] - public DateTime? Expires - { - get - { - if (this.isExpiresUnmarshalled) - { - return this.expires; - } - else - { - if (!string.IsNullOrEmpty(this.ExpiresString)) - { - this.expires = AmazonS3Util.ParseExpiresHeader(this.ExpiresString, this.ResponseMetadata.RequestId); - } - else - { - this.expires = null; - } - this.isExpiresUnmarshalled = true; - return this.expires.GetValueOrDefault(); - } - } - set { this.expires = value; this.isExpiresUnmarshalled = true; } - } - - // Check to see if Expires property is set - internal bool IsSetExpires() - { - return this.expires.HasValue; - } - /// /// Gets and sets the property WebsiteRedirectLocation. /// diff --git a/sdk/src/Services/S3/Custom/Model/GetObjectRequest.cs b/sdk/src/Services/S3/Custom/Model/GetObjectRequest.cs index 39130df683e5..314052be312f 100644 --- a/sdk/src/Services/S3/Custom/Model/GetObjectRequest.cs +++ b/sdk/src/Services/S3/Custom/Model/GetObjectRequest.cs @@ -212,8 +212,6 @@ public partial class GetObjectRequest : AmazonWebServiceRequest private string expectedBucketOwner; DateTime? modifiedSinceDate; DateTime? unmodifiedSinceDate; - DateTime? modifiedSinceDateUtc; - DateTime? unmodifiedSinceDateUtc; string etagToMatch; string etagToNotMatch; private string key; @@ -221,7 +219,6 @@ public partial class GetObjectRequest : AmazonWebServiceRequest private ByteRange byteRange; private RequestPayer requestPayer; private DateTime? responseExpires; - private DateTime? responseExpiresUtc; private ResponseHeaderOverrides responseHeaders; private ServerSideEncryptionCustomerMethod serverSideCustomerEncryption; private string serverSideEncryptionCustomerProvidedKey; @@ -312,129 +309,55 @@ internal bool IsSetExpectedBucketOwner() } /// - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use ModifiedSinceDateUtc instead. Setting either ModifiedSinceDate or - /// ModifiedSinceDateUtc results in both ModifiedSinceDate and ModifiedSinceDateUtc being assigned, - /// the latest assignment to either one of the two property is reflected in the value of both. - /// ModifiedSinceDate is provided for backwards compatibility only and assigning a non-Utc DateTime - /// to it results in the wrong timestamp being passed to the service. - /// /// Returns the object only if it has been modified since the specified time, /// otherwise returns a PreconditionFailed. /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use ModifiedSinceDateUtc instead. Setting either ModifiedSinceDate or ModifiedSinceDateUtc results in both ModifiedSinceDate and " + - "ModifiedSinceDateUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. ModifiedSinceDate is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] public DateTime? ModifiedSinceDate { - get { return this.modifiedSinceDate; } + get { return this.modifiedSinceDate ?? DateTime.SpecifyKind(default, DateTimeKind.Utc); } set { if (value == null) { - this.modifiedSinceDate = null; - this.modifiedSinceDateUtc = null; + this.modifiedSinceDate = null; } else { this.modifiedSinceDate = value; - this.modifiedSinceDateUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); } } } - /// - /// Returns the object only if it has been modified since the specified time, - /// otherwise returns a PreconditionFailed. - /// - public DateTime? ModifiedSinceDateUtc + // Check to see if ModifiedSinceDate property is set + internal bool IsSetModifiedSinceDate() { - get { return this.modifiedSinceDateUtc ?? default(DateTime); } - set - { - if (value == null) - { - this.modifiedSinceDate = null; - this.modifiedSinceDateUtc = null; - } - else - { - this.modifiedSinceDateUtc = value; - this.modifiedSinceDate = value; - } - } - } - - // Check to see if ModifiedSinceDateUtc property is set - internal bool IsSetModifiedSinceDateUtc() - { - return this.modifiedSinceDateUtc.HasValue; + return this.modifiedSinceDate.HasValue; } /// - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use UnmodifiedSinceDateUtc instead. Setting either UnmodifiedSinceDate or - /// UnmodifiedSinceDateUtc results in both UnmodifiedSinceDate and UnmodifiedSinceDateUtc being assigned, - /// the latest assignment to either one of the two property is reflected in the value of both. - /// UnmodifiedSinceDate is provided for backwards compatibility only and assigning a non-Utc DateTime - /// to it results in the wrong timestamp being passed to the service. - /// /// Returns the object only if it has not been modified since the specified time, /// otherwise returns a PreconditionFailed. /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use UnmodifiedSinceDateUtc instead. Setting either UnmodifiedSinceDate or UnmodifiedSinceDateUtc results in both UnmodifiedSinceDate and " + - "UnmodifiedSinceDateUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. UnmodifiedSinceDate is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] public DateTime? UnmodifiedSinceDate { - get { return this.unmodifiedSinceDate ?? default(DateTime); } + get { return this.unmodifiedSinceDate ?? DateTime.SpecifyKind(default, DateTimeKind.Utc); } set { if (value == null) { this.unmodifiedSinceDate = null; - this.unmodifiedSinceDateUtc = null; } else { this.unmodifiedSinceDate = value; - this.unmodifiedSinceDateUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); } } } - /// - /// Returns the object only if it has not been modified since the specified time, - /// otherwise returns a PreconditionFailed. - /// - public DateTime? UnmodifiedSinceDateUtc + // Check to see if UnmodifiedSinceDate property is set + internal bool IsSetUnmodifiedSinceDate() { - get { return this.unmodifiedSinceDateUtc ?? default(DateTime); } - set - { - if (value == null) - { - this.unmodifiedSinceDate = null; - this.unmodifiedSinceDateUtc = null; - } - else - { - this.unmodifiedSinceDateUtc = value; - this.unmodifiedSinceDate = value; - } - } - } - - // Check to see if UnmodifiedSinceDateUtc property is set - internal bool IsSetUnmodifiedSinceDateUtc() - { - return this.unmodifiedSinceDateUtc.HasValue; + return this.unmodifiedSinceDate.HasValue; } /// @@ -517,21 +440,8 @@ internal bool IsSetRequestPayer() } /// - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use ResponseExpiresUtc instead. Setting either ResponseExpires or - /// ResponseExpiresUtc results in both ResponseExpires and ResponseExpiresUtc being assigned, - /// the latest assignment to either one of the two property is reflected in the value of both. - /// ResponseExpires is provided for backwards compatibility only and assigning a non-Utc DateTime - /// to it results in the wrong timestamp being passed to the service. - /// /// Sets the Expires header of the response. /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use ResponseExpiresUtc instead. Setting either ResponseExpires or ResponseExpiresUtc results in both ResponseExpires and " + - "ResponseExpiresUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. ResponseExpires is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] public DateTime? ResponseExpires { get { return this.responseExpires; } @@ -539,42 +449,19 @@ public DateTime? ResponseExpires { if (value == null) { - this.responseExpires = null; - this.responseExpiresUtc = null; - } - else - { - this.responseExpires = value; - this.responseExpiresUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - } - } - - /// - /// Sets the Expires header of the response. - /// - public DateTime? ResponseExpiresUtc - { - get { return this.responseExpiresUtc; } - set - { - if (value == null) - { - this.responseExpires = null; - this.responseExpiresUtc = null; + this.responseExpires = null; } else { - this.responseExpiresUtc = value; this.responseExpires = value; } } } - // Check to see if ResponseExpiresUtc property is set - internal bool IsSetResponseExpiresUtc() + // Check to see if ResponseExpires property is set + internal bool IsSetResponseExpires() { - return this.responseExpiresUtc.HasValue; + return this.responseExpires.HasValue; } /// diff --git a/sdk/src/Services/S3/Custom/Model/HeadersCollection.cs b/sdk/src/Services/S3/Custom/Model/HeadersCollection.cs index 2fb985c26a67..ed2945257f9b 100644 --- a/sdk/src/Services/S3/Custom/Model/HeadersCollection.cs +++ b/sdk/src/Services/S3/Custom/Model/HeadersCollection.cs @@ -158,14 +158,14 @@ internal bool IsSetContentType() /// see https://www.rfc-editor.org/rfc/rfc7234#section-5.3. /// /// - public DateTime? ExpiresUtc + public DateTime? Expires { get { if (this["Expires"] == null) return null; - return DateTime.Parse(this["Expires"], CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal); + return DateTime.Parse(this["Expires"], CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal); } set { @@ -174,19 +174,6 @@ public DateTime? ExpiresUtc this["Expires"] = value.GetValueOrDefault().ToUniversalTime().ToString(Amazon.Util.AWSSDKUtils.RFC822DateFormat, CultureInfo.InvariantCulture); } - } - - /// - /// - /// The date and time at which the object is no longer cacheable. For more information, - /// see https://www.rfc-editor.org/rfc/rfc7234#section-5.3. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. Use ExpiresUtc instead.", false)] - public DateTime? Expires - { - get { return ExpiresUtc?.ToLocalTime(); } - set { ExpiresUtc = value == null ? (DateTime?)null : new DateTime(value.Value.Ticks, DateTimeKind.Utc); } - } + } } } diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/CopyObjectRequestMarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/CopyObjectRequestMarshaller.cs index f4533e628ae4..8a3808ec8d1a 100644 --- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/CopyObjectRequestMarshaller.cs +++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/CopyObjectRequestMarshaller.cs @@ -59,14 +59,14 @@ public IRequest Marshall(CopyObjectRequest copyObjectRequest) if (copyObjectRequest.IsSetETagToMatch()) request.Headers.Add(HeaderKeys.XAmzCopySourceIfMatchHeader, S3Transforms.ToStringValue(copyObjectRequest.ETagToMatch)); - if (copyObjectRequest.IsSetModifiedSinceDateUtc()) - request.Headers.Add(HeaderKeys.XAmzCopySourceIfModifiedSinceHeader, S3Transforms.ToStringValue(copyObjectRequest.ModifiedSinceDateUtc.Value)); + if (copyObjectRequest.IsSetModifiedSinceDate()) + request.Headers.Add(HeaderKeys.XAmzCopySourceIfModifiedSinceHeader, S3Transforms.ToStringValue(copyObjectRequest.ModifiedSinceDate.Value)); if (copyObjectRequest.IsSetETagToNotMatch()) request.Headers.Add(HeaderKeys.XAmzCopySourceIfNoneMatchHeader, S3Transforms.ToStringValue(copyObjectRequest.ETagToNotMatch)); - if (copyObjectRequest.IsSetUnmodifiedSinceDateUtc()) - request.Headers.Add(HeaderKeys.XAmzCopySourceIfUnmodifiedSinceHeader, S3Transforms.ToStringValue(copyObjectRequest.UnmodifiedSinceDateUtc.Value)); + if (copyObjectRequest.IsSetUnmodifiedSinceDate()) + request.Headers.Add(HeaderKeys.XAmzCopySourceIfUnmodifiedSinceHeader, S3Transforms.ToStringValue(copyObjectRequest.UnmodifiedSinceDate.Value)); if (copyObjectRequest.IsSetTaggingDirective()) { diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ExpirationUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ExpirationUnmarshaller.cs index 36e413a2fe0d..f2ec50d80454 100644 --- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ExpirationUnmarshaller.cs +++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/ExpirationUnmarshaller.cs @@ -44,7 +44,7 @@ public LifecycleRuleExpiration Unmarshall(XmlUnmarshallerContext context) { if (context.TestExpression("Date", targetDepth)) { - expiration.DateUtc = DateTimeUnmarshaller.GetInstance().Unmarshall(context); + expiration.Date = DateTimeUnmarshaller.GetInstance().Unmarshall(context); continue; } diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetObjectMetadataRequestMarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetObjectMetadataRequestMarshaller.cs index 604d275e6099..81c51a344915 100644 --- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetObjectMetadataRequestMarshaller.cs +++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetObjectMetadataRequestMarshaller.cs @@ -45,14 +45,14 @@ public IRequest Marshall(GetObjectMetadataRequest headObjectRequest) if(headObjectRequest.IsSetEtagToMatch()) request.Headers.Add(HeaderKeys.IfMatchHeader, S3Transforms.ToStringValue(headObjectRequest.EtagToMatch)); - if(headObjectRequest.IsSetModifiedSinceDateUtc()) - request.Headers.Add(HeaderKeys.IfModifiedSinceHeader, S3Transforms.ToStringValue(headObjectRequest.ModifiedSinceDateUtc.Value)); + if(headObjectRequest.IsSetModifiedSinceDate()) + request.Headers.Add(HeaderKeys.IfModifiedSinceHeader, S3Transforms.ToStringValue(headObjectRequest.ModifiedSinceDate.Value)); if(headObjectRequest.IsSetEtagToNotMatch()) request.Headers.Add(HeaderKeys.IfNoneMatchHeader, S3Transforms.ToStringValue(headObjectRequest.EtagToNotMatch)); - if(headObjectRequest.IsSetUnmodifiedSinceDateUtc()) - request.Headers.Add(HeaderKeys.IfUnmodifiedSinceHeader, S3Transforms.ToStringValue(headObjectRequest.UnmodifiedSinceDateUtc.Value)); + if(headObjectRequest.IsSetUnmodifiedSinceDate()) + request.Headers.Add(HeaderKeys.IfUnmodifiedSinceHeader, S3Transforms.ToStringValue(headObjectRequest.UnmodifiedSinceDate.Value)); if (headObjectRequest.IsSetServerSideEncryptionCustomerMethod()) request.Headers.Add(HeaderKeys.XAmzSSECustomerAlgorithmHeader, headObjectRequest.ServerSideEncryptionCustomerMethod); diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetObjectRequestMarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetObjectRequestMarshaller.cs index a8fd84c18853..fa8a43f2fe8a 100644 --- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetObjectRequestMarshaller.cs +++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/GetObjectRequestMarshaller.cs @@ -45,14 +45,14 @@ public IRequest Marshall(GetObjectRequest getObjectRequest) if (getObjectRequest.IsSetEtagToMatch()) request.Headers.Add(HeaderKeys.IfMatchHeader, S3Transforms.ToStringValue(getObjectRequest.EtagToMatch)); - if (getObjectRequest.IsSetModifiedSinceDateUtc()) - request.Headers.Add(HeaderKeys.IfModifiedSinceHeader, S3Transforms.ToStringValue(getObjectRequest.ModifiedSinceDateUtc.Value)); + if (getObjectRequest.IsSetModifiedSinceDate()) + request.Headers.Add(HeaderKeys.IfModifiedSinceHeader, S3Transforms.ToStringValue(getObjectRequest.ModifiedSinceDate.Value)); if (getObjectRequest.IsSetEtagToNotMatch()) request.Headers.Add(HeaderKeys.IfNoneMatchHeader, S3Transforms.ToStringValue(getObjectRequest.EtagToNotMatch)); - if(getObjectRequest.IsSetUnmodifiedSinceDateUtc()) - request.Headers.Add(HeaderKeys.IfUnmodifiedSinceHeader, S3Transforms.ToStringValue(getObjectRequest.UnmodifiedSinceDateUtc.Value)); + if(getObjectRequest.IsSetUnmodifiedSinceDate()) + request.Headers.Add(HeaderKeys.IfUnmodifiedSinceHeader, S3Transforms.ToStringValue(getObjectRequest.UnmodifiedSinceDate.Value)); if(getObjectRequest.IsSetByteRange()) request.Headers.Add(HeaderKeys.RangeHeader, getObjectRequest.ByteRange.FormattedByteRange); @@ -96,8 +96,8 @@ public IRequest Marshall(GetObjectRequest getObjectRequest) request.Parameters.Add("response-content-language", S3Transforms.ToStringValue(headerOverrides.ContentLanguage)); if (headerOverrides.ContentType != null) request.Parameters.Add("response-content-type", S3Transforms.ToStringValue(headerOverrides.ContentType)); - if (getObjectRequest.IsSetResponseExpiresUtc()) - request.Parameters.Add("response-expires", S3Transforms.ToStringValue(getObjectRequest.ResponseExpiresUtc.Value)); + if (getObjectRequest.IsSetResponseExpires()) + request.Parameters.Add("response-expires", S3Transforms.ToStringValue(getObjectRequest.ResponseExpires.Value)); if (getObjectRequest.IsSetVersionId()) request.AddSubResource("versionId", S3Transforms.ToStringValue(getObjectRequest.VersionId)); if (getObjectRequest.IsSetPartNumber()) diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PutLifecycleConfigurationRequestMarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PutLifecycleConfigurationRequestMarshaller.cs index f032bf0d0a93..8ab123a39525 100644 --- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PutLifecycleConfigurationRequestMarshaller.cs +++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PutLifecycleConfigurationRequestMarshaller.cs @@ -78,9 +78,9 @@ public IRequest Marshall(PutLifecycleConfigurationRequest putLifecycleConfigurat if (expiration != null) { xmlWriter.WriteStartElement("Expiration"); - if (expiration.IsSetDateUtc()) + if (expiration.IsSetDate()) { - xmlWriter.WriteElementString("Date", S3Transforms.ToXmlStringValue(expiration.DateUtc.Value)); + xmlWriter.WriteElementString("Date", StringUtils.FromDateTimeToISO8601WithOptionalMs(expiration.Date.Value)); } if (expiration.IsSetDays()) { @@ -101,9 +101,9 @@ public IRequest Marshall(PutLifecycleConfigurationRequest putLifecycleConfigurat if (transition != null) { xmlWriter.WriteStartElement("Transition"); - if (transition.IsSetDateUtc()) + if (transition.IsSetDate()) { - xmlWriter.WriteElementString("Date", S3Transforms.ToXmlStringValue(transition.DateUtc.Value)); + xmlWriter.WriteElementString("Date", StringUtils.FromDateTimeToISO8601WithOptionalMs(transition.Date.Value)); } if (transition.IsSetDays()) { diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PutObjectRetentionRequestMarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PutObjectRetentionRequestMarshaller.cs index da95b4d01cde..164d83ceaae8 100644 --- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PutObjectRetentionRequestMarshaller.cs +++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PutObjectRetentionRequestMarshaller.cs @@ -90,7 +90,7 @@ public IRequest Marshall(PutObjectRetentionRequest publicRequest) xmlWriter.WriteElementString("Mode", StringUtils.FromString(publicRequest.Retention.Mode)); if(publicRequest.Retention.IsSetRetainUntilDate()) - xmlWriter.WriteElementString("RetainUntilDate", StringUtils.FromDateTimeToISO8601(publicRequest.Retention.RetainUntilDate.Value)); + xmlWriter.WriteElementString("RetainUntilDate", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.Retention.RetainUntilDate.Value)); xmlWriter.WriteEndElement(); diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/S3Transforms.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/S3Transforms.cs index 6945ee6280b2..4a21d0a21752 100644 --- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/S3Transforms.cs +++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/S3Transforms.cs @@ -101,7 +101,6 @@ internal static string ToXmlStringValue(bool value) internal static DateTime ToDateTime(string value) { - //return DateTime.ParseExact(value, AWSSDKUtils.RFC822DateFormat, CultureInfo.InvariantCulture); DateTime result = (DateTime)Convert.ChangeType(value, typeof(DateTime), System.Globalization.CultureInfo.InvariantCulture); result = result.ToUniversalTime(); return result; diff --git a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/TransitionUnmarshaller.cs b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/TransitionUnmarshaller.cs index f73fa1888fc1..7c2d26086f33 100644 --- a/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/TransitionUnmarshaller.cs +++ b/sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/TransitionUnmarshaller.cs @@ -44,7 +44,7 @@ public LifecycleTransition Unmarshall(XmlUnmarshallerContext context) { if (context.TestExpression("Date", targetDepth)) { - transition.DateUtc = DateTimeUnmarshaller.GetInstance().Unmarshall(context); + transition.Date = DateTimeUnmarshaller.GetInstance().Unmarshall(context); continue; } diff --git a/sdk/src/Services/S3/Custom/Model/LifecycleRuleExpiration.cs b/sdk/src/Services/S3/Custom/Model/LifecycleRuleExpiration.cs index 9651536900d1..987be75a8c1e 100644 --- a/sdk/src/Services/S3/Custom/Model/LifecycleRuleExpiration.cs +++ b/sdk/src/Services/S3/Custom/Model/LifecycleRuleExpiration.cs @@ -32,7 +32,6 @@ namespace Amazon.S3.Model public class LifecycleRuleExpiration { private DateTime? date; - private DateTime? dateUtc; private int? days; private bool? expiredObjectDeleteMarker; @@ -40,39 +39,16 @@ public class LifecycleRuleExpiration /// Indicates at what date the object is to be moved or deleted. The date value must conform /// to the ISO 8601 format. The time is always midnight UTC. /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. Use DateUtc instead.", false)] public DateTime? Date { get { return this.date; } - set - { - this.date = value; - - if (value.HasValue) - { - this.dateUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this.dateUtc = null; - } - } - } - - /// - /// Indicates at what date the object is to be moved or deleted. The date value must conform - /// to the ISO 8601 format. The time is always midnight UTC. - /// - public DateTime? DateUtc - { - get { return this.dateUtc; } - set { this.dateUtc = this.date = value; } + set { this.date = value; } } - // Check to see if DateUtc property is set - internal bool IsSetDateUtc() + // Check to see if Date property is set + internal bool IsSetDate() { - return this.dateUtc.HasValue; + return this.date.HasValue; } /// diff --git a/sdk/src/Services/S3/Custom/Model/LifecycleTransition.cs b/sdk/src/Services/S3/Custom/Model/LifecycleTransition.cs index c024d988a57e..9397afd540fd 100644 --- a/sdk/src/Services/S3/Custom/Model/LifecycleTransition.cs +++ b/sdk/src/Services/S3/Custom/Model/LifecycleTransition.cs @@ -27,44 +27,22 @@ public class LifecycleTransition { private DateTime? date; - private DateTime? dateUtc; private int? days; private S3StorageClass storageClass; /// /// Indicates at what date the object is to be moved or deleted. Should be in GMT ISO 8601 Format. /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. Use DateUtc instead.", false)] public DateTime? Date { get { return this.date; } - set - { - this.date = value; - if (value != null) - { - this.dateUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this.dateUtc = null; - } - } + set { this.date = value; } } - /// - /// Indicates at what date the object is to be moved or deleted. Should be in GMT ISO 8601 Format. - /// - public DateTime? DateUtc - { - get { return this.dateUtc; } - set { this.dateUtc = this.date = value; } - } - - // Check to see if DateUtc property is set - internal bool IsSetDateUtc() + // Check to see if Date property is set + internal bool IsSetDate() { - return this.dateUtc.HasValue; + return this.date.HasValue; } /// diff --git a/sdk/src/Services/S3/Custom/Transfer/BaseDownloadRequest.cs b/sdk/src/Services/S3/Custom/Transfer/BaseDownloadRequest.cs index 2f5606ca5d11..d29a3747f24a 100644 --- a/sdk/src/Services/S3/Custom/Transfer/BaseDownloadRequest.cs +++ b/sdk/src/Services/S3/Custom/Transfer/BaseDownloadRequest.cs @@ -37,8 +37,6 @@ public abstract class BaseDownloadRequest private string versionId; private DateTime? modifiedSinceDate; private DateTime? unmodifiedSinceDate; - private DateTime? modifiedSinceDateUtc; - private DateTime? unmodifiedSinceDateUtc; private ChecksumMode checksumMode; private ServerSideEncryptionCustomerMethod serverSideCustomerEncryption; @@ -115,108 +113,48 @@ public string VersionId internal bool IsSetVersionId() { return !System.String.IsNullOrEmpty(this.versionId); - } + } /// - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use ModifiedSinceDateUtc instead. Setting either ModifiedSinceDate or - /// ModifiedSinceDateUtc results in both ModifiedSinceDate and ModifiedSinceDateUtc being assigned, - /// the latest assignment to either one of the two property is reflected in the value of both. - /// ModifiedSinceDate is provided for backwards compatibility only and assigning a non-Utc DateTime - /// to it results in the wrong timestamp being passed to the service. - /// /// Gets or sets the ModifiedSinceDate property. /// /// /// The ModifiedSinceDate property. /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use ModifiedSinceDateUtc instead. Setting either ModifiedSinceDate or ModifiedSinceDateUtc results in both ModifiedSinceDate and " + - "ModifiedSinceDateUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. ModifiedSinceDate is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] public DateTime ModifiedSinceDate { - get { return this.modifiedSinceDate.GetValueOrDefault(); } - set - { - this.modifiedSinceDate = value; - this.modifiedSinceDateUtc = new DateTime(value.Ticks, DateTimeKind.Utc); - } - } - - /// - /// Gets or sets the ModifiedSinceDate property. - /// - /// - /// The ModifiedSinceDate property. - /// - public DateTime ModifiedSinceDateUtc - { - get { return this.modifiedSinceDateUtc ?? default(DateTime); } + get { return this.modifiedSinceDate ?? DateTime.SpecifyKind(default, DateTimeKind.Utc); } set { - this.modifiedSinceDateUtc = value; this.modifiedSinceDate = value; } } - // Check to see if ModifiedSinceDateUtc property is set - internal bool IsSetModifiedSinceDateUtc() + // Check to see if ModifiedSinceDate property is set + internal bool IsSetModifiedSinceDate() { - return this.modifiedSinceDateUtc.HasValue; + return this.modifiedSinceDate.HasValue; } /// - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use UnmodifiedSinceDateUtc instead. Setting either UnmodifiedSinceDate or - /// UnmodifiedSinceDateUtc results in both UnmodifiedSinceDate and UnmodifiedSinceDateUtc being assigned, - /// the latest assignment to either one of the two property is reflected in the value of both. - /// UnmodifiedSinceDate is provided for backwards compatibility only and assigning a non-Utc DateTime - /// to it results in the wrong timestamp being passed to the service. - /// /// Gets or sets the UnmodifiedSinceDate property. /// /// /// The UnmodifiedSinceDate property. /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use UnmodifiedSinceDateUtc instead. Setting either UnmodifiedSinceDate or UnmodifiedSinceDateUtc results in both UnmodifiedSinceDate and " + - "UnmodifiedSinceDateUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. UnmodifiedSinceDate is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] public DateTime UnmodifiedSinceDate { - get { return this.unmodifiedSinceDate.GetValueOrDefault(); } - set - { - this.unmodifiedSinceDate = value; - this.unmodifiedSinceDateUtc = new DateTime(value.Ticks, DateTimeKind.Utc); - } - } - - /// - /// Gets or sets the UnmodifiedSinceDate property. - /// - /// - /// The UnmodifiedSinceDate property. - /// - public DateTime UnmodifiedSinceDateUtc - { - get { return this.unmodifiedSinceDateUtc ?? default(DateTime); } + get { return this.unmodifiedSinceDate ?? DateTime.SpecifyKind(default, DateTimeKind.Utc); } set { - this.unmodifiedSinceDateUtc = value; this.unmodifiedSinceDate = value; } } - // Check to see if UnmodifiedSinceDateUtc property is set - internal bool IsSetUnmodifiedSinceDateUtc() + // Check to see if UnmodifiedSinceDate property is set + internal bool IsSetUnmodifiedSinceDate() { - return this.unmodifiedSinceDateUtc.HasValue; + return this.unmodifiedSinceDate.HasValue; } /// diff --git a/sdk/src/Services/S3/Custom/Transfer/Internal/BaseCommand.cs b/sdk/src/Services/S3/Custom/Transfer/Internal/BaseCommand.cs index 1951688e1101..76a45216a141 100644 --- a/sdk/src/Services/S3/Custom/Transfer/Internal/BaseCommand.cs +++ b/sdk/src/Services/S3/Custom/Transfer/Internal/BaseCommand.cs @@ -46,13 +46,13 @@ protected GetObjectRequest ConvertToGetObjectRequest(BaseDownloadRequest request }; ((Amazon.Runtime.Internal.IAmazonWebServiceRequest)getRequest).AddBeforeRequestHandler(this.RequestEventHandler); - if (request.IsSetModifiedSinceDateUtc()) + if (request.IsSetModifiedSinceDate()) { - getRequest.ModifiedSinceDateUtc = request.ModifiedSinceDateUtc; + getRequest.ModifiedSinceDate = request.ModifiedSinceDate; } - if (request.IsSetUnmodifiedSinceDateUtc()) + if (request.IsSetUnmodifiedSinceDate()) { - getRequest.UnmodifiedSinceDateUtc = request.UnmodifiedSinceDateUtc; + getRequest.UnmodifiedSinceDate = request.UnmodifiedSinceDate; } getRequest.ServerSideEncryptionCustomerMethod = request.ServerSideEncryptionCustomerMethod; diff --git a/sdk/src/Services/S3/Custom/Transfer/Internal/DownloadDirectoryCommand.cs b/sdk/src/Services/S3/Custom/Transfer/Internal/DownloadDirectoryCommand.cs index 3b2842b0c2a5..9a529f413df4 100644 --- a/sdk/src/Services/S3/Custom/Transfer/Internal/DownloadDirectoryCommand.cs +++ b/sdk/src/Services/S3/Custom/Transfer/Internal/DownloadDirectoryCommand.cs @@ -196,20 +196,12 @@ private bool IsInstructionFile(string key) private bool ShouldDownload(S3Object s3o) { - // skip objects based on ModifiedSinceDateUtc - if (this._request.IsSetModifiedSinceDateUtc() && s3o.LastModified.GetValueOrDefault().ToUniversalTime() <= this._request.ModifiedSinceDateUtc.ToUniversalTime()) - return false; - // skip objects based on UnmodifiedSinceDateUtc - if (this._request.IsSetUnmodifiedSinceDateUtc() && s3o.LastModified.GetValueOrDefault().ToUniversalTime() > this._request.UnmodifiedSinceDateUtc.ToUniversalTime()) - return false; -#pragma warning disable CS0618 //A class member was marked with the Obsolete attribute // skip objects based on ModifiedSinceDate - if (this._request.IsSetModifiedSinceDate() && s3o.LastModified <= this._request.ModifiedSinceDate) + if (this._request.IsSetModifiedSinceDate() && s3o.LastModified.GetValueOrDefault().ToUniversalTime() <= this._request.ModifiedSinceDate.ToUniversalTime()) return false; // skip objects based on UnmodifiedSinceDate - if (this._request.IsSetUnmodifiedSinceDate() && s3o.LastModified > this._request.UnmodifiedSinceDate) + if (this._request.IsSetUnmodifiedSinceDate() && s3o.LastModified.GetValueOrDefault().ToUniversalTime() > this._request.UnmodifiedSinceDate.ToUniversalTime()) return false; -#pragma warning restore CS0618 //A class member was marked with the Obsolete attribute // skip objects which are instruction files and we're using encryption client if (IsInstructionFile(s3o.Key)) return false; diff --git a/sdk/src/Services/S3/Custom/Transfer/TransferUtilityDownloadDirectoryRequest.cs b/sdk/src/Services/S3/Custom/Transfer/TransferUtilityDownloadDirectoryRequest.cs index 5ab832de5978..2bffe3c249bb 100644 --- a/sdk/src/Services/S3/Custom/Transfer/TransferUtilityDownloadDirectoryRequest.cs +++ b/sdk/src/Services/S3/Custom/Transfer/TransferUtilityDownloadDirectoryRequest.cs @@ -44,8 +44,6 @@ public class TransferUtilityDownloadDirectoryRequest private bool downloadFilesConcurrently = false; private DateTime? modifiedSinceDate; private DateTime? unmodifiedSinceDate; - private DateTime? modifiedSinceDateUtc; - private DateTime? unmodifiedSinceDateUtc; private bool disableSlashCorrection = false; private ServerSideEncryptionCustomerMethod serverSideCustomerEncryption; @@ -135,10 +133,6 @@ internal bool IsSetS3Directory() } /// - /// - /// This property is deprecated. This property doesn't honor the DateTimeKind, please - /// use ModifiedSinceDateUtc instead. - /// /// Gets or sets the ModifiedSinceDate property. /// Only objects that have been modified since this date will be /// downloaded. @@ -146,7 +140,6 @@ internal bool IsSetS3Directory() /// /// The ModifiedSinceDate property. /// - [Obsolete("This property doesn't honor the DateTimeKind, please use ModifiedSinceDateUtc instead.", false)] public DateTime ModifiedSinceDate { get { return this.modifiedSinceDate.GetValueOrDefault(); } @@ -164,41 +157,12 @@ internal bool IsSetModifiedSinceDate() } /// - /// Gets or sets the ModifiedSinceDateUtc property. - /// Only objects that have been modified since this date will be - /// downloaded. - /// - /// - /// The ModifiedSinceDateUtc property. - /// - public DateTime ModifiedSinceDateUtc - { - get { return this.modifiedSinceDateUtc.GetValueOrDefault(); } - set { this.modifiedSinceDateUtc = value; } - } - - /// - /// Checks if ModifiedSinceDateUtc property is set. - /// - /// A value of true if ModifiedSinceDateUtc property is set. - /// Otherwise, returns false. - internal bool IsSetModifiedSinceDateUtc() - { - return modifiedSinceDateUtc.HasValue; - } - - /// - /// - /// This property is deprecated. This property doesn't honor the DateTimeKind, please - /// use UnmodifiedSinceDateUtc instead. - /// /// Gets or sets the UnmodifiedSinceDate property. /// Only objects that have not been modified since this date will be downloaded. /// /// /// The UnmodifiedSinceDate property. /// - [Obsolete("This property doesn't honor the DateTimeKind, please use UnmodifiedSinceDateUtc instead.", false)] public DateTime UnmodifiedSinceDate { get { return this.unmodifiedSinceDate.GetValueOrDefault(); } @@ -214,28 +178,6 @@ internal bool IsSetUnmodifiedSinceDate() return unmodifiedSinceDate.HasValue; } - /// - /// Gets or sets the UnmodifiedSinceDateUtc property. - /// Only objects that have not been modified since this date will be downloaded. - /// - /// - /// The UnmodifiedSinceDateUtc property. - /// - public DateTime UnmodifiedSinceDateUtc - { - get { return this.unmodifiedSinceDateUtc.GetValueOrDefault(); } - set { this.unmodifiedSinceDateUtc = value; } - } - - /// - /// Checks if UnmodifiedSinceDateUtc property is set. - /// - /// true if UnmodifiedSinceDateUtc property is set. - internal bool IsSetUnmodifiedSinceDateUtc() - { - return unmodifiedSinceDateUtc.HasValue; - } - /// /// Gets or sets the DownloadFilesConcurrently property. /// Specifies if multiple files will be downloaded concurrently. diff --git a/sdk/src/Services/S3/Custom/Util/AmazonS3Util.cs b/sdk/src/Services/S3/Custom/Util/AmazonS3Util.cs index 7e3a5254408a..0a64b60118d7 100644 --- a/sdk/src/Services/S3/Custom/Util/AmazonS3Util.cs +++ b/sdk/src/Services/S3/Custom/Util/AmazonS3Util.cs @@ -702,7 +702,7 @@ public static async System.Threading.Tasks.Task DoesS3BucketExistAsync(IAm var parameters = new ServiceOperationEndpointParameters(request); var endpoint = s3Client.Config.DetermineServiceOperationEndpoint(parameters); - request.Expires = CorrectClockSkew.GetCorrectedUtcNowForEndpoint(endpoint.URL).ToLocalTime().AddDays(1); + request.Expires = CorrectClockSkew.GetCorrectedUtcNowForEndpoint(endpoint.URL).AddDays(1); var url = s3Client.GetPreSignedURL(request); var uri = new Uri(url); diff --git a/sdk/src/Services/S3/Custom/Util/BucketRegionDetector.cs b/sdk/src/Services/S3/Custom/Util/BucketRegionDetector.cs index 39a53c87205d..fa1d5339f1c4 100644 --- a/sdk/src/Services/S3/Custom/Util/BucketRegionDetector.cs +++ b/sdk/src/Services/S3/Custom/Util/BucketRegionDetector.cs @@ -138,7 +138,7 @@ private static string GetHeadBucketPreSignedUrl(string bucketName, IRequestConte var parameters = new ServiceOperationEndpointParameters(request); var endpoint = s3Client.Config.DetermineServiceOperationEndpoint(parameters); - request.Expires = CorrectClockSkew.GetCorrectedUtcNowForEndpoint(endpoint.URL).ToLocalTime().AddDays(1); + request.Expires = CorrectClockSkew.GetCorrectedUtcNowForEndpoint(endpoint.URL).AddDays(1); return s3Client.GetPreSignedURLInternal(request, false); } diff --git a/sdk/src/Services/S3/Custom/Util/S3EventNotification.cs b/sdk/src/Services/S3/Custom/Util/S3EventNotification.cs index 3fdd04b3fada..873d02836e5c 100644 --- a/sdk/src/Services/S3/Custom/Util/S3EventNotification.cs +++ b/sdk/src/Services/S3/Custom/Util/S3EventNotification.cs @@ -42,7 +42,7 @@ public static S3EventNotification ParseJson(string json) record.AwsRegion = GetValueAsString(jsonRecord, "awsRegion"); if (jsonRecord["eventTime"] != null) - record.EventTime = DateTime.Parse((string)jsonRecord["eventTime"], CultureInfo.InvariantCulture); + record.EventTime = DateTime.Parse((string)jsonRecord["eventTime"], CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal); if (jsonRecord["eventName"] != null) { var eventName = (string)jsonRecord["eventName"]; @@ -360,7 +360,7 @@ private static string GetValueAsString(JsonData data, string key) if (string.IsNullOrEmpty(str)) return null; - return DateTime.Parse(str, CultureInfo.InvariantCulture); + return DateTime.Parse(str, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal); } private static long GetValueAsLong(JsonData data, string key) diff --git a/sdk/src/Services/S3/Custom/Util/_bcl/AmazonS3Util.Operations.cs b/sdk/src/Services/S3/Custom/Util/_bcl/AmazonS3Util.Operations.cs index 19056ac16ba7..ce2af47a67b9 100644 --- a/sdk/src/Services/S3/Custom/Util/_bcl/AmazonS3Util.Operations.cs +++ b/sdk/src/Services/S3/Custom/Util/_bcl/AmazonS3Util.Operations.cs @@ -104,7 +104,7 @@ public static bool DoesS3BucketExist(IAmazonS3 s3Client, string bucketName) var parameters = new ServiceOperationEndpointParameters(request); var endpoint = config.DetermineServiceOperationEndpoint(parameters); - request.Expires = CorrectClockSkew.GetCorrectedUtcNowForEndpoint(endpoint.URL).ToLocalTime().AddDays(1); + request.Expires = CorrectClockSkew.GetCorrectedUtcNowForEndpoint(endpoint.URL).AddDays(1); var url = s3Client.GetPreSignedURL(request); var uri = new Uri(url); diff --git a/sdk/src/Services/S3/Custom/_bcl/IO/S3DirectoryInfo.cs b/sdk/src/Services/S3/Custom/_bcl/IO/S3DirectoryInfo.cs index b4c67b1f1580..9ac73aabeefa 100644 --- a/sdk/src/Services/S3/Custom/_bcl/IO/S3DirectoryInfo.cs +++ b/sdk/src/Services/S3/Custom/_bcl/IO/S3DirectoryInfo.cs @@ -299,7 +299,8 @@ public DateTime LastWriteTime } } - return ret; + //This is a value use of .ToLocalTime because there is both LastWriteTime and LastWriteTimeUtc for S3DirectoryInfo operations. + return ret.ToLocalTime(); } } diff --git a/sdk/src/Services/S3/Custom/_bcl/IO/S3FileInfo.cs b/sdk/src/Services/S3/Custom/_bcl/IO/S3FileInfo.cs index aed74189341c..9f1353e491dd 100644 --- a/sdk/src/Services/S3/Custom/_bcl/IO/S3FileInfo.cs +++ b/sdk/src/Services/S3/Custom/_bcl/IO/S3FileInfo.cs @@ -184,11 +184,6 @@ public DateTime LastWriteTime DateTime ret = DateTime.MinValue; if (Exists) { - //ret = s3Client.GetObjectMetadata(new GetObjectMetadataRequest() - // .WithBucketName(bucket) - // .WithKey(S3Helper.EncodeKey(key)) - // .WithBeforeRequestHandler(S3Helper.FileIORequestEventHandler) as GetObjectMetadataRequest) - // .LastModified.ToLocalTime(); var request = new GetObjectMetadataRequest { BucketName = bucket, @@ -196,6 +191,8 @@ public DateTime LastWriteTime }; ((Amazon.Runtime.Internal.IAmazonWebServiceRequest)request).AddBeforeRequestHandler(S3Helper.FileIORequestEventHandler); var response = s3Client.GetObjectMetadata(request); + + //This is a value use of .ToLocalTime because there is both LastWriteTime and LastWriteTimeUtc for S3FileInfo operations. ret = response.LastModified.GetValueOrDefault().ToLocalTime(); } return ret; @@ -215,11 +212,6 @@ public DateTime LastWriteTimeUtc DateTime ret = DateTime.MinValue; if (Exists) { - //ret = s3Client.GetObjectMetadata(new GetObjectMetadataRequest() - // .WithBucketName(bucket) - // .WithKey(S3Helper.EncodeKey(key)) - // .WithBeforeRequestHandler(S3Helper.FileIORequestEventHandler) as GetObjectMetadataRequest) - // .LastModified; var request = new GetObjectMetadataRequest { BucketName = bucket, diff --git a/sdk/src/Services/SimpleDB/Custom/Util/AmazonSimpleDBUtil.cs b/sdk/src/Services/SimpleDB/Custom/Util/AmazonSimpleDBUtil.cs index be6bfe28f0c4..b52a07836540 100644 --- a/sdk/src/Services/SimpleDB/Custom/Util/AmazonSimpleDBUtil.cs +++ b/sdk/src/Services/SimpleDB/Custom/Util/AmazonSimpleDBUtil.cs @@ -170,6 +170,7 @@ public static float DecodeRealNumberRangeFloat(string value, int maxDigitsRight, /// string representation of the date value public static string EncodeDate(DateTime date) { + //TODO: ERROR? the dateformat is in localtime... return date.ToString(dateFormat, CultureInfo.InvariantCulture); } @@ -180,7 +181,7 @@ public static string EncodeDate(DateTime date) /// original date value public static DateTime DecodeDate(string value) { - return DateTime.ParseExact(value, dateFormat, CultureInfo.InvariantCulture); + return DateTime.ParseExact(value, dateFormat, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal); } /// diff --git a/sdk/test/Common/Utils/Servlet.cs b/sdk/test/Common/Utils/Servlet.cs index b7ff2731cde0..7dc3b8bcceb8 100644 --- a/sdk/test/Common/Utils/Servlet.cs +++ b/sdk/test/Common/Utils/Servlet.cs @@ -105,7 +105,7 @@ private static int FindFreePort() private static int RandomPort() { if (_random == null) - _random = new Random((int)DateTime.Now.Ticks); + _random = new Random((int)DateTime.UtcNow.Ticks); return _random.Next(10000, 11000); } @@ -140,7 +140,7 @@ private void HttpWebListenerCallback(IAsyncResult result) if (Debug) { - Console.WriteLine(DateTime.Now.ToString() + "Handling request"); + Console.WriteLine(DateTime.UtcNow.ToString() + "Handling request"); Console.WriteLine("\tRequest url - " + context.Request.Url); Console.WriteLine("\tHost address - " + context.Request.UserHostAddress); Console.WriteLine("\tServlet type - " + this.GetType().FullName); diff --git a/sdk/test/IntegrationTests/Tests/General.cs b/sdk/test/IntegrationTests/Tests/General.cs index 673966a4b8a0..b7dd6b8238b2 100644 --- a/sdk/test/IntegrationTests/Tests/General.cs +++ b/sdk/test/IntegrationTests/Tests/General.cs @@ -660,7 +660,7 @@ protected override CredentialsRefreshState GenerateNewCredentials() } else { - var now = DateTime.Now; + var now = DateTime.UtcNow; expiration = now + expireOffset; } @@ -776,16 +776,19 @@ private static void TestServiceCallForClockSkew(ClockSkewTestContext context) #pragma warning disable CS0618 // Type or member is obsolete Assert.IsTrue(AWSConfigs.ClockOffset == TimeSpan.Zero); +#pragma warning restore CS0618 // Re-enable the warning SetClockSkewCorrection(IncorrectPositiveClockSkewOffset); context.TestAction(); #pragma warning disable CS0618 // Type or member is obsolete Assert.AreEqual(IncorrectPositiveClockSkewOffset, AWSConfigs.ClockOffset); +#pragma warning restore CS0618 // Re-enable the warning SetClockSkewCorrection(IncorrectNegativeClockSkewOffset); context.TestAction(); #pragma warning disable CS0618 // Type or member is obsolete Assert.AreEqual(IncorrectNegativeClockSkewOffset, AWSConfigs.ClockOffset); +#pragma warning restore CS0618 // Re-enable the warning Console.WriteLine("Simulating positive clock skew"); SetUtcNowSource(() => DateTime.UtcNow + IncorrectPositiveClockSkewOffset); diff --git a/sdk/test/IntegrationTests/Utils/ConsoleTraceListener.cs b/sdk/test/IntegrationTests/Utils/ConsoleTraceListener.cs index d4bcf2b8b481..82c228111244 100644 --- a/sdk/test/IntegrationTests/Utils/ConsoleTraceListener.cs +++ b/sdk/test/IntegrationTests/Utils/ConsoleTraceListener.cs @@ -18,6 +18,7 @@ private static string TimeStamp { get { + // Since there is no date associated with the TimeStamp we will output the time as local time to the console. var now = DateTime.Now; return now.ToString("HH:mm:ss:fffffff"); } diff --git a/sdk/test/IntegrationTests/Utils/UtilityMethods.cs b/sdk/test/IntegrationTests/Utils/UtilityMethods.cs index 226537d325c1..b07aa9d9aa5e 100644 --- a/sdk/test/IntegrationTests/Utils/UtilityMethods.cs +++ b/sdk/test/IntegrationTests/Utils/UtilityMethods.cs @@ -35,7 +35,7 @@ public static string AccountId { var createRequest = new CreateTopicRequest { - Name = "sdk-accountid-lookup" + DateTime.Now.Ticks + Name = "sdk-accountid-lookup" + DateTime.UtcNow.Ticks }; using(var snsClient = new AmazonSimpleNotificationServiceClient()) { @@ -218,9 +218,9 @@ public static void WaitUntil(Func matchFunction, ListSleeper sleeper, int if (maxWaitSeconds < 0) throw new ArgumentOutOfRangeException("maxWaitSeconds"); var maxTime = TimeSpan.FromSeconds(maxWaitSeconds); - var endTime = DateTime.Now + maxTime; + var endTime = DateTime.UtcNow + maxTime; - while(DateTime.Now < endTime) + while(DateTime.UtcNow < endTime) { if (matchFunction()) return; diff --git a/sdk/test/NetStandard/IntegrationTests/Framework/UtilityMethods.cs b/sdk/test/NetStandard/IntegrationTests/Framework/UtilityMethods.cs index ce4832b23f26..253f591edc13 100644 --- a/sdk/test/NetStandard/IntegrationTests/Framework/UtilityMethods.cs +++ b/sdk/test/NetStandard/IntegrationTests/Framework/UtilityMethods.cs @@ -38,7 +38,7 @@ public static string AccountId { var createRequest = new CreateTopicRequest { - Name = "sdk-accountid-lookup" + DateTime.Now.Ticks + Name = "sdk-accountid-lookup" + DateTime.UtcNow.Ticks }; using (var snsClient = CreateClient()) { @@ -57,7 +57,7 @@ public static string AccountId public async static Task CreateBucketAsync(IAmazonS3 s3Client, string testName, bool setPublicACLs = false) { - string bucketName = string.Format("{0}-{1}-{2}", UtilityMethods.SDK_TEST_PREFIX, testName, DateTime.Now.Ticks).ToLower().Replace('_','-'); + string bucketName = string.Format("{0}-{1}-{2}", UtilityMethods.SDK_TEST_PREFIX, testName, DateTime.UtcNow.Ticks).ToLower().Replace('_','-'); await s3Client.PutBucketAsync(new PutBucketRequest { BucketName = bucketName }); if (setPublicACLs) { @@ -313,9 +313,9 @@ public static void WaitUntil(Func matchFunction, int sleepSeconds = 5, int var sleepTime = TimeSpan.FromSeconds(sleepSeconds); var maxTime = TimeSpan.FromSeconds(maxWaitSeconds); - var endTime = DateTime.Now + maxTime; + var endTime = DateTime.UtcNow + maxTime; - while (DateTime.Now < endTime) + while (DateTime.UtcNow < endTime) { if (matchFunction()) return; diff --git a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/Beanstalk.cs b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/Beanstalk.cs index 16579d0732b1..83607d11d2b9 100644 --- a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/Beanstalk.cs +++ b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/Beanstalk.cs @@ -32,7 +32,7 @@ public async Task CheckDNSAvailabilityTest() { CheckDNSAvailabilityRequest request = new CheckDNSAvailabilityRequest() { - CNAMEPrefix = "mycnamecheck" + DateTime.Now.Ticks + CNAMEPrefix = "mycnamecheck" + DateTime.UtcNow.Ticks }; CheckDNSAvailabilityResponse response = await Client.CheckDNSAvailabilityAsync(request); diff --git a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/CloudFormation.cs b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/CloudFormation.cs index 1dcf8e7a50e2..1e501058773d 100644 --- a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/CloudFormation.cs +++ b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/CloudFormation.cs @@ -136,7 +136,7 @@ public void EstimateCostTest() [Trait(CategoryAttribute,"CloudFormation")] public async Task TestCreateStack() { - string stackName = "test-stack-" + DateTime.Now.Ticks; + string stackName = "test-stack-" + DateTime.UtcNow.Ticks; try { CreateStackRequest createRequest = new CreateStackRequest @@ -148,12 +148,12 @@ public async Task TestCreateStack() new Parameter { ParameterKey = "TopicName", - ParameterValue = "MyTopic" + DateTime.Now.Ticks + ParameterValue = "MyTopic" + DateTime.UtcNow.Ticks }, new Parameter { ParameterKey = "QueueName", - ParameterValue = "MyQueue" + DateTime.Now.Ticks + ParameterValue = "MyQueue" + DateTime.UtcNow.Ticks } } }; diff --git a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/CloudWatchLogs.cs b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/CloudWatchLogs.cs index 01878581bad4..70ca115d46ae 100644 --- a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/CloudWatchLogs.cs +++ b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/CloudWatchLogs.cs @@ -17,7 +17,7 @@ public class CloudWatchLogs : TestBase [Trait(CategoryAttribute,"CloudWatchLogs")] public async Task CRUDLogGroup() { - var logGroupName = "sdk-dotnet-" + DateTime.Now.Ticks; + var logGroupName = "sdk-dotnet-" + DateTime.UtcNow.Ticks; await Client.CreateLogGroupAsync(new CreateLogGroupRequest { LogGroupName = logGroupName @@ -74,7 +74,7 @@ await Client.CreateLogStreamAsync(new CreateLogStreamRequest new InputLogEvent { Message = "First Data", - Timestamp = DateTime.Now + Timestamp = DateTime.UtcNow } } }); @@ -92,7 +92,7 @@ await Client.PutLogEventsAsync(new PutLogEventsRequest new InputLogEvent { Message = "Second Data", - Timestamp = DateTime.Now + Timestamp = DateTime.UtcNow } } }); @@ -108,8 +108,8 @@ await Client.PutLogEventsAsync(new PutLogEventsRequest { LogGroupName = logGroupName, LogStreamName = "sample", - StartTime = DateTime.Now.AddDays(-2), - EndTime = DateTime.Now + StartTime = DateTime.UtcNow.AddDays(-2), + EndTime = DateTime.UtcNow }); if (getResponse.Events.Count == 2) diff --git a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/Common/WaitUtils.cs b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/Common/WaitUtils.cs index 8619834a0bd8..f05540c200ec 100644 --- a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/Common/WaitUtils.cs +++ b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/Common/WaitUtils.cs @@ -41,10 +41,10 @@ public static T WaitForComplete(Func func, Func isComplete, int m public static T WaitForComplete(Func func, Func isComplete, TimeSpan maxWaitTime, TimeSpan sleepTime) { - var stopTime = DateTime.Now + maxWaitTime; + var stopTime = DateTime.UtcNow + maxWaitTime; Exception lastException = null; var success = false; - while (DateTime.Now < stopTime) + while (DateTime.UtcNow < stopTime) { try { diff --git a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/DynamoDB/DataModelTests.cs b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/DynamoDB/DataModelTests.cs index f4e65d4fba98..c648f2526d4d 100644 --- a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/DynamoDB/DataModelTests.cs +++ b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/DynamoDB/DataModelTests.cs @@ -290,7 +290,7 @@ private async Task TestEnumHashKeyObjects() } private async Task TestHashObjects() { - string bucketName = "aws-sdk-net-s3link-" + DateTime.Now.Ticks; + string bucketName = "aws-sdk-net-s3link-" + DateTime.UtcNow.Ticks; var s3Client = new Amazon.S3.AmazonS3Client(Amazon.RegionEndpoint.USEast1); await s3Client.PutBucketAsync(bucketName); try @@ -383,6 +383,7 @@ private async Task TestHashObjects() Assert.Equal(product.KeySizes.Count, retrieved.KeySizes.Count); Assert.NotNull(retrieved.CompanyInfo); Assert.Equal(product.CompanyInfo.Name, retrieved.CompanyInfo.Name); + //TODO: this is coming back in UTC but the original is DateTimeKind.Unspecified Assert.Equal(product.CompanyInfo.Founded, retrieved.CompanyInfo.Founded); Assert.NotEqual(product.CompanyInfo.Revenue, retrieved.CompanyInfo.Revenue); Assert.Equal(product.CompanyInfo.AllProducts.Count, retrieved.CompanyInfo.AllProducts.Count); diff --git a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/DynamoDB/DocumentTests.cs b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/DynamoDB/DocumentTests.cs index 86bdb1808e31..07cf853a2695 100644 --- a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/DynamoDB/DocumentTests.cs +++ b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/DynamoDB/DocumentTests.cs @@ -707,7 +707,7 @@ private async Task TestExpressionPut(ITable hashTable) { Document doc = new Document(); - doc["Id"] = DateTime.Now.Ticks; + doc["Id"] = DateTime.UtcNow.Ticks; doc["name"] = "condition-form"; await hashTable.PutItemAsync(doc); @@ -750,7 +750,7 @@ private async Task TestExpressionUpdate(ITable hashTable) { Document doc = new Document(); - doc["Id"] = DateTime.Now.Ticks; + doc["Id"] = DateTime.UtcNow.Ticks; doc["name"] = "condition-form"; await hashTable.PutItemAsync(doc); diff --git a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/DynamoDB/DynamoDBTestsBase.cs b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/DynamoDB/DynamoDBTestsBase.cs index bc82cdb78593..75078499720d 100644 --- a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/DynamoDB/DynamoDBTestsBase.cs +++ b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/DynamoDB/DynamoDBTestsBase.cs @@ -155,7 +155,7 @@ public void CreateContext(DynamoDBEntryConversion conversion) public const int ScanLimit = 1; public static readonly string BaseTableNamePrefix = "DotNetTests"; public static readonly string TableNamePrefix = BaseTableNamePrefix + "-" + - (ReuseTables ? string.Empty : + DateTime.Now.ToFileTime() + "-"); + (ReuseTables ? string.Empty : + DateTime.UtcNow.ToFileTime() + "-"); public List CreatedTables = new List(); public async Task ClearTable(string tableName) diff --git a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/DynamoDBTruncateError.cs b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/DynamoDBTruncateError.cs index c134060a2574..d65dc02221f0 100644 --- a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/DynamoDBTruncateError.cs +++ b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/DynamoDBTruncateError.cs @@ -340,7 +340,7 @@ public async Task DynamoDBTruncateErrorTest() private async Task SetupTable(IAmazonDynamoDB dynamoDBClient) { - string tableName = "aws-sdk-dotnet-truncate-test-" + DateTime.Now.Ticks; + string tableName = "aws-sdk-dotnet-truncate-test-" + DateTime.UtcNow.Ticks; await dynamoDBClient.CreateTableAsync( tableName, diff --git a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/IAM/AccessKeyTests.cs b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/IAM/AccessKeyTests.cs index 307b8c72bdfd..4ca8b06ab490 100644 --- a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/IAM/AccessKeyTests.cs +++ b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/IAM/AccessKeyTests.cs @@ -30,7 +30,7 @@ public async Task TestCreateAccessKey() CreateAccessKeyResponse response = await Client.CreateAccessKeyAsync(new CreateAccessKeyRequest() { UserName = username }); keyId = response.AccessKey.AccessKeyId; - Assert.True(response.AccessKey.CreateDate.Value.Date.CompareTo(DateTime.Now.Date) == 0); + Assert.True(response.AccessKey.CreateDate.Value.Date.CompareTo(DateTime.UtcNow.Date) == 0); } finally { @@ -45,7 +45,7 @@ public async Task TestCreateAccessKey() //[ExpectedException(typeof(NoSuchEntityException))] public async Task TestCreateAccessKeyNonExistentUserException() { - string username = "sdk-testuser-" + DateTime.Now.Ticks; + string username = "sdk-testuser-" + DateTime.UtcNow.Ticks; await AssertExtensions.ExpectExceptionAsync(Client.CreateAccessKeyAsync(new CreateAccessKeyRequest() { UserName = username })); } diff --git a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/IAM/Util.cs b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/IAM/Util.cs index 43722f6feee9..514db2bbc441 100644 --- a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/IAM/Util.cs +++ b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/IAM/Util.cs @@ -110,7 +110,7 @@ public static void DeleteCertificatesForUser(AmazonIdentityManagementServiceClie internal static string CreateTestUser(AmazonIdentityManagementServiceClient client, string testPrefix) { var prefix = MakePath(testPrefix); - string username = "sdk-testuser-" + DateTime.Now.Ticks; + string username = "sdk-testuser-" + DateTime.UtcNow.Ticks; client.CreateUserAsync(new CreateUserRequest() { UserName = username, Path = prefix }).Wait(); return username; } diff --git a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/ProtocolTests.cs b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/ProtocolTests.cs index 547d603b794f..28d4269619b9 100644 --- a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/ProtocolTests.cs +++ b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/ProtocolTests.cs @@ -33,7 +33,7 @@ private async Task TestJson_Async() { using (var client = UtilityMethods.CreateClient()) { - var domainName = "dotnet-test-domain-" + DateTime.Now.ToFileTime(); + var domainName = "dotnet-test-domain-" + DateTime.UtcNow.ToFileTime(); await client.RegisterDomainAsync(new RegisterDomainRequest { @@ -58,7 +58,7 @@ await client.DeprecateDomainAsync(new DeprecateDomainRequest var ure = await AssertExtensions.ExpectExceptionAsync(client.DeprecateDomainAsync(new DeprecateDomainRequest { - Name = "really-fake-domain-that-should-not-exist" + DateTime.Now.ToFileTime() + Name = "really-fake-domain-that-should-not-exist" + DateTime.UtcNow.ToFileTime() })); Assert.NotNull(ure); Assert.NotNull(ure.Message); @@ -82,7 +82,7 @@ public async Task TestRestXml() .Count(b => string.Equals(bucketName, b.BucketName, StringComparison.OrdinalIgnoreCase))); - var fakeBucketName = ("really-fake-bucket-that-shout-not-exist" + DateTime.Now.ToFileTime()).ToLower(); + var fakeBucketName = ("really-fake-bucket-that-shout-not-exist" + DateTime.UtcNow.ToFileTime()).ToLower(); var as3e = await AssertExtensions.ExpectExceptionAsync(client.DeleteBucketAsync(new DeleteBucketRequest { BucketName = fakeBucketName diff --git a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/Route53.cs b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/Route53.cs index 5483a6595778..f17f0e6066d3 100644 --- a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/Route53.cs +++ b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/Route53.cs @@ -180,9 +180,9 @@ public async Task HealthCheckTests() Assert.NotNull(listResponse.HealthChecks.FirstOrDefault(x => x.Id == healthCheckId)); GetHealthCheckStatusResponse status = null; - var stopTime = DateTime.Now + maxWaitTime; + var stopTime = DateTime.UtcNow + maxWaitTime; - while (DateTime.Now < stopTime) + while (DateTime.UtcNow < stopTime) { try { @@ -269,7 +269,7 @@ public async Task DelegationSetTests() var sets = await Client.ListReusableDelegationSetsAsync(new ListReusableDelegationSetsRequest()); var setCount = sets.DelegationSets.Count; - var callerReference = "DNSMigration" + DateTime.Now.ToFileTime(); + var callerReference = "DNSMigration" + DateTime.UtcNow.ToFileTime(); var createResponse = await Client.CreateReusableDelegationSetAsync(new CreateReusableDelegationSetRequest { CallerReference = callerReference @@ -312,7 +312,7 @@ public async Task DelegationSetTests() Assert.Single(hostedZones); // add a second set - callerReference = "DNSMigration" + DateTime.Now.ToFileTime(); + callerReference = "DNSMigration" + DateTime.UtcNow.ToFileTime(); createResponse = await Client.CreateReusableDelegationSetAsync(new CreateReusableDelegationSetRequest { CallerReference = callerReference diff --git a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/S3/MetadataTests.cs b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/S3/MetadataTests.cs index 47feb2644d14..40146eac2b4a 100644 --- a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/S3/MetadataTests.cs +++ b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/S3/MetadataTests.cs @@ -21,7 +21,7 @@ public class MetadataTests : TestBase private string filePath = string.Empty; private static readonly Dictionary metadata = new Dictionary(StringComparer.Ordinal) { - { "date", DateTime.Now.ToFileTime().ToString() }, + { "date", DateTime.UtcNow.ToFileTime().ToString() }, { "test", "true" } }; private static readonly Dictionary unicodeMetadata = new Dictionary(StringComparer.Ordinal) diff --git a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/S3/PutObjectTests.cs b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/S3/PutObjectTests.cs index 35494cec9a3f..97c3e813c1d1 100644 --- a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/S3/PutObjectTests.cs +++ b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/S3/PutObjectTests.cs @@ -217,7 +217,7 @@ private PutObjectRequest CreatePutObjectRequest() var request = new PutObjectRequest { BucketName = bucketName, - Key = DateTime.Now.ToFileTime() + testKey, + Key = DateTime.UtcNow.ToFileTime() + testKey, ContentBody = testContent }; return request; diff --git a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/S3/S3ServiceClientTests.cs b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/S3/S3ServiceClientTests.cs index 6605404b6c8f..35e6436ad2c9 100644 --- a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/S3/S3ServiceClientTests.cs +++ b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/S3/S3ServiceClientTests.cs @@ -86,7 +86,7 @@ public async Task TestDisableCanonicalization() BucketName = bucketName, Key = key, Verb = HttpVerb.GET, - Expires = DateTime.Now.AddDays(1) + Expires = DateTime.UtcNow.AddDays(1) }; var presignedUrl = Client.GetPreSignedURL(presignedUrlRequest); diff --git a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/SNS.cs b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/SNS.cs index 0b7cd645541f..bf4bef98b667 100644 --- a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/SNS.cs +++ b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/SNS.cs @@ -142,8 +142,8 @@ public async Task SubscribeTopic() // wait until subscription has been confirmed, maximum wait time of two minutes // by default string subArn = null; - var latest = DateTime.Now + subscriptionWaitDelay; - while (DateTime.Now < latest) + var latest = DateTime.UtcNow + subscriptionWaitDelay; + while (DateTime.UtcNow < latest) { // get subscriptions for topic var listSubscriptionsRequest = new ListSubscriptionsByTopicRequest diff --git a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/SecurityToken/GetFederationToken.cs b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/SecurityToken/GetFederationToken.cs index 17f1e97b18e3..5f9b96bf0e71 100644 --- a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/SecurityToken/GetFederationToken.cs +++ b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/SecurityToken/GetFederationToken.cs @@ -29,7 +29,7 @@ public async Task TestGetFederationToken() Assert.NotNull(gftResult.Credentials.SessionToken); Assert.NotEqual(DateTime.MinValue, gftResult.Credentials.Expiration); - var time = DateTime.Now; + var time = DateTime.UtcNow; var approximateExpires = time.AddHours(1); var expiresAfter = approximateExpires.AddMinutes(-5); var expiresBefore = approximateExpires.AddMinutes(5); @@ -70,7 +70,7 @@ public async Task TestGetFederationTokenAsync() Assert.NotNull(gftResult.Credentials.SessionToken); Assert.NotEqual(DateTime.MinValue, gftResult.Credentials.Expiration); - var time = DateTime.Now; + var time = DateTime.UtcNow; var approximateExpires = time.AddHours(1); var expiresAfter = approximateExpires.AddMinutes(-5); var expiresBefore = approximateExpires.AddMinutes(5); diff --git a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/SecurityToken/GetSessionToken.cs b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/SecurityToken/GetSessionToken.cs index 13da19ef70c3..9a4803ea0440 100644 --- a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/SecurityToken/GetSessionToken.cs +++ b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/SecurityToken/GetSessionToken.cs @@ -29,7 +29,7 @@ public async Task TestGetSessionToken() Assert.NotNull(gstResult.Credentials.SessionToken); Assert.NotEqual(DateTime.MinValue, gstResult.Credentials.Expiration); - var time = DateTime.Now; + var time = DateTime.UtcNow; var approximateExpires = time.AddHours(1); var expiresAfter = approximateExpires.AddMinutes(-5); var expiresBefore = approximateExpires.AddMinutes(5); @@ -57,7 +57,7 @@ public async Task TestGetSessionTokenRegional() Assert.NotNull(gstResult.Credentials.SessionToken); Assert.NotEqual(DateTime.MinValue, gstResult.Credentials.Expiration); - var time = DateTime.Now; + var time = DateTime.UtcNow; var approximateExpires = time.AddHours(1); var expiresAfter = approximateExpires.AddMinutes(-5); var expiresBefore = approximateExpires.AddMinutes(5); @@ -91,7 +91,7 @@ public async Task TestGetSessionTokenAsync() Assert.NotNull(gstResult.Credentials.SessionToken); Assert.NotEqual(DateTime.MinValue, gstResult.Credentials.Expiration); - var time = DateTime.Now; + var time = DateTime.UtcNow; var approximateExpires = time.AddHours(1); var expiresAfter = approximateExpires.AddMinutes(-5); var expiresBefore = approximateExpires.AddMinutes(5); diff --git a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/SimpleEmail.cs b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/SimpleEmail.cs index 09236902834c..996e36c0f12a 100644 --- a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/SimpleEmail.cs +++ b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/SimpleEmail.cs @@ -61,8 +61,8 @@ await Client.VerifyEmailIdentityAsync(new VerifyEmailIdentityRequest // wait until all are verified, maximum wait time of two minutes bool allVerified = true; - DateTime latest = DateTime.Now + TimeSpan.FromMinutes(2); - while(DateTime.Now < latest) + DateTime latest = DateTime.UtcNow + TimeSpan.FromMinutes(2); + while(DateTime.UtcNow < latest) { // get verification status for all emails var verificationAttributes = (await Client.GetIdentityVerificationAttributesAsync(new GetIdentityVerificationAttributesRequest diff --git a/sdk/test/NetStandard/IntegrationTests/SQSTests.cs b/sdk/test/NetStandard/IntegrationTests/SQSTests.cs index 7f4f039af3e4..17dd2d277a86 100644 --- a/sdk/test/NetStandard/IntegrationTests/SQSTests.cs +++ b/sdk/test/NetStandard/IntegrationTests/SQSTests.cs @@ -31,7 +31,7 @@ public async Task SendAndReceiveMessage() var createQueueRequest = new CreateQueueRequest() { - QueueName = "aws-sdk-net-" + DateTime.Now.Ticks + QueueName = "aws-sdk-net-" + DateTime.UtcNow.Ticks }; var createQueueResponse = await Client.CreateQueueAsync(createQueueRequest); try diff --git a/sdk/test/Performance/EC2PerformanceBenchmarks/CloudwatchLogsBenchmarks.cs b/sdk/test/Performance/EC2PerformanceBenchmarks/CloudwatchLogsBenchmarks.cs index f13bb336a88f..293bdf3bc310 100644 --- a/sdk/test/Performance/EC2PerformanceBenchmarks/CloudwatchLogsBenchmarks.cs +++ b/sdk/test/Performance/EC2PerformanceBenchmarks/CloudwatchLogsBenchmarks.cs @@ -48,7 +48,7 @@ public async Task SetupForPutLogEvents() var inputLogEvent = new InputLogEvent { Message = message, - Timestamp = DateTime.Now + Timestamp = DateTime.UtcNow }; _logEvents.Add(inputLogEvent); } diff --git a/sdk/test/Performance/EC2PerformanceBenchmarks/S3Benchmarks.cs b/sdk/test/Performance/EC2PerformanceBenchmarks/S3Benchmarks.cs index 8fba9241e6fa..15373389ca2c 100644 --- a/sdk/test/Performance/EC2PerformanceBenchmarks/S3Benchmarks.cs +++ b/sdk/test/Performance/EC2PerformanceBenchmarks/S3Benchmarks.cs @@ -109,7 +109,7 @@ public async Task S3PutObjectAsync() public async Task SetupForS3GetPresignedUrl() { _s3Client = new AmazonS3Client(); - _getPresignedUrlRequest = new GetPreSignedUrlRequest { BucketName = "FakeBucketName", Key = "foo", Expires = DateTime.Now + TimeSpan.FromDays(2), Verb = HttpVerb.GET}; + _getPresignedUrlRequest = new GetPreSignedUrlRequest { BucketName = "FakeBucketName", Key = "foo", Expires = DateTime.UtcNow + TimeSpan.FromDays(2), Verb = HttpVerb.GET}; } /// diff --git a/sdk/test/Performance/EC2PerformanceBenchmarks/Utils.cs b/sdk/test/Performance/EC2PerformanceBenchmarks/Utils.cs index 60808e4da400..814c938c7780 100644 --- a/sdk/test/Performance/EC2PerformanceBenchmarks/Utils.cs +++ b/sdk/test/Performance/EC2PerformanceBenchmarks/Utils.cs @@ -161,7 +161,7 @@ private static string CreateStringOfSize(long sizeInBytes) } public static async Task CreateBucket(IAmazonS3 s3Client) { - string bucketName = Constants.SdkTestPrefix + DateTime.Now.Ticks; + string bucketName = Constants.SdkTestPrefix + DateTime.UtcNow.Ticks; await s3Client.PutBucketAsync(new PutBucketRequest { BucketName = bucketName }); return bucketName; } diff --git a/sdk/test/Services/APIGateway/IntegrationTests/APIGateway.cs b/sdk/test/Services/APIGateway/IntegrationTests/APIGateway.cs index 221a00d71805..065218b6dd59 100644 --- a/sdk/test/Services/APIGateway/IntegrationTests/APIGateway.cs +++ b/sdk/test/Services/APIGateway/IntegrationTests/APIGateway.cs @@ -33,7 +33,7 @@ public static void ClassCleanup() } private static string restApiId = null; - private static string timestamp = DateTime.Now.ToFileTime().ToString(); + private static string timestamp = DateTime.UtcNow.ToFileTime().ToString(); private static string apiName = "dotnet-test-" + timestamp; private static string apiDescription = "RestApi created by dotnet tests at " + timestamp; @@ -48,7 +48,7 @@ public static void ClassInitialize(TestContext testContext) Assert.AreEqual(apiDescription, createRestApi.Description); Assert.AreEqual(apiName, createRestApi.Name); Assert.IsFalse(string.IsNullOrEmpty(createRestApi.Id)); - Assert.AreNotEqual(default(DateTime), createRestApi.CreatedDate); + Assert.AreNotEqual(DateTime.SpecifyKind(default, DateTimeKind.Utc), createRestApi.CreatedDate); restApiId = createRestApi.Id; } @@ -130,7 +130,7 @@ public void TestRestApiCalls() Assert.AreEqual(apiDescription, getRestApi.Description); Assert.AreEqual(apiName, getRestApi.Name); Assert.IsFalse(string.IsNullOrEmpty(getRestApi.Id)); - Assert.AreNotEqual(default(DateTime), getRestApi.CreatedDate); + Assert.AreNotEqual(DateTime.SpecifyKind(default, DateTimeKind.Utc), getRestApi.CreatedDate); var newDescription = "New description!"; Client.UpdateRestApi(new UpdateRestApiRequest @@ -154,7 +154,7 @@ public void TestRestApiCalls() Assert.AreEqual(newDescription, getRestApi.Description); Assert.AreEqual(apiName, getRestApi.Name); Assert.IsFalse(string.IsNullOrEmpty(getRestApi.Id)); - Assert.AreNotEqual(default(DateTime), getRestApi.CreatedDate); + Assert.AreNotEqual(DateTime.SpecifyKind(default, DateTimeKind.Utc), getRestApi.CreatedDate); Client.UpdateRestApi(new UpdateRestApiRequest { @@ -202,8 +202,8 @@ public void TestOtherOperations() }); Assert.IsNotNull(clientCert); Assert.AreEqual(certDescription, clientCert.Description); - Assert.AreNotEqual(default(DateTime), clientCert.CreatedDate); - Assert.AreNotEqual(default(DateTime), clientCert.ExpirationDate); + Assert.AreNotEqual(DateTime.SpecifyKind(default, DateTimeKind.Utc), clientCert.CreatedDate); + Assert.AreNotEqual(DateTime.SpecifyKind(default, DateTimeKind.Utc), clientCert.ExpirationDate); Assert.IsTrue(clientCert.ExpirationDate > clientCert.CreatedDate); Assert.IsFalse(string.IsNullOrEmpty(clientCert.PemEncodedCertificate)); Assert.IsFalse(string.IsNullOrEmpty(clientCert.ClientCertificateId)); diff --git a/sdk/test/Services/AWSMarketplaceCommerceAnalytics/IntegrationTests/AWSMarketplaceCommerceAnalytics.cs b/sdk/test/Services/AWSMarketplaceCommerceAnalytics/IntegrationTests/AWSMarketplaceCommerceAnalytics.cs index 6fbbbf19e474..1589fa750a4d 100644 --- a/sdk/test/Services/AWSMarketplaceCommerceAnalytics/IntegrationTests/AWSMarketplaceCommerceAnalytics.cs +++ b/sdk/test/Services/AWSMarketplaceCommerceAnalytics/IntegrationTests/AWSMarketplaceCommerceAnalytics.cs @@ -122,7 +122,7 @@ public void GenerateDatasetTest() ( () => Client.GenerateDataSet(new GenerateDataSetRequest { - DataSetPublicationDate = DateTime.Now, + DataSetPublicationDate = DateTime.UtcNow, DataSetType = DataSetType.DailyBusinessFees, DestinationS3BucketName = bucketName, SnsTopicArn = topicArn, @@ -164,7 +164,7 @@ public void TestInvalidInputs() (() => Client.GenerateDataSet(new GenerateDataSetRequest { - DataSetPublicationDate = DateTime.Now, + DataSetPublicationDate = DateTime.UtcNow, DataSetType = DataSetType.DailyBusinessFees }) ); @@ -174,7 +174,7 @@ public void TestInvalidInputs() ( ()=> Client.GenerateDataSet(new GenerateDataSetRequest { - DataSetPublicationDate = DateTime.Now, + DataSetPublicationDate = DateTime.UtcNow, DataSetType = DataSetType.DailyBusinessFees, DestinationS3BucketName = "randomBucket", RoleNameArn = "invalidArn", diff --git a/sdk/test/Services/CloudFormation/IntegrationTests/CloudFormation.cs b/sdk/test/Services/CloudFormation/IntegrationTests/CloudFormation.cs index 1f9a080ce4e7..5eade6eab7bc 100644 --- a/sdk/test/Services/CloudFormation/IntegrationTests/CloudFormation.cs +++ b/sdk/test/Services/CloudFormation/IntegrationTests/CloudFormation.cs @@ -165,7 +165,7 @@ public void TestInvalidTemplate() [TestCategory("CloudFormation")] public void TestCreateStack() { - string stackName = "test-stack-" + DateTime.Now.Ticks; + string stackName = "test-stack-" + DateTime.UtcNow.Ticks; try { CreateStackRequest createRequest = new CreateStackRequest @@ -177,12 +177,12 @@ public void TestCreateStack() new Parameter { ParameterKey = "TopicName", - ParameterValue = "MyTopic" + DateTime.Now.Ticks + ParameterValue = "MyTopic" + DateTime.UtcNow.Ticks }, new Parameter { ParameterKey = "QueueName", - ParameterValue = "MyQueue" + DateTime.Now.Ticks + ParameterValue = "MyQueue" + DateTime.UtcNow.Ticks } } }; diff --git a/sdk/test/Services/CloudTrail/IntegrationTests/CloudTrail.cs b/sdk/test/Services/CloudTrail/IntegrationTests/CloudTrail.cs index dfa3ed22ec74..26aae1cffc2f 100644 --- a/sdk/test/Services/CloudTrail/IntegrationTests/CloudTrail.cs +++ b/sdk/test/Services/CloudTrail/IntegrationTests/CloudTrail.cs @@ -18,7 +18,7 @@ namespace AWSSDK_DotNet.IntegrationTests.Tests [TestClass] public class CloudTrail : TestBase { - private static string _trailStorageBucketName = "sdk-dotnet-integ-test-trail-bucket-" + DateTime.Now.Ticks; + private static string _trailStorageBucketName = "sdk-dotnet-integ-test-trail-bucket-" + DateTime.UtcNow.Ticks; private const string S3_PREFIX = "folder"; static AmazonS3Client s3Client; @@ -88,7 +88,7 @@ public void CloudTrailIntegrationTest() if (trailsCount != 0) return; - var trailName = "dotnet-integ-test-trail-" + DateTime.Now.Ticks; + var trailName = "dotnet-integ-test-trail-" + DateTime.UtcNow.Ticks; var trail = Client.CreateTrail(new CreateTrailRequest { Name = trailName, diff --git a/sdk/test/Services/CloudWatch/IntegrationTests/CloudWatch.cs b/sdk/test/Services/CloudWatch/IntegrationTests/CloudWatch.cs index 6ef0191b9d57..f1ad16ade0e8 100644 --- a/sdk/test/Services/CloudWatch/IntegrationTests/CloudWatch.cs +++ b/sdk/test/Services/CloudWatch/IntegrationTests/CloudWatch.cs @@ -49,12 +49,12 @@ public void PutMetricDataWithNonStreamingPayload() Namespace = "compression-test", MetricData = new List() { - new MetricDatum { MetricName = "test-request-compression-metric", TimestampUtc = DateTime.UtcNow, Unit = StandardUnit.Count, Value = random.Next(100) }, - new MetricDatum { MetricName = "test-request-compression-metric", TimestampUtc = DateTime.UtcNow.AddSeconds(2), Unit = StandardUnit.Bytes, Value = random.Next(100) }, - new MetricDatum { MetricName = "test-request-compression-metric", TimestampUtc = DateTime.UtcNow.AddSeconds(4), Unit = StandardUnit.Bytes, Value = random.Next(100) }, - new MetricDatum { MetricName = "test-request-compression-metric", TimestampUtc = DateTime.UtcNow.AddSeconds(6), Unit = StandardUnit.Bytes, Value = random.Next(100) }, - new MetricDatum { MetricName = "test-request-compression-metric", TimestampUtc = DateTime.UtcNow.AddSeconds(8), Unit = StandardUnit.Bytes, Value = random.Next(100) }, - new MetricDatum { MetricName = "test-request-compression-metric", TimestampUtc = DateTime.UtcNow.AddSeconds(10), Unit = StandardUnit.Bytes, Value = random.Next(100) }, + new MetricDatum { MetricName = "test-request-compression-metric", Timestamp = DateTime.UtcNow, Unit = StandardUnit.Count, Value = random.Next(100) }, + new MetricDatum { MetricName = "test-request-compression-metric", Timestamp = DateTime.UtcNow.AddSeconds(2), Unit = StandardUnit.Bytes, Value = random.Next(100) }, + new MetricDatum { MetricName = "test-request-compression-metric", Timestamp = DateTime.UtcNow.AddSeconds(4), Unit = StandardUnit.Bytes, Value = random.Next(100) }, + new MetricDatum { MetricName = "test-request-compression-metric", Timestamp = DateTime.UtcNow.AddSeconds(6), Unit = StandardUnit.Bytes, Value = random.Next(100) }, + new MetricDatum { MetricName = "test-request-compression-metric", Timestamp = DateTime.UtcNow.AddSeconds(8), Unit = StandardUnit.Bytes, Value = random.Next(100) }, + new MetricDatum { MetricName = "test-request-compression-metric", Timestamp = DateTime.UtcNow.AddSeconds(10), Unit = StandardUnit.Bytes, Value = random.Next(100) }, } }; @@ -111,8 +111,8 @@ public void BasicCRUD() { MetricName = "NetworkIn", Namespace = "AWS/EC2", - StartTimeUtc = DateTime.Parse("2008-01-01T19:00:00+00:00"), - EndTimeUtc = DateTime.Parse("2009-12-01T19:00:00+00:00"), + StartTime = DateTime.Parse("2008-01-01T19:00:00+00:00"), + EndTime = DateTime.Parse("2009-12-01T19:00:00+00:00"), Statistics = new List { "Average" }, Unit = "Percent", Period = 42000, @@ -126,7 +126,7 @@ public void BasicCRUD() [TestCategory("CloudWatch")] public void AlarmTest() { - var alarmName = ALARM_BASENAME + DateTime.Now.Ticks; + var alarmName = ALARM_BASENAME + DateTime.UtcNow.Ticks; var putResponse = Client.PutMetricAlarm(new PutMetricAlarmRequest() { AlarmName = alarmName, @@ -290,7 +290,7 @@ public void TestGetMetricStatistics() GetMetricStatisticsRequest request = new GetMetricStatisticsRequest() { - StartTimeUtc = DateTime.UtcNow.AddMilliseconds(-ONE_WEEK_IN_MILLISECONDS), + StartTime = DateTime.UtcNow.AddMilliseconds(-ONE_WEEK_IN_MILLISECONDS), Namespace = "AWS/EC2", Period = 60 * 60, Dimensions = new List @@ -299,7 +299,7 @@ public void TestGetMetricStatistics() }, MetricName = measureName, Statistics = new List { "Average", "Maximum", "Minimum", "Sum" }, - EndTimeUtc = DateTime.UtcNow + EndTime = DateTime.UtcNow }; var result = Client.GetMetricStatistics(request); @@ -314,7 +314,7 @@ public void TestGetMetricStatistics() [TestCategory("CloudWatch")] public void TestSetAlarmStateAndHistory() { - String metricName = this.GetType().Name + DateTime.Now.Ticks; + String metricName = this.GetType().Name + DateTime.UtcNow.Ticks; PutMetricAlarmRequest[] rqs = CreateTwoNewAlarms(metricName); @@ -383,7 +383,7 @@ public void TestSetAlarmStateAndHistory() [TestCategory("CloudWatch")] public void TestDisableEnableAlarms() { - String metricName = this.GetType().Name + DateTime.Now.Ticks; + String metricName = this.GetType().Name + DateTime.UtcNow.Ticks; PutMetricAlarmRequest[] rqs = CreateTwoNewAlarms(metricName); @@ -445,7 +445,7 @@ public void TestDisableEnableAlarms() [TestCategory("CloudWatch")] public void TestDescribeAlarms() { - string metricName = this.GetType().Name + DateTime.Now.Ticks; + string metricName = this.GetType().Name + DateTime.UtcNow.Ticks; PutMetricAlarmRequest[] rqs = CreateTwoNewAlarms(metricName); diff --git a/sdk/test/Services/CloudWatchLogs/IntegrationTests/CloudWatchLogs.cs b/sdk/test/Services/CloudWatchLogs/IntegrationTests/CloudWatchLogs.cs index 77df3e3704e8..5fa0ab83e943 100644 --- a/sdk/test/Services/CloudWatchLogs/IntegrationTests/CloudWatchLogs.cs +++ b/sdk/test/Services/CloudWatchLogs/IntegrationTests/CloudWatchLogs.cs @@ -22,7 +22,7 @@ public static void Cleanup() [TestCategory("CloudWatchLogs")] public void CRUDLogGroup() { - var logGroupName = "sdk-dotnet-" + DateTime.Now.Ticks; + var logGroupName = "sdk-dotnet-" + DateTime.UtcNow.Ticks; Client.CreateLogGroup(new CreateLogGroupRequest { LogGroupName = logGroupName @@ -79,7 +79,7 @@ public void CRUDLogGroup() new InputLogEvent { Message = "First Data", - Timestamp = DateTime.Now + Timestamp = DateTime.UtcNow } } }); @@ -97,7 +97,7 @@ public void CRUDLogGroup() new InputLogEvent { Message = "Second Data", - Timestamp = DateTime.Now + Timestamp = DateTime.UtcNow } } }); @@ -113,8 +113,8 @@ public void CRUDLogGroup() { LogGroupName = logGroupName, LogStreamName = "sample", - StartTime = DateTime.Now.AddDays(-2), - EndTime = DateTime.Now + StartTime = DateTime.UtcNow.AddDays(-2), + EndTime = DateTime.UtcNow }); if (getResponse.Events.Count == 2) diff --git a/sdk/test/Services/DataPipeline/IntegrationTests/DataPipeline.cs b/sdk/test/Services/DataPipeline/IntegrationTests/DataPipeline.cs index c0a26733bb06..dba4a8d859e1 100644 --- a/sdk/test/Services/DataPipeline/IntegrationTests/DataPipeline.cs +++ b/sdk/test/Services/DataPipeline/IntegrationTests/DataPipeline.cs @@ -37,7 +37,7 @@ public void TestPipelineOperations() const string testPipelineName = "dotnet-test-pipeline"; const string testPipelineDescription = "dotnet test pipeline"; - var testPipelineId = "dotnet-test-pipeline" + DateTime.Now.ToFileTime(); + var testPipelineId = "dotnet-test-pipeline" + DateTime.UtcNow.ToFileTime(); const string testObjectId = "123"; const string testObjectName = "object"; @@ -71,7 +71,7 @@ var putPipelineDefinitionResult var tags = new List { new Tag { Key = "tag1", Value = "42" }, - new Tag { Key = "tag2", Value = DateTime.Now.ToString() } + new Tag { Key = "tag2", Value = DateTime.UtcNow.ToString() } }; Client.AddTags(createdPipelineId, tags); diff --git a/sdk/test/Services/DirectConnect/IntegrationTests/DirectConnect.cs b/sdk/test/Services/DirectConnect/IntegrationTests/DirectConnect.cs index 6e92a990ed50..8fac598675e9 100644 --- a/sdk/test/Services/DirectConnect/IntegrationTests/DirectConnect.cs +++ b/sdk/test/Services/DirectConnect/IntegrationTests/DirectConnect.cs @@ -88,7 +88,7 @@ public void TestCreateDeleteConnection() const string BANDWIDTH = "1Gbps"; var locations = Client.DescribeLocations().Locations; - var connectionName = "dotnet-test-connection" + DateTime.Now.Ticks; + var connectionName = "dotnet-test-connection" + DateTime.UtcNow.Ticks; string connectionId = null; try diff --git a/sdk/test/Services/DynamoDBv2/IntegrationTests/DataModelTests.cs b/sdk/test/Services/DynamoDBv2/IntegrationTests/DataModelTests.cs index aa8da86a6764..ec8e730e4cb5 100644 --- a/sdk/test/Services/DynamoDBv2/IntegrationTests/DataModelTests.cs +++ b/sdk/test/Services/DynamoDBv2/IntegrationTests/DataModelTests.cs @@ -206,7 +206,7 @@ public void TestContext_RetrieveDateTimeInUtc(bool retrieveDateTimeInUtc) Context = new DynamoDBContext(Client, config); #pragma warning restore CS0618 // Re-enable the warning - var currTime = DateTime.Now; + var currTime = DateTime.UtcNow; var employee = new AnnotatedNumericEpochEmployee { @@ -219,6 +219,8 @@ public void TestContext_RetrieveDateTimeInUtc(bool retrieveDateTimeInUtc) }; Context.Save(employee); + + //This is a value use of .ToLocalTime var expectedCurrTime = retrieveDateTimeInUtc ? currTime.ToUniversalTime() : currTime.ToLocalTime(); // Load @@ -280,7 +282,7 @@ public void TestContext_CustomDateTimeConverter(bool retrieveDateTimeInUtc) // Add a custom DateTime converter Context.ConverterCache.Add(typeof(DateTime), new DateTimeUtcConverter()); - var currTime = DateTime.Now; + var currTime = DateTime.UtcNow; var employee = new AnnotatedNumericEpochEmployee { @@ -349,7 +351,7 @@ public void TestContext_RetrieveDateTimeInUtc_OperationConfig(bool retrieveDateT #pragma warning restore CS0618 // Re-enable the warning var operationConfig = new DynamoDBOperationConfig { RetrieveDateTimeInUtc = retrieveDateTimeInUtc }; - var currTime = DateTime.Now; + var currTime = DateTime.UtcNow; var employee = new AnnotatedNumericEpochEmployee { @@ -362,6 +364,8 @@ public void TestContext_RetrieveDateTimeInUtc_OperationConfig(bool retrieveDateT }; Context.Save(employee); + + //This is a value use of .ToLocalTime var expectedCurrTime = retrieveDateTimeInUtc ? currTime.ToUniversalTime() : currTime.ToLocalTime(); // Load @@ -659,7 +663,7 @@ private static void TestAnnotatedUnsupportedTypes() } private void TestContextConversions() - { + { var conversionV1 = DynamoDBEntryConversion.V1; var conversionV2 = DynamoDBEntryConversion.V2; @@ -877,7 +881,7 @@ private void TestEnumHashKeyObjects() } private void TestHashObjects() { - string bucketName = "aws-sdk-net-s3link-" + DateTime.Now.Ticks; + string bucketName = "aws-sdk-net-s3link-" + DateTime.UtcNow.Ticks; var s3Client = new Amazon.S3.AmazonS3Client(Amazon.RegionEndpoint.USEast1); s3Client.PutBucket(bucketName); try diff --git a/sdk/test/Services/DynamoDBv2/IntegrationTests/DocumentTests.cs b/sdk/test/Services/DynamoDBv2/IntegrationTests/DocumentTests.cs index 234b5a0c97e1..81e81eff879a 100644 --- a/sdk/test/Services/DynamoDBv2/IntegrationTests/DocumentTests.cs +++ b/sdk/test/Services/DynamoDBv2/IntegrationTests/DocumentTests.cs @@ -1712,7 +1712,7 @@ private void TestExpressionPut(ITable hashTable) { Document doc = new Document(); - doc["Id"] = DateTime.Now.Ticks; + doc["Id"] = DateTime.UtcNow.Ticks; doc["name"] = "condition-form"; hashTable.PutItem(doc); @@ -1755,7 +1755,7 @@ private void TestExpressionUpdate(ITable hashTable) { Document doc = new Document(); - doc["Id"] = DateTime.Now.Ticks; + doc["Id"] = DateTime.UtcNow.Ticks; doc["name"] = "condition-form"; hashTable.PutItem(doc); diff --git a/sdk/test/Services/DynamoDBv2/IntegrationTests/DynamoDBTestsBase.cs b/sdk/test/Services/DynamoDBv2/IntegrationTests/DynamoDBTestsBase.cs index 1380e87dfad5..b04e9828d1d8 100644 --- a/sdk/test/Services/DynamoDBv2/IntegrationTests/DynamoDBTestsBase.cs +++ b/sdk/test/Services/DynamoDBv2/IntegrationTests/DynamoDBTestsBase.cs @@ -123,7 +123,7 @@ public static void CreateContext(DynamoDBEntryConversion conversion, bool isEmpt public const int ScanLimit = 1; public static readonly string BaseTableNamePrefix = "DotNetTests"; public static readonly string TableNamePrefix = BaseTableNamePrefix + "-" + - (ReuseTables ? string.Empty : + DateTime.Now.ToFileTime() + "-"); + (ReuseTables ? string.Empty : + DateTime.UtcNow.ToFileTime() + "-"); public static List CreatedTables = new List(); public static void ClearTable(string tableName) diff --git a/sdk/test/Services/DynamoDBv2/IntegrationTests/JSONTests.cs b/sdk/test/Services/DynamoDBv2/IntegrationTests/JSONTests.cs index 625fc831da4d..0d8970f99e8b 100644 --- a/sdk/test/Services/DynamoDBv2/IntegrationTests/JSONTests.cs +++ b/sdk/test/Services/DynamoDBv2/IntegrationTests/JSONTests.cs @@ -10,6 +10,7 @@ using Amazon.DynamoDBv2.DocumentModel; using System.IO; using System.Text.Json; +using System.Globalization; namespace AWSSDK_DotNet.IntegrationTests.Tests.DynamoDB { @@ -358,7 +359,9 @@ public void TestFromJsonCanHandleAllDataTypes() Assert.AreEqual(container.StringValue, "test string"); Assert.AreEqual(container.BoolValue, true); Assert.AreEqual(container.IntValue, 200); - Assert.AreEqual(container.DateValue, DateTime.Parse("2022-12-29T12:46:14.097Z")); + Assert.AreEqual(container.DateValue, DateTime.Parse("2022-12-29T12:46:14.097Z", CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal)); + Assert.AreEqual(container.DateValue.Kind, DateTimeKind.Utc); + Assert.IsNull(container.NullableBoolValue); Assert.IsNull(container.NullableIntValue); Assert.IsNull(container.NullableDateValue); diff --git a/sdk/test/Services/DynamoDBv2/IntegrationTests/TTLTests.cs b/sdk/test/Services/DynamoDBv2/IntegrationTests/TTLTests.cs index f62d71de4264..97e52dda5b70 100644 --- a/sdk/test/Services/DynamoDBv2/IntegrationTests/TTLTests.cs +++ b/sdk/test/Services/DynamoDBv2/IntegrationTests/TTLTests.cs @@ -22,7 +22,7 @@ public partial class DynamoDBTests : TestBase { #region Private members - private static readonly DateTime EpochDate = DateTime.Now.AddDays(7); + private static readonly DateTime EpochDate = DateTime.UtcNow.AddDays(7); private static readonly TimeSpan Epsilon = TimeSpan.FromSeconds(1); private static readonly int EpochSeconds = AWSSDKUtils.ConvertToUnixEpochSeconds(EpochDate); diff --git a/sdk/test/Services/DynamoDBv2/UnitTests/Custom/DynamoDBTests.cs b/sdk/test/Services/DynamoDBv2/UnitTests/Custom/DynamoDBTests.cs index bb792b35f8ec..90da25fd33cf 100644 --- a/sdk/test/Services/DynamoDBv2/UnitTests/Custom/DynamoDBTests.cs +++ b/sdk/test/Services/DynamoDBv2/UnitTests/Custom/DynamoDBTests.cs @@ -224,7 +224,7 @@ public class DateTestObject [TestMethod] [TestCategory("DynamoDBv2")] public void TestDateTimeDeserializationWithDdbContext() - { + { //Arrange var dateWithNoDecimals = "2022-05-05T11:56:11Z"; var expectedDateNoDecimal = DateTime.Parse(dateWithNoDecimals); diff --git a/sdk/test/Services/ElasticBeanstalk/IntegrationTests/Beanstalk.cs b/sdk/test/Services/ElasticBeanstalk/IntegrationTests/Beanstalk.cs index ca134850ac23..8d21d9dd209c 100644 --- a/sdk/test/Services/ElasticBeanstalk/IntegrationTests/Beanstalk.cs +++ b/sdk/test/Services/ElasticBeanstalk/IntegrationTests/Beanstalk.cs @@ -38,7 +38,7 @@ public void CheckDNSAvailabilityTest() { CheckDNSAvailabilityRequest request = new CheckDNSAvailabilityRequest() { - CNAMEPrefix = "mycnamecheck" + DateTime.Now.Ticks + CNAMEPrefix = "mycnamecheck" + DateTime.UtcNow.Ticks }; CheckDNSAvailabilityResponse response = Client.CheckDNSAvailability(request); @@ -50,7 +50,7 @@ public void CheckDNSAvailabilityTest() [TestCategory("ElasticBeanstalk")] public void CRUDApplication() { - string applicationName = "dotnet-integ-app" + DateTime.Now.Ticks; + string applicationName = "dotnet-integ-app" + DateTime.UtcNow.Ticks; CreateApplicationRequest createRequest = new CreateApplicationRequest() { ApplicationName = applicationName, diff --git a/sdk/test/Services/ElasticLoadBalancing/IntegrationTests/ElasticLoadBalancing.cs b/sdk/test/Services/ElasticLoadBalancing/IntegrationTests/ElasticLoadBalancing.cs index c97730bdaae0..71643e6b728c 100644 --- a/sdk/test/Services/ElasticLoadBalancing/IntegrationTests/ElasticLoadBalancing.cs +++ b/sdk/test/Services/ElasticLoadBalancing/IntegrationTests/ElasticLoadBalancing.cs @@ -49,7 +49,7 @@ public void TestBasicDescribe() [TestCategory("ElasticLoadBalancing")] public void TestLoadBalancerOperations() { - loadBalancerName = SDK_TEST_PREFIX+"-lb" + DateTime.Now.Ticks; + loadBalancerName = SDK_TEST_PREFIX+"-lb" + DateTime.UtcNow.Ticks; Listener expectedListener = new Listener() { InstancePort = 8080, @@ -149,7 +149,7 @@ public void TestLoadBalancerOperations() Assert.IsFalse(availabilityZones.Contains(AVAILABILITY_ZONE_2)); // Create LB stickiness policy - String policyName = SDK_TEST_PREFIX + "-policy-" + DateTime.Now.Ticks; + String policyName = SDK_TEST_PREFIX + "-policy-" + DateTime.UtcNow.Ticks; Client.CreateLBCookieStickinessPolicy(new CreateLBCookieStickinessPolicyRequest() { LoadBalancerName = loadBalancerName, diff --git a/sdk/test/Services/ElasticLoadBalancingV2/IntegrationTests/ElasticLoadBalancingV2.cs b/sdk/test/Services/ElasticLoadBalancingV2/IntegrationTests/ElasticLoadBalancingV2.cs index 9500deb1ce42..c8dfefd13210 100644 --- a/sdk/test/Services/ElasticLoadBalancingV2/IntegrationTests/ElasticLoadBalancingV2.cs +++ b/sdk/test/Services/ElasticLoadBalancingV2/IntegrationTests/ElasticLoadBalancingV2.cs @@ -13,7 +13,7 @@ namespace AWSSDK_DotNet.IntegrationTests.Tests [TestClass] public class ElasticLoadBalancingV2 : TestBase { - private static string loadBalancerName = "dotnet-test-" + DateTime.Now.ToFileTime(); + private static string loadBalancerName = "dotnet-test-" + DateTime.UtcNow.ToFileTime(); private static string loadBalancerArn = null; [ClassCleanup] diff --git a/sdk/test/Services/GameLift/IntegrationTests/GameLift.cs b/sdk/test/Services/GameLift/IntegrationTests/GameLift.cs index 854e1803d1f4..1a9b4c485bd7 100644 --- a/sdk/test/Services/GameLift/IntegrationTests/GameLift.cs +++ b/sdk/test/Services/GameLift/IntegrationTests/GameLift.cs @@ -33,7 +33,7 @@ public void CrudCalls() { var originalBuilds = GetAllBuilds().ToList(); - var timestamp = DateTime.Now.ToFileTime().ToString(); + var timestamp = DateTime.UtcNow.ToFileTime().ToString(); var newBuild = Client.CreateBuild(new CreateBuildRequest { Name = "TestBuild-" + timestamp, diff --git a/sdk/test/Services/Glacier/IntegrationTests/Glacier.cs b/sdk/test/Services/Glacier/IntegrationTests/Glacier.cs index 0533ad45b64c..407ca9e436fb 100644 --- a/sdk/test/Services/Glacier/IntegrationTests/Glacier.cs +++ b/sdk/test/Services/Glacier/IntegrationTests/Glacier.cs @@ -26,7 +26,7 @@ public static void Cleanup() [TestCategory("Glacier")] public void ListCalls() { - var testingVaultName = "dotnet-sdk-test" + DateTime.Now.Ticks.ToString(); + var testingVaultName = "dotnet-sdk-test" + DateTime.UtcNow.Ticks.ToString(); Client.CreateVault(new CreateVaultRequest() { VaultName = testingVaultName @@ -43,7 +43,7 @@ public void ListCalls() //[TestCategory("Glacier")] public void TestSimpleUpload() { - var testingVaultName = "dotnet-sdk-test" + DateTime.Now.Ticks.ToString(); + var testingVaultName = "dotnet-sdk-test" + DateTime.UtcNow.Ticks.ToString(); Client.CreateVault(new CreateVaultRequest() { VaultName = testingVaultName @@ -77,7 +77,7 @@ public void TestSimpleUpload() //[TestCategory("Glacier")] public void TestMultiPartUpload() { - var testingVaultName = "dotnet-sdk-test" + DateTime.Now.Ticks.ToString(); + var testingVaultName = "dotnet-sdk-test" + DateTime.UtcNow.Ticks.ToString(); Client.CreateVault(new CreateVaultRequest() { VaultName = testingVaultName diff --git a/sdk/test/Services/IdentityManagement/IntegrationTests/AccessKeyTests.cs b/sdk/test/Services/IdentityManagement/IntegrationTests/AccessKeyTests.cs index e01fe0fcbff3..69ba15dc9502 100644 --- a/sdk/test/Services/IdentityManagement/IntegrationTests/AccessKeyTests.cs +++ b/sdk/test/Services/IdentityManagement/IntegrationTests/AccessKeyTests.cs @@ -62,7 +62,7 @@ public void TestCreateAccessKey() CreateAccessKeyResponse response = Client.CreateAccessKey(new CreateAccessKeyRequest() { UserName = username }); keyId = response.AccessKey.AccessKeyId; - Assert.IsTrue(response.AccessKey.CreateDate.Value.Date.CompareTo(DateTime.Now.Date) == 0); + Assert.IsTrue(response.AccessKey.CreateDate.Value.Date.CompareTo(DateTime.UtcNow.Date) == 0); } finally { @@ -79,7 +79,7 @@ public void TestCreateAccessKey() [ExpectedException(typeof(NoSuchEntityException))] public void TestCreateAccessKeyNonExistentUserException() { - string username = "sdk-testuser-" + DateTime.Now.Ticks; + string username = "sdk-testuser-" + DateTime.UtcNow.Ticks; Client.CreateAccessKey(new CreateAccessKeyRequest() { UserName = username }); } diff --git a/sdk/test/Services/IdentityManagement/IntegrationTests/AccountAliasTests.cs b/sdk/test/Services/IdentityManagement/IntegrationTests/AccountAliasTests.cs index 558b5e2203d0..30698e468913 100644 --- a/sdk/test/Services/IdentityManagement/IntegrationTests/AccountAliasTests.cs +++ b/sdk/test/Services/IdentityManagement/IntegrationTests/AccountAliasTests.cs @@ -71,7 +71,7 @@ public void ListAccessKeys() [TestCategory("IdentityManagement")] public void CreateAccountAlias() { - string alias = "dotnetalias" + DateTime.Now.Ticks; + string alias = "dotnetalias" + DateTime.UtcNow.Ticks; CreateAccountAliasRequest createRequest = new CreateAccountAliasRequest() { AccountAlias = alias diff --git a/sdk/test/Services/IdentityManagement/IntegrationTests/AssumeRoleAWSCredentialsTest.cs b/sdk/test/Services/IdentityManagement/IntegrationTests/AssumeRoleAWSCredentialsTest.cs index 3440070259d1..07b14bf62d1b 100644 --- a/sdk/test/Services/IdentityManagement/IntegrationTests/AssumeRoleAWSCredentialsTest.cs +++ b/sdk/test/Services/IdentityManagement/IntegrationTests/AssumeRoleAWSCredentialsTest.cs @@ -199,8 +199,8 @@ private static void TestCredentials(AssumeRoleAWSCredentials assumeRoleCredentia { // user/role setup may not be complete // so retry for a bit before giving up - var stopTime = DateTime.Now.AddSeconds(30); - while (response == null && DateTime.Now < stopTime) + var stopTime = DateTime.UtcNow.AddSeconds(30); + while (response == null && DateTime.UtcNow < stopTime) { var doSleep = true; try diff --git a/sdk/test/Services/IdentityManagement/IntegrationTests/GroupTests.cs b/sdk/test/Services/IdentityManagement/IntegrationTests/GroupTests.cs index c9c3db4d4002..d48a2fc4ac0c 100644 --- a/sdk/test/Services/IdentityManagement/IntegrationTests/GroupTests.cs +++ b/sdk/test/Services/IdentityManagement/IntegrationTests/GroupTests.cs @@ -76,10 +76,10 @@ public void TestCreateGetGroup() public void TestGroupWithUsers() { string - username1 = "user1" + DateTime.Now.Ticks, - username2 = "user2" + DateTime.Now.Ticks, - username3 = "user3" + DateTime.Now.Ticks, - groupname = "group" + DateTime.Now.Ticks; + username1 = "user1" + DateTime.UtcNow.Ticks, + username2 = "user2" + DateTime.UtcNow.Ticks, + username3 = "user3" + DateTime.UtcNow.Ticks, + groupname = "group" + DateTime.UtcNow.Ticks; try { @@ -131,10 +131,10 @@ public void TestGroupWithUsers() public void TestRemoveUsersFromGroup() { string - username1 = "user1" + DateTime.Now.Ticks, - username2 = "user2" + DateTime.Now.Ticks, - username3 = "user3" + DateTime.Now.Ticks, - groupname = "group" + DateTime.Now.Ticks; + username1 = "user1" + DateTime.UtcNow.Ticks, + username2 = "user2" + DateTime.UtcNow.Ticks, + username3 = "user3" + DateTime.UtcNow.Ticks, + groupname = "group" + DateTime.UtcNow.Ticks; try { @@ -191,11 +191,11 @@ public void TestRemoveUsersFromGroup() public void TestGroupPaging() { string - username1 = "user1" + DateTime.Now.Ticks, - username2 = "user2" + DateTime.Now.Ticks, - username3 = "user3" + DateTime.Now.Ticks, - username4 = "user4" + DateTime.Now.Ticks, - groupname = "group" + DateTime.Now.Ticks; + username1 = "user1" + DateTime.UtcNow.Ticks, + username2 = "user2" + DateTime.UtcNow.Ticks, + username3 = "user3" + DateTime.UtcNow.Ticks, + username4 = "user4" + DateTime.UtcNow.Ticks, + groupname = "group" + DateTime.UtcNow.Ticks; try @@ -275,10 +275,10 @@ public void TestListGroupWithPaths() { string - groupname1 = "group1" + DateTime.Now.Ticks, - groupname2 = "group2" + DateTime.Now.Ticks, - groupname3 = "group3" + DateTime.Now.Ticks, - groupname4 = "group4" + DateTime.Now.Ticks; + groupname1 = "group1" + DateTime.UtcNow.Ticks, + groupname2 = "group2" + DateTime.UtcNow.Ticks, + groupname3 = "group3" + DateTime.UtcNow.Ticks, + groupname4 = "group4" + DateTime.UtcNow.Ticks; string pathA = IAMUtil.MakePath("A"), @@ -344,10 +344,10 @@ public void TestListGroupWithPaths() public void TestListGroupsPaging() { string - groupname1 = "group1" + DateTime.Now.Ticks, - groupname2 = "group2" + DateTime.Now.Ticks, - groupname3 = "group3" + DateTime.Now.Ticks, - groupname4 = "group4" + DateTime.Now.Ticks; + groupname1 = "group1" + DateTime.UtcNow.Ticks, + groupname2 = "group2" + DateTime.UtcNow.Ticks, + groupname3 = "group3" + DateTime.UtcNow.Ticks, + groupname4 = "group4" + DateTime.UtcNow.Ticks; try @@ -420,8 +420,8 @@ public void TestListGroupsPaging() public void AddUserToNonExistentGroup() { string - username = "user" + DateTime.Now.Ticks, - grpname = "group" + DateTime.Now.Ticks; + username = "user" + DateTime.UtcNow.Ticks, + grpname = "group" + DateTime.UtcNow.Ticks; try { Client.CreateUser(new CreateUserRequest() { UserName = username, Path = IAMUtil.TEST_PATH }); @@ -440,7 +440,7 @@ public void AddUserToNonExistentGroup() public void TestDoubleCreation() { string - grpname = "group" + DateTime.Now.Ticks; + grpname = "group" + DateTime.UtcNow.Ticks; try { @@ -460,8 +460,8 @@ public void TestDoubleCreation() public void TestDeleteUserInGroupThrowsException() { string - username = "user" + DateTime.Now.Ticks, - grpname = "group" + DateTime.Now.Ticks; + username = "user" + DateTime.UtcNow.Ticks, + grpname = "group" + DateTime.UtcNow.Ticks; try { @@ -486,8 +486,8 @@ public void TestDeleteUserInGroupThrowsException() public void TestDeleteGroupWithUsersThrowsException() { string - username = "user" + DateTime.Now.Ticks, - grpname = "group" + DateTime.Now.Ticks; + username = "user" + DateTime.UtcNow.Ticks, + grpname = "group" + DateTime.UtcNow.Ticks; try diff --git a/sdk/test/Services/IdentityManagement/IntegrationTests/PolicyTests.cs b/sdk/test/Services/IdentityManagement/IntegrationTests/PolicyTests.cs index 815bb57fe48f..b0571527a34e 100644 --- a/sdk/test/Services/IdentityManagement/IntegrationTests/PolicyTests.cs +++ b/sdk/test/Services/IdentityManagement/IntegrationTests/PolicyTests.cs @@ -61,7 +61,7 @@ public void TestSetup() [TestCategory("IdentityManagement")] public void TestPrincipalPolicies() { - string groupname = "sdk-testgroup-" + DateTime.Now.Ticks; + string groupname = "sdk-testgroup-" + DateTime.UtcNow.Ticks; string policyName = "strong-password"; string policy = @"{ ""Version"": ""2012-10-17"", @@ -309,7 +309,7 @@ public void TestCustomPolicies() public void TestPutGetUserPolicy() { string username = IAMUtil.CreateTestUser(Client); - string policyName = "test-policy-" + DateTime.Now.Ticks; + string policyName = "test-policy-" + DateTime.UtcNow.Ticks; try { @@ -339,7 +339,7 @@ public void TestPutGetUserPolicy() [TestCategory("IdentityManagement")] public void TestPutGetGroupPolicy() { - string groupname = "sdk-testgroup-" + DateTime.Now.Ticks; + string groupname = "sdk-testgroup-" + DateTime.UtcNow.Ticks; string policyName = "strong-password"; try @@ -374,7 +374,7 @@ public void TestPutGetGroupPolicy() public void TestGetNonExistantPolicy() { string username = IAMUtil.CreateTestUser(Client); - string policyName = "test-policy-" + DateTime.Now.Ticks; + string policyName = "test-policy-" + DateTime.UtcNow.Ticks; try { @@ -400,7 +400,7 @@ public void TestListUserPolicies() { for (int i = 0; i < nPolicies; i++) { - policyNames[i] = "test-policy-" + DateTime.Now.Ticks + i; + policyNames[i] = "test-policy-" + DateTime.UtcNow.Ticks + i; Client.PutUserPolicy(new PutUserPolicyRequest() { UserName = username, @@ -436,7 +436,7 @@ public void TestListUserPolicies() [TestCategory("IdentityManagement")] public void TestListGroupPolicies() { - string grpname = "sdk-testgroup-" + DateTime.Now.Ticks; + string grpname = "sdk-testgroup-" + DateTime.UtcNow.Ticks; string[] policyNames = new string[3]; int nPolicies = 3; @@ -446,7 +446,7 @@ public void TestListGroupPolicies() for (int i = 0; i < nPolicies; i++) { - policyNames[i] = "test-policy-" + DateTime.Now.Ticks + i; + policyNames[i] = "test-policy-" + DateTime.UtcNow.Ticks + i; Client.PutGroupPolicy(new PutGroupPolicyRequest() { GroupName = grpname, @@ -495,7 +495,7 @@ public void TestListUserPoliciesPaging() { for (int i = 0; i < nPolicies; i++) { - policyNames[i] = "test-policy-" + DateTime.Now.Ticks + i; + policyNames[i] = "test-policy-" + DateTime.UtcNow.Ticks + i; Client.PutUserPolicy(new PutUserPolicyRequest() { UserName = username, @@ -548,7 +548,7 @@ public void TestListUserPoliciesPaging() [TestCategory("IdentityManagement")] public void TestListGroupPoliciesPaging() { - string grpname = "sdk-testgroup-" + DateTime.Now.Ticks; + string grpname = "sdk-testgroup-" + DateTime.UtcNow.Ticks; int nPolicies = 3; string[] policyNames = new string[nPolicies]; @@ -558,7 +558,7 @@ public void TestListGroupPoliciesPaging() for (int i = 0; i < nPolicies; i++) { - policyNames[i] = "test-policy-" + DateTime.Now.Ticks + i; + policyNames[i] = "test-policy-" + DateTime.UtcNow.Ticks + i; Client.PutGroupPolicy(new PutGroupPolicyRequest() { GroupName = grpname, @@ -617,7 +617,7 @@ public void TestListGroupPoliciesPaging() public void TestDeleteUserPolicy() { string username = IAMUtil.CreateTestUser(Client); - string pName = "sdk-policy-" + DateTime.Now.Ticks; + string pName = "sdk-policy-" + DateTime.UtcNow.Ticks; try { @@ -650,8 +650,8 @@ public void TestDeleteUserPolicy() [TestCategory("IdentityManagement")] public void TestDeleteGroupPolicy() { - string groupname = "sdk-testgroup-" + DateTime.Now.Ticks; - string pName = "test-policy-" + DateTime.Now.Ticks; + string groupname = "sdk-testgroup-" + DateTime.UtcNow.Ticks; + string pName = "test-policy-" + DateTime.UtcNow.Ticks; try { @@ -687,12 +687,12 @@ public void TestDeleteGroupPolicy() [ExpectedException(typeof(NoSuchEntityException))] public void TestDeleteNonExistentGroupPolicyException() { - string groupname = "sdk-testgroup-" + DateTime.Now.Ticks; + string groupname = "sdk-testgroup-" + DateTime.UtcNow.Ticks; try { Client.CreateGroup(new CreateGroupRequest() { GroupName = groupname, Path = IAMUtil.TEST_PATH }); - Client.DeleteGroupPolicy(new DeleteGroupPolicyRequest() { GroupName = groupname, PolicyName = "test-policy-" + DateTime.Now.Ticks }); + Client.DeleteGroupPolicy(new DeleteGroupPolicyRequest() { GroupName = groupname, PolicyName = "test-policy-" + DateTime.UtcNow.Ticks }); } finally { @@ -706,12 +706,12 @@ public void TestDeleteNonExistentGroupPolicyException() [ExpectedException(typeof(NoSuchEntityException))] public void TestGetNonExistentGroupPolicyException() { - string groupname = "sdk-testgroup-" + DateTime.Now.Ticks; + string groupname = "sdk-testgroup-" + DateTime.UtcNow.Ticks; try { Client.CreateGroup(new CreateGroupRequest() { GroupName = groupname, Path = IAMUtil.TEST_PATH }); - Client.GetGroupPolicy(new GetGroupPolicyRequest() { GroupName = groupname, PolicyName = "test-policy-" + DateTime.Now.Ticks }); + Client.GetGroupPolicy(new GetGroupPolicyRequest() { GroupName = groupname, PolicyName = "test-policy-" + DateTime.UtcNow.Ticks }); } finally { @@ -729,7 +729,7 @@ public void TestDeleteNonExistentUserPolicyException() try { - Client.DeleteUserPolicy(new DeleteUserPolicyRequest() { UserName = username, PolicyName = "test-policy-" + DateTime.Now.Ticks }); + Client.DeleteUserPolicy(new DeleteUserPolicyRequest() { UserName = username, PolicyName = "test-policy-" + DateTime.UtcNow.Ticks }); } finally { @@ -747,7 +747,7 @@ public void TestGetNonExistentUserPolicyException() try { - Client.GetUserPolicy(new GetUserPolicyRequest() { UserName = username, PolicyName = "test-policy-" + DateTime.Now.Ticks }); + Client.GetUserPolicy(new GetUserPolicyRequest() { UserName = username, PolicyName = "test-policy-" + DateTime.UtcNow.Ticks }); } finally { @@ -762,7 +762,7 @@ public void TestGetNonExistentUserPolicyException() public void TestPutUserPolicyMalformedPolicyDocumentException() { string username = IAMUtil.CreateTestUser(Client); - string policyName = "test-policy-" + DateTime.Now.Ticks; + string policyName = "test-policy-" + DateTime.UtcNow.Ticks; try { @@ -784,7 +784,7 @@ public void TestPutUserPolicyMalformedPolicyDocumentException() [TestCategory("IdentityManagement")] public void TestCreateManagedPolicy() { - string policyName = "test-policy-" + DateTime.Now.Ticks; + string policyName = "test-policy-" + DateTime.UtcNow.Ticks; string arn = null; Client.CreatePolicy(new CreatePolicyRequest { PolicyName = policyName, PolicyDocument = TEST_VERSIONED_POLICY }); @@ -838,7 +838,7 @@ private static IEnumerable ListAllPolicies() public void TestAttachManagedPolicy() { string username = IAMUtil.CreateTestUser(Client); - string policyName = "sdk-policy-" + DateTime.Now.Ticks; + string policyName = "sdk-policy-" + DateTime.UtcNow.Ticks; var policyArn = Client.CreatePolicy(new CreatePolicyRequest { PolicyName = policyName, PolicyDocument = TEST_VERSIONED_POLICY }).Policy.Arn; diff --git a/sdk/test/Services/IdentityManagement/IntegrationTests/UserTests.cs b/sdk/test/Services/IdentityManagement/IntegrationTests/UserTests.cs index c03d8815aaa1..61c8bd65ad53 100644 --- a/sdk/test/Services/IdentityManagement/IntegrationTests/UserTests.cs +++ b/sdk/test/Services/IdentityManagement/IntegrationTests/UserTests.cs @@ -69,7 +69,7 @@ public void TestGetUserImplicit() [TestCategory("IdentityManagement")] public void TestCreateGetUser() { - string username = "sdk-testuser-" + DateTime.Now.Ticks; + string username = "sdk-testuser-" + DateTime.UtcNow.Ticks; try { @@ -123,7 +123,7 @@ public void TestListUsers() [TestCategory("IdentityManagement")] public void TestUserWithPath() { - string username = "sdk-testuser-" + DateTime.Now.Ticks; + string username = "sdk-testuser-" + DateTime.UtcNow.Ticks; string path = IAMUtil.MakePath("one", "two", "three"); try { @@ -143,10 +143,10 @@ public void TestUserWithPath() [TestCategory("IdentityManagement")] public void TestListUsersByPath() { - string username1 = "sdk-testuser1-" + DateTime.Now.Ticks; - string username2 = "sdk-testuser2-" + DateTime.Now.Ticks; - string username3 = "sdk-testuser3-" + DateTime.Now.Ticks; - string username4 = "sdk-testuser4-" + DateTime.Now.Ticks; + string username1 = "sdk-testuser1-" + DateTime.UtcNow.Ticks; + string username2 = "sdk-testuser2-" + DateTime.UtcNow.Ticks; + string username3 = "sdk-testuser3-" + DateTime.UtcNow.Ticks; + string username4 = "sdk-testuser4-" + DateTime.UtcNow.Ticks; string pathA = IAMUtil.MakePath("A"); string pathB = IAMUtil.MakePath("B"); @@ -270,8 +270,8 @@ public void TestListUsersMaxResults() public void TestUpdateUser() { string - username = "sdk-testuser-" + DateTime.Now.Ticks, - newusername = "sdk-testnewuser-" + DateTime.Now.Ticks; + username = "sdk-testuser-" + DateTime.UtcNow.Ticks, + newusername = "sdk-testnewuser-" + DateTime.UtcNow.Ticks; string firstPath = IAMUtil.MakePath("first"), secondPath = IAMUtil.MakePath("second"); @@ -305,7 +305,7 @@ public void TestUpdateUser() [ExpectedException(typeof(NoSuchEntityException))] public void TestDeleteUser() { - string username = "sdk-testuser-" + DateTime.Now.Ticks; + string username = "sdk-testuser-" + DateTime.UtcNow.Ticks; Client.CreateUser(new CreateUserRequest() {UserName = username, Path = IAMUtil.TEST_PATH }); @@ -323,7 +323,7 @@ public void TestDeleteUser() [ExpectedException(typeof(EntityAlreadyExistsException))] public void TestDoubleCreateUser() { - string username = "sdk-testuser-" + DateTime.Now.Ticks; + string username = "sdk-testuser-" + DateTime.UtcNow.Ticks; try { @@ -342,7 +342,7 @@ public void TestDoubleCreateUser() [ExpectedException(typeof(NoSuchEntityException))] public void TestUpdateNonexistantUser() { - string username = "sdk-testuser-" + DateTime.Now.Ticks; + string username = "sdk-testuser-" + DateTime.UtcNow.Ticks; Client.UpdateUser(new UpdateUserRequest() { UserName = username, NewPath = "/lala/" }); } diff --git a/sdk/test/Services/IdentityManagement/IntegrationTests/Util.cs b/sdk/test/Services/IdentityManagement/IntegrationTests/Util.cs index 3e336ab829aa..886e232a43a5 100644 --- a/sdk/test/Services/IdentityManagement/IntegrationTests/Util.cs +++ b/sdk/test/Services/IdentityManagement/IntegrationTests/Util.cs @@ -93,7 +93,7 @@ public static void DeleteCertificatesForUser(AmazonIdentityManagementServiceClie public static string CreateTestUser(AmazonIdentityManagementServiceClient client) { - string username = "sdk-testuser-" + DateTime.Now.Ticks; + string username = "sdk-testuser-" + DateTime.UtcNow.Ticks; client.CreateUser(new CreateUserRequest() { UserName = username, Path = TEST_PATH }); return username; } diff --git a/sdk/test/Services/ImportExport/IntegrationTests/ImportExport.cs b/sdk/test/Services/ImportExport/IntegrationTests/ImportExport.cs index f873b80b46f9..1d1a1e2c0409 100644 --- a/sdk/test/Services/ImportExport/IntegrationTests/ImportExport.cs +++ b/sdk/test/Services/ImportExport/IntegrationTests/ImportExport.cs @@ -63,7 +63,7 @@ public static void ClassInitialize(TestContext testContext) s3Client = new AmazonS3Client(); // Add test data to export - bucketName = "sdk-import-test" + DateTime.Now.Ticks; + bucketName = "sdk-import-test" + DateTime.UtcNow.Ticks; s3Client.PutBucket(new PutBucketRequest { BucketName = bucketName }); s3Client.PutObject(new PutObjectRequest { diff --git a/sdk/test/Services/KeyManagementService/IntegrationTests/KeyManagementService.cs b/sdk/test/Services/KeyManagementService/IntegrationTests/KeyManagementService.cs index 1237f7322a7d..29730495d55b 100644 --- a/sdk/test/Services/KeyManagementService/IntegrationTests/KeyManagementService.cs +++ b/sdk/test/Services/KeyManagementService/IntegrationTests/KeyManagementService.cs @@ -22,7 +22,7 @@ public class KeyManagementService : TestBase private const int keySize = 1024; private const int numberOfRandomBytes = 1023; private const string testContents = "This is test data"; - private static string keyAlias = "alias/net_key" + DateTime.Now.ToFileTime(); + private static string keyAlias = "alias/net_key" + DateTime.UtcNow.ToFileTime(); private static MemoryStream testData = new MemoryStream(Encoding.UTF8.GetBytes(testContents)); private static TimeSpan keyMaxWait = TimeSpan.FromSeconds(30); private static TimeSpan keyDescribeWait = TimeSpan.FromSeconds(5); @@ -331,10 +331,10 @@ private void ValidateEncryptedData(MemoryStream cb, MemoryStream plaintext) } private void ValidateKey(string keyId, bool keyEnabled, bool isCopy = false) { - var stopTime = DateTime.Now + keyMaxWait; + var stopTime = DateTime.UtcNow + keyMaxWait; KeyMetadata keyMetadata = null; - while(DateTime.Now < stopTime) + while(DateTime.UtcNow < stopTime) { try { diff --git a/sdk/test/Services/Kinesis/IntegrationTests/Kinesis.cs b/sdk/test/Services/Kinesis/IntegrationTests/Kinesis.cs index c65d73453239..92e35a13f52f 100644 --- a/sdk/test/Services/Kinesis/IntegrationTests/Kinesis.cs +++ b/sdk/test/Services/Kinesis/IntegrationTests/Kinesis.cs @@ -46,7 +46,7 @@ public static void Cleanup() [TestCategory("Kinesis")] public void KinesisCRUD() { - var streamName = "dotnet-integ-test-stream-" + DateTime.Now.Ticks; + var streamName = "dotnet-integ-test-stream-" + DateTime.UtcNow.Ticks; Action waitUntilStreamActive = () => UtilityMethods.WaitUntil(() => Client.DescribeStream(new DescribeStreamRequest { StreamName = streamName }).StreamDescription.StreamStatus == StreamStatus.ACTIVE); diff --git a/sdk/test/Services/Kinesis/IntegrationTests/KinesisFirehose.cs b/sdk/test/Services/Kinesis/IntegrationTests/KinesisFirehose.cs index 212a1ed4f6aa..899692f724e6 100644 --- a/sdk/test/Services/Kinesis/IntegrationTests/KinesisFirehose.cs +++ b/sdk/test/Services/Kinesis/IntegrationTests/KinesisFirehose.cs @@ -75,11 +75,11 @@ public class KinesisFirehose : TestBase public void TestInitialize() { // Create S3 Bucket - BucketName = "sdk-dotnet-integ-test-bucket-firehose" + DateTime.Now.Ticks; + BucketName = "sdk-dotnet-integ-test-bucket-firehose" + DateTime.UtcNow.Ticks; s3Client.PutBucket(BucketName); // Create IAM Role - RoleName = "NetFirehoseTestRole" + DateTime.Now.Ticks; + RoleName = "NetFirehoseTestRole" + DateTime.UtcNow.Ticks; if (string.IsNullOrEmpty(TestAccountId)) Assert.Fail("TestAccountId must be specified to run these tests"); @@ -92,7 +92,7 @@ public void TestInitialize() Assert.IsNotNull(roleArn); // Attach Policy to Role - PolicyName = "NetFirehoseTestRolePolicy" + DateTime.Now.Ticks; + PolicyName = "NetFirehoseTestRolePolicy" + DateTime.UtcNow.Ticks; iamClient.PutRolePolicy(new PutRolePolicyRequest() { PolicyDocument = string.Format(RolePolicyDocumentFormat, BucketName), @@ -105,7 +105,7 @@ public void TestInitialize() // Create Firehose Delivery Stream string bucketArn = "arn:aws:s3:::" + BucketName; - DeliveryStreamName = "dotnet-test-delivery-stream" + DateTime.Now.Ticks; + DeliveryStreamName = "dotnet-test-delivery-stream" + DateTime.UtcNow.Ticks; string deliveryStreamArn = Client.CreateDeliveryStream(new CreateDeliveryStreamRequest() { DeliveryStreamName = DeliveryStreamName, @@ -122,8 +122,8 @@ public void TestInitialize() // Wait for Delivery Stream to be active DeliveryStreamStatus streamStatus = DeliveryStreamStatus.CREATING; - var timeout = DateTime.Now.AddSeconds(120); - while (streamStatus != DeliveryStreamStatus.ACTIVE && DateTime.Now.Ticks < timeout.Ticks) + var timeout = DateTime.UtcNow.AddSeconds(120); + while (streamStatus != DeliveryStreamStatus.ACTIVE && DateTime.UtcNow.Ticks < timeout.Ticks) { streamStatus = Client.DescribeDeliveryStream(new DescribeDeliveryStreamRequest() { diff --git a/sdk/test/Services/Lambda/IntegrationTests/LambdaTests.cs b/sdk/test/Services/Lambda/IntegrationTests/LambdaTests.cs index 25fdeec62fb0..fde274506afc 100644 --- a/sdk/test/Services/Lambda/IntegrationTests/LambdaTests.cs +++ b/sdk/test/Services/Lambda/IntegrationTests/LambdaTests.cs @@ -177,8 +177,8 @@ public async Task StreamifyLambdaResponseTest() try { //Arrange - var functionName = "HelloWorld-" + DateTime.Now.Ticks; - var iamRoleName = "Lambda-" + DateTime.Now.Ticks; + var functionName = "HelloWorld-" + DateTime.UtcNow.Ticks; + var iamRoleName = "Lambda-" + DateTime.UtcNow.Ticks; var request = new CreateRoleRequest { RoleName = iamRoleName, @@ -364,8 +364,8 @@ public void LambdaFunctionTest() public static void CreateLambdaFunction(out string functionName, out string functionArn, out string iamRoleName, out string iamRoleArn, string functionCode, Runtime runtime) { - functionName = "HelloWorld-" + DateTime.Now.Ticks; - iamRoleName = "Lambda-" + DateTime.Now.Ticks; + functionName = "HelloWorld-" + DateTime.UtcNow.Ticks; + iamRoleName = "Lambda-" + DateTime.UtcNow.Ticks; CreateLambdaFunction(functionName, iamRoleName, out iamRoleArn, out functionArn, functionCode, runtime); } diff --git a/sdk/test/Services/RDS/IntegrationTests/DBParameters.cs b/sdk/test/Services/RDS/IntegrationTests/DBParameters.cs index 0949258b9516..e247559144d6 100644 --- a/sdk/test/Services/RDS/IntegrationTests/DBParameters.cs +++ b/sdk/test/Services/RDS/IntegrationTests/DBParameters.cs @@ -14,7 +14,7 @@ public class DBParameters : TestBase public void TestDBParameterOperations() { const string engine = "mysql5.5"; - var parameterGroupName = "dotnet-test-param-group-" + DateTime.Now.Ticks; + var parameterGroupName = "dotnet-test-param-group-" + DateTime.UtcNow.Ticks; DBParameterGroup parameterGroup = null; DBParameterGroup parameterGroup2 = null; diff --git a/sdk/test/Services/Redshift/IntegrationTests/Redshift.cs b/sdk/test/Services/Redshift/IntegrationTests/Redshift.cs index 6831712c4f24..107eb47a2201 100644 --- a/sdk/test/Services/Redshift/IntegrationTests/Redshift.cs +++ b/sdk/test/Services/Redshift/IntegrationTests/Redshift.cs @@ -23,7 +23,7 @@ public static void Cleanup() [TestCategory("Redshift")] public void CRUDSecurityGroups() { - string name = "dotnetsdk" + DateTime.Now.Ticks; + string name = "dotnetsdk" + DateTime.UtcNow.Ticks; var createRequest = new CreateClusterSecurityGroupRequest() { ClusterSecurityGroupName = name, Description = "Description" }; CreateClusterSecurityGroupResponse createResponse = null; try @@ -67,7 +67,7 @@ public void CRUDSecurityGroups() [TestCategory("Redshift")] public void CRUDParameterGroup() { - string name = "dotnetsdk" + DateTime.Now.Ticks; + string name = "dotnetsdk" + DateTime.UtcNow.Ticks; var createRequest = new CreateClusterParameterGroupRequest() { ParameterGroupName = name, ParameterGroupFamily = "redshift-1.0", Description = "A Description" }; CreateClusterParameterGroupResponse createResponse = Client.CreateClusterParameterGroup(createRequest); try diff --git a/sdk/test/Services/Route53/IntegrationTests/Route53.cs b/sdk/test/Services/Route53/IntegrationTests/Route53.cs index 296eac7f559c..b83f17bcd6a4 100644 --- a/sdk/test/Services/Route53/IntegrationTests/Route53.cs +++ b/sdk/test/Services/Route53/IntegrationTests/Route53.cs @@ -171,9 +171,9 @@ public void HealthCheckTests() Assert.IsNotNull(listResponse.HealthChecks.FirstOrDefault(x => x.Id == healthCheckId)); GetHealthCheckStatusResponse status = null; - var stopTime = DateTime.Now + maxWaitTime; + var stopTime = DateTime.UtcNow + maxWaitTime; - while (DateTime.Now < stopTime) + while (DateTime.UtcNow < stopTime) { try { @@ -263,7 +263,7 @@ public void DelegationSetTests() var sets = Client.ListReusableDelegationSets(new ListReusableDelegationSetsRequest()); var setCount = sets.DelegationSets.Count; - var callerReference = "DNSMigration" + DateTime.Now.ToFileTime(); + var callerReference = "DNSMigration" + DateTime.UtcNow.ToFileTime(); var createResponse = Client.CreateReusableDelegationSet(new CreateReusableDelegationSetRequest { CallerReference = callerReference @@ -306,7 +306,7 @@ public void DelegationSetTests() Assert.AreEqual(1, hostedZones.Count); // add a second set - callerReference = "DNSMigration" + DateTime.Now.ToFileTime(); + callerReference = "DNSMigration" + DateTime.UtcNow.ToFileTime(); createResponse = Client.CreateReusableDelegationSet(new CreateReusableDelegationSetRequest { CallerReference = callerReference diff --git a/sdk/test/Services/S3/IntegrationTests/AccessPointTests.cs b/sdk/test/Services/S3/IntegrationTests/AccessPointTests.cs index fe4a3efb2477..0d1f16e6553d 100644 --- a/sdk/test/Services/S3/IntegrationTests/AccessPointTests.cs +++ b/sdk/test/Services/S3/IntegrationTests/AccessPointTests.cs @@ -23,7 +23,7 @@ namespace AWSSDK_DotNet.IntegrationTests.Tests.S3 public class AccessPointTests : TestBase { static string _bucketName; - static string _accesspointName = "sdk-integtests-" + DateTime.Now.Ticks; + static string _accesspointName = "sdk-integtests-" + DateTime.UtcNow.Ticks; static string _accesspointArn; static string _accountId; diff --git a/sdk/test/Services/S3/IntegrationTests/BucketRegionTestRunner.cs b/sdk/test/Services/S3/IntegrationTests/BucketRegionTestRunner.cs index 0239a000e3ff..2e9d951f268a 100644 --- a/sdk/test/Services/S3/IntegrationTests/BucketRegionTestRunner.cs +++ b/sdk/test/Services/S3/IntegrationTests/BucketRegionTestRunner.cs @@ -93,7 +93,7 @@ public BucketRegionTestRunner(bool useSigV4, bool useSigV4SetExplicitly = false, { BucketName = BucketName, Key = BucketRegionTestRunner.TestObjectKey, - Expires = DateTime.Now.AddHours(1) + Expires = DateTime.UtcNow.AddHours(1) }; } } @@ -106,7 +106,7 @@ private void CreateAndCheckTestBucket() if (TestBucket == null) { // add ticks to bucket name because the bucket namespace is shared globally - var bucketName = BucketPrefix + DateTime.Now.Ticks; + var bucketName = BucketPrefix + DateTime.UtcNow.Ticks; // Create the bucket but don't run the test. // If the bucket is ready the next time this test runs we'll test then. USWest1Client.PutBucket(new PutBucketRequest() @@ -115,7 +115,7 @@ private void CreateAndCheckTestBucket() BucketName = bucketName, }); } - else if (TestBucket.CreationDate.Value.AddHours(TemporaryRedirectMaxExpirationHours) < DateTime.Now) + else if (TestBucket.CreationDate.Value.AddHours(TemporaryRedirectMaxExpirationHours) < DateTime.UtcNow) { BucketRegionDetector.BucketRegionCache.Clear(); TestBucketIsReady = true; diff --git a/sdk/test/Services/S3/IntegrationTests/GeneratePreSignedUrlTests.cs b/sdk/test/Services/S3/IntegrationTests/GeneratePreSignedUrlTests.cs index 01f00b3fca45..206f5fb935ac 100644 --- a/sdk/test/Services/S3/IntegrationTests/GeneratePreSignedUrlTests.cs +++ b/sdk/test/Services/S3/IntegrationTests/GeneratePreSignedUrlTests.cs @@ -152,7 +152,7 @@ public void EUNorth1Over7Days() [TestMethod] [TestCategory("S3")] public void USEastSignedParameters() { - TestSignedUrlParameters(RegionEndpoint.USEast1, DateTime.Now.AddDays(1)); + TestSignedUrlParameters(RegionEndpoint.USEast1, DateTime.UtcNow.AddDays(1)); } [TestMethod] @@ -185,7 +185,7 @@ private void TestPreSignedUrlPut(PresignedUrlTestParameters testParams) AWSConfigsS3.UseSignatureVersion4 = true; if (testParams.IsS3Express) { - testParams.BucketName = $"{UtilityMethods.SDK_TEST_PREFIX + DateTime.Now.Ticks}--{RegionCodePairs[testParams.Region]}--x-s3"; + testParams.BucketName = $"{UtilityMethods.SDK_TEST_PREFIX + DateTime.UtcNow.Ticks}--{RegionCodePairs[testParams.Region]}--x-s3"; client.PutBucket(new PutBucketRequest { @@ -213,7 +213,7 @@ private void TestPreSignedUrlPut(PresignedUrlTestParameters testParams) } private static void AssertPresignedUrlPut(AmazonS3Client client, PresignedUrlTestParameters testParams) { - string objectKey = TestKey + DateTime.Now.Ticks; + string objectKey = TestKey + DateTime.UtcNow.Ticks; var request = new GetPreSignedUrlRequest { @@ -466,7 +466,7 @@ public void MultipartUploadPresignedUrl() { BucketName = bucketName, Key = key, - Expires = DateTime.Now.AddDays(1), + Expires = DateTime.UtcNow.AddDays(1), PartNumber = part, UploadId = initiateMultipartResponse.UploadId, Verb = HttpVerb.PUT, diff --git a/sdk/test/Services/S3/IntegrationTests/KMSTests.cs b/sdk/test/Services/S3/IntegrationTests/KMSTests.cs index 94e88da3966f..582d86f5c86d 100644 --- a/sdk/test/Services/S3/IntegrationTests/KMSTests.cs +++ b/sdk/test/Services/S3/IntegrationTests/KMSTests.cs @@ -461,7 +461,7 @@ private void TestPresignedGet(string bucketName, string key, string keyId) { BucketName = bucketName, Key = key, - Expires = DateTime.Now.AddMinutes(5) + Expires = DateTime.UtcNow.AddMinutes(5) }; var url = Client.GetPreSignedURL(getPresignedUrlRequest); var webRequest = HttpWebRequest.Create(url); @@ -488,7 +488,7 @@ private void VerifyPresignedPut(string bucketName, string key, string keyId, Ser Verb = HttpVerb.PUT, ServerSideEncryptionMethod = serverSideEncryptionMethod, ServerSideEncryptionKeyManagementServiceKeyId = keyId, - Expires = DateTime.Now.AddMinutes(5) + Expires = DateTime.UtcNow.AddMinutes(5) }; var url = Client.GetPreSignedURL(getPresignedUrlRequest); diff --git a/sdk/test/Services/S3/IntegrationTests/LifecycleTests.cs b/sdk/test/Services/S3/IntegrationTests/LifecycleTests.cs index 4d2c8f328b88..bba188f2b3c7 100644 --- a/sdk/test/Services/S3/IntegrationTests/LifecycleTests.cs +++ b/sdk/test/Services/S3/IntegrationTests/LifecycleTests.cs @@ -244,7 +244,7 @@ public void LifecycleTest() Thread.Sleep(10000); - var expectedMinAbortDate = DateTime.Now.Date.AddDays(7); + var expectedMinAbortDate = DateTime.UtcNow.Date.AddDays(7); var initResponse = Client.InitiateMultipartUpload(new InitiateMultipartUploadRequest { BucketName = bucketName, diff --git a/sdk/test/Services/S3/IntegrationTests/MetadataTests.cs b/sdk/test/Services/S3/IntegrationTests/MetadataTests.cs index 4e9d30a08b0c..3c716e83d29b 100644 --- a/sdk/test/Services/S3/IntegrationTests/MetadataTests.cs +++ b/sdk/test/Services/S3/IntegrationTests/MetadataTests.cs @@ -26,7 +26,7 @@ public class MetadataTests : TestBase private static string bucketName; private static readonly Dictionary metadata = new Dictionary(StringComparer.Ordinal) { - { "date", DateTime.Now.ToFileTime().ToString() }, + { "date", DateTime.UtcNow.ToFileTime().ToString() }, { "test", "true" }, { "null-value", null }, { "aaa", "aaa" }, diff --git a/sdk/test/Services/S3/IntegrationTests/NotificationTests.cs b/sdk/test/Services/S3/IntegrationTests/NotificationTests.cs index 28b057729143..b1f8f2b73d44 100644 --- a/sdk/test/Services/S3/IntegrationTests/NotificationTests.cs +++ b/sdk/test/Services/S3/IntegrationTests/NotificationTests.cs @@ -48,7 +48,7 @@ public void SetTopicConfigurationTests() using (var snsClient = new AmazonSimpleNotificationServiceClient()) using (var stsClient = new AmazonSecurityTokenServiceClient()) { - var snsCreateResponse = snsClient.CreateTopic("events-test-" + DateTime.Now.Ticks); + var snsCreateResponse = snsClient.CreateTopic("events-test-" + DateTime.UtcNow.Ticks); var bucketName = S3TestUtils.CreateBucketWithWait(s3Client); try @@ -125,7 +125,7 @@ public void SetQueueConfigurationTests() using (var sqsClient = new AmazonSQSClient()) using (var stsClient = new AmazonSecurityTokenServiceClient()) { - var createResponse = sqsClient.CreateQueue("events-test-" + DateTime.Now.Ticks); + var createResponse = sqsClient.CreateQueue("events-test-" + DateTime.UtcNow.Ticks); var bucketName = S3TestUtils.CreateBucketWithWait(s3Client); try diff --git a/sdk/test/Services/S3/IntegrationTests/ObjectLockConfigurationTests.cs b/sdk/test/Services/S3/IntegrationTests/ObjectLockConfigurationTests.cs index aeaee5b350a6..1738e69c0392 100644 --- a/sdk/test/Services/S3/IntegrationTests/ObjectLockConfigurationTests.cs +++ b/sdk/test/Services/S3/IntegrationTests/ObjectLockConfigurationTests.cs @@ -196,7 +196,7 @@ public void TestObjectRetention_SetCompliance() { AddObjectLockConfiguration(); - DateTime date = DateTime.Now.AddMinutes(15); + DateTime date = DateTime.UtcNow.AddMinutes(15); var key = PutObject(); try @@ -248,7 +248,7 @@ public void TestObjectLockRetainUntilDate() { AddObjectLockConfiguration(); - DateTime date = DateTime.Now.AddMinutes(15); + DateTime date = DateTime.UtcNow.AddMinutes(15); var key = PutObject(date); try diff --git a/sdk/test/Services/S3/IntegrationTests/PutBucketS3ExpressTests.cs b/sdk/test/Services/S3/IntegrationTests/PutBucketS3ExpressTests.cs index f5da56b0f16b..ca2bb16f9125 100644 --- a/sdk/test/Services/S3/IntegrationTests/PutBucketS3ExpressTests.cs +++ b/sdk/test/Services/S3/IntegrationTests/PutBucketS3ExpressTests.cs @@ -27,7 +27,7 @@ public class PutBucketS3ExpressTests :TestBase //at the moment public void PutRegularBucketUsingS3ExpressConfiguration() { - string bucketName = UtilityMethods.SDK_TEST_PREFIX + DateTime.Now.Ticks; + string bucketName = UtilityMethods.SDK_TEST_PREFIX + DateTime.UtcNow.Ticks; var response = Client.PutBucket(new PutBucketRequest { BucketName = bucketName, @@ -45,7 +45,7 @@ public void PutRegularBucketUsingS3ExpressConfiguration() [TestCategory("S3")] public void PutS3ExpressBucketUsingS3ExpressConfiguration() { - string bucketName = $"{UtilityMethods.SDK_TEST_PREFIX + DateTime.Now.Ticks}--use1-az5--x-s3"; + string bucketName = $"{UtilityMethods.SDK_TEST_PREFIX + DateTime.UtcNow.Ticks}--use1-az5--x-s3"; var response = Client.PutBucket(new PutBucketRequest { BucketName = bucketName, @@ -63,7 +63,7 @@ public void PutS3ExpressBucketUsingS3ExpressConfiguration() [TestCategory("S3")] public void PutRegularBucketUsingNoConfiguration() { - string bucketName = UtilityMethods.SDK_TEST_PREFIX + DateTime.Now.Ticks; + string bucketName = UtilityMethods.SDK_TEST_PREFIX + DateTime.UtcNow.Ticks; var response = Client.PutBucket(new PutBucketRequest { BucketName = bucketName, diff --git a/sdk/test/Services/S3/IntegrationTests/PutObjectTests.cs b/sdk/test/Services/S3/IntegrationTests/PutObjectTests.cs index 83526e559c47..216500946a00 100644 --- a/sdk/test/Services/S3/IntegrationTests/PutObjectTests.cs +++ b/sdk/test/Services/S3/IntegrationTests/PutObjectTests.cs @@ -69,7 +69,7 @@ public void TestPutAndGetWithInvalidExpires() putObjectRequest.Headers["Expires"] = invalidValue; Client.PutObject(putObjectRequest); - var newExpires = DateTime.Now.AddDays(1); + var newExpires = DateTime.UtcNow.AddDays(1); var getObjectResponse = Client.GetObject(bucketName, key); using (getObjectResponse) { @@ -78,7 +78,7 @@ public void TestPutAndGetWithInvalidExpires() Assert.IsTrue(content.Equals(contentRead)); #pragma warning disable CS0618 // Type or member is obsolete - Assert.AreEqual(getObjectResponse.Expires, default(DateTime)); + Assert.AreEqual(getObjectResponse.Expires, DateTime.SpecifyKind(default, DateTimeKind.Utc)); #pragma warning restore CS0618 // Type or member is obsolete Assert.AreEqual(getObjectResponse.ExpiresString, invalidValue); @@ -91,13 +91,6 @@ public void TestPutAndGetWithInvalidExpires() var getObjectMetadataResponse = Client.GetObjectMetadata(bucketName, key); Assert.AreEqual(getObjectMetadataResponse.ExpiresString, invalidValue); - -#pragma warning disable CS0618 // Type or member is obsolete - Assert.AreEqual(getObjectMetadataResponse.Expires, default(DateTime)); - // Test getObjectMetadataResponse.Expires being overwritten by user code - getObjectMetadataResponse.Expires = newExpires; - Assert.AreEqual(newExpires, getObjectMetadataResponse.Expires); -#pragma warning restore CS0618 // Type or member is obsolete } [TestMethod] @@ -393,7 +386,7 @@ public void PutObject_SigV4() public void PutObject_WithExpires() { var key = "contentBodyPut" + random.Next(); - var expires = DateTime.Now.AddYears(5); + var expires = DateTime.UtcNow.AddYears(5); PutObjectRequest request = new PutObjectRequest() { BucketName = bucketName, @@ -709,7 +702,7 @@ private PutObjectRequest CreatePutObjectRequest() var request = new PutObjectRequest { BucketName = bucketName, - Key = DateTime.Now.ToFileTime() + testKey, + Key = DateTime.UtcNow.ToFileTime() + testKey, ContentBody = testContent }; return request; @@ -1096,7 +1089,7 @@ public void PutObjectWithACL() [TestCategory("S3")] public void PutBucketWithCannedACL() { - string aclBucketName = "dotnet-integtests-cannedacl" + DateTime.Now.Ticks; + string aclBucketName = "dotnet-integtests-cannedacl" + DateTime.UtcNow.Ticks; PutBucketRequest request = new PutBucketRequest() { BucketName = aclBucketName, CannedACL = S3CannedACL.LogDeliveryWrite, ObjectOwnership = ObjectOwnership.ObjectWriter }; Client.PutBucket(request); @@ -1149,7 +1142,7 @@ public void PutObjectWithContentLength() { BucketName = bucketName, Key = sourceKey, - Expires = DateTime.Now + TimeSpan.FromHours(2) + Expires = DateTime.UtcNow + TimeSpan.FromHours(2) }); HttpWebRequest httpRequest = HttpWebRequest.Create(url) as HttpWebRequest; diff --git a/sdk/test/Services/S3/IntegrationTests/RequesterPaysTests.cs b/sdk/test/Services/S3/IntegrationTests/RequesterPaysTests.cs index 3eef1a2dd4a9..0b45eb10541a 100644 --- a/sdk/test/Services/S3/IntegrationTests/RequesterPaysTests.cs +++ b/sdk/test/Services/S3/IntegrationTests/RequesterPaysTests.cs @@ -131,7 +131,7 @@ private void TestRequesterPays(string profileName, RequestPayer requestPayer, bo { BucketName = BucketName, Key = Key, - Expires = DateTime.Now.AddMinutes(20), + Expires = DateTime.UtcNow.AddMinutes(20), RequestPayer = requestPayer }); diff --git a/sdk/test/Services/S3/IntegrationTests/S3ExpressTests.cs b/sdk/test/Services/S3/IntegrationTests/S3ExpressTests.cs index 51377d30e8e8..a1570ee48864 100644 --- a/sdk/test/Services/S3/IntegrationTests/S3ExpressTests.cs +++ b/sdk/test/Services/S3/IntegrationTests/S3ExpressTests.cs @@ -219,7 +219,7 @@ public void Test_CopyObject_BetweenRegularBucket_And_S3ExpressBucket() var newObjectContent = "New Test Content"; // Create regular bucket - var newRegularBucket = $"{UtilityMethods.SDK_TEST_PREFIX + DateTime.Now.Ticks}"; + var newRegularBucket = $"{UtilityMethods.SDK_TEST_PREFIX + DateTime.UtcNow.Ticks}"; Client.PutBucket(newRegularBucket); S3TestUtils.WaitForBucket(Client, newRegularBucket); diff --git a/sdk/test/Services/S3/IntegrationTests/S3TestUtils.cs b/sdk/test/Services/S3/IntegrationTests/S3TestUtils.cs index e60aa1508518..da3b56c52522 100644 --- a/sdk/test/Services/S3/IntegrationTests/S3TestUtils.cs +++ b/sdk/test/Services/S3/IntegrationTests/S3TestUtils.cs @@ -23,7 +23,7 @@ public static class S3TestUtils public static string CreateBucket(IAmazonS3 s3Client) { - string bucketName = UtilityMethods.SDK_TEST_PREFIX + DateTime.Now.Ticks; + string bucketName = UtilityMethods.SDK_TEST_PREFIX + DateTime.UtcNow.Ticks; s3Client.PutBucket(new PutBucketRequest { BucketName = bucketName }); return bucketName; @@ -32,7 +32,7 @@ public static string CreateBucket(IAmazonS3 s3Client) public static string CreateBucket(IAmazonS3 s3Client, PutBucketRequest bucketRequest) { string bucketName = string.IsNullOrEmpty(bucketRequest.BucketName) ? - UtilityMethods.SDK_TEST_PREFIX + DateTime.Now.Ticks : + UtilityMethods.SDK_TEST_PREFIX + DateTime.UtcNow.Ticks : bucketRequest.BucketName; bucketRequest.BucketName = bucketName; @@ -42,7 +42,7 @@ public static string CreateBucket(IAmazonS3 s3Client, PutBucketRequest bucketReq } public static string CreateS3ExpressBucketWithWait(IAmazonS3 s3Client, string regionCode, bool setPublicACLs = false) { - string bucketName = $"{UtilityMethods.SDK_TEST_PREFIX}-{DateTime.Now.Ticks}--{regionCode}--x-s3"; + string bucketName = $"{UtilityMethods.SDK_TEST_PREFIX}-{DateTime.UtcNow.Ticks}--{regionCode}--x-s3"; s3Client.PutBucket(new PutBucketRequest { @@ -378,7 +378,7 @@ internal static void PutAndGetObjectTestHelper(IAmazonS3 s3Client, string bucket BucketName = bucketName, Key = keyName, Verb = HttpVerb.GET, - Expires = DateTime.Now + TimeSpan.FromDays(5) + Expires = DateTime.UtcNow + TimeSpan.FromDays(5) }); var httpRequest = HttpWebRequest.Create(presignedUrl); diff --git a/sdk/test/Services/S3/IntegrationTests/ServerSideBYOK.cs b/sdk/test/Services/S3/IntegrationTests/ServerSideBYOK.cs index 873933f38684..b68cff8cdeab 100644 --- a/sdk/test/Services/S3/IntegrationTests/ServerSideBYOK.cs +++ b/sdk/test/Services/S3/IntegrationTests/ServerSideBYOK.cs @@ -108,7 +108,7 @@ public void ServerSideEncryptionBYOKPutAndGet() BucketName = bucketName, Key = key, ServerSideEncryptionCustomerMethod = ServerSideEncryptionCustomerMethod.AES256, - Expires = DateTime.Now.AddMinutes(5) + Expires = DateTime.UtcNow.AddMinutes(5) }; var url = Client.GetPreSignedURL(getPresignedUrlRequest); var webRequest = HttpWebRequest.Create(url); diff --git a/sdk/test/Services/S3/IntegrationTests/TransferUtilityTests.cs b/sdk/test/Services/S3/IntegrationTests/TransferUtilityTests.cs index c4f5ead73b4b..7b1990775749 100644 --- a/sdk/test/Services/S3/IntegrationTests/TransferUtilityTests.cs +++ b/sdk/test/Services/S3/IntegrationTests/TransferUtilityTests.cs @@ -790,7 +790,7 @@ public void DownloadDirectoryWithDisableSlashCorrectionForS3DirectoryProgressTes DirectoryInfo DownloadDirectoryWithDisableSlashCorrectionForS3Directory(int numberOfTestFiles, DirectoryProgressValidator progressValidator) { - var keyPrefix = DateTime.Now.ToString("yyyy-MM-dd"); + var keyPrefix = DateTime.UtcNow.ToString("yyyy-MM-dd"); var directory = UploadDirectoryWithKeyPrefix(1 * KILO_SIZE, null, keyPrefix, numberOfTestFiles, false); var directoryPath = directory.FullName; Directory.Delete(directoryPath, true); diff --git a/sdk/test/Services/S3/UnitTests/Custom/S3AccessPointTests.cs b/sdk/test/Services/S3/UnitTests/Custom/S3AccessPointTests.cs index a1b45330b01e..73ab9c517ff1 100644 --- a/sdk/test/Services/S3/UnitTests/Custom/S3AccessPointTests.cs +++ b/sdk/test/Services/S3/UnitTests/Custom/S3AccessPointTests.cs @@ -369,7 +369,7 @@ public void PreSignedUrlTest(string accessPointArn, S3ConfigFlags flags, string { BucketName = accessPointArn, Key = "foo.txt", - Expires = DateTime.Now.AddDays(1), + Expires = DateTime.UtcNow.AddDays(1), Verb = HttpVerb.GET }; diff --git a/sdk/test/Services/S3/UnitTests/Custom/S3EventNotificationTests.cs b/sdk/test/Services/S3/UnitTests/Custom/S3EventNotificationTests.cs index 10ca2efa8c45..5e0be751068e 100644 --- a/sdk/test/Services/S3/UnitTests/Custom/S3EventNotificationTests.cs +++ b/sdk/test/Services/S3/UnitTests/Custom/S3EventNotificationTests.cs @@ -91,7 +91,7 @@ public void ParseS3EventTest() Assert.AreEqual("096fKKXTRTtl3on89fVO.nfljtsv6qko", record.S3.Object.VersionId); Assert.AreEqual("1234567890", record.S3.Object.Sequencer); - Assert.AreEqual(DateTime.Parse("1970-01-01T00:00:00.000Z", CultureInfo.InvariantCulture), record.GlacierEventData.RestoreEventData.LifecycleRestorationExpiryTime); + Assert.AreEqual(DateTime.Parse("1970-01-01T00:00:00.000Z", CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal), record.GlacierEventData.RestoreEventData.LifecycleRestorationExpiryTime); Assert.AreEqual("Standard", record.GlacierEventData.RestoreEventData.LifecycleRestoreStorageClass); } diff --git a/sdk/test/Services/S3/UnitTests/Custom/S3ExpiresUnmarshallTest.cs b/sdk/test/Services/S3/UnitTests/Custom/S3ExpiresUnmarshallTest.cs index b91ff11ddd8a..a541dfe408f5 100644 --- a/sdk/test/Services/S3/UnitTests/Custom/S3ExpiresUnmarshallTest.cs +++ b/sdk/test/Services/S3/UnitTests/Custom/S3ExpiresUnmarshallTest.cs @@ -55,7 +55,7 @@ public void GetObjectUnmarshallHandleInvalidDates(string expiresValue, bool isVa } else { - Assert.AreEqual(response.Expires, default(DateTime)); + Assert.AreEqual(response.Expires, DateTime.SpecifyKind(default, DateTimeKind.Utc)); } #pragma warning restore CS0618 // Type or member is obsolete } @@ -95,17 +95,6 @@ public void GetObjectMetadataUnmarshallHandleInvalidDates(string expiresValue, b GetObjectMetadataResponseUnmarshaller.Instance.UnmarshallResponse(context); Assert.AreEqual(response.ExpiresString, expiresValue); - -#pragma warning disable CS0618 // Type or member is obsolete - if (isValidDate) - { - Assert.AreEqual(response.Expires, DateTime.Parse(expiresValue).ToUniversalTime()); - } - else - { - Assert.AreEqual(response.Expires, default(DateTime)); - } -#pragma warning restore CS0618 // Type or member is obsolete } } } diff --git a/sdk/test/Services/S3/UnitTests/Custom/S3ObjectLambdaTests.cs b/sdk/test/Services/S3/UnitTests/Custom/S3ObjectLambdaTests.cs index 90f4fe4a60fd..c5d2dcd1bca5 100644 --- a/sdk/test/Services/S3/UnitTests/Custom/S3ObjectLambdaTests.cs +++ b/sdk/test/Services/S3/UnitTests/Custom/S3ObjectLambdaTests.cs @@ -246,7 +246,7 @@ public void PreSignedUrlTest() { BucketName = arnString, Key = "test2.txt", - Expires = DateTime.Now.AddDays(1), + Expires = DateTime.UtcNow.AddDays(1), Verb = HttpVerb.GET }; @@ -463,7 +463,7 @@ public void BlockTransferUtilityAbortMultipartUploadsTest() var transferUtility = new TransferUtility(RegionEndpoint.USWest2); try { - transferUtility.AbortMultipartUploads("arn:aws:s3-object-lambda:us-west-2:123456789012:accesspoint/mybanner", DateTime.Now); + transferUtility.AbortMultipartUploads("arn:aws:s3-object-lambda:us-west-2:123456789012:accesspoint/mybanner", DateTime.UtcNow); } catch (AmazonS3Exception e) { diff --git a/sdk/test/Services/S3/UnitTests/Custom/S3OutpostsTests.cs b/sdk/test/Services/S3/UnitTests/Custom/S3OutpostsTests.cs index e540e709c1d6..39a0d86226a3 100644 --- a/sdk/test/Services/S3/UnitTests/Custom/S3OutpostsTests.cs +++ b/sdk/test/Services/S3/UnitTests/Custom/S3OutpostsTests.cs @@ -335,7 +335,7 @@ public void PreSignedUrlTestBasic() { BucketName = outpostsArn, Key = "foo.txt", - Expires = DateTime.Now.AddDays(1), + Expires = DateTime.UtcNow.AddDays(1), Verb = HttpVerb.GET }; diff --git a/sdk/test/Services/SQS/IntegrationTests/SQS.cs b/sdk/test/Services/SQS/IntegrationTests/SQS.cs index fcdb18046264..ea57c87e7fe2 100644 --- a/sdk/test/Services/SQS/IntegrationTests/SQS.cs +++ b/sdk/test/Services/SQS/IntegrationTests/SQS.cs @@ -187,7 +187,7 @@ private static void ValidateMD5(string message, string md5) public void TestGetQueueUrl() { Client.ListQueues(new ListQueuesRequest()); - string queueName = "TestGetQueueUrl" + DateTime.Now.Ticks; + string queueName = "TestGetQueueUrl" + DateTime.UtcNow.Ticks; CreateQueueResponse createResponse = Client.CreateQueue(new CreateQueueRequest() { QueueName = queueName diff --git a/sdk/test/Services/SSOOIDC/UnitTests/Custom/_bcl+netstandard/CoreAmazonSSOOIDCTest.cs b/sdk/test/Services/SSOOIDC/UnitTests/Custom/_bcl+netstandard/CoreAmazonSSOOIDCTest.cs index dcebca20619a..acf454a7dec6 100644 --- a/sdk/test/Services/SSOOIDC/UnitTests/Custom/_bcl+netstandard/CoreAmazonSSOOIDCTest.cs +++ b/sdk/test/Services/SSOOIDC/UnitTests/Custom/_bcl+netstandard/CoreAmazonSSOOIDCTest.cs @@ -43,7 +43,7 @@ public void TestCleanup() [TestMethod] public void GetSsoToken() { - var minExpectedExpiresAt = DateTime.Now.AddSeconds(_testFixture.CreateTokenResponse.ExpiresIn.Value); + var minExpectedExpiresAt = DateTime.UtcNow.AddSeconds(_testFixture.CreateTokenResponse.ExpiresIn.Value); var response = CoreAmazonSSOOIDC.GetSsoToken(_testFixture.OidcClient.Object, _testFixture.GetSsoTokenRequest, _testFixture.GetSsoTokenContext.Object); @@ -58,7 +58,7 @@ public void GetSsoToken() [TestMethod] public void GetSsoToken_PkceFlow() { - var minExpectedExpiresAt = DateTime.Now.AddSeconds(_testFixture.CreateTokenResponse.ExpiresIn.Value); + var minExpectedExpiresAt = DateTime.UtcNow.AddSeconds(_testFixture.CreateTokenResponse.ExpiresIn.Value); var response = CoreAmazonSSOOIDC.GetSsoToken( _testFixture.OidcClient.Object, _testFixture.GetSsoTokenRequestWithPkceSuccess, @@ -76,7 +76,7 @@ public void GetSsoToken_PkceFlow() [TestMethod] public async Task GetSsoTokenAsync() { - var minExpectedExpiresAt = DateTime.Now.AddSeconds(_testFixture.CreateTokenResponse.ExpiresIn.Value); + var minExpectedExpiresAt = DateTime.UtcNow.AddSeconds(_testFixture.CreateTokenResponse.ExpiresIn.Value); var response = await CoreAmazonSSOOIDC.GetSsoTokenAsync(_testFixture.OidcClient.Object, _testFixture.GetSsoTokenRequest, _testFixture.GetSsoTokenContext.Object); @@ -91,7 +91,7 @@ public async Task GetSsoTokenAsync() [TestMethod] public async Task GetSsoToken_PkceFlowAsync() { - var minExpectedExpiresAt = DateTime.Now.AddSeconds(_testFixture.CreateTokenResponse.ExpiresIn.Value); + var minExpectedExpiresAt = DateTime.UtcNow.AddSeconds(_testFixture.CreateTokenResponse.ExpiresIn.Value); var response = await CoreAmazonSSOOIDC.GetSsoTokenAsync( _testFixture.OidcClient.Object, _testFixture.GetSsoTokenRequestWithPkceSuccess, @@ -109,7 +109,7 @@ public async Task GetSsoToken_PkceFlowAsync() [TestMethod] public void GetSsoToken_Poll_AuthorizationPendingException() { - var minExpectedExpiresAt = DateTime.Now.AddSeconds(_testFixture.CreateTokenResponse.ExpiresIn.Value); + var minExpectedExpiresAt = DateTime.UtcNow.AddSeconds(_testFixture.CreateTokenResponse.ExpiresIn.Value); _testFixture.WithCreateTokenExceptionThenSuccess(new AuthorizationPendingException("simulation")); var response = CoreAmazonSSOOIDC.GetSsoToken(_testFixture.OidcClient.Object, @@ -123,7 +123,7 @@ public void GetSsoToken_Poll_AuthorizationPendingException() [TestMethod] public async Task GetSsoTokenAsync_Poll_AuthorizationPendingException() { - var minExpectedExpiresAt = DateTime.Now.AddSeconds(_testFixture.CreateTokenResponse.ExpiresIn.Value); + var minExpectedExpiresAt = DateTime.UtcNow.AddSeconds(_testFixture.CreateTokenResponse.ExpiresIn.Value); _testFixture.WithCreateTokenExceptionThenSuccess(new AuthorizationPendingException("simulation")); var response = await CoreAmazonSSOOIDC.GetSsoTokenAsync(_testFixture.OidcClient.Object, @@ -137,7 +137,7 @@ public async Task GetSsoTokenAsync_Poll_AuthorizationPendingException() [TestMethod] public void GetSsoToken_Poll_SlowDownException() { - var minExpectedExpiresAt = DateTime.Now.AddSeconds(_testFixture.CreateTokenResponse.ExpiresIn.Value); + var minExpectedExpiresAt = DateTime.UtcNow.AddSeconds(_testFixture.CreateTokenResponse.ExpiresIn.Value); _testFixture.WithCreateTokenExceptionThenSuccess(new SlowDownException("simulation")); var response = CoreAmazonSSOOIDC.GetSsoToken(_testFixture.OidcClient.Object, @@ -151,7 +151,7 @@ public void GetSsoToken_Poll_SlowDownException() [TestMethod] public async Task GetSsoTokenAsync_Poll_SlowDownException() { - var minExpectedExpiresAt = DateTime.Now.AddSeconds(_testFixture.CreateTokenResponse.ExpiresIn.Value); + var minExpectedExpiresAt = DateTime.UtcNow.AddSeconds(_testFixture.CreateTokenResponse.ExpiresIn.Value); _testFixture.WithCreateTokenExceptionThenSuccess(new SlowDownException("simulation")); var response = await CoreAmazonSSOOIDC.GetSsoTokenAsync(_testFixture.OidcClient.Object, @@ -165,7 +165,7 @@ public async Task GetSsoTokenAsync_Poll_SlowDownException() [TestMethod] public void GetSsoToken_Poll_TimeoutException() { - var minExpectedExpiresAt = DateTime.Now.AddSeconds(_testFixture.CreateTokenResponse.ExpiresIn.Value); + var minExpectedExpiresAt = DateTime.UtcNow.AddSeconds(_testFixture.CreateTokenResponse.ExpiresIn.Value); _testFixture.WithCreateTokenExceptionThenSuccess(new TimeoutException("simulation")); @@ -181,7 +181,7 @@ public void GetSsoToken_Poll_TimeoutException() [TestMethod] public async Task GetSsoTokenAsync_Poll_TimeoutException() { - var minExpectedExpiresAt = DateTime.Now.AddSeconds(_testFixture.CreateTokenResponse.ExpiresIn.Value); + var minExpectedExpiresAt = DateTime.UtcNow.AddSeconds(_testFixture.CreateTokenResponse.ExpiresIn.Value); _testFixture.WithCreateTokenExceptionThenSuccess(new TimeoutException("simulation")); diff --git a/sdk/test/Services/SecurityToken/IntegrationTests/AssumeRole.cs b/sdk/test/Services/SecurityToken/IntegrationTests/AssumeRole.cs index 14017434b4a3..2c2db4bbfbbd 100644 --- a/sdk/test/Services/SecurityToken/IntegrationTests/AssumeRole.cs +++ b/sdk/test/Services/SecurityToken/IntegrationTests/AssumeRole.cs @@ -32,7 +32,7 @@ public static void ClassCleanup() [TestInitialize] public void Init() { - _now = DateTime.Now.ToFileTime().ToString(); + _now = DateTime.UtcNow.ToFileTime().ToString(); _roleName = "assume-role-" + _now; _userName = "assume-user-" + _now; diff --git a/sdk/test/Services/SecurityToken/IntegrationTests/GetFederationToken.cs b/sdk/test/Services/SecurityToken/IntegrationTests/GetFederationToken.cs index 79b1ae407dab..6b7bb8fcc2f4 100644 --- a/sdk/test/Services/SecurityToken/IntegrationTests/GetFederationToken.cs +++ b/sdk/test/Services/SecurityToken/IntegrationTests/GetFederationToken.cs @@ -37,7 +37,7 @@ public void TestGetFederationToken() Assert.IsNotNull(gftResult.Credentials.SessionToken); Assert.IsNotNull(gftResult.Credentials.Expiration); - var time = DateTime.Now; + var time = DateTime.UtcNow; var approximateExpires = time.AddHours(1); var expiresAfter = approximateExpires.AddMinutes(-5); var expiresBefore = approximateExpires.AddMinutes(5); @@ -90,7 +90,7 @@ public void TestGetFederationTokenAsync() Assert.IsNotNull(gftResult.Credentials.SessionToken); Assert.IsNotNull(gftResult.Credentials.Expiration); - var time = DateTime.Now; + var time = DateTime.UtcNow; var approximateExpires = time.AddHours(1); var expiresAfter = approximateExpires.AddMinutes(-5); var expiresBefore = approximateExpires.AddMinutes(5); diff --git a/sdk/test/Services/SecurityToken/IntegrationTests/GetSessionToken.cs b/sdk/test/Services/SecurityToken/IntegrationTests/GetSessionToken.cs index f14738733ae3..8f9d705d7731 100644 --- a/sdk/test/Services/SecurityToken/IntegrationTests/GetSessionToken.cs +++ b/sdk/test/Services/SecurityToken/IntegrationTests/GetSessionToken.cs @@ -37,7 +37,7 @@ public void TestGetSessionToken() Assert.IsNotNull(gstResult.Credentials.SessionToken); Assert.IsNotNull(gstResult.Credentials.Expiration); - var time = DateTime.Now; + var time = DateTime.UtcNow; var approximateExpires = time.AddHours(1); var expiresAfter = approximateExpires.AddMinutes(-5); var expiresBefore = approximateExpires.AddMinutes(5); @@ -64,7 +64,7 @@ public void TestGetSessionTokenRegional() Assert.IsNotNull(gstResult.Credentials.SessionToken); Assert.IsNotNull(gstResult.Credentials.Expiration); - var time = DateTime.Now; + var time = DateTime.UtcNow; var approximateExpires = time.AddHours(1); var expiresAfter = approximateExpires.AddMinutes(-5); var expiresBefore = approximateExpires.AddMinutes(5); @@ -109,7 +109,7 @@ public void TestGetSessionTokenAsync() Assert.IsNotNull(gstResult.Credentials.SessionToken); Assert.IsNotNull(gstResult.Credentials.Expiration); - var time = DateTime.Now; + var time = DateTime.UtcNow; var approximateExpires = time.AddHours(1); var expiresAfter = approximateExpires.AddMinutes(-5); var expiresBefore = approximateExpires.AddMinutes(5); diff --git a/sdk/test/Services/SecurityToken/UnitTests/Custom/RolePrincipalFormatTests.cs b/sdk/test/Services/SecurityToken/UnitTests/Custom/RolePrincipalFormatTests.cs index 291d86481fea..3cb4e28a320f 100644 --- a/sdk/test/Services/SecurityToken/UnitTests/Custom/RolePrincipalFormatTests.cs +++ b/sdk/test/Services/SecurityToken/UnitTests/Custom/RolePrincipalFormatTests.cs @@ -76,7 +76,7 @@ private void TestRolePrincipalARNFormats(string samlResponseFormat, string princ return new AssumeRoleWithSAMLResponse { Subject = "TestSubject", - Credentials = new Credentials("Test", "Test", "Test", DateTime.Now) + Credentials = new Credentials("Test", "Test", "Test", DateTime.UtcNow) }; }); diff --git a/sdk/test/Services/SimpleDB/IntegrationTests/SimpleDB.cs b/sdk/test/Services/SimpleDB/IntegrationTests/SimpleDB.cs index 9aee8c3c71f4..540d53c254d0 100644 --- a/sdk/test/Services/SimpleDB/IntegrationTests/SimpleDB.cs +++ b/sdk/test/Services/SimpleDB/IntegrationTests/SimpleDB.cs @@ -27,7 +27,7 @@ public static void Cleanup() } // Name of the domain used for all the integration tests. - private static string domainName = "aws-net-sdk-domain-" + DateTime.Now.Ticks; + private static string domainName = "aws-net-sdk-domain-" + DateTime.UtcNow.Ticks; // All test data used in these integration tests. private static List ALL_TEST_DATA = new List{ diff --git a/sdk/test/Services/SimpleEmail/IntegrationTests/SimpleEmail.cs b/sdk/test/Services/SimpleEmail/IntegrationTests/SimpleEmail.cs index 7d5fa700f5b4..c8b6ecdeefa7 100644 --- a/sdk/test/Services/SimpleEmail/IntegrationTests/SimpleEmail.cs +++ b/sdk/test/Services/SimpleEmail/IntegrationTests/SimpleEmail.cs @@ -65,8 +65,8 @@ public static void VerifyEmails(params string[] emails) // wait until all are verified, maximum wait time of two minutes bool allVerified = true; - DateTime latest = DateTime.Now + TimeSpan.FromMinutes(2); - while(DateTime.Now < latest) + DateTime latest = DateTime.UtcNow + TimeSpan.FromMinutes(2); + while(DateTime.UtcNow < latest) { // get verification status for all emails var verificationAttributes = Client.GetIdentityVerificationAttributes(new GetIdentityVerificationAttributesRequest diff --git a/sdk/test/Services/SimpleNotificationService/IntegrationTests/SNS.cs b/sdk/test/Services/SimpleNotificationService/IntegrationTests/SNS.cs index 7a761c51e135..2f3e441d2781 100644 --- a/sdk/test/Services/SimpleNotificationService/IntegrationTests/SNS.cs +++ b/sdk/test/Services/SimpleNotificationService/IntegrationTests/SNS.cs @@ -50,7 +50,7 @@ public void CRUDTopics() var currentTopicCount = allTopics.Count; // create new topic - var name = "dotnetsdk" + DateTime.Now.Ticks; + var name = "dotnetsdk" + DateTime.UtcNow.Ticks; var createTopicRequest = new CreateTopicRequest { Name = name @@ -110,7 +110,7 @@ public void SubscribeTopic() var subscriptionWaitDelay = TimeSpan.FromMinutes(2); // create new topic - var name = "dotnetsdk" + DateTime.Now.Ticks; + var name = "dotnetsdk" + DateTime.UtcNow.Ticks; var createTopicRequest = new CreateTopicRequest { Name = name @@ -132,8 +132,8 @@ public void SubscribeTopic() // wait until subscription has been confirmed, maximum wait time of two minutes // by default string subArn = null; - var latest = DateTime.Now + subscriptionWaitDelay; - while (DateTime.Now < latest) + var latest = DateTime.UtcNow + subscriptionWaitDelay; + while (DateTime.UtcNow < latest) { // get subscriptions for topic var listSubscriptionsRequest = new ListSubscriptionsByTopicRequest @@ -188,7 +188,7 @@ public void SubscribeTopic() public void TestPublishAsJson() { // create new topic - var name = "dotnetsdk" + DateTime.Now.Ticks; + var name = "dotnetsdk" + DateTime.UtcNow.Ticks; var createTopicRequest = new CreateTopicRequest { Name = name @@ -401,13 +401,13 @@ public void TestMultipleQueueSubscription() { var topicArns = new List(); - var topicName1 = "dotnetsdkTopic" + DateTime.Now.Ticks; + var topicName1 = "dotnetsdkTopic" + DateTime.UtcNow.Ticks; topicArns.Add(Client.CreateTopic(topicName1).TopicArn); - var topicName2 = "dotnetsdkTopic" + DateTime.Now.Ticks; + var topicName2 = "dotnetsdkTopic" + DateTime.UtcNow.Ticks; topicArns.Add(Client.CreateTopic(topicName2).TopicArn); - var queueName = "dotnetsdkQueue-" + DateTime.Now.Ticks; + var queueName = "dotnetsdkQueue-" + DateTime.UtcNow.Ticks; var queueUrl = sqsClient.CreateQueue(queueName).QueueUrl; try @@ -438,7 +438,7 @@ public void TestMultipleQueueSubscription() public void FindTopic() { // create new topic - var name = "dotnetsdk" + DateTime.Now.Ticks; + var name = "dotnetsdk" + DateTime.UtcNow.Ticks; var createTopicRequest = new CreateTopicRequest { Name = name diff --git a/sdk/test/Services/WAF/IntegrationTests/WAF.cs b/sdk/test/Services/WAF/IntegrationTests/WAF.cs index 2528ed268906..f1965dbcd7e7 100644 --- a/sdk/test/Services/WAF/IntegrationTests/WAF.cs +++ b/sdk/test/Services/WAF/IntegrationTests/WAF.cs @@ -31,7 +31,7 @@ public void TestByteMatchSet() var tokenStatus = Client.GetChangeTokenStatus(token1).ChangeTokenStatus; - var setName = "BMS-net-test-" + DateTime.Now.ToFileTime(); + var setName = "BMS-net-test-" + DateTime.UtcNow.ToFileTime(); var tupleTargetString = "aws"; var tuple = new ByteMatchTuple { diff --git a/sdk/test/UnitTests/Custom/Marshalling/BackwardsCompatibilityForDateTimePropertiesTests.cs b/sdk/test/UnitTests/Custom/Marshalling/BackwardsCompatibilityForDateTimePropertiesTests.cs index 92f67a2735a9..37ed5a740a36 100644 --- a/sdk/test/UnitTests/Custom/Marshalling/BackwardsCompatibilityForDateTimePropertiesTests.cs +++ b/sdk/test/UnitTests/Custom/Marshalling/BackwardsCompatibilityForDateTimePropertiesTests.cs @@ -36,91 +36,22 @@ public class BackwardsCompatibilityForDateTimePropertiesTests [TestMethod] [TestCategory("UnitTest")] - public void TestLegacyFieldsBackwardsCompatibility() + public void TestUtcFields() { PutScheduledUpdateGroupActionRequest request = new PutScheduledUpdateGroupActionRequest(); DateTime timeUtc = new DateTime(2018, 7, 18, 0, 0, 0, DateTimeKind.Utc); - DateTime timeLocal = new DateTime(2018, 7, 18, 0, 0, 0, DateTimeKind.Local); - DateTime timeUnspecified = new DateTime(2018, 7, 18, 0, 0, 0); - -#pragma warning disable CS0618 // Type or member is obsolete - request.StartTime = timeUtc; - request.EndTime = timeLocal; - request.Time = timeUnspecified; - Assert.AreEqual(request.StartTime, timeUtc); - Assert.AreEqual(request.EndTime, timeLocal); - Assert.AreEqual(request.Time, timeUnspecified); -#pragma warning restore CS0618 // Type or member is obsolete - - Assert.AreEqual(request.StartTimeUtc, timeUtc); - Assert.AreEqual(request.EndTimeUtc, timeUtc); - Assert.AreEqual(request.TimeUtc, timeUtc); - - var marshaller = new PutScheduledUpdateGroupActionRequestMarshaller(); - var marshalledRequest = marshaller.Marshall(request); - - Assert.AreEqual(marshalledRequest.Parameters["StartTime"], EXPECTED_MARSHALLED_STRING); - Assert.AreEqual(marshalledRequest.Parameters["EndTime"], EXPECTED_MARSHALLED_STRING); - Assert.AreEqual(marshalledRequest.Parameters["Time"], EXPECTED_MARSHALLED_STRING); - } - - [TestMethod] - [TestCategory("UnitTest")] - public void TestLegacyFieldsBackwardsCompatibilityWithMS() - { - PutScheduledUpdateGroupActionRequest request = new PutScheduledUpdateGroupActionRequest(); - - DateTime timeUtc = new DateTime(2018, 7, 18, 0, 0, 0, 123, DateTimeKind.Utc); - DateTime timeLocal = new DateTime(2018, 7, 18, 0, 0, 0, 123, DateTimeKind.Local); - DateTime timeUnspecified = new DateTime(2018, 7, 18, 0, 0, 0, 123); + //This is a value use of .ToLocalTime to construct a local time for testing. + DateTime timeLocal = new DateTime(2018, 7, 18, 0, 0, 0, DateTimeKind.Utc).ToLocalTime(); + DateTime timeUnspecified = new DateTime(timeLocal.Ticks); -#pragma warning disable CS0618 // Type or member is obsolete request.StartTime = timeUtc; request.EndTime = timeLocal; request.Time = timeUnspecified; - - Assert.AreEqual(request.StartTime, timeUtc); - Assert.AreEqual(request.EndTime, timeLocal); - Assert.AreEqual(request.Time, timeUnspecified); -#pragma warning restore CS0618 // Type or member is obsolete - - Assert.AreEqual(request.StartTimeUtc, timeUtc); - Assert.AreEqual(request.EndTimeUtc, timeUtc); - Assert.AreEqual(request.TimeUtc, timeUtc); - - var marshaller = new PutScheduledUpdateGroupActionRequestMarshaller(); - var marshalledRequest = marshaller.Marshall(request); - - Assert.AreEqual(marshalledRequest.Parameters["StartTime"], EXPECTED_MARSHALLED_STRING_WITH_MS); - Assert.AreEqual(marshalledRequest.Parameters["EndTime"], EXPECTED_MARSHALLED_STRING_WITH_MS); - Assert.AreEqual(marshalledRequest.Parameters["Time"], EXPECTED_MARSHALLED_STRING_WITH_MS); - } - - [TestMethod] - [TestCategory("UnitTest")] - public void TestUtcFields() - { - PutScheduledUpdateGroupActionRequest request = new PutScheduledUpdateGroupActionRequest(); - - DateTime timeUtc = new DateTime(2018, 7, 18, 0, 0, 0, DateTimeKind.Utc); - DateTime timeLocal = new DateTime(2018, 7, 18, 0, 0, 0, DateTimeKind.Utc).ToLocalTime(); - DateTime timeUnspecified = new DateTime(timeLocal.Ticks); - - request.StartTimeUtc = timeUtc; - request.EndTimeUtc = timeLocal; - request.TimeUtc = timeUnspecified; - -#pragma warning disable CS0618 // Type or member is obsolete Assert.AreEqual(request.StartTime, timeUtc); Assert.AreEqual(request.EndTime, timeLocal); Assert.AreEqual(request.Time, timeUnspecified); -#pragma warning restore CS0618 // Type or member is obsolete - - Assert.AreEqual(request.StartTimeUtc, timeUtc); - Assert.AreEqual(request.EndTimeUtc, timeLocal); - Assert.AreEqual(request.TimeUtc, timeUnspecified); var marshaller = new PutScheduledUpdateGroupActionRequestMarshaller(); var marshalledRequest = marshaller.Marshall(request); @@ -137,22 +68,17 @@ public void TestUtcFieldsWithMS() PutScheduledUpdateGroupActionRequest request = new PutScheduledUpdateGroupActionRequest(); DateTime timeUtc = new DateTime(2018, 7, 18, 0, 0, 0, 123, DateTimeKind.Utc); + + //This is a value use of .ToLocalTime to construct a local time for testing. DateTime timeLocal = new DateTime(2018, 7, 18, 0, 0, 0, 123, DateTimeKind.Utc).ToLocalTime(); DateTime timeUnspecified = new DateTime(timeLocal.Ticks); - request.StartTimeUtc = timeUtc; - request.EndTimeUtc = timeLocal; - request.TimeUtc = timeUnspecified; - -#pragma warning disable CS0618 // Type or member is obsolete + request.StartTime = timeUtc; + request.EndTime = timeLocal; + request.Time = timeUnspecified; Assert.AreEqual(request.StartTime, timeUtc); Assert.AreEqual(request.EndTime, timeLocal); Assert.AreEqual(request.Time, timeUnspecified); -#pragma warning restore CS0618 // Type or member is obsolete - - Assert.AreEqual(request.StartTimeUtc, timeUtc); - Assert.AreEqual(request.EndTimeUtc, timeLocal); - Assert.AreEqual(request.TimeUtc, timeUnspecified); var marshaller = new PutScheduledUpdateGroupActionRequestMarshaller(); var marshalledRequest = marshaller.Marshall(request); diff --git a/sdk/test/UnitTests/Custom/Marshalling/SimpleTypeUnmarshallerTests.cs b/sdk/test/UnitTests/Custom/Marshalling/SimpleTypeUnmarshallerTests.cs index 7c5b4641ba00..fcd16e1d83d1 100644 --- a/sdk/test/UnitTests/Custom/Marshalling/SimpleTypeUnmarshallerTests.cs +++ b/sdk/test/UnitTests/Custom/Marshalling/SimpleTypeUnmarshallerTests.cs @@ -38,24 +38,24 @@ public void TestJsonUnmarshalling() Assert.AreEqual(null, nullModel.Priority); var expected = new DateTime(2018, 8, 1, 0, 0, 0, DateTimeKind.Utc); - Assert.AreEqual(expected, model.ReservoirQuotaTTL.Value.ToUniversalTime()); + Assert.AreEqual(expected, model.ReservoirQuotaTTL.Value); Assert.AreEqual(DateTimeKind.Utc, model.ReservoirQuotaTTL.Value.Kind); Assert.AreEqual(null, nullModel.ReservoirQuotaTTL); - Assert.AreEqual(expected, model.StartTimeISO8601.ToUniversalTime()); - Assert.AreEqual(DateTimeKind.Local, model.StartTimeISO8601.Kind); + Assert.AreEqual(expected, model.StartTimeISO8601); + Assert.AreEqual(DateTimeKind.Utc, model.StartTimeISO8601.Kind); Assert.AreEqual(DateTime.MinValue, nullModel.StartTimeISO8601); - Assert.AreEqual(DateTimeKind.Unspecified, nullModel.StartTimeISO8601.Kind); + Assert.AreEqual(DateTimeKind.Utc, nullModel.StartTimeISO8601.Kind); - Assert.AreEqual(expected, model.StartTimeEpoch.ToUniversalTime()); + Assert.AreEqual(expected, model.StartTimeEpoch); Assert.AreEqual(DateTimeKind.Utc, model.StartTimeEpoch.Kind); Assert.AreEqual(DateTime.MinValue, nullModel.StartTimeEpoch); - Assert.AreEqual(DateTimeKind.Unspecified, nullModel.StartTimeEpoch.Kind); + Assert.AreEqual(DateTimeKind.Utc, nullModel.StartTimeEpoch.Kind); - Assert.AreEqual(expected, model.StartTimeRFC822.ToUniversalTime()); - Assert.AreEqual(DateTimeKind.Local, model.StartTimeRFC822.Kind); + Assert.AreEqual(expected, model.StartTimeRFC822); + Assert.AreEqual(DateTimeKind.Utc, model.StartTimeRFC822.Kind); Assert.AreEqual(DateTime.MinValue, nullModel.StartTimeRFC822); - Assert.AreEqual(DateTimeKind.Unspecified, nullModel.StartTimeRFC822.Kind); + Assert.AreEqual(DateTimeKind.Utc, nullModel.StartTimeRFC822.Kind); } private Model UnmarshallModel(string json) diff --git a/sdk/test/UnitTests/Custom/Runtime/CompressionHandlerTests.cs b/sdk/test/UnitTests/Custom/Runtime/CompressionHandlerTests.cs index ebb96f19782e..4bb722fc9ae5 100644 --- a/sdk/test/UnitTests/Custom/Runtime/CompressionHandlerTests.cs +++ b/sdk/test/UnitTests/Custom/Runtime/CompressionHandlerTests.cs @@ -145,12 +145,12 @@ private ExecutionContext CreateTestContext(bool isStreaming) Namespace = "compression-test", MetricData = new List() { - new MetricDatum { MetricName = "test-request-compression-metric", TimestampUtc = DateTime.UtcNow, Unit = StandardUnit.Count, Value = random.Next(100) }, - new MetricDatum { MetricName = "test-request-compression-metric", TimestampUtc = DateTime.UtcNow.AddSeconds(2), Unit = StandardUnit.Bytes, Value = random.Next(100) }, - new MetricDatum { MetricName = "test-request-compression-metric", TimestampUtc = DateTime.UtcNow.AddSeconds(4), Unit = StandardUnit.Bytes, Value = random.Next(100) }, - new MetricDatum { MetricName = "test-request-compression-metric", TimestampUtc = DateTime.UtcNow.AddSeconds(6), Unit = StandardUnit.Bytes, Value = random.Next(100) }, - new MetricDatum { MetricName = "test-request-compression-metric", TimestampUtc = DateTime.UtcNow.AddSeconds(8), Unit = StandardUnit.Bytes, Value = random.Next(100) }, - new MetricDatum { MetricName = "test-request-compression-metric", TimestampUtc = DateTime.UtcNow.AddSeconds(10), Unit = StandardUnit.Bytes, Value = random.Next(100) }, + new MetricDatum { MetricName = "test-request-compression-metric", Timestamp = DateTime.UtcNow, Unit = StandardUnit.Count, Value = random.Next(100) }, + new MetricDatum { MetricName = "test-request-compression-metric", Timestamp = DateTime.UtcNow.AddSeconds(2), Unit = StandardUnit.Bytes, Value = random.Next(100) }, + new MetricDatum { MetricName = "test-request-compression-metric", Timestamp = DateTime.UtcNow.AddSeconds(4), Unit = StandardUnit.Bytes, Value = random.Next(100) }, + new MetricDatum { MetricName = "test-request-compression-metric", Timestamp = DateTime.UtcNow.AddSeconds(6), Unit = StandardUnit.Bytes, Value = random.Next(100) }, + new MetricDatum { MetricName = "test-request-compression-metric", Timestamp = DateTime.UtcNow.AddSeconds(8), Unit = StandardUnit.Bytes, Value = random.Next(100) }, + new MetricDatum { MetricName = "test-request-compression-metric", Timestamp = DateTime.UtcNow.AddSeconds(10), Unit = StandardUnit.Bytes, Value = random.Next(100) }, } }; diff --git a/sdk/test/UnitTests/Custom/Runtime/Credentials/InstanceProfileAWSCredentialsTest.cs b/sdk/test/UnitTests/Custom/Runtime/Credentials/InstanceProfileAWSCredentialsTest.cs index 45f7691b03d0..80e0758f2a68 100644 --- a/sdk/test/UnitTests/Custom/Runtime/Credentials/InstanceProfileAWSCredentialsTest.cs +++ b/sdk/test/UnitTests/Custom/Runtime/Credentials/InstanceProfileAWSCredentialsTest.cs @@ -62,7 +62,7 @@ public void TestWhitespaceRole() [TestMethod] public void StaticStabilityWhenIMDSExperiencesAnOutageScenarioTest() { - var currentTime = new DateTime(1997, 8, 29, 16, 20, 0); + var currentTime = new DateTime(1997, 8, 29, 16, 20, 0, DateTimeKind.Utc); var token = "ValidToken"; diff --git a/sdk/test/UnitTests/Custom/Runtime/Credentials/ProcessAWSCredentialsTest.cs b/sdk/test/UnitTests/Custom/Runtime/Credentials/ProcessAWSCredentialsTest.cs index dff8c8844d71..5a9dcfba5fc1 100644 --- a/sdk/test/UnitTests/Custom/Runtime/Credentials/ProcessAWSCredentialsTest.cs +++ b/sdk/test/UnitTests/Custom/Runtime/Credentials/ProcessAWSCredentialsTest.cs @@ -54,7 +54,7 @@ public void ValidBasicProcessCredentialInput() { var processCredential = new ProcessAWSCredentials($"{Executable} {ArgumentsBasic} {ValidVersionNumber}"); var credentialsRefreshState = processCredential.DetermineProcessCredential(); - Assert.AreEqual(DateTime.MaxValue, credentialsRefreshState.Expiration); + Assert.AreEqual(DateTime.SpecifyKind(DateTime.MaxValue, DateTimeKind.Utc), credentialsRefreshState.Expiration); Assert.AreEqual(ActualAccessKey, credentialsRefreshState.Credentials.AccessKey); Assert.AreEqual(ActualSecretKey, credentialsRefreshState.Credentials.SecretKey); Assert.IsTrue(string.IsNullOrEmpty(credentialsRefreshState.Credentials.Token)); @@ -65,7 +65,7 @@ public async Task ValidBasicProcessCredentialInputAsync() { var processCredential = new ProcessAWSCredentials($"{Executable} {ArgumentsBasic} {ValidVersionNumber}"); var credentialsRefreshState = await processCredential.DetermineProcessCredentialAsync().ConfigureAwait(false); - Assert.AreEqual(DateTime.MaxValue, credentialsRefreshState.Expiration); + Assert.AreEqual(DateTime.SpecifyKind(DateTime.MaxValue, DateTimeKind.Utc), credentialsRefreshState.Expiration); Assert.AreEqual(ActualAccessKey, credentialsRefreshState.Credentials.AccessKey); Assert.AreEqual(ActualSecretKey, credentialsRefreshState.Credentials.SecretKey); Assert.IsTrue(string.IsNullOrEmpty(credentialsRefreshState.Credentials.Token)); @@ -83,7 +83,7 @@ public void ValidSessionProcessCredentialInput() { var processCredential = new ProcessAWSCredentials($"{Executable} {ArgumentsSession} {ValidVersionNumber}"); var credentialsRefreshState = processCredential.DetermineProcessCredential(); - Assert.AreNotEqual(DateTime.MaxValue, credentialsRefreshState.Expiration); + Assert.AreNotEqual(DateTime.SpecifyKind(DateTime.MaxValue, DateTimeKind.Utc), credentialsRefreshState.Expiration); Assert.AreEqual(ActualAccessKey, credentialsRefreshState.Credentials.AccessKey); Assert.AreEqual(ActualSecretKey, credentialsRefreshState.Credentials.SecretKey); Assert.IsNotNull(credentialsRefreshState.Credentials.Token); diff --git a/sdk/test/UnitTests/Custom/Runtime/HttpWebRequestFactoryTests.cs b/sdk/test/UnitTests/Custom/Runtime/HttpWebRequestFactoryTests.cs index 31f80bb22bb9..74d4993dc58b 100644 --- a/sdk/test/UnitTests/Custom/Runtime/HttpWebRequestFactoryTests.cs +++ b/sdk/test/UnitTests/Custom/Runtime/HttpWebRequestFactoryTests.cs @@ -188,7 +188,7 @@ private IHttpRequest CreateHttpRequest(CancellationToken cancellationTok var contentTypeHeader = _fixture.Create(); var contentLength = 0; var userAgentHeader = _fixture.Create(); - var date = DateTime.Now.ToUniversalTime(); + var date = DateTime.UtcNow; var rangeHeader = _fixture.Create(); var contentRangeHeader = _fixture.Create(); var nonStandardHeader = _fixture.Create(); diff --git a/sdk/test/UnitTests/Custom/Runtime/ProtocolTests/HttpLabelTests.cs b/sdk/test/UnitTests/Custom/Runtime/ProtocolTests/HttpLabelTests.cs index 9f18b5c0e910..a16ae6f2abea 100644 --- a/sdk/test/UnitTests/Custom/Runtime/ProtocolTests/HttpLabelTests.cs +++ b/sdk/test/UnitTests/Custom/Runtime/ProtocolTests/HttpLabelTests.cs @@ -199,7 +199,7 @@ public IRequest Marshall(HttpRequestWithLabelsInput publicRequest) request.AddPathResource("{FloatProperty}", StringUtils.FromFloat(publicRequest.FloatProperty)); request.AddPathResource("{DoubleProperty}", StringUtils.FromDouble(publicRequest.DoubleProperty)); request.AddPathResource("{BooleanProperty}", StringUtils.FromBool(publicRequest.BooleanProperty)); - request.AddPathResource("{DateTimeProperty}", StringUtils.FromDateTimeToISO8601NoMs(publicRequest.DateTimeProperty)); + request.AddPathResource("{DateTimeProperty}", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.DateTimeProperty)); request.ResourcePath = "/HttpRequestWithLabels/{StringProperty}/{IntProperty}/{LongProperty}/{FloatProperty}/{DoubleProperty}/{BooleanProperty}/{DateTimeProperty}"; } if (publicRequest.IsGreedy) diff --git a/sdk/test/UnitTests/Custom/Runtime/StringUtilsTests.cs b/sdk/test/UnitTests/Custom/Runtime/StringUtilsTests.cs index c05beea48f25..b9eb283a7d46 100644 --- a/sdk/test/UnitTests/Custom/Runtime/StringUtilsTests.cs +++ b/sdk/test/UnitTests/Custom/Runtime/StringUtilsTests.cs @@ -49,6 +49,7 @@ public void TestStringUtilsFromDateTimeUtcUtc() [TestCategory("Runtime")] public void TestStringUtilsFromDateTimeUtcUnspecified() { + //This is a value use of .ToLocalTime to construct a local time for testing. string convertedDateTime = StringUtils.FromDateTimeToISO8601(new DateTime(new DateTime(2018, 7, 18, 0, 0, 0, DateTimeKind.Utc).ToLocalTime().Ticks)); Assert.AreEqual(EXPECTED_FROM_DATE_STRING, convertedDateTime); @@ -59,6 +60,7 @@ public void TestStringUtilsFromDateTimeUtcUnspecified() [TestCategory("Runtime")] public void TestStringUtilsFromDateTimeUtcLocal() { + //This is a value use of .ToLocalTime to construct a local time for testing. string convertedDateTime = StringUtils.FromDateTimeToISO8601(new DateTime(2018, 7, 18, 0, 0, 0, DateTimeKind.Utc).ToLocalTime()); Assert.AreEqual(EXPECTED_FROM_DATE_STRING, convertedDateTime); @@ -78,6 +80,7 @@ public void TestStringUtilsFromDateTimeEpochCompatibilityUtc() [TestCategory("Runtime")] public void TestStringUtilsFromDateTimeEpochCompatibilityUnknown() { + //This is a value use of .ToLocalTime to construct a local time for testing. DateTime time = new DateTime(new DateTime(2018, 7, 18, 0, 0, 0, DateTimeKind.Utc).ToLocalTime().Ticks); TestStringUtilsFromDateUtcTimeEpochCompatibility(time); } @@ -87,6 +90,7 @@ public void TestStringUtilsFromDateTimeEpochCompatibilityUnknown() [TestCategory("Runtime")] public void TestStringUtilsFromDateTimeEpochCompatibilityLocal() { + //This is a value use of .ToLocalTime to construct a local time for testing. DateTime time = new DateTime(2018, 7, 18, 0, 0, 0, DateTimeKind.Utc).ToLocalTime(); TestStringUtilsFromDateUtcTimeEpochCompatibility(time); } @@ -94,9 +98,9 @@ public void TestStringUtilsFromDateTimeEpochCompatibilityLocal() private void TestStringUtilsFromDateUtcTimeEpochCompatibility(DateTime time) { string convertedDateTime = StringUtils.FromDateTimeToISO8601(time); - DateTime restoredDateTime = DateTime.Parse(convertedDateTime).ToUniversalTime(); + DateTime restoredDateTime = DateTime.Parse(convertedDateTime, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal); - //We want the marshalling performed by StringUtils.FromDateTimeUtc to be coherent with AWSSDKUtils.ConvertToUnixEpochSecondsDouble + //We want the marshalling performed by StringUtils.FromDateTimeToISO8601 to be coherent with AWSSDKUtils.ConvertToUnixEpochSecondsDouble double secondsFromEpoch = AWSSDKUtils.ConvertToUnixEpochSecondsDouble(time); DateTime epochDateTime = EPOCH.AddSeconds(secondsFromEpoch); diff --git a/sdk/test/UnitTests/Custom/TestTools/Comparer.cs b/sdk/test/UnitTests/Custom/TestTools/Comparer.cs index af48c3dda860..7e0f569a8a41 100644 --- a/sdk/test/UnitTests/Custom/TestTools/Comparer.cs +++ b/sdk/test/UnitTests/Custom/TestTools/Comparer.cs @@ -78,8 +78,8 @@ private static void Compare(object x, object y, Type type) { var xDate = (DateTime)x; var yDate = (DateTime)y; - xDate = xDate.Kind != DateTimeKind.Utc ? xDate.ToUniversalTime() : xDate; - yDate = yDate.Kind != DateTimeKind.Utc ? yDate.ToUniversalTime() : yDate; + xDate = xDate.Kind != DateTimeKind.Utc ? throw new Exception("xDate DateTime Kind is not UTC") : xDate; + yDate = yDate.Kind != DateTimeKind.Utc ? throw new Exception("yDate DateTime Kind is not UTC") : yDate; Assert.IsTrue(xDate.Equals(yDate), "x is not equal to y. x={0} y={1}", xDate, yDate); return; @@ -475,7 +475,7 @@ private static object ConvertToDateTime(object value) .AddMilliseconds((long)value); if (value.GetType() == typeof(string)) - return DateTime.Parse((string)value, CultureInfo.InvariantCulture); + return DateTime.Parse((string)value, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal); throw new InvalidOperationException(string.Format("Could not convert {0} of type {1} to DateTime", value, value.GetType())); diff --git a/sdk/test/UnitTests/Custom/TestTools/ComparerTests.cs b/sdk/test/UnitTests/Custom/TestTools/ComparerTests.cs index cdb6882b22e4..8ab6fa9f9dad 100644 --- a/sdk/test/UnitTests/Custom/TestTools/ComparerTests.cs +++ b/sdk/test/UnitTests/Custom/TestTools/ComparerTests.cs @@ -101,7 +101,7 @@ public void TestComplexTypeComparisions() new Product { Id = 1, - LastStocked = DateTime.MinValue, + LastStocked = DateTime.SpecifyKind(DateTime.MinValue, DateTimeKind.Utc), Name = "A", Price = 10, Qty = 5, @@ -112,7 +112,7 @@ public void TestComplexTypeComparisions() new Product { Id = 1, - LastStocked = DateTime.MinValue, + LastStocked = DateTime.SpecifyKind(DateTime.MinValue, DateTimeKind.Utc), Name = "A", Price = 10, Qty = 5, @@ -125,7 +125,7 @@ public void TestComplexTypeComparisions() new Product { Id = 1, - LastStocked = DateTime.MinValue, + LastStocked = DateTime.SpecifyKind(DateTime.MinValue, DateTimeKind.Utc), Name = "A", Price = 10, Qty = 5, @@ -136,7 +136,7 @@ public void TestComplexTypeComparisions() new Product { Id = 1, - LastStocked = DateTime.MinValue, + LastStocked = DateTime.SpecifyKind(DateTime.MinValue, DateTimeKind.Utc), Name = "A", Price = 10, Qty = 5, @@ -149,7 +149,7 @@ public void TestComplexTypeComparisions() new Product { Id = 1, - LastStocked = DateTime.MinValue, + LastStocked = DateTime.SpecifyKind(DateTime.MinValue, DateTimeKind.Utc), Name = "A", Price = 10, Qty = 5, @@ -160,7 +160,7 @@ public void TestComplexTypeComparisions() new Product { Id = 1, - LastStocked = DateTime.MinValue, + LastStocked = DateTime.SpecifyKind(DateTime.MinValue, DateTimeKind.Utc), Name = "A", Price = 10, Qty = 5, diff --git a/sdk/test/UnitTests/Custom/TestTools/JsonSampleGenerator.cs b/sdk/test/UnitTests/Custom/TestTools/JsonSampleGenerator.cs index 755b3671b685..0198a77543cb 100644 --- a/sdk/test/UnitTests/Custom/TestTools/JsonSampleGenerator.cs +++ b/sdk/test/UnitTests/Custom/TestTools/JsonSampleGenerator.cs @@ -69,7 +69,7 @@ private void Write(JsonWriter writer, Member member, Shape shape) writer.Write(double.MaxValue); else if (shape.IsFloat) writer.Write(float.MaxValue); - else if (shape.IsDateTime) + else if (shape.IsTimeStamp) { writer.Write(ValidatorUtils.GetTestDate(member, shape)); } diff --git a/sdk/test/UnitTests/Custom/TestTools/RequestValidator.cs b/sdk/test/UnitTests/Custom/TestTools/RequestValidator.cs index 8a9b84e23461..c27ffac1accc 100644 --- a/sdk/test/UnitTests/Custom/TestTools/RequestValidator.cs +++ b/sdk/test/UnitTests/Custom/TestTools/RequestValidator.cs @@ -405,7 +405,7 @@ protected void ValidateHeaders(IEnumerable properties) var encodedValue = Convert.ToBase64String(Encoding.UTF8.GetBytes((string)property.GetValue(this.Request))); Assert.AreEqual(encodedValue, this.MarshalledRequest.Headers[member.MarshallLocationName]); } - else if(member.IsDateTime) + else if(member.IsTimeStamp) { var value = ParseUsingFormat(this.MarshalledRequest.Headers[member.MarshallLocationName], member.TimestampFormat); Assert.AreEqual(((DateTime)property.GetValue(this.Request)).ToUniversalTime(), value.ToUniversalTime()); diff --git a/sdk/test/UnitTests/Custom/TestTools/ValidatorUtils.cs b/sdk/test/UnitTests/Custom/TestTools/ValidatorUtils.cs index eaace7ab173e..903083a70e1f 100644 --- a/sdk/test/UnitTests/Custom/TestTools/ValidatorUtils.cs +++ b/sdk/test/UnitTests/Custom/TestTools/ValidatorUtils.cs @@ -13,11 +13,11 @@ public static class ValidatorUtils { public static string GetTestDate(Member member, Shape shape) { - if (member.IsDateTime) + if (member.IsTimeStamp) { return GetTestDate(member.TimestampFormat); } - else if ((member.IsList || member.IsMap) && shape.IsDateTime) + else if ((member.IsList || member.IsMap) && shape.IsTimeStamp) { // Member is of type list or map, and the shape is a date time return GetTestDate(shape.GetTimestampFormat(member.MarshallLocation)); diff --git a/sdk/test/UnitTests/Custom/TestTools/XmlSampleGenerator.cs b/sdk/test/UnitTests/Custom/TestTools/XmlSampleGenerator.cs index 838920c77d6c..896aad0820ef 100644 --- a/sdk/test/UnitTests/Custom/TestTools/XmlSampleGenerator.cs +++ b/sdk/test/UnitTests/Custom/TestTools/XmlSampleGenerator.cs @@ -166,7 +166,7 @@ private void Write(XmlWriter writer, Member member, Shape shape) writer.WriteValue(float.MaxValue); else if (shape.IsDouble) writer.WriteValue(double.MaxValue); - else if (shape.IsDateTime) + else if (shape.IsTimeStamp) writer.WriteValue(ValidatorUtils.GetTestDate(member, shape)); else if (shape.IsBoolean) writer.WriteValue(true); diff --git a/sdk/test/UnitTests/Custom/Util/AWSSDKUtilsTests.cs b/sdk/test/UnitTests/Custom/Util/AWSSDKUtilsTests.cs index 3cd8c6982c21..9b2f1e6fd065 100644 --- a/sdk/test/UnitTests/Custom/Util/AWSSDKUtilsTests.cs +++ b/sdk/test/UnitTests/Custom/Util/AWSSDKUtilsTests.cs @@ -152,6 +152,18 @@ public void TestIsPropertySet() } } + [TestMethod] + [TestCategory("UnitTest")] + [TestCategory("Util")] + public void ConvertFromUnixEpochSeconds() + { + // Sample UTC value: 9/8/2020 18:48:34 + var expectedDateTime = new DateTime(2020, 9, 8, 18, 48, 34, DateTimeKind.Utc); + var dateTime = AWSSDKUtils.ConvertFromUnixEpochMilliseconds(1599590914000); + + Assert.AreEqual(expectedDateTime, dateTime); + } + [TestMethod] [TestCategory("UnitTest")] [TestCategory("Util")] @@ -159,7 +171,7 @@ public void ConvertFromUnixEpochMilliseconds() { // Sample UTC value: 9/8/2020 18:48:34.970 var expectedDateTime = new DateTime(2020, 9, 8, 18, 48, 34, DateTimeKind.Utc).AddMilliseconds(970); - var dateTime = AWSSDKUtils.ConvertFromUnixEpochMilliseconds(1599590914970).ToUniversalTime(); + var dateTime = AWSSDKUtils.ConvertFromUnixEpochMilliseconds(1599590914970); Assert.AreEqual(expectedDateTime, dateTime); } diff --git a/sdk/test/UnitTests/Custom/Util/MultiValueHeaderParserTests.cs b/sdk/test/UnitTests/Custom/Util/MultiValueHeaderParserTests.cs index 84d0c275ed4c..c3e74b652685 100644 --- a/sdk/test/UnitTests/Custom/Util/MultiValueHeaderParserTests.cs +++ b/sdk/test/UnitTests/Custom/Util/MultiValueHeaderParserTests.cs @@ -54,8 +54,8 @@ public void ToDateTimeList_ISO8601Format_ReturnsDateTimeList() string format = "ISO8601"; var result = MultiValueHeaderParser.ToDateTimeList(header, format); - Assert.AreEqual(new DateTime(2019, 12, 16, 23, 48, 18, DateTimeKind.Utc).ToLocalTime(), result[0]); - Assert.AreEqual(new DateTime(2019, 12, 16, 23, 48, 18, DateTimeKind.Utc).ToLocalTime(), result[1]); + Assert.AreEqual(new DateTime(2019, 12, 16, 23, 48, 18, DateTimeKind.Utc), result[0]); + Assert.AreEqual(new DateTime(2019, 12, 16, 23, 48, 18, DateTimeKind.Utc), result[1]); } [TestMethod] @@ -65,8 +65,8 @@ public void ToDateTimeList_RFC822Format_ReturnsDateTimeList() string format = "RFC822"; var result = MultiValueHeaderParser.ToDateTimeList(header, format); - Assert.AreEqual(new DateTime(2019, 12, 16, 23, 48, 18, DateTimeKind.Utc).ToLocalTime(), result[0]); - Assert.AreEqual(new DateTime(2019, 12, 16, 23, 48, 18, DateTimeKind.Utc).ToLocalTime(), result[1]); + Assert.AreEqual(new DateTime(2019, 12, 16, 23, 48, 18, DateTimeKind.Utc), result[0]); + Assert.AreEqual(new DateTime(2019, 12, 16, 23, 48, 18, DateTimeKind.Utc), result[1]); } [TestMethod] @@ -76,8 +76,8 @@ public void ToDateTimeList_UnixTimestampFormat_ReturnsDateTimeList() string format = "UnixTimestamp"; var result = MultiValueHeaderParser.ToDateTimeList(header, format); - Assert.AreEqual(new DateTime(2019, 12, 16, 23, 48, 18, DateTimeKind.Utc).ToLocalTime(), result[0]); - Assert.AreEqual(new DateTime(2019, 12, 16, 23, 48, 18, DateTimeKind.Utc).ToLocalTime(), result[1]); + Assert.AreEqual(new DateTime(2019, 12, 16, 23, 48, 18, DateTimeKind.Utc), result[0]); + Assert.AreEqual(new DateTime(2019, 12, 16, 23, 48, 18, DateTimeKind.Utc), result[1]); } [TestMethod] From 9611cbaae076a25c258b6e341f762942adbf9ef9 Mon Sep 17 00:00:00 2001 From: Bo Blodgett Date: Sun, 8 Dec 2024 19:43:40 -0800 Subject: [PATCH 3/7] Datetime handling generated changes. --- .../Model/DescribeScheduledActionsRequest.cs | 111 ++---------- ...duledUpdateGroupActionRequestMarshaller.cs | 8 +- ...scribeScheduledActionsRequestMarshaller.cs | 8 +- ...duledUpdateGroupActionRequestMarshaller.cs | 12 +- .../PutScheduledUpdateGroupActionRequest.cs | 168 +++--------------- .../ScheduledUpdateGroupActionRequest.cs | 120 ++----------- .../Model/DescribeAlarmHistoryRequest.cs | 109 ++---------- .../Generated/Model/GetMetricDataRequest.cs | 164 ++--------------- .../Model/GetMetricStatisticsRequest.cs | 151 ++-------------- .../DescribeAlarmHistoryRequestMarshaller.cs | 8 +- .../GetMetricDataRequestMarshaller.cs | 8 +- .../GetMetricStatisticsRequestMarshaller.cs | 8 +- .../PutMetricDataRequestMarshaller.cs | 8 +- .../CloudWatch/Generated/Model/MetricDatum.cs | 57 +----- .../GetLogEventsRequestMarshaller.cs | 4 +- .../InputLogEventMarshaller.cs | 2 +- .../EC2/Generated/Model/ClientData.cs | 109 ++---------- .../EC2/Generated/Model/CreateFleetRequest.cs | 112 ++---------- .../Model/DescribeFleetHistoryRequest.cs | 56 +----- .../DescribeSpotFleetRequestHistoryRequest.cs | 56 +----- .../Model/DescribeSpotPriceHistoryRequest.cs | 111 ++---------- .../CreateFleetRequestMarshaller.cs | 8 +- .../CreateLaunchTemplateRequestMarshaller.cs | 4 +- ...eLaunchTemplateVersionRequestMarshaller.cs | 4 +- .../DescribeFleetHistoryRequestMarshaller.cs | 4 +- ...edInstanceAvailabilityRequestMarshaller.cs | 8 +- ...ribeScheduledInstancesRequestMarshaller.cs | 8 +- ...potFleetRequestHistoryRequestMarshaller.cs | 4 +- ...scribeSpotPriceHistoryRequestMarshaller.cs | 8 +- .../ImportImageRequestMarshaller.cs | 8 +- .../ImportSnapshotRequestMarshaller.cs | 8 +- .../ReportInstanceStatusRequestMarshaller.cs | 8 +- .../RequestSpotFleetRequestMarshaller.cs | 8 +- .../RequestSpotInstancesRequestMarshaller.cs | 8 +- .../RunInstancesRequestMarshaller.cs | 4 +- .../SpotFleetRequestConfigDataUnmarshaller.cs | 4 +- .../LaunchTemplateSpotMarketOptionsRequest.cs | 71 +------- .../Model/ReportInstanceStatusRequest.cs | 109 ++---------- .../Model/RequestSpotInstancesRequest.cs | 129 ++------------ .../Model/SlotDateTimeRangeRequest.cs | 110 ++---------- .../Model/SlotStartTimeRangeRequest.cs | 109 ++---------- .../Model/SpotFleetRequestConfigData.cs | 113 ++---------- .../EC2/Generated/Model/SpotMarketOptions.cs | 68 +------ .../Generated/Model/DescribeEventsRequest.cs | 117 ++---------- .../DescribeEventsRequestMarshaller.cs | 8 +- .../Model/DescribeEnvironmentsRequest.cs | 58 +----- .../Generated/Model/DescribeEventsRequest.cs | 111 ++---------- .../DescribeEnvironmentsRequestMarshaller.cs | 4 +- .../DescribeEventsRequestMarshaller.cs | 8 +- .../ListAuditTasksRequestMarshaller.cs | 8 +- .../ListViolationEventsRequestMarshaller.cs | 8 +- .../Generated/Model/ListAuditTasksRequest.cs | 110 ++---------- .../Model/ListViolationEventsRequest.cs | 109 ++---------- .../ListDeviceEventsRequestMarshaller.cs | 8 +- .../Model/ListDeviceEventsRequest.cs | 111 ++---------- .../SampleChannelDataRequestMarshaller.cs | 8 +- .../Model/SampleChannelDataRequest.cs | 109 ++---------- ...nputDeviceThumbnailResponseUnmarshaller.cs | 2 +- .../DescribeObjectResponseUnmarshaller.cs | 2 +- .../GetObjectResponseUnmarshaller.cs | 2 +- .../MobileAnalytics/Generated/Model/Event.cs | 56 +----- .../EventMarshaller.cs | 4 +- .../EventUnmarshaller.cs | 2 +- .../SessionMarshaller.cs | 8 +- .../SessionUnmarshaller.cs | 4 +- .../Generated/Model/Session.cs | 110 ++---------- .../Generated/Model/DescribeEventsRequest.cs | 121 ++----------- .../DescribeEventsRequestMarshaller.cs | 8 +- ...DBClusterToPointInTimeRequestMarshaller.cs | 4 +- .../RestoreDBClusterToPointInTimeRequest.cs | 84 +-------- .../Model/BacktrackDBClusterRequest.cs | 79 +------- .../Generated/Model/DescribeEventsRequest.cs | 121 ++----------- .../BacktrackDBClusterRequestMarshaller.cs | 4 +- .../DescribeEventsRequestMarshaller.cs | 8 +- ...DBClusterToPointInTimeRequestMarshaller.cs | 4 +- ...BInstanceToPointInTimeRequestMarshaller.cs | 4 +- .../RestoreDBClusterToPointInTimeRequest.cs | 88 +-------- .../RestoreDBInstanceToPointInTimeRequest.cs | 76 +------- .../Model/DescribeClusterSnapshotsRequest.cs | 122 ++----------- .../Generated/Model/DescribeEventsRequest.cs | 121 ++----------- ...scribeClusterSnapshotsRequestMarshaller.cs | 8 +- .../DescribeEventsRequestMarshaller.cs | 8 +- .../SendBounceRequestMarshaller.cs | 8 +- .../SimpleEmail/Generated/Model/MessageDsn.cs | 57 +----- .../Generated/Model/RecipientDsnFields.cs | 58 +----- .../Model/DescribeActivitiesRequest.cs | 111 ++---------- .../DescribeActivitiesRequestMarshaller.cs | 8 +- ...estampFormatHeadersResponseUnmarshaller.cs | 10 +- ...estampFormatHeadersResponseUnmarshaller.cs | 10 +- 89 files changed, 689 insertions(+), 3595 deletions(-) diff --git a/sdk/src/Services/AutoScaling/Generated/Model/DescribeScheduledActionsRequest.cs b/sdk/src/Services/AutoScaling/Generated/Model/DescribeScheduledActionsRequest.cs index 4ba88181bee6..8da941c168de 100644 --- a/sdk/src/Services/AutoScaling/Generated/Model/DescribeScheduledActionsRequest.cs +++ b/sdk/src/Services/AutoScaling/Generated/Model/DescribeScheduledActionsRequest.cs @@ -44,11 +44,11 @@ namespace Amazon.AutoScaling.Model public partial class DescribeScheduledActionsRequest : AmazonAutoScalingRequest { private string _autoScalingGroupName; - private DateTime? _endTimeUtc; + private DateTime? _endTime; private int? _maxRecords; private string _nextToken; private List _scheduledActionNames = AWSConfigs.InitializeCollections ? new List() : null; - private DateTime? _startTimeUtc; + private DateTime? _startTime; /// /// Gets and sets the property AutoScalingGroupName. @@ -70,22 +70,22 @@ internal bool IsSetAutoScalingGroupName() } /// - /// Gets and sets the property EndTimeUtc. + /// Gets and sets the property EndTime. /// /// The latest scheduled start time to return. If scheduled action names are provided, /// this property is ignored. /// /// - public DateTime? EndTimeUtc + public DateTime? EndTime { - get { return this._endTimeUtc; } - set { this._endTime = this._endTimeUtc = value; } + get { return this._endTime; } + set { this._endTime = value; } } - // Check to see if EndTimeUtc property is set - internal bool IsSetEndTimeUtc() + // Check to see if EndTime property is set + internal bool IsSetEndTime() { - return this._endTimeUtc.HasValue; + return this._endTime.HasValue; } /// @@ -151,102 +151,23 @@ internal bool IsSetScheduledActionNames() } /// - /// Gets and sets the property StartTimeUtc. + /// Gets and sets the property StartTime. /// /// The earliest scheduled start time to return. If scheduled action names are provided, /// this property is ignored. /// /// - public DateTime? StartTimeUtc + public DateTime? StartTime { - get { return this._startTimeUtc; } - set { this._startTime = this._startTimeUtc = value; } + get { return this._startTime; } + set { this._startTime = value; } } - // Check to see if StartTimeUtc property is set - internal bool IsSetStartTimeUtc() + // Check to see if StartTime property is set + internal bool IsSetStartTime() { - return this._startTimeUtc.HasValue; + return this._startTime.HasValue; } -#region Backwards compatible properties - private DateTime? _endTime; - private DateTime? _startTime; - - /// - /// Gets and sets the property EndTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use EndTimeUtc instead. Setting either EndTime or EndTimeUtc - /// results in both EndTime and EndTimeUtc being assigned, the latest assignment to either - /// one of the two property is reflected in the value of both. EndTime is provided for - /// backwards compatibility only and assigning a non-Utc DateTime to it results in the - /// wrong timestamp being passed to the service. - /// - /// - /// - /// The latest scheduled start time to return. If scheduled action names are provided, - /// this property is ignored. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use EndTimeUtc instead. Setting either EndTime or EndTimeUtc results in both EndTime and " + - "EndTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. EndTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? EndTime - { - get { return this._endTime.GetValueOrDefault(); } - set - { - this._endTime = value; - if (value != null) - { - this._endTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._endTimeUtc = null; - } - } - } - /// - /// Gets and sets the property StartTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use StartTimeUtc instead. Setting either StartTime or - /// StartTimeUtc results in both StartTime and StartTimeUtc being assigned, the latest - /// assignment to either one of the two property is reflected in the value of both. StartTime - /// is provided for backwards compatibility only and assigning a non-Utc DateTime to it - /// results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The earliest scheduled start time to return. If scheduled action names are provided, - /// this property is ignored. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use StartTimeUtc instead. Setting either StartTime or StartTimeUtc results in both StartTime and " + - "StartTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. StartTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? StartTime - { - get { return this._startTime.GetValueOrDefault(); } - set - { - this._startTime = value; - if (value != null) - { - this._startTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._startTimeUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/AutoScaling/Generated/Model/Internal/MarshallTransformations/BatchPutScheduledUpdateGroupActionRequestMarshaller.cs b/sdk/src/Services/AutoScaling/Generated/Model/Internal/MarshallTransformations/BatchPutScheduledUpdateGroupActionRequestMarshaller.cs index b1c85e0e7295..0d5ffa0afbbb 100644 --- a/sdk/src/Services/AutoScaling/Generated/Model/Internal/MarshallTransformations/BatchPutScheduledUpdateGroupActionRequestMarshaller.cs +++ b/sdk/src/Services/AutoScaling/Generated/Model/Internal/MarshallTransformations/BatchPutScheduledUpdateGroupActionRequestMarshaller.cs @@ -76,9 +76,9 @@ public IRequest Marshall(BatchPutScheduledUpdateGroupActionRequest publicRequest { request.Parameters.Add("ScheduledUpdateGroupActions" + "." + "member" + "." + publicRequestlistValueIndex + "." + "DesiredCapacity", StringUtils.FromInt(publicRequestlistValue.DesiredCapacity)); } - if(publicRequestlistValue.IsSetEndTimeUtc()) + if(publicRequestlistValue.IsSetEndTime()) { - request.Parameters.Add("ScheduledUpdateGroupActions" + "." + "member" + "." + publicRequestlistValueIndex + "." + "EndTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequestlistValue.EndTimeUtc)); + request.Parameters.Add("ScheduledUpdateGroupActions" + "." + "member" + "." + publicRequestlistValueIndex + "." + "EndTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequestlistValue.EndTime)); } if(publicRequestlistValue.IsSetMaxSize()) { @@ -96,9 +96,9 @@ public IRequest Marshall(BatchPutScheduledUpdateGroupActionRequest publicRequest { request.Parameters.Add("ScheduledUpdateGroupActions" + "." + "member" + "." + publicRequestlistValueIndex + "." + "ScheduledActionName", StringUtils.FromString(publicRequestlistValue.ScheduledActionName)); } - if(publicRequestlistValue.IsSetStartTimeUtc()) + if(publicRequestlistValue.IsSetStartTime()) { - request.Parameters.Add("ScheduledUpdateGroupActions" + "." + "member" + "." + publicRequestlistValueIndex + "." + "StartTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequestlistValue.StartTimeUtc)); + request.Parameters.Add("ScheduledUpdateGroupActions" + "." + "member" + "." + publicRequestlistValueIndex + "." + "StartTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequestlistValue.StartTime)); } if(publicRequestlistValue.IsSetTimeZone()) { diff --git a/sdk/src/Services/AutoScaling/Generated/Model/Internal/MarshallTransformations/DescribeScheduledActionsRequestMarshaller.cs b/sdk/src/Services/AutoScaling/Generated/Model/Internal/MarshallTransformations/DescribeScheduledActionsRequestMarshaller.cs index 26b11f79fc13..022071799d12 100644 --- a/sdk/src/Services/AutoScaling/Generated/Model/Internal/MarshallTransformations/DescribeScheduledActionsRequestMarshaller.cs +++ b/sdk/src/Services/AutoScaling/Generated/Model/Internal/MarshallTransformations/DescribeScheduledActionsRequestMarshaller.cs @@ -63,9 +63,9 @@ public IRequest Marshall(DescribeScheduledActionsRequest publicRequest) { request.Parameters.Add("AutoScalingGroupName", StringUtils.FromString(publicRequest.AutoScalingGroupName)); } - if(publicRequest.IsSetEndTimeUtc()) + if(publicRequest.IsSetEndTime()) { - request.Parameters.Add("EndTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndTimeUtc)); + request.Parameters.Add("EndTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndTime)); } if(publicRequest.IsSetMaxRecords()) { @@ -89,9 +89,9 @@ public IRequest Marshall(DescribeScheduledActionsRequest publicRequest) } } } - if(publicRequest.IsSetStartTimeUtc()) + if(publicRequest.IsSetStartTime()) { - request.Parameters.Add("StartTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartTimeUtc)); + request.Parameters.Add("StartTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartTime)); } } return request; diff --git a/sdk/src/Services/AutoScaling/Generated/Model/Internal/MarshallTransformations/PutScheduledUpdateGroupActionRequestMarshaller.cs b/sdk/src/Services/AutoScaling/Generated/Model/Internal/MarshallTransformations/PutScheduledUpdateGroupActionRequestMarshaller.cs index 0b6cbc47dd1c..b26d93ecff6d 100644 --- a/sdk/src/Services/AutoScaling/Generated/Model/Internal/MarshallTransformations/PutScheduledUpdateGroupActionRequestMarshaller.cs +++ b/sdk/src/Services/AutoScaling/Generated/Model/Internal/MarshallTransformations/PutScheduledUpdateGroupActionRequestMarshaller.cs @@ -67,9 +67,9 @@ public IRequest Marshall(PutScheduledUpdateGroupActionRequest publicRequest) { request.Parameters.Add("DesiredCapacity", StringUtils.FromInt(publicRequest.DesiredCapacity)); } - if(publicRequest.IsSetEndTimeUtc()) + if(publicRequest.IsSetEndTime()) { - request.Parameters.Add("EndTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndTimeUtc)); + request.Parameters.Add("EndTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndTime)); } if(publicRequest.IsSetMaxSize()) { @@ -87,13 +87,13 @@ public IRequest Marshall(PutScheduledUpdateGroupActionRequest publicRequest) { request.Parameters.Add("ScheduledActionName", StringUtils.FromString(publicRequest.ScheduledActionName)); } - if(publicRequest.IsSetStartTimeUtc()) + if(publicRequest.IsSetStartTime()) { - request.Parameters.Add("StartTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartTimeUtc)); + request.Parameters.Add("StartTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartTime)); } - if(publicRequest.IsSetTimeUtc()) + if(publicRequest.IsSetTime()) { - request.Parameters.Add("Time", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.TimeUtc)); + request.Parameters.Add("Time", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.Time)); } if(publicRequest.IsSetTimeZone()) { diff --git a/sdk/src/Services/AutoScaling/Generated/Model/PutScheduledUpdateGroupActionRequest.cs b/sdk/src/Services/AutoScaling/Generated/Model/PutScheduledUpdateGroupActionRequest.cs index 87b39cc7f4a8..8d12c075641c 100644 --- a/sdk/src/Services/AutoScaling/Generated/Model/PutScheduledUpdateGroupActionRequest.cs +++ b/sdk/src/Services/AutoScaling/Generated/Model/PutScheduledUpdateGroupActionRequest.cs @@ -55,13 +55,13 @@ public partial class PutScheduledUpdateGroupActionRequest : AmazonAutoScalingReq { private string _autoScalingGroupName; private int? _desiredCapacity; - private DateTime? _endTimeUtc; + private DateTime? _endTime; private int? _maxSize; private int? _minSize; private string _recurrence; private string _scheduledActionName; - private DateTime? _startTimeUtc; - private DateTime? _timeUtc; + private DateTime? _startTime; + private DateTime? _time; private string _timeZone; /// @@ -110,21 +110,21 @@ internal bool IsSetDesiredCapacity() } /// - /// Gets and sets the property EndTimeUtc. + /// Gets and sets the property EndTime. /// /// The date and time for the recurring schedule to end, in UTC. For example, "2021-06-01T00:00:00Z". /// /// - public DateTime? EndTimeUtc + public DateTime? EndTime { - get { return this._endTimeUtc; } - set { this._endTime = this._endTimeUtc = value; } + get { return this._endTime; } + set { this._endTime = value; } } - // Check to see if EndTimeUtc property is set - internal bool IsSetEndTimeUtc() + // Check to see if EndTime property is set + internal bool IsSetEndTime() { - return this._endTimeUtc.HasValue; + return this._endTime.HasValue; } /// @@ -214,7 +214,7 @@ internal bool IsSetScheduledActionName() } /// - /// Gets and sets the property StartTimeUtc. + /// Gets and sets the property StartTime. /// /// The date and time for this action to start, in YYYY-MM-DDThh:mm:ssZ format in UTC/GMT /// only and in quotes (for example, "2021-06-01T00:00:00Z"). @@ -225,34 +225,34 @@ internal bool IsSetScheduledActionName() /// the action at this time, and then performs the action based on the specified recurrence. /// /// - public DateTime? StartTimeUtc + public DateTime? StartTime { - get { return this._startTimeUtc; } - set { this._startTime = this._startTimeUtc = value; } + get { return this._startTime; } + set { this._startTime = value; } } - // Check to see if StartTimeUtc property is set - internal bool IsSetStartTimeUtc() + // Check to see if StartTime property is set + internal bool IsSetStartTime() { - return this._startTimeUtc.HasValue; + return this._startTime.HasValue; } /// - /// Gets and sets the property TimeUtc. + /// Gets and sets the property Time. /// /// This property is no longer used. /// /// - public DateTime? TimeUtc + public DateTime? Time { - get { return this._timeUtc; } - set { this._time = this._timeUtc = value; } + get { return this._time; } + set { this._time = value; } } - // Check to see if TimeUtc property is set - internal bool IsSetTimeUtc() + // Check to see if Time property is set + internal bool IsSetTime() { - return this._timeUtc.HasValue; + return this._time.HasValue; } /// @@ -281,125 +281,5 @@ internal bool IsSetTimeZone() return this._timeZone != null; } -#region Backwards compatible properties - private DateTime? _endTime; - private DateTime? _startTime; - private DateTime? _time; - - /// - /// Gets and sets the property EndTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use EndTimeUtc instead. Setting either EndTime or EndTimeUtc - /// results in both EndTime and EndTimeUtc being assigned, the latest assignment to either - /// one of the two property is reflected in the value of both. EndTime is provided for - /// backwards compatibility only and assigning a non-Utc DateTime to it results in the - /// wrong timestamp being passed to the service. - /// - /// - /// - /// The date and time for the recurring schedule to end, in UTC. For example, "2021-06-01T00:00:00Z". - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use EndTimeUtc instead. Setting either EndTime or EndTimeUtc results in both EndTime and " + - "EndTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. EndTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? EndTime - { - get { return this._endTime.GetValueOrDefault(); } - set - { - this._endTime = value; - if (value != null) - { - this._endTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._endTimeUtc = null; - } - } - } - /// - /// Gets and sets the property StartTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use StartTimeUtc instead. Setting either StartTime or - /// StartTimeUtc results in both StartTime and StartTimeUtc being assigned, the latest - /// assignment to either one of the two property is reflected in the value of both. StartTime - /// is provided for backwards compatibility only and assigning a non-Utc DateTime to it - /// results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The date and time for this action to start, in YYYY-MM-DDThh:mm:ssZ format in UTC/GMT - /// only and in quotes (for example, "2021-06-01T00:00:00Z"). - /// - /// - /// - /// If you specify Recurrence and StartTime, Amazon EC2 Auto Scaling performs - /// the action at this time, and then performs the action based on the specified recurrence. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use StartTimeUtc instead. Setting either StartTime or StartTimeUtc results in both StartTime and " + - "StartTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. StartTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? StartTime - { - get { return this._startTime.GetValueOrDefault(); } - set - { - this._startTime = value; - if (value != null) - { - this._startTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._startTimeUtc = null; - } - } - } - /// - /// Gets and sets the property TimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use TimeUtc instead. Setting either Time or TimeUtc results - /// in both Time and TimeUtc being assigned, the latest assignment to either one of the - /// two property is reflected in the value of both. Time is provided for backwards compatibility - /// only and assigning a non-Utc DateTime to it results in the wrong timestamp being passed - /// to the service. - /// - /// - /// - /// This property is no longer used. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use TimeUtc instead. Setting either Time or TimeUtc results in both Time and " + - "TimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. Time is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? Time - { - get { return this._time.GetValueOrDefault(); } - set - { - this._time = value; - if (value != null) - { - this._timeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._timeUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/AutoScaling/Generated/Model/ScheduledUpdateGroupActionRequest.cs b/sdk/src/Services/AutoScaling/Generated/Model/ScheduledUpdateGroupActionRequest.cs index c73f4c797207..037479ebf468 100644 --- a/sdk/src/Services/AutoScaling/Generated/Model/ScheduledUpdateGroupActionRequest.cs +++ b/sdk/src/Services/AutoScaling/Generated/Model/ScheduledUpdateGroupActionRequest.cs @@ -37,12 +37,12 @@ namespace Amazon.AutoScaling.Model public partial class ScheduledUpdateGroupActionRequest { private int? _desiredCapacity; - private DateTime? _endTimeUtc; + private DateTime? _endTime; private int? _maxSize; private int? _minSize; private string _recurrence; private string _scheduledActionName; - private DateTime? _startTimeUtc; + private DateTime? _startTime; private string _timeZone; /// @@ -65,21 +65,21 @@ internal bool IsSetDesiredCapacity() } /// - /// Gets and sets the property EndTimeUtc. + /// Gets and sets the property EndTime. /// /// The date and time for the recurring schedule to end, in UTC. /// /// - public DateTime? EndTimeUtc + public DateTime? EndTime { - get { return this._endTimeUtc; } - set { this._endTime = this._endTimeUtc = value; } + get { return this._endTime; } + set { this._endTime = value; } } - // Check to see if EndTimeUtc property is set - internal bool IsSetEndTimeUtc() + // Check to see if EndTime property is set + internal bool IsSetEndTime() { - return this._endTimeUtc.HasValue; + return this._endTime.HasValue; } /// @@ -169,7 +169,7 @@ internal bool IsSetScheduledActionName() } /// - /// Gets and sets the property StartTimeUtc. + /// Gets and sets the property StartTime. /// /// The date and time for the action to start, in YYYY-MM-DDThh:mm:ssZ format in UTC/GMT /// only and in quotes (for example, "2019-06-01T00:00:00Z"). @@ -185,16 +185,16 @@ internal bool IsSetScheduledActionName() /// error message. /// /// - public DateTime? StartTimeUtc + public DateTime? StartTime { - get { return this._startTimeUtc; } - set { this._startTime = this._startTimeUtc = value; } + get { return this._startTime; } + set { this._startTime = value; } } - // Check to see if StartTimeUtc property is set - internal bool IsSetStartTimeUtc() + // Check to see if StartTime property is set + internal bool IsSetStartTime() { - return this._startTimeUtc.HasValue; + return this._startTime.HasValue; } /// @@ -223,93 +223,5 @@ internal bool IsSetTimeZone() return this._timeZone != null; } -#region Backwards compatible properties - private DateTime? _endTime; - private DateTime? _startTime; - - /// - /// Gets and sets the property EndTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use EndTimeUtc instead. Setting either EndTime or EndTimeUtc - /// results in both EndTime and EndTimeUtc being assigned, the latest assignment to either - /// one of the two property is reflected in the value of both. EndTime is provided for - /// backwards compatibility only and assigning a non-Utc DateTime to it results in the - /// wrong timestamp being passed to the service. - /// - /// - /// - /// The date and time for the recurring schedule to end, in UTC. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use EndTimeUtc instead. Setting either EndTime or EndTimeUtc results in both EndTime and " + - "EndTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. EndTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? EndTime - { - get { return this._endTime.GetValueOrDefault(); } - set - { - this._endTime = value; - if (value != null) - { - this._endTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._endTimeUtc = null; - } - } - } - /// - /// Gets and sets the property StartTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use StartTimeUtc instead. Setting either StartTime or - /// StartTimeUtc results in both StartTime and StartTimeUtc being assigned, the latest - /// assignment to either one of the two property is reflected in the value of both. StartTime - /// is provided for backwards compatibility only and assigning a non-Utc DateTime to it - /// results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The date and time for the action to start, in YYYY-MM-DDThh:mm:ssZ format in UTC/GMT - /// only and in quotes (for example, "2019-06-01T00:00:00Z"). - /// - /// - /// - /// If you specify Recurrence and StartTime, Amazon EC2 Auto Scaling performs - /// the action at this time, and then performs the action based on the specified recurrence. - /// - /// - /// - /// If you try to schedule the action in the past, Amazon EC2 Auto Scaling returns an - /// error message. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use StartTimeUtc instead. Setting either StartTime or StartTimeUtc results in both StartTime and " + - "StartTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. StartTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? StartTime - { - get { return this._startTime.GetValueOrDefault(); } - set - { - this._startTime = value; - if (value != null) - { - this._startTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._startTimeUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/CloudWatch/Generated/Model/DescribeAlarmHistoryRequest.cs b/sdk/src/Services/CloudWatch/Generated/Model/DescribeAlarmHistoryRequest.cs index a2c0e29f441f..94f34e3f3516 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/DescribeAlarmHistoryRequest.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/DescribeAlarmHistoryRequest.cs @@ -51,12 +51,12 @@ public partial class DescribeAlarmHistoryRequest : AmazonCloudWatchRequest { private string _alarmName; private List _alarmTypes = AWSConfigs.InitializeCollections ? new List() : null; - private DateTime? _endDateUtc; + private DateTime? _endDate; private HistoryItemType _historyItemType; private int? _maxRecords; private string _nextToken; private ScanBy _scanBy; - private DateTime? _startDateUtc; + private DateTime? _startDate; /// /// Gets and sets the property AlarmName. @@ -97,21 +97,21 @@ internal bool IsSetAlarmTypes() } /// - /// Gets and sets the property EndDateUtc. + /// Gets and sets the property EndDate. /// /// The ending date to retrieve alarm history. /// /// - public DateTime? EndDateUtc + public DateTime? EndDate { - get { return this._endDateUtc; } - set { this._endDate = this._endDateUtc = value; } + get { return this._endDate; } + set { this._endDate = value; } } - // Check to see if EndDateUtc property is set - internal bool IsSetEndDateUtc() + // Check to see if EndDate property is set + internal bool IsSetEndDate() { - return this._endDateUtc.HasValue; + return this._endDate.HasValue; } /// @@ -190,99 +190,22 @@ internal bool IsSetScanBy() } /// - /// Gets and sets the property StartDateUtc. + /// Gets and sets the property StartDate. /// /// The starting date to retrieve alarm history. /// /// - public DateTime? StartDateUtc + public DateTime? StartDate { - get { return this._startDateUtc; } - set { this._startDate = this._startDateUtc = value; } + get { return this._startDate; } + set { this._startDate = value; } } - // Check to see if StartDateUtc property is set - internal bool IsSetStartDateUtc() + // Check to see if StartDate property is set + internal bool IsSetStartDate() { - return this._startDateUtc.HasValue; + return this._startDate.HasValue; } -#region Backwards compatible properties - private DateTime? _endDate; - private DateTime? _startDate; - - /// - /// Gets and sets the property EndDateUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use EndDateUtc instead. Setting either EndDate or EndDateUtc - /// results in both EndDate and EndDateUtc being assigned, the latest assignment to either - /// one of the two property is reflected in the value of both. EndDate is provided for - /// backwards compatibility only and assigning a non-Utc DateTime to it results in the - /// wrong timestamp being passed to the service. - /// - /// - /// - /// The ending date to retrieve alarm history. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use EndDateUtc instead. Setting either EndDate or EndDateUtc results in both EndDate and " + - "EndDateUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. EndDate is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? EndDate - { - get { return this._endDate.GetValueOrDefault(); } - set - { - this._endDate = value; - if (value != null) - { - this._endDateUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._endDateUtc = null; - } - } - } - /// - /// Gets and sets the property StartDateUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use StartDateUtc instead. Setting either StartDate or - /// StartDateUtc results in both StartDate and StartDateUtc being assigned, the latest - /// assignment to either one of the two property is reflected in the value of both. StartDate - /// is provided for backwards compatibility only and assigning a non-Utc DateTime to it - /// results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The starting date to retrieve alarm history. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use StartDateUtc instead. Setting either StartDate or StartDateUtc results in both StartDate and " + - "StartDateUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. StartDate is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? StartDate - { - get { return this._startDate.GetValueOrDefault(); } - set - { - this._startDate = value; - if (value != null) - { - this._startDateUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._startDateUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/CloudWatch/Generated/Model/GetMetricDataRequest.cs b/sdk/src/Services/CloudWatch/Generated/Model/GetMetricDataRequest.cs index 6237f61c3c85..bd65a6ac09f8 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/GetMetricDataRequest.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/GetMetricDataRequest.cs @@ -118,16 +118,16 @@ namespace Amazon.CloudWatch.Model /// public partial class GetMetricDataRequest : AmazonCloudWatchRequest { - private DateTime? _endTimeUtc; + private DateTime? _endTime; private LabelOptions _labelOptions; private int? _maxDatapoints; private List _metricDataQueries = AWSConfigs.InitializeCollections ? new List() : null; private string _nextToken; private ScanBy _scanBy; - private DateTime? _startTimeUtc; + private DateTime? _startTime; /// - /// Gets and sets the property EndTimeUtc. + /// Gets and sets the property EndTime. /// /// The time stamp indicating the latest data to be returned. /// @@ -146,16 +146,16 @@ public partial class GetMetricDataRequest : AmazonCloudWatchRequest /// /// [AWSProperty(Required=true)] - public DateTime? EndTimeUtc + public DateTime? EndTime { - get { return this._endTimeUtc; } - set { this._endTime = this._endTimeUtc = value; } + get { return this._endTime; } + set { this._endTime = value; } } - // Check to see if EndTimeUtc property is set - internal bool IsSetEndTimeUtc() + // Check to see if EndTime property is set + internal bool IsSetEndTime() { - return this._endTimeUtc.HasValue; + return this._endTime.HasValue; } /// @@ -264,7 +264,7 @@ internal bool IsSetScanBy() } /// - /// Gets and sets the property StartTimeUtc. + /// Gets and sets the property StartTime. /// /// The time stamp indicating the earliest data to be returned. /// @@ -312,149 +312,17 @@ internal bool IsSetScanBy() /// /// [AWSProperty(Required=true)] - public DateTime? StartTimeUtc + public DateTime? StartTime { - get { return this._startTimeUtc; } - set { this._startTime = this._startTimeUtc = value; } + get { return this._startTime; } + set { this._startTime = value; } } - // Check to see if StartTimeUtc property is set - internal bool IsSetStartTimeUtc() + // Check to see if StartTime property is set + internal bool IsSetStartTime() { - return this._startTimeUtc.HasValue; + return this._startTime.HasValue; } -#region Backwards compatible properties - private DateTime? _endTime; - private DateTime? _startTime; - - /// - /// Gets and sets the property EndTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use EndTimeUtc instead. Setting either EndTime or EndTimeUtc - /// results in both EndTime and EndTimeUtc being assigned, the latest assignment to either - /// one of the two property is reflected in the value of both. EndTime is provided for - /// backwards compatibility only and assigning a non-Utc DateTime to it results in the - /// wrong timestamp being passed to the service. - /// - /// - /// - /// The time stamp indicating the latest data to be returned. - /// - /// - /// - /// The value specified is exclusive; results include data points up to the specified - /// time stamp. - /// - /// - /// - /// For better performance, specify StartTime and EndTime values that align - /// with the value of the metric's Period and sync up with the beginning and end - /// of an hour. For example, if the Period of a metric is 5 minutes, specifying - /// 12:05 or 12:30 as EndTime can get a faster response from CloudWatch than setting - /// 12:07 or 12:29 as the EndTime. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use EndTimeUtc instead. Setting either EndTime or EndTimeUtc results in both EndTime and " + - "EndTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. EndTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? EndTime - { - get { return this._endTime.GetValueOrDefault(); } - set - { - this._endTime = value; - if (value != null) - { - this._endTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._endTimeUtc = null; - } - } - } - /// - /// Gets and sets the property StartTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use StartTimeUtc instead. Setting either StartTime or - /// StartTimeUtc results in both StartTime and StartTimeUtc being assigned, the latest - /// assignment to either one of the two property is reflected in the value of both. StartTime - /// is provided for backwards compatibility only and assigning a non-Utc DateTime to it - /// results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The time stamp indicating the earliest data to be returned. - /// - /// - /// - /// The value specified is inclusive; results include data points with the specified time - /// stamp. - /// - /// - /// - /// CloudWatch rounds the specified time stamp as follows: - /// - ///
  • - /// - /// Start time less than 15 days ago - Round down to the nearest whole minute. For example, - /// 12:32:34 is rounded down to 12:32:00. - /// - ///
  • - /// - /// Start time between 15 and 63 days ago - Round down to the nearest 5-minute clock interval. - /// For example, 12:32:34 is rounded down to 12:30:00. - /// - ///
  • - /// - /// Start time greater than 63 days ago - Round down to the nearest 1-hour clock interval. - /// For example, 12:32:34 is rounded down to 12:00:00. - /// - ///
- /// - /// If you set Period to 5, 10, or 30, the start time of your request is rounded - /// down to the nearest time that corresponds to even 5-, 10-, or 30-second divisions - /// of a minute. For example, if you make a query at (HH:mm:ss) 01:05:23 for the previous - /// 10-second period, the start time of your request is rounded down and you receive data - /// from 01:05:10 to 01:05:20. If you make a query at 15:07:17 for the previous 5 minutes - /// of data, using a period of 5 seconds, you receive data timestamped between 15:02:15 - /// and 15:07:15. - /// - /// - /// - /// For better performance, specify StartTime and EndTime values that align - /// with the value of the metric's Period and sync up with the beginning and end - /// of an hour. For example, if the Period of a metric is 5 minutes, specifying - /// 12:05 or 12:30 as StartTime can get a faster response from CloudWatch than - /// setting 12:07 or 12:29 as the StartTime. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use StartTimeUtc instead. Setting either StartTime or StartTimeUtc results in both StartTime and " + - "StartTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. StartTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? StartTime - { - get { return this._startTime.GetValueOrDefault(); } - set - { - this._startTime = value; - if (value != null) - { - this._startTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._startTimeUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/CloudWatch/Generated/Model/GetMetricStatisticsRequest.cs b/sdk/src/Services/CloudWatch/Generated/Model/GetMetricStatisticsRequest.cs index 0e89c6c761ad..5f4120256cd9 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/GetMetricStatisticsRequest.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/GetMetricStatisticsRequest.cs @@ -114,12 +114,12 @@ namespace Amazon.CloudWatch.Model public partial class GetMetricStatisticsRequest : AmazonCloudWatchRequest { private List _dimensions = AWSConfigs.InitializeCollections ? new List() : null; - private DateTime? _endTimeUtc; + private DateTime? _endTime; private List _extendedStatistics = AWSConfigs.InitializeCollections ? new List() : null; private string _metricName; private string _awsNamespace; private int? _period; - private DateTime? _startTimeUtc; + private DateTime? _startTime; private List _statistics = AWSConfigs.InitializeCollections ? new List() : null; private StandardUnit _unit; @@ -150,7 +150,7 @@ internal bool IsSetDimensions() } /// - /// Gets and sets the property EndTimeUtc. + /// Gets and sets the property EndTime. /// /// The time stamp that determines the last data point to return. /// @@ -162,16 +162,16 @@ internal bool IsSetDimensions() /// /// [AWSProperty(Required=true)] - public DateTime? EndTimeUtc + public DateTime? EndTime { - get { return this._endTimeUtc; } - set { this._endTime = this._endTimeUtc = value; } + get { return this._endTime; } + set { this._endTime = value; } } - // Check to see if EndTimeUtc property is set - internal bool IsSetEndTimeUtc() + // Check to see if EndTime property is set + internal bool IsSetEndTime() { - return this._endTimeUtc.HasValue; + return this._endTime.HasValue; } /// @@ -278,7 +278,7 @@ internal bool IsSetPeriod() } /// - /// Gets and sets the property StartTimeUtc. + /// Gets and sets the property StartTime. /// /// The time stamp that determines the first data point to return. Start times are evaluated /// relative to the time that CloudWatch receives the request. @@ -320,16 +320,16 @@ internal bool IsSetPeriod() /// /// [AWSProperty(Required=true)] - public DateTime? StartTimeUtc + public DateTime? StartTime { - get { return this._startTimeUtc; } - set { this._startTime = this._startTimeUtc = value; } + get { return this._startTime; } + set { this._startTime = value; } } - // Check to see if StartTimeUtc property is set - internal bool IsSetStartTimeUtc() + // Check to see if StartTime property is set + internal bool IsSetStartTime() { - return this._startTimeUtc.HasValue; + return this._startTime.HasValue; } /// @@ -376,124 +376,5 @@ internal bool IsSetUnit() return this._unit != null; } -#region Backwards compatible properties - private DateTime? _endTime; - private DateTime? _startTime; - - /// - /// Gets and sets the property EndTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use EndTimeUtc instead. Setting either EndTime or EndTimeUtc - /// results in both EndTime and EndTimeUtc being assigned, the latest assignment to either - /// one of the two property is reflected in the value of both. EndTime is provided for - /// backwards compatibility only and assigning a non-Utc DateTime to it results in the - /// wrong timestamp being passed to the service. - /// - /// - /// - /// The time stamp that determines the last data point to return. - /// - /// - /// - /// The value specified is exclusive; results include data points up to the specified - /// time stamp. In a raw HTTP query, the time stamp must be in ISO 8601 UTC format (for - /// example, 2016-10-10T23:00:00Z). - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use EndTimeUtc instead. Setting either EndTime or EndTimeUtc results in both EndTime and " + - "EndTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. EndTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? EndTime - { - get { return this._endTime.GetValueOrDefault(); } - set - { - this._endTime = value; - if (value != null) - { - this._endTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._endTimeUtc = null; - } - } - } - /// - /// Gets and sets the property StartTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use StartTimeUtc instead. Setting either StartTime or - /// StartTimeUtc results in both StartTime and StartTimeUtc being assigned, the latest - /// assignment to either one of the two property is reflected in the value of both. StartTime - /// is provided for backwards compatibility only and assigning a non-Utc DateTime to it - /// results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The time stamp that determines the first data point to return. Start times are evaluated - /// relative to the time that CloudWatch receives the request. - /// - /// - /// - /// The value specified is inclusive; results include data points with the specified time - /// stamp. In a raw HTTP query, the time stamp must be in ISO 8601 UTC format (for example, - /// 2016-10-03T23:00:00Z). - /// - /// - /// - /// CloudWatch rounds the specified time stamp as follows: - /// - ///
  • - /// - /// Start time less than 15 days ago - Round down to the nearest whole minute. For example, - /// 12:32:34 is rounded down to 12:32:00. - /// - ///
  • - /// - /// Start time between 15 and 63 days ago - Round down to the nearest 5-minute clock interval. - /// For example, 12:32:34 is rounded down to 12:30:00. - /// - ///
  • - /// - /// Start time greater than 63 days ago - Round down to the nearest 1-hour clock interval. - /// For example, 12:32:34 is rounded down to 12:00:00. - /// - ///
- /// - /// If you set Period to 5, 10, or 30, the start time of your request is rounded - /// down to the nearest time that corresponds to even 5-, 10-, or 30-second divisions - /// of a minute. For example, if you make a query at (HH:mm:ss) 01:05:23 for the previous - /// 10-second period, the start time of your request is rounded down and you receive data - /// from 01:05:10 to 01:05:20. If you make a query at 15:07:17 for the previous 5 minutes - /// of data, using a period of 5 seconds, you receive data timestamped between 15:02:15 - /// and 15:07:15. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use StartTimeUtc instead. Setting either StartTime or StartTimeUtc results in both StartTime and " + - "StartTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. StartTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? StartTime - { - get { return this._startTime.GetValueOrDefault(); } - set - { - this._startTime = value; - if (value != null) - { - this._startTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._startTimeUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DescribeAlarmHistoryRequestMarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DescribeAlarmHistoryRequestMarshaller.cs index aa1c9019b868..c73c01e6d4af 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DescribeAlarmHistoryRequestMarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/DescribeAlarmHistoryRequestMarshaller.cs @@ -77,9 +77,9 @@ public IRequest Marshall(DescribeAlarmHistoryRequest publicRequest) } } } - if(publicRequest.IsSetEndDateUtc()) + if(publicRequest.IsSetEndDate()) { - request.Parameters.Add("EndDate", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndDateUtc)); + request.Parameters.Add("EndDate", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndDate)); } if(publicRequest.IsSetHistoryItemType()) { @@ -97,9 +97,9 @@ public IRequest Marshall(DescribeAlarmHistoryRequest publicRequest) { request.Parameters.Add("ScanBy", StringUtils.FromString(publicRequest.ScanBy)); } - if(publicRequest.IsSetStartDateUtc()) + if(publicRequest.IsSetStartDate()) { - request.Parameters.Add("StartDate", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartDateUtc)); + request.Parameters.Add("StartDate", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartDate)); } } return request; diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/GetMetricDataRequestMarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/GetMetricDataRequestMarshaller.cs index 48d84c1ebc6a..307d00ad84cb 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/GetMetricDataRequestMarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/GetMetricDataRequestMarshaller.cs @@ -59,9 +59,9 @@ public IRequest Marshall(GetMetricDataRequest publicRequest) if(publicRequest != null) { - if(publicRequest.IsSetEndTimeUtc()) + if(publicRequest.IsSetEndTime()) { - request.Parameters.Add("EndTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndTimeUtc)); + request.Parameters.Add("EndTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndTime)); } if(publicRequest.IsSetLabelOptions()) { @@ -166,9 +166,9 @@ public IRequest Marshall(GetMetricDataRequest publicRequest) { request.Parameters.Add("ScanBy", StringUtils.FromString(publicRequest.ScanBy)); } - if(publicRequest.IsSetStartTimeUtc()) + if(publicRequest.IsSetStartTime()) { - request.Parameters.Add("StartTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartTimeUtc)); + request.Parameters.Add("StartTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartTime)); } } return request; diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/GetMetricStatisticsRequestMarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/GetMetricStatisticsRequestMarshaller.cs index 75e431528cbd..29cdcce80c51 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/GetMetricStatisticsRequestMarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/GetMetricStatisticsRequestMarshaller.cs @@ -80,9 +80,9 @@ public IRequest Marshall(GetMetricStatisticsRequest publicRequest) } } } - if(publicRequest.IsSetEndTimeUtc()) + if(publicRequest.IsSetEndTime()) { - request.Parameters.Add("EndTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndTimeUtc)); + request.Parameters.Add("EndTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndTime)); } if(publicRequest.IsSetExtendedStatistics()) { @@ -110,9 +110,9 @@ public IRequest Marshall(GetMetricStatisticsRequest publicRequest) { request.Parameters.Add("Period", StringUtils.FromInt(publicRequest.Period)); } - if(publicRequest.IsSetStartTimeUtc()) + if(publicRequest.IsSetStartTime()) { - request.Parameters.Add("StartTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartTimeUtc)); + request.Parameters.Add("StartTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartTime)); } if(publicRequest.IsSetStatistics()) { diff --git a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutMetricDataRequestMarshaller.cs b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutMetricDataRequestMarshaller.cs index 8d4965dccd62..112844610871 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutMetricDataRequestMarshaller.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/Internal/MarshallTransformations/PutMetricDataRequestMarshaller.cs @@ -173,9 +173,9 @@ public IRequest Marshall(PutMetricDataRequest publicRequest) { request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "MetricData" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "StorageResolution", StringUtils.FromInt(publicRequestlistValuelistValue.StorageResolution)); } - if(publicRequestlistValuelistValue.IsSetTimestampUtc()) + if(publicRequestlistValuelistValue.IsSetTimestamp()) { - request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "MetricData" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "Timestamp", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequestlistValuelistValue.TimestampUtc)); + request.Parameters.Add("EntityMetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "MetricData" + "." + "member" + "." + publicRequestlistValuelistValueIndex + "." + "Timestamp", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequestlistValuelistValue.Timestamp)); } if(publicRequestlistValuelistValue.IsSetUnit()) { @@ -278,9 +278,9 @@ public IRequest Marshall(PutMetricDataRequest publicRequest) { request.Parameters.Add("MetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "StorageResolution", StringUtils.FromInt(publicRequestlistValue.StorageResolution)); } - if(publicRequestlistValue.IsSetTimestampUtc()) + if(publicRequestlistValue.IsSetTimestamp()) { - request.Parameters.Add("MetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "Timestamp", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequestlistValue.TimestampUtc)); + request.Parameters.Add("MetricData" + "." + "member" + "." + publicRequestlistValueIndex + "." + "Timestamp", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequestlistValue.Timestamp)); } if(publicRequestlistValue.IsSetUnit()) { diff --git a/sdk/src/Services/CloudWatch/Generated/Model/MetricDatum.cs b/sdk/src/Services/CloudWatch/Generated/Model/MetricDatum.cs index 2b6714a8401e..9b31a9e20098 100644 --- a/sdk/src/Services/CloudWatch/Generated/Model/MetricDatum.cs +++ b/sdk/src/Services/CloudWatch/Generated/Model/MetricDatum.cs @@ -40,7 +40,7 @@ public partial class MetricDatum private string _metricName; private StatisticSet _statisticValues; private int? _storageResolution; - private DateTime? _timestampUtc; + private DateTime? _timestamp; private StandardUnit _unit; private double? _value; private List _values = AWSConfigs.InitializeCollections ? new List() : null; @@ -157,22 +157,22 @@ internal bool IsSetStorageResolution() } /// - /// Gets and sets the property TimestampUtc. + /// Gets and sets the property Timestamp. /// /// The time the metric data was received, expressed as the number of milliseconds since /// Jan 1, 1970 00:00:00 UTC. /// /// - public DateTime? TimestampUtc + public DateTime? Timestamp { - get { return this._timestampUtc; } - set { this._timestamp = this._timestampUtc = value; } + get { return this._timestamp; } + set { this._timestamp = value; } } - // Check to see if TimestampUtc property is set - internal bool IsSetTimestampUtc() + // Check to see if Timestamp property is set + internal bool IsSetTimestamp() { - return this._timestampUtc.HasValue; + return this._timestamp.HasValue; } /// @@ -251,46 +251,5 @@ internal bool IsSetValues() return this._values != null && (this._values.Count > 0 || !AWSConfigs.InitializeCollections); } -#region Backwards compatible properties - private DateTime? _timestamp; - - /// - /// Gets and sets the property TimestampUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use TimestampUtc instead. Setting either Timestamp or - /// TimestampUtc results in both Timestamp and TimestampUtc being assigned, the latest - /// assignment to either one of the two property is reflected in the value of both. Timestamp - /// is provided for backwards compatibility only and assigning a non-Utc DateTime to it - /// results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The time the metric data was received, expressed as the number of milliseconds since - /// Jan 1, 1970 00:00:00 UTC. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use TimestampUtc instead. Setting either Timestamp or TimestampUtc results in both Timestamp and " + - "TimestampUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. Timestamp is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? Timestamp - { - get { return this._timestamp.GetValueOrDefault(); } - set - { - this._timestamp = value; - if (value != null) - { - this._timestampUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._timestampUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/CloudWatchLogs/Generated/Model/Internal/MarshallTransformations/GetLogEventsRequestMarshaller.cs b/sdk/src/Services/CloudWatchLogs/Generated/Model/Internal/MarshallTransformations/GetLogEventsRequestMarshaller.cs index 2d16b1ab4ce2..751c5d2bb89f 100644 --- a/sdk/src/Services/CloudWatchLogs/Generated/Model/Internal/MarshallTransformations/GetLogEventsRequestMarshaller.cs +++ b/sdk/src/Services/CloudWatchLogs/Generated/Model/Internal/MarshallTransformations/GetLogEventsRequestMarshaller.cs @@ -74,7 +74,7 @@ public IRequest Marshall(GetLogEventsRequest publicRequest) if(publicRequest.IsSetEndTime()) { context.Writer.WritePropertyName("endTime"); - context.Writer.Write(Amazon.Runtime.Internal.Transform.CustomMarshallTransformations.ConvertDateTimeToEpochMilliseconds(publicRequest.EndTime.Value)); + context.Writer.Write(Amazon.Util.AWSSDKUtils.ConvertToUnixEpochMilliseconds(publicRequest.EndTime.Value)); } if(publicRequest.IsSetLimit()) @@ -116,7 +116,7 @@ public IRequest Marshall(GetLogEventsRequest publicRequest) if(publicRequest.IsSetStartTime()) { context.Writer.WritePropertyName("startTime"); - context.Writer.Write(Amazon.Runtime.Internal.Transform.CustomMarshallTransformations.ConvertDateTimeToEpochMilliseconds(publicRequest.StartTime.Value)); + context.Writer.Write(Amazon.Util.AWSSDKUtils.ConvertToUnixEpochMilliseconds(publicRequest.StartTime.Value)); } if(publicRequest.IsSetUnmask()) diff --git a/sdk/src/Services/CloudWatchLogs/Generated/Model/Internal/MarshallTransformations/InputLogEventMarshaller.cs b/sdk/src/Services/CloudWatchLogs/Generated/Model/Internal/MarshallTransformations/InputLogEventMarshaller.cs index ec6d2247a2f6..269d87d0031e 100644 --- a/sdk/src/Services/CloudWatchLogs/Generated/Model/Internal/MarshallTransformations/InputLogEventMarshaller.cs +++ b/sdk/src/Services/CloudWatchLogs/Generated/Model/Internal/MarshallTransformations/InputLogEventMarshaller.cs @@ -57,7 +57,7 @@ public void Marshall(InputLogEvent requestObject, JsonMarshallerContext context) if(requestObject.IsSetTimestamp()) { context.Writer.WritePropertyName("timestamp"); - context.Writer.Write(Amazon.Runtime.Internal.Transform.CustomMarshallTransformations.ConvertDateTimeToEpochMilliseconds(requestObject.Timestamp.Value)); + context.Writer.Write(Amazon.Util.AWSSDKUtils.ConvertToUnixEpochMilliseconds(requestObject.Timestamp.Value)); } } diff --git a/sdk/src/Services/EC2/Generated/Model/ClientData.cs b/sdk/src/Services/EC2/Generated/Model/ClientData.cs index d49ee3416431..d4da04498798 100644 --- a/sdk/src/Services/EC2/Generated/Model/ClientData.cs +++ b/sdk/src/Services/EC2/Generated/Model/ClientData.cs @@ -35,9 +35,9 @@ namespace Amazon.EC2.Model public partial class ClientData { private string _comment; - private DateTime? _uploadEndUtc; + private DateTime? _uploadEnd; private double? _uploadSize; - private DateTime? _uploadStartUtc; + private DateTime? _uploadStart; /// /// Gets and sets the property Comment. @@ -58,21 +58,21 @@ internal bool IsSetComment() } /// - /// Gets and sets the property UploadEndUtc. + /// Gets and sets the property UploadEnd. /// /// The time that the disk upload ends. /// /// - public DateTime? UploadEndUtc + public DateTime? UploadEnd { - get { return this._uploadEndUtc; } - set { this._uploadEnd = this._uploadEndUtc = value; } + get { return this._uploadEnd; } + set { this._uploadEnd = value; } } - // Check to see if UploadEndUtc property is set - internal bool IsSetUploadEndUtc() + // Check to see if UploadEnd property is set + internal bool IsSetUploadEnd() { - return this._uploadEndUtc.HasValue; + return this._uploadEnd.HasValue; } /// @@ -94,99 +94,22 @@ internal bool IsSetUploadSize() } /// - /// Gets and sets the property UploadStartUtc. + /// Gets and sets the property UploadStart. /// /// The time that the disk upload starts. /// /// - public DateTime? UploadStartUtc + public DateTime? UploadStart { - get { return this._uploadStartUtc; } - set { this._uploadStart = this._uploadStartUtc = value; } + get { return this._uploadStart; } + set { this._uploadStart = value; } } - // Check to see if UploadStartUtc property is set - internal bool IsSetUploadStartUtc() + // Check to see if UploadStart property is set + internal bool IsSetUploadStart() { - return this._uploadStartUtc.HasValue; + return this._uploadStart.HasValue; } -#region Backwards compatible properties - private DateTime? _uploadEnd; - private DateTime? _uploadStart; - - /// - /// Gets and sets the property UploadEndUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use UploadEndUtc instead. Setting either UploadEnd or - /// UploadEndUtc results in both UploadEnd and UploadEndUtc being assigned, the latest - /// assignment to either one of the two property is reflected in the value of both. UploadEnd - /// is provided for backwards compatibility only and assigning a non-Utc DateTime to it - /// results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The time that the disk upload ends. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use UploadEndUtc instead. Setting either UploadEnd or UploadEndUtc results in both UploadEnd and " + - "UploadEndUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. UploadEnd is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? UploadEnd - { - get { return this._uploadEnd.GetValueOrDefault(); } - set - { - this._uploadEnd = value; - if (value != null) - { - this._uploadEndUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._uploadEndUtc = null; - } - } - } - /// - /// Gets and sets the property UploadStartUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use UploadStartUtc instead. Setting either UploadStart - /// or UploadStartUtc results in both UploadStart and UploadStartUtc being assigned, the - /// latest assignment to either one of the two property is reflected in the value of both. - /// UploadStart is provided for backwards compatibility only and assigning a non-Utc DateTime - /// to it results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The time that the disk upload starts. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use UploadStartUtc instead. Setting either UploadStart or UploadStartUtc results in both UploadStart and " + - "UploadStartUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. UploadStart is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? UploadStart - { - get { return this._uploadStart.GetValueOrDefault(); } - set - { - this._uploadStart = value; - if (value != null) - { - this._uploadStartUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._uploadStartUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/EC2/Generated/Model/CreateFleetRequest.cs b/sdk/src/Services/EC2/Generated/Model/CreateFleetRequest.cs index 7ae433f6e2cb..49bfe87a655d 100644 --- a/sdk/src/Services/EC2/Generated/Model/CreateFleetRequest.cs +++ b/sdk/src/Services/EC2/Generated/Model/CreateFleetRequest.cs @@ -58,8 +58,8 @@ public partial class CreateFleetRequest : AmazonEC2Request private TargetCapacitySpecificationRequest _targetCapacitySpecification; private bool? _terminateInstancesWithExpiration; private FleetType _type; - private DateTime? _validFromUtc; - private DateTime? _validUntilUtc; + private DateTime? _validFrom; + private DateTime? _validUntil; /// /// Gets and sets the property ClientToken. @@ -307,123 +307,43 @@ internal bool IsSetType() } /// - /// Gets and sets the property ValidFromUtc. + /// Gets and sets the property ValidFrom. /// /// The start date and time of the request, in UTC format (for example, YYYY-MM-DDTHH:MM:SSZ). /// The default is to start fulfilling the request immediately. /// /// - public DateTime? ValidFromUtc + public DateTime? ValidFrom { - get { return this._validFromUtc; } - set { this._validFrom = this._validFromUtc = value; } + get { return this._validFrom; } + set { this._validFrom = value; } } - // Check to see if ValidFromUtc property is set - internal bool IsSetValidFromUtc() + // Check to see if ValidFrom property is set + internal bool IsSetValidFrom() { - return this._validFromUtc.HasValue; + return this._validFrom.HasValue; } /// - /// Gets and sets the property ValidUntilUtc. + /// Gets and sets the property ValidUntil. /// /// The end date and time of the request, in UTC format (for example, YYYY-MM-DDTHH:MM:SSZ). /// At this point, no new EC2 Fleet requests are placed or able to fulfill the request. /// If no value is specified, the request remains until you cancel it. /// /// - public DateTime? ValidUntilUtc + public DateTime? ValidUntil { - get { return this._validUntilUtc; } - set { this._validUntil = this._validUntilUtc = value; } + get { return this._validUntil; } + set { this._validUntil = value; } } - // Check to see if ValidUntilUtc property is set - internal bool IsSetValidUntilUtc() + // Check to see if ValidUntil property is set + internal bool IsSetValidUntil() { - return this._validUntilUtc.HasValue; + return this._validUntil.HasValue; } -#region Backwards compatible properties - private DateTime? _validFrom; - private DateTime? _validUntil; - - /// - /// Gets and sets the property ValidFromUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use ValidFromUtc instead. Setting either ValidFrom or - /// ValidFromUtc results in both ValidFrom and ValidFromUtc being assigned, the latest - /// assignment to either one of the two property is reflected in the value of both. ValidFrom - /// is provided for backwards compatibility only and assigning a non-Utc DateTime to it - /// results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The start date and time of the request, in UTC format (for example, YYYY-MM-DDTHH:MM:SSZ). - /// The default is to start fulfilling the request immediately. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use ValidFromUtc instead. Setting either ValidFrom or ValidFromUtc results in both ValidFrom and " + - "ValidFromUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. ValidFrom is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? ValidFrom - { - get { return this._validFrom.GetValueOrDefault(); } - set - { - this._validFrom = value; - if (value != null) - { - this._validFromUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._validFromUtc = null; - } - } - } - /// - /// Gets and sets the property ValidUntilUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use ValidUntilUtc instead. Setting either ValidUntil or - /// ValidUntilUtc results in both ValidUntil and ValidUntilUtc being assigned, the latest - /// assignment to either one of the two property is reflected in the value of both. ValidUntil - /// is provided for backwards compatibility only and assigning a non-Utc DateTime to it - /// results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The end date and time of the request, in UTC format (for example, YYYY-MM-DDTHH:MM:SSZ). - /// At this point, no new EC2 Fleet requests are placed or able to fulfill the request. - /// If no value is specified, the request remains until you cancel it. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use ValidUntilUtc instead. Setting either ValidUntil or ValidUntilUtc results in both ValidUntil and " + - "ValidUntilUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. ValidUntil is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? ValidUntil - { - get { return this._validUntil.GetValueOrDefault(); } - set - { - this._validUntil = value; - if (value != null) - { - this._validUntilUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._validUntilUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/EC2/Generated/Model/DescribeFleetHistoryRequest.cs b/sdk/src/Services/EC2/Generated/Model/DescribeFleetHistoryRequest.cs index 8e6daacf239b..96f8b9efc27b 100644 --- a/sdk/src/Services/EC2/Generated/Model/DescribeFleetHistoryRequest.cs +++ b/sdk/src/Services/EC2/Generated/Model/DescribeFleetHistoryRequest.cs @@ -51,7 +51,7 @@ public partial class DescribeFleetHistoryRequest : AmazonEC2Request private string _fleetId; private int? _maxResults; private string _nextToken; - private DateTime? _startTimeUtc; + private DateTime? _startTime; /// /// Gets and sets the property EventType. @@ -130,63 +130,23 @@ internal bool IsSetNextToken() } /// - /// Gets and sets the property StartTimeUtc. + /// Gets and sets the property StartTime. /// /// The start date and time for the events, in UTC format (for example, YYYY-MM-DDTHH:MM:SSZ). /// /// [AWSProperty(Required=true)] - public DateTime? StartTimeUtc + public DateTime? StartTime { - get { return this._startTimeUtc; } - set { this._startTime = this._startTimeUtc = value; } + get { return this._startTime; } + set { this._startTime = value; } } - // Check to see if StartTimeUtc property is set - internal bool IsSetStartTimeUtc() + // Check to see if StartTime property is set + internal bool IsSetStartTime() { - return this._startTimeUtc.HasValue; + return this._startTime.HasValue; } -#region Backwards compatible properties - private DateTime? _startTime; - - /// - /// Gets and sets the property StartTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use StartTimeUtc instead. Setting either StartTime or - /// StartTimeUtc results in both StartTime and StartTimeUtc being assigned, the latest - /// assignment to either one of the two property is reflected in the value of both. StartTime - /// is provided for backwards compatibility only and assigning a non-Utc DateTime to it - /// results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The start date and time for the events, in UTC format (for example, YYYY-MM-DDTHH:MM:SSZ). - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use StartTimeUtc instead. Setting either StartTime or StartTimeUtc results in both StartTime and " + - "StartTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. StartTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? StartTime - { - get { return this._startTime.GetValueOrDefault(); } - set - { - this._startTime = value; - if (value != null) - { - this._startTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._startTimeUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/EC2/Generated/Model/DescribeSpotFleetRequestHistoryRequest.cs b/sdk/src/Services/EC2/Generated/Model/DescribeSpotFleetRequestHistoryRequest.cs index 16a6d78f9618..087967be8630 100644 --- a/sdk/src/Services/EC2/Generated/Model/DescribeSpotFleetRequestHistoryRequest.cs +++ b/sdk/src/Services/EC2/Generated/Model/DescribeSpotFleetRequestHistoryRequest.cs @@ -51,7 +51,7 @@ public partial class DescribeSpotFleetRequestHistoryRequest : AmazonEC2Request private int? _maxResults; private string _nextToken; private string _spotFleetRequestId; - private DateTime? _startTimeUtc; + private DateTime? _startTime; /// /// Gets and sets the property EventType. @@ -131,63 +131,23 @@ internal bool IsSetSpotFleetRequestId() } /// - /// Gets and sets the property StartTimeUtc. + /// Gets and sets the property StartTime. /// /// The starting date and time for the events, in UTC format (for example, YYYY-MM-DDTHH:MM:SSZ). /// /// [AWSProperty(Required=true)] - public DateTime? StartTimeUtc + public DateTime? StartTime { - get { return this._startTimeUtc; } - set { this._startTime = this._startTimeUtc = value; } + get { return this._startTime; } + set { this._startTime = value; } } - // Check to see if StartTimeUtc property is set - internal bool IsSetStartTimeUtc() + // Check to see if StartTime property is set + internal bool IsSetStartTime() { - return this._startTimeUtc != null; + return this._startTime != null; } -#region Backwards compatible properties - private DateTime? _startTime; - - /// - /// Gets and sets the property StartTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use StartTimeUtc instead. Setting either StartTime or - /// StartTimeUtc results in both StartTime and StartTimeUtc being assigned, the latest - /// assignment to either one of the two property is reflected in the value of both. StartTime - /// is provided for backwards compatibility only and assigning a non-Utc DateTime to it - /// results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The starting date and time for the events, in UTC format (for example, YYYY-MM-DDTHH:MM:SSZ). - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use StartTimeUtc instead. Setting either StartTime or StartTimeUtc results in both StartTime and " + - "StartTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. StartTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? StartTime - { - get { return this._startTime.GetValueOrDefault(); } - set - { - this._startTime = value; - if (value != null) - { - this._startTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._startTimeUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/EC2/Generated/Model/DescribeSpotPriceHistoryRequest.cs b/sdk/src/Services/EC2/Generated/Model/DescribeSpotPriceHistoryRequest.cs index c3c241e436e4..0c5de2d8fc16 100644 --- a/sdk/src/Services/EC2/Generated/Model/DescribeSpotPriceHistoryRequest.cs +++ b/sdk/src/Services/EC2/Generated/Model/DescribeSpotPriceHistoryRequest.cs @@ -44,13 +44,13 @@ namespace Amazon.EC2.Model public partial class DescribeSpotPriceHistoryRequest : AmazonEC2Request { private string _availabilityZone; - private DateTime? _endTimeUtc; + private DateTime? _endTime; private List _filters = AWSConfigs.InitializeCollections ? new List() : null; private List _instanceTypes = AWSConfigs.InitializeCollections ? new List() : null; private int? _maxResults; private string _nextToken; private List _productDescriptions = AWSConfigs.InitializeCollections ? new List() : null; - private DateTime? _startTimeUtc; + private DateTime? _startTime; /// /// Gets and sets the property AvailabilityZone. @@ -71,22 +71,22 @@ internal bool IsSetAvailabilityZone() } /// - /// Gets and sets the property EndTimeUtc. + /// Gets and sets the property EndTime. /// /// The date and time, up to the current date, from which to stop retrieving the price /// history data, in UTC format (for example, YYYY-MM-DDTHH:MM:SSZ). /// /// - public DateTime? EndTimeUtc + public DateTime? EndTime { - get { return this._endTimeUtc; } - set { this._endTime = this._endTimeUtc = value; } + get { return this._endTime; } + set { this._endTime = value; } } - // Check to see if EndTimeUtc property is set - internal bool IsSetEndTimeUtc() + // Check to see if EndTime property is set + internal bool IsSetEndTime() { - return this._endTimeUtc.HasValue; + return this._endTime.HasValue; } /// @@ -210,102 +210,23 @@ internal bool IsSetProductDescriptions() } /// - /// Gets and sets the property StartTimeUtc. + /// Gets and sets the property StartTime. /// /// The date and time, up to the past 90 days, from which to start retrieving the price /// history data, in UTC format (for example, YYYY-MM-DDTHH:MM:SSZ). /// /// - public DateTime? StartTimeUtc + public DateTime? StartTime { - get { return this._startTimeUtc; } - set { this._startTime = this._startTimeUtc = value; } + get { return this._startTime; } + set { this._startTime = value; } } - // Check to see if StartTimeUtc property is set - internal bool IsSetStartTimeUtc() + // Check to see if StartTime property is set + internal bool IsSetStartTime() { - return this._startTimeUtc.HasValue; + return this._startTime.HasValue; } -#region Backwards compatible properties - private DateTime? _endTime; - private DateTime? _startTime; - - /// - /// Gets and sets the property EndTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use EndTimeUtc instead. Setting either EndTime or EndTimeUtc - /// results in both EndTime and EndTimeUtc being assigned, the latest assignment to either - /// one of the two property is reflected in the value of both. EndTime is provided for - /// backwards compatibility only and assigning a non-Utc DateTime to it results in the - /// wrong timestamp being passed to the service. - /// - /// - /// - /// The date and time, up to the current date, from which to stop retrieving the price - /// history data, in UTC format (for example, YYYY-MM-DDTHH:MM:SSZ). - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use EndTimeUtc instead. Setting either EndTime or EndTimeUtc results in both EndTime and " + - "EndTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. EndTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? EndTime - { - get { return this._endTime.GetValueOrDefault(); } - set - { - this._endTime = value; - if (value != null) - { - this._endTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._endTimeUtc = null; - } - } - } - /// - /// Gets and sets the property StartTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use StartTimeUtc instead. Setting either StartTime or - /// StartTimeUtc results in both StartTime and StartTimeUtc being assigned, the latest - /// assignment to either one of the two property is reflected in the value of both. StartTime - /// is provided for backwards compatibility only and assigning a non-Utc DateTime to it - /// results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The date and time, up to the past 90 days, from which to start retrieving the price - /// history data, in UTC format (for example, YYYY-MM-DDTHH:MM:SSZ). - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use StartTimeUtc instead. Setting either StartTime or StartTimeUtc results in both StartTime and " + - "StartTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. StartTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? StartTime - { - get { return this._startTime.GetValueOrDefault(); } - set - { - this._startTime = value; - if (value != null) - { - this._startTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._startTimeUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/CreateFleetRequestMarshaller.cs b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/CreateFleetRequestMarshaller.cs index 4f808c438d92..367cbb708220 100644 --- a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/CreateFleetRequestMarshaller.cs +++ b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/CreateFleetRequestMarshaller.cs @@ -569,13 +569,13 @@ public IRequest Marshall(CreateFleetRequest publicRequest) { request.Parameters.Add("Type", StringUtils.FromString(publicRequest.Type)); } - if(publicRequest.IsSetValidFromUtc()) + if(publicRequest.IsSetValidFrom()) { - request.Parameters.Add("ValidFrom", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.ValidFromUtc)); + request.Parameters.Add("ValidFrom", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.ValidFrom)); } - if(publicRequest.IsSetValidUntilUtc()) + if(publicRequest.IsSetValidUntil()) { - request.Parameters.Add("ValidUntil", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.ValidUntilUtc)); + request.Parameters.Add("ValidUntil", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.ValidUntil)); } } return request; diff --git a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/CreateLaunchTemplateRequestMarshaller.cs b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/CreateLaunchTemplateRequestMarshaller.cs index d6044ab53938..6b372c850ceb 100644 --- a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/CreateLaunchTemplateRequestMarshaller.cs +++ b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/CreateLaunchTemplateRequestMarshaller.cs @@ -272,9 +272,9 @@ public IRequest Marshall(CreateLaunchTemplateRequest publicRequest) { request.Parameters.Add("LaunchTemplateData" + "." + "InstanceMarketOptions" + "." + "SpotOptions" + "." + "SpotInstanceType", StringUtils.FromString(publicRequest.LaunchTemplateData.InstanceMarketOptions.SpotOptions.SpotInstanceType)); } - if(publicRequest.LaunchTemplateData.InstanceMarketOptions.SpotOptions.IsSetValidUntilUtc()) + if(publicRequest.LaunchTemplateData.InstanceMarketOptions.SpotOptions.IsSetValidUntil()) { - request.Parameters.Add("LaunchTemplateData" + "." + "InstanceMarketOptions" + "." + "SpotOptions" + "." + "ValidUntil", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.LaunchTemplateData.InstanceMarketOptions.SpotOptions.ValidUntilUtc)); + request.Parameters.Add("LaunchTemplateData" + "." + "InstanceMarketOptions" + "." + "SpotOptions" + "." + "ValidUntil", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.LaunchTemplateData.InstanceMarketOptions.SpotOptions.ValidUntil)); } } } diff --git a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/CreateLaunchTemplateVersionRequestMarshaller.cs b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/CreateLaunchTemplateVersionRequestMarshaller.cs index d1eabdff282a..7cd289a4444a 100644 --- a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/CreateLaunchTemplateVersionRequestMarshaller.cs +++ b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/CreateLaunchTemplateVersionRequestMarshaller.cs @@ -272,9 +272,9 @@ public IRequest Marshall(CreateLaunchTemplateVersionRequest publicRequest) { request.Parameters.Add("LaunchTemplateData" + "." + "InstanceMarketOptions" + "." + "SpotOptions" + "." + "SpotInstanceType", StringUtils.FromString(publicRequest.LaunchTemplateData.InstanceMarketOptions.SpotOptions.SpotInstanceType)); } - if(publicRequest.LaunchTemplateData.InstanceMarketOptions.SpotOptions.IsSetValidUntilUtc()) + if(publicRequest.LaunchTemplateData.InstanceMarketOptions.SpotOptions.IsSetValidUntil()) { - request.Parameters.Add("LaunchTemplateData" + "." + "InstanceMarketOptions" + "." + "SpotOptions" + "." + "ValidUntil", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.LaunchTemplateData.InstanceMarketOptions.SpotOptions.ValidUntilUtc)); + request.Parameters.Add("LaunchTemplateData" + "." + "InstanceMarketOptions" + "." + "SpotOptions" + "." + "ValidUntil", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.LaunchTemplateData.InstanceMarketOptions.SpotOptions.ValidUntil)); } } } diff --git a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DescribeFleetHistoryRequestMarshaller.cs b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DescribeFleetHistoryRequestMarshaller.cs index c345fbb56d8a..61d1a669d2e2 100644 --- a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DescribeFleetHistoryRequestMarshaller.cs +++ b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DescribeFleetHistoryRequestMarshaller.cs @@ -75,9 +75,9 @@ public IRequest Marshall(DescribeFleetHistoryRequest publicRequest) { request.Parameters.Add("NextToken", StringUtils.FromString(publicRequest.NextToken)); } - if(publicRequest.IsSetStartTimeUtc()) + if(publicRequest.IsSetStartTime()) { - request.Parameters.Add("StartTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartTimeUtc)); + request.Parameters.Add("StartTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartTime)); } } return request; diff --git a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DescribeScheduledInstanceAvailabilityRequestMarshaller.cs b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DescribeScheduledInstanceAvailabilityRequestMarshaller.cs index 5a16e54ab0b3..462e6d9ebb4c 100644 --- a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DescribeScheduledInstanceAvailabilityRequestMarshaller.cs +++ b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DescribeScheduledInstanceAvailabilityRequestMarshaller.cs @@ -92,13 +92,13 @@ public IRequest Marshall(DescribeScheduledInstanceAvailabilityRequest publicRequ } if(publicRequest.IsSetFirstSlotStartTimeRange()) { - if(publicRequest.FirstSlotStartTimeRange.IsSetEarliestTimeUtc()) + if(publicRequest.FirstSlotStartTimeRange.IsSetEarliestTime()) { - request.Parameters.Add("FirstSlotStartTimeRange" + "." + "EarliestTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.FirstSlotStartTimeRange.EarliestTimeUtc)); + request.Parameters.Add("FirstSlotStartTimeRange" + "." + "EarliestTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.FirstSlotStartTimeRange.EarliestTime)); } - if(publicRequest.FirstSlotStartTimeRange.IsSetLatestTimeUtc()) + if(publicRequest.FirstSlotStartTimeRange.IsSetLatestTime()) { - request.Parameters.Add("FirstSlotStartTimeRange" + "." + "LatestTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.FirstSlotStartTimeRange.LatestTimeUtc)); + request.Parameters.Add("FirstSlotStartTimeRange" + "." + "LatestTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.FirstSlotStartTimeRange.LatestTime)); } } if(publicRequest.IsSetMaxResults()) diff --git a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DescribeScheduledInstancesRequestMarshaller.cs b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DescribeScheduledInstancesRequestMarshaller.cs index 215802011ac6..8605b55f1c6d 100644 --- a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DescribeScheduledInstancesRequestMarshaller.cs +++ b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DescribeScheduledInstancesRequestMarshaller.cs @@ -114,13 +114,13 @@ public IRequest Marshall(DescribeScheduledInstancesRequest publicRequest) } if(publicRequest.IsSetSlotStartTimeRange()) { - if(publicRequest.SlotStartTimeRange.IsSetEarliestTimeUtc()) + if(publicRequest.SlotStartTimeRange.IsSetEarliestTime()) { - request.Parameters.Add("SlotStartTimeRange" + "." + "EarliestTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.SlotStartTimeRange.EarliestTimeUtc)); + request.Parameters.Add("SlotStartTimeRange" + "." + "EarliestTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.SlotStartTimeRange.EarliestTime)); } - if(publicRequest.SlotStartTimeRange.IsSetLatestTimeUtc()) + if(publicRequest.SlotStartTimeRange.IsSetLatestTime()) { - request.Parameters.Add("SlotStartTimeRange" + "." + "LatestTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.SlotStartTimeRange.LatestTimeUtc)); + request.Parameters.Add("SlotStartTimeRange" + "." + "LatestTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.SlotStartTimeRange.LatestTime)); } } } diff --git a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DescribeSpotFleetRequestHistoryRequestMarshaller.cs b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DescribeSpotFleetRequestHistoryRequestMarshaller.cs index 190ded1bc475..060d217ef986 100644 --- a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DescribeSpotFleetRequestHistoryRequestMarshaller.cs +++ b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DescribeSpotFleetRequestHistoryRequestMarshaller.cs @@ -75,9 +75,9 @@ public IRequest Marshall(DescribeSpotFleetRequestHistoryRequest publicRequest) { request.Parameters.Add("SpotFleetRequestId", StringUtils.FromString(publicRequest.SpotFleetRequestId)); } - if(publicRequest.IsSetStartTimeUtc()) + if(publicRequest.IsSetStartTime()) { - request.Parameters.Add("StartTime", Amazon.EC2.Internal.CustomMarshallTransformations.ConvertDateTimeISOWithoutMillisecondsUtc(publicRequest.StartTimeUtc)); + request.Parameters.Add("StartTime", Amazon.Runtime.Internal.Util.StringUtils.FromDateTimeToISO8601NoMs(publicRequest.StartTime)); } } return request; diff --git a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DescribeSpotPriceHistoryRequestMarshaller.cs b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DescribeSpotPriceHistoryRequestMarshaller.cs index 8887865977c5..d0520a627ba6 100644 --- a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DescribeSpotPriceHistoryRequestMarshaller.cs +++ b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/DescribeSpotPriceHistoryRequestMarshaller.cs @@ -63,9 +63,9 @@ public IRequest Marshall(DescribeSpotPriceHistoryRequest publicRequest) { request.Parameters.Add("AvailabilityZone", StringUtils.FromString(publicRequest.AvailabilityZone)); } - if(publicRequest.IsSetEndTimeUtc()) + if(publicRequest.IsSetEndTime()) { - request.Parameters.Add("EndTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndTimeUtc)); + request.Parameters.Add("EndTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndTime)); } if(publicRequest.IsSetFilters()) { @@ -134,9 +134,9 @@ public IRequest Marshall(DescribeSpotPriceHistoryRequest publicRequest) } } } - if(publicRequest.IsSetStartTimeUtc()) + if(publicRequest.IsSetStartTime()) { - request.Parameters.Add("StartTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartTimeUtc)); + request.Parameters.Add("StartTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartTime)); } } return request; diff --git a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/ImportImageRequestMarshaller.cs b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/ImportImageRequestMarshaller.cs index f4c79ae5ca61..92f0ad4b503a 100644 --- a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/ImportImageRequestMarshaller.cs +++ b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/ImportImageRequestMarshaller.cs @@ -73,17 +73,17 @@ public IRequest Marshall(ImportImageRequest publicRequest) { request.Parameters.Add("ClientData" + "." + "Comment", StringUtils.FromString(publicRequest.ClientData.Comment)); } - if(publicRequest.ClientData.IsSetUploadEndUtc()) + if(publicRequest.ClientData.IsSetUploadEnd()) { - request.Parameters.Add("ClientData" + "." + "UploadEnd", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.ClientData.UploadEndUtc)); + request.Parameters.Add("ClientData" + "." + "UploadEnd", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.ClientData.UploadEnd)); } if(publicRequest.ClientData.IsSetUploadSize()) { request.Parameters.Add("ClientData" + "." + "UploadSize", StringUtils.FromDouble(publicRequest.ClientData.UploadSize)); } - if(publicRequest.ClientData.IsSetUploadStartUtc()) + if(publicRequest.ClientData.IsSetUploadStart()) { - request.Parameters.Add("ClientData" + "." + "UploadStart", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.ClientData.UploadStartUtc)); + request.Parameters.Add("ClientData" + "." + "UploadStart", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.ClientData.UploadStart)); } } if(publicRequest.IsSetClientToken()) diff --git a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/ImportSnapshotRequestMarshaller.cs b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/ImportSnapshotRequestMarshaller.cs index 7557bcbfbdf8..6cd13a3dcb47 100644 --- a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/ImportSnapshotRequestMarshaller.cs +++ b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/ImportSnapshotRequestMarshaller.cs @@ -65,17 +65,17 @@ public IRequest Marshall(ImportSnapshotRequest publicRequest) { request.Parameters.Add("ClientData" + "." + "Comment", StringUtils.FromString(publicRequest.ClientData.Comment)); } - if(publicRequest.ClientData.IsSetUploadEndUtc()) + if(publicRequest.ClientData.IsSetUploadEnd()) { - request.Parameters.Add("ClientData" + "." + "UploadEnd", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.ClientData.UploadEndUtc)); + request.Parameters.Add("ClientData" + "." + "UploadEnd", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.ClientData.UploadEnd)); } if(publicRequest.ClientData.IsSetUploadSize()) { request.Parameters.Add("ClientData" + "." + "UploadSize", StringUtils.FromDouble(publicRequest.ClientData.UploadSize)); } - if(publicRequest.ClientData.IsSetUploadStartUtc()) + if(publicRequest.ClientData.IsSetUploadStart()) { - request.Parameters.Add("ClientData" + "." + "UploadStart", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.ClientData.UploadStartUtc)); + request.Parameters.Add("ClientData" + "." + "UploadStart", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.ClientData.UploadStart)); } } if(publicRequest.IsSetClientToken()) diff --git a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/ReportInstanceStatusRequestMarshaller.cs b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/ReportInstanceStatusRequestMarshaller.cs index 8f493bf37383..8bab0b14f44a 100644 --- a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/ReportInstanceStatusRequestMarshaller.cs +++ b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/ReportInstanceStatusRequestMarshaller.cs @@ -63,9 +63,9 @@ public IRequest Marshall(ReportInstanceStatusRequest publicRequest) { request.Parameters.Add("Description", StringUtils.FromString(publicRequest.Description)); } - if(publicRequest.IsSetEndTimeUtc()) + if(publicRequest.IsSetEndTime()) { - request.Parameters.Add("EndTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndTimeUtc)); + request.Parameters.Add("EndTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndTime)); } if(publicRequest.IsSetInstances()) { @@ -95,9 +95,9 @@ public IRequest Marshall(ReportInstanceStatusRequest publicRequest) } } } - if(publicRequest.IsSetStartTimeUtc()) + if(publicRequest.IsSetStartTime()) { - request.Parameters.Add("StartTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartTimeUtc)); + request.Parameters.Add("StartTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartTime)); } if(publicRequest.IsSetStatus()) { diff --git a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/RequestSpotFleetRequestMarshaller.cs b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/RequestSpotFleetRequestMarshaller.cs index 346d8696c53c..45f18084156e 100644 --- a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/RequestSpotFleetRequestMarshaller.cs +++ b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/RequestSpotFleetRequestMarshaller.cs @@ -1186,13 +1186,13 @@ public IRequest Marshall(RequestSpotFleetRequest publicRequest) { request.Parameters.Add("SpotFleetRequestConfig" + "." + "Type", StringUtils.FromString(publicRequest.SpotFleetRequestConfig.Type)); } - if(publicRequest.SpotFleetRequestConfig.IsSetValidFromUtc()) + if(publicRequest.SpotFleetRequestConfig.IsSetValidFrom()) { - request.Parameters.Add("SpotFleetRequestConfig" + "." + "ValidFrom", Amazon.EC2.Internal.CustomMarshallTransformations.ConvertDateTimeISOWithoutMillisecondsUtc(publicRequest.SpotFleetRequestConfig.ValidFromUtc)); + request.Parameters.Add("SpotFleetRequestConfig" + "." + "ValidFrom", Amazon.Runtime.Internal.Util.StringUtils.FromDateTimeToISO8601NoMs(publicRequest.SpotFleetRequestConfig.ValidFrom)); } - if(publicRequest.SpotFleetRequestConfig.IsSetValidUntilUtc()) + if(publicRequest.SpotFleetRequestConfig.IsSetValidUntil()) { - request.Parameters.Add("SpotFleetRequestConfig" + "." + "ValidUntil", Amazon.EC2.Internal.CustomMarshallTransformations.ConvertDateTimeISOWithoutMillisecondsUtc(publicRequest.SpotFleetRequestConfig.ValidUntilUtc)); + request.Parameters.Add("SpotFleetRequestConfig" + "." + "ValidUntil", Amazon.Runtime.Internal.Util.StringUtils.FromDateTimeToISO8601NoMs(publicRequest.SpotFleetRequestConfig.ValidUntil)); } } } diff --git a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/RequestSpotInstancesRequestMarshaller.cs b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/RequestSpotInstancesRequestMarshaller.cs index d49ff6b9f2dc..982dce0e37f1 100644 --- a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/RequestSpotInstancesRequestMarshaller.cs +++ b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/RequestSpotInstancesRequestMarshaller.cs @@ -454,13 +454,13 @@ public IRequest Marshall(RequestSpotInstancesRequest publicRequest) { request.Parameters.Add("Type", StringUtils.FromString(publicRequest.Type)); } - if(publicRequest.IsSetValidFromUtc()) + if(publicRequest.IsSetValidFrom()) { - request.Parameters.Add("ValidFrom", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.ValidFromUtc)); + request.Parameters.Add("ValidFrom", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.ValidFrom)); } - if(publicRequest.IsSetValidUntilUtc()) + if(publicRequest.IsSetValidUntil()) { - request.Parameters.Add("ValidUntil", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.ValidUntilUtc)); + request.Parameters.Add("ValidUntil", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.ValidUntil)); } } return request; diff --git a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/RunInstancesRequestMarshaller.cs b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/RunInstancesRequestMarshaller.cs index 8d26e465cea6..f9902eb7fd2a 100644 --- a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/RunInstancesRequestMarshaller.cs +++ b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/RunInstancesRequestMarshaller.cs @@ -286,9 +286,9 @@ public IRequest Marshall(RunInstancesRequest publicRequest) { request.Parameters.Add("InstanceMarketOptions" + "." + "SpotOptions" + "." + "SpotInstanceType", StringUtils.FromString(publicRequest.InstanceMarketOptions.SpotOptions.SpotInstanceType)); } - if(publicRequest.InstanceMarketOptions.SpotOptions.IsSetValidUntilUtc()) + if(publicRequest.InstanceMarketOptions.SpotOptions.IsSetValidUntil()) { - request.Parameters.Add("InstanceMarketOptions" + "." + "SpotOptions" + "." + "ValidUntil", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.InstanceMarketOptions.SpotOptions.ValidUntilUtc)); + request.Parameters.Add("InstanceMarketOptions" + "." + "SpotOptions" + "." + "ValidUntil", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.InstanceMarketOptions.SpotOptions.ValidUntil)); } } } diff --git a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/SpotFleetRequestConfigDataUnmarshaller.cs b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/SpotFleetRequestConfigDataUnmarshaller.cs index 03544900d4d5..4f25195ecf58 100644 --- a/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/SpotFleetRequestConfigDataUnmarshaller.cs +++ b/sdk/src/Services/EC2/Generated/Model/Internal/MarshallTransformations/SpotFleetRequestConfigDataUnmarshaller.cs @@ -217,13 +217,13 @@ public SpotFleetRequestConfigData Unmarshall(XmlUnmarshallerContext context) if (context.TestExpression("validFrom", targetDepth)) { var unmarshaller = NullableDateTimeUnmarshaller.Instance; - unmarshalledObject.ValidFromUtc = unmarshaller.Unmarshall(context); + unmarshalledObject.ValidFrom = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("validUntil", targetDepth)) { var unmarshaller = NullableDateTimeUnmarshaller.Instance; - unmarshalledObject.ValidUntilUtc = unmarshaller.Unmarshall(context); + unmarshalledObject.ValidUntil = unmarshaller.Unmarshall(context); continue; } } diff --git a/sdk/src/Services/EC2/Generated/Model/LaunchTemplateSpotMarketOptionsRequest.cs b/sdk/src/Services/EC2/Generated/Model/LaunchTemplateSpotMarketOptionsRequest.cs index 670850fca0b1..bd15d542f5e5 100644 --- a/sdk/src/Services/EC2/Generated/Model/LaunchTemplateSpotMarketOptionsRequest.cs +++ b/sdk/src/Services/EC2/Generated/Model/LaunchTemplateSpotMarketOptionsRequest.cs @@ -38,7 +38,7 @@ public partial class LaunchTemplateSpotMarketOptionsRequest private InstanceInterruptionBehavior _instanceInterruptionBehavior; private string _maxPrice; private SpotInstanceType _spotInstanceType; - private DateTime? _validUntilUtc; + private DateTime? _validUntil; /// /// Gets and sets the property BlockDurationMinutes. @@ -121,7 +121,7 @@ internal bool IsSetSpotInstanceType() } /// - /// Gets and sets the property ValidUntilUtc. + /// Gets and sets the property ValidUntil. /// /// The end date of the request, in UTC format (YYYY-MM-DDTHH:MM:SSZ). Supported /// only for persistent requests. @@ -141,72 +141,17 @@ internal bool IsSetSpotInstanceType() /// Default: 7 days from the current date /// /// - public DateTime? ValidUntilUtc + public DateTime? ValidUntil { - get { return this._validUntilUtc; } - set { this._validUntil = this._validUntilUtc = value; } + get { return this._validUntil; } + set { this._validUntil = value; } } - // Check to see if ValidUntilUtc property is set - internal bool IsSetValidUntilUtc() + // Check to see if ValidUntil property is set + internal bool IsSetValidUntil() { - return this._validUntilUtc.HasValue; + return this._validUntil.HasValue; } -#region Backwards compatible properties - private DateTime? _validUntil; - - /// - /// Gets and sets the property ValidUntilUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use ValidUntilUtc instead. Setting either ValidUntil or - /// ValidUntilUtc results in both ValidUntil and ValidUntilUtc being assigned, the latest - /// assignment to either one of the two property is reflected in the value of both. ValidUntil - /// is provided for backwards compatibility only and assigning a non-Utc DateTime to it - /// results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The end date of the request, in UTC format (YYYY-MM-DDTHH:MM:SSZ). Supported - /// only for persistent requests. - /// - ///
  • - /// - /// For a persistent request, the request remains active until the ValidUntil date - /// and time is reached. Otherwise, the request remains active until you cancel it. - /// - ///
  • - /// - /// For a one-time request, ValidUntil is not supported. The request remains active - /// until all instances launch or you cancel the request. - /// - ///
- /// - /// Default: 7 days from the current date - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use ValidUntilUtc instead. Setting either ValidUntil or ValidUntilUtc results in both ValidUntil and " + - "ValidUntilUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. ValidUntil is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? ValidUntil - { - get { return this._validUntil.GetValueOrDefault(); } - set - { - this._validUntil = value; - if (value != null) - { - this._validUntilUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._validUntilUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/EC2/Generated/Model/ReportInstanceStatusRequest.cs b/sdk/src/Services/EC2/Generated/Model/ReportInstanceStatusRequest.cs index 417de3bb440b..b30f80bd6773 100644 --- a/sdk/src/Services/EC2/Generated/Model/ReportInstanceStatusRequest.cs +++ b/sdk/src/Services/EC2/Generated/Model/ReportInstanceStatusRequest.cs @@ -45,10 +45,10 @@ namespace Amazon.EC2.Model public partial class ReportInstanceStatusRequest : AmazonEC2Request { private string _description; - private DateTime? _endTimeUtc; + private DateTime? _endTime; private List _instances = AWSConfigs.InitializeCollections ? new List() : null; private List _reasonCodes = AWSConfigs.InitializeCollections ? new List() : null; - private DateTime? _startTimeUtc; + private DateTime? _startTime; private ReportStatusType _status; /// @@ -72,21 +72,21 @@ internal bool IsSetDescription() } /// - /// Gets and sets the property EndTimeUtc. + /// Gets and sets the property EndTime. /// /// The time at which the reported instance health state ended. /// /// - public DateTime? EndTimeUtc + public DateTime? EndTime { - get { return this._endTimeUtc; } - set { this._endTime = this._endTimeUtc = value; } + get { return this._endTime; } + set { this._endTime = value; } } - // Check to see if EndTimeUtc property is set - internal bool IsSetEndTimeUtc() + // Check to see if EndTime property is set + internal bool IsSetEndTime() { - return this._endTimeUtc.HasValue; + return this._endTime.HasValue; } /// @@ -168,21 +168,21 @@ internal bool IsSetReasonCodes() } /// - /// Gets and sets the property StartTimeUtc. + /// Gets and sets the property StartTime. /// /// The time at which the reported instance health state began. /// /// - public DateTime? StartTimeUtc + public DateTime? StartTime { - get { return this._startTimeUtc; } - set { this._startTime = this._startTimeUtc = value; } + get { return this._startTime; } + set { this._startTime = value; } } - // Check to see if StartTimeUtc property is set - internal bool IsSetStartTimeUtc() + // Check to see if StartTime property is set + internal bool IsSetStartTime() { - return this._startTimeUtc.HasValue; + return this._startTime.HasValue; } /// @@ -204,82 +204,5 @@ internal bool IsSetStatus() return this._status != null; } -#region Backwards compatible properties - private DateTime? _endTime; - private DateTime? _startTime; - - /// - /// Gets and sets the property EndTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use EndTimeUtc instead. Setting either EndTime or EndTimeUtc - /// results in both EndTime and EndTimeUtc being assigned, the latest assignment to either - /// one of the two property is reflected in the value of both. EndTime is provided for - /// backwards compatibility only and assigning a non-Utc DateTime to it results in the - /// wrong timestamp being passed to the service. - /// - /// - /// - /// The time at which the reported instance health state ended. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use EndTimeUtc instead. Setting either EndTime or EndTimeUtc results in both EndTime and " + - "EndTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. EndTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? EndTime - { - get { return this._endTime.GetValueOrDefault(); } - set - { - this._endTime = value; - if (value != null) - { - this._endTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._endTimeUtc = null; - } - } - } - /// - /// Gets and sets the property StartTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use StartTimeUtc instead. Setting either StartTime or - /// StartTimeUtc results in both StartTime and StartTimeUtc being assigned, the latest - /// assignment to either one of the two property is reflected in the value of both. StartTime - /// is provided for backwards compatibility only and assigning a non-Utc DateTime to it - /// results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The time at which the reported instance health state began. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use StartTimeUtc instead. Setting either StartTime or StartTimeUtc results in both StartTime and " + - "StartTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. StartTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? StartTime - { - get { return this._startTime.GetValueOrDefault(); } - set - { - this._startTime = value; - if (value != null) - { - this._startTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._startTimeUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/EC2/Generated/Model/RequestSpotInstancesRequest.cs b/sdk/src/Services/EC2/Generated/Model/RequestSpotInstancesRequest.cs index 26299599cc00..77c375ffc659 100644 --- a/sdk/src/Services/EC2/Generated/Model/RequestSpotInstancesRequest.cs +++ b/sdk/src/Services/EC2/Generated/Model/RequestSpotInstancesRequest.cs @@ -58,8 +58,8 @@ public partial class RequestSpotInstancesRequest : AmazonEC2Request private string _spotPrice; private List _tagSpecifications = AWSConfigs.InitializeCollections ? new List() : null; private SpotInstanceType _type; - private DateTime? _validFromUtc; - private DateTime? _validUntilUtc; + private DateTime? _validFrom; + private DateTime? _validUntil; /// /// Empty constructor used to set properties independently even when a simple constructor is available @@ -306,7 +306,7 @@ internal bool IsSetType() } /// - /// Gets and sets the property ValidFromUtc. + /// Gets and sets the property ValidFrom. /// /// The start date of the request. If this is a one-time request, the request becomes /// active at this date and time and remains active until all instances launch, the request @@ -319,20 +319,20 @@ internal bool IsSetType() /// must specify a start date and time that occurs after the current date and time. /// /// - public DateTime? ValidFromUtc + public DateTime? ValidFrom { - get { return this._validFromUtc; } - set { this._validFrom = this._validFromUtc = value; } + get { return this._validFrom; } + set { this._validFrom = value; } } - // Check to see if ValidFromUtc property is set - internal bool IsSetValidFromUtc() + // Check to see if ValidFrom property is set + internal bool IsSetValidFrom() { - return this._validFromUtc.HasValue; + return this._validFrom.HasValue; } /// - /// Gets and sets the property ValidUntilUtc. + /// Gets and sets the property ValidUntil. /// /// The end date of the request, in UTC format (YYYY-MM-DDTHH:MM:SSZ). /// @@ -349,114 +349,17 @@ internal bool IsSetValidFromUtc() /// /// /// - public DateTime? ValidUntilUtc + public DateTime? ValidUntil { - get { return this._validUntilUtc; } - set { this._validUntil = this._validUntilUtc = value; } + get { return this._validUntil; } + set { this._validUntil = value; } } - // Check to see if ValidUntilUtc property is set - internal bool IsSetValidUntilUtc() + // Check to see if ValidUntil property is set + internal bool IsSetValidUntil() { - return this._validUntilUtc.HasValue; + return this._validUntil.HasValue; } -#region Backwards compatible properties - private DateTime? _validFrom; - private DateTime? _validUntil; - - /// - /// Gets and sets the property ValidFromUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use ValidFromUtc instead. Setting either ValidFrom or - /// ValidFromUtc results in both ValidFrom and ValidFromUtc being assigned, the latest - /// assignment to either one of the two property is reflected in the value of both. ValidFrom - /// is provided for backwards compatibility only and assigning a non-Utc DateTime to it - /// results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The start date of the request. If this is a one-time request, the request becomes - /// active at this date and time and remains active until all instances launch, the request - /// expires, or the request is canceled. If the request is persistent, the request becomes - /// active at this date and time and remains active until it expires or is canceled. - /// - /// - /// - /// The specified start date and time cannot be equal to the current date and time. You - /// must specify a start date and time that occurs after the current date and time. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use ValidFromUtc instead. Setting either ValidFrom or ValidFromUtc results in both ValidFrom and " + - "ValidFromUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. ValidFrom is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? ValidFrom - { - get { return this._validFrom.GetValueOrDefault(); } - set - { - this._validFrom = value; - if (value != null) - { - this._validFromUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._validFromUtc = null; - } - } - } - /// - /// Gets and sets the property ValidUntilUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use ValidUntilUtc instead. Setting either ValidUntil or - /// ValidUntilUtc results in both ValidUntil and ValidUntilUtc being assigned, the latest - /// assignment to either one of the two property is reflected in the value of both. ValidUntil - /// is provided for backwards compatibility only and assigning a non-Utc DateTime to it - /// results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The end date of the request, in UTC format (YYYY-MM-DDTHH:MM:SSZ). - /// - ///
  • - /// - /// For a persistent request, the request remains active until the ValidUntil date - /// and time is reached. Otherwise, the request remains active until you cancel it. - /// - ///
  • - /// - /// For a one-time request, the request remains active until all instances launch, the - /// request is canceled, or the ValidUntil date and time is reached. By default, - /// the request is valid for 7 days from the date the request was created. - /// - ///
- /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use ValidUntilUtc instead. Setting either ValidUntil or ValidUntilUtc results in both ValidUntil and " + - "ValidUntilUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. ValidUntil is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? ValidUntil - { - get { return this._validUntil.GetValueOrDefault(); } - set - { - this._validUntil = value; - if (value != null) - { - this._validUntilUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._validUntilUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/EC2/Generated/Model/SlotDateTimeRangeRequest.cs b/sdk/src/Services/EC2/Generated/Model/SlotDateTimeRangeRequest.cs index 796e5c3ae332..2e7b3293207a 100644 --- a/sdk/src/Services/EC2/Generated/Model/SlotDateTimeRangeRequest.cs +++ b/sdk/src/Services/EC2/Generated/Model/SlotDateTimeRangeRequest.cs @@ -35,125 +35,47 @@ namespace Amazon.EC2.Model /// public partial class SlotDateTimeRangeRequest { - private DateTime? _earliestTimeUtc; - private DateTime? _latestTimeUtc; + private DateTime? _earliestTime; + private DateTime? _latestTime; /// - /// Gets and sets the property EarliestTimeUtc. + /// Gets and sets the property EarliestTime. /// /// The earliest date and time, in UTC, for the Scheduled Instance to start. /// /// [AWSProperty(Required=true)] - public DateTime? EarliestTimeUtc + public DateTime? EarliestTime { - get { return this._earliestTimeUtc; } - set { this._earliestTime = this._earliestTimeUtc = value; } + get { return this._earliestTime; } + set { this._earliestTime = value; } } - // Check to see if EarliestTimeUtc property is set - internal bool IsSetEarliestTimeUtc() + // Check to see if EarliestTime property is set + internal bool IsSetEarliestTime() { - return this._earliestTimeUtc.HasValue; + return this._earliestTime.HasValue; } /// - /// Gets and sets the property LatestTimeUtc. + /// Gets and sets the property LatestTime. /// /// The latest date and time, in UTC, for the Scheduled Instance to start. This value /// must be later than or equal to the earliest date and at most three months in the future. /// /// [AWSProperty(Required=true)] - public DateTime? LatestTimeUtc + public DateTime? LatestTime { - get { return this._latestTimeUtc; } - set { this._latestTime = this._latestTimeUtc = value; } + get { return this._latestTime; } + set { this._latestTime = value; } } - // Check to see if LatestTimeUtc property is set - internal bool IsSetLatestTimeUtc() + // Check to see if LatestTime property is set + internal bool IsSetLatestTime() { - return this._latestTimeUtc.HasValue; + return this._latestTime.HasValue; } -#region Backwards compatible properties - private DateTime? _earliestTime; - private DateTime? _latestTime; - - /// - /// Gets and sets the property EarliestTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use EarliestTimeUtc instead. Setting either EarliestTime - /// or EarliestTimeUtc results in both EarliestTime and EarliestTimeUtc being assigned, - /// the latest assignment to either one of the two property is reflected in the value - /// of both. EarliestTime is provided for backwards compatibility only and assigning a - /// non-Utc DateTime to it results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The earliest date and time, in UTC, for the Scheduled Instance to start. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use EarliestTimeUtc instead. Setting either EarliestTime or EarliestTimeUtc results in both EarliestTime and " + - "EarliestTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. EarliestTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? EarliestTime - { - get { return this._earliestTime.GetValueOrDefault(); } - set - { - this._earliestTime = value; - if (value != null) - { - this._earliestTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._earliestTimeUtc = null; - } - } - } - /// - /// Gets and sets the property LatestTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use LatestTimeUtc instead. Setting either LatestTime or - /// LatestTimeUtc results in both LatestTime and LatestTimeUtc being assigned, the latest - /// assignment to either one of the two property is reflected in the value of both. LatestTime - /// is provided for backwards compatibility only and assigning a non-Utc DateTime to it - /// results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The latest date and time, in UTC, for the Scheduled Instance to start. This value - /// must be later than or equal to the earliest date and at most three months in the future. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use LatestTimeUtc instead. Setting either LatestTime or LatestTimeUtc results in both LatestTime and " + - "LatestTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. LatestTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? LatestTime - { - get { return this._latestTime.GetValueOrDefault(); } - set - { - this._latestTime = value; - if (value != null) - { - this._latestTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._latestTimeUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/EC2/Generated/Model/SlotStartTimeRangeRequest.cs b/sdk/src/Services/EC2/Generated/Model/SlotStartTimeRangeRequest.cs index 058c50434778..06f08764ddb0 100644 --- a/sdk/src/Services/EC2/Generated/Model/SlotStartTimeRangeRequest.cs +++ b/sdk/src/Services/EC2/Generated/Model/SlotStartTimeRangeRequest.cs @@ -34,121 +34,44 @@ namespace Amazon.EC2.Model /// public partial class SlotStartTimeRangeRequest { - private DateTime? _earliestTimeUtc; - private DateTime? _latestTimeUtc; + private DateTime? _earliestTime; + private DateTime? _latestTime; /// - /// Gets and sets the property EarliestTimeUtc. + /// Gets and sets the property EarliestTime. /// /// The earliest date and time, in UTC, for the Scheduled Instance to start. /// /// - public DateTime? EarliestTimeUtc + public DateTime? EarliestTime { - get { return this._earliestTimeUtc; } - set { this._earliestTime = this._earliestTimeUtc = value; } + get { return this._earliestTime; } + set { this._earliestTime = value; } } - // Check to see if EarliestTimeUtc property is set - internal bool IsSetEarliestTimeUtc() + // Check to see if EarliestTime property is set + internal bool IsSetEarliestTime() { - return this._earliestTimeUtc.HasValue; + return this._earliestTime.HasValue; } /// - /// Gets and sets the property LatestTimeUtc. + /// Gets and sets the property LatestTime. /// /// The latest date and time, in UTC, for the Scheduled Instance to start. /// /// - public DateTime? LatestTimeUtc + public DateTime? LatestTime { - get { return this._latestTimeUtc; } - set { this._latestTime = this._latestTimeUtc = value; } + get { return this._latestTime; } + set { this._latestTime = value; } } - // Check to see if LatestTimeUtc property is set - internal bool IsSetLatestTimeUtc() + // Check to see if LatestTime property is set + internal bool IsSetLatestTime() { - return this._latestTimeUtc.HasValue; + return this._latestTime.HasValue; } -#region Backwards compatible properties - private DateTime? _earliestTime; - private DateTime? _latestTime; - - /// - /// Gets and sets the property EarliestTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use EarliestTimeUtc instead. Setting either EarliestTime - /// or EarliestTimeUtc results in both EarliestTime and EarliestTimeUtc being assigned, - /// the latest assignment to either one of the two property is reflected in the value - /// of both. EarliestTime is provided for backwards compatibility only and assigning a - /// non-Utc DateTime to it results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The earliest date and time, in UTC, for the Scheduled Instance to start. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use EarliestTimeUtc instead. Setting either EarliestTime or EarliestTimeUtc results in both EarliestTime and " + - "EarliestTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. EarliestTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? EarliestTime - { - get { return this._earliestTime.GetValueOrDefault(); } - set - { - this._earliestTime = value; - if (value != null) - { - this._earliestTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._earliestTimeUtc = null; - } - } - } - /// - /// Gets and sets the property LatestTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use LatestTimeUtc instead. Setting either LatestTime or - /// LatestTimeUtc results in both LatestTime and LatestTimeUtc being assigned, the latest - /// assignment to either one of the two property is reflected in the value of both. LatestTime - /// is provided for backwards compatibility only and assigning a non-Utc DateTime to it - /// results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The latest date and time, in UTC, for the Scheduled Instance to start. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use LatestTimeUtc instead. Setting either LatestTime or LatestTimeUtc results in both LatestTime and " + - "LatestTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. LatestTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? LatestTime - { - get { return this._latestTime.GetValueOrDefault(); } - set - { - this._latestTime = value; - if (value != null) - { - this._latestTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._latestTimeUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/EC2/Generated/Model/SpotFleetRequestConfigData.cs b/sdk/src/Services/EC2/Generated/Model/SpotFleetRequestConfigData.cs index 449985a5544b..408a62fdb38c 100644 --- a/sdk/src/Services/EC2/Generated/Model/SpotFleetRequestConfigData.cs +++ b/sdk/src/Services/EC2/Generated/Model/SpotFleetRequestConfigData.cs @@ -58,8 +58,8 @@ public partial class SpotFleetRequestConfigData private TargetCapacityUnitType _targetCapacityUnitType; private bool? _terminateInstancesWithExpiration; private FleetType _type; - private DateTime? _validFromUtc; - private DateTime? _validUntilUtc; + private DateTime? _validFrom; + private DateTime? _validUntil; /// /// Gets and sets the property AllocationStrategy. @@ -661,26 +661,26 @@ internal bool IsSetType() } /// - /// Gets and sets the property ValidFromUtc. + /// Gets and sets the property ValidFrom. /// /// The start date and time of the request, in UTC format (YYYY-MM-DDTHH:MM:SSZ). /// By default, Amazon EC2 starts fulfilling the request immediately. /// /// - public DateTime? ValidFromUtc + public DateTime? ValidFrom { - get { return this._validFromUtc; } - set { this._validFrom = this._validFromUtc = value; } + get { return this._validFrom; } + set { this._validFrom = value; } } - // Check to see if ValidFromUtc property is set - internal bool IsSetValidFromUtc() + // Check to see if ValidFrom property is set + internal bool IsSetValidFrom() { - return this._validFromUtc != null; + return this._validFrom != null; } /// - /// Gets and sets the property ValidUntilUtc. + /// Gets and sets the property ValidUntil. /// /// The end date and time of the request, in UTC format (YYYY-MM-DDTHH:MM:SSZ). /// After the end date and time, no new Spot Instance requests are placed or able to fulfill @@ -688,98 +688,17 @@ internal bool IsSetValidFromUtc() /// it. /// /// - public DateTime? ValidUntilUtc + public DateTime? ValidUntil { - get { return this._validUntilUtc; } - set { this._validUntil = this._validUntilUtc = value; } + get { return this._validUntil; } + set { this._validUntil = value; } } - // Check to see if ValidUntilUtc property is set - internal bool IsSetValidUntilUtc() + // Check to see if ValidUntil property is set + internal bool IsSetValidUntil() { - return this._validUntilUtc != null; + return this._validUntil != null; } -#region Backwards compatible properties - private DateTime? _validFrom; - private DateTime? _validUntil; - - /// - /// Gets and sets the property ValidFromUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use ValidFromUtc instead. Setting either ValidFrom or - /// ValidFromUtc results in both ValidFrom and ValidFromUtc being assigned, the latest - /// assignment to either one of the two property is reflected in the value of both. ValidFrom - /// is provided for backwards compatibility only and assigning a non-Utc DateTime to it - /// results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The start date and time of the request, in UTC format (YYYY-MM-DDTHH:MM:SSZ). - /// By default, Amazon EC2 starts fulfilling the request immediately. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use ValidFromUtc instead. Setting either ValidFrom or ValidFromUtc results in both ValidFrom and " + - "ValidFromUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. ValidFrom is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? ValidFrom - { - get { return this._validFrom.GetValueOrDefault(); } - set - { - this._validFrom = value; - if (value != null) - { - this._validFromUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._validFromUtc = null; - } - } - } - /// - /// Gets and sets the property ValidUntilUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use ValidUntilUtc instead. Setting either ValidUntil or - /// ValidUntilUtc results in both ValidUntil and ValidUntilUtc being assigned, the latest - /// assignment to either one of the two property is reflected in the value of both. ValidUntil - /// is provided for backwards compatibility only and assigning a non-Utc DateTime to it - /// results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The end date and time of the request, in UTC format (YYYY-MM-DDTHH:MM:SSZ). - /// After the end date and time, no new Spot Instance requests are placed or able to fulfill - /// the request. If no value is specified, the Spot Fleet request remains until you cancel - /// it. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use ValidUntilUtc instead. Setting either ValidUntil or ValidUntilUtc results in both ValidUntil and " + - "ValidUntilUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. ValidUntil is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? ValidUntil - { - get { return this._validUntil.GetValueOrDefault(); } - set - { - this._validUntil = value; - if (value != null) - { - this._validUntilUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._validUntilUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/EC2/Generated/Model/SpotMarketOptions.cs b/sdk/src/Services/EC2/Generated/Model/SpotMarketOptions.cs index 007031756aa7..f048b47e0a4a 100644 --- a/sdk/src/Services/EC2/Generated/Model/SpotMarketOptions.cs +++ b/sdk/src/Services/EC2/Generated/Model/SpotMarketOptions.cs @@ -38,7 +38,7 @@ public partial class SpotMarketOptions private InstanceInterruptionBehavior _instanceInterruptionBehavior; private string _maxPrice; private SpotInstanceType _spotInstanceType; - private DateTime? _validUntilUtc; + private DateTime? _validUntil; /// /// Gets and sets the property BlockDurationMinutes. @@ -142,7 +142,7 @@ internal bool IsSetSpotInstanceType() } /// - /// Gets and sets the property ValidUntilUtc. + /// Gets and sets the property ValidUntil. /// /// The end date of the request, in UTC format (YYYY-MM-DDTHH:MM:SSZ). /// Supported only for persistent requests. @@ -159,69 +159,17 @@ internal bool IsSetSpotInstanceType() /// /// /// - public DateTime? ValidUntilUtc + public DateTime? ValidUntil { - get { return this._validUntilUtc; } - set { this._validUntil = this._validUntilUtc = value; } + get { return this._validUntil; } + set { this._validUntil = value; } } - // Check to see if ValidUntilUtc property is set - internal bool IsSetValidUntilUtc() + // Check to see if ValidUntil property is set + internal bool IsSetValidUntil() { - return this._validUntilUtc.HasValue; + return this._validUntil.HasValue; } -#region Backwards compatible properties - private DateTime? _validUntil; - - /// - /// Gets and sets the property ValidUntilUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use ValidUntilUtc instead. Setting either ValidUntil or - /// ValidUntilUtc results in both ValidUntil and ValidUntilUtc being assigned, the latest - /// assignment to either one of the two property is reflected in the value of both. ValidUntil - /// is provided for backwards compatibility only and assigning a non-Utc DateTime to it - /// results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The end date of the request, in UTC format (YYYY-MM-DDTHH:MM:SSZ). - /// Supported only for persistent requests. - /// - ///
  • - /// - /// For a persistent request, the request remains active until the ValidUntil date - /// and time is reached. Otherwise, the request remains active until you cancel it. - /// - ///
  • - /// - /// For a one-time request, ValidUntil is not supported. The request remains active - /// until all instances launch or you cancel the request. - /// - ///
- /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use ValidUntilUtc instead. Setting either ValidUntil or ValidUntilUtc results in both ValidUntil and " + - "ValidUntilUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. ValidUntil is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? ValidUntil - { - get { return this._validUntil.GetValueOrDefault(); } - set - { - this._validUntil = value; - if (value != null) - { - this._validUntilUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._validUntilUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/ElastiCache/Generated/Model/DescribeEventsRequest.cs b/sdk/src/Services/ElastiCache/Generated/Model/DescribeEventsRequest.cs index 69d051a59b25..72ee171caa3f 100644 --- a/sdk/src/Services/ElastiCache/Generated/Model/DescribeEventsRequest.cs +++ b/sdk/src/Services/ElastiCache/Generated/Model/DescribeEventsRequest.cs @@ -44,12 +44,12 @@ namespace Amazon.ElastiCache.Model public partial class DescribeEventsRequest : AmazonElastiCacheRequest { private int? _duration; - private DateTime? _endTimeUtc; + private DateTime? _endTime; private string _marker; private int? _maxRecords; private string _sourceIdentifier; private SourceType _sourceType; - private DateTime? _startTimeUtc; + private DateTime? _startTime; /// /// Empty constructor used to set properties independently even when a simple constructor is available @@ -75,7 +75,7 @@ internal bool IsSetDuration() } /// - /// Gets and sets the property EndTimeUtc. + /// Gets and sets the property EndTime. /// /// The end of the time interval for which to retrieve events, specified in ISO 8601 format. /// @@ -84,16 +84,16 @@ internal bool IsSetDuration() /// Example: 2017-03-30T07:03:49.555Z /// /// - public DateTime? EndTimeUtc + public DateTime? EndTime { - get { return this._endTimeUtc; } - set { this._endTime = this._endTimeUtc = value; } + get { return this._endTime; } + set { this._endTime = value; } } - // Check to see if EndTimeUtc property is set - internal bool IsSetEndTimeUtc() + // Check to see if EndTime property is set + internal bool IsSetEndTime() { - return this._endTimeUtc.HasValue; + return this._endTime.HasValue; } /// @@ -183,7 +183,7 @@ internal bool IsSetSourceType() } /// - /// Gets and sets the property StartTimeUtc. + /// Gets and sets the property StartTime. /// /// The beginning of the time interval to retrieve events for, specified in ISO 8601 format. /// @@ -192,102 +192,17 @@ internal bool IsSetSourceType() /// Example: 2017-03-30T07:03:49.555Z /// /// - public DateTime? StartTimeUtc + public DateTime? StartTime { - get { return this._startTimeUtc; } - set { this._startTime = this._startTimeUtc = value; } + get { return this._startTime; } + set { this._startTime = value; } } - // Check to see if StartTimeUtc property is set - internal bool IsSetStartTimeUtc() + // Check to see if StartTime property is set + internal bool IsSetStartTime() { - return this._startTimeUtc.HasValue; + return this._startTime.HasValue; } -#region Backwards compatible properties - private DateTime? _endTime; - private DateTime? _startTime; - - /// - /// Gets and sets the property EndTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use EndTimeUtc instead. Setting either EndTime or EndTimeUtc - /// results in both EndTime and EndTimeUtc being assigned, the latest assignment to either - /// one of the two property is reflected in the value of both. EndTime is provided for - /// backwards compatibility only and assigning a non-Utc DateTime to it results in the - /// wrong timestamp being passed to the service. - /// - /// - /// - /// The end of the time interval for which to retrieve events, specified in ISO 8601 format. - /// - /// - /// - /// Example: 2017-03-30T07:03:49.555Z - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use EndTimeUtc instead. Setting either EndTime or EndTimeUtc results in both EndTime and " + - "EndTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. EndTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? EndTime - { - get { return this._endTime.GetValueOrDefault(); } - set - { - this._endTime = value; - if (value != null) - { - this._endTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._endTimeUtc = null; - } - } - } - /// - /// Gets and sets the property StartTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use StartTimeUtc instead. Setting either StartTime or - /// StartTimeUtc results in both StartTime and StartTimeUtc being assigned, the latest - /// assignment to either one of the two property is reflected in the value of both. StartTime - /// is provided for backwards compatibility only and assigning a non-Utc DateTime to it - /// results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The beginning of the time interval to retrieve events for, specified in ISO 8601 format. - /// - /// - /// - /// Example: 2017-03-30T07:03:49.555Z - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use StartTimeUtc instead. Setting either StartTime or StartTimeUtc results in both StartTime and " + - "StartTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. StartTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? StartTime - { - get { return this._startTime.GetValueOrDefault(); } - set - { - this._startTime = value; - if (value != null) - { - this._startTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._startTimeUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/ElastiCache/Generated/Model/Internal/MarshallTransformations/DescribeEventsRequestMarshaller.cs b/sdk/src/Services/ElastiCache/Generated/Model/Internal/MarshallTransformations/DescribeEventsRequestMarshaller.cs index 89ae522a99f5..17d5f0aaa401 100644 --- a/sdk/src/Services/ElastiCache/Generated/Model/Internal/MarshallTransformations/DescribeEventsRequestMarshaller.cs +++ b/sdk/src/Services/ElastiCache/Generated/Model/Internal/MarshallTransformations/DescribeEventsRequestMarshaller.cs @@ -63,9 +63,9 @@ public IRequest Marshall(DescribeEventsRequest publicRequest) { request.Parameters.Add("Duration", StringUtils.FromInt(publicRequest.Duration)); } - if(publicRequest.IsSetEndTimeUtc()) + if(publicRequest.IsSetEndTime()) { - request.Parameters.Add("EndTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndTimeUtc)); + request.Parameters.Add("EndTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndTime)); } if(publicRequest.IsSetMarker()) { @@ -83,9 +83,9 @@ public IRequest Marshall(DescribeEventsRequest publicRequest) { request.Parameters.Add("SourceType", StringUtils.FromString(publicRequest.SourceType)); } - if(publicRequest.IsSetStartTimeUtc()) + if(publicRequest.IsSetStartTime()) { - request.Parameters.Add("StartTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartTimeUtc)); + request.Parameters.Add("StartTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartTime)); } } return request; diff --git a/sdk/src/Services/ElasticBeanstalk/Generated/Model/DescribeEnvironmentsRequest.cs b/sdk/src/Services/ElasticBeanstalk/Generated/Model/DescribeEnvironmentsRequest.cs index e09a9ef588bd..0f18b1722314 100644 --- a/sdk/src/Services/ElasticBeanstalk/Generated/Model/DescribeEnvironmentsRequest.cs +++ b/sdk/src/Services/ElasticBeanstalk/Generated/Model/DescribeEnvironmentsRequest.cs @@ -38,7 +38,7 @@ public partial class DescribeEnvironmentsRequest : AmazonElasticBeanstalkRequest private string _applicationName; private List _environmentIds = AWSConfigs.InitializeCollections ? new List() : null; private List _environmentNames = AWSConfigs.InitializeCollections ? new List() : null; - private DateTime? _includedDeletedBackToUtc; + private DateTime? _includedDeletedBackTo; private bool? _includeDeleted; private int? _maxRecords; private string _nextToken; @@ -108,22 +108,22 @@ internal bool IsSetEnvironmentNames() } /// - /// Gets and sets the property IncludedDeletedBackToUtc. + /// Gets and sets the property IncludedDeletedBackTo. /// /// If specified when IncludeDeleted is set to true, then environments /// deleted after this date are displayed. /// /// - public DateTime? IncludedDeletedBackToUtc + public DateTime? IncludedDeletedBackTo { - get { return this._includedDeletedBackToUtc; } - set { this._includedDeletedBackTo = this._includedDeletedBackToUtc = value; } + get { return this._includedDeletedBackTo; } + set { this._includedDeletedBackTo = value; } } - // Check to see if IncludedDeletedBackToUtc property is set - internal bool IsSetIncludedDeletedBackToUtc() + // Check to see if IncludedDeletedBackTo property is set + internal bool IsSetIncludedDeletedBackTo() { - return this._includedDeletedBackToUtc.HasValue; + return this._includedDeletedBackTo.HasValue; } /// @@ -222,47 +222,5 @@ internal bool IsSetVersionLabel() return this._versionLabel != null; } -#region Backwards compatible properties - private DateTime? _includedDeletedBackTo; - - /// - /// Gets and sets the property IncludedDeletedBackToUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use IncludedDeletedBackToUtc instead. Setting either IncludedDeletedBackTo - /// or IncludedDeletedBackToUtc results in both IncludedDeletedBackTo and IncludedDeletedBackToUtc - /// being assigned, the latest assignment to either one of the two property is reflected - /// in the value of both. IncludedDeletedBackTo is provided for backwards compatibility - /// only and assigning a non-Utc DateTime to it results in the wrong timestamp being passed - /// to the service. - /// - /// - /// - /// If specified when IncludeDeleted is set to true, then environments - /// deleted after this date are displayed. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use IncludedDeletedBackToUtc instead. Setting either IncludedDeletedBackTo or IncludedDeletedBackToUtc results in both IncludedDeletedBackTo and " + - "IncludedDeletedBackToUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. IncludedDeletedBackTo is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? IncludedDeletedBackTo - { - get { return this._includedDeletedBackTo.GetValueOrDefault(); } - set - { - this._includedDeletedBackTo = value; - if (value != null) - { - this._includedDeletedBackToUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._includedDeletedBackToUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/ElasticBeanstalk/Generated/Model/DescribeEventsRequest.cs b/sdk/src/Services/ElasticBeanstalk/Generated/Model/DescribeEventsRequest.cs index c458f3914db0..24f55f19b66e 100644 --- a/sdk/src/Services/ElasticBeanstalk/Generated/Model/DescribeEventsRequest.cs +++ b/sdk/src/Services/ElasticBeanstalk/Generated/Model/DescribeEventsRequest.cs @@ -42,7 +42,7 @@ namespace Amazon.ElasticBeanstalk.Model public partial class DescribeEventsRequest : AmazonElasticBeanstalkRequest { private string _applicationName; - private DateTime? _endTimeUtc; + private DateTime? _endTime; private string _environmentId; private string _environmentName; private int? _maxRecords; @@ -50,7 +50,7 @@ public partial class DescribeEventsRequest : AmazonElasticBeanstalkRequest private string _platformArn; private string _requestId; private EventSeverity _severity; - private DateTime? _startTimeUtc; + private DateTime? _startTime; private string _templateName; private string _versionLabel; @@ -80,22 +80,22 @@ internal bool IsSetApplicationName() } /// - /// Gets and sets the property EndTimeUtc. + /// Gets and sets the property EndTime. /// /// If specified, AWS Elastic Beanstalk restricts the returned descriptions to those /// that occur up to, but not including, the EndTime. /// /// - public DateTime? EndTimeUtc + public DateTime? EndTime { - get { return this._endTimeUtc; } - set { this._endTime = this._endTimeUtc = value; } + get { return this._endTime; } + set { this._endTime = value; } } - // Check to see if EndTimeUtc property is set - internal bool IsSetEndTimeUtc() + // Check to see if EndTime property is set + internal bool IsSetEndTime() { - return this._endTimeUtc.HasValue; + return this._endTime.HasValue; } /// @@ -233,22 +233,22 @@ internal bool IsSetSeverity() } /// - /// Gets and sets the property StartTimeUtc. + /// Gets and sets the property StartTime. /// /// If specified, AWS Elastic Beanstalk restricts the returned descriptions to those that /// occur on or after this time. /// /// - public DateTime? StartTimeUtc + public DateTime? StartTime { - get { return this._startTimeUtc; } - set { this._startTime = this._startTimeUtc = value; } + get { return this._startTime; } + set { this._startTime = value; } } - // Check to see if StartTimeUtc property is set - internal bool IsSetStartTimeUtc() + // Check to see if StartTime property is set + internal bool IsSetStartTime() { - return this._startTimeUtc.HasValue; + return this._startTime.HasValue; } /// @@ -291,84 +291,5 @@ internal bool IsSetVersionLabel() return this._versionLabel != null; } -#region Backwards compatible properties - private DateTime? _endTime; - private DateTime? _startTime; - - /// - /// Gets and sets the property EndTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use EndTimeUtc instead. Setting either EndTime or EndTimeUtc - /// results in both EndTime and EndTimeUtc being assigned, the latest assignment to either - /// one of the two property is reflected in the value of both. EndTime is provided for - /// backwards compatibility only and assigning a non-Utc DateTime to it results in the - /// wrong timestamp being passed to the service. - /// - /// - /// - /// If specified, AWS Elastic Beanstalk restricts the returned descriptions to those - /// that occur up to, but not including, the EndTime. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use EndTimeUtc instead. Setting either EndTime or EndTimeUtc results in both EndTime and " + - "EndTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. EndTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? EndTime - { - get { return this._endTime.GetValueOrDefault(); } - set - { - this._endTime = value; - if (value != null) - { - this._endTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._endTimeUtc = null; - } - } - } - /// - /// Gets and sets the property StartTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use StartTimeUtc instead. Setting either StartTime or - /// StartTimeUtc results in both StartTime and StartTimeUtc being assigned, the latest - /// assignment to either one of the two property is reflected in the value of both. StartTime - /// is provided for backwards compatibility only and assigning a non-Utc DateTime to it - /// results in the wrong timestamp being passed to the service. - /// - /// - /// - /// If specified, AWS Elastic Beanstalk restricts the returned descriptions to those that - /// occur on or after this time. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use StartTimeUtc instead. Setting either StartTime or StartTimeUtc results in both StartTime and " + - "StartTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. StartTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? StartTime - { - get { return this._startTime.GetValueOrDefault(); } - set - { - this._startTime = value; - if (value != null) - { - this._startTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._startTimeUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/ElasticBeanstalk/Generated/Model/Internal/MarshallTransformations/DescribeEnvironmentsRequestMarshaller.cs b/sdk/src/Services/ElasticBeanstalk/Generated/Model/Internal/MarshallTransformations/DescribeEnvironmentsRequestMarshaller.cs index d04bc682d870..16ffcd833990 100644 --- a/sdk/src/Services/ElasticBeanstalk/Generated/Model/Internal/MarshallTransformations/DescribeEnvironmentsRequestMarshaller.cs +++ b/sdk/src/Services/ElasticBeanstalk/Generated/Model/Internal/MarshallTransformations/DescribeEnvironmentsRequestMarshaller.cs @@ -91,9 +91,9 @@ public IRequest Marshall(DescribeEnvironmentsRequest publicRequest) } } } - if(publicRequest.IsSetIncludedDeletedBackToUtc()) + if(publicRequest.IsSetIncludedDeletedBackTo()) { - request.Parameters.Add("IncludedDeletedBackTo", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.IncludedDeletedBackToUtc)); + request.Parameters.Add("IncludedDeletedBackTo", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.IncludedDeletedBackTo)); } if(publicRequest.IsSetIncludeDeleted()) { diff --git a/sdk/src/Services/ElasticBeanstalk/Generated/Model/Internal/MarshallTransformations/DescribeEventsRequestMarshaller.cs b/sdk/src/Services/ElasticBeanstalk/Generated/Model/Internal/MarshallTransformations/DescribeEventsRequestMarshaller.cs index 69b408381763..9533e8047293 100644 --- a/sdk/src/Services/ElasticBeanstalk/Generated/Model/Internal/MarshallTransformations/DescribeEventsRequestMarshaller.cs +++ b/sdk/src/Services/ElasticBeanstalk/Generated/Model/Internal/MarshallTransformations/DescribeEventsRequestMarshaller.cs @@ -63,9 +63,9 @@ public IRequest Marshall(DescribeEventsRequest publicRequest) { request.Parameters.Add("ApplicationName", StringUtils.FromString(publicRequest.ApplicationName)); } - if(publicRequest.IsSetEndTimeUtc()) + if(publicRequest.IsSetEndTime()) { - request.Parameters.Add("EndTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndTimeUtc)); + request.Parameters.Add("EndTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndTime)); } if(publicRequest.IsSetEnvironmentId()) { @@ -95,9 +95,9 @@ public IRequest Marshall(DescribeEventsRequest publicRequest) { request.Parameters.Add("Severity", StringUtils.FromString(publicRequest.Severity)); } - if(publicRequest.IsSetStartTimeUtc()) + if(publicRequest.IsSetStartTime()) { - request.Parameters.Add("StartTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartTimeUtc)); + request.Parameters.Add("StartTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartTime)); } if(publicRequest.IsSetTemplateName()) { diff --git a/sdk/src/Services/IoT/Generated/Model/Internal/MarshallTransformations/ListAuditTasksRequestMarshaller.cs b/sdk/src/Services/IoT/Generated/Model/Internal/MarshallTransformations/ListAuditTasksRequestMarshaller.cs index a2c96932b5d6..bef838467848 100644 --- a/sdk/src/Services/IoT/Generated/Model/Internal/MarshallTransformations/ListAuditTasksRequestMarshaller.cs +++ b/sdk/src/Services/IoT/Generated/Model/Internal/MarshallTransformations/ListAuditTasksRequestMarshaller.cs @@ -60,8 +60,8 @@ public IRequest Marshall(ListAuditTasksRequest publicRequest) request.HttpMethod = "GET"; - if (publicRequest.IsSetEndTimeUtc()) - request.Parameters.Add("endTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndTimeUtc)); + if (publicRequest.IsSetEndTime()) + request.Parameters.Add("endTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndTime)); if (publicRequest.IsSetMaxResults()) request.Parameters.Add("maxResults", StringUtils.FromInt(publicRequest.MaxResults)); @@ -69,8 +69,8 @@ public IRequest Marshall(ListAuditTasksRequest publicRequest) if (publicRequest.IsSetNextToken()) request.Parameters.Add("nextToken", StringUtils.FromString(publicRequest.NextToken)); - if (publicRequest.IsSetStartTimeUtc()) - request.Parameters.Add("startTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartTimeUtc)); + if (publicRequest.IsSetStartTime()) + request.Parameters.Add("startTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartTime)); if (publicRequest.IsSetTaskStatus()) request.Parameters.Add("taskStatus", StringUtils.FromString(publicRequest.TaskStatus)); diff --git a/sdk/src/Services/IoT/Generated/Model/Internal/MarshallTransformations/ListViolationEventsRequestMarshaller.cs b/sdk/src/Services/IoT/Generated/Model/Internal/MarshallTransformations/ListViolationEventsRequestMarshaller.cs index d348f16f396c..75385be9cd7b 100644 --- a/sdk/src/Services/IoT/Generated/Model/Internal/MarshallTransformations/ListViolationEventsRequestMarshaller.cs +++ b/sdk/src/Services/IoT/Generated/Model/Internal/MarshallTransformations/ListViolationEventsRequestMarshaller.cs @@ -63,8 +63,8 @@ public IRequest Marshall(ListViolationEventsRequest publicRequest) if (publicRequest.IsSetBehaviorCriteriaType()) request.Parameters.Add("behaviorCriteriaType", StringUtils.FromString(publicRequest.BehaviorCriteriaType)); - if (publicRequest.IsSetEndTimeUtc()) - request.Parameters.Add("endTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndTimeUtc)); + if (publicRequest.IsSetEndTime()) + request.Parameters.Add("endTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndTime)); if (publicRequest.IsSetListSuppressedAlerts()) request.Parameters.Add("listSuppressedAlerts", StringUtils.FromBool(publicRequest.ListSuppressedAlerts)); @@ -78,8 +78,8 @@ public IRequest Marshall(ListViolationEventsRequest publicRequest) if (publicRequest.IsSetSecurityProfileName()) request.Parameters.Add("securityProfileName", StringUtils.FromString(publicRequest.SecurityProfileName)); - if (publicRequest.IsSetStartTimeUtc()) - request.Parameters.Add("startTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartTimeUtc)); + if (publicRequest.IsSetStartTime()) + request.Parameters.Add("startTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartTime)); if (publicRequest.IsSetThingName()) request.Parameters.Add("thingName", StringUtils.FromString(publicRequest.ThingName)); diff --git a/sdk/src/Services/IoT/Generated/Model/ListAuditTasksRequest.cs b/sdk/src/Services/IoT/Generated/Model/ListAuditTasksRequest.cs index 7b761609a398..036e2b7718d2 100644 --- a/sdk/src/Services/IoT/Generated/Model/ListAuditTasksRequest.cs +++ b/sdk/src/Services/IoT/Generated/Model/ListAuditTasksRequest.cs @@ -41,30 +41,30 @@ namespace Amazon.IoT.Model /// public partial class ListAuditTasksRequest : AmazonIoTRequest { - private DateTime? _endTimeUtc; + private DateTime? _endTime; private int? _maxResults; private string _nextToken; - private DateTime? _startTimeUtc; + private DateTime? _startTime; private AuditTaskStatus _taskStatus; private AuditTaskType _taskType; /// - /// Gets and sets the property EndTimeUtc. + /// Gets and sets the property EndTime. /// /// The end of the time period. /// /// [AWSProperty(Required=true)] - public DateTime? EndTimeUtc + public DateTime? EndTime { - get { return this._endTimeUtc; } - set { this._endTime = this._endTimeUtc = value; } + get { return this._endTime; } + set { this._endTime = value; } } - // Check to see if EndTimeUtc property is set - internal bool IsSetEndTimeUtc() + // Check to see if EndTime property is set + internal bool IsSetEndTime() { - return this._endTimeUtc.HasValue; + return this._endTime.HasValue; } /// @@ -105,23 +105,23 @@ internal bool IsSetNextToken() } /// - /// Gets and sets the property StartTimeUtc. + /// Gets and sets the property StartTime. /// /// The beginning of the time period. Audit information is retained for a limited time /// (90 days). Requesting a start time prior to what is retained results in an "InvalidRequestException". /// /// [AWSProperty(Required=true)] - public DateTime? StartTimeUtc + public DateTime? StartTime { - get { return this._startTimeUtc; } - set { this._startTime = this._startTimeUtc = value; } + get { return this._startTime; } + set { this._startTime = value; } } - // Check to see if StartTimeUtc property is set - internal bool IsSetStartTimeUtc() + // Check to see if StartTime property is set + internal bool IsSetStartTime() { - return this._startTimeUtc.HasValue; + return this._startTime.HasValue; } /// @@ -162,83 +162,5 @@ internal bool IsSetTaskType() return this._taskType != null; } -#region Backwards compatible properties - private DateTime? _endTime; - private DateTime? _startTime; - - /// - /// Gets and sets the property EndTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use EndTimeUtc instead. Setting either EndTime or EndTimeUtc - /// results in both EndTime and EndTimeUtc being assigned, the latest assignment to either - /// one of the two property is reflected in the value of both. EndTime is provided for - /// backwards compatibility only and assigning a non-Utc DateTime to it results in the - /// wrong timestamp being passed to the service. - /// - /// - /// - /// The end of the time period. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use EndTimeUtc instead. Setting either EndTime or EndTimeUtc results in both EndTime and " + - "EndTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. EndTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? EndTime - { - get { return this._endTime.GetValueOrDefault(); } - set - { - this._endTime = value; - if (value != null) - { - this._endTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._endTimeUtc = null; - } - } - } - /// - /// Gets and sets the property StartTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use StartTimeUtc instead. Setting either StartTime or - /// StartTimeUtc results in both StartTime and StartTimeUtc being assigned, the latest - /// assignment to either one of the two property is reflected in the value of both. StartTime - /// is provided for backwards compatibility only and assigning a non-Utc DateTime to it - /// results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The beginning of the time period. Audit information is retained for a limited time - /// (90 days). Requesting a start time prior to what is retained results in an "InvalidRequestException". - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use StartTimeUtc instead. Setting either StartTime or StartTimeUtc results in both StartTime and " + - "StartTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. StartTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? StartTime - { - get { return this._startTime.GetValueOrDefault(); } - set - { - this._startTime = value; - if (value != null) - { - this._startTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._startTimeUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/IoT/Generated/Model/ListViolationEventsRequest.cs b/sdk/src/Services/IoT/Generated/Model/ListViolationEventsRequest.cs index 88cae01d65b5..e898a69359bf 100644 --- a/sdk/src/Services/IoT/Generated/Model/ListViolationEventsRequest.cs +++ b/sdk/src/Services/IoT/Generated/Model/ListViolationEventsRequest.cs @@ -44,12 +44,12 @@ namespace Amazon.IoT.Model public partial class ListViolationEventsRequest : AmazonIoTRequest { private BehaviorCriteriaType _behaviorCriteriaType; - private DateTime? _endTimeUtc; + private DateTime? _endTime; private bool? _listSuppressedAlerts; private int? _maxResults; private string _nextToken; private string _securityProfileName; - private DateTime? _startTimeUtc; + private DateTime? _startTime; private string _thingName; private VerificationState _verificationState; @@ -72,22 +72,22 @@ internal bool IsSetBehaviorCriteriaType() } /// - /// Gets and sets the property EndTimeUtc. + /// Gets and sets the property EndTime. /// /// The end time for the alerts to be listed. /// /// [AWSProperty(Required=true)] - public DateTime? EndTimeUtc + public DateTime? EndTime { - get { return this._endTimeUtc; } - set { this._endTime = this._endTimeUtc = value; } + get { return this._endTime; } + set { this._endTime = value; } } - // Check to see if EndTimeUtc property is set - internal bool IsSetEndTimeUtc() + // Check to see if EndTime property is set + internal bool IsSetEndTime() { - return this._endTimeUtc.HasValue; + return this._endTime.HasValue; } /// @@ -165,22 +165,22 @@ internal bool IsSetSecurityProfileName() } /// - /// Gets and sets the property StartTimeUtc. + /// Gets and sets the property StartTime. /// /// The start time for the alerts to be listed. /// /// [AWSProperty(Required=true)] - public DateTime? StartTimeUtc + public DateTime? StartTime { - get { return this._startTimeUtc; } - set { this._startTime = this._startTimeUtc = value; } + get { return this._startTime; } + set { this._startTime = value; } } - // Check to see if StartTimeUtc property is set - internal bool IsSetStartTimeUtc() + // Check to see if StartTime property is set + internal bool IsSetStartTime() { - return this._startTimeUtc.HasValue; + return this._startTime.HasValue; } /// @@ -220,82 +220,5 @@ internal bool IsSetVerificationState() return this._verificationState != null; } -#region Backwards compatible properties - private DateTime? _endTime; - private DateTime? _startTime; - - /// - /// Gets and sets the property EndTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use EndTimeUtc instead. Setting either EndTime or EndTimeUtc - /// results in both EndTime and EndTimeUtc being assigned, the latest assignment to either - /// one of the two property is reflected in the value of both. EndTime is provided for - /// backwards compatibility only and assigning a non-Utc DateTime to it results in the - /// wrong timestamp being passed to the service. - /// - /// - /// - /// The end time for the alerts to be listed. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use EndTimeUtc instead. Setting either EndTime or EndTimeUtc results in both EndTime and " + - "EndTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. EndTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? EndTime - { - get { return this._endTime.GetValueOrDefault(); } - set - { - this._endTime = value; - if (value != null) - { - this._endTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._endTimeUtc = null; - } - } - } - /// - /// Gets and sets the property StartTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use StartTimeUtc instead. Setting either StartTime or - /// StartTimeUtc results in both StartTime and StartTimeUtc being assigned, the latest - /// assignment to either one of the two property is reflected in the value of both. StartTime - /// is provided for backwards compatibility only and assigning a non-Utc DateTime to it - /// results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The start time for the alerts to be listed. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use StartTimeUtc instead. Setting either StartTime or StartTimeUtc results in both StartTime and " + - "StartTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. StartTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? StartTime - { - get { return this._startTime.GetValueOrDefault(); } - set - { - this._startTime = value; - if (value != null) - { - this._startTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._startTimeUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/IoT1ClickDevicesService/Generated/Model/Internal/MarshallTransformations/ListDeviceEventsRequestMarshaller.cs b/sdk/src/Services/IoT1ClickDevicesService/Generated/Model/Internal/MarshallTransformations/ListDeviceEventsRequestMarshaller.cs index 0e678a6d2b71..e16add889494 100644 --- a/sdk/src/Services/IoT1ClickDevicesService/Generated/Model/Internal/MarshallTransformations/ListDeviceEventsRequestMarshaller.cs +++ b/sdk/src/Services/IoT1ClickDevicesService/Generated/Model/Internal/MarshallTransformations/ListDeviceEventsRequestMarshaller.cs @@ -63,8 +63,8 @@ public IRequest Marshall(ListDeviceEventsRequest publicRequest) throw new AmazonIoT1ClickDevicesServiceException("Request object does not have required field DeviceId set"); request.AddPathResource("{deviceId}", StringUtils.FromString(publicRequest.DeviceId)); - if (publicRequest.IsSetFromTimeStampUtc()) - request.Parameters.Add("fromTimeStamp", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.FromTimeStampUtc)); + if (publicRequest.IsSetFromTimeStamp()) + request.Parameters.Add("fromTimeStamp", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.FromTimeStamp)); if (publicRequest.IsSetMaxResults()) request.Parameters.Add("maxResults", StringUtils.FromInt(publicRequest.MaxResults)); @@ -72,8 +72,8 @@ public IRequest Marshall(ListDeviceEventsRequest publicRequest) if (publicRequest.IsSetNextToken()) request.Parameters.Add("nextToken", StringUtils.FromString(publicRequest.NextToken)); - if (publicRequest.IsSetToTimeStampUtc()) - request.Parameters.Add("toTimeStamp", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.ToTimeStampUtc)); + if (publicRequest.IsSetToTimeStamp()) + request.Parameters.Add("toTimeStamp", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.ToTimeStamp)); request.ResourcePath = "/devices/{deviceId}/events"; request.UseQueryString = true; diff --git a/sdk/src/Services/IoT1ClickDevicesService/Generated/Model/ListDeviceEventsRequest.cs b/sdk/src/Services/IoT1ClickDevicesService/Generated/Model/ListDeviceEventsRequest.cs index 932641181c4b..143a7e817593 100644 --- a/sdk/src/Services/IoT1ClickDevicesService/Generated/Model/ListDeviceEventsRequest.cs +++ b/sdk/src/Services/IoT1ClickDevicesService/Generated/Model/ListDeviceEventsRequest.cs @@ -37,10 +37,10 @@ namespace Amazon.IoT1ClickDevicesService.Model public partial class ListDeviceEventsRequest : AmazonIoT1ClickDevicesServiceRequest { private string _deviceId; - private DateTime? _fromTimeStampUtc; + private DateTime? _fromTimeStamp; private int? _maxResults; private string _nextToken; - private DateTime? _toTimeStampUtc; + private DateTime? _toTimeStamp; /// /// Gets and sets the property DeviceId. @@ -62,23 +62,23 @@ internal bool IsSetDeviceId() } /// - /// Gets and sets the property FromTimeStampUtc. + /// Gets and sets the property FromTimeStamp. /// /// The start date for the device event query, in ISO8061 format. For example, 2018-03-28T15:45:12.880Z /// /// /// [AWSProperty(Required=true)] - public DateTime? FromTimeStampUtc + public DateTime? FromTimeStamp { - get { return this._fromTimeStampUtc; } - set { this._fromTimeStamp = this._fromTimeStampUtc = value; } + get { return this._fromTimeStamp; } + set { this._fromTimeStamp = value; } } - // Check to see if FromTimeStampUtc property is set - internal bool IsSetFromTimeStampUtc() + // Check to see if FromTimeStamp property is set + internal bool IsSetFromTimeStamp() { - return this._fromTimeStampUtc.HasValue; + return this._fromTimeStamp.HasValue; } /// @@ -120,103 +120,24 @@ internal bool IsSetNextToken() } /// - /// Gets and sets the property ToTimeStampUtc. + /// Gets and sets the property ToTimeStamp. /// /// The end date for the device event query, in ISO8061 format. For example, 2018-03-28T15:45:12.880Z /// /// /// [AWSProperty(Required=true)] - public DateTime? ToTimeStampUtc + public DateTime? ToTimeStamp { - get { return this._toTimeStampUtc; } - set { this._toTimeStamp = this._toTimeStampUtc = value; } + get { return this._toTimeStamp; } + set { this._toTimeStamp = value; } } - // Check to see if ToTimeStampUtc property is set - internal bool IsSetToTimeStampUtc() + // Check to see if ToTimeStamp property is set + internal bool IsSetToTimeStamp() { - return this._toTimeStampUtc.HasValue; + return this._toTimeStamp.HasValue; } -#region Backwards compatible properties - private DateTime? _fromTimeStamp; - private DateTime? _toTimeStamp; - - /// - /// Gets and sets the property FromTimeStampUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use FromTimeStampUtc instead. Setting either FromTimeStamp - /// or FromTimeStampUtc results in both FromTimeStamp and FromTimeStampUtc being assigned, - /// the latest assignment to either one of the two property is reflected in the value - /// of both. FromTimeStamp is provided for backwards compatibility only and assigning - /// a non-Utc DateTime to it results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The start date for the device event query, in ISO8061 format. For example, 2018-03-28T15:45:12.880Z - /// - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use FromTimeStampUtc instead. Setting either FromTimeStamp or FromTimeStampUtc results in both FromTimeStamp and " + - "FromTimeStampUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. FromTimeStamp is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? FromTimeStamp - { - get { return this._fromTimeStamp.GetValueOrDefault(); } - set - { - this._fromTimeStamp = value; - if (value != null) - { - this._fromTimeStampUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._fromTimeStampUtc = null; - } - } - } - /// - /// Gets and sets the property ToTimeStampUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use ToTimeStampUtc instead. Setting either ToTimeStamp - /// or ToTimeStampUtc results in both ToTimeStamp and ToTimeStampUtc being assigned, the - /// latest assignment to either one of the two property is reflected in the value of both. - /// ToTimeStamp is provided for backwards compatibility only and assigning a non-Utc DateTime - /// to it results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The end date for the device event query, in ISO8061 format. For example, 2018-03-28T15:45:12.880Z - /// - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use ToTimeStampUtc instead. Setting either ToTimeStamp or ToTimeStampUtc results in both ToTimeStamp and " + - "ToTimeStampUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. ToTimeStamp is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? ToTimeStamp - { - get { return this._toTimeStamp.GetValueOrDefault(); } - set - { - this._toTimeStamp = value; - if (value != null) - { - this._toTimeStampUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._toTimeStampUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/IoTAnalytics/Generated/Model/Internal/MarshallTransformations/SampleChannelDataRequestMarshaller.cs b/sdk/src/Services/IoTAnalytics/Generated/Model/Internal/MarshallTransformations/SampleChannelDataRequestMarshaller.cs index 6f87cae6dd3d..2d001ac7f9bf 100644 --- a/sdk/src/Services/IoTAnalytics/Generated/Model/Internal/MarshallTransformations/SampleChannelDataRequestMarshaller.cs +++ b/sdk/src/Services/IoTAnalytics/Generated/Model/Internal/MarshallTransformations/SampleChannelDataRequestMarshaller.cs @@ -63,14 +63,14 @@ public IRequest Marshall(SampleChannelDataRequest publicRequest) throw new AmazonIoTAnalyticsException("Request object does not have required field ChannelName set"); request.AddPathResource("{channelName}", StringUtils.FromString(publicRequest.ChannelName)); - if (publicRequest.IsSetEndTimeUtc()) - request.Parameters.Add("endTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndTimeUtc)); + if (publicRequest.IsSetEndTime()) + request.Parameters.Add("endTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndTime)); if (publicRequest.IsSetMaxMessages()) request.Parameters.Add("maxMessages", StringUtils.FromInt(publicRequest.MaxMessages)); - if (publicRequest.IsSetStartTimeUtc()) - request.Parameters.Add("startTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartTimeUtc)); + if (publicRequest.IsSetStartTime()) + request.Parameters.Add("startTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartTime)); request.ResourcePath = "/channels/{channelName}/sample"; request.UseQueryString = true; diff --git a/sdk/src/Services/IoTAnalytics/Generated/Model/SampleChannelDataRequest.cs b/sdk/src/Services/IoTAnalytics/Generated/Model/SampleChannelDataRequest.cs index cdcc6edb1b9f..a7016a36a7c5 100644 --- a/sdk/src/Services/IoTAnalytics/Generated/Model/SampleChannelDataRequest.cs +++ b/sdk/src/Services/IoTAnalytics/Generated/Model/SampleChannelDataRequest.cs @@ -37,9 +37,9 @@ namespace Amazon.IoTAnalytics.Model public partial class SampleChannelDataRequest : AmazonIoTAnalyticsRequest { private string _channelName; - private DateTime? _endTimeUtc; + private DateTime? _endTime; private int? _maxMessages; - private DateTime? _startTimeUtc; + private DateTime? _startTime; /// /// Gets and sets the property ChannelName. @@ -61,21 +61,21 @@ internal bool IsSetChannelName() } /// - /// Gets and sets the property EndTimeUtc. + /// Gets and sets the property EndTime. /// /// The end of the time window from which sample messages are retrieved. /// /// - public DateTime? EndTimeUtc + public DateTime? EndTime { - get { return this._endTimeUtc; } - set { this._endTime = this._endTimeUtc = value; } + get { return this._endTime; } + set { this._endTime = value; } } - // Check to see if EndTimeUtc property is set - internal bool IsSetEndTimeUtc() + // Check to see if EndTime property is set + internal bool IsSetEndTime() { - return this._endTimeUtc.HasValue; + return this._endTime.HasValue; } /// @@ -99,99 +99,22 @@ internal bool IsSetMaxMessages() } /// - /// Gets and sets the property StartTimeUtc. + /// Gets and sets the property StartTime. /// /// The start of the time window from which sample messages are retrieved. /// /// - public DateTime? StartTimeUtc + public DateTime? StartTime { - get { return this._startTimeUtc; } - set { this._startTime = this._startTimeUtc = value; } + get { return this._startTime; } + set { this._startTime = value; } } - // Check to see if StartTimeUtc property is set - internal bool IsSetStartTimeUtc() + // Check to see if StartTime property is set + internal bool IsSetStartTime() { - return this._startTimeUtc.HasValue; + return this._startTime.HasValue; } -#region Backwards compatible properties - private DateTime? _endTime; - private DateTime? _startTime; - - /// - /// Gets and sets the property EndTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use EndTimeUtc instead. Setting either EndTime or EndTimeUtc - /// results in both EndTime and EndTimeUtc being assigned, the latest assignment to either - /// one of the two property is reflected in the value of both. EndTime is provided for - /// backwards compatibility only and assigning a non-Utc DateTime to it results in the - /// wrong timestamp being passed to the service. - /// - /// - /// - /// The end of the time window from which sample messages are retrieved. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use EndTimeUtc instead. Setting either EndTime or EndTimeUtc results in both EndTime and " + - "EndTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. EndTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? EndTime - { - get { return this._endTime.GetValueOrDefault(); } - set - { - this._endTime = value; - if (value != null) - { - this._endTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._endTimeUtc = null; - } - } - } - /// - /// Gets and sets the property StartTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use StartTimeUtc instead. Setting either StartTime or - /// StartTimeUtc results in both StartTime and StartTimeUtc being assigned, the latest - /// assignment to either one of the two property is reflected in the value of both. StartTime - /// is provided for backwards compatibility only and assigning a non-Utc DateTime to it - /// results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The start of the time window from which sample messages are retrieved. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use StartTimeUtc instead. Setting either StartTime or StartTimeUtc results in both StartTime and " + - "StartTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. StartTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? StartTime - { - get { return this._startTime.GetValueOrDefault(); } - set - { - this._startTime = value; - if (value != null) - { - this._startTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._startTimeUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/MediaLive/Generated/Model/Internal/MarshallTransformations/DescribeInputDeviceThumbnailResponseUnmarshaller.cs b/sdk/src/Services/MediaLive/Generated/Model/Internal/MarshallTransformations/DescribeInputDeviceThumbnailResponseUnmarshaller.cs index 26f6fe8f22bd..bddfeaf0a171 100644 --- a/sdk/src/Services/MediaLive/Generated/Model/Internal/MarshallTransformations/DescribeInputDeviceThumbnailResponseUnmarshaller.cs +++ b/sdk/src/Services/MediaLive/Generated/Model/Internal/MarshallTransformations/DescribeInputDeviceThumbnailResponseUnmarshaller.cs @@ -56,7 +56,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont if (context.ResponseData.IsHeaderPresent("ETag")) response.ETag = context.ResponseData.GetHeaderValue("ETag"); if (context.ResponseData.IsHeaderPresent("Last-Modified")) - response.LastModified = DateTime.Parse(context.ResponseData.GetHeaderValue("Last-Modified"), CultureInfo.InvariantCulture); + response.LastModified = DateTime.Parse(context.ResponseData.GetHeaderValue("Last-Modified"), CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal); return response; } diff --git a/sdk/src/Services/MediaStoreData/Generated/Model/Internal/MarshallTransformations/DescribeObjectResponseUnmarshaller.cs b/sdk/src/Services/MediaStoreData/Generated/Model/Internal/MarshallTransformations/DescribeObjectResponseUnmarshaller.cs index 9f65167614b0..412e5fc912d2 100644 --- a/sdk/src/Services/MediaStoreData/Generated/Model/Internal/MarshallTransformations/DescribeObjectResponseUnmarshaller.cs +++ b/sdk/src/Services/MediaStoreData/Generated/Model/Internal/MarshallTransformations/DescribeObjectResponseUnmarshaller.cs @@ -57,7 +57,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont if (context.ResponseData.IsHeaderPresent("ETag")) response.ETag = context.ResponseData.GetHeaderValue("ETag"); if (context.ResponseData.IsHeaderPresent("Last-Modified")) - response.LastModified = DateTime.Parse(context.ResponseData.GetHeaderValue("Last-Modified"), CultureInfo.InvariantCulture); + response.LastModified = DateTime.Parse(context.ResponseData.GetHeaderValue("Last-Modified"), CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal); return response; } diff --git a/sdk/src/Services/MediaStoreData/Generated/Model/Internal/MarshallTransformations/GetObjectResponseUnmarshaller.cs b/sdk/src/Services/MediaStoreData/Generated/Model/Internal/MarshallTransformations/GetObjectResponseUnmarshaller.cs index eb38ca8d7bcd..f8f27f1de9af 100644 --- a/sdk/src/Services/MediaStoreData/Generated/Model/Internal/MarshallTransformations/GetObjectResponseUnmarshaller.cs +++ b/sdk/src/Services/MediaStoreData/Generated/Model/Internal/MarshallTransformations/GetObjectResponseUnmarshaller.cs @@ -60,7 +60,7 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont if (context.ResponseData.IsHeaderPresent("ETag")) response.ETag = context.ResponseData.GetHeaderValue("ETag"); if (context.ResponseData.IsHeaderPresent("Last-Modified")) - response.LastModified = DateTime.Parse(context.ResponseData.GetHeaderValue("Last-Modified"), CultureInfo.InvariantCulture); + response.LastModified = DateTime.Parse(context.ResponseData.GetHeaderValue("Last-Modified"), CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal); response.StatusCode = (int)context.ResponseData.StatusCode; return response; diff --git a/sdk/src/Services/MobileAnalytics/Generated/Model/Event.cs b/sdk/src/Services/MobileAnalytics/Generated/Model/Event.cs index 402fa29705a3..760ab70215be 100644 --- a/sdk/src/Services/MobileAnalytics/Generated/Model/Event.cs +++ b/sdk/src/Services/MobileAnalytics/Generated/Model/Event.cs @@ -38,7 +38,7 @@ public partial class Event private string _eventType; private Dictionary _metrics = AWSConfigs.InitializeCollections ? new Dictionary() : null; private Session _session; - private DateTime? _timestampUtc; + private DateTime? _timestamp; private string _version; /// @@ -128,22 +128,22 @@ internal bool IsSetSession() } /// - /// Gets and sets the property TimestampUtc. + /// Gets and sets the property Timestamp. /// /// The time the event occurred in ISO 8601 standard date time format. For example, 2014-06-30T19:07:47.885Z /// /// [AWSProperty(Required=true)] - public DateTime? TimestampUtc + public DateTime? Timestamp { - get { return this._timestampUtc; } - set { this._timestamp = this._timestampUtc = value; } + get { return this._timestamp; } + set { this._timestamp = value; } } - // Check to see if TimestampUtc property is set - internal bool IsSetTimestampUtc() + // Check to see if Timestamp property is set + internal bool IsSetTimestamp() { - return this._timestampUtc != null; + return this._timestamp != null; } /// @@ -165,45 +165,5 @@ internal bool IsSetVersion() return this._version != null; } -#region Backwards compatible properties - private DateTime? _timestamp; - - /// - /// Gets and sets the property TimestampUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use TimestampUtc instead. Setting either Timestamp or - /// TimestampUtc results in both Timestamp and TimestampUtc being assigned, the latest - /// assignment to either one of the two property is reflected in the value of both. Timestamp - /// is provided for backwards compatibility only and assigning a non-Utc DateTime to it - /// results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The time the event occurred in ISO 8601 standard date time format. For example, 2014-06-30T19:07:47.885Z - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use TimestampUtc instead. Setting either Timestamp or TimestampUtc results in both Timestamp and " + - "TimestampUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. Timestamp is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? Timestamp - { - get { return this._timestamp.GetValueOrDefault(); } - set - { - this._timestamp = value; - if (value != null) - { - this._timestampUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._timestampUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/MobileAnalytics/Generated/Model/Internal/MarshallTransformations/EventMarshaller.cs b/sdk/src/Services/MobileAnalytics/Generated/Model/Internal/MarshallTransformations/EventMarshaller.cs index 47527ccc3ebb..0c0e2b832bf2 100644 --- a/sdk/src/Services/MobileAnalytics/Generated/Model/Internal/MarshallTransformations/EventMarshaller.cs +++ b/sdk/src/Services/MobileAnalytics/Generated/Model/Internal/MarshallTransformations/EventMarshaller.cs @@ -93,10 +93,10 @@ public void Marshall(Event requestObject, JsonMarshallerContext context) context.Writer.WriteObjectEnd(); } - if(requestObject.IsSetTimestampUtc()) + if(requestObject.IsSetTimestamp()) { context.Writer.WritePropertyName("timestamp"); - context.Writer.Write(Amazon.Runtime.Internal.Util.StringUtils.FromDateTimeToISO8601(requestObject.TimestampUtc)); + context.Writer.Write(Amazon.Runtime.Internal.Util.StringUtils.FromDateTimeToISO8601WithOptionalMs(requestObject.Timestamp)); } if(requestObject.IsSetVersion()) diff --git a/sdk/src/Services/MobileAnalytics/Generated/Model/Internal/MarshallTransformations/EventUnmarshaller.cs b/sdk/src/Services/MobileAnalytics/Generated/Model/Internal/MarshallTransformations/EventUnmarshaller.cs index 7091536fe383..1163002999c4 100644 --- a/sdk/src/Services/MobileAnalytics/Generated/Model/Internal/MarshallTransformations/EventUnmarshaller.cs +++ b/sdk/src/Services/MobileAnalytics/Generated/Model/Internal/MarshallTransformations/EventUnmarshaller.cs @@ -93,7 +93,7 @@ public Event Unmarshall(JsonUnmarshallerContext context) if (context.TestExpression("timestamp", targetDepth)) { var unmarshaller = Amazon.Runtime.Internal.Transform.NullableDateTimeUnmarshaller.Instance; - unmarshalledObject.TimestampUtc = unmarshaller.Unmarshall(context); + unmarshalledObject.Timestamp = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("version", targetDepth)) diff --git a/sdk/src/Services/MobileAnalytics/Generated/Model/Internal/MarshallTransformations/SessionMarshaller.cs b/sdk/src/Services/MobileAnalytics/Generated/Model/Internal/MarshallTransformations/SessionMarshaller.cs index 536c91408ee3..91078b71063b 100644 --- a/sdk/src/Services/MobileAnalytics/Generated/Model/Internal/MarshallTransformations/SessionMarshaller.cs +++ b/sdk/src/Services/MobileAnalytics/Generated/Model/Internal/MarshallTransformations/SessionMarshaller.cs @@ -60,16 +60,16 @@ public void Marshall(Session requestObject, JsonMarshallerContext context) context.Writer.Write(requestObject.Id); } - if(requestObject.IsSetStartTimestampUtc()) + if(requestObject.IsSetStartTimestamp()) { context.Writer.WritePropertyName("startTimestamp"); - context.Writer.Write(Amazon.Runtime.Internal.Util.StringUtils.FromDateTimeToISO8601(requestObject.StartTimestampUtc)); + context.Writer.Write(Amazon.Runtime.Internal.Util.StringUtils.FromDateTimeToISO8601WithOptionalMs(requestObject.StartTimestamp)); } - if(requestObject.IsSetStopTimestampUtc()) + if(requestObject.IsSetStopTimestamp()) { context.Writer.WritePropertyName("stopTimestamp"); - context.Writer.Write(Amazon.Runtime.Internal.Util.StringUtils.FromDateTimeToISO8601(requestObject.StopTimestampUtc)); + context.Writer.Write(Amazon.Runtime.Internal.Util.StringUtils.FromDateTimeToISO8601WithOptionalMs(requestObject.StopTimestamp)); } } diff --git a/sdk/src/Services/MobileAnalytics/Generated/Model/Internal/MarshallTransformations/SessionUnmarshaller.cs b/sdk/src/Services/MobileAnalytics/Generated/Model/Internal/MarshallTransformations/SessionUnmarshaller.cs index c9be7b6694be..c84394eaa8ba 100644 --- a/sdk/src/Services/MobileAnalytics/Generated/Model/Internal/MarshallTransformations/SessionUnmarshaller.cs +++ b/sdk/src/Services/MobileAnalytics/Generated/Model/Internal/MarshallTransformations/SessionUnmarshaller.cs @@ -81,13 +81,13 @@ public Session Unmarshall(JsonUnmarshallerContext context) if (context.TestExpression("startTimestamp", targetDepth)) { var unmarshaller = Amazon.Runtime.Internal.Transform.NullableDateTimeUnmarshaller.Instance; - unmarshalledObject.StartTimestampUtc = unmarshaller.Unmarshall(context); + unmarshalledObject.StartTimestamp = unmarshaller.Unmarshall(context); continue; } if (context.TestExpression("stopTimestamp", targetDepth)) { var unmarshaller = Amazon.Runtime.Internal.Transform.NullableDateTimeUnmarshaller.Instance; - unmarshalledObject.StopTimestampUtc = unmarshaller.Unmarshall(context); + unmarshalledObject.StopTimestamp = unmarshaller.Unmarshall(context); continue; } } diff --git a/sdk/src/Services/MobileAnalytics/Generated/Model/Session.cs b/sdk/src/Services/MobileAnalytics/Generated/Model/Session.cs index d5719d20a8f0..f8b7e206bbc2 100644 --- a/sdk/src/Services/MobileAnalytics/Generated/Model/Session.cs +++ b/sdk/src/Services/MobileAnalytics/Generated/Model/Session.cs @@ -36,8 +36,8 @@ public partial class Session { private long? _duration; private string _id; - private DateTime? _startTimestampUtc; - private DateTime? _stopTimestampUtc; + private DateTime? _startTimestamp; + private DateTime? _stopTimestamp; /// /// Gets and sets the property Duration. @@ -77,119 +77,41 @@ internal bool IsSetId() } /// - /// Gets and sets the property StartTimestampUtc. + /// Gets and sets the property StartTimestamp. /// /// The time the event started in ISO 8601 standard date time format. For example, 2014-06-30T19:07:47.885Z /// /// - public DateTime? StartTimestampUtc + public DateTime? StartTimestamp { - get { return this._startTimestampUtc; } - set { this._startTimestamp = this._startTimestampUtc = value; } + get { return this._startTimestamp; } + set { this._startTimestamp = value; } } - // Check to see if StartTimestampUtc property is set - internal bool IsSetStartTimestampUtc() + // Check to see if StartTimestamp property is set + internal bool IsSetStartTimestamp() { - return this._startTimestampUtc != null; + return this._startTimestamp != null; } /// - /// Gets and sets the property StopTimestampUtc. + /// Gets and sets the property StopTimestamp. /// /// The time the event terminated in ISO 8601 standard date time format. For example, /// 2014-06-30T19:07:47.885Z /// /// - public DateTime? StopTimestampUtc + public DateTime? StopTimestamp { - get { return this._stopTimestampUtc; } - set { this._stopTimestamp = this._stopTimestampUtc = value; } + get { return this._stopTimestamp; } + set { this._stopTimestamp = value; } } - // Check to see if StopTimestampUtc property is set - internal bool IsSetStopTimestampUtc() + // Check to see if StopTimestamp property is set + internal bool IsSetStopTimestamp() { - return this._stopTimestampUtc != null; + return this._stopTimestamp != null; } -#region Backwards compatible properties - private DateTime? _startTimestamp; - private DateTime? _stopTimestamp; - - /// - /// Gets and sets the property StartTimestampUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use StartTimestampUtc instead. Setting either StartTimestamp - /// or StartTimestampUtc results in both StartTimestamp and StartTimestampUtc being assigned, - /// the latest assignment to either one of the two property is reflected in the value - /// of both. StartTimestamp is provided for backwards compatibility only and assigning - /// a non-Utc DateTime to it results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The time the event started in ISO 8601 standard date time format. For example, 2014-06-30T19:07:47.885Z - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use StartTimestampUtc instead. Setting either StartTimestamp or StartTimestampUtc results in both StartTimestamp and " + - "StartTimestampUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. StartTimestamp is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? StartTimestamp - { - get { return this._startTimestamp.GetValueOrDefault(); } - set - { - this._startTimestamp = value; - if (value != null) - { - this._startTimestampUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._startTimestampUtc = null; - } - } - } - /// - /// Gets and sets the property StopTimestampUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use StopTimestampUtc instead. Setting either StopTimestamp - /// or StopTimestampUtc results in both StopTimestamp and StopTimestampUtc being assigned, - /// the latest assignment to either one of the two property is reflected in the value - /// of both. StopTimestamp is provided for backwards compatibility only and assigning - /// a non-Utc DateTime to it results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The time the event terminated in ISO 8601 standard date time format. For example, - /// 2014-06-30T19:07:47.885Z - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use StopTimestampUtc instead. Setting either StopTimestamp or StopTimestampUtc results in both StopTimestamp and " + - "StopTimestampUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. StopTimestamp is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? StopTimestamp - { - get { return this._stopTimestamp.GetValueOrDefault(); } - set - { - this._stopTimestamp = value; - if (value != null) - { - this._stopTimestampUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._stopTimestampUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/Neptune/Generated/Model/DescribeEventsRequest.cs b/sdk/src/Services/Neptune/Generated/Model/DescribeEventsRequest.cs index ef1550f8c40e..530cd5de8497 100644 --- a/sdk/src/Services/Neptune/Generated/Model/DescribeEventsRequest.cs +++ b/sdk/src/Services/Neptune/Generated/Model/DescribeEventsRequest.cs @@ -39,14 +39,14 @@ namespace Amazon.Neptune.Model public partial class DescribeEventsRequest : AmazonNeptuneRequest { private int? _duration; - private DateTime? _endTimeUtc; + private DateTime? _endTime; private List _eventCategories = AWSConfigs.InitializeCollections ? new List() : null; private List _filters = AWSConfigs.InitializeCollections ? new List() : null; private string _marker; private int? _maxRecords; private string _sourceIdentifier; private SourceType _sourceType; - private DateTime? _startTimeUtc; + private DateTime? _startTime; /// /// Gets and sets the property Duration. @@ -71,7 +71,7 @@ internal bool IsSetDuration() } /// - /// Gets and sets the property EndTimeUtc. + /// Gets and sets the property EndTime. /// /// The end of the time interval for which to retrieve events, specified in ISO 8601 /// format. For more information about ISO 8601, go to the ISO8601 @@ -82,16 +82,16 @@ internal bool IsSetDuration() /// Example: 2009-07-08T18:00Z /// /// - public DateTime? EndTimeUtc + public DateTime? EndTime { - get { return this._endTimeUtc; } - set { this._endTime = this._endTimeUtc = value; } + get { return this._endTime; } + set { this._endTime = value; } } - // Check to see if EndTimeUtc property is set - internal bool IsSetEndTimeUtc() + // Check to see if EndTime property is set + internal bool IsSetEndTime() { - return this._endTimeUtc.HasValue; + return this._endTime.HasValue; } /// @@ -249,7 +249,7 @@ internal bool IsSetSourceType() } /// - /// Gets and sets the property StartTimeUtc. + /// Gets and sets the property StartTime. /// /// The beginning of the time interval to retrieve events for, specified in ISO 8601 /// format. For more information about ISO 8601, go to the ISO8601 @@ -260,106 +260,17 @@ internal bool IsSetSourceType() /// Example: 2009-07-08T18:00Z /// /// - public DateTime? StartTimeUtc + public DateTime? StartTime { - get { return this._startTimeUtc; } - set { this._startTime = this._startTimeUtc = value; } + get { return this._startTime; } + set { this._startTime = value; } } - // Check to see if StartTimeUtc property is set - internal bool IsSetStartTimeUtc() + // Check to see if StartTime property is set + internal bool IsSetStartTime() { - return this._startTimeUtc.HasValue; + return this._startTime.HasValue; } -#region Backwards compatible properties - private DateTime? _endTime; - private DateTime? _startTime; - - /// - /// Gets and sets the property EndTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use EndTimeUtc instead. Setting either EndTime or EndTimeUtc - /// results in both EndTime and EndTimeUtc being assigned, the latest assignment to either - /// one of the two property is reflected in the value of both. EndTime is provided for - /// backwards compatibility only and assigning a non-Utc DateTime to it results in the - /// wrong timestamp being passed to the service. - /// - /// - /// - /// The end of the time interval for which to retrieve events, specified in ISO 8601 - /// format. For more information about ISO 8601, go to the ISO8601 - /// Wikipedia page. - /// - /// - /// - /// Example: 2009-07-08T18:00Z - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use EndTimeUtc instead. Setting either EndTime or EndTimeUtc results in both EndTime and " + - "EndTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. EndTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? EndTime - { - get { return this._endTime.GetValueOrDefault(); } - set - { - this._endTime = value; - if (value != null) - { - this._endTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._endTimeUtc = null; - } - } - } - /// - /// Gets and sets the property StartTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use StartTimeUtc instead. Setting either StartTime or - /// StartTimeUtc results in both StartTime and StartTimeUtc being assigned, the latest - /// assignment to either one of the two property is reflected in the value of both. StartTime - /// is provided for backwards compatibility only and assigning a non-Utc DateTime to it - /// results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The beginning of the time interval to retrieve events for, specified in ISO 8601 - /// format. For more information about ISO 8601, go to the ISO8601 - /// Wikipedia page. - /// - /// - /// - /// Example: 2009-07-08T18:00Z - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use StartTimeUtc instead. Setting either StartTime or StartTimeUtc results in both StartTime and " + - "StartTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. StartTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? StartTime - { - get { return this._startTime.GetValueOrDefault(); } - set - { - this._startTime = value; - if (value != null) - { - this._startTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._startTimeUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/Neptune/Generated/Model/Internal/MarshallTransformations/DescribeEventsRequestMarshaller.cs b/sdk/src/Services/Neptune/Generated/Model/Internal/MarshallTransformations/DescribeEventsRequestMarshaller.cs index a73fc24966b6..3f87071acf07 100644 --- a/sdk/src/Services/Neptune/Generated/Model/Internal/MarshallTransformations/DescribeEventsRequestMarshaller.cs +++ b/sdk/src/Services/Neptune/Generated/Model/Internal/MarshallTransformations/DescribeEventsRequestMarshaller.cs @@ -63,9 +63,9 @@ public IRequest Marshall(DescribeEventsRequest publicRequest) { request.Parameters.Add("Duration", StringUtils.FromInt(publicRequest.Duration)); } - if(publicRequest.IsSetEndTimeUtc()) + if(publicRequest.IsSetEndTime()) { - request.Parameters.Add("EndTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndTimeUtc)); + request.Parameters.Add("EndTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndTime)); } if(publicRequest.IsSetEventCategories()) { @@ -128,9 +128,9 @@ public IRequest Marshall(DescribeEventsRequest publicRequest) { request.Parameters.Add("SourceType", StringUtils.FromString(publicRequest.SourceType)); } - if(publicRequest.IsSetStartTimeUtc()) + if(publicRequest.IsSetStartTime()) { - request.Parameters.Add("StartTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartTimeUtc)); + request.Parameters.Add("StartTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartTime)); } } return request; diff --git a/sdk/src/Services/Neptune/Generated/Model/Internal/MarshallTransformations/RestoreDBClusterToPointInTimeRequestMarshaller.cs b/sdk/src/Services/Neptune/Generated/Model/Internal/MarshallTransformations/RestoreDBClusterToPointInTimeRequestMarshaller.cs index a830c9e140e0..03c73c2804dc 100644 --- a/sdk/src/Services/Neptune/Generated/Model/Internal/MarshallTransformations/RestoreDBClusterToPointInTimeRequestMarshaller.cs +++ b/sdk/src/Services/Neptune/Generated/Model/Internal/MarshallTransformations/RestoreDBClusterToPointInTimeRequestMarshaller.cs @@ -105,9 +105,9 @@ public IRequest Marshall(RestoreDBClusterToPointInTimeRequest publicRequest) { request.Parameters.Add("Port", StringUtils.FromInt(publicRequest.Port)); } - if(publicRequest.IsSetRestoreToTimeUtc()) + if(publicRequest.IsSetRestoreToTime()) { - request.Parameters.Add("RestoreToTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.RestoreToTimeUtc)); + request.Parameters.Add("RestoreToTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.RestoreToTime)); } if(publicRequest.IsSetRestoreType()) { diff --git a/sdk/src/Services/Neptune/Generated/Model/RestoreDBClusterToPointInTimeRequest.cs b/sdk/src/Services/Neptune/Generated/Model/RestoreDBClusterToPointInTimeRequest.cs index 48cc977efdcb..dd4b1dd59068 100644 --- a/sdk/src/Services/Neptune/Generated/Model/RestoreDBClusterToPointInTimeRequest.cs +++ b/sdk/src/Services/Neptune/Generated/Model/RestoreDBClusterToPointInTimeRequest.cs @@ -58,7 +58,7 @@ public partial class RestoreDBClusterToPointInTimeRequest : AmazonNeptuneRequest private string _kmsKeyId; private string _optionGroupName; private int? _port; - private DateTime? _restoreToTimeUtc; + private DateTime? _restoreToTime; private string _restoreType; private ServerlessV2ScalingConfiguration _serverlessV2ScalingConfiguration; private string _sourceDBClusterIdentifier; @@ -313,7 +313,7 @@ internal bool IsSetPort() } /// - /// Gets and sets the property RestoreToTimeUtc. + /// Gets and sets the property RestoreToTime. /// /// The date and time to restore the DB cluster to. /// @@ -346,16 +346,16 @@ internal bool IsSetPort() /// Example: 2015-03-07T23:45:00Z /// /// - public DateTime? RestoreToTimeUtc + public DateTime? RestoreToTime { - get { return this._restoreToTimeUtc; } - set { this._restoreToTime = this._restoreToTimeUtc = value; } + get { return this._restoreToTime; } + set { this._restoreToTime = value; } } - // Check to see if RestoreToTimeUtc property is set - internal bool IsSetRestoreToTimeUtc() + // Check to see if RestoreToTime property is set + internal bool IsSetRestoreToTime() { - return this._restoreToTimeUtc.HasValue; + return this._restoreToTime.HasValue; } /// @@ -531,73 +531,5 @@ internal bool IsSetVpcSecurityGroupIds() return this._vpcSecurityGroupIds != null && (this._vpcSecurityGroupIds.Count > 0 || !AWSConfigs.InitializeCollections); } -#region Backwards compatible properties - private DateTime? _restoreToTime; - - /// - /// Gets and sets the property RestoreToTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use RestoreToTimeUtc instead. Setting either RestoreToTime - /// or RestoreToTimeUtc results in both RestoreToTime and RestoreToTimeUtc being assigned, - /// the latest assignment to either one of the two property is reflected in the value - /// of both. RestoreToTime is provided for backwards compatibility only and assigning - /// a non-Utc DateTime to it results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The date and time to restore the DB cluster to. - /// - /// - /// - /// Valid Values: Value must be a time in Universal Coordinated Time (UTC) format - /// - /// - /// - /// Constraints: - /// - ///
  • - /// - /// Must be before the latest restorable time for the DB instance - /// - ///
  • - /// - /// Must be specified if UseLatestRestorableTime parameter is not provided - /// - ///
  • - /// - /// Cannot be specified if UseLatestRestorableTime parameter is true - /// - ///
  • - /// - /// Cannot be specified if RestoreType parameter is copy-on-write - /// - ///
- /// - /// Example: 2015-03-07T23:45:00Z - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use RestoreToTimeUtc instead. Setting either RestoreToTime or RestoreToTimeUtc results in both RestoreToTime and " + - "RestoreToTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. RestoreToTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? RestoreToTime - { - get { return this._restoreToTime.GetValueOrDefault(); } - set - { - this._restoreToTime = value; - if (value != null) - { - this._restoreToTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._restoreToTimeUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/RDS/Generated/Model/BacktrackDBClusterRequest.cs b/sdk/src/Services/RDS/Generated/Model/BacktrackDBClusterRequest.cs index 9d73fc448201..162cfb41af82 100644 --- a/sdk/src/Services/RDS/Generated/Model/BacktrackDBClusterRequest.cs +++ b/sdk/src/Services/RDS/Generated/Model/BacktrackDBClusterRequest.cs @@ -46,13 +46,13 @@ namespace Amazon.RDS.Model /// public partial class BacktrackDBClusterRequest : AmazonRDSRequest { - private DateTime? _backtrackToUtc; + private DateTime? _backtrackTo; private string _dbClusterIdentifier; private bool? _force; private bool? _useEarliestTimeOnPointInTimeUnavailable; /// - /// Gets and sets the property BacktrackToUtc. + /// Gets and sets the property BacktrackTo. /// /// The timestamp of the time to backtrack the DB cluster to, specified in ISO 8601 format. /// For more information about ISO 8601, see the ISO8601 @@ -81,16 +81,16 @@ public partial class BacktrackDBClusterRequest : AmazonRDSRequest /// /// [AWSProperty(Required=true)] - public DateTime? BacktrackToUtc + public DateTime? BacktrackTo { - get { return this._backtrackToUtc; } - set { this._backtrackTo = this._backtrackToUtc = value; } + get { return this._backtrackTo; } + set { this._backtrackTo = value; } } - // Check to see if BacktrackToUtc property is set - internal bool IsSetBacktrackToUtc() + // Check to see if BacktrackTo property is set + internal bool IsSetBacktrackTo() { - return this._backtrackToUtc.HasValue; + return this._backtrackTo.HasValue; } /// @@ -173,68 +173,5 @@ internal bool IsSetUseEarliestTimeOnPointInTimeUnavailable() return this._useEarliestTimeOnPointInTimeUnavailable.HasValue; } -#region Backwards compatible properties - private DateTime? _backtrackTo; - - /// - /// Gets and sets the property BacktrackToUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use BacktrackToUtc instead. Setting either BacktrackTo - /// or BacktrackToUtc results in both BacktrackTo and BacktrackToUtc being assigned, the - /// latest assignment to either one of the two property is reflected in the value of both. - /// BacktrackTo is provided for backwards compatibility only and assigning a non-Utc DateTime - /// to it results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The timestamp of the time to backtrack the DB cluster to, specified in ISO 8601 format. - /// For more information about ISO 8601, see the ISO8601 - /// Wikipedia page. - /// - /// - /// - /// If the specified time isn't a consistent time for the DB cluster, Aurora automatically - /// chooses the nearest possible consistent time for the DB cluster. - /// - /// - /// - /// Constraints: - /// - ///
  • - /// - /// Must contain a valid ISO 8601 timestamp. - /// - ///
  • - /// - /// Can't contain a timestamp set in the future. - /// - ///
- /// - /// Example: 2017-07-08T18:00Z - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use BacktrackToUtc instead. Setting either BacktrackTo or BacktrackToUtc results in both BacktrackTo and " + - "BacktrackToUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. BacktrackTo is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? BacktrackTo - { - get { return this._backtrackTo.GetValueOrDefault(); } - set - { - this._backtrackTo = value; - if (value != null) - { - this._backtrackToUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._backtrackToUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/RDS/Generated/Model/DescribeEventsRequest.cs b/sdk/src/Services/RDS/Generated/Model/DescribeEventsRequest.cs index ed2e8848058e..b724c709ca06 100644 --- a/sdk/src/Services/RDS/Generated/Model/DescribeEventsRequest.cs +++ b/sdk/src/Services/RDS/Generated/Model/DescribeEventsRequest.cs @@ -52,14 +52,14 @@ namespace Amazon.RDS.Model public partial class DescribeEventsRequest : AmazonRDSRequest { private int? _duration; - private DateTime? _endTimeUtc; + private DateTime? _endTime; private List _eventCategories = AWSConfigs.InitializeCollections ? new List() : null; private List _filters = AWSConfigs.InitializeCollections ? new List() : null; private string _marker; private int? _maxRecords; private string _sourceIdentifier; private SourceType _sourceType; - private DateTime? _startTimeUtc; + private DateTime? _startTime; /// /// Empty constructor used to set properties independently even when a simple constructor is available @@ -89,7 +89,7 @@ internal bool IsSetDuration() } /// - /// Gets and sets the property EndTimeUtc. + /// Gets and sets the property EndTime. /// /// The end of the time interval for which to retrieve events, specified in ISO 8601 format. /// For more information about ISO 8601, go to the ISO8601 @@ -100,16 +100,16 @@ internal bool IsSetDuration() /// Example: 2009-07-08T18:00Z /// /// - public DateTime? EndTimeUtc + public DateTime? EndTime { - get { return this._endTimeUtc; } - set { this._endTime = this._endTimeUtc = value; } + get { return this._endTime; } + set { this._endTime = value; } } - // Check to see if EndTimeUtc property is set - internal bool IsSetEndTimeUtc() + // Check to see if EndTime property is set + internal bool IsSetEndTime() { - return this._endTimeUtc.HasValue; + return this._endTime.HasValue; } /// @@ -279,7 +279,7 @@ internal bool IsSetSourceType() } /// - /// Gets and sets the property StartTimeUtc. + /// Gets and sets the property StartTime. /// /// The beginning of the time interval to retrieve events for, specified in ISO 8601 format. /// For more information about ISO 8601, go to the ISO8601 @@ -290,106 +290,17 @@ internal bool IsSetSourceType() /// Example: 2009-07-08T18:00Z /// /// - public DateTime? StartTimeUtc + public DateTime? StartTime { - get { return this._startTimeUtc; } - set { this._startTime = this._startTimeUtc = value; } + get { return this._startTime; } + set { this._startTime = value; } } - // Check to see if StartTimeUtc property is set - internal bool IsSetStartTimeUtc() + // Check to see if StartTime property is set + internal bool IsSetStartTime() { - return this._startTimeUtc.HasValue; + return this._startTime.HasValue; } -#region Backwards compatible properties - private DateTime? _endTime; - private DateTime? _startTime; - - /// - /// Gets and sets the property EndTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use EndTimeUtc instead. Setting either EndTime or EndTimeUtc - /// results in both EndTime and EndTimeUtc being assigned, the latest assignment to either - /// one of the two property is reflected in the value of both. EndTime is provided for - /// backwards compatibility only and assigning a non-Utc DateTime to it results in the - /// wrong timestamp being passed to the service. - /// - /// - /// - /// The end of the time interval for which to retrieve events, specified in ISO 8601 format. - /// For more information about ISO 8601, go to the ISO8601 - /// Wikipedia page. - /// - /// - /// - /// Example: 2009-07-08T18:00Z - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use EndTimeUtc instead. Setting either EndTime or EndTimeUtc results in both EndTime and " + - "EndTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. EndTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? EndTime - { - get { return this._endTime.GetValueOrDefault(); } - set - { - this._endTime = value; - if (value != null) - { - this._endTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._endTimeUtc = null; - } - } - } - /// - /// Gets and sets the property StartTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use StartTimeUtc instead. Setting either StartTime or - /// StartTimeUtc results in both StartTime and StartTimeUtc being assigned, the latest - /// assignment to either one of the two property is reflected in the value of both. StartTime - /// is provided for backwards compatibility only and assigning a non-Utc DateTime to it - /// results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The beginning of the time interval to retrieve events for, specified in ISO 8601 format. - /// For more information about ISO 8601, go to the ISO8601 - /// Wikipedia page. - /// - /// - /// - /// Example: 2009-07-08T18:00Z - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use StartTimeUtc instead. Setting either StartTime or StartTimeUtc results in both StartTime and " + - "StartTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. StartTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? StartTime - { - get { return this._startTime.GetValueOrDefault(); } - set - { - this._startTime = value; - if (value != null) - { - this._startTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._startTimeUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/RDS/Generated/Model/Internal/MarshallTransformations/BacktrackDBClusterRequestMarshaller.cs b/sdk/src/Services/RDS/Generated/Model/Internal/MarshallTransformations/BacktrackDBClusterRequestMarshaller.cs index 5b372fbf19b3..6888acdd5328 100644 --- a/sdk/src/Services/RDS/Generated/Model/Internal/MarshallTransformations/BacktrackDBClusterRequestMarshaller.cs +++ b/sdk/src/Services/RDS/Generated/Model/Internal/MarshallTransformations/BacktrackDBClusterRequestMarshaller.cs @@ -59,9 +59,9 @@ public IRequest Marshall(BacktrackDBClusterRequest publicRequest) if(publicRequest != null) { - if(publicRequest.IsSetBacktrackToUtc()) + if(publicRequest.IsSetBacktrackTo()) { - request.Parameters.Add("BacktrackTo", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.BacktrackToUtc)); + request.Parameters.Add("BacktrackTo", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.BacktrackTo)); } if(publicRequest.IsSetDBClusterIdentifier()) { diff --git a/sdk/src/Services/RDS/Generated/Model/Internal/MarshallTransformations/DescribeEventsRequestMarshaller.cs b/sdk/src/Services/RDS/Generated/Model/Internal/MarshallTransformations/DescribeEventsRequestMarshaller.cs index 73a768a8bf5b..d1fc76a39d7d 100644 --- a/sdk/src/Services/RDS/Generated/Model/Internal/MarshallTransformations/DescribeEventsRequestMarshaller.cs +++ b/sdk/src/Services/RDS/Generated/Model/Internal/MarshallTransformations/DescribeEventsRequestMarshaller.cs @@ -63,9 +63,9 @@ public IRequest Marshall(DescribeEventsRequest publicRequest) { request.Parameters.Add("Duration", StringUtils.FromInt(publicRequest.Duration)); } - if(publicRequest.IsSetEndTimeUtc()) + if(publicRequest.IsSetEndTime()) { - request.Parameters.Add("EndTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndTimeUtc)); + request.Parameters.Add("EndTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndTime)); } if(publicRequest.IsSetEventCategories()) { @@ -128,9 +128,9 @@ public IRequest Marshall(DescribeEventsRequest publicRequest) { request.Parameters.Add("SourceType", StringUtils.FromString(publicRequest.SourceType)); } - if(publicRequest.IsSetStartTimeUtc()) + if(publicRequest.IsSetStartTime()) { - request.Parameters.Add("StartTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartTimeUtc)); + request.Parameters.Add("StartTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartTime)); } } return request; diff --git a/sdk/src/Services/RDS/Generated/Model/Internal/MarshallTransformations/RestoreDBClusterToPointInTimeRequestMarshaller.cs b/sdk/src/Services/RDS/Generated/Model/Internal/MarshallTransformations/RestoreDBClusterToPointInTimeRequestMarshaller.cs index f0f0a808d2c2..4b0ddf94c9da 100644 --- a/sdk/src/Services/RDS/Generated/Model/Internal/MarshallTransformations/RestoreDBClusterToPointInTimeRequestMarshaller.cs +++ b/sdk/src/Services/RDS/Generated/Model/Internal/MarshallTransformations/RestoreDBClusterToPointInTimeRequestMarshaller.cs @@ -180,9 +180,9 @@ public IRequest Marshall(RestoreDBClusterToPointInTimeRequest publicRequest) request.Parameters.Add("RdsCustomClusterConfiguration" + "." + "TransitGatewayMulticastDomainId", StringUtils.FromString(publicRequest.RdsCustomClusterConfiguration.TransitGatewayMulticastDomainId)); } } - if(publicRequest.IsSetRestoreToTimeUtc()) + if(publicRequest.IsSetRestoreToTime()) { - request.Parameters.Add("RestoreToTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.RestoreToTimeUtc)); + request.Parameters.Add("RestoreToTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.RestoreToTime)); } if(publicRequest.IsSetRestoreType()) { diff --git a/sdk/src/Services/RDS/Generated/Model/Internal/MarshallTransformations/RestoreDBInstanceToPointInTimeRequestMarshaller.cs b/sdk/src/Services/RDS/Generated/Model/Internal/MarshallTransformations/RestoreDBInstanceToPointInTimeRequestMarshaller.cs index e1308f588904..00904588bc1b 100644 --- a/sdk/src/Services/RDS/Generated/Model/Internal/MarshallTransformations/RestoreDBInstanceToPointInTimeRequestMarshaller.cs +++ b/sdk/src/Services/RDS/Generated/Model/Internal/MarshallTransformations/RestoreDBInstanceToPointInTimeRequestMarshaller.cs @@ -228,9 +228,9 @@ public IRequest Marshall(RestoreDBInstanceToPointInTimeRequest publicRequest) { request.Parameters.Add("PubliclyAccessible", StringUtils.FromBool(publicRequest.PubliclyAccessible)); } - if(publicRequest.IsSetRestoreTimeUtc()) + if(publicRequest.IsSetRestoreTime()) { - request.Parameters.Add("RestoreTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.RestoreTimeUtc)); + request.Parameters.Add("RestoreTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.RestoreTime)); } if(publicRequest.IsSetSourceDBInstanceAutomatedBackupsArn()) { diff --git a/sdk/src/Services/RDS/Generated/Model/RestoreDBClusterToPointInTimeRequest.cs b/sdk/src/Services/RDS/Generated/Model/RestoreDBClusterToPointInTimeRequest.cs index ee567ac32043..bd0bb2e501fe 100644 --- a/sdk/src/Services/RDS/Generated/Model/RestoreDBClusterToPointInTimeRequest.cs +++ b/sdk/src/Services/RDS/Generated/Model/RestoreDBClusterToPointInTimeRequest.cs @@ -84,7 +84,7 @@ public partial class RestoreDBClusterToPointInTimeRequest : AmazonRDSRequest private int? _port; private bool? _publiclyAccessible; private RdsCustomClusterConfiguration _rdsCustomClusterConfiguration; - private DateTime? _restoreToTimeUtc; + private DateTime? _restoreToTime; private string _restoreType; private ScalingConfiguration _scalingConfiguration; private ServerlessV2ScalingConfiguration _serverlessV2ScalingConfiguration; @@ -974,7 +974,7 @@ internal bool IsSetRdsCustomClusterConfiguration() } /// - /// Gets and sets the property RestoreToTimeUtc. + /// Gets and sets the property RestoreToTime. /// /// The date and time to restore the DB cluster to. /// @@ -1011,16 +1011,16 @@ internal bool IsSetRdsCustomClusterConfiguration() /// Valid for: Aurora DB clusters and Multi-AZ DB clusters /// /// - public DateTime? RestoreToTimeUtc + public DateTime? RestoreToTime { - get { return this._restoreToTimeUtc; } - set { this._restoreToTime = this._restoreToTimeUtc = value; } + get { return this._restoreToTime; } + set { this._restoreToTime = value; } } - // Check to see if RestoreToTimeUtc property is set - internal bool IsSetRestoreToTimeUtc() + // Check to see if RestoreToTime property is set + internal bool IsSetRestoreToTime() { - return this._restoreToTimeUtc.HasValue; + return this._restoreToTime.HasValue; } /// @@ -1246,77 +1246,5 @@ internal bool IsSetVpcSecurityGroupIds() return this._vpcSecurityGroupIds != null && (this._vpcSecurityGroupIds.Count > 0 || !AWSConfigs.InitializeCollections); } -#region Backwards compatible properties - private DateTime? _restoreToTime; - - /// - /// Gets and sets the property RestoreToTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use RestoreToTimeUtc instead. Setting either RestoreToTime - /// or RestoreToTimeUtc results in both RestoreToTime and RestoreToTimeUtc being assigned, - /// the latest assignment to either one of the two property is reflected in the value - /// of both. RestoreToTime is provided for backwards compatibility only and assigning - /// a non-Utc DateTime to it results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The date and time to restore the DB cluster to. - /// - /// - /// - /// Valid Values: Value must be a time in Universal Coordinated Time (UTC) format - /// - /// - /// - /// Constraints: - /// - ///
  • - /// - /// Must be before the latest restorable time for the DB instance - /// - ///
  • - /// - /// Must be specified if UseLatestRestorableTime parameter isn't provided - /// - ///
  • - /// - /// Can't be specified if the UseLatestRestorableTime parameter is enabled - /// - ///
  • - /// - /// Can't be specified if the RestoreType parameter is copy-on-write - /// - ///
- /// - /// Example: 2015-03-07T23:45:00Z - /// - /// - /// - /// Valid for: Aurora DB clusters and Multi-AZ DB clusters - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use RestoreToTimeUtc instead. Setting either RestoreToTime or RestoreToTimeUtc results in both RestoreToTime and " + - "RestoreToTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. RestoreToTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? RestoreToTime - { - get { return this._restoreToTime.GetValueOrDefault(); } - set - { - this._restoreToTime = value; - if (value != null) - { - this._restoreToTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._restoreToTimeUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/RDS/Generated/Model/RestoreDBInstanceToPointInTimeRequest.cs b/sdk/src/Services/RDS/Generated/Model/RestoreDBInstanceToPointInTimeRequest.cs index c94ea38f0556..8148ec07941d 100644 --- a/sdk/src/Services/RDS/Generated/Model/RestoreDBInstanceToPointInTimeRequest.cs +++ b/sdk/src/Services/RDS/Generated/Model/RestoreDBInstanceToPointInTimeRequest.cs @@ -87,7 +87,7 @@ public partial class RestoreDBInstanceToPointInTimeRequest : AmazonRDSRequest private int? _port; private List _processorFeatures = AWSConfigs.InitializeCollections ? new List() : null; private bool? _publiclyAccessible; - private DateTime? _restoreTimeUtc; + private DateTime? _restoreTime; private string _sourceDBInstanceAutomatedBackupsArn; private string _sourceDBInstanceIdentifier; private string _sourceDbiResourceId; @@ -1242,7 +1242,7 @@ internal bool IsSetPubliclyAccessible() } /// - /// Gets and sets the property RestoreTimeUtc. + /// Gets and sets the property RestoreTime. /// /// The date and time to restore from. /// @@ -1267,16 +1267,16 @@ internal bool IsSetPubliclyAccessible() /// Example: 2009-09-07T23:45:00Z /// /// - public DateTime? RestoreTimeUtc + public DateTime? RestoreTime { - get { return this._restoreTimeUtc; } - set { this._restoreTime = this._restoreTimeUtc = value; } + get { return this._restoreTime; } + set { this._restoreTime = value; } } - // Check to see if RestoreTimeUtc property is set - internal bool IsSetRestoreTimeUtc() + // Check to see if RestoreTime property is set + internal bool IsSetRestoreTime() { - return this._restoreTimeUtc.HasValue; + return this._restoreTime.HasValue; } /// @@ -1573,65 +1573,5 @@ internal bool IsSetVpcSecurityGroupIds() return this._vpcSecurityGroupIds != null && (this._vpcSecurityGroupIds.Count > 0 || !AWSConfigs.InitializeCollections); } -#region Backwards compatible properties - private DateTime? _restoreTime; - - /// - /// Gets and sets the property RestoreTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use RestoreTimeUtc instead. Setting either RestoreTime - /// or RestoreTimeUtc results in both RestoreTime and RestoreTimeUtc being assigned, the - /// latest assignment to either one of the two property is reflected in the value of both. - /// RestoreTime is provided for backwards compatibility only and assigning a non-Utc DateTime - /// to it results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The date and time to restore from. - /// - /// - /// - /// Constraints: - /// - ///
  • - /// - /// Must be a time in Universal Coordinated Time (UTC) format. - /// - ///
  • - /// - /// Must be before the latest restorable time for the DB instance. - /// - ///
  • - /// - /// Can't be specified if the UseLatestRestorableTime parameter is enabled. - /// - ///
- /// - /// Example: 2009-09-07T23:45:00Z - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use RestoreTimeUtc instead. Setting either RestoreTime or RestoreTimeUtc results in both RestoreTime and " + - "RestoreTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. RestoreTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? RestoreTime - { - get { return this._restoreTime.GetValueOrDefault(); } - set - { - this._restoreTime = value; - if (value != null) - { - this._restoreTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._restoreTimeUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/Redshift/Generated/Model/DescribeClusterSnapshotsRequest.cs b/sdk/src/Services/Redshift/Generated/Model/DescribeClusterSnapshotsRequest.cs index 44cfb4a4a024..b482d34105d5 100644 --- a/sdk/src/Services/Redshift/Generated/Model/DescribeClusterSnapshotsRequest.cs +++ b/sdk/src/Services/Redshift/Generated/Model/DescribeClusterSnapshotsRequest.cs @@ -55,7 +55,7 @@ public partial class DescribeClusterSnapshotsRequest : AmazonRedshiftRequest { private bool? _clusterExists; private string _clusterIdentifier; - private DateTime? _endTimeUtc; + private DateTime? _endTime; private string _marker; private int? _maxRecords; private string _ownerAccount; @@ -63,7 +63,7 @@ public partial class DescribeClusterSnapshotsRequest : AmazonRedshiftRequest private string _snapshotIdentifier; private string _snapshotType; private List _sortingEntities = AWSConfigs.InitializeCollections ? new List() : null; - private DateTime? _startTimeUtc; + private DateTime? _startTime; private List _tagKeys = AWSConfigs.InitializeCollections ? new List() : null; private List _tagValues = AWSConfigs.InitializeCollections ? new List() : null; @@ -129,7 +129,7 @@ internal bool IsSetClusterIdentifier() } /// - /// Gets and sets the property EndTimeUtc. + /// Gets and sets the property EndTime. /// /// A time value that requests only snapshots created at or before the specified time. /// The time value is specified in ISO 8601 format. For more information about ISO 8601, @@ -141,16 +141,16 @@ internal bool IsSetClusterIdentifier() /// Example: 2012-07-16T18:00:00Z /// /// - public DateTime? EndTimeUtc + public DateTime? EndTime { - get { return this._endTimeUtc; } - set { this._endTime = this._endTimeUtc = value; } + get { return this._endTime; } + set { this._endTime = value; } } - // Check to see if EndTimeUtc property is set - internal bool IsSetEndTimeUtc() + // Check to see if EndTime property is set + internal bool IsSetEndTime() { - return this._endTimeUtc.HasValue; + return this._endTime.HasValue; } /// @@ -306,7 +306,7 @@ internal bool IsSetSortingEntities() } /// - /// Gets and sets the property StartTimeUtc. + /// Gets and sets the property StartTime. /// /// A value that requests only snapshots created at or after the specified time. The time /// value is specified in ISO 8601 format. For more information about ISO 8601, go to @@ -317,16 +317,16 @@ internal bool IsSetSortingEntities() /// Example: 2012-07-16T18:00:00Z /// /// - public DateTime? StartTimeUtc + public DateTime? StartTime { - get { return this._startTimeUtc; } - set { this._startTime = this._startTimeUtc = value; } + get { return this._startTime; } + set { this._startTime = value; } } - // Check to see if StartTimeUtc property is set - internal bool IsSetStartTimeUtc() + // Check to see if StartTime property is set + internal bool IsSetStartTime() { - return this._startTimeUtc.HasValue; + return this._startTime.HasValue; } /// @@ -374,95 +374,5 @@ internal bool IsSetTagValues() return this._tagValues != null && (this._tagValues.Count > 0 || !AWSConfigs.InitializeCollections); } -#region Backwards compatible properties - private DateTime? _endTime; - private DateTime? _startTime; - - /// - /// Gets and sets the property EndTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use EndTimeUtc instead. Setting either EndTime or EndTimeUtc - /// results in both EndTime and EndTimeUtc being assigned, the latest assignment to either - /// one of the two property is reflected in the value of both. EndTime is provided for - /// backwards compatibility only and assigning a non-Utc DateTime to it results in the - /// wrong timestamp being passed to the service. - /// - /// - /// - /// A time value that requests only snapshots created at or before the specified time. - /// The time value is specified in ISO 8601 format. For more information about ISO 8601, - /// go to the ISO8601 Wikipedia page. - /// - /// - /// - /// - /// Example: 2012-07-16T18:00:00Z - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use EndTimeUtc instead. Setting either EndTime or EndTimeUtc results in both EndTime and " + - "EndTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. EndTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? EndTime - { - get { return this._endTime.GetValueOrDefault(); } - set - { - this._endTime = value; - if (value != null) - { - this._endTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._endTimeUtc = null; - } - } - } - /// - /// Gets and sets the property StartTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use StartTimeUtc instead. Setting either StartTime or - /// StartTimeUtc results in both StartTime and StartTimeUtc being assigned, the latest - /// assignment to either one of the two property is reflected in the value of both. StartTime - /// is provided for backwards compatibility only and assigning a non-Utc DateTime to it - /// results in the wrong timestamp being passed to the service. - /// - /// - /// - /// A value that requests only snapshots created at or after the specified time. The time - /// value is specified in ISO 8601 format. For more information about ISO 8601, go to - /// the ISO8601 Wikipedia page. - /// - /// - /// - /// Example: 2012-07-16T18:00:00Z - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use StartTimeUtc instead. Setting either StartTime or StartTimeUtc results in both StartTime and " + - "StartTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. StartTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? StartTime - { - get { return this._startTime.GetValueOrDefault(); } - set - { - this._startTime = value; - if (value != null) - { - this._startTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._startTimeUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/Redshift/Generated/Model/DescribeEventsRequest.cs b/sdk/src/Services/Redshift/Generated/Model/DescribeEventsRequest.cs index 86d17bd9dca0..426c9d5b3731 100644 --- a/sdk/src/Services/Redshift/Generated/Model/DescribeEventsRequest.cs +++ b/sdk/src/Services/Redshift/Generated/Model/DescribeEventsRequest.cs @@ -39,12 +39,12 @@ namespace Amazon.Redshift.Model public partial class DescribeEventsRequest : AmazonRedshiftRequest { private int? _duration; - private DateTime? _endTimeUtc; + private DateTime? _endTime; private string _marker; private int? _maxRecords; private string _sourceIdentifier; private SourceType _sourceType; - private DateTime? _startTimeUtc; + private DateTime? _startTime; /// /// Gets and sets the property Duration. @@ -71,7 +71,7 @@ internal bool IsSetDuration() } /// - /// Gets and sets the property EndTimeUtc. + /// Gets and sets the property EndTime. /// /// The end of the time interval for which to retrieve events, specified in ISO 8601 format. /// For more information about ISO 8601, go to the ISO8601 @@ -82,16 +82,16 @@ internal bool IsSetDuration() /// Example: 2009-07-08T18:00Z /// /// - public DateTime? EndTimeUtc + public DateTime? EndTime { - get { return this._endTimeUtc; } - set { this._endTime = this._endTimeUtc = value; } + get { return this._endTime; } + set { this._endTime = value; } } - // Check to see if EndTimeUtc property is set - internal bool IsSetEndTimeUtc() + // Check to see if EndTime property is set + internal bool IsSetEndTime() { - return this._endTimeUtc.HasValue; + return this._endTime.HasValue; } /// @@ -239,7 +239,7 @@ internal bool IsSetSourceType() } /// - /// Gets and sets the property StartTimeUtc. + /// Gets and sets the property StartTime. /// /// The beginning of the time interval to retrieve events for, specified in ISO 8601 format. /// For more information about ISO 8601, go to the ISO8601 @@ -250,106 +250,17 @@ internal bool IsSetSourceType() /// Example: 2009-07-08T18:00Z /// /// - public DateTime? StartTimeUtc + public DateTime? StartTime { - get { return this._startTimeUtc; } - set { this._startTime = this._startTimeUtc = value; } + get { return this._startTime; } + set { this._startTime = value; } } - // Check to see if StartTimeUtc property is set - internal bool IsSetStartTimeUtc() + // Check to see if StartTime property is set + internal bool IsSetStartTime() { - return this._startTimeUtc.HasValue; + return this._startTime.HasValue; } -#region Backwards compatible properties - private DateTime? _endTime; - private DateTime? _startTime; - - /// - /// Gets and sets the property EndTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use EndTimeUtc instead. Setting either EndTime or EndTimeUtc - /// results in both EndTime and EndTimeUtc being assigned, the latest assignment to either - /// one of the two property is reflected in the value of both. EndTime is provided for - /// backwards compatibility only and assigning a non-Utc DateTime to it results in the - /// wrong timestamp being passed to the service. - /// - /// - /// - /// The end of the time interval for which to retrieve events, specified in ISO 8601 format. - /// For more information about ISO 8601, go to the ISO8601 - /// Wikipedia page. - /// - /// - /// - /// Example: 2009-07-08T18:00Z - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use EndTimeUtc instead. Setting either EndTime or EndTimeUtc results in both EndTime and " + - "EndTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. EndTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? EndTime - { - get { return this._endTime.GetValueOrDefault(); } - set - { - this._endTime = value; - if (value != null) - { - this._endTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._endTimeUtc = null; - } - } - } - /// - /// Gets and sets the property StartTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use StartTimeUtc instead. Setting either StartTime or - /// StartTimeUtc results in both StartTime and StartTimeUtc being assigned, the latest - /// assignment to either one of the two property is reflected in the value of both. StartTime - /// is provided for backwards compatibility only and assigning a non-Utc DateTime to it - /// results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The beginning of the time interval to retrieve events for, specified in ISO 8601 format. - /// For more information about ISO 8601, go to the ISO8601 - /// Wikipedia page. - /// - /// - /// - /// Example: 2009-07-08T18:00Z - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use StartTimeUtc instead. Setting either StartTime or StartTimeUtc results in both StartTime and " + - "StartTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. StartTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? StartTime - { - get { return this._startTime.GetValueOrDefault(); } - set - { - this._startTime = value; - if (value != null) - { - this._startTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._startTimeUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/DescribeClusterSnapshotsRequestMarshaller.cs b/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/DescribeClusterSnapshotsRequestMarshaller.cs index 306b76788373..e9383401213e 100644 --- a/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/DescribeClusterSnapshotsRequestMarshaller.cs +++ b/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/DescribeClusterSnapshotsRequestMarshaller.cs @@ -67,9 +67,9 @@ public IRequest Marshall(DescribeClusterSnapshotsRequest publicRequest) { request.Parameters.Add("ClusterIdentifier", StringUtils.FromString(publicRequest.ClusterIdentifier)); } - if(publicRequest.IsSetEndTimeUtc()) + if(publicRequest.IsSetEndTime()) { - request.Parameters.Add("EndTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndTimeUtc)); + request.Parameters.Add("EndTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndTime)); } if(publicRequest.IsSetMarker()) { @@ -116,9 +116,9 @@ public IRequest Marshall(DescribeClusterSnapshotsRequest publicRequest) } } } - if(publicRequest.IsSetStartTimeUtc()) + if(publicRequest.IsSetStartTime()) { - request.Parameters.Add("StartTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartTimeUtc)); + request.Parameters.Add("StartTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartTime)); } if(publicRequest.IsSetTagKeys()) { diff --git a/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/DescribeEventsRequestMarshaller.cs b/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/DescribeEventsRequestMarshaller.cs index 14f2b3157981..e675b4ca212c 100644 --- a/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/DescribeEventsRequestMarshaller.cs +++ b/sdk/src/Services/Redshift/Generated/Model/Internal/MarshallTransformations/DescribeEventsRequestMarshaller.cs @@ -63,9 +63,9 @@ public IRequest Marshall(DescribeEventsRequest publicRequest) { request.Parameters.Add("Duration", StringUtils.FromInt(publicRequest.Duration)); } - if(publicRequest.IsSetEndTimeUtc()) + if(publicRequest.IsSetEndTime()) { - request.Parameters.Add("EndTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndTimeUtc)); + request.Parameters.Add("EndTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndTime)); } if(publicRequest.IsSetMarker()) { @@ -83,9 +83,9 @@ public IRequest Marshall(DescribeEventsRequest publicRequest) { request.Parameters.Add("SourceType", StringUtils.FromString(publicRequest.SourceType)); } - if(publicRequest.IsSetStartTimeUtc()) + if(publicRequest.IsSetStartTime()) { - request.Parameters.Add("StartTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartTimeUtc)); + request.Parameters.Add("StartTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartTime)); } } return request; diff --git a/sdk/src/Services/SimpleEmail/Generated/Model/Internal/MarshallTransformations/SendBounceRequestMarshaller.cs b/sdk/src/Services/SimpleEmail/Generated/Model/Internal/MarshallTransformations/SendBounceRequestMarshaller.cs index b7736826cef6..71bc00f1b693 100644 --- a/sdk/src/Services/SimpleEmail/Generated/Model/Internal/MarshallTransformations/SendBounceRequestMarshaller.cs +++ b/sdk/src/Services/SimpleEmail/Generated/Model/Internal/MarshallTransformations/SendBounceRequestMarshaller.cs @@ -115,9 +115,9 @@ public IRequest Marshall(SendBounceRequest publicRequest) { request.Parameters.Add("BouncedRecipientInfoList" + "." + "member" + "." + publicRequestlistValueIndex + "." + "RecipientDsnFields" + "." + "FinalRecipient", StringUtils.FromString(publicRequestlistValue.RecipientDsnFields.FinalRecipient)); } - if(publicRequestlistValue.RecipientDsnFields.IsSetLastAttemptDateUtc()) + if(publicRequestlistValue.RecipientDsnFields.IsSetLastAttemptDate()) { - request.Parameters.Add("BouncedRecipientInfoList" + "." + "member" + "." + publicRequestlistValueIndex + "." + "RecipientDsnFields" + "." + "LastAttemptDate", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequestlistValue.RecipientDsnFields.LastAttemptDateUtc)); + request.Parameters.Add("BouncedRecipientInfoList" + "." + "member" + "." + publicRequestlistValueIndex + "." + "RecipientDsnFields" + "." + "LastAttemptDate", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequestlistValue.RecipientDsnFields.LastAttemptDate)); } if(publicRequestlistValue.RecipientDsnFields.IsSetRemoteMta()) { @@ -146,9 +146,9 @@ public IRequest Marshall(SendBounceRequest publicRequest) } if(publicRequest.IsSetMessageDsn()) { - if(publicRequest.MessageDsn.IsSetArrivalDateUtc()) + if(publicRequest.MessageDsn.IsSetArrivalDate()) { - request.Parameters.Add("MessageDsn" + "." + "ArrivalDate", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.MessageDsn.ArrivalDateUtc)); + request.Parameters.Add("MessageDsn" + "." + "ArrivalDate", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.MessageDsn.ArrivalDate)); } if(publicRequest.MessageDsn.IsSetExtensionFields()) { diff --git a/sdk/src/Services/SimpleEmail/Generated/Model/MessageDsn.cs b/sdk/src/Services/SimpleEmail/Generated/Model/MessageDsn.cs index 075a17502fe7..dfa3a044ede7 100644 --- a/sdk/src/Services/SimpleEmail/Generated/Model/MessageDsn.cs +++ b/sdk/src/Services/SimpleEmail/Generated/Model/MessageDsn.cs @@ -41,27 +41,27 @@ namespace Amazon.SimpleEmail.Model /// public partial class MessageDsn { - private DateTime? _arrivalDateUtc; + private DateTime? _arrivalDate; private List _extensionFields = AWSConfigs.InitializeCollections ? new List() : null; private string _reportingMta; /// - /// Gets and sets the property ArrivalDateUtc. + /// Gets and sets the property ArrivalDate. /// /// When the message was received by the reporting mail transfer agent (MTA), in RFC /// 822 date-time format. /// /// - public DateTime? ArrivalDateUtc + public DateTime? ArrivalDate { - get { return this._arrivalDateUtc; } - set { this._arrivalDate = this._arrivalDateUtc = value; } + get { return this._arrivalDate; } + set { this._arrivalDate = value; } } - // Check to see if ArrivalDateUtc property is set - internal bool IsSetArrivalDateUtc() + // Check to see if ArrivalDate property is set + internal bool IsSetArrivalDate() { - return this._arrivalDateUtc.HasValue; + return this._arrivalDate.HasValue; } /// @@ -103,46 +103,5 @@ internal bool IsSetReportingMta() return this._reportingMta != null; } -#region Backwards compatible properties - private DateTime? _arrivalDate; - - /// - /// Gets and sets the property ArrivalDateUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use ArrivalDateUtc instead. Setting either ArrivalDate - /// or ArrivalDateUtc results in both ArrivalDate and ArrivalDateUtc being assigned, the - /// latest assignment to either one of the two property is reflected in the value of both. - /// ArrivalDate is provided for backwards compatibility only and assigning a non-Utc DateTime - /// to it results in the wrong timestamp being passed to the service. - /// - /// - /// - /// When the message was received by the reporting mail transfer agent (MTA), in RFC - /// 822 date-time format. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use ArrivalDateUtc instead. Setting either ArrivalDate or ArrivalDateUtc results in both ArrivalDate and " + - "ArrivalDateUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. ArrivalDate is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? ArrivalDate - { - get { return this._arrivalDate.GetValueOrDefault(); } - set - { - this._arrivalDate = value; - if (value != null) - { - this._arrivalDateUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._arrivalDateUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/SimpleEmail/Generated/Model/RecipientDsnFields.cs b/sdk/src/Services/SimpleEmail/Generated/Model/RecipientDsnFields.cs index 0d9358ffad2d..2fbbe770e340 100644 --- a/sdk/src/Services/SimpleEmail/Generated/Model/RecipientDsnFields.cs +++ b/sdk/src/Services/SimpleEmail/Generated/Model/RecipientDsnFields.cs @@ -45,7 +45,7 @@ public partial class RecipientDsnFields private string _diagnosticCode; private List _extensionFields = AWSConfigs.InitializeCollections ? new List() : null; private string _finalRecipient; - private DateTime? _lastAttemptDateUtc; + private DateTime? _lastAttemptDate; private string _remoteMta; private string _status; @@ -137,22 +137,22 @@ internal bool IsSetFinalRecipient() } /// - /// Gets and sets the property LastAttemptDateUtc. + /// Gets and sets the property LastAttemptDate. /// /// The time the final delivery attempt was made, in RFC /// 822 date-time format. /// /// - public DateTime? LastAttemptDateUtc + public DateTime? LastAttemptDate { - get { return this._lastAttemptDateUtc; } - set { this._lastAttemptDate = this._lastAttemptDateUtc = value; } + get { return this._lastAttemptDate; } + set { this._lastAttemptDate = value; } } - // Check to see if LastAttemptDateUtc property is set - internal bool IsSetLastAttemptDateUtc() + // Check to see if LastAttemptDate property is set + internal bool IsSetLastAttemptDate() { - return this._lastAttemptDateUtc.HasValue; + return this._lastAttemptDate.HasValue; } /// @@ -195,47 +195,5 @@ internal bool IsSetStatus() return this._status != null; } -#region Backwards compatible properties - private DateTime? _lastAttemptDate; - - /// - /// Gets and sets the property LastAttemptDateUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use LastAttemptDateUtc instead. Setting either LastAttemptDate - /// or LastAttemptDateUtc results in both LastAttemptDate and LastAttemptDateUtc being - /// assigned, the latest assignment to either one of the two property is reflected in - /// the value of both. LastAttemptDate is provided for backwards compatibility only and - /// assigning a non-Utc DateTime to it results in the wrong timestamp being passed to - /// the service. - /// - /// - /// - /// The time the final delivery attempt was made, in RFC - /// 822 date-time format. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use LastAttemptDateUtc instead. Setting either LastAttemptDate or LastAttemptDateUtc results in both LastAttemptDate and " + - "LastAttemptDateUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. LastAttemptDate is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? LastAttemptDate - { - get { return this._lastAttemptDate.GetValueOrDefault(); } - set - { - this._lastAttemptDate = value; - if (value != null) - { - this._lastAttemptDateUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._lastAttemptDateUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/WorkDocs/Generated/Model/DescribeActivitiesRequest.cs b/sdk/src/Services/WorkDocs/Generated/Model/DescribeActivitiesRequest.cs index 3bde104fbf41..5997baf25320 100644 --- a/sdk/src/Services/WorkDocs/Generated/Model/DescribeActivitiesRequest.cs +++ b/sdk/src/Services/WorkDocs/Generated/Model/DescribeActivitiesRequest.cs @@ -37,13 +37,13 @@ public partial class DescribeActivitiesRequest : AmazonWorkDocsRequest { private string _activityTypes; private string _authenticationToken; - private DateTime? _endTimeUtc; + private DateTime? _endTime; private bool? _includeIndirectActivities; private int? _limit; private string _marker; private string _organizationId; private string _resourceId; - private DateTime? _startTimeUtc; + private DateTime? _startTime; private string _userId; /// @@ -87,22 +87,22 @@ internal bool IsSetAuthenticationToken() } /// - /// Gets and sets the property EndTimeUtc. + /// Gets and sets the property EndTime. /// /// The timestamp that determines the end time of the activities. The response includes /// the activities performed before the specified timestamp. /// /// - public DateTime? EndTimeUtc + public DateTime? EndTime { - get { return this._endTimeUtc; } - set { this._endTime = this._endTimeUtc = value; } + get { return this._endTime; } + set { this._endTime = value; } } - // Check to see if EndTimeUtc property is set - internal bool IsSetEndTimeUtc() + // Check to see if EndTime property is set + internal bool IsSetEndTime() { - return this._endTimeUtc.HasValue; + return this._endTime.HasValue; } /// @@ -204,22 +204,22 @@ internal bool IsSetResourceId() } /// - /// Gets and sets the property StartTimeUtc. + /// Gets and sets the property StartTime. /// /// The timestamp that determines the starting time of the activities. The response includes /// the activities performed after the specified timestamp. /// /// - public DateTime? StartTimeUtc + public DateTime? StartTime { - get { return this._startTimeUtc; } - set { this._startTime = this._startTimeUtc = value; } + get { return this._startTime; } + set { this._startTime = value; } } - // Check to see if StartTimeUtc property is set - internal bool IsSetStartTimeUtc() + // Check to see if StartTime property is set + internal bool IsSetStartTime() { - return this._startTimeUtc.HasValue; + return this._startTime.HasValue; } /// @@ -243,84 +243,5 @@ internal bool IsSetUserId() return this._userId != null; } -#region Backwards compatible properties - private DateTime? _endTime; - private DateTime? _startTime; - - /// - /// Gets and sets the property EndTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use EndTimeUtc instead. Setting either EndTime or EndTimeUtc - /// results in both EndTime and EndTimeUtc being assigned, the latest assignment to either - /// one of the two property is reflected in the value of both. EndTime is provided for - /// backwards compatibility only and assigning a non-Utc DateTime to it results in the - /// wrong timestamp being passed to the service. - /// - /// - /// - /// The timestamp that determines the end time of the activities. The response includes - /// the activities performed before the specified timestamp. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use EndTimeUtc instead. Setting either EndTime or EndTimeUtc results in both EndTime and " + - "EndTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. EndTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? EndTime - { - get { return this._endTime.GetValueOrDefault(); } - set - { - this._endTime = value; - if (value != null) - { - this._endTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._endTimeUtc = null; - } - } - } - /// - /// Gets and sets the property StartTimeUtc. - /// - /// This property is deprecated. Setting this property results in non-UTC DateTimes not - /// being marshalled correctly. Use StartTimeUtc instead. Setting either StartTime or - /// StartTimeUtc results in both StartTime and StartTimeUtc being assigned, the latest - /// assignment to either one of the two property is reflected in the value of both. StartTime - /// is provided for backwards compatibility only and assigning a non-Utc DateTime to it - /// results in the wrong timestamp being passed to the service. - /// - /// - /// - /// The timestamp that determines the starting time of the activities. The response includes - /// the activities performed after the specified timestamp. - /// - /// - [Obsolete("Setting this property results in non-UTC DateTimes not being marshalled correctly. " + - "Use StartTimeUtc instead. Setting either StartTime or StartTimeUtc results in both StartTime and " + - "StartTimeUtc being assigned, the latest assignment to either one of the two property is " + - "reflected in the value of both. StartTime is provided for backwards compatibility only and " + - "assigning a non-Utc DateTime to it results in the wrong timestamp being passed to the service.", false)] - public DateTime? StartTime - { - get { return this._startTime.GetValueOrDefault(); } - set - { - this._startTime = value; - if (value != null) - { - this._startTimeUtc = new DateTime(value.Value.Ticks, DateTimeKind.Utc); - } - else - { - this._startTimeUtc = null; - } - } - } -#endregion } } \ No newline at end of file diff --git a/sdk/src/Services/WorkDocs/Generated/Model/Internal/MarshallTransformations/DescribeActivitiesRequestMarshaller.cs b/sdk/src/Services/WorkDocs/Generated/Model/Internal/MarshallTransformations/DescribeActivitiesRequestMarshaller.cs index fe6af380555f..f65350aa788a 100644 --- a/sdk/src/Services/WorkDocs/Generated/Model/Internal/MarshallTransformations/DescribeActivitiesRequestMarshaller.cs +++ b/sdk/src/Services/WorkDocs/Generated/Model/Internal/MarshallTransformations/DescribeActivitiesRequestMarshaller.cs @@ -63,8 +63,8 @@ public IRequest Marshall(DescribeActivitiesRequest publicRequest) if (publicRequest.IsSetActivityTypes()) request.Parameters.Add("activityTypes", StringUtils.FromString(publicRequest.ActivityTypes)); - if (publicRequest.IsSetEndTimeUtc()) - request.Parameters.Add("endTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndTimeUtc)); + if (publicRequest.IsSetEndTime()) + request.Parameters.Add("endTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.EndTime)); if (publicRequest.IsSetIncludeIndirectActivities()) request.Parameters.Add("includeIndirectActivities", StringUtils.FromBool(publicRequest.IncludeIndirectActivities)); @@ -81,8 +81,8 @@ public IRequest Marshall(DescribeActivitiesRequest publicRequest) if (publicRequest.IsSetResourceId()) request.Parameters.Add("resourceId", StringUtils.FromString(publicRequest.ResourceId)); - if (publicRequest.IsSetStartTimeUtc()) - request.Parameters.Add("startTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartTimeUtc)); + if (publicRequest.IsSetStartTime()) + request.Parameters.Add("startTime", StringUtils.FromDateTimeToISO8601WithOptionalMs(publicRequest.StartTime)); if (publicRequest.IsSetUserId()) request.Parameters.Add("userId", StringUtils.FromString(publicRequest.UserId)); diff --git a/sdk/test/Services/RestJsonProtocol/Generated/Model/Internal/MarshallTransformations/TimestampFormatHeadersResponseUnmarshaller.cs b/sdk/test/Services/RestJsonProtocol/Generated/Model/Internal/MarshallTransformations/TimestampFormatHeadersResponseUnmarshaller.cs index ead463b0a403..1d26b94dbd8c 100644 --- a/sdk/test/Services/RestJsonProtocol/Generated/Model/Internal/MarshallTransformations/TimestampFormatHeadersResponseUnmarshaller.cs +++ b/sdk/test/Services/RestJsonProtocol/Generated/Model/Internal/MarshallTransformations/TimestampFormatHeadersResponseUnmarshaller.cs @@ -49,19 +49,19 @@ public override AmazonWebServiceResponse Unmarshall(JsonUnmarshallerContext cont TimestampFormatHeadersResponse response = new TimestampFormatHeadersResponse(); if (context.ResponseData.IsHeaderPresent("X-defaultFormat")) - response.DefaultFormat = DateTime.Parse(context.ResponseData.GetHeaderValue("X-defaultFormat"), CultureInfo.InvariantCulture); + response.DefaultFormat = DateTime.Parse(context.ResponseData.GetHeaderValue("X-defaultFormat"), CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal); if (context.ResponseData.IsHeaderPresent("X-memberDateTime")) - response.MemberDateTime = DateTime.Parse(context.ResponseData.GetHeaderValue("X-memberDateTime"), CultureInfo.InvariantCulture); + response.MemberDateTime = DateTime.Parse(context.ResponseData.GetHeaderValue("X-memberDateTime"), CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal); if (context.ResponseData.IsHeaderPresent("X-memberEpochSeconds")) response.MemberEpochSeconds = Amazon.Util.AWSSDKUtils.ConvertFromUnixEpochSeconds(int.Parse(context.ResponseData.GetHeaderValue("X-memberEpochSeconds"), CultureInfo.InvariantCulture)); if (context.ResponseData.IsHeaderPresent("X-memberHttpDate")) - response.MemberHttpDate = DateTime.Parse(context.ResponseData.GetHeaderValue("X-memberHttpDate"), CultureInfo.InvariantCulture); + response.MemberHttpDate = DateTime.Parse(context.ResponseData.GetHeaderValue("X-memberHttpDate"), CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal); if (context.ResponseData.IsHeaderPresent("X-targetDateTime")) - response.TargetDateTime = DateTime.Parse(context.ResponseData.GetHeaderValue("X-targetDateTime"), CultureInfo.InvariantCulture); + response.TargetDateTime = DateTime.Parse(context.ResponseData.GetHeaderValue("X-targetDateTime"), CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal); if (context.ResponseData.IsHeaderPresent("X-targetEpochSeconds")) response.TargetEpochSeconds = Amazon.Util.AWSSDKUtils.ConvertFromUnixEpochSeconds(int.Parse(context.ResponseData.GetHeaderValue("X-targetEpochSeconds"), CultureInfo.InvariantCulture)); if (context.ResponseData.IsHeaderPresent("X-targetHttpDate")) - response.TargetHttpDate = DateTime.Parse(context.ResponseData.GetHeaderValue("X-targetHttpDate"), CultureInfo.InvariantCulture); + response.TargetHttpDate = DateTime.Parse(context.ResponseData.GetHeaderValue("X-targetHttpDate"), CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal); return response; } diff --git a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/TimestampFormatHeadersResponseUnmarshaller.cs b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/TimestampFormatHeadersResponseUnmarshaller.cs index 33235a5d0aa1..9c316ed11fff 100644 --- a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/TimestampFormatHeadersResponseUnmarshaller.cs +++ b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/TimestampFormatHeadersResponseUnmarshaller.cs @@ -47,19 +47,19 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte { TimestampFormatHeadersResponse response = new TimestampFormatHeadersResponse(); if (context.ResponseData.IsHeaderPresent("X-defaultFormat")) - response.DefaultFormat = DateTime.Parse(context.ResponseData.GetHeaderValue("X-defaultFormat"), CultureInfo.InvariantCulture); + response.DefaultFormat = DateTime.Parse(context.ResponseData.GetHeaderValue("X-defaultFormat"), CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal); if (context.ResponseData.IsHeaderPresent("X-memberDateTime")) - response.MemberDateTime = DateTime.Parse(context.ResponseData.GetHeaderValue("X-memberDateTime"), CultureInfo.InvariantCulture); + response.MemberDateTime = DateTime.Parse(context.ResponseData.GetHeaderValue("X-memberDateTime"), CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal); if (context.ResponseData.IsHeaderPresent("X-memberEpochSeconds")) response.MemberEpochSeconds = Amazon.Util.AWSSDKUtils.ConvertFromUnixEpochSeconds(int.Parse(context.ResponseData.GetHeaderValue("X-memberEpochSeconds"), CultureInfo.InvariantCulture)); if (context.ResponseData.IsHeaderPresent("X-memberHttpDate")) - response.MemberHttpDate = DateTime.Parse(context.ResponseData.GetHeaderValue("X-memberHttpDate"), CultureInfo.InvariantCulture); + response.MemberHttpDate = DateTime.Parse(context.ResponseData.GetHeaderValue("X-memberHttpDate"), CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal); if (context.ResponseData.IsHeaderPresent("X-targetDateTime")) - response.TargetDateTime = DateTime.Parse(context.ResponseData.GetHeaderValue("X-targetDateTime"), CultureInfo.InvariantCulture); + response.TargetDateTime = DateTime.Parse(context.ResponseData.GetHeaderValue("X-targetDateTime"), CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal); if (context.ResponseData.IsHeaderPresent("X-targetEpochSeconds")) response.TargetEpochSeconds = Amazon.Util.AWSSDKUtils.ConvertFromUnixEpochSeconds(int.Parse(context.ResponseData.GetHeaderValue("X-targetEpochSeconds"), CultureInfo.InvariantCulture)); if (context.ResponseData.IsHeaderPresent("X-targetHttpDate")) - response.TargetHttpDate = DateTime.Parse(context.ResponseData.GetHeaderValue("X-targetHttpDate"), CultureInfo.InvariantCulture); + response.TargetHttpDate = DateTime.Parse(context.ResponseData.GetHeaderValue("X-targetHttpDate"), CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal); return response; } From 5f8866085fb055d8333432804a2ff5cb2e8730e8 Mon Sep 17 00:00:00 2001 From: Bo Blodgett Date: Tue, 10 Dec 2024 17:19:07 -0800 Subject: [PATCH 4/7] Datetime handling - updated default for DynamoDB data model to return UTC by default. --- sdk/src/Services/DynamoDBv2/Custom/AWSConfigs.DynamoDB.cs | 5 +++-- sdk/src/Services/DynamoDBv2/Custom/Conversion/SchemaV1.cs | 4 ++-- .../Services/DynamoDBv2/Custom/DataModel/ContextInternal.cs | 6 +++--- .../IntegrationTests/DynamoDB/DataModelTests.cs | 3 +-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sdk/src/Services/DynamoDBv2/Custom/AWSConfigs.DynamoDB.cs b/sdk/src/Services/DynamoDBv2/Custom/AWSConfigs.DynamoDB.cs index 99134aa88b4d..aea4783cd4fa 100644 --- a/sdk/src/Services/DynamoDBv2/Custom/AWSConfigs.DynamoDB.cs +++ b/sdk/src/Services/DynamoDBv2/Custom/AWSConfigs.DynamoDB.cs @@ -170,8 +170,9 @@ public partial class DynamoDBContextConfig /// /// If true, all properties are retrieved in UTC timezone while reading data from DynamoDB. Else, the local timezone is used. /// - /// This setting is only applicable to the high-level library. Service calls made via will always return attributes in UTC. - public bool? RetrieveDateTimeInUtc { get; set; } + /// This setting is only applicable to the high-level library. Service calls made via will always + /// return attributes in UTC. The default is true to return datetimes in UTC format. + public bool? RetrieveDateTimeInUtc { get; set; } = true; /// /// Adds a TableAlias to the TableAliases property. diff --git a/sdk/src/Services/DynamoDBv2/Custom/Conversion/SchemaV1.cs b/sdk/src/Services/DynamoDBv2/Custom/Conversion/SchemaV1.cs index d0d0d16f770d..aea237648acb 100644 --- a/sdk/src/Services/DynamoDBv2/Custom/Conversion/SchemaV1.cs +++ b/sdk/src/Services/DynamoDBv2/Custom/Conversion/SchemaV1.cs @@ -252,11 +252,11 @@ protected override bool TryTo(DateTime value, out Primitive p) } protected override bool TryFrom(Primitive p, Type targetType, out DateTime result) { - if (DateTime.TryParseExact(p.StringValue, AWSSDKUtils.ISO8601DateFormat, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal, out result)) + if (DateTime.TryParseExact(p.StringValue, AWSSDKUtils.ISO8601DateFormat, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal, out result)) { return true; } - return DateTime.TryParse(p.StringValue, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal, out result); + return DateTime.TryParse(p.StringValue, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal, out result); } } diff --git a/sdk/src/Services/DynamoDBv2/Custom/DataModel/ContextInternal.cs b/sdk/src/Services/DynamoDBv2/Custom/DataModel/ContextInternal.cs index b692b1bc806a..2f4ce08aa726 100644 --- a/sdk/src/Services/DynamoDBv2/Custom/DataModel/ContextInternal.cs +++ b/sdk/src/Services/DynamoDBv2/Custom/DataModel/ContextInternal.cs @@ -475,15 +475,15 @@ private object FromDynamoDBEntry(SimplePropertyStorage propertyStorage, DynamoDB if (conversion.HasConverter(targetType)) { var output = conversion.ConvertFromEntry(targetType, entry); - if (flatConfig.RetrieveDateTimeInUtc) + if (!flatConfig.RetrieveDateTimeInUtc) { if (targetType == typeof(DateTime)) { - return ((DateTime)output).ToUniversalTime(); + return ((DateTime)output).ToLocalTime(); } else if (targetType == typeof(DateTime?)) { - return ((DateTime?)output)?.ToUniversalTime(); + return ((DateTime?)output)?.ToLocalTime(); } } return output; diff --git a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/DynamoDB/DataModelTests.cs b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/DynamoDB/DataModelTests.cs index c648f2526d4d..fc842ea08b58 100644 --- a/sdk/test/NetStandard/IntegrationTests/IntegrationTests/DynamoDB/DataModelTests.cs +++ b/sdk/test/NetStandard/IntegrationTests/IntegrationTests/DynamoDB/DataModelTests.cs @@ -383,8 +383,7 @@ private async Task TestHashObjects() Assert.Equal(product.KeySizes.Count, retrieved.KeySizes.Count); Assert.NotNull(retrieved.CompanyInfo); Assert.Equal(product.CompanyInfo.Name, retrieved.CompanyInfo.Name); - //TODO: this is coming back in UTC but the original is DateTimeKind.Unspecified - Assert.Equal(product.CompanyInfo.Founded, retrieved.CompanyInfo.Founded); + Assert.Equal(product.CompanyInfo.Founded.ToUniversalTime(), retrieved.CompanyInfo.Founded); Assert.NotEqual(product.CompanyInfo.Revenue, retrieved.CompanyInfo.Revenue); Assert.Equal(product.CompanyInfo.AllProducts.Count, retrieved.CompanyInfo.AllProducts.Count); Assert.Equal(product.CompanyInfo.AllProducts[0].Id, retrieved.CompanyInfo.AllProducts[0].Id); From 3f93a6d739a92a7011de5b04a96061891ee43576 Mon Sep 17 00:00:00 2001 From: Bo Blodgett Date: Wed, 11 Dec 2024 22:36:12 -0800 Subject: [PATCH 5/7] Fixed based on PR feedback rev.1 --- .../AWSCredentialsFactory.cs | 4 ---- .../InstanceProfileAWSCredentials.cs | 3 --- .../_bcl+netstandard/SSOTokenManager.cs | 4 ---- .../Credentials/RefreshingAWSCredentials.cs | 10 +-------- .../Credentials/SAMLImmutableCredentials.cs | 2 -- .../Internal/Util/Logger.Console.cs | 2 -- .../Amazon.Runtime/Internal/Util/Metrics.cs | 2 -- .../Amazon.Runtime/Internal/Util/SdkCache.cs | 21 +++++++------------ .../Amazon.Util/AWSPublicIpAddressRanges.cs | 2 -- sdk/src/Core/Amazon.Util/AWSSDKUtils.cs | 2 -- .../Custom/DataModel/ContextInternal.cs | 2 ++ .../S3/Custom/_bcl/IO/S3DirectoryInfo.cs | 2 +- .../Services/S3/Custom/_bcl/IO/S3FileInfo.cs | 2 +- .../IntegrationTests/DataModelTests.cs | 4 ++-- ...CompatibilityForDateTimePropertiesTests.cs | 4 ++-- .../Custom/Runtime/StringUtilsTests.cs | 8 +++---- 16 files changed, 20 insertions(+), 54 deletions(-) diff --git a/sdk/src/Core/Amazon.Runtime/CredentialManagement/AWSCredentialsFactory.cs b/sdk/src/Core/Amazon.Runtime/CredentialManagement/AWSCredentialsFactory.cs index 0386046788c1..f6817ed03f93 100644 --- a/sdk/src/Core/Amazon.Runtime/CredentialManagement/AWSCredentialsFactory.cs +++ b/sdk/src/Core/Amazon.Runtime/CredentialManagement/AWSCredentialsFactory.cs @@ -270,9 +270,7 @@ private static AWSCredentials GetAWSCredentialsInternal( return ThrowOrReturnNull(sourceMessage, e, throwIfInvalid); } -#pragma warning disable CS0612,CS0618 // Type or member is obsolete var roleSessionName = options.RoleSessionName ?? RoleSessionNamePrefix + AWSSDKUtils.CorrectedUtcNow.Ticks; -#pragma warning restore CS0612,CS0618 // Type or member is obsolete var assumeRoleOptions = new AssumeRoleAWSCredentialsOptions() { ExternalId = options.ExternalID, @@ -302,9 +300,7 @@ private static AWSCredentials GetAWSCredentialsInternal( return ThrowOrReturnNull(sourceMessage, e, throwIfInvalid); } -#pragma warning disable CS0612,CS0618 // Type or member is obsolete roleSessionName = options.RoleSessionName ?? RoleSessionNamePrefix + AWSSDKUtils.CorrectedUtcNow.Ticks; -#pragma warning restore CS0612,CS0618 // Type or member is obsolete assumeRoleOptions = new AssumeRoleAWSCredentialsOptions(); return new AssumeRoleAWSCredentials(sourceCredentials, options.RoleArn, roleSessionName, assumeRoleOptions); case CredentialProfileType.AssumeRoleWithWebIdentity: diff --git a/sdk/src/Core/Amazon.Runtime/Credentials/InstanceProfileAWSCredentials.cs b/sdk/src/Core/Amazon.Runtime/Credentials/InstanceProfileAWSCredentials.cs index 19c0cec295e2..eafddedc6dd1 100644 --- a/sdk/src/Core/Amazon.Runtime/Credentials/InstanceProfileAWSCredentials.cs +++ b/sdk/src/Core/Amazon.Runtime/Credentials/InstanceProfileAWSCredentials.cs @@ -283,10 +283,7 @@ private static Uri InfoUri private CredentialsRefreshState GetEarlyRefreshState(CredentialsRefreshState state) { - // New expiry time = Now + _refreshAttemptPeriod + PreemptExpiryTime -#pragma warning disable CS0612,CS0618 // Type or member is obsolete DateTime newExpiryTime = AWSSDKUtils.CorrectedUtcNow + _refreshAttemptPeriod + PreemptExpiryTime; -#pragma warning restore CS0612, CS0618 // Type or member is obsolete // Use this only if the time is earlier than the default expiration time if (newExpiryTime > state.Expiration) diff --git a/sdk/src/Core/Amazon.Runtime/Credentials/Internal/_bcl+netstandard/SSOTokenManager.cs b/sdk/src/Core/Amazon.Runtime/Credentials/Internal/_bcl+netstandard/SSOTokenManager.cs index 06fd4df534ba..e6bdb8da8d82 100644 --- a/sdk/src/Core/Amazon.Runtime/Credentials/Internal/_bcl+netstandard/SSOTokenManager.cs +++ b/sdk/src/Core/Amazon.Runtime/Credentials/Internal/_bcl+netstandard/SSOTokenManager.cs @@ -236,9 +236,7 @@ public SsoToken GetToken(SSOTokenManagerGetTokenOptions options) RefreshState = new RefreshState { FailedLastRefreshAttempt = true, -#pragma warning disable CS0612,CS0618 // Type or member is obsolete BlockRefreshUntil = AWSSDKUtils.CorrectedUtcNow.AddSeconds(30) -#pragma warning restore CS0612,CS0618 // Type or member is obsolete } }; @@ -499,9 +497,7 @@ public async Task GetTokenAsync(SSOTokenManagerGetTokenOptions options RefreshState = new RefreshState { FailedLastRefreshAttempt = true, -#pragma warning disable CS0612,CS0618 // Type or member is obsolete BlockRefreshUntil = AWSSDKUtils.CorrectedUtcNow.AddSeconds(30) -#pragma warning restore CS0612,CS0618 // Type or member is obsolete } }; diff --git a/sdk/src/Core/Amazon.Runtime/Credentials/RefreshingAWSCredentials.cs b/sdk/src/Core/Amazon.Runtime/Credentials/RefreshingAWSCredentials.cs index 0f69c41a2332..33af9f078c7f 100644 --- a/sdk/src/Core/Amazon.Runtime/Credentials/RefreshingAWSCredentials.cs +++ b/sdk/src/Core/Amazon.Runtime/Credentials/RefreshingAWSCredentials.cs @@ -55,9 +55,7 @@ public CredentialsRefreshState(ImmutableCredentials credentials, DateTime expira internal bool IsExpiredWithin(TimeSpan preemptExpiryTime) { -#pragma warning disable CS0612,CS0618 // Type or member is obsolete var now = AWSSDKUtils.CorrectedUtcNow; -#pragma warning restore CS0612,CS0618 // Type or member is obsolete var exp = Expiration.ToUniversalTime(); return (now > exp - preemptExpiryTime); } @@ -174,9 +172,7 @@ private static void UpdateToGeneratedCredentials(CredentialsRefreshState state, { errorMessage = string.Format(CultureInfo.InvariantCulture, "The retrieved credentials have already expired: Now = {0}, Credentials expiration = {1}", -#pragma warning disable CS0612,CS0618 // Type or member is obsolete AWSSDKUtils.CorrectedUtcNow, state.Expiration); -#pragma warning restore CS0612,CS0618 // Type or member is obsolete } throw new AmazonClientException(errorMessage); @@ -193,9 +189,7 @@ private static void UpdateToGeneratedCredentials(CredentialsRefreshState state, var logger = Logger.GetLogger(typeof(RefreshingAWSCredentials)); logger.InfoFormat( "The preempt expiry time is set too high: Current time = {0}, Credentials expiry time = {1}, Preempt expiry time = {2}.", -#pragma warning disable CS0612,CS0618 // Type or member is obsolete AWSSDKUtils.CorrectedUtcNow, -#pragma warning restore CS0612,CS0618 // Type or member is obsolete state.Expiration, preemptExpiryTime); } } @@ -232,12 +226,10 @@ private static bool ShouldUpdateState(CredentialsRefreshState state, TimeSpan pr var isExpired = state?.IsExpiredWithin(TimeSpan.Zero); if (isExpired == true) { -#pragma warning disable CS0612,CS0618 // Type or member is obsolete var logger = Logger.GetLogger(typeof(RefreshingAWSCredentials)); logger.InfoFormat("Determined refreshing credentials should update. Expiration time: {0}, Current time: {1}", - state.Expiration.Add(preemptExpiryTime).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffffffK", CultureInfo.InvariantCulture), + state.Expiration.Add(preemptExpiryTime).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.f ffffffK", CultureInfo.InvariantCulture), AWSSDKUtils.CorrectedUtcNow.ToString("yyyy-MM-ddTHH:mm:ss.fffffffK", CultureInfo.InvariantCulture)); -#pragma warning restore CS0612,CS0618 // Type or member is obsolete } return isExpired ?? true; diff --git a/sdk/src/Core/Amazon.Runtime/Credentials/SAMLImmutableCredentials.cs b/sdk/src/Core/Amazon.Runtime/Credentials/SAMLImmutableCredentials.cs index 66ff1455b722..c7b8cbcb2225 100644 --- a/sdk/src/Core/Amazon.Runtime/Credentials/SAMLImmutableCredentials.cs +++ b/sdk/src/Core/Amazon.Runtime/Credentials/SAMLImmutableCredentials.cs @@ -155,9 +155,7 @@ internal static SAMLImmutableCredentials FromJson(string json) // get the expiry first - if the credentials have expired we can then // ignore the data var expires = DateTime.Parse((string)o[ExpiresProperty], CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal); -#pragma warning disable CS0612,CS0618 // Type or member is obsolete if (expires <= AWSSDKUtils.CorrectedUtcNow) -#pragma warning restore CS0612,CS0618 // Type or member is obsolete { Logger.GetLogger(typeof(SAMLImmutableCredentials)).InfoFormat("Skipping serialized credentials due to expiry."); return null; diff --git a/sdk/src/Core/Amazon.Runtime/Internal/Util/Logger.Console.cs b/sdk/src/Core/Amazon.Runtime/Internal/Util/Logger.Console.cs index 85058bcce6f2..4139d3c68d3c 100644 --- a/sdk/src/Core/Amazon.Runtime/Internal/Util/Logger.Console.cs +++ b/sdk/src/Core/Amazon.Runtime/Internal/Util/Logger.Console.cs @@ -84,9 +84,7 @@ private void Log(LogLevel logLevel, string message, Exception ex) { string formatted = null; long sequence = Interlocked.Increment(ref _sequanceId); -#pragma warning disable CS0612,CS0618 // Type or member is obsolete string dt = AWSSDKUtils.CorrectedUtcNow.ToString(AWSSDKUtils.ISO8601DateFormat, CultureInfo.InvariantCulture); -#pragma warning restore CS0612,CS0618 // Type or member is obsolete string asString = logLevel.ToString().ToUpper(CultureInfo.InvariantCulture); if (ex != null) diff --git a/sdk/src/Core/Amazon.Runtime/Internal/Util/Metrics.cs b/sdk/src/Core/Amazon.Runtime/Internal/Util/Metrics.cs index e7edead57bd2..ee3d0b1597cd 100644 --- a/sdk/src/Core/Amazon.Runtime/Internal/Util/Metrics.cs +++ b/sdk/src/Core/Amazon.Runtime/Internal/Util/Metrics.cs @@ -534,9 +534,7 @@ public class MetricError public MetricError(Metric metric, string messageFormat, params object[] args) : this(metric, null, messageFormat, args) { } public MetricError(Metric metric, Exception exception, string messageFormat, params object[] args) { -#pragma warning disable CS0612,CS0618 // Type or member is obsolete Time = AWSSDKUtils.CorrectedUtcNow; -#pragma warning restore CS0612,CS0618 // Type or member is obsolete try { Message = string.Format(CultureInfo.InvariantCulture, messageFormat, args); diff --git a/sdk/src/Core/Amazon.Runtime/Internal/Util/SdkCache.cs b/sdk/src/Core/Amazon.Runtime/Internal/Util/SdkCache.cs index c638ff221bc4..72c51e971f5b 100644 --- a/sdk/src/Core/Amazon.Runtime/Internal/Util/SdkCache.cs +++ b/sdk/src/Core/Amazon.Runtime/Internal/Util/SdkCache.cs @@ -326,7 +326,7 @@ public void Clear() lock (CacheLock) { Contents.Clear(); - LastCacheClean = GetCorrectedTime(); + LastCacheClean = AWSSDKUtils.CorrectedUtcNow; } } public List Keys @@ -454,7 +454,7 @@ private bool IsValidItem(CacheItem item) { if (item == null) return false; - var cutoff = GetCorrectedTime() - this.MaximumItemLifespan; + var cutoff = AWSSDKUtils.CorrectedUtcNow - this.MaximumItemLifespan; if (item.LastUseTime < cutoff) return false; @@ -468,7 +468,7 @@ private void RemoveOldItems_Locked() // Remove all items that were not accessed since the cutoff. // Using a cutoff is more optimal than item.Age, as we only need // to do DateTime calculation once, not for each item. - var cutoff = GetCorrectedTime() - MaximumItemLifespan; + var cutoff = AWSSDKUtils.CorrectedUtcNow - MaximumItemLifespan; var keysToRemove = new List(); foreach (var kvp in Contents) @@ -483,7 +483,7 @@ private void RemoveOldItems_Locked() foreach (var key in keysToRemove) Contents.Remove(key); - LastCacheClean = GetCorrectedTime(); + LastCacheClean = AWSSDKUtils.CorrectedUtcNow; } private class CacheItem @@ -494,7 +494,7 @@ public T Value { get { - LastUseTime = GetCorrectedTime(); + LastUseTime = AWSSDKUtils.CorrectedUtcNow; return _value; } private set @@ -507,16 +507,9 @@ private set public CacheItem(T value) { Value = value; - LastUseTime = GetCorrectedTime(); + LastUseTime = AWSSDKUtils.CorrectedUtcNow; } - } - - private static DateTime GetCorrectedTime() - { -#pragma warning disable CS0612,CS0618 // Type or member is obsolete - return AWSSDKUtils.CorrectedUtcNow; -#pragma warning restore CS0612,CS0618 // Type or member is obsolete - } + } #endregion } diff --git a/sdk/src/Core/Amazon.Util/AWSPublicIpAddressRanges.cs b/sdk/src/Core/Amazon.Util/AWSPublicIpAddressRanges.cs index 925ec0a4592e..97fc5bbbd916 100644 --- a/sdk/src/Core/Amazon.Util/AWSPublicIpAddressRanges.cs +++ b/sdk/src/Core/Amazon.Util/AWSPublicIpAddressRanges.cs @@ -176,9 +176,7 @@ private static AWSPublicIpAddressRanges Parse(string fileContent) { } -#pragma warning disable CS0612,CS0618 // Type or member is obsolete instance.CreateDate = creationDateTime.GetValueOrDefault(AWSSDKUtils.CorrectedUtcNow); -#pragma warning restore CS0612,CS0618 // Type or member is obsolete // ipv4 and v6 addresses occupy different keys in the data file and can't easily be merged // so process each subset separately diff --git a/sdk/src/Core/Amazon.Util/AWSSDKUtils.cs b/sdk/src/Core/Amazon.Util/AWSSDKUtils.cs index 0bdce825572d..2d38a6a47936 100644 --- a/sdk/src/Core/Amazon.Util/AWSSDKUtils.cs +++ b/sdk/src/Core/Amazon.Util/AWSSDKUtils.cs @@ -936,9 +936,7 @@ public static string FormattedCurrentTimestampRFC822 /// The ISO8601 formatted future timestamp. public static string GetFormattedTimestampRFC822(int minutesFromNow) { -#pragma warning disable CS0612,CS0618 // Type or member is obsolete DateTime dateTime = AWSSDKUtils.CorrectedUtcNow.AddMinutes(minutesFromNow); -#pragma warning restore CS0612,CS0618 // Type or member is obsolete return dateTime.ToString(AWSSDKUtils.RFC822DateFormat, CultureInfo.InvariantCulture); } diff --git a/sdk/src/Services/DynamoDBv2/Custom/DataModel/ContextInternal.cs b/sdk/src/Services/DynamoDBv2/Custom/DataModel/ContextInternal.cs index 2f4ce08aa726..32c771e11a06 100644 --- a/sdk/src/Services/DynamoDBv2/Custom/DataModel/ContextInternal.cs +++ b/sdk/src/Services/DynamoDBv2/Custom/DataModel/ContextInternal.cs @@ -479,10 +479,12 @@ private object FromDynamoDBEntry(SimplePropertyStorage propertyStorage, DynamoDB { if (targetType == typeof(DateTime)) { + //This is a valid use of .ToLocalTime because by default the dates are in UTC. If the user specifies to not retrieve in UTC we must convert to LocalTime. return ((DateTime)output).ToLocalTime(); } else if (targetType == typeof(DateTime?)) { + //This is a valid use of .ToLocalTime because by default the dates are in UTC. If the user specifies to not retrieve in UTC we must convert to LocalTime. return ((DateTime?)output)?.ToLocalTime(); } } diff --git a/sdk/src/Services/S3/Custom/_bcl/IO/S3DirectoryInfo.cs b/sdk/src/Services/S3/Custom/_bcl/IO/S3DirectoryInfo.cs index 9ac73aabeefa..165f6cbf9e59 100644 --- a/sdk/src/Services/S3/Custom/_bcl/IO/S3DirectoryInfo.cs +++ b/sdk/src/Services/S3/Custom/_bcl/IO/S3DirectoryInfo.cs @@ -299,7 +299,7 @@ public DateTime LastWriteTime } } - //This is a value use of .ToLocalTime because there is both LastWriteTime and LastWriteTimeUtc for S3DirectoryInfo operations. + //This is a valid use of .ToLocalTime because there is both LastWriteTime and LastWriteTimeUtc for S3DirectoryInfo operations. return ret.ToLocalTime(); } } diff --git a/sdk/src/Services/S3/Custom/_bcl/IO/S3FileInfo.cs b/sdk/src/Services/S3/Custom/_bcl/IO/S3FileInfo.cs index 9f1353e491dd..dbd66fc771d3 100644 --- a/sdk/src/Services/S3/Custom/_bcl/IO/S3FileInfo.cs +++ b/sdk/src/Services/S3/Custom/_bcl/IO/S3FileInfo.cs @@ -192,7 +192,7 @@ public DateTime LastWriteTime ((Amazon.Runtime.Internal.IAmazonWebServiceRequest)request).AddBeforeRequestHandler(S3Helper.FileIORequestEventHandler); var response = s3Client.GetObjectMetadata(request); - //This is a value use of .ToLocalTime because there is both LastWriteTime and LastWriteTimeUtc for S3FileInfo operations. + //This is a valid use of .ToLocalTime because there is both LastWriteTime and LastWriteTimeUtc for S3FileInfo operations. ret = response.LastModified.GetValueOrDefault().ToLocalTime(); } return ret; diff --git a/sdk/test/Services/DynamoDBv2/IntegrationTests/DataModelTests.cs b/sdk/test/Services/DynamoDBv2/IntegrationTests/DataModelTests.cs index ec8e730e4cb5..4405406d0e83 100644 --- a/sdk/test/Services/DynamoDBv2/IntegrationTests/DataModelTests.cs +++ b/sdk/test/Services/DynamoDBv2/IntegrationTests/DataModelTests.cs @@ -220,7 +220,7 @@ public void TestContext_RetrieveDateTimeInUtc(bool retrieveDateTimeInUtc) Context.Save(employee); - //This is a value use of .ToLocalTime + //This is a valid use of .ToLocalTime var expectedCurrTime = retrieveDateTimeInUtc ? currTime.ToUniversalTime() : currTime.ToLocalTime(); // Load @@ -365,7 +365,7 @@ public void TestContext_RetrieveDateTimeInUtc_OperationConfig(bool retrieveDateT Context.Save(employee); - //This is a value use of .ToLocalTime + //This is a valid use of .ToLocalTime var expectedCurrTime = retrieveDateTimeInUtc ? currTime.ToUniversalTime() : currTime.ToLocalTime(); // Load diff --git a/sdk/test/UnitTests/Custom/Marshalling/BackwardsCompatibilityForDateTimePropertiesTests.cs b/sdk/test/UnitTests/Custom/Marshalling/BackwardsCompatibilityForDateTimePropertiesTests.cs index 37ed5a740a36..317779893f30 100644 --- a/sdk/test/UnitTests/Custom/Marshalling/BackwardsCompatibilityForDateTimePropertiesTests.cs +++ b/sdk/test/UnitTests/Custom/Marshalling/BackwardsCompatibilityForDateTimePropertiesTests.cs @@ -42,7 +42,7 @@ public void TestUtcFields() DateTime timeUtc = new DateTime(2018, 7, 18, 0, 0, 0, DateTimeKind.Utc); - //This is a value use of .ToLocalTime to construct a local time for testing. + //This is a valid use of .ToLocalTime to construct a local time for testing. DateTime timeLocal = new DateTime(2018, 7, 18, 0, 0, 0, DateTimeKind.Utc).ToLocalTime(); DateTime timeUnspecified = new DateTime(timeLocal.Ticks); @@ -69,7 +69,7 @@ public void TestUtcFieldsWithMS() DateTime timeUtc = new DateTime(2018, 7, 18, 0, 0, 0, 123, DateTimeKind.Utc); - //This is a value use of .ToLocalTime to construct a local time for testing. + //This is a valid use of .ToLocalTime to construct a local time for testing. DateTime timeLocal = new DateTime(2018, 7, 18, 0, 0, 0, 123, DateTimeKind.Utc).ToLocalTime(); DateTime timeUnspecified = new DateTime(timeLocal.Ticks); diff --git a/sdk/test/UnitTests/Custom/Runtime/StringUtilsTests.cs b/sdk/test/UnitTests/Custom/Runtime/StringUtilsTests.cs index b9eb283a7d46..0d9fc67024df 100644 --- a/sdk/test/UnitTests/Custom/Runtime/StringUtilsTests.cs +++ b/sdk/test/UnitTests/Custom/Runtime/StringUtilsTests.cs @@ -49,7 +49,7 @@ public void TestStringUtilsFromDateTimeUtcUtc() [TestCategory("Runtime")] public void TestStringUtilsFromDateTimeUtcUnspecified() { - //This is a value use of .ToLocalTime to construct a local time for testing. + //This is a valid use of .ToLocalTime to construct a local time for testing. string convertedDateTime = StringUtils.FromDateTimeToISO8601(new DateTime(new DateTime(2018, 7, 18, 0, 0, 0, DateTimeKind.Utc).ToLocalTime().Ticks)); Assert.AreEqual(EXPECTED_FROM_DATE_STRING, convertedDateTime); @@ -60,7 +60,7 @@ public void TestStringUtilsFromDateTimeUtcUnspecified() [TestCategory("Runtime")] public void TestStringUtilsFromDateTimeUtcLocal() { - //This is a value use of .ToLocalTime to construct a local time for testing. + //This is a valid use of .ToLocalTime to construct a local time for testing. string convertedDateTime = StringUtils.FromDateTimeToISO8601(new DateTime(2018, 7, 18, 0, 0, 0, DateTimeKind.Utc).ToLocalTime()); Assert.AreEqual(EXPECTED_FROM_DATE_STRING, convertedDateTime); @@ -80,7 +80,7 @@ public void TestStringUtilsFromDateTimeEpochCompatibilityUtc() [TestCategory("Runtime")] public void TestStringUtilsFromDateTimeEpochCompatibilityUnknown() { - //This is a value use of .ToLocalTime to construct a local time for testing. + //This is a valid use of .ToLocalTime to construct a local time for testing. DateTime time = new DateTime(new DateTime(2018, 7, 18, 0, 0, 0, DateTimeKind.Utc).ToLocalTime().Ticks); TestStringUtilsFromDateUtcTimeEpochCompatibility(time); } @@ -90,7 +90,7 @@ public void TestStringUtilsFromDateTimeEpochCompatibilityUnknown() [TestCategory("Runtime")] public void TestStringUtilsFromDateTimeEpochCompatibilityLocal() { - //This is a value use of .ToLocalTime to construct a local time for testing. + //This is a valid use of .ToLocalTime to construct a local time for testing. DateTime time = new DateTime(2018, 7, 18, 0, 0, 0, DateTimeKind.Utc).ToLocalTime(); TestStringUtilsFromDateUtcTimeEpochCompatibility(time); } From c072d6d4b2fcf0707565a5f3e830549161dd324a Mon Sep 17 00:00:00 2001 From: Bo Blodgett Date: Fri, 13 Dec 2024 12:30:31 -0800 Subject: [PATCH 6/7] Fixes based on PR feedback rev.2 --- .../460d1afb-6912-4244-82e2-cfb811a84743.json | 15 ++++++++++++++- .../DynamoDBv2/Custom/AWSConfigs.DynamoDB.cs | 2 +- .../Transfer/Internal/DownloadDirectoryCommand.cs | 4 ++-- .../Services/S3/Custom/_bcl/IO/S3DirectoryInfo.cs | 4 ++-- sdk/src/Services/S3/Custom/_bcl/IO/S3FileInfo.cs | 4 ++-- 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/generator/.DevConfigs/460d1afb-6912-4244-82e2-cfb811a84743.json b/generator/.DevConfigs/460d1afb-6912-4244-82e2-cfb811a84743.json index d169802698d4..6a004266db7f 100644 --- a/generator/.DevConfigs/460d1afb-6912-4244-82e2-cfb811a84743.json +++ b/generator/.DevConfigs/460d1afb-6912-4244-82e2-cfb811a84743.json @@ -1,7 +1,20 @@ { "core": { "changeLogMessages": [ - "Updated DateTime handling." + "Updated DateTime handling to use UTC instead of local times.", + "DateTime handling (Breaking Change): Removed obsolete properties such EndTime then changed EndTimeUtc to EndTime. This could lead to offset times for developers still using the marked obsolete original EndTime for example. A compile time error will occur for anyone using any of the removed *Utc properties such as EndTimeUtc.", + "DateTime handling (Breaking Change): Response unmarshallers for TimeStamps and list TimeStamps for formats TimestampFormat.ISO8601 || TimestampFormat.RFC822 datetimes were being parsed into local times. Adjusted DateTime parsing to return UTC times.", + "DateTime handling (Breaking Change): Fixed the DateTimeUnmarshaller which was parsing datetime strings into and returning them as local time which in some cases were still getting converted back to UTC on a prior bug fix but not always. DateTime strings unmarshalled are assumed to be UTC time and will be specified and unmarshalled as UTC.", + "DateTime handling (Breaking Change): ConvertFromUnixEpochSeconds/ConvertFromUnixEpochMilliseconds incorrectly returning the Unix Epoch time as local time instead of a UTC time by definition. This changes the behavior where these methods were used.", + "DateTime handling (Breaking Change): DynamoDB RetrieveDateTimeInUtc has been switched to true as the default.", + "DateTime handling (Bug fix): Fixed internal Epoch dates to UTC per definition where the epoch date was created in local time. ", + "DateTime handling (Bug fix): Stopped using expiry times in credentials internally as local time. Changed to UTC.", + "DateTime handling (Bug fix): Ensured DateTime.Max and DateTime.Min are marked with a DateTime.Kind DateTimeKind.Utc for proper calculations.", + "DateTime handling (Bug fix): Instead of assuming SAML credentials are local time then converting to UTC and assume that the time given is UTC to work properly with credential expiration being in UTC time for other credential providers.", + "DateTime handling (Bug fix): Console logger outputs timestamps as a UTC date incase output is sent off the local machine and for easier comparison with other UTC dates.", + "DateTime handling (Bug fix): RetryPolicies return UTC server time instead of a UTC time converted to local time.", + "DateTime handling (Bug fix): AWSPublicIpAddressRanges mixing UTC and local time.", + "DateTime handling (Bug fix): GetFormattedTimestampISO8601 incorrectly creating a DateTime object as local time even though it is passed in as UTC. Then formatting it as a UTC string." ], "type": "patch", "updateMinimum": true diff --git a/sdk/src/Services/DynamoDBv2/Custom/AWSConfigs.DynamoDB.cs b/sdk/src/Services/DynamoDBv2/Custom/AWSConfigs.DynamoDB.cs index aea4783cd4fa..d964880252bb 100644 --- a/sdk/src/Services/DynamoDBv2/Custom/AWSConfigs.DynamoDB.cs +++ b/sdk/src/Services/DynamoDBv2/Custom/AWSConfigs.DynamoDB.cs @@ -170,7 +170,7 @@ public partial class DynamoDBContextConfig /// /// If true, all properties are retrieved in UTC timezone while reading data from DynamoDB. Else, the local timezone is used. /// - /// This setting is only applicable to the high-level library. Service calls made via will always + /// This setting is only applicable to data retrieved from the DynamoDBContext object. Service calls made via will always /// return attributes in UTC. The default is true to return datetimes in UTC format. public bool? RetrieveDateTimeInUtc { get; set; } = true; diff --git a/sdk/src/Services/S3/Custom/Transfer/Internal/DownloadDirectoryCommand.cs b/sdk/src/Services/S3/Custom/Transfer/Internal/DownloadDirectoryCommand.cs index 9a529f413df4..356091b417ee 100644 --- a/sdk/src/Services/S3/Custom/Transfer/Internal/DownloadDirectoryCommand.cs +++ b/sdk/src/Services/S3/Custom/Transfer/Internal/DownloadDirectoryCommand.cs @@ -197,10 +197,10 @@ private bool IsInstructionFile(string key) private bool ShouldDownload(S3Object s3o) { // skip objects based on ModifiedSinceDate - if (this._request.IsSetModifiedSinceDate() && s3o.LastModified.GetValueOrDefault().ToUniversalTime() <= this._request.ModifiedSinceDate.ToUniversalTime()) + if (this._request.IsSetModifiedSinceDate() && s3o.LastModified.GetValueOrDefault() <= this._request.ModifiedSinceDate.ToUniversalTime()) return false; // skip objects based on UnmodifiedSinceDate - if (this._request.IsSetUnmodifiedSinceDate() && s3o.LastModified.GetValueOrDefault().ToUniversalTime() > this._request.UnmodifiedSinceDate.ToUniversalTime()) + if (this._request.IsSetUnmodifiedSinceDate() && s3o.LastModified.GetValueOrDefault() > this._request.UnmodifiedSinceDate.ToUniversalTime()) return false; // skip objects which are instruction files and we're using encryption client if (IsInstructionFile(s3o.Key)) diff --git a/sdk/src/Services/S3/Custom/_bcl/IO/S3DirectoryInfo.cs b/sdk/src/Services/S3/Custom/_bcl/IO/S3DirectoryInfo.cs index 165f6cbf9e59..4a311ae263a2 100644 --- a/sdk/src/Services/S3/Custom/_bcl/IO/S3DirectoryInfo.cs +++ b/sdk/src/Services/S3/Custom/_bcl/IO/S3DirectoryInfo.cs @@ -234,7 +234,7 @@ public string FullName } /// - /// Returns the last write time of the the latest file written to the directory. + /// Returns the last write time of the latest file written to the directory in local time. /// /// /// @@ -305,7 +305,7 @@ public DateTime LastWriteTime } /// - /// UTC converted version of LastWriteTime. + /// Returns the last write time of the latest file written to the directory in UTC time. /// /// /// diff --git a/sdk/src/Services/S3/Custom/_bcl/IO/S3FileInfo.cs b/sdk/src/Services/S3/Custom/_bcl/IO/S3FileInfo.cs index dbd66fc771d3..a08c838eff95 100644 --- a/sdk/src/Services/S3/Custom/_bcl/IO/S3FileInfo.cs +++ b/sdk/src/Services/S3/Custom/_bcl/IO/S3FileInfo.cs @@ -173,7 +173,7 @@ public string FullName } /// - /// Returns the last time the file was modified. + /// Returns the last time the file was modified in local time. /// /// /// @@ -201,7 +201,7 @@ public DateTime LastWriteTime } /// - /// Returns the last time the file was modified in UTC. + /// Returns the last time the file was modified in UTC time. /// /// /// From fb591471b723d0dbc610012777acac33ed430e5b Mon Sep 17 00:00:00 2001 From: Bo Blodgett Date: Fri, 13 Dec 2024 15:47:10 -0800 Subject: [PATCH 7/7] Fixed bug where if RetrieveDateTimeInUtc was not set on the operation or context config the value was still defaulted to false. --- sdk/src/Services/DynamoDBv2/Custom/DataModel/Configs.cs | 2 +- sdk/test/Services/DynamoDBv2/IntegrationTests/DataModelTests.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/src/Services/DynamoDBv2/Custom/DataModel/Configs.cs b/sdk/src/Services/DynamoDBv2/Custom/DataModel/Configs.cs index b094bbe9d8ee..42e52e5b9679 100644 --- a/sdk/src/Services/DynamoDBv2/Custom/DataModel/Configs.cs +++ b/sdk/src/Services/DynamoDBv2/Custom/DataModel/Configs.cs @@ -424,7 +424,7 @@ public DynamoDBFlatConfig(DynamoDBOperationConfig operationConfig, DynamoDBConte bool consistentRead = operationConfig.ConsistentRead ?? contextConfig.ConsistentRead ?? false; bool skipVersionCheck = operationConfig.SkipVersionCheck ?? contextConfig.SkipVersionCheck ?? false; bool ignoreNullValues = operationConfig.IgnoreNullValues ?? contextConfig.IgnoreNullValues ?? false; - bool retrieveDateTimeInUtc = operationConfig.RetrieveDateTimeInUtc ?? contextConfig.RetrieveDateTimeInUtc ?? false; + bool retrieveDateTimeInUtc = operationConfig.RetrieveDateTimeInUtc ?? contextConfig.RetrieveDateTimeInUtc ?? true; bool isEmptyStringValueEnabled = operationConfig.IsEmptyStringValueEnabled ?? contextConfig.IsEmptyStringValueEnabled ?? false; DynamoDBEntryConversion conversion = operationConfig.Conversion ?? contextConfig.Conversion ?? DynamoDBEntryConversion.CurrentConversion; string tableNamePrefix = operationConfig.TableNamePrefix ?? contextConfig.TableNamePrefix ?? string.Empty; diff --git a/sdk/test/Services/DynamoDBv2/IntegrationTests/DataModelTests.cs b/sdk/test/Services/DynamoDBv2/IntegrationTests/DataModelTests.cs index 4405406d0e83..24c04342f0a0 100644 --- a/sdk/test/Services/DynamoDBv2/IntegrationTests/DataModelTests.cs +++ b/sdk/test/Services/DynamoDBv2/IntegrationTests/DataModelTests.cs @@ -980,7 +980,7 @@ private void TestHashObjects() Assert.AreEqual(product.KeySizes.Count, retrieved.KeySizes.Count); Assert.IsNotNull(retrieved.CompanyInfo); Assert.AreEqual(product.CompanyInfo.Name, retrieved.CompanyInfo.Name); - Assert.AreEqual(product.CompanyInfo.Founded, retrieved.CompanyInfo.Founded); + Assert.AreEqual(product.CompanyInfo.Founded.ToUniversalTime(), retrieved.CompanyInfo.Founded); Assert.AreNotEqual(product.CompanyInfo.Revenue, retrieved.CompanyInfo.Revenue); Assert.AreEqual(product.CompanyInfo.AllProducts.Count, retrieved.CompanyInfo.AllProducts.Count); Assert.AreEqual(product.CompanyInfo.AllProducts[0].Id, retrieved.CompanyInfo.AllProducts[0].Id);