Changed per code review comment

micronaut-projects · Jul 25, 2023 · aac1692 · aac1692
1 parent 29d3df9
commit aac1692
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/serde-support/src/main/java/io/micronaut/serde/support/deserializers/DeserBean.java b/serde-support/src/main/java/io/micronaut/serde/support/deserializers/DeserBean.java
@@ -655,10 +655,11 @@ public DerProperty(ConversionService conversionService,
             this.instrospection = instrospection;
             this.index = index;
             this.argument = argument;
-            this.mustSetField = argument.isNonNull() || (!argument.getType().equals(Object.class) && (argument.isAssignableFrom(Optional.class)
-                    || argument.isAssignableFrom(OptionalLong.class)
-                    || argument.isAssignableFrom(OptionalDouble.class)
-                    || argument.isAssignableFrom(OptionalInt.class)));
+            Class<?> type = argument.getType();
+            this.mustSetField = argument.isNonNull() || type.equals(Optional.class)
+                    || type.equals(OptionalLong.class)
+                    || type.equals(OptionalDouble.class)
+                    || type.equals(OptionalInt.class);
             this.nonNull = argument.isNonNull();
             this.nullable = argument.isNullable();
             if (beanProperty != null)  {