Remove potential for NullPointerException (#1219)

Author: nakamura-to

doma-core/src/main/java/org/seasar/doma/wrapper/BigDecimalWrapper.java

@@ -18,7 +18,9 @@ public BigDecimalWrapper(BigDecimal value) {
 
   @Override
   public void set(Number v) {
-    if (v instanceof BigDecimal) {
+    if (v == null) {
+      super.set(null);
+    } else if (v instanceof BigDecimal) {
       super.set((BigDecimal) v);
     } else if (v instanceof BigInteger) {
       super.set(new BigDecimal((BigInteger) v));

doma-core/src/main/java/org/seasar/doma/wrapper/BigIntegerWrapper.java

@@ -18,7 +18,9 @@ public BigIntegerWrapper(BigInteger value) {
 
   @Override
   public void set(Number v) {
-    if (v instanceof BigInteger) {
+    if (v == null) {
+      super.set(null);
+    } else if (v instanceof BigInteger) {
       super.set((BigInteger) v);
     } else if (v instanceof BigDecimal) {
       super.set(((BigDecimal) v).toBigInteger());

doma-core/src/main/java/org/seasar/doma/wrapper/ByteWrapper.java

@@ -15,7 +15,11 @@ public ByteWrapper(Byte value) {
 
   @Override
   public void set(Number v) {
-    super.set(v.byteValue());
+    if (v == null) {
+      super.set(null);
+    } else {
+      super.set(v.byteValue());
+    }
   }
 
   @Override

doma-core/src/main/java/org/seasar/doma/wrapper/DoubleWrapper.java

@@ -15,7 +15,11 @@ public DoubleWrapper(Double value) {
 
   @Override
   public void set(Number v) {
-    super.set(v.doubleValue());
+    if (v == null) {
+      super.set(null);
+    } else {
+      super.set(v.doubleValue());
+    }
   }
 
   @Override

doma-core/src/main/java/org/seasar/doma/wrapper/FloatWrapper.java

@@ -15,7 +15,11 @@ public FloatWrapper(Float value) {
 
   @Override
   public void set(Number v) {
-    super.set(v.floatValue());
+    if (v == null) {
+      super.set(null);
+    } else {
+      super.set(v.floatValue());
+    }
   }
 
   @Override

doma-core/src/main/java/org/seasar/doma/wrapper/IntegerWrapper.java

@@ -15,7 +15,11 @@ public IntegerWrapper(Integer value) {
 
   @Override
   public void set(Number v) {
-    set(v.intValue());
+    if (v == null) {
+      super.set(null);
+    } else {
+      super.set(v.intValue());
+    }
   }
 
   @Override

doma-core/src/main/java/org/seasar/doma/wrapper/LongWrapper.java

@@ -15,7 +15,11 @@ public LongWrapper(Long value) {
 
   @Override
   public void set(Number v) {
-    super.set(v.longValue());
+    if (v == null) {
+      super.set(null);
+    } else {
+      super.set(v.longValue());
+    }
   }
 
   @Override

doma-core/src/main/java/org/seasar/doma/wrapper/ShortWrapper.java

@@ -15,7 +15,11 @@ public ShortWrapper(Short value) {
 
   @Override
   public void set(Number v) {
-    super.set(v.shortValue());
+    if (v == null) {
+      super.set(null);
+    } else {
+      super.set(v.shortValue());
+    }
   }
 
   @Override

doma-core/src/test/java/org/seasar/doma/wrapper/BigDecimalWrapperTest.java

@@ -2,6 +2,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.math.BigDecimal;
@@ -29,6 +30,20 @@ public void testSetBigInteger() {
     assertEquals(new BigDecimal(greaterThanLongMaxValue), wrapper.get());
   }
 
+  @Test
+  public void testSetNull() {
+    BigDecimalWrapper wrapper = new BigDecimalWrapper();
+    wrapper.set(null);
+    assertNull(wrapper.get());
+  }
+
+  @Test
+  public void testSetNullNumber() {
+    BigDecimalWrapper wrapper = new BigDecimalWrapper();
+    wrapper.set((Number) null);
+    assertNull(wrapper.get());
+  }
+
   /** */
   @Test
   public void testIncrement() {

doma-core/src/test/java/org/seasar/doma/wrapper/BigIntegerWrapperTest.java

@@ -1,6 +1,7 @@
 package org.seasar.doma.wrapper;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -27,6 +28,20 @@ public void testSetBigDecimal() {
     assertEquals(greaterThanLongMaxValue.toBigInteger(), wrapper.get());
   }
 
+  @Test
+  public void testSetNull() {
+    BigIntegerWrapper wrapper = new BigIntegerWrapper();
+    wrapper.set(null);
+    assertNull(wrapper.get());
+  }
+
+  @Test
+  public void testSetNullNumber() {
+    BigIntegerWrapper wrapper = new BigIntegerWrapper();
+    wrapper.set((Number) null);
+    assertNull(wrapper.get());
+  }
+
   /** */
   @Test
   public void testIncrement() {