検索用メソッドの戻り値の型を Stream とすることを認めた

Author: nakamura-to

src/main/java/org/seasar/doma/internal/apt/DaoGenerator.java

@@ -40,6 +40,7 @@
 import org.seasar.doma.internal.apt.cttype.OptionalIntCtType;
 import org.seasar.doma.internal.apt.cttype.OptionalLongCtType;
 import org.seasar.doma.internal.apt.cttype.SimpleCtTypeVisitor;
+import org.seasar.doma.internal.apt.cttype.StreamCtType;
 import org.seasar.doma.internal.apt.util.TypeMirrorUtil;
 import org.seasar.doma.jdbc.BatchResult;
 import org.seasar.doma.jdbc.Result;
@@ -84,6 +85,11 @@ protected CtType createCtType(final ExecutableElement methodElement,
             return iterableCtType;
         }
 
+        StreamCtType streamCtType = StreamCtType.newInstance(type, env);
+        if (streamCtType != null) {
+            return streamCtType;
+        }
+
         EntityCtType entityCtType = EntityCtType.newInstance(type, env);
         if (entityCtType != null) {
             return entityCtType;

src/main/java/org/seasar/doma/internal/apt/meta/QueryReturnMeta.java

@@ -49,6 +49,8 @@ public class SqlFileSelectQueryMeta extends AbstractSqlFileQueryMeta {
 
     protected EntityCtType entityCtType;
 
+    protected boolean resultStream;
+
     public SqlFileSelectQueryMeta(ExecutableElement method) {
         super(method);
     }
@@ -157,6 +159,14 @@ public boolean isExpandable() {
         return entityCtType != null;
     }
 
+    public boolean isResultStream() {
+        return resultStream;
+    }
+
+    public void setResultStream(boolean resultStream) {
+        this.resultStream = resultStream;
+    }
+
     @Override
     public <R, P> R accept(QueryMetaVisitor<R, P> visitor, P p) {
         return visitor.visitSqlFileSelectQueryMeta(this, p);

src/main/java/org/seasar/doma/internal/apt/meta/SqlFileSelectQueryMeta.java

@@ -20,9 +20,12 @@
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.VariableElement;
+import javax.tools.Diagnostic.Kind;
 
 import org.seasar.doma.SelectType;
+import org.seasar.doma.Suppress;
 import org.seasar.doma.internal.apt.AptException;
+import org.seasar.doma.internal.apt.Notifier;
 import org.seasar.doma.internal.apt.cttype.AnyCtType;
 import org.seasar.doma.internal.apt.cttype.BasicCtType;
 import org.seasar.doma.internal.apt.cttype.CollectorCtType;
@@ -442,10 +445,14 @@ protected class ReturnCtTypeVisitor extends
 
         protected QueryReturnMeta returnMeta;
 
+        protected Suppress suppress;
+
         protected ReturnCtTypeVisitor(SqlFileSelectQueryMeta queryMeta,
                 QueryReturnMeta returnMeta) {
             this.queryMeta = queryMeta;
             this.returnMeta = returnMeta;
+            this.suppress = queryMeta.getExecutableElement().getAnnotation(
+                    Suppress.class);
         }
 
         @Override
@@ -496,6 +503,20 @@ public Void visitIterableCtType(IterableCtType ctType, Void p)
             return null;
         }
 
+        @Override
+        public Void visitStreamCtType(StreamCtType ctType, Void p)
+                throws RuntimeException {
+            if (!isSuppressed(Message.DOMA4274)) {
+                Notifier.notify(env, Kind.WARNING, Message.DOMA4274,
+                        returnMeta.getElement());
+            }
+            queryMeta.setResultStream(true);
+            ctType.getElementCtType()
+                    .accept(new ReturnStreamElementCtTypeVisitor(queryMeta,
+                            returnMeta), p);
+            return null;
+        }
+
         @Override
         public Void visitOptionalCtType(OptionalCtType ctType, Void p)
                 throws RuntimeException {
@@ -523,6 +544,17 @@ public Void visitOptionalDoubleCtType(OptionalDoubleCtType ctType,
             return null;
         }
 
+        protected boolean isSuppressed(Message message) {
+            if (suppress != null) {
+                for (Message suppressMessage : suppress.messages()) {
+                    if (suppressMessage == message) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+
     }
 
     /**
@@ -608,6 +640,89 @@ public Void visitOptionalDoubleCtType(OptionalDoubleCtType ctType,
 
     }
 
+    /**
+     * 
+     * @author nakamura-to
+     * 
+     */
+    protected class ReturnStreamElementCtTypeVisitor extends
+            SimpleCtTypeVisitor<Void, Void, RuntimeException> {
+
+        protected SqlFileSelectQueryMeta queryMeta;
+
+        protected QueryReturnMeta returnMeta;
+
+        protected ReturnStreamElementCtTypeVisitor(
+                SqlFileSelectQueryMeta queryMeta, QueryReturnMeta returnMeta) {
+            this.queryMeta = queryMeta;
+            this.returnMeta = returnMeta;
+        }
+
+        @Override
+        protected Void defaultAction(CtType type, Void p)
+                throws RuntimeException {
+            throw new AptException(Message.DOMA4271, env,
+                    returnMeta.getElement(), type.getTypeName());
+        }
+
+        @Override
+        public Void visitBasicCtType(BasicCtType ctType, Void p)
+                throws RuntimeException {
+            return null;
+        }
+
+        @Override
+        public Void visitDomainCtType(DomainCtType ctType, Void p)
+                throws RuntimeException {
+            return null;
+        }
+
+        @Override
+        public Void visitMapCtType(MapCtType ctType, Void p)
+                throws RuntimeException {
+            return null;
+        }
+
+        @Override
+        public Void visitEntityCtType(EntityCtType ctType, Void p)
+                throws RuntimeException {
+            if (ctType.isAbstract()) {
+                throw new AptException(Message.DOMA4272, env,
+                        returnMeta.getElement(), ctType.getTypeMirror());
+            }
+            queryMeta.setEntityCtType(ctType);
+            return null;
+        }
+
+        @Override
+        public Void visitOptionalCtType(OptionalCtType ctType, Void p)
+                throws RuntimeException {
+            ctType.getElementCtType().accept(
+                    new ReturnStreamOptionalElementCtTypeVisitor(queryMeta,
+                            returnMeta), p);
+            return null;
+        }
+
+        @Override
+        public Void visitOptionalIntCtType(OptionalIntCtType ctType, Void p)
+                throws RuntimeException {
+            return null;
+        }
+
+        @Override
+        public Void visitOptionalLongCtType(OptionalLongCtType ctType, Void p)
+                throws RuntimeException {
+            return null;
+        }
+
+        @Override
+        public Void visitOptionalDoubleCtType(OptionalDoubleCtType ctType,
+                Void p) throws RuntimeException {
+            return null;
+        }
+
+    }
+
     /**
      * 
      * @author nakamura-to
@@ -701,4 +816,42 @@ public Void visitDomainCtType(DomainCtType ctType, Void p)
         }
     }
 
+    /**
+     * 
+     * @author nakamura-to
+     * 
+     */
+    protected class ReturnStreamOptionalElementCtTypeVisitor extends
+            SimpleCtTypeVisitor<Void, Void, RuntimeException> {
+
+        protected SqlFileSelectQueryMeta queryMeta;
+
+        protected QueryReturnMeta returnMeta;
+
+        protected ReturnStreamOptionalElementCtTypeVisitor(
+                SqlFileSelectQueryMeta queryMeta, QueryReturnMeta returnMeta) {
+            this.queryMeta = queryMeta;
+            this.returnMeta = returnMeta;
+        }
+
+        @Override
+        protected Void defaultAction(CtType type, Void p)
+                throws RuntimeException {
+            throw new AptException(Message.DOMA4267, env,
+                    returnMeta.getElement(), type.getTypeName());
+        }
+
+        @Override
+        public Void visitBasicCtType(BasicCtType ctType, Void p)
+                throws RuntimeException {
+            return null;
+        }
+
+        @Override
+        public Void visitDomainCtType(DomainCtType ctType, Void p)
+                throws RuntimeException {
+            return null;
+        }
+    }
+
 }