Add null validation in ConverterUtils.validateDouble/validateFloat to replace auto-unboxing NPE

Author: S-Saranya1

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

@@ -39,6 +39,7 @@ private ConverterUtils() {
      * @param input
      */
     public static void validateDouble(Double input) {
+        Validate.paramNotNull(input, "input");
         Validate.isTrue(!Double.isNaN(input), "NaN is not supported by the default converters.");
         Validate.isTrue(Double.isFinite(input), "Infinite numbers are not supported by the default converters.");
     }
@@ -48,6 +49,7 @@ public static void validateDouble(Double input) {
      * @param input
      */
     public static void validateFloat(Float input) {
+        Validate.paramNotNull(input, "input");
         Validate.isTrue(!Float.isNaN(input), "NaN is not supported by the default converters.");
         Validate.isTrue(Float.isFinite(input), "Infinite numbers are not supported by the default converters.");
     }

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

@@ -21,7 +21,6 @@
 import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
 import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
 import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
-import software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues;
 import software.amazon.awssdk.enhanced.dynamodb.internal.converter.ConverterUtils;
 import software.amazon.awssdk.enhanced.dynamodb.internal.converter.PrimitiveConverter;
 import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
@@ -72,9 +71,6 @@ public AttributeValueType attributeValueType() {
 
     @Override
     public AttributeValue transformFrom(Double input) {
-        if (input == null) {
-            return AttributeValues.nullAttributeValue();
-        }
         ConverterUtils.validateDouble(input);
         return AttributeValue.builder().n(STRING_CONVERTER.toString(input)).build();
     }

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

@@ -21,7 +21,6 @@
 import software.amazon.awssdk.enhanced.dynamodb.AttributeConverter;
 import software.amazon.awssdk.enhanced.dynamodb.AttributeValueType;
 import software.amazon.awssdk.enhanced.dynamodb.EnhancedType;
-import software.amazon.awssdk.enhanced.dynamodb.internal.AttributeValues;
 import software.amazon.awssdk.enhanced.dynamodb.internal.converter.ConverterUtils;
 import software.amazon.awssdk.enhanced.dynamodb.internal.converter.PrimitiveConverter;
 import software.amazon.awssdk.enhanced.dynamodb.internal.converter.TypeConvertingVisitor;
@@ -72,9 +71,6 @@ public AttributeValueType attributeValueType() {
 
     @Override
     public AttributeValue transformFrom(Float input) {
-        if (input == null) {
-            return AttributeValues.nullAttributeValue();
-        }
         ConverterUtils.validateFloat(input);
         return AttributeValue.builder().n(STRING_CONVERTER.toString(input)).build();
     }

services-custom/dynamodb-enhanced/src/test/java/software/amazon/awssdk/enhanced/dynamodb/converters/attribute/NumberAttributeConvertersTest.java

@@ -16,6 +16,7 @@
 package software.amazon.awssdk.enhanced.dynamodb.converters.attribute;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.data.Offset.offset;
 import static software.amazon.awssdk.enhanced.dynamodb.converters.attribute.ConverterTestUtils.assertFails;
 import static software.amazon.awssdk.enhanced.dynamodb.converters.attribute.ConverterTestUtils.transformFrom;
@@ -150,8 +151,9 @@ public void floatAttributeConverterBehaves() {
         assertFails(() -> transformFrom(converter, Float.NEGATIVE_INFINITY));
         assertFails(() -> transformFrom(converter, Float.POSITIVE_INFINITY));
         assertFails(() -> transformFrom(converter, Float.NaN));
-
-        assertThat(transformFrom(converter, null).nul()).isTrue();
+        assertThatThrownBy(() -> transformFrom(converter, null))
+            .isInstanceOf(NullPointerException.class)
+            .hasMessageContaining("input must not be null");
 
         assertThat(transformFrom(converter, -Float.MAX_VALUE).n()).isEqualTo("-3.4028235E38");
         assertThat(Float.parseFloat(transformFrom(converter, -42.42f).n())).isCloseTo(-42.42f, offset(1E-10f));
@@ -181,8 +183,9 @@ public void doubleAttributeConverterBehaves() {
         assertFails(() -> transformFrom(converter, Double.NEGATIVE_INFINITY));
         assertFails(() -> transformFrom(converter, Double.POSITIVE_INFINITY));
         assertFails(() -> transformFrom(converter, Double.NaN));
-
-        assertThat(transformFrom(converter, null).nul()).isTrue();
+        assertThatThrownBy(() -> transformFrom(converter, null))
+            .isInstanceOf(NullPointerException.class)
+            .hasMessageContaining("input must not be null");
 
         assertThat(transformFrom(converter, -Double.MAX_VALUE).n()).isEqualTo("-1.7976931348623157E308");
         assertThat(Double.parseDouble(transformFrom(converter, -42.42d).n())).isCloseTo(-42.42d, offset(1E-10));