Move the def package

nakamura-to · nakamura-to · commit a335135623b3 · 2020-05-04T09:59:27.000+09:00
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/AggregateFunctions.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/AggregateFunctions.java
@@ -1,7 +1,7 @@
 package org.seasar.doma.jdbc.criteria;
 
-import org.seasar.doma.def.PropertyDef;
 import org.seasar.doma.jdbc.criteria.declaration.AggregateFunction;
+import org.seasar.doma.jdbc.criteria.def.PropertyDef;
 
 public final class AggregateFunctions {
 
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/Entityql.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/Entityql.java
@@ -1,9 +1,9 @@
 package org.seasar.doma.jdbc.criteria;
 
 import java.util.Objects;
-import org.seasar.doma.def.EntityDef;
 import org.seasar.doma.jdbc.criteria.context.SelectContext;
 import org.seasar.doma.jdbc.criteria.declaration.SelectFromDeclaration;
+import org.seasar.doma.jdbc.criteria.def.EntityDef;
 import org.seasar.doma.jdbc.criteria.statement.EntityqlSelectStatement;
 
 public final class Entityql {
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/NativeSql.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/NativeSql.java
@@ -1,7 +1,6 @@
 package org.seasar.doma.jdbc.criteria;
 
 import java.util.Objects;
-import org.seasar.doma.def.EntityDef;
 import org.seasar.doma.jdbc.criteria.context.DeleteContext;
 import org.seasar.doma.jdbc.criteria.context.InsertContext;
 import org.seasar.doma.jdbc.criteria.context.SelectContext;
@@ -10,6 +9,7 @@
 import org.seasar.doma.jdbc.criteria.declaration.InsertIntoDeclaration;
 import org.seasar.doma.jdbc.criteria.declaration.SelectFromDeclaration;
 import org.seasar.doma.jdbc.criteria.declaration.UpdateDeclaration;
+import org.seasar.doma.jdbc.criteria.def.EntityDef;
 import org.seasar.doma.jdbc.criteria.statement.NativeSqlDeleteStarting;
 import org.seasar.doma.jdbc.criteria.statement.NativeSqlInsertStarting;
 import org.seasar.doma.jdbc.criteria.statement.NativeSqlSelectStarting;
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/command/AssociateCommand.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/command/AssociateCommand.java
@@ -7,11 +7,11 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.function.BiConsumer;
-import org.seasar.doma.def.EntityDef;
 import org.seasar.doma.internal.util.Pair;
 import org.seasar.doma.jdbc.command.Command;
 import org.seasar.doma.jdbc.command.SelectCommand;
 import org.seasar.doma.jdbc.criteria.context.SelectContext;
+import org.seasar.doma.jdbc.criteria.def.EntityDef;
 import org.seasar.doma.jdbc.entity.EntityType;
 import org.seasar.doma.jdbc.query.Query;
 import org.seasar.doma.jdbc.query.SelectQuery;
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/command/EntityKey.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/command/EntityKey.java
@@ -3,7 +3,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
-import org.seasar.doma.def.EntityDef;
+import org.seasar.doma.jdbc.criteria.def.EntityDef;
 
 public final class EntityKey {
   private final EntityDef<?> entityDef;
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/command/EntityPoolIterationHandler.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/command/EntityPoolIterationHandler.java
@@ -2,10 +2,10 @@
 
 import java.util.List;
 import java.util.Objects;
-import org.seasar.doma.def.EntityDef;
 import org.seasar.doma.internal.jdbc.command.AbstractIterationHandler;
 import org.seasar.doma.internal.jdbc.command.ResultListCallback;
 import org.seasar.doma.jdbc.ObjectProvider;
+import org.seasar.doma.jdbc.criteria.def.EntityDef;
 import org.seasar.doma.jdbc.query.SelectQuery;
 
 public class EntityPoolIterationHandler
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/command/EntityPoolProvider.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/command/EntityPoolProvider.java
@@ -13,12 +13,12 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 import org.seasar.doma.DomaNullPointerException;
-import org.seasar.doma.def.EntityDef;
 import org.seasar.doma.internal.jdbc.command.JdbcValueGetter;
 import org.seasar.doma.jdbc.JdbcMappable;
 import org.seasar.doma.jdbc.JdbcMappingFunction;
 import org.seasar.doma.jdbc.JdbcMappingVisitor;
 import org.seasar.doma.jdbc.ObjectProvider;
+import org.seasar.doma.jdbc.criteria.def.EntityDef;
 import org.seasar.doma.jdbc.entity.EntityPropertyType;
 import org.seasar.doma.jdbc.entity.EntityType;
 import org.seasar.doma.jdbc.entity.Property;
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/command/MappedObjectIterationHandler.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/command/MappedObjectIterationHandler.java
@@ -3,10 +3,10 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Function;
-import org.seasar.doma.def.PropertyDef;
 import org.seasar.doma.internal.jdbc.command.AbstractIterationHandler;
 import org.seasar.doma.internal.jdbc.command.ResultListCallback;
 import org.seasar.doma.jdbc.ObjectProvider;
+import org.seasar.doma.jdbc.criteria.def.PropertyDef;
 import org.seasar.doma.jdbc.criteria.statement.Row;
 import org.seasar.doma.jdbc.query.SelectQuery;
 
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/command/MappedObjectProvider.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/command/MappedObjectProvider.java
@@ -7,9 +7,9 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.function.Function;
-import org.seasar.doma.def.PropertyDef;
 import org.seasar.doma.internal.jdbc.command.AbstractObjectProvider;
 import org.seasar.doma.jdbc.JdbcMappingVisitor;
+import org.seasar.doma.jdbc.criteria.def.PropertyDef;
 import org.seasar.doma.jdbc.criteria.statement.Row;
 import org.seasar.doma.jdbc.entity.Property;
 import org.seasar.doma.jdbc.query.Query;
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/command/SetOperationResultProvider.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/command/SetOperationResultProvider.java
@@ -4,9 +4,9 @@
 import java.sql.SQLException;
 import java.util.Objects;
 import java.util.function.Function;
-import org.seasar.doma.def.PropertyDef;
 import org.seasar.doma.internal.jdbc.command.AbstractObjectProvider;
 import org.seasar.doma.jdbc.JdbcMappingVisitor;
+import org.seasar.doma.jdbc.criteria.def.PropertyDef;
 import org.seasar.doma.jdbc.criteria.statement.Row;
 import org.seasar.doma.jdbc.entity.Property;
 import org.seasar.doma.jdbc.query.Query;
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/Context.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/Context.java
@@ -1,7 +1,7 @@
 package org.seasar.doma.jdbc.criteria.context;
 
 import java.util.List;
-import org.seasar.doma.def.EntityDef;
+import org.seasar.doma.jdbc.criteria.def.EntityDef;
 
 public interface Context {
 
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/DeleteContext.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/DeleteContext.java
@@ -4,7 +4,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
-import org.seasar.doma.def.EntityDef;
+import org.seasar.doma.jdbc.criteria.def.EntityDef;
 
 public class DeleteContext implements Context {
   public final EntityDef<?> entityDef;
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/InsertContext.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/InsertContext.java
@@ -5,7 +5,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import org.seasar.doma.def.EntityDef;
+import org.seasar.doma.jdbc.criteria.def.EntityDef;
 
 public class InsertContext implements Context {
   public final EntityDef<?> entityDef;
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/Join.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/Join.java
@@ -3,7 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import org.seasar.doma.def.EntityDef;
+import org.seasar.doma.jdbc.criteria.def.EntityDef;
 
 public class Join {
   public final EntityDef<?> entityDef;
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/Operand.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/Operand.java
@@ -1,9 +1,9 @@
 package org.seasar.doma.jdbc.criteria.context;
 
 import java.util.function.Function;
-import org.seasar.doma.def.PropertyDef;
 import org.seasar.doma.jdbc.ClassHelper;
 import org.seasar.doma.jdbc.InParameter;
+import org.seasar.doma.jdbc.criteria.def.PropertyDef;
 
 public interface Operand {
 
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/Projection.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/Projection.java
@@ -3,7 +3,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Objects;
-import org.seasar.doma.def.PropertyDef;
+import org.seasar.doma.jdbc.criteria.def.PropertyDef;
 
 public interface Projection {
   All All = new All() {};
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/SelectContext.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/SelectContext.java
@@ -10,9 +10,9 @@
 import java.util.function.BiConsumer;
 import java.util.function.Function;
 import java.util.stream.Stream;
-import org.seasar.doma.def.EntityDef;
-import org.seasar.doma.def.PropertyDef;
 import org.seasar.doma.internal.util.Pair;
+import org.seasar.doma.jdbc.criteria.def.EntityDef;
+import org.seasar.doma.jdbc.criteria.def.PropertyDef;
 import org.seasar.doma.jdbc.criteria.statement.Row;
 
 public class SelectContext implements Context {
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/UpdateContext.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/UpdateContext.java
@@ -6,7 +6,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import org.seasar.doma.def.EntityDef;
+import org.seasar.doma.jdbc.criteria.def.EntityDef;
 
 public class UpdateContext implements Context {
   public final EntityDef<?> entityDef;
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/AggregateFunction.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/AggregateFunction.java
@@ -4,11 +4,11 @@
 import java.util.Optional;
 import java.util.function.BiFunction;
 import java.util.function.Function;
-import org.seasar.doma.def.PropertyDef;
 import org.seasar.doma.internal.jdbc.scalar.BasicScalar;
 import org.seasar.doma.internal.jdbc.scalar.Scalar;
 import org.seasar.doma.internal.jdbc.sql.ScalarInParameter;
 import org.seasar.doma.jdbc.InParameter;
+import org.seasar.doma.jdbc.criteria.def.PropertyDef;
 import org.seasar.doma.jdbc.entity.EntityPropertyType;
 import org.seasar.doma.jdbc.entity.NamingType;
 import org.seasar.doma.jdbc.entity.Property;
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/ComparisonDeclaration.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/ComparisonDeclaration.java
@@ -3,9 +3,9 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Function;
-import org.seasar.doma.def.PropertyDef;
 import org.seasar.doma.jdbc.criteria.context.Context;
 import org.seasar.doma.jdbc.criteria.context.Criterion;
+import org.seasar.doma.jdbc.criteria.def.PropertyDef;
 
 public abstract class ComparisonDeclaration<CONTEXT extends Context> {
 
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/DeclarationSupport.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/DeclarationSupport.java
@@ -2,13 +2,13 @@
 
 import java.util.function.Function;
 import java.util.function.Supplier;
-import org.seasar.doma.def.PropertyDef;
 import org.seasar.doma.internal.jdbc.scalar.Scalar;
 import org.seasar.doma.internal.jdbc.scalar.Scalars;
 import org.seasar.doma.internal.jdbc.sql.ScalarInParameter;
 import org.seasar.doma.jdbc.ClassHelper;
 import org.seasar.doma.jdbc.InParameter;
 import org.seasar.doma.jdbc.criteria.context.Operand;
+import org.seasar.doma.jdbc.criteria.def.PropertyDef;
 
 public class DeclarationSupport {
 
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/JoinDeclaration.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/JoinDeclaration.java
@@ -1,9 +1,9 @@
 package org.seasar.doma.jdbc.criteria.declaration;
 
 import java.util.Objects;
-import org.seasar.doma.def.PropertyDef;
 import org.seasar.doma.jdbc.criteria.context.Criterion;
 import org.seasar.doma.jdbc.criteria.context.Join;
+import org.seasar.doma.jdbc.criteria.def.PropertyDef;
 
 public class JoinDeclaration {
 
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/OrderByDeclaration.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/OrderByDeclaration.java
@@ -1,9 +1,9 @@
 package org.seasar.doma.jdbc.criteria.declaration;
 
 import java.util.Objects;
-import org.seasar.doma.def.PropertyDef;
 import org.seasar.doma.internal.util.Pair;
 import org.seasar.doma.jdbc.criteria.context.SelectContext;
+import org.seasar.doma.jdbc.criteria.def.PropertyDef;
 
 public class OrderByDeclaration {
 
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/SelectFromDeclaration.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/SelectFromDeclaration.java
@@ -5,14 +5,14 @@
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import org.seasar.doma.def.EntityDef;
-import org.seasar.doma.def.PropertyDef;
 import org.seasar.doma.internal.util.Pair;
 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.statement.Row;
 
 public class SelectFromDeclaration {
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/SetDeclaration.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/SetDeclaration.java
@@ -1,8 +1,8 @@
 package org.seasar.doma.jdbc.criteria.declaration;
 
 import java.util.Objects;
-import org.seasar.doma.def.PropertyDef;
 import org.seasar.doma.jdbc.criteria.context.UpdateContext;
+import org.seasar.doma.jdbc.criteria.def.PropertyDef;
 
 public class SetDeclaration {
 
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/SubSelectFromDeclaration.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/SubSelectFromDeclaration.java
@@ -2,12 +2,12 @@
 
 import java.util.Objects;
 import java.util.function.Consumer;
-import org.seasar.doma.def.EntityDef;
-import org.seasar.doma.def.PropertyDef;
 import org.seasar.doma.jdbc.criteria.Tuple2;
 import org.seasar.doma.jdbc.criteria.context.Projection;
 import org.seasar.doma.jdbc.criteria.context.SelectContext;
 import org.seasar.doma.jdbc.criteria.context.SubSelectContext;
+import org.seasar.doma.jdbc.criteria.def.EntityDef;
+import org.seasar.doma.jdbc.criteria.def.PropertyDef;
 
 public class SubSelectFromDeclaration {
 
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/ValuesDeclaration.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/ValuesDeclaration.java
@@ -1,8 +1,8 @@
 package org.seasar.doma.jdbc.criteria.declaration;
 
 import java.util.Objects;
-import org.seasar.doma.def.PropertyDef;
 import org.seasar.doma.jdbc.criteria.context.InsertContext;
+import org.seasar.doma.jdbc.criteria.def.PropertyDef;
 
 public class ValuesDeclaration {
 
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/WhereDeclaration.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/WhereDeclaration.java
@@ -6,13 +6,13 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Function;
-import org.seasar.doma.def.EntityDef;
-import org.seasar.doma.def.PropertyDef;
 import org.seasar.doma.jdbc.criteria.Tuple2;
 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;
 
 public class WhereDeclaration extends ComparisonDeclaration<Context> {
 
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/def/DefaultPropertyDef.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/def/DefaultPropertyDef.java
@@ -1,4 +1,4 @@
-package org.seasar.doma.def;
+package org.seasar.doma.jdbc.criteria.def;
 
 import org.seasar.doma.jdbc.entity.EntityPropertyType;
 import org.seasar.doma.jdbc.entity.EntityType;
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/def/EmbeddableDef.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/def/EmbeddableDef.java
@@ -1,4 +1,4 @@
-package org.seasar.doma.def;
+package org.seasar.doma.jdbc.criteria.def;
 
 import java.util.List;
 
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/def/EntityDef.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/def/EntityDef.java
@@ -1,4 +1,4 @@
-package org.seasar.doma.def;
+package org.seasar.doma.jdbc.criteria.def;
 
 import java.util.List;
 import org.seasar.doma.jdbc.entity.EntityType;
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/def/PropertyDef.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/def/PropertyDef.java
@@ -1,4 +1,4 @@
-package org.seasar.doma.def;
+package org.seasar.doma.jdbc.criteria.def;
 
 import org.seasar.doma.jdbc.entity.EntityPropertyType;
 
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/query/AliasManager.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/query/AliasManager.java
@@ -3,9 +3,9 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
-import org.seasar.doma.def.EntityDef;
-import org.seasar.doma.def.PropertyDef;
 import org.seasar.doma.jdbc.criteria.context.Context;
+import org.seasar.doma.jdbc.criteria.def.EntityDef;
+import org.seasar.doma.jdbc.criteria.def.PropertyDef;
 
 public class AliasManager {
   private final AliasManager parent;
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/query/BuilderSupport.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/query/BuilderSupport.java
@@ -4,8 +4,6 @@
 import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import org.seasar.doma.def.EntityDef;
-import org.seasar.doma.def.PropertyDef;
 import org.seasar.doma.internal.jdbc.sql.PreparedSqlBuilder;
 import org.seasar.doma.jdbc.Config;
 import org.seasar.doma.jdbc.InParameter;
@@ -14,6 +12,8 @@
 import org.seasar.doma.jdbc.criteria.context.Operand;
 import org.seasar.doma.jdbc.criteria.context.SelectContext;
 import org.seasar.doma.jdbc.criteria.declaration.AggregateFunction;
+import org.seasar.doma.jdbc.criteria.def.EntityDef;
+import org.seasar.doma.jdbc.criteria.def.PropertyDef;
 import org.seasar.doma.jdbc.entity.EntityPropertyType;
 import org.seasar.doma.jdbc.entity.EntityType;
 
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/query/DeleteBuilder.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/query/DeleteBuilder.java
@@ -2,14 +2,14 @@
 
 import java.util.Objects;
 import java.util.function.Function;
-import org.seasar.doma.def.EntityDef;
 import org.seasar.doma.internal.jdbc.sql.PreparedSqlBuilder;
 import org.seasar.doma.jdbc.Config;
 import org.seasar.doma.jdbc.PreparedSql;
 import org.seasar.doma.jdbc.SqlKind;
 import org.seasar.doma.jdbc.SqlLogType;
 import org.seasar.doma.jdbc.criteria.context.Criterion;
 import org.seasar.doma.jdbc.criteria.context.DeleteContext;
+import org.seasar.doma.jdbc.criteria.def.EntityDef;
 
 public class DeleteBuilder {
   private final DeleteContext context;
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/query/InsertBuilder.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/query/InsertBuilder.java
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/query/SelectBuilder.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/query/SelectBuilder.java
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/query/UpdateBuilder.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/query/UpdateBuilder.java
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlSelectStatement.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlSelectStatement.java
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/NativeSqlSelectStarting.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/NativeSqlSelectStarting.java
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/NativeSqlSelectTerminate.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/NativeSqlSelectTerminate.java
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/Row.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/Row.java
diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/command/EntityKeyTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/command/EntityKeyTest.java
diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/entity/Dept_.java b/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/entity/Dept_.java
diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/entity/Emp_.java b/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/entity/Emp_.java
diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/entity/NoIdEmp_.java b/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/entity/NoIdEmp_.java
diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/query/AliasManagerTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/query/AliasManagerTest.java
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/generator/EmbeddableDefGenerator.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/generator/EmbeddableDefGenerator.java
diff --git a/doma-processor/src/main/java/org/seasar/doma/internal/apt/generator/EntityDefGenerator.java b/doma-processor/src/main/java/org/seasar/doma/internal/apt/generator/EntityDefGenerator.java
diff --git a/doma-processor/src/test/java/org/seasar/doma/internal/apt/processor/entitydesc/EmpInfo_.java b/doma-processor/src/test/java/org/seasar/doma/internal/apt/processor/entitydesc/EmpInfo_.java
diff --git a/doma-processor/src/test/resources/org/seasar/doma/internal/apt/processor/embeddabledesc/EmbeddableDescProcessorTest__Address.txt b/doma-processor/src/test/resources/org/seasar/doma/internal/apt/processor/embeddabledesc/EmbeddableDescProcessorTest__Address.txt
diff --git a/doma-processor/src/test/resources/org/seasar/doma/internal/apt/processor/entitydesc/EntityDescProcessorTest__Emp.txt b/doma-processor/src/test/resources/org/seasar/doma/internal/apt/processor/entitydesc/EntityDescProcessorTest__Emp.txt
