Add and polish the Options classes

Author: nakamura-to

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/Entityql.java

@@ -6,6 +6,7 @@
 import org.seasar.doma.jdbc.Config;
 import org.seasar.doma.jdbc.criteria.context.Options;
 import org.seasar.doma.jdbc.criteria.context.SelectContext;
+import org.seasar.doma.jdbc.criteria.context.SelectOptions;
 import org.seasar.doma.jdbc.criteria.declaration.SelectFromDeclaration;
 import org.seasar.doma.jdbc.criteria.def.EntityDef;
 import org.seasar.doma.jdbc.criteria.statement.EntityqlBatchDeleteStatement;
@@ -31,7 +32,7 @@ public <ENTITY> EntityqlSelectStatement<ENTITY> from(EntityDef<ENTITY> entityDef
   }
 
   public <ENTITY> EntityqlSelectStatement<ENTITY> from(
-      EntityDef<ENTITY> entityDef, Consumer<Options> optionsConsumer) {
+      EntityDef<ENTITY> entityDef, Consumer<SelectOptions> optionsConsumer) {
     Objects.requireNonNull(entityDef);
     Objects.requireNonNull(optionsConsumer);
     SelectContext context = new SelectContext(entityDef);

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/DeleteOptions.java

@@ -0,0 +1,6 @@
+package org.seasar.doma.jdbc.criteria.context;
+
+public class DeleteOptions {
+  int batchSize = 0;
+  boolean emptyWhereAllowable;
+}

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/InsertOptions.java

@@ -0,0 +1,13 @@
+package org.seasar.doma.jdbc.criteria.context;
+
+public class InsertOptions {
+  int batchSize = 0;
+
+  public int getBatchSize() {
+    return batchSize;
+  }
+
+  public void setBatchSize(int batchSize) {
+    this.batchSize = batchSize;
+  }
+}

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/Options.java

@@ -1,26 +1,33 @@
 package org.seasar.doma.jdbc.criteria.context;
 
-import java.util.Objects;
 import org.seasar.doma.jdbc.SqlLogType;
 
 public class Options {
-
   private String comment;
   private SqlLogType sqlLogType = SqlLogType.FORMATTED;
+  private int queryTimeout = 0;
 
-  public String comment() {
+  public String getComment() {
     return comment;
   }
 
-  public void comment(String comment) {
+  public void setComment(String comment) {
     this.comment = comment;
   }
 
-  public SqlLogType sqlLogType() {
+  public SqlLogType getSqlLogType() {
     return sqlLogType;
   }
 
-  public void sqlLogType(SqlLogType sqlLogType) {
-    this.sqlLogType = Objects.requireNonNull(sqlLogType);
+  public void setSqlLogType(SqlLogType sqlLogType) {
+    this.sqlLogType = sqlLogType;
+  }
+
+  public int getQueryTimeout() {
+    return queryTimeout;
+  }
+
+  public void setQueryTimeout(int queryTimeout) {
+    this.queryTimeout = queryTimeout;
   }
 }

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/SelectContext.java

@@ -27,7 +27,7 @@ public class SelectContext implements Context {
   public ForUpdate forUpdate;
   public final Map<Pair<EntityDef<?>, EntityDef<?>>, BiConsumer<Object, Object>> associations =
       new LinkedHashMap<>();
-  public final Options options = new Options();
+  public final SelectOptions options = new SelectOptions();
 
   public SelectContext(EntityDef<?> entityDef) {
     this(entityDef, Projection.All);
@@ -60,7 +60,7 @@ public void setWhere(List<Criterion> where) {
   }
 
   @Override
-  public Options getOptions() {
+  public SelectOptions getOptions() {
     return options;
   }
 

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/SelectOptions.java

@@ -0,0 +1,14 @@
+package org.seasar.doma.jdbc.criteria.context;
+
+public class SelectOptions extends Options {
+  private int fetchSize = 0;
+  private int maxRows = 0;
+
+  public int getFetchSize() {
+    return fetchSize;
+  }
+
+  public void setFetchSize(int fetchSize) {
+    this.fetchSize = fetchSize;
+  }
+}

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/UpdateOptions.java

@@ -0,0 +1,6 @@
+package org.seasar.doma.jdbc.criteria.context;
+
+public class UpdateOptions extends Options {
+  int batchSize = 0;
+  boolean emptyWhereAllowable;
+}

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlBatchDeleteStatement.java

@@ -41,10 +41,10 @@ protected Command<List<ENTITY>> createCommand() {
     query.setCallerMethodName(EXECUTE_METHOD_NAME);
     query.setQueryTimeout(config.getQueryTimeout());
     query.setBatchSize(config.getBatchSize());
-    query.setSqlLogType(options.sqlLogType());
+    query.setSqlLogType(options.getSqlLogType());
     query.setVersionIgnored(false);
     query.setOptimisticLockExceptionSuppressed(false);
-    query.setMessage(options.comment());
+    query.setMessage(options.getComment());
     query.prepare();
     BatchDeleteCommand command =
         config.getCommandImplementors().createBatchDeleteCommand(EXECUTE_METHOD, query);

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlBatchInsertStatement.java

@@ -41,10 +41,10 @@ protected Command<List<ENTITY>> createCommand() {
     query.setCallerMethodName(EXECUTE_METHOD_NAME);
     query.setQueryTimeout(config.getQueryTimeout());
     query.setBatchSize(config.getBatchSize());
-    query.setSqlLogType(options.sqlLogType());
+    query.setSqlLogType(options.getSqlLogType());
     query.setIncludedPropertyNames();
     query.setExcludedPropertyNames();
-    query.setMessage(options.comment());
+    query.setMessage(options.getComment());
     query.prepare();
     BatchInsertCommand command =
         config.getCommandImplementors().createBatchInsertCommand(EXECUTE_METHOD, query);

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlBatchUpdateStatement.java

@@ -41,12 +41,12 @@ protected Command<List<ENTITY>> createCommand() {
     query.setCallerMethodName(EXECUTE_METHOD_NAME);
     query.setQueryTimeout(config.getQueryTimeout());
     query.setBatchSize(config.getBatchSize());
-    query.setSqlLogType(options.sqlLogType());
+    query.setSqlLogType(options.getSqlLogType());
     query.setVersionIgnored(false);
     query.setIncludedPropertyNames();
     query.setExcludedPropertyNames();
     query.setOptimisticLockExceptionSuppressed(false);
-    query.setMessage(options.comment());
+    query.setMessage(options.getComment());
     query.prepare();
     BatchUpdateCommand command =
         config.getCommandImplementors().createBatchUpdateCommand(EXECUTE_METHOD, query);