Replace InstantAsInteger with InstantAsString and test if this works.

Author: Quanzzzz

services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/AttributeConverter.java

@@ -18,7 +18,6 @@
 import java.time.Instant;
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.annotations.ThreadSafe;
-import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.InstantAsIntegerAttributeConverter;
 import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.InstantAsStringAttributeConverter;
 import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.StringAttributeConverter;
 import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
@@ -31,8 +30,6 @@
  * <ul>
  *     <li>The {@link StringAttributeConverter} converts a {@link String} into a DynamoDB string
  *     ({@link software.amazon.awssdk.services.dynamodb.model.AttributeValue#s()}).</li>
- *     <li>The {@link InstantAsIntegerAttributeConverter} converts an {@link Instant} into a DynamoDB number
- *     ({@link software.amazon.awssdk.services.dynamodb.model.AttributeValue#n()}).</li>
  *     <li>The {@link InstantAsStringAttributeConverter} converts an {@link Instant} into a DynamoDB string
  *     ({@link software.amazon.awssdk.services.dynamodb.model.AttributeValue#s()}).</li>
  * </ul>

services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/DefaultAttributeConverterProvider.java

@@ -43,7 +43,7 @@
 import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.DurationAttributeConverter;
 import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.EnumAttributeConverter;
 import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.FloatAttributeConverter;
-import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.InstantAsIntegerAttributeConverter;
+import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.InstantAsStringAttributeConverter;
 import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.IntegerAttributeConverter;
 import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.ListAttributeConverter;
 import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.LocalDateAttributeConverter;
@@ -211,7 +211,7 @@ private static Builder getDefaultBuilder() {
                                                 .addConverter(DoubleAttributeConverter.create())
                                                 .addConverter(DurationAttributeConverter.create())
                                                 .addConverter(FloatAttributeConverter.create())
-                                                .addConverter(InstantAsIntegerAttributeConverter.create())
+                                                .addConverter(InstantAsStringAttributeConverter.create())
                                                 .addConverter(IntegerAttributeConverter.create())
                                                 .addConverter(LocalDateAttributeConverter.create())
                                                 .addConverter(LocalDateTimeAttributeConverter.create())

services-custom/dynamodb-enhanced/src/main/java/software/amazon/awssdk/enhanced/dynamodb/internal/converter/ConverterUtils.java

@@ -15,6 +15,9 @@
 
 package software.amazon.awssdk.enhanced.dynamodb.internal.converter;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
 import software.amazon.awssdk.enhanced.dynamodb.internal.converter.attribute.DoubleAttributeConverter;
@@ -49,10 +52,6 @@ public static void validateFloat(Float input) {
         Validate.isTrue(Float.isFinite(input), "Infinite numbers are not supported by the default converters.");
     }
 
-    public static String padLeft2(int valueToPad) {
-        return valueToPad > 10 ? Integer.toString(valueToPad) : "0" + valueToPad;
-    }
-
     public static String padLeft(int paddingAmount, int valueToPad) {
         String value = Integer.toString(valueToPad);
         int padding = paddingAmount - value.length();
@@ -64,60 +63,6 @@ public static String padLeft(int paddingAmount, int valueToPad) {
         return result.toString();
     }
 
-    public static String padRight(int paddingAmount, String valueToPad) {
-        StringBuilder result = new StringBuilder(paddingAmount);
-        result.append(valueToPad);
-        for (int i = result.length(); i < paddingAmount; i++) {
-            result.append('0');
-        }
-        return result.toString();
-    }
-
-    public static String trimNumber(String number) {
-        int startInclusive = findTrimInclusiveStart(number, '0', 0);
-
-        if (startInclusive >= number.length()) {
-            return "0";
-        }
-
-        if (!number.contains(".")) {
-            return number.substring(startInclusive);
-        }
-
-        int endExclusive = findTrimExclusiveEnd(number, '0', number.length());
-        endExclusive = findTrimExclusiveEnd(number, '.', endExclusive);
-
-        if (startInclusive >= endExclusive) {
-            return "0";
-        }
-
-        String result = number.substring(startInclusive, endExclusive);
-        if (result.startsWith(".")) {
-            return "0" + result;
-        }
-        return result;
-    }
-
-    private static int findTrimInclusiveStart(String string, char characterToTrim, int startingIndex) {
-        int startInclusive = startingIndex;
-
-        while (startInclusive < string.length() && string.charAt(startInclusive) == characterToTrim) {
-            ++startInclusive;
-        }
-
-        return startInclusive;
-    }
-
-    private static int findTrimExclusiveEnd(String string, char characterToTrim, int startingIndex) {
-        int endExclusive = startingIndex;
-
-        while (endExclusive > 0 && string.charAt(endExclusive - 1) == characterToTrim) {
-            --endExclusive;
-        }
-
-        return endExclusive;
-    }
-
     public static String[] splitNumberOnDecimal(String valueToSplit) {
         int i = valueToSplit.indexOf('.');
         if (i == -1) {
@@ -128,55 +73,8 @@ public static String[] splitNumberOnDecimal(String valueToSplit) {
         }
     }
 
-    public static String[] chunk(String valueToChunk, int... splitSizes) {
-        String[] result = new String[splitSizes.length + 1];
-        int splitStartInclusive = chunkLeft(valueToChunk, result, splitSizes);
-
-        Validate.isTrue(splitStartInclusive == valueToChunk.length(), "Value size does not match expected chunking scheme.");
-
-        return result;
-    }
-
-    public static String[] chunkWithRightOverflow(String valueToChunk, int... splitSizesFromLeft) {
-        String[] result = new String[splitSizesFromLeft.length + 1];
-        int splitStartInclusive = chunkLeft(valueToChunk, result, splitSizesFromLeft);
-
-        result[splitSizesFromLeft.length] = valueToChunk.substring(splitStartInclusive);
-
-        return result;
+    public static LocalDateTime convertFromLocalDate(LocalDate localDate) {
+        return LocalDateTime.of(localDate, LocalTime.MIDNIGHT);
     }
 
-    public static String[] chunkWithLeftOverflow(String valueToChunk, int... splitSizesFromRight) {
-        try {
-            String[] result = new String[splitSizesFromRight.length + 1];
-            int splitEndExclusive = valueToChunk.length();
-
-            for (int i = splitSizesFromRight.length - 1; i >= 0; i--) {
-                int splitStartInclusive = splitEndExclusive - splitSizesFromRight[i];
-                result[i + 1] = valueToChunk.substring(splitStartInclusive, splitEndExclusive);
-                splitEndExclusive = splitStartInclusive;
-            }
-
-            result[0] = valueToChunk.substring(0, splitEndExclusive);
-
-            return result;
-        } catch (StringIndexOutOfBoundsException e) {
-            throw new IllegalArgumentException("Invalid format for value.", e);
-        }
-    }
-
-    private static int chunkLeft(String valueToChunk, String[] result, int[] splitSizes) {
-        try {
-            int splitStartInclusive = 0;
-
-            for (int i = 0; i < splitSizes.length; i++) {
-                int splitEndExclusive = splitStartInclusive + splitSizes[i];
-                result[i] = valueToChunk.substring(splitStartInclusive, splitEndExclusive);
-                splitStartInclusive = splitEndExclusive;
-            }
-            return splitStartInclusive;
-        } catch (StringIndexOutOfBoundsException e) {
-            throw new IllegalArgumentException("Invalid format for value.", e);
-        }
-    }
 }