Revert changes to mock, reintroduce checks for primitive values

Author: papegaaij

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

@@ -72,39 +72,39 @@ public JsonParseNode(@Nonnull final JsonElement node, @Nonnull final Gson gson)
     }
 
     @Nullable public String getStringValue() {
-        return gson.fromJson(currentNode, String.class);
+        return currentNode.isJsonPrimitive() ? gson.fromJson(currentNode, String.class) : null;
     }
 
     @Nullable public Boolean getBooleanValue() {
-        return gson.fromJson(currentNode, Boolean.class);
+        return currentNode.isJsonPrimitive() ? gson.fromJson(currentNode, Boolean.class) : null;
     }
 
     @Nullable public Byte getByteValue() {
-        return gson.fromJson(currentNode, Byte.class);
+        return currentNode.isJsonPrimitive() ? gson.fromJson(currentNode, Byte.class) : null;
     }
 
     @Nullable public Short getShortValue() {
-        return gson.fromJson(currentNode, Short.class);
+        return currentNode.isJsonPrimitive() ? gson.fromJson(currentNode, Short.class) : null;
     }
 
     @Nullable public BigDecimal getBigDecimalValue() {
-        return gson.fromJson(currentNode, BigDecimal.class);
+        return currentNode.isJsonPrimitive() ? gson.fromJson(currentNode, BigDecimal.class) : null;
     }
 
     @Nullable public Integer getIntegerValue() {
-        return gson.fromJson(currentNode, Integer.class);
+        return currentNode.isJsonPrimitive() ? gson.fromJson(currentNode, Integer.class) : null;
     }
 
     @Nullable public Float getFloatValue() {
-        return gson.fromJson(currentNode, Float.class);
+        return currentNode.isJsonPrimitive() ? gson.fromJson(currentNode, Float.class) : null;
     }
 
     @Nullable public Double getDoubleValue() {
-        return gson.fromJson(currentNode, Double.class);
+        return currentNode.isJsonPrimitive() ? gson.fromJson(currentNode, Double.class) : null;
     }
 
     @Nullable public Long getLongValue() {
-        return gson.fromJson(currentNode, Long.class);
+        return currentNode.isJsonPrimitive() ? gson.fromJson(currentNode, Long.class) : null;
     }
 
     @Nullable public UUID getUUIDValue() {
@@ -311,6 +311,6 @@ public void setOnAfterAssignFieldValues(@Nullable final Consumer<Parsable> value
     }
 
     @Nullable public byte[] getByteArrayValue() {
-        return gson.fromJson(currentNode, byte[].class);
+        return currentNode.isJsonPrimitive() ? gson.fromJson(currentNode, byte[].class) : null;
     }
 }

components/serialization/json/src/test/java/com/microsoft/kiota/serialization/mocks/IntersectionTypeMock.java

@@ -1,6 +1,5 @@
 package com.microsoft.kiota.serialization.mocks;
 
-import com.google.gson.JsonSyntaxException;
 import com.microsoft.kiota.serialization.ComposedTypeWrapper;
 import com.microsoft.kiota.serialization.Parsable;
 import com.microsoft.kiota.serialization.ParseNode;
@@ -22,18 +21,16 @@ public class IntersectionTypeMock implements Parsable, ComposedTypeWrapper {
             @jakarta.annotation.Nonnull final ParseNode parseNode) {
         Objects.requireNonNull(parseNode);
         final var result = new IntersectionTypeMock();
-        try {
+        if (parseNode.getStringValue() != null) {
             result.setStringValue(parseNode.getStringValue());
-        } catch (JsonSyntaxException e) {
-            if (parseNode.getCollectionOfObjectValues(TestEntity::createFromDiscriminatorValue)
-                    != null) {
-                result.setComposedType3(
-                        parseNode.getCollectionOfObjectValues(
-                                TestEntity::createFromDiscriminatorValue));
-            } else {
-                result.setComposedType1(new TestEntity());
-                result.setComposedType2(new SecondTestEntity());
-            }
+        } else if (parseNode.getCollectionOfObjectValues(TestEntity::createFromDiscriminatorValue)
+                != null) {
+            result.setComposedType3(
+                    parseNode.getCollectionOfObjectValues(
+                            TestEntity::createFromDiscriminatorValue));
+        } else {
+            result.setComposedType1(new TestEntity());
+            result.setComposedType2(new SecondTestEntity());
         }
         return result;
     }

components/serialization/json/src/test/java/com/microsoft/kiota/serialization/mocks/UnionTypeMock.java

@@ -1,6 +1,5 @@
 package com.microsoft.kiota.serialization.mocks;
 
-import com.google.gson.JsonSyntaxException;
 import com.microsoft.kiota.serialization.ComposedTypeWrapper;
 import com.microsoft.kiota.serialization.Parsable;
 import com.microsoft.kiota.serialization.ParseNode;
@@ -29,17 +28,13 @@ public class UnionTypeMock implements Parsable, ComposedTypeWrapper {
             } else if ("#microsoft.graph.secondTestEntity".equalsIgnoreCase(mappingValue)) {
                 result.setComposedType2(new SecondTestEntity());
             }
-        } else {
-            try {
-                result.setStringValue(parseNode.getStringValue());
-            } catch (JsonSyntaxException e) {
-                if (parseNode.getCollectionOfObjectValues(TestEntity::createFromDiscriminatorValue)
-                        != null) {
-                    result.setComposedType3(
-                            parseNode.getCollectionOfObjectValues(
-                                    TestEntity::createFromDiscriminatorValue));
-                }
-            }
+        } else if (parseNode.getStringValue() != null) {
+            result.setStringValue(parseNode.getStringValue());
+        } else if (parseNode.getCollectionOfObjectValues(TestEntity::createFromDiscriminatorValue)
+                != null) {
+            result.setComposedType3(
+                    parseNode.getCollectionOfObjectValues(
+                            TestEntity::createFromDiscriminatorValue));
         }
         return result;
     }