refactor: share enum parsing helper; delegate scalar getters to static parse methods

Co-authored-by: baywet <7905502+baywet@users.noreply.github.com>

Author: Copilot

components/serialization/form/src/main/java/com/microsoft/kiota/serialization/FormParseNode.java

@@ -88,115 +88,55 @@ private String sanitizeKey(@Nonnull final String key) {
     }
 
     @Nullable public Boolean getBooleanValue() {
-        switch (getStringValue()
-                .toLowerCase(
-                        Locale.ROOT)) { // boolean parse returns false for any value that is not
-                // true
-            case "true":
-            case "1":
-                return true;
-            case "false":
-            case "0":
-                return false;
-            default:
-                return null;
-        }
+        return parseBooleanValue(getStringValue());
     }
 
     @Nullable public Byte getByteValue() {
-        try {
-            return Byte.parseByte(getStringValue());
-        } catch (final NumberFormatException ex) {
-            return null;
-        }
+        return parseByteValue(getStringValue());
     }
 
     @Nullable public Short getShortValue() {
-        try {
-            return Short.parseShort(getStringValue());
-        } catch (final NumberFormatException ex) {
-            return null;
-        }
+        return parseShortValue(getStringValue());
     }
 
     @Nullable public BigDecimal getBigDecimalValue() {
-        try {
-            return new BigDecimal(getStringValue());
-        } catch (final NumberFormatException ex) {
-            return null;
-        }
+        return parseBigDecimalValue(getStringValue());
     }
 
     @Nullable public Integer getIntegerValue() {
-        try {
-            return Integer.parseInt(getStringValue());
-        } catch (final NumberFormatException ex) {
-            return null;
-        }
+        return parseIntegerValue(getStringValue());
     }
 
     @Nullable public Float getFloatValue() {
-        try {
-            return Float.parseFloat(getStringValue());
-        } catch (final NumberFormatException ex) {
-            return null;
-        }
+        return parseFloatValue(getStringValue());
     }
 
     @Nullable public Double getDoubleValue() {
-        try {
-            return Double.parseDouble(getStringValue());
-        } catch (final NumberFormatException ex) {
-            return null;
-        }
+        return parseDoubleValue(getStringValue());
     }
 
     @Nullable public Long getLongValue() {
-        try {
-            return Long.parseLong(getStringValue());
-        } catch (final NumberFormatException ex) {
-            return null;
-        }
+        return parseLongValue(getStringValue());
     }
 
     @Nullable public UUID getUUIDValue() {
-        final String stringValue = getStringValue();
-        if (stringValue == null) return null;
-        return UUID.fromString(stringValue);
+        return parseUUIDValue(getStringValue());
     }
 
     @Nullable public OffsetDateTime getOffsetDateTimeValue() {
-        final String stringValue = getStringValue();
-        if (stringValue == null) return null;
-        try {
-            return OffsetDateTime.parse(stringValue);
-        } catch (DateTimeParseException ex) {
-            // Append UTC offset if it's missing
-            try {
-                LocalDateTime localDateTime = LocalDateTime.parse(stringValue);
-                return localDateTime.atOffset(ZoneOffset.UTC);
-            } catch (DateTimeParseException ex2) {
-                throw ex;
-            }
-        }
+        return parseOffsetDateTimeValue(getStringValue());
     }
 
     @Nullable public LocalDate getLocalDateValue() {
-        final String stringValue = getStringValue();
-        if (stringValue == null) return null;
-        return LocalDate.parse(stringValue);
+        return parseLocalDateValue(getStringValue());
     }
 
     @Nullable public LocalTime getLocalTimeValue() {
-        final String stringValue = getStringValue();
-        if (stringValue == null) return null;
-        return LocalTime.parse(stringValue);
+        return parseLocalTimeValue(getStringValue());
     }
 
     @Nullable public PeriodAndDuration getPeriodAndDurationValue() {
-        final String stringValue = getStringValue();
-        if (stringValue == null) return null;
-        return PeriodAndDuration.parse(stringValue);
+        return parsePeriodAndDurationValue(getStringValue());
     }
 
     @Nullable public <T> List<T> getCollectionOfPrimitiveValues(@Nonnull final Class<T> targetClass) {
@@ -231,6 +171,8 @@ private String sanitizeKey(@Nonnull final String key) {
             return (T) parseIntegerValue(value);
         } else if (targetClass == Float.class) {
             return (T) parseFloatValue(value);
+        } else if (targetClass == Double.class) {
+            return (T) parseDoubleValue(value);
         } else if (targetClass == Long.class) {
             return (T) parseLongValue(value);
         } else if (targetClass == UUID.class) {
@@ -307,6 +249,15 @@ private String sanitizeKey(@Nonnull final String key) {
         }
     }
 
+    @Nullable private static Double parseDoubleValue(@Nullable final String value) {
+        if (value == null) return null;
+        try {
+            return Double.parseDouble(value);
+        } catch (final NumberFormatException ex) {
+            return null;
+        }
+    }
+
     @Nullable private static Long parseLongValue(@Nullable final String value) {
         if (value == null) return null;
         try {

components/serialization/json/src/main/java/com/microsoft/kiota/serialization/JsonParseNode.java

@@ -175,12 +175,9 @@ private <T> List<T> iterateOnArray(JsonElement jsonElement, Function<JsonParseNo
             final List<T> result = new ArrayList<>(array.size());
             for (final JsonElement item : array) {
                 if (!item.isJsonNull()) {
-                    final String rawValue = gson.fromJson(item, String.class);
-                    if (rawValue != null && !rawValue.isEmpty()) {
-                        final T value = enumParser.forValue(rawValue);
-                        if (value != null) {
-                            result.add(value);
-                        }
+                    final T value = parseEnumValue(gson.fromJson(item, String.class), enumParser);
+                    if (value != null) {
+                        result.add(value);
                     }
                 }
             }
@@ -232,7 +229,11 @@ else if (element.isJsonPrimitive()) {
     }
 
     @Nullable public <T extends Enum<T>> T getEnumValue(@Nonnull final ValuedEnumParser<T> enumParser) {
-        final String rawValue = this.getStringValue();
+        return parseEnumValue(this.getStringValue(), enumParser);
+    }
+
+    @Nullable private static <T extends Enum<T>> T parseEnumValue(
+            @Nullable final String rawValue, @Nonnull final ValuedEnumParser<T> enumParser) {
         if (rawValue == null || rawValue.isEmpty()) {
             return null;
         }