FIX: null handling in ScalarType.toBeanType (#1455)

src/main/java/io/ebeaninternal/server/type/ScalarTypeChar.java

@@ -51,6 +51,7 @@ public class ScalarTypeChar extends ScalarTypeBaseVarchar<Character> {
 
   @Override
   public Character toBeanType(Object value) {
+    if (value == null) return null;
     String s = BasicTypeConverter.toString(value);
     return s.charAt(0);
   }

src/main/java/io/ebeaninternal/server/type/ScalarTypeCharArray.java

@@ -54,6 +54,7 @@ public class ScalarTypeCharArray extends ScalarTypeBaseVarchar<char[]> {
 
   @Override
   public char[] toBeanType(Object value) {
+    if (value == null) return null;
     String s = BasicTypeConverter.toString(value);
     return s.toCharArray();
   }

src/main/java/io/ebeaninternal/server/type/ScalarTypeDuration.java

@@ -59,6 +59,7 @@ public class ScalarTypeDuration extends ScalarTypeBase<Duration> {
   @Override
   public Duration toBeanType(Object value) {
     if (value instanceof Duration) return (Duration) value;
+    if (value == null) return null;
     return Duration.ofSeconds(BasicTypeConverter.toLong(value));
   }
 

src/main/java/io/ebeaninternal/server/type/ScalarTypeDurationWithNanos.java

@@ -42,6 +42,7 @@ public class ScalarTypeDurationWithNanos extends ScalarTypeDuration {
   @Override
   public Duration toBeanType(Object value) {
     if (value instanceof Duration) return (Duration) value;
+    if (value == null) return null;
     return convertFromBigDecimal(BasicTypeConverter.toBigDecimal(value));
   }
 

src/main/java/io/ebeaninternal/server/type/ScalarTypeInstant.java

@@ -53,7 +53,7 @@ public class ScalarTypeInstant extends ScalarTypeBaseDateTime<Instant> {
 
   @Override
   public Instant toBeanType(Object value) {
-    if (value instanceof Instant) return (Instant) value;
-    return convertFromTimestamp((Timestamp) value);
+    if (value instanceof Timestamp) return convertFromTimestamp((Timestamp) value);
+    return (Instant) value;
   }
 }

src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTime.java

@@ -54,7 +54,7 @@ public class ScalarTypeLocalDateTime extends ScalarTypeBaseDateTime<LocalDateTim
 
   @Override
   public LocalDateTime toBeanType(Object value) {
-    if (value instanceof LocalDateTime) return (LocalDateTime) value;
-    return convertFromTimestamp((Timestamp) value);
+    if (value instanceof Timestamp) return convertFromTimestamp((Timestamp) value);
+    return (LocalDateTime) value;
   }
 }

src/main/java/io/ebeaninternal/server/type/ScalarTypeOffsetDateTime.java

@@ -55,7 +55,7 @@ public class ScalarTypeOffsetDateTime extends ScalarTypeBaseDateTime<OffsetDateT
 
   @Override
   public OffsetDateTime toBeanType(Object value) {
-    if (value instanceof OffsetDateTime) return (OffsetDateTime) value;
-    return convertFromTimestamp((Timestamp) value);
+    if (value instanceof Timestamp) return convertFromTimestamp((Timestamp) value);
+    return (OffsetDateTime) value;
   }
 }

src/main/java/io/ebeaninternal/server/type/ScalarTypeYear.java

@@ -65,6 +65,7 @@ public class ScalarTypeYear extends ScalarTypeBase<Year> {
   @Override
   public Year toBeanType(Object value) {
     if (value instanceof Year) return (Year) value;
+    if (value == null) return null;
     return Year.of(BasicTypeConverter.toInteger(value));
   }
 

src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java

@@ -61,6 +61,7 @@ public class ScalarTypeYearMonthDate extends ScalarTypeBaseDate<YearMonth> {
   public YearMonth toBeanType(Object value) {
     if (value instanceof YearMonth) return (YearMonth) value;
     if (value instanceof LocalDate) return fromLocalDate((LocalDate) value);
+    if (value == null) return null;
     return fromLocalDate(BasicTypeConverter.toDate(value).toLocalDate());
   }
 

src/main/java/io/ebeaninternal/server/type/ScalarTypeZonedDateTime.java

@@ -55,7 +55,7 @@ public class ScalarTypeZonedDateTime extends ScalarTypeBaseDateTime<ZonedDateTim
 
   @Override
   public ZonedDateTime toBeanType(Object value) {
-    if (value instanceof ZonedDateTime) return (ZonedDateTime) value;
-    return convertFromTimestamp((Timestamp) value);
+    if (value instanceof Timestamp) return convertFromTimestamp((Timestamp) value);
+    return (ZonedDateTime) value;
   }
 }