Fix returning wrong type for Optional properties on selecting (#628)

Author: nakamura-to

doma-core/src/main/java/org/seasar/doma/internal/jdbc/scalar/BasicScalar.java

@@ -35,6 +35,11 @@ public BASIC get() {
     return wrapper.get();
   }
 
+  @Override
+  public Object getAsNonOptional() {
+    return get();
+  }
+
   @Override
   public BASIC getDefault() {
     return wrapper.getDefault();

doma-core/src/main/java/org/seasar/doma/internal/jdbc/scalar/OptionalBasicScalar.java

@@ -37,6 +37,11 @@ public Optional<BASIC> get() {
     return Optional.ofNullable(wrapper.get());
   }
 
+  @Override
+  public Object getAsNonOptional() {
+    return get().orElse(null);
+  }
+
   @Override
   public Optional<BASIC> getDefault() {
     return Optional.empty();

doma-core/src/main/java/org/seasar/doma/internal/jdbc/scalar/OptionalDoubleScalar.java

@@ -29,6 +29,11 @@ public OptionalDouble get() {
     return value != null ? OptionalDouble.of(value) : OptionalDouble.empty();
   }
 
+  @Override
+  public Object getAsNonOptional() {
+    return get().orElse(0d);
+  }
+
   @Override
   public OptionalDouble getDefault() {
     return OptionalDouble.empty();

doma-core/src/main/java/org/seasar/doma/internal/jdbc/scalar/OptionalIntScalar.java

@@ -29,6 +29,11 @@ public OptionalInt get() {
     return value != null ? OptionalInt.of(value) : OptionalInt.empty();
   }
 
+  @Override
+  public Object getAsNonOptional() {
+    return get().orElse(0);
+  }
+
   @Override
   public OptionalInt getDefault() {
     return OptionalInt.empty();

doma-core/src/main/java/org/seasar/doma/internal/jdbc/scalar/OptionalLongScalar.java

@@ -29,6 +29,11 @@ public OptionalLong get() {
     return value != null ? OptionalLong.of(value) : OptionalLong.empty();
   }
 
+  @Override
+  public Object getAsNonOptional() {
+    return get().orElse(0L);
+  }
+
   @Override
   public OptionalLong getDefault() {
     return OptionalLong.empty();

doma-core/src/main/java/org/seasar/doma/internal/jdbc/scalar/Scalar.java

@@ -8,6 +8,8 @@ public interface Scalar<BASIC, CONTAINER> extends JdbcMappable<BASIC> {
 
   CONTAINER get();
 
+  Object getAsNonOptional();
+
   CONTAINER getDefault();
 
   void set(CONTAINER container);

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/command/MappedResultProvider.java

@@ -74,7 +74,7 @@ public <PROPERTY> PROPERTY get(PropertyMetamodel<PROPERTY> propertyMetamodel) {
             } catch (SQLException e) {
               throw new UncheckedSQLException(e);
             }
-            return (PROPERTY) property.get();
+            return (PROPERTY) property.getAsNonOptional();
           }
         };
     try {

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/expression/BasicPropertyTypes.java

@@ -114,6 +114,11 @@ public Object get() {
     return scalar.get();
   }
 
+  @Override
+  public Object getAsNonOptional() {
+    return scalar.getAsNonOptional();
+  }
+
   @Override
   public Property<Object, BASIC> load(Object o) {
     throw new UnsupportedOperationException();

doma-core/src/main/java/org/seasar/doma/jdbc/domain/AbstractDomainType.java

@@ -67,6 +67,11 @@ public DOMAIN get() {
       return newDomain(wrapper.get());
     }
 
+    @Override
+    public Object getAsNonOptional() {
+      return get();
+    }
+
     @Override
     public DOMAIN getDefault() {
       return null;
@@ -118,6 +123,11 @@ public Optional<DOMAIN> get() {
       return Optional.of(newDomain(value));
     }
 
+    @Override
+    public Object getAsNonOptional() {
+      return get().orElse(null);
+    }
+
     @Override
     public Optional<DOMAIN> getDefault() {
       return getDefaultInternal();

doma-core/src/main/java/org/seasar/doma/jdbc/entity/DefaultPropertyType.java

@@ -200,6 +200,11 @@ public Object get() {
       return scalar.get();
     }
 
+    @Override
+    public Object getAsNonOptional() {
+      return scalar.getAsNonOptional();
+    }
+
     @Override
     public Property<ENTITY, BASIC> load(ENTITY entity) {
       Object value = field.getValue(entity);