Merge pull request #23 from jeffgbutler/master

Small Test Improvements

Author: jeffgbutler

src/test/java/examples/simple/LastNameTypeHandler.java

@@ -46,12 +46,6 @@ public LastName getResult(CallableStatement cs, int columnIndex) throws SQLExcep
     }
 
     private LastName toLastName(String s) {
-        LastName lastName = null;
-        
-        if (s != null) {
-            return null;
-        }
-        
-        return lastName;
+        return s == null ? null : LastName.of(s);
     }
 }

src/test/java/examples/simple/SimpleTableAnnotatedMapper.java

@@ -19,6 +19,7 @@
 import static org.mybatis.dynamic.sql.SqlBuilder.*;
 
 import java.util.List;
+import java.util.function.Function;
 
 import org.apache.ibatis.annotations.DeleteProvider;
 import org.apache.ibatis.annotations.InsertProvider;
@@ -28,6 +29,7 @@
 import org.apache.ibatis.annotations.Results;
 import org.apache.ibatis.annotations.SelectProvider;
 import org.apache.ibatis.annotations.UpdateProvider;
+import org.apache.ibatis.session.RowBounds;
 import org.apache.ibatis.type.JdbcType;
 import org.mybatis.dynamic.sql.SqlBuilder;
 import org.mybatis.dynamic.sql.delete.DeleteDSL;
@@ -44,6 +46,11 @@
 import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider;
 import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
 
+/**
+ * 
+ * Note: this is the canonical mapper and represents the desired output for MyBatis Generator 
+ *
+ */
 @Mapper
 public interface SimpleTableAnnotatedMapper {
 
@@ -64,6 +71,10 @@ public interface SimpleTableAnnotatedMapper {
     })
     List<SimpleTableRecord> selectMany(SelectStatementProvider selectStatement);
 
+    @SelectProvider(type=SqlProviderAdapter.class, method="select")
+    @ResultMap("SimpleTableResult")
+    List<SimpleTableRecord> selectManyWithRowbounds(SelectStatementProvider selectStatement, RowBounds rowBounds);
+    
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     @ResultMap("SimpleTableResult")
     SimpleTableRecord selectOne(SelectStatementProvider selectStatement);
@@ -74,6 +85,10 @@ public interface SimpleTableAnnotatedMapper {
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
     long count(SelectStatementProvider selectStatement);
 
+    default Function<SelectStatementProvider, List<SimpleTableRecord>> selectManyWithRowbounds(RowBounds rowBounds) {
+        return selectStatement -> selectManyWithRowbounds(selectStatement, rowBounds);
+    }
+    
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<Long>> countByExample() {
         return SelectDSL.selectWithMapper(this::count, SqlBuilder.count())
                 .from(simpleTable);
@@ -121,11 +136,21 @@ default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<SimpleTableRecord>>>
             .from(simpleTable);
     }
 
+    default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<SimpleTableRecord>>> selectByExample(RowBounds rowBounds) {
+        return SelectDSL.selectWithMapper(selectManyWithRowbounds(rowBounds), id.as("A_ID"), firstName, lastName, birthDate, employed, occupation)
+            .from(simpleTable);
+    }
+    
     default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<SimpleTableRecord>>> selectDistinctByExample() {
         return SelectDSL.selectDistinctWithMapper(this::selectMany, id.as("A_ID"), firstName, lastName, birthDate, employed, occupation)
             .from(simpleTable);
     }
 
+    default QueryExpressionDSL<MyBatis3SelectModelAdapter<List<SimpleTableRecord>>> selectDistinctByExample(RowBounds rowBounds) {
+        return SelectDSL.selectDistinctWithMapper(selectManyWithRowbounds(rowBounds), id.as("A_ID"), firstName, lastName, birthDate, employed, occupation)
+            .from(simpleTable);
+    }
+    
     default SimpleTableRecord selectByPrimaryKey(Integer id_) {
         return SelectDSL.selectWithMapper(this::selectOne, id.as("A_ID"), firstName, lastName, birthDate, employed, occupation)
             .from(simpleTable)
@@ -156,7 +181,6 @@ default UpdateDSL<MyBatis3UpdateModelAdapter<Integer>> updateByExampleSelective(
 
     default int updateByPrimaryKey(SimpleTableRecord record) {
         return UpdateDSL.updateWithMapper(this::update, simpleTable)
-                .set(id).equalTo(record::getId)
                 .set(firstName).equalTo(record::getFirstName)
                 .set(lastName).equalTo(record::getLastName)
                 .set(birthDate).equalTo(record::getBirthDate)
@@ -169,7 +193,6 @@ default int updateByPrimaryKey(SimpleTableRecord record) {
 
     default int updateByPrimaryKeySelective(SimpleTableRecord record) {
         return UpdateDSL.updateWithMapper(this::update, simpleTable)
-                .set(id).equalToWhenPresent(record::getId)
                 .set(firstName).equalToWhenPresent(record::getFirstName)
                 .set(lastName).equalToWhenPresent(record::getLastName)
                 .set(birthDate).equalToWhenPresent(record::getBirthDate)

src/test/java/examples/simple/SimpleTableAnnotatedMapperTest.java

@@ -30,6 +30,7 @@
 import org.apache.ibatis.jdbc.ScriptRunner;
 import org.apache.ibatis.mapping.Environment;
 import org.apache.ibatis.session.Configuration;
+import org.apache.ibatis.session.RowBounds;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.session.SqlSessionFactoryBuilder;
@@ -85,6 +86,25 @@ public void testSelectByExample() {
         }
     }
 
+    @Test
+    public void testSelectByExampleWithRowbounds() {
+        SqlSession session = sqlSessionFactory.openSession();
+        try {
+            SimpleTableAnnotatedMapper mapper = session.getMapper(SimpleTableAnnotatedMapper.class);
+            RowBounds rowBounds = new RowBounds(2, 2);
+            
+            List<SimpleTableRecord> rows = mapper.selectByExample(rowBounds)
+                    .where(id, isEqualTo(1))
+                    .or(occupation, isNull())
+                    .build()
+                    .execute();
+            
+            assertThat(rows.size()).isEqualTo(1);
+        } finally {
+            session.close();
+        }
+    }
+
     @Test
     public void testSelectDistinctByExample() {
         SqlSession session = sqlSessionFactory.openSession();
@@ -103,6 +123,25 @@ public void testSelectDistinctByExample() {
         }
     }
 
+    @Test
+    public void testSelectDistinctByExampleWithRowbounds() {
+        SqlSession session = sqlSessionFactory.openSession();
+        try {
+            SimpleTableAnnotatedMapper mapper = session.getMapper(SimpleTableAnnotatedMapper.class);
+            RowBounds rowBounds = new RowBounds(2, 2);
+            
+            List<SimpleTableRecord> rows = mapper.selectDistinctByExample(rowBounds)
+                    .where(id, isGreaterThan(1))
+                    .or(occupation, isNull())
+                    .build()
+                    .execute();
+            
+            assertThat(rows.size()).isEqualTo(2);
+        } finally {
+            session.close();
+        }
+    }
+    
     @Test
     public void testSelectByExampleWithTypeHandler() {
         SqlSession session = sqlSessionFactory.openSession();
@@ -137,6 +176,8 @@ public void testFirstNameIn() {
                     .execute();
 
             assertThat(rows.size()).isEqualTo(2);
+            assertThat(rows.get(0).getLastName().getName()).isEqualTo("Flintstone");
+            assertThat(rows.get(1).getLastName().getName()).isEqualTo("Rubble");
         } finally {
             session.close();
         }