Merge pull request #140 from domaframework/fix-null-assignment-for-primitive-type

プリミティブ型のプロパティにnullがアサインされる場合に例外が発生していた不具合をデフォルト値が設定されるように修正

Author: nakamura-to

src/main/java/org/seasar/doma/internal/jdbc/entity/PropertyField.java

@@ -111,4 +111,9 @@ private void setFieldValue(Field field, ENTITY entity, Object value) {
                     entityClass.getName(), path);
         }
     }
+
+    public boolean isPrimitive() {
+        Field field = fields.getLast();
+        return field.getType().isPrimitive();
+    }
 }

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

@@ -203,7 +203,7 @@ private Supplier<Property<ENTITY, BASIC>> createPropertySupplier() {
                     (Scalar<BASIC, OptionalDouble>) new OptionalDoubleScalar());
         } else {
             return () -> new DefaultProperty<BASIC>(new BasicScalar<>(
-                    wrapperSupplier, field.getClass().isPrimitive()));
+                    wrapperSupplier, field.isPrimitive()));
         }
     }
 

src/test/java/org/seasar/doma/internal/jdbc/entity/Person.java

@@ -20,4 +20,6 @@ public class Person extends Animal {
     public String name;
 
     public Address address;
+
+    public int age;
 }

src/test/java/org/seasar/doma/internal/jdbc/entity/PropertyFieldTest.java

@@ -110,4 +110,10 @@ public void testSetValue_nestedParentPath() throws Exception {
         }
     }
 
+    public void testIsPrimitive() throws Exception {
+        PropertyField<Person> age = new PropertyField<>("age", Person.class);
+        assertTrue(age.isPrimitive());
+        PropertyField<Person> name = new PropertyField<>("name", Person.class);
+        assertFalse(name.isPrimitive());
+    }
 }

src/test/java/org/seasar/doma/jdbc/entity/DefaultPropertyTypeTest.java

@@ -17,6 +17,7 @@
 
 import junit.framework.TestCase;
 
+import org.seasar.doma.wrapper.IntegerWrapper;
 import org.seasar.doma.wrapper.StringWrapper;
 
 /**
@@ -31,6 +32,12 @@ public class DefaultPropertyTypeTest extends TestCase {
     @SuppressWarnings("unused")
     private Foo foo;
 
+    @SuppressWarnings("unused")
+    private int primitiveInt;
+
+    @SuppressWarnings("unused")
+    private Integer integer;
+
     public void testIsQuoteRequired_true() throws Exception {
         boolean isQuoteRequired = true;
         DefaultPropertyType<Object, DefaultPropertyTypeTest, String, Object> propertyType = new DefaultPropertyType<>(
@@ -138,6 +145,26 @@ public void testGetColumnName_naiming_quote_quoteNotRequired()
                         + text + "]"));
     }
 
+    public void testPrimitivePropertyDefaultValue() throws Exception {
+        DefaultPropertyType<Object, DefaultPropertyTypeTest, Integer, Object> propertyType = new DefaultPropertyType<>(
+                DefaultPropertyTypeTest.class, Integer.class, Integer.class,
+                () -> new IntegerWrapper(), null, null, "primitiveInt",
+                "primitiveInt", NamingType.NONE, true, true, false);
+        Property<DefaultPropertyTypeTest, Integer> property = propertyType
+                .createProperty();
+        assertEquals(0, property.get());
+    }
+
+    public void testWrapperPropertyDefaultValue() throws Exception {
+        DefaultPropertyType<Object, DefaultPropertyTypeTest, Integer, Object> propertyType = new DefaultPropertyType<>(
+                DefaultPropertyTypeTest.class, Integer.class, Integer.class,
+                () -> new IntegerWrapper(), null, null, "integer", "integer",
+                NamingType.NONE, true, true, false);
+        Property<DefaultPropertyTypeTest, Integer> property = propertyType
+                .createProperty();
+        assertNull(property.get());
+    }
+
     public static class Foo {
         String hoge;
     }