Add tests and fix return types in DAO methods

Author: xterao

src/test/kotlin/org/domaframework/doma/intellij/inspection/dao/AnnotationParamTypeCheckInspectionTest.kt

@@ -44,6 +44,11 @@ class AnnotationParamTypeCheckInspectionTest : DomaSqlTest() {
         }
     }
 
+    fun testSelectParam() {
+        val dao = findDaoClass("$daoPackage.SelectParamTestDao")
+        myFixture.testHighlighting(false, false, false, dao.containingFile.virtualFile)
+    }
+
     fun testInsertUpdateDeleteParam() {
         val dao = findDaoClass("$daoPackage.InsertUpdateDeleteParamTestDao")
         myFixture.testHighlighting(false, false, false, dao.containingFile.virtualFile)

src/test/testData/src/main/java/doma/example/dao/inspection/paramtype/MultiInsertParamTestDao.java

@@ -2,6 +2,7 @@
 
 import doma.example.entity.*;
 import org.seasar.doma.*;
+import org.seasar.doma.jdbc.MultiResult;
 
 import java.util.List;
 
@@ -21,13 +22,13 @@ public interface MultiInsertParamTestDao {
     int[] multiInsert(List<Pckt> PcktList);
 
     @MultiInsert
-    MultiResult<<error descr="Cannot resolve symbol 'Prj'">Prj</error>> multiInsertNoMatchResult(List<Pckt> PcktList);
+    MultiResult<User> multiInsertNoMatchResult(List<Pckt> PcktList);
 
     @MultiInsert
-    <error descr="Cannot resolve symbol 'MultiResult'">MultiResult</error><Pckt> multiInsertResult(List<Pckt> PcktList);
+    MultiResult<Pckt> multiInsertResult(List<Pckt> PcktList);
 
     @MultiInsert
-    <error descr="Cannot resolve symbol 'MultiResult'">MultiResult</error><Packet> multiInsertPacket(List<Packet> PacketList);
+    MultiResult<Packet> multiInsertPacket(List<Packet> PacketList);
 
     @MultiInsert(returning = @Returning)
     int[] multiInsertReturning(List<Pckt> Pckts);

src/test/testData/src/main/java/doma/example/dao/inspection/paramtype/ProcedureParamTestDao.java

@@ -2,9 +2,11 @@
 
 import org.seasar.doma.*;
 import org.seasar.doma.jdbc.Reference;
+import doma.example.entity.*;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 @Dao
 public interface ProcedureParamTestDao {
@@ -13,9 +15,12 @@ public interface ProcedureParamTestDao {
     void executeNotAnnotation(@In Integer inParam,@InOut Reference<String> inOurPatam, @Out Reference<Integer> outParam);
 
     @Procedure
-    void executeValidType(@In Reference<Integer> <error descr="Reference<Integer> is not supported as the type of the parameter annotated with @In">inParam</error>,@InOut Integer <error descr="The parameter type annotated with @InOut must be \"org.seasar.doma.jdbc.Reference\"">inOurPatam</error>, @Out String <error descr="The parameter type annotated with @Out must be \"org.seasar.doma.jdbc.Reference\"">outParam</error>,@ResultSet List<Optional<<error descr="Cannot resolve symbol 'Emp'">Emp</error>>> <error descr="\"Optional<Emp>\" is illegal as the type argument of \"java.util.List\"">optional</error>);
+    void executeValidType(@In Reference<Integer> <error descr="Reference<Integer> is not supported as the type of the parameter annotated with @In">inParam</error>
+        , @InOut Integer <error descr="The parameter type annotated with @InOut must be \"org.seasar.doma.jdbc.Reference\"">inOurPatam</error>
+        , @Out String <error descr="The parameter type annotated with @Out must be \"org.seasar.doma.jdbc.Reference\"">outParam</error>
+        , @ResultSet Optional<Pckt> <error descr="The parameter type annotated with @ResultSet must be \"java.util.List\"">optional</error>);
 
     @Function
-    int executeFuncValidType(@Out Reference<<error descr="Cannot resolve symbol 'Optional'">Optional</error><String>> <error descr="\"Optional<String>\" is illegal as the type argument of \"org.seasar.doma.jdbc.Reference\"">out</error>,@ResultSet List<Optional<<error descr="Cannot resolve symbol 'Address'">Address</error>>> <error descr="\"Optional<Address>\" is illegal as the type argument of \"java.util.List\"">optional</error>);
+    int executeFuncValidType(@Out Reference<Optional<String>> out,@ResultSet List<Optional<Packet>> optional);
 }
 

src/test/testData/src/main/java/doma/example/dao/inspection/paramtype/SelectParamTestDao.java

@@ -22,11 +22,11 @@ public interface SelectParamTestDao {
 
   @Select(strategy = SelectType.STREAM)
   @Sql("Select 10000 from user where name = /* name */'name' and salary = /* salary */0")
-  Stream<Packet> selectReturnStreamWithStreamOption(String name, BigDecimal salary);
+  Stream<Packet> <error descr="When you specify SelectType.STREAM for the strategy element of @Select, the \"java.util.function.Function<java.util.stream.Stream>\" parameter is required for the method">selectReturnStreamWithStreamOption</error>(String name, BigDecimal salary);
 
   @Select
   @Sql("Select 10000 from user")
-  Stream<Packet> selectReturnStreamWithOutStreamOption(Function<Stream<Packet>, BigDecimal> streams);
+  Stream<Packet> <error descr="When you use the \"java.util.function.Function\" parameter, SelectStrategyType.STREAM must be specified for the strategy element of @Select">selectReturnStreamWithOutStreamOption</error>(Function<Stream<Packet>, BigDecimal> streams);
 
   @Select(strategy = SelectType.STREAM)
   @Sql("Select 10000 from user")
@@ -47,7 +47,7 @@ public interface SelectParamTestDao {
 
   @Select(strategy = SelectType.COLLECT)
   @Sql("select * from packet where salary > /* salary */0")
-  Pckt selectCollectAccumulation(BigDecimal salary, Packet packet);
+  Pckt <error descr="When you specify SelectType.COLLECT for the strategy element of @Select, the \"java.util.stream.Collector\" parameter is required for the method">selectWithOutCollector</error>(BigDecimal salary, Packet packet);
 
   @Select(strategy = SelectType.COLLECT)
   @Sql("select * from emp where salary > /* salary */0")