Merge pull request #412 from domaframework/make-aggregate-queries-typesafe

Make aggregate queries more typesafe

Author: nakamura-to

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

@@ -2,7 +2,10 @@
 
 import java.util.Objects;
 import java.util.function.Consumer;
+import java.util.function.Function;
+import org.seasar.doma.internal.jdbc.command.EntityProvider;
 import org.seasar.doma.jdbc.Config;
+import org.seasar.doma.jdbc.ObjectProvider;
 import org.seasar.doma.jdbc.criteria.context.DeleteContext;
 import org.seasar.doma.jdbc.criteria.context.InsertContext;
 import org.seasar.doma.jdbc.criteria.context.Options;
@@ -17,6 +20,7 @@
 import org.seasar.doma.jdbc.criteria.statement.NativeSqlInsertStarting;
 import org.seasar.doma.jdbc.criteria.statement.NativeSqlSelectStarting;
 import org.seasar.doma.jdbc.criteria.statement.NativeSqlUpdateStarting;
+import org.seasar.doma.jdbc.query.SelectQuery;
 
 public class NativeSql {
 
@@ -26,27 +30,29 @@ public NativeSql(Config config) {
     this.config = Objects.requireNonNull(config);
   }
 
-  public <ELEMENT> NativeSqlSelectStarting<ELEMENT> from(EntityDef<ELEMENT> entityDef) {
+  public <ENTITY> NativeSqlSelectStarting<ENTITY> from(EntityDef<ENTITY> entityDef) {
     return from(entityDef, (options) -> {});
   }
 
-  public <ELEMENT> NativeSqlSelectStarting<ELEMENT> from(
-      EntityDef<ELEMENT> entityDef, Consumer<Options> optionsConsumer) {
+  public <ENTITY> NativeSqlSelectStarting<ENTITY> from(
+      EntityDef<ENTITY> entityDef, Consumer<Options> optionsConsumer) {
     Objects.requireNonNull(entityDef);
     Objects.requireNonNull(optionsConsumer);
     SelectContext context = new SelectContext(entityDef);
     optionsConsumer.accept(context.getOptions());
     SelectFromDeclaration declaration = new SelectFromDeclaration(context);
-    return new NativeSqlSelectStarting<>(config, declaration, entityDef);
+    Function<SelectQuery, ObjectProvider<ENTITY>> factory =
+        query -> new EntityProvider<>(entityDef.asType(), query, false);
+    return new NativeSqlSelectStarting<>(config, declaration, entityDef, factory);
   }
 
-  public <ELEMENT> NativeSqlUpdateStarting update(EntityDef<ELEMENT> entityDef) {
+  public <ENTITY> NativeSqlUpdateStarting update(EntityDef<ENTITY> entityDef) {
     Objects.requireNonNull(entityDef);
     return this.update(entityDef, options -> {});
   }
 
-  public <ELEMENT> NativeSqlUpdateStarting update(
-      EntityDef<ELEMENT> entityDef, Consumer<Options> optionsConsumer) {
+  public <ENTITY> NativeSqlUpdateStarting update(
+      EntityDef<ENTITY> entityDef, Consumer<Options> optionsConsumer) {
     Objects.requireNonNull(entityDef);
     Objects.requireNonNull(optionsConsumer);
     UpdateContext context = new UpdateContext(entityDef);
@@ -55,13 +61,13 @@ public <ELEMENT> NativeSqlUpdateStarting update(
     return new NativeSqlUpdateStarting(config, declaration);
   }
 
-  public <ELEMENT> NativeSqlDeleteStarting delete(EntityDef<ELEMENT> entityDef) {
+  public <ENTITY> NativeSqlDeleteStarting delete(EntityDef<ENTITY> entityDef) {
     Objects.requireNonNull(entityDef);
     return this.delete(entityDef, options -> {});
   }
 
-  public <ELEMENT> NativeSqlDeleteStarting delete(
-      EntityDef<ELEMENT> entityDef, Consumer<Options> optionsConsumer) {
+  public <ENTITY> NativeSqlDeleteStarting delete(
+      EntityDef<ENTITY> entityDef, Consumer<Options> optionsConsumer) {
     Objects.requireNonNull(entityDef);
     Objects.requireNonNull(optionsConsumer);
     DeleteContext context = new DeleteContext(entityDef);
@@ -70,13 +76,13 @@ public <ELEMENT> NativeSqlDeleteStarting delete(
     return new NativeSqlDeleteStarting(config, declaration);
   }
 
-  public <ELEMENT> NativeSqlInsertStarting insert(EntityDef<ELEMENT> entityDef) {
+  public <ENTITY> NativeSqlInsertStarting insert(EntityDef<ENTITY> entityDef) {
     Objects.requireNonNull(entityDef);
     return this.insert(entityDef, options -> {});
   }
 
-  public <ELEMENT> NativeSqlInsertStarting insert(
-      EntityDef<ELEMENT> entityDef, Consumer<Options> optionsConsumer) {
+  public <ENTITY> NativeSqlInsertStarting insert(
+      EntityDef<ENTITY> entityDef, Consumer<Options> optionsConsumer) {
     Objects.requireNonNull(entityDef);
     Objects.requireNonNull(optionsConsumer);
     InsertContext context = new InsertContext(entityDef);

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

@@ -11,11 +11,11 @@
 import org.seasar.doma.jdbc.entity.Property;
 import org.seasar.doma.jdbc.query.Query;
 
-public class SetOperationResultProvider<RESULT> extends AbstractObjectProvider<RESULT> {
+public class MappedResultProvider<RESULT> extends AbstractObjectProvider<RESULT> {
   private final Function<Row, RESULT> mapper;
   private final JdbcMappingVisitor jdbcMappingVisitor;
 
-  public SetOperationResultProvider(Query query, Function<Row, RESULT> mapper) {
+  public MappedResultProvider(Query query, Function<Row, RESULT> mapper) {
     Objects.requireNonNull(query);
     Objects.requireNonNull(mapper);
     this.mapper = mapper;

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

@@ -0,0 +1,25 @@
+package org.seasar.doma.jdbc.criteria.command;
+
+import java.util.Objects;
+import java.util.function.Function;
+import java.util.stream.Stream;
+import org.seasar.doma.internal.jdbc.command.AbstractStreamHandler;
+import org.seasar.doma.jdbc.ObjectProvider;
+import org.seasar.doma.jdbc.query.SelectQuery;
+
+public class MappedResultStreamHandler<ELEMENT, RESULT>
+    extends AbstractStreamHandler<ELEMENT, RESULT> {
+  private final Function<SelectQuery, ObjectProvider<ELEMENT>> objectProviderFactory;
+
+  public MappedResultStreamHandler(
+      Function<Stream<ELEMENT>, RESULT> streamMapper,
+      Function<SelectQuery, ObjectProvider<ELEMENT>> objectProviderFactory) {
+    super(Objects.requireNonNull(streamMapper));
+    this.objectProviderFactory = Objects.requireNonNull(objectProviderFactory);
+  }
+
+  @Override
+  protected ObjectProvider<ELEMENT> createObjectProvider(SelectQuery query) {
+    return objectProviderFactory.apply(query);
+  }
+}

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

@@ -3,7 +3,7 @@
 import java.util.Collections;
 import java.util.List;
 import org.seasar.doma.jdbc.criteria.LikeOption;
-import org.seasar.doma.jdbc.criteria.Tuple2;
+import org.seasar.doma.jdbc.criteria.tuple.Tuple2;
 
 public interface Criterion {
   void accept(Visitor visitor);

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

@@ -2,12 +2,12 @@
 
 import java.util.Objects;
 import java.util.function.Consumer;
-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;
+import org.seasar.doma.jdbc.criteria.tuple.Tuple2;
 
 public class SubSelectFromDeclaration {