From 9f00f4924f418ab6e626cbe1d84cefc3f3ba971f Mon Sep 17 00:00:00 2001 From: moparisthebest Date: Mon, 7 May 2018 23:10:20 -0400 Subject: [PATCH] Fix for java6 --- .../java/com/moparisthebest/jdbc/codegen/QmDao.java | 10 +++++++--- .../moparisthebest/jdbc/codegen/QueryMapperQmDao.java | 8 ++++++-- .../java/com/moparisthebest/jdbc/QueryMapperTest.java | 4 ++-- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/test/src/main/java/com/moparisthebest/jdbc/codegen/QmDao.java b/test/src/main/java/com/moparisthebest/jdbc/codegen/QmDao.java index 2d8ab64..6ad94d6 100644 --- a/test/src/main/java/com/moparisthebest/jdbc/codegen/QmDao.java +++ b/test/src/main/java/com/moparisthebest/jdbc/codegen/QmDao.java @@ -8,6 +8,10 @@ import java.sql.SQLException; import java.util.List; import java.util.Map; +//IFJAVA8_START +import java.util.stream.Stream; +//IFJAVA8_END + @JdbcMapper.Mapper( cachePreparedStatements = JdbcMapper.OptionalBool.FALSE , allowReflection = JdbcMapper.OptionalBool.TRUE @@ -157,10 +161,10 @@ public interface QmDao extends JdbcMapper { @SQL(selectThreePeople) ResultSetIterable getThreePeopleResultSetIterable(long personNo1, long personNo2, long personNo3) throws SQLException; - //IFJAVA 8_START + //IFJAVA8_START @SQL(selectThreePeople) - java.util.stream.Stream getThreePeopleStream(long personNo1, long personNo2, long personNo3) throws SQLException; + Stream getThreePeopleStream(long personNo1, long personNo2, long personNo3) throws SQLException; - //IFJAVA 8_END + //IFJAVA8_END } diff --git a/test/src/main/java/com/moparisthebest/jdbc/codegen/QueryMapperQmDao.java b/test/src/main/java/com/moparisthebest/jdbc/codegen/QueryMapperQmDao.java index a3a5b75..bf53a6e 100644 --- a/test/src/main/java/com/moparisthebest/jdbc/codegen/QueryMapperQmDao.java +++ b/test/src/main/java/com/moparisthebest/jdbc/codegen/QueryMapperQmDao.java @@ -12,6 +12,10 @@ import java.sql.SQLException; import java.util.List; import java.util.Map; +//IFJAVA8_START +import java.util.stream.Stream; +//IFJAVA8_END + import static com.moparisthebest.jdbc.TryClose.tryClose; public class QueryMapperQmDao implements QmDao { @@ -248,7 +252,7 @@ public class QueryMapperQmDao implements QmDao { FieldPerson.class, personNo1, personNo2, personNo3); } - //IFJAVA 8_START + //IFJAVA8_START @Override public java.util.stream.Stream getThreePeopleStream(final long personNo1, final long personNo2, final long personNo3) throws SQLException { @@ -256,5 +260,5 @@ public class QueryMapperQmDao implements QmDao { FieldPerson.class, personNo1, personNo2, personNo3); } - //IFJAVA 8_END + //IFJAVA8_END } diff --git a/test/src/test/java/com/moparisthebest/jdbc/QueryMapperTest.java b/test/src/test/java/com/moparisthebest/jdbc/QueryMapperTest.java index 56b7662..ce8828e 100644 --- a/test/src/test/java/com/moparisthebest/jdbc/QueryMapperTest.java +++ b/test/src/test/java/com/moparisthebest/jdbc/QueryMapperTest.java @@ -454,7 +454,7 @@ public class QueryMapperTest { assertArrayEquals(people, fromDb.toArray()); } - //IFJAVA 8_START + //IFJAVA8_START @Test public void testStream() throws SQLException { @@ -465,7 +465,7 @@ public class QueryMapperTest { assertArrayEquals(people, fromDb.toArray()); } - //IFJAVA 8_END + //IFJAVA8_END /* @Test