Move and Rename the Option enmu classes

Author: nakamura-to

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

@@ -2,7 +2,7 @@
 
 import java.util.Collections;
 import java.util.List;
-import org.seasar.doma.jdbc.criteria.LikeOption;
+import org.seasar.doma.jdbc.criteria.option.LikeOption;
 import org.seasar.doma.jdbc.criteria.tuple.Tuple2;
 
 public interface Criterion {

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

@@ -1,10 +1,10 @@
 package org.seasar.doma.jdbc.criteria.context;
 
 import java.util.Objects;
-import org.seasar.doma.jdbc.criteria.ForUpdateOption;
+import org.seasar.doma.jdbc.criteria.option.ForUpdateOption;
 
 public class ForUpdate {
-  public ForUpdateOption option;
+  public final ForUpdateOption option;
 
   public ForUpdate(ForUpdateOption option) {
     Objects.requireNonNull(option);

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

@@ -10,9 +10,10 @@
 import java.util.function.BiConsumer;
 import java.util.stream.Stream;
 import org.seasar.doma.internal.util.Pair;
-import org.seasar.doma.jdbc.criteria.DistinctOption;
 import org.seasar.doma.jdbc.criteria.def.EntityDef;
 import org.seasar.doma.jdbc.criteria.def.PropertyDef;
+import org.seasar.doma.jdbc.criteria.option.DistinctOption;
+import org.seasar.doma.jdbc.criteria.option.ForUpdateOption;
 
 public class SelectContext implements Context {
   public final EntityDef<?> entityDef;
@@ -25,7 +26,7 @@ public class SelectContext implements Context {
   public final List<Pair<OrderByItem, String>> orderBy = new ArrayList<>();
   public Integer limit;
   public Integer offset;
-  public ForUpdate forUpdate;
+  public ForUpdate forUpdate = new ForUpdate(ForUpdateOption.DISABLED);
   public final Map<Pair<EntityDef<?>, EntityDef<?>>, BiConsumer<Object, Object>> associations =
       new LinkedHashMap<>();
   public final SelectSettings options = new SelectSettings();

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

@@ -6,16 +6,16 @@
 import java.util.function.Consumer;
 import org.seasar.doma.DomaException;
 import org.seasar.doma.internal.util.Pair;
-import org.seasar.doma.jdbc.criteria.AssociationKind;
-import org.seasar.doma.jdbc.criteria.DistinctOption;
-import org.seasar.doma.jdbc.criteria.ForUpdateOption;
 import org.seasar.doma.jdbc.criteria.context.ForUpdate;
 import org.seasar.doma.jdbc.criteria.context.Join;
 import org.seasar.doma.jdbc.criteria.context.JoinKind;
 import org.seasar.doma.jdbc.criteria.context.Projection;
 import org.seasar.doma.jdbc.criteria.context.SelectContext;
 import org.seasar.doma.jdbc.criteria.def.EntityDef;
 import org.seasar.doma.jdbc.criteria.def.PropertyDef;
+import org.seasar.doma.jdbc.criteria.option.AssociationOption;
+import org.seasar.doma.jdbc.criteria.option.DistinctOption;
+import org.seasar.doma.jdbc.criteria.option.ForUpdateOption;
 import org.seasar.doma.message.Message;
 
 public class SelectFromDeclaration {
@@ -102,19 +102,19 @@ public <ENTITY1, ENTITY2> void associate(
       EntityDef<ENTITY1> first,
       EntityDef<ENTITY2> second,
       BiConsumer<ENTITY1, ENTITY2> associator,
-      AssociationKind kind) {
+      AssociationOption kind) {
     Objects.requireNonNull(first);
     Objects.requireNonNull(second);
     Objects.requireNonNull(associator);
     Objects.requireNonNull(kind);
     if (!context.getEntityDefs().contains(first)) {
-      if (kind == AssociationKind.MANDATORY) {
+      if (kind == AssociationOption.MANDATORY) {
         throw new DomaException(Message.DOMA6001, "first");
       }
       return;
     }
     if (!context.getEntityDefs().contains(second)) {
-      if (kind == AssociationKind.MANDATORY) {
+      if (kind == AssociationOption.MANDATORY) {
         throw new DomaException(Message.DOMA6001, "second");
       }
       return;

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

@@ -6,13 +6,13 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Function;
-import org.seasar.doma.jdbc.criteria.LikeOption;
 import org.seasar.doma.jdbc.criteria.context.Context;
 import org.seasar.doma.jdbc.criteria.context.Criterion;
 import org.seasar.doma.jdbc.criteria.context.Operand;
 import org.seasar.doma.jdbc.criteria.context.SubSelectContext;
 import org.seasar.doma.jdbc.criteria.def.EntityDef;
 import org.seasar.doma.jdbc.criteria.def.PropertyDef;
+import org.seasar.doma.jdbc.criteria.option.LikeOption;
 import org.seasar.doma.jdbc.criteria.tuple.Tuple2;
 
 public class WhereDeclaration extends ComparisonDeclaration<Context> {

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

@@ -0,0 +1,6 @@
+package org.seasar.doma.jdbc.criteria.option;
+
+public enum AssociationOption {
+  MANDATORY,
+  OPTIONAL
+}

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

@@ -1,4 +1,4 @@
-package org.seasar.doma.jdbc.criteria;
+package org.seasar.doma.jdbc.criteria.option;
 
 public enum DistinctOption {
   ENABLED,

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/DistinctOption.java renamed to doma-core/src/main/java/org/seasar/doma/jdbc/criteria/option/DistinctOption.java

@@ -1,4 +1,4 @@
-package org.seasar.doma.jdbc.criteria;
+package org.seasar.doma.jdbc.criteria.option;
 
 public enum ForUpdateOption {
   WAIT,

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/ForUpdateOption.java renamed to doma-core/src/main/java/org/seasar/doma/jdbc/criteria/option/ForUpdateOption.java

@@ -1,4 +1,4 @@
-package org.seasar.doma.jdbc.criteria;
+package org.seasar.doma.jdbc.criteria.option;
 
 public enum LikeOption {
   NONE,