fix: Manual changes after V3 sync

Author: dscpinheiro

sdk/src/Core/Amazon.Util/AWSSDKUtils.cs

@@ -613,16 +613,6 @@ public static DateTime ConvertFromUnixLongEpochSeconds(long seconds)
             return new DateTime(seconds * 10000000L + EPOCH_START.Ticks, DateTimeKind.Utc);
         }
 
-        /// <summary>
-        /// Utility method for converting Unix epoch seconds to DateTime structure.
-        /// </summary>
-        /// <param name="seconds">The number of seconds since January 1, 1970.</param>
-        /// <returns>Converted DateTime structure</returns>
-        public static DateTime ConvertFromUnixLongEpochSeconds(long seconds)
-        {
-            return new DateTime(seconds * 10000000L + EPOCH_START.Ticks, DateTimeKind.Utc).ToLocalTime();
-        }
-
         /// <summary>
         /// Utility method for converting Unix epoch milliseconds to DateTime structure.
         /// </summary>

sdk/src/Services/DynamoDBv2/Custom/DataModel/ContextInternal.cs

@@ -1173,8 +1173,6 @@ internal Key MakeKey(object hashKey, object rangeKey, ItemStorageConfig storageC
                 hashKeyEntry = Document.DateTimeToEpochSeconds(hashKeyEntry, hashKeyProperty.AttributeName);
             if (storageConfig.AttributesToStoreAsEpochLong.Contains(hashKeyProperty.AttributeName))
                 hashKeyEntry = Document.DateTimeToEpochSecondsLong(hashKeyEntry, hashKeyProperty.AttributeName);
-            if (storageConfig.AttributesToStoreAsEpochLong.Contains(hashKeyProperty.AttributeName))
-                hashKeyEntry = Document.DateTimeToEpochSecondsLong(hashKeyEntry, hashKeyProperty.AttributeName);
             var hashKeyEntryAttributeConversionConfig = new DynamoDBEntry.AttributeConversionConfig(flatConfig.Conversion, flatConfig.IsEmptyStringValueEnabled);
             key[hashKeyProperty.AttributeName] = hashKeyEntry.ConvertToAttributeValue(hashKeyEntryAttributeConversionConfig);
 
@@ -1195,8 +1193,6 @@ internal Key MakeKey(object hashKey, object rangeKey, ItemStorageConfig storageC
                     rangeKeyEntry = Document.DateTimeToEpochSeconds(rangeKeyEntry, rangeKeyProperty.AttributeName);
                 if (storageConfig.AttributesToStoreAsEpochLong.Contains(rangeKeyProperty.AttributeName))
                     rangeKeyEntry = Document.DateTimeToEpochSecondsLong(rangeKeyEntry, rangeKeyProperty.AttributeName);
-                if (storageConfig.AttributesToStoreAsEpochLong.Contains(rangeKeyProperty.AttributeName))
-                    rangeKeyEntry = Document.DateTimeToEpochSecondsLong(rangeKeyEntry, rangeKeyProperty.AttributeName);
 
                 var rangeKeyEntryAttributeConversionConfig = new DynamoDBEntry.AttributeConversionConfig(flatConfig.Conversion, flatConfig.IsEmptyStringValueEnabled);
                 key[rangeKeyProperty.AttributeName] = rangeKeyEntry.ConvertToAttributeValue(rangeKeyEntryAttributeConversionConfig);
@@ -1211,7 +1207,6 @@ internal Key MakeKey<T>(T keyObject, ItemStorageConfig storageConfig, DynamoDBFl
             if (storageConfig.HasVersion) // if version field is defined, it would have been returned, so remove before making the key
                 keyAsStorage.Document[storageConfig.VersionPropertyStorage.AttributeName] = null;
             Key key = new Key(keyAsStorage.Document.ToAttributeMap(flatConfig.Conversion, storageConfig.AttributesToStoreAsEpoch, storageConfig.AttributesToStoreAsEpochLong, flatConfig.IsEmptyStringValueEnabled));
-            Key key = new Key(keyAsStorage.Document.ToAttributeMap(flatConfig.Conversion, storageConfig.AttributesToStoreAsEpoch, storageConfig.AttributesToStoreAsEpochLong, flatConfig.IsEmptyStringValueEnabled));
             ValidateKey(key, storageConfig);
             return key;
         }

sdk/src/Services/DynamoDBv2/Custom/DataModel/InternalModel.cs

@@ -209,6 +209,9 @@ public void Validate(DynamoDBContext context)
                 this.Converter = Utils.InstantiateConverter(ConverterType, context) as IPropertyConverter;
             }
 
+            if (StoreAsEpoch && StoreAsEpochLong)
+                throw new InvalidOperationException(PropertyName + " must not set both StoreAsEpoch and StoreAsEpochLong as true at the same time.");
+
             IPropertyConverter converter;
             if (context.ConverterCache.TryGetValue(MemberType, out converter) && converter != null)
             {

sdk/src/Services/DynamoDBv2/Custom/DocumentModel/Table.cs

@@ -475,9 +475,6 @@ internal Key MakeKey(Primitive hashKey, Primitive rangeKey)
                 if (this.StoreAsEpochLong.Contains(rangeKeyName))
                     rangeKey = KeyDateTimeToEpochSecondsLong(rangeKey, rangeKeyName);
 
-                if (this.StoreAsEpochLong.Contains(rangeKeyName))
-                    rangeKey = KeyDateTimeToEpochSecondsLong(rangeKey, rangeKeyName);
-
                 if (rangeKeyDescription.Type != rangeKey.Type)
                     throw new InvalidOperationException(string.Format(CultureInfo.InvariantCulture,
                         "Schema for table {0}, range key {1}, is inconsistent with specified range key value.", TableName, hashKeyName));
@@ -505,28 +502,20 @@ private static Primitive KeyDateTimeToEpochSecondsLong(Primitive key, string att
 
         internal void UpdateRequestUserAgentDetails(AmazonDynamoDBRequest request, bool isAsync)
         {
-            ((Amazon.Runtime.Internal.IAmazonWebServiceRequest)request).AddBeforeRequestHandler(isAsync ?
-                new RequestEventHandler(this.UserAgentRequestEventHandlerAsync) :
-                new RequestEventHandler(this.UserAgentRequestEventHandlerSync)
-                );
-        }
+            if (request == null) return;
 
-        private void UserAgentRequestEventHandler(object sender, RequestEventArgs args, bool isAsync)
-        {
-            WebServiceRequestEventArgs wsArgs = args as WebServiceRequestEventArgs;
-            if (wsArgs != null)
+            var userAgentDetails = ((Runtime.Internal.IAmazonWebServiceRequest)request).UserAgentDetails;
+
+            userAgentDetails.AddUserAgentComponent("ft/ddb-hll");
+            userAgentDetails.AddUserAgentComponent($"md/{(isAsync ? "TableAsync" : "TableSync")}");
+
+            if (this.TableConsumer == DynamoDBConsumer.DataModel)
             {
-                var feature = string.Format(" ft/ddb-hll md/{0} md/{1}", this.TableConsumer, (isAsync ? "TableAsync" : "TableSync"));
-                if (wsArgs.Headers.Keys.Contains(HeaderKeys.UserAgentHeader))
-                {
-                    string currentUserAgent = wsArgs.Headers[HeaderKeys.UserAgentHeader];
-                    wsArgs.Headers[HeaderKeys.UserAgentHeader] = currentUserAgent + feature;
-                }
-                else if (wsArgs.Headers.Keys.Contains(HeaderKeys.XAmzUserAgentHeader))
-                {
-                    string currentUserAgent = wsArgs.Headers[HeaderKeys.XAmzUserAgentHeader];
-                    wsArgs.Headers[HeaderKeys.XAmzUserAgentHeader] = currentUserAgent + feature;
-                }
+                userAgentDetails.AddFeature(UserAgentFeatureId.DDB_MAPPER);
+            }
+            else
+            {
+                userAgentDetails.AddUserAgentComponent($"md/{this.TableConsumer}");
             }
         }
 
@@ -1344,7 +1333,7 @@ internal async Task<Document> GetItemHelperAsync(Key key, GetItemOperationConfig
         }
 #endif
 
-#endregion
+        #endregion
 
 
         #region UpdateItem