Introduce wrapper classes dedicated to primitive types

Author: nakamura-to

src/main/java/org/seasar/doma/internal/apt/cttype/CtTypes.java

@@ -78,6 +78,13 @@
 import org.seasar.doma.wrapper.LongWrapper;
 import org.seasar.doma.wrapper.NClobWrapper;
 import org.seasar.doma.wrapper.ObjectWrapper;
+import org.seasar.doma.wrapper.PrimitiveBooleanWrapper;
+import org.seasar.doma.wrapper.PrimitiveByteWrapper;
+import org.seasar.doma.wrapper.PrimitiveDoubleWrapper;
+import org.seasar.doma.wrapper.PrimitiveFloatWrapper;
+import org.seasar.doma.wrapper.PrimitiveIntWrapper;
+import org.seasar.doma.wrapper.PrimitiveLongWrapper;
+import org.seasar.doma.wrapper.PrimitiveShortWrapper;
 import org.seasar.doma.wrapper.SQLXMLWrapper;
 import org.seasar.doma.wrapper.ShortWrapper;
 import org.seasar.doma.wrapper.StringWrapper;
@@ -638,19 +645,19 @@ public Class<?> visitDeclared(DeclaredType t, Void p) {
     public Class<?> visitPrimitive(PrimitiveType t, Void p) {
       switch (t.getKind()) {
         case BOOLEAN:
-          return BooleanWrapper.class;
+          return PrimitiveBooleanWrapper.class;
         case BYTE:
-          return ByteWrapper.class;
+          return PrimitiveByteWrapper.class;
         case SHORT:
-          return ShortWrapper.class;
+          return PrimitiveShortWrapper.class;
         case INT:
-          return IntegerWrapper.class;
+          return PrimitiveIntWrapper.class;
         case LONG:
-          return LongWrapper.class;
+          return PrimitiveLongWrapper.class;
         case FLOAT:
-          return FloatWrapper.class;
+          return PrimitiveFloatWrapper.class;
         case DOUBLE:
-          return DoubleWrapper.class;
+          return PrimitiveDoubleWrapper.class;
         case CHAR:
           return null;
         default:

src/main/java/org/seasar/doma/internal/apt/generator/DaoImplMethodGenerator.java

@@ -1011,11 +1011,10 @@ public Void visitBasicSingleResultParameterMeta(
         BasicSingleResultParameterMeta m, AutoModuleQueryMeta p) {
       final BasicCtType basicCtType = m.getBasicCtType();
       iprint(
-          "__query.setResultParameter(new %1$s<%2$s>(%3$s, %4$s));%n",
+          "__query.setResultParameter(new %1$s<%2$s>(%3$s));%n",
           /* 1 */ BasicSingleResultParameter.class,
           /* 2 */ basicCtType.getBoxedType(),
-          /* 3 */ basicCtType.getWrapperSupplierCode(),
-          /* 4 */ basicCtType.isPrimitive());
+          /* 3 */ basicCtType.getWrapperSupplierCode());
       return null;
     }
 
@@ -1701,15 +1700,14 @@ private SqlFileSelectQueryReturnCtTypeVisitor(SqlFileSelectQueryMeta m) {
     @Override
     public Void visitBasicCtType(final BasicCtType basicCtType, Boolean optional) {
       iprint(
-          "%1$s<%2$s> __command = getCommandImplementors().create%7$s(%8$s, __query, new %3$s<%6$s>(%4$s, %5$s));%n",
+          "%1$s<%2$s> __command = getCommandImplementors().create%6$s(%7$s, __query, new %3$s<%5$s>(%4$s));%n",
           /* 1 */ commandClass,
           /* 2 */ resultBoxedType,
           /* 3 */ getBasicSingleResultHandler(optional),
           /* 4 */ basicCtType.getWrapperSupplierCode(),
-          /* 5 */ basicCtType.isPrimitive(),
-          /* 6 */ basicCtType.getBoxedType(),
-          /* 7 */ commandName,
-          /* 8 */ methodName);
+          /* 5 */ basicCtType.getBoxedType(),
+          /* 6 */ commandName,
+          /* 7 */ methodName);
       return null;
     }
 

src/main/java/org/seasar/doma/internal/apt/generator/ScalarMetaFactory.java

@@ -86,10 +86,8 @@ public ScalarMeta visitBasicCtType(BasicCtType basicCtType, Boolean optional) {
                     OptionalBasicScalar.class, basicCtType.getWrapperSupplierCode());
               } else {
                 p.print(
-                    "() -> new %1$s<>(%2$s, %3$s)",
-                    BasicScalar.class,
-                    basicCtType.getWrapperSupplierCode(),
-                    basicCtType.isPrimitive());
+                    "() -> new %1$s<>(%2$s)",
+                    BasicScalar.class, basicCtType.getWrapperSupplierCode());
               }
             });
     return defaultAction(basicCtType, optional);

src/main/java/org/seasar/doma/internal/jdbc/command/BasicCollectorHandler.java

@@ -10,6 +10,6 @@ public class BasicCollectorHandler<BASIC, RESULT>
 
   public BasicCollectorHandler(
       Supplier<Wrapper<BASIC>> supplier, Collector<BASIC, ?, RESULT> collector) {
-    super(() -> new BasicScalar<>(supplier, false), collector);
+    super(() -> new BasicScalar<>(supplier), collector);
   }
 }

src/main/java/org/seasar/doma/internal/jdbc/command/BasicResultListHandler.java

@@ -9,7 +9,7 @@
 public class BasicResultListHandler<BASIC> extends ScalarResultListHandler<BASIC, BASIC> {
 
   public BasicResultListHandler(Supplier<Wrapper<BASIC>> supplier) {
-    super(() -> new BasicScalar<>(supplier, false));
+    super(() -> new BasicScalar<>(supplier));
     assertNotNull(supplier);
   }
 }

src/main/java/org/seasar/doma/internal/jdbc/command/BasicSingleResultHandler.java

@@ -6,7 +6,7 @@
 
 public class BasicSingleResultHandler<BASIC> extends ScalarSingleResultHandler<BASIC, BASIC> {
 
-  public BasicSingleResultHandler(Supplier<Wrapper<BASIC>> supplier, boolean primitive) {
-    super(() -> new BasicScalar<>(supplier, primitive));
+  public BasicSingleResultHandler(Supplier<Wrapper<BASIC>> supplier) {
+    super(() -> new BasicScalar<>(supplier));
   }
 }

src/main/java/org/seasar/doma/internal/jdbc/command/BasicStreamHandler.java

@@ -10,6 +10,6 @@ public class BasicStreamHandler<BASIC, RESULT> extends ScalarStreamHandler<BASIC
 
   public BasicStreamHandler(
       Supplier<Wrapper<BASIC>> supplier, Function<Stream<BASIC>, RESULT> mapper) {
-    super(() -> new BasicScalar<>(supplier, false), mapper);
+    super(() -> new BasicScalar<>(supplier), mapper);
   }
 }

src/main/java/org/seasar/doma/internal/jdbc/command/MapProvider.java

@@ -42,7 +42,7 @@ public Map<String, Object> get(ResultSet resultSet) throws SQLException {
     for (Map.Entry<Integer, String> entry : indexMap.entrySet()) {
       Integer index = entry.getKey();
       String key = entry.getValue();
-      BasicScalar<Object> scalar = new BasicScalar<>(() -> new ObjectWrapper(), false);
+      BasicScalar<Object> scalar = new BasicScalar<>(() -> new ObjectWrapper());
       fetch(resultSet, scalar, index, jdbcMappingVisitor);
       map.put(key, scalar.get());
     }

src/main/java/org/seasar/doma/internal/jdbc/command/OptionalBasicSingleResultHandler.java

@@ -10,7 +10,7 @@
 public class OptionalBasicSingleResultHandler<BASIC>
     extends ScalarSingleResultHandler<BASIC, Optional<BASIC>> {
 
-  public OptionalBasicSingleResultHandler(Supplier<Wrapper<BASIC>> supplier, boolean primitive) {
+  public OptionalBasicSingleResultHandler(Supplier<Wrapper<BASIC>> supplier) {
     super(() -> new OptionalBasicScalar<>(supplier));
     assertNotNull(supplier);
   }

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

@@ -9,13 +9,10 @@ public class BasicScalar<BASIC> implements Scalar<BASIC, BASIC> {
 
   protected final Wrapper<BASIC> wrapper;
 
-  protected final boolean primitive;
-
-  public BasicScalar(Supplier<Wrapper<BASIC>> supplier, boolean primitive) {
+  public BasicScalar(Supplier<Wrapper<BASIC>> supplier) {
     AssertionUtil.assertNotNull(supplier);
     this.wrapper = supplier.get();
     AssertionUtil.assertNotNull(this.wrapper);
-    this.primitive = primitive;
   }
 
   @Override
@@ -30,32 +27,17 @@ public BASIC cast(Object value) {
 
   @Override
   public BASIC get() {
-    BASIC value = wrapper.get();
-    if (value == null) {
-      return getDefaultInternal();
-    }
-    return value;
+    return wrapper.get();
   }
 
   @Override
   public BASIC getDefault() {
-    return getDefaultInternal();
-  }
-
-  protected BASIC getDefaultInternal() {
-    if (primitive) {
-      return wrapper.getDefault();
-    }
-    return null;
+    return wrapper.getDefault();
   }
 
   @Override
   public void set(BASIC value) {
-    if (value == null && primitive) {
-      wrapper.set(wrapper.getDefault());
-    } else {
-      wrapper.set(value);
-    }
+    wrapper.set(value);
   }
 
   @Override