Refactor

Author: nakamura-to

doma-core/src/main/java/org/seasar/doma/jdbc/dialect/OracleMultiInsertAssembler.java

@@ -15,15 +15,15 @@ public class OracleMultiInsertAssembler<ENTITY> implements MultiInsertAssembler
   public final EntityType<?> entityType;
   public final Naming naming;
   public final Dialect dialect;
-  public final List<EntityPropertyType<ENTITY, ?>> targetPropertyTypes;
+  public final List<EntityPropertyType<ENTITY, ?>> insertPropertyTypes;
   public final List<ENTITY> entities;
 
   public OracleMultiInsertAssembler(MultiInsertAssemblerContext<ENTITY> context) {
     this.buf = context.buf;
     this.entityType = context.entityType;
     this.naming = context.naming;
     this.dialect = context.dialect;
-    this.targetPropertyTypes = context.targetPropertyTypes;
+    this.insertPropertyTypes = context.insertPropertyTypes;
     this.entities = context.entities;
   }
 
@@ -34,19 +34,21 @@ public void assemble() {
       buf.appendSql("into ");
       buf.appendSql(entityType.getQualifiedTableName(naming::apply, dialect::applyQuote));
       buf.appendSql(" (");
-      if (!targetPropertyTypes.isEmpty()) {
-        for (EntityPropertyType<?, ?> propertyType : targetPropertyTypes) {
+      if (!insertPropertyTypes.isEmpty()) {
+        for (EntityPropertyType<?, ?> propertyType : insertPropertyTypes) {
           buf.appendSql(propertyType.getColumnName(naming::apply, dialect::applyQuote));
           buf.appendSql(", ");
         }
         buf.cutBackSql(2);
       }
       buf.appendSql(") values (");
-      for (EntityPropertyType<ENTITY, ?> propertyType : targetPropertyTypes) {
-        Property<ENTITY, ?> property = propertyType.createProperty();
-        property.load(entity);
-        buf.appendParameter(property.asInParameter());
-        buf.appendSql(", ");
+      if (!insertPropertyTypes.isEmpty()) {
+        for (EntityPropertyType<ENTITY, ?> propertyType : insertPropertyTypes) {
+          Property<ENTITY, ?> property = propertyType.createProperty();
+          property.load(entity);
+          buf.appendParameter(property.asInParameter());
+          buf.appendSql(", ");
+        }
       }
       buf.cutBackSql(2);
       buf.appendSql(") ");

doma-core/src/main/java/org/seasar/doma/jdbc/dialect/StandardMultiInsertAssembler.java

@@ -15,15 +15,15 @@ public class StandardMultiInsertAssembler<ENTITY> implements MultiInsertAssemble
   public final EntityType<?> entityType;
   public final Naming naming;
   public final Dialect dialect;
-  public final List<EntityPropertyType<ENTITY, ?>> targetPropertyTypes;
+  public final List<EntityPropertyType<ENTITY, ?>> insertPropertyTypes;
   public final List<ENTITY> entities;
 
   public StandardMultiInsertAssembler(MultiInsertAssemblerContext<ENTITY> context) {
     this.buf = context.buf;
     this.entityType = context.entityType;
     this.naming = context.naming;
     this.dialect = context.dialect;
-    this.targetPropertyTypes = context.targetPropertyTypes;
+    this.insertPropertyTypes = context.insertPropertyTypes;
     this.entities = context.entities;
   }
 
@@ -32,8 +32,8 @@ public void assemble() {
     buf.appendSql("insert into ");
     buf.appendSql(entityType.getQualifiedTableName(naming::apply, dialect::applyQuote));
     buf.appendSql(" (");
-    if (!targetPropertyTypes.isEmpty()) {
-      for (EntityPropertyType<?, ?> propertyType : targetPropertyTypes) {
+    if (!insertPropertyTypes.isEmpty()) {
+      for (EntityPropertyType<?, ?> propertyType : insertPropertyTypes) {
         buf.appendSql(propertyType.getColumnName(naming::apply, dialect::applyQuote));
         buf.appendSql(", ");
       }
@@ -43,8 +43,8 @@ public void assemble() {
     if (!entities.isEmpty()) {
       for (ENTITY entity : entities) {
         buf.appendSql("(");
-        if (!targetPropertyTypes.isEmpty()) {
-          for (EntityPropertyType<ENTITY, ?> propertyType : targetPropertyTypes) {
+        if (!insertPropertyTypes.isEmpty()) {
+          for (EntityPropertyType<ENTITY, ?> propertyType : insertPropertyTypes) {
             Property<ENTITY, ?> property = propertyType.createProperty();
             property.load(entity);
             buf.appendParameter(property.asInParameter());

doma-core/src/main/java/org/seasar/doma/jdbc/query/AutoMultiInsertQuery.java

@@ -175,9 +175,8 @@ private void assembleUpsertSql(PreparedSqlBuilder builder, Naming naming, Dialec
             idPropertyTypes,
             targetPropertyTypes,
             entities);
-    UpsertAssembler upsertAssembler = dialect.getUpsertAssembler(context);
-    upsertAssembler.assemble();
-    sql = builder.build(this::comment);
+    UpsertAssembler assembler = dialect.getUpsertAssembler(context);
+    assembler.assemble();
   }
 
   @Override

doma-core/src/main/java/org/seasar/doma/jdbc/query/MultiInsertAssemblerContext.java

@@ -19,7 +19,7 @@ public class MultiInsertAssemblerContext<ENTITY> {
   public final EntityType<ENTITY> entityType;
   public final Naming naming;
   public final Dialect dialect;
-  public final List<EntityPropertyType<ENTITY, ?>> targetPropertyTypes;
+  public final List<EntityPropertyType<ENTITY, ?>> insertPropertyTypes;
   public final List<ENTITY> entities;
 
   /**
@@ -29,21 +29,21 @@ public class MultiInsertAssemblerContext<ENTITY> {
    * @param entityType the entity type
    * @param naming the naming convention
    * @param dialect the SQL dialect
-   * @param targetPropertyTypes the property types that are targets for the insert
+   * @param insertPropertyTypes the property types that are targets for the insert
    * @param entities the entities
    */
   MultiInsertAssemblerContext(
       PreparedSqlBuilder buf,
       EntityType<ENTITY> entityType,
       Naming naming,
       Dialect dialect,
-      List<EntityPropertyType<ENTITY, ?>> targetPropertyTypes,
+      List<EntityPropertyType<ENTITY, ?>> insertPropertyTypes,
       List<ENTITY> entities) {
     Objects.requireNonNull(buf);
     Objects.requireNonNull(entityType);
     Objects.requireNonNull(naming);
     Objects.requireNonNull(dialect);
-    Objects.requireNonNull(targetPropertyTypes);
+    Objects.requireNonNull(insertPropertyTypes);
     Objects.requireNonNull(entities);
     if (entities.isEmpty()) {
       throw new DomaIllegalArgumentException(
@@ -53,7 +53,7 @@ public class MultiInsertAssemblerContext<ENTITY> {
     this.entityType = entityType;
     this.naming = naming;
     this.dialect = dialect;
-    this.targetPropertyTypes = targetPropertyTypes;
+    this.insertPropertyTypes = insertPropertyTypes;
     this.entities = entities;
   }
 }

doma-core/src/main/java/org/seasar/doma/jdbc/query/MultiInsertAssemblerContextBuilder.java

@@ -14,21 +14,10 @@ public static <ENTITY> MultiInsertAssemblerContext<ENTITY> buildFromEntityList(
       EntityType<ENTITY> entityType,
       Naming naming,
       Dialect dialect,
-      List<EntityPropertyType<ENTITY, ?>> targetPropertyTypes,
+      List<EntityPropertyType<ENTITY, ?>> insertPropertyTypes,
       List<ENTITY> entities) {
 
-    return buildInternal(buf, entityType, naming, dialect, targetPropertyTypes, entities);
-  }
-
-  private static <ENTITY> MultiInsertAssemblerContext<ENTITY> buildInternal(
-      PreparedSqlBuilder buf,
-      EntityType<ENTITY> entityType,
-      Naming naming,
-      Dialect dialect,
-      List<EntityPropertyType<ENTITY, ?>> targetPropertyTypes,
-      List<ENTITY> entities) {
-
-    return new MultiInsertAssemblerContext<ENTITY>(
-        buf, entityType, naming, dialect, targetPropertyTypes, entities);
+    return new MultiInsertAssemblerContext<>(
+        buf, entityType, naming, dialect, insertPropertyTypes, entities);
   }
 }

doma-core/src/main/java/org/seasar/doma/jdbc/query/UpsertAssemblerContext.java

@@ -72,7 +72,9 @@ public class UpsertAssemblerContext {
     Objects.requireNonNull(naming);
     Objects.requireNonNull(dialect);
     Objects.requireNonNull(keys);
+    Objects.requireNonNull(insertPropertyTypes);
     Objects.requireNonNull(insertRows);
+    Objects.requireNonNull(setValues);
     if (duplicateKeyType == DuplicateKeyType.EXCEPTION) {
       throw new DomaIllegalArgumentException(
           "duplicateKeyType",