Avoid the ClassName::new syntax.

Because the syntax is slow in Eclipse.

Author: nakamura-to

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

@@ -9,6 +9,11 @@ public class BasicScalar<BASIC> implements Scalar<BASIC, BASIC> {
 
   protected final Wrapper<BASIC> wrapper;
 
+  public BasicScalar(Wrapper<BASIC> wrapper) {
+    AssertionUtil.assertNotNull(wrapper);
+    this.wrapper = wrapper;
+  }
+
   public BasicScalar(Supplier<Wrapper<BASIC>> supplier) {
     AssertionUtil.assertNotNull(supplier);
     this.wrapper = supplier.get();

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

@@ -9,6 +9,12 @@ public class OptionalBasicScalar<BASIC> implements Scalar<BASIC, Optional<BASIC>
 
   protected final Wrapper<BASIC> wrapper;
 
+  public OptionalBasicScalar(Wrapper<BASIC> wrapper) {
+    AssertionUtil.assertNotNull(wrapper);
+    this.wrapper = wrapper;
+    AssertionUtil.assertNotNull(wrapper);
+  }
+
   public OptionalBasicScalar(Supplier<Wrapper<BASIC>> supplier) {
     AssertionUtil.assertNotNull(supplier);
     this.wrapper = supplier.get();

doma-processor/src/main/java/org/seasar/doma/internal/apt/cttype/BasicCtType.java

@@ -34,6 +34,17 @@ public Code getWrapperSupplierCode() {
         });
   }
 
+  public Code getWrapperCode() {
+    return new Code(
+        p -> {
+          if (isEnum()) {
+            p.print("new %1$s(%2$s.class)", wrapperType, getQualifiedName());
+          } else {
+            p.print("new %1$s()", wrapperType);
+          }
+        });
+  }
+
   @Override
   public <R, P, TH extends Throwable> R accept(CtTypeVisitor<R, P, TH> visitor, P p) throws TH {
     return visitor.visitBasicCtType(this, p);

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

@@ -83,11 +83,9 @@ public ScalarMeta visitBasicCtType(BasicCtType basicCtType, Boolean optional) {
               if (optional) {
                 p.print(
                     "() -> new %1$s<>(%2$s)",
-                    OptionalBasicScalar.class, basicCtType.getWrapperSupplierCode());
+                    OptionalBasicScalar.class, basicCtType.getWrapperCode());
               } else {
-                p.print(
-                    "() -> new %1$s<>(%2$s)",
-                    BasicScalar.class, basicCtType.getWrapperSupplierCode());
+                p.print("() -> new %1$s<>(%2$s)", BasicScalar.class, basicCtType.getWrapperCode());
               }
             });
     return defaultAction(basicCtType, optional);