Skip to content

Commit f19209a

Browse files
jeffgbutlerjeffgbutler
committed
Better names for new style mapper
1 parent 24b0eb7 commit f19209a

File tree

2 files changed

+82
-26
lines changed

2 files changed

+82
-26
lines changed

src/test/java/examples/simple/newstyle/SimpleTableAnnotatedMapperNewStyle.java renamed to src/test/java/examples/simple/newstyle/SimpleTableMapperNewStyle.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
*
5959
*/
6060
@Mapper
61-
public interface SimpleTableAnnotatedMapperNewStyle {
61+
public interface SimpleTableMapperNewStyle {
6262

6363
@InsertProvider(type=SqlProviderAdapter.class, method="insert")
6464
int insert(InsertStatementProvider<SimpleTableRecord> insertStatement);

src/test/java/examples/simple/newstyle/SimpleTableAnnotatedNewStyleMapperTest.java renamed to src/test/java/examples/simple/newstyle/SimpleTableMapperNewStyleTest.java

Lines changed: 81 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
import examples.simple.LastName;
4747
import examples.simple.SimpleTableRecord;
4848

49-
public class SimpleTableAnnotatedNewStyleMapperTest {
49+
public class SimpleTableMapperNewStyleTest {
5050

5151
private static final String JDBC_URL = "jdbc:hsqldb:mem:aname";
5252
private static final String JDBC_DRIVER = "org.hsqldb.jdbcDriver";
@@ -66,14 +66,14 @@ public void setup() throws Exception {
6666
UnpooledDataSource ds = new UnpooledDataSource(JDBC_DRIVER, JDBC_URL, "sa", "");
6767
Environment environment = new Environment("test", new JdbcTransactionFactory(), ds);
6868
Configuration config = new Configuration(environment);
69-
config.addMapper(SimpleTableAnnotatedMapperNewStyle.class);
69+
config.addMapper(SimpleTableMapperNewStyle.class);
7070
sqlSessionFactory = new SqlSessionFactoryBuilder().build(config);
7171
}
7272

7373
@Test
7474
public void testSelect() {
7575
try (SqlSession session = sqlSessionFactory.openSession()) {
76-
SimpleTableAnnotatedMapperNewStyle mapper = session.getMapper(SimpleTableAnnotatedMapperNewStyle.class);
76+
SimpleTableMapperNewStyle mapper = session.getMapper(SimpleTableMapperNewStyle.class);
7777

7878
List<SimpleTableRecord> rows = mapper.select(h ->
7979
h.where(id, isEqualTo(1))
@@ -86,7 +86,7 @@ public void testSelect() {
8686
@Test
8787
public void testSelectAll() {
8888
try (SqlSession session = sqlSessionFactory.openSession()) {
89-
SimpleTableAnnotatedMapperNewStyle mapper = session.getMapper(SimpleTableAnnotatedMapperNewStyle.class);
89+
SimpleTableMapperNewStyle mapper = session.getMapper(SimpleTableMapperNewStyle.class);
9090

9191
List<SimpleTableRecord> rows = mapper.select(MyBatis3SelectHelper.allRows());
9292

@@ -99,7 +99,7 @@ public void testSelectAll() {
9999
@Test
100100
public void testSelectAllOrdered() {
101101
try (SqlSession session = sqlSessionFactory.openSession()) {
102-
SimpleTableAnnotatedMapperNewStyle mapper = session.getMapper(SimpleTableAnnotatedMapperNewStyle.class);
102+
SimpleTableMapperNewStyle mapper = session.getMapper(SimpleTableMapperNewStyle.class);
103103

104104
List<SimpleTableRecord> rows = mapper
105105
.select(MyBatis3SelectHelper.allRowsOrderdBy(lastName.descending(), firstName.descending()));
@@ -113,7 +113,7 @@ public void testSelectAllOrdered() {
113113
@Test
114114
public void testSelectDistinct() {
115115
try (SqlSession session = sqlSessionFactory.openSession()) {
116-
SimpleTableAnnotatedMapperNewStyle mapper = session.getMapper(SimpleTableAnnotatedMapperNewStyle.class);
116+
SimpleTableMapperNewStyle mapper = session.getMapper(SimpleTableMapperNewStyle.class);
117117

118118
List<SimpleTableRecord> rows = mapper.selectDistinct(h ->
119119
h.where(id, isGreaterThan(1))
@@ -126,7 +126,7 @@ public void testSelectDistinct() {
126126
@Test
127127
public void testSelectWithTypeHandler() {
128128
try (SqlSession session = sqlSessionFactory.openSession()) {
129-
SimpleTableAnnotatedMapperNewStyle mapper = session.getMapper(SimpleTableAnnotatedMapperNewStyle.class);
129+
SimpleTableMapperNewStyle mapper = session.getMapper(SimpleTableMapperNewStyle.class);
130130

131131
List<SimpleTableRecord> rows = mapper.select(h ->
132132
h.where(employed, isEqualTo(false))
@@ -143,7 +143,7 @@ public void testSelectWithTypeHandler() {
143143
@Test
144144
public void testSelectByPrimaryKeyWithMissingRecord() {
145145
try (SqlSession session = sqlSessionFactory.openSession()) {
146-
SimpleTableAnnotatedMapperNewStyle mapper = session.getMapper(SimpleTableAnnotatedMapperNewStyle.class);
146+
SimpleTableMapperNewStyle mapper = session.getMapper(SimpleTableMapperNewStyle.class);
147147

148148
Optional<SimpleTableRecord> record = mapper.selectByPrimaryKey(300);
149149
assertThat(record.isPresent()).isFalse();
@@ -153,7 +153,7 @@ public void testSelectByPrimaryKeyWithMissingRecord() {
153153
@Test
154154
public void testFirstNameIn() {
155155
try (SqlSession session = sqlSessionFactory.openSession()) {
156-
SimpleTableAnnotatedMapperNewStyle mapper = session.getMapper(SimpleTableAnnotatedMapperNewStyle.class);
156+
SimpleTableMapperNewStyle mapper = session.getMapper(SimpleTableMapperNewStyle.class);
157157

158158
List<SimpleTableRecord> rows = mapper.select(h ->
159159
h.where(firstName, isIn("Fred", "Barney")));
@@ -169,7 +169,7 @@ public void testFirstNameIn() {
169169
@Test
170170
public void testDelete() {
171171
try (SqlSession session = sqlSessionFactory.openSession()) {
172-
SimpleTableAnnotatedMapperNewStyle mapper = session.getMapper(SimpleTableAnnotatedMapperNewStyle.class);
172+
SimpleTableMapperNewStyle mapper = session.getMapper(SimpleTableMapperNewStyle.class);
173173
int rows = mapper.delete(h ->
174174
h.where(occupation, isNull()));
175175
assertThat(rows).isEqualTo(2);
@@ -179,7 +179,7 @@ public void testDelete() {
179179
@Test
180180
public void testDeleteAll() {
181181
try (SqlSession session = sqlSessionFactory.openSession()) {
182-
SimpleTableAnnotatedMapperNewStyle mapper = session.getMapper(SimpleTableAnnotatedMapperNewStyle.class);
182+
SimpleTableMapperNewStyle mapper = session.getMapper(SimpleTableMapperNewStyle.class);
183183
int rows = mapper.delete(MyBatis3DeleteHelper.allRows());
184184

185185
assertThat(rows).isEqualTo(6);
@@ -189,7 +189,7 @@ public void testDeleteAll() {
189189
@Test
190190
public void testDeleteByPrimaryKey() {
191191
try (SqlSession session = sqlSessionFactory.openSession()) {
192-
SimpleTableAnnotatedMapperNewStyle mapper = session.getMapper(SimpleTableAnnotatedMapperNewStyle.class);
192+
SimpleTableMapperNewStyle mapper = session.getMapper(SimpleTableMapperNewStyle.class);
193193
int rows = mapper.deleteByPrimaryKey(2);
194194

195195
assertThat(rows).isEqualTo(1);
@@ -199,7 +199,7 @@ public void testDeleteByPrimaryKey() {
199199
@Test
200200
public void testInsert() {
201201
try (SqlSession session = sqlSessionFactory.openSession()) {
202-
SimpleTableAnnotatedMapperNewStyle mapper = session.getMapper(SimpleTableAnnotatedMapperNewStyle.class);
202+
SimpleTableMapperNewStyle mapper = session.getMapper(SimpleTableMapperNewStyle.class);
203203
SimpleTableRecord record = new SimpleTableRecord();
204204
record.setId(100);
205205
record.setFirstName("Joe");
@@ -216,7 +216,7 @@ public void testInsert() {
216216
@Test
217217
public void testInsertMultiple() {
218218
try (SqlSession session = sqlSessionFactory.openSession()) {
219-
SimpleTableAnnotatedMapperNewStyle mapper = session.getMapper(SimpleTableAnnotatedMapperNewStyle.class);
219+
SimpleTableMapperNewStyle mapper = session.getMapper(SimpleTableMapperNewStyle.class);
220220

221221
List<SimpleTableRecord> records = new ArrayList<>();
222222

@@ -246,7 +246,7 @@ record = new SimpleTableRecord();
246246
@Test
247247
public void testInsertSelective() {
248248
try (SqlSession session = sqlSessionFactory.openSession()) {
249-
SimpleTableAnnotatedMapperNewStyle mapper = session.getMapper(SimpleTableAnnotatedMapperNewStyle.class);
249+
SimpleTableMapperNewStyle mapper = session.getMapper(SimpleTableMapperNewStyle.class);
250250
SimpleTableRecord record = new SimpleTableRecord();
251251
record.setId(100);
252252
record.setFirstName("Joe");
@@ -262,7 +262,7 @@ public void testInsertSelective() {
262262
@Test
263263
public void testUpdateByPrimaryKey() {
264264
try (SqlSession session = sqlSessionFactory.openSession()) {
265-
SimpleTableAnnotatedMapperNewStyle mapper = session.getMapper(SimpleTableAnnotatedMapperNewStyle.class);
265+
SimpleTableMapperNewStyle mapper = session.getMapper(SimpleTableMapperNewStyle.class);
266266
SimpleTableRecord record = new SimpleTableRecord();
267267
record.setId(100);
268268
record.setFirstName("Joe");
@@ -287,7 +287,7 @@ public void testUpdateByPrimaryKey() {
287287
@Test
288288
public void testUpdateByPrimaryKeySelective() {
289289
try (SqlSession session = sqlSessionFactory.openSession()) {
290-
SimpleTableAnnotatedMapperNewStyle mapper = session.getMapper(SimpleTableAnnotatedMapperNewStyle.class);
290+
SimpleTableMapperNewStyle mapper = session.getMapper(SimpleTableMapperNewStyle.class);
291291
SimpleTableRecord record = new SimpleTableRecord();
292292
record.setId(100);
293293
record.setFirstName("Joe");
@@ -315,7 +315,7 @@ public void testUpdateByPrimaryKeySelective() {
315315
@Test
316316
public void testUpdate() {
317317
try (SqlSession session = sqlSessionFactory.openSession()) {
318-
SimpleTableAnnotatedMapperNewStyle mapper = session.getMapper(SimpleTableAnnotatedMapperNewStyle.class);
318+
SimpleTableMapperNewStyle mapper = session.getMapper(SimpleTableMapperNewStyle.class);
319319
SimpleTableRecord record = new SimpleTableRecord();
320320
record.setId(100);
321321
record.setFirstName("Joe");
@@ -330,7 +330,7 @@ public void testUpdate() {
330330
record.setOccupation("Programmer");
331331

332332
rows = mapper.update(h ->
333-
SimpleTableAnnotatedMapperNewStyle.setAll(record, h)
333+
SimpleTableMapperNewStyle.setAll(record, h)
334334
.where(id, isEqualTo(100))
335335
.and(firstName, isEqualTo("Joe")));
336336

@@ -342,10 +342,37 @@ public void testUpdate() {
342342
}
343343
}
344344

345+
@Test
346+
public void testUpdateOneField() {
347+
try (SqlSession session = sqlSessionFactory.openSession()) {
348+
SimpleTableMapperNewStyle mapper = session.getMapper(SimpleTableMapperNewStyle.class);
349+
SimpleTableRecord record = new SimpleTableRecord();
350+
record.setId(100);
351+
record.setFirstName("Joe");
352+
record.setLastName(LastName.of("Jones"));
353+
record.setBirthDate(new Date());
354+
record.setEmployed(true);
355+
record.setOccupation("Developer");
356+
357+
int rows = mapper.insert(record);
358+
assertThat(rows).isEqualTo(1);
359+
360+
rows = mapper.update(h ->
361+
h.set(occupation).equalTo("Programmer")
362+
.where(id, isEqualTo(100)));
363+
364+
assertThat(rows).isEqualTo(1);
365+
366+
Optional<SimpleTableRecord> newRecord = mapper.selectByPrimaryKey(100);
367+
assertThat(newRecord.isPresent()).isTrue();
368+
assertThat(newRecord.get().getOccupation()).isEqualTo("Programmer");
369+
}
370+
}
371+
345372
@Test
346373
public void testUpdateAll() {
347374
try (SqlSession session = sqlSessionFactory.openSession()) {
348-
SimpleTableAnnotatedMapperNewStyle mapper = session.getMapper(SimpleTableAnnotatedMapperNewStyle.class);
375+
SimpleTableMapperNewStyle mapper = session.getMapper(SimpleTableMapperNewStyle.class);
349376
SimpleTableRecord record = new SimpleTableRecord();
350377
record.setId(100);
351378
record.setFirstName("Joe");
@@ -360,7 +387,7 @@ public void testUpdateAll() {
360387
SimpleTableRecord updateRecord = new SimpleTableRecord();
361388
updateRecord.setOccupation("Programmer");
362389
rows = mapper.update(h ->
363-
SimpleTableAnnotatedMapperNewStyle.setSelective(updateRecord, h));
390+
SimpleTableMapperNewStyle.setSelective(updateRecord, h));
364391

365392
assertThat(rows).isEqualTo(7);
366393

@@ -370,10 +397,39 @@ public void testUpdateAll() {
370397
}
371398
}
372399

400+
@Test
401+
public void testUpdateSelective() {
402+
try (SqlSession session = sqlSessionFactory.openSession()) {
403+
SimpleTableMapperNewStyle mapper = session.getMapper(SimpleTableMapperNewStyle.class);
404+
SimpleTableRecord record = new SimpleTableRecord();
405+
record.setId(100);
406+
record.setFirstName("Joe");
407+
record.setLastName(LastName.of("Jones"));
408+
record.setBirthDate(new Date());
409+
record.setEmployed(true);
410+
record.setOccupation("Developer");
411+
412+
int rows = mapper.insert(record);
413+
assertThat(rows).isEqualTo(1);
414+
415+
SimpleTableRecord updateRecord = new SimpleTableRecord();
416+
updateRecord.setOccupation("Programmer");
417+
rows = mapper.update(h ->
418+
SimpleTableMapperNewStyle.setSelective(updateRecord, h)
419+
.where(id, isEqualTo(100)));
420+
421+
assertThat(rows).isEqualTo(1);
422+
423+
Optional<SimpleTableRecord> newRecord = mapper.selectByPrimaryKey(100);
424+
assertThat(newRecord.isPresent()).isTrue();
425+
assertThat(newRecord.get().getOccupation()).isEqualTo("Programmer");
426+
}
427+
}
428+
373429
@Test
374430
public void testCount() {
375431
try (SqlSession session = sqlSessionFactory.openSession()) {
376-
SimpleTableAnnotatedMapperNewStyle mapper = session.getMapper(SimpleTableAnnotatedMapperNewStyle.class);
432+
SimpleTableMapperNewStyle mapper = session.getMapper(SimpleTableMapperNewStyle.class);
377433
long rows = mapper.count(h ->
378434
h.where(occupation, isNull()));
379435

@@ -384,7 +440,7 @@ public void testCount() {
384440
@Test
385441
public void testCountAll() {
386442
try (SqlSession session = sqlSessionFactory.openSession()) {
387-
SimpleTableAnnotatedMapperNewStyle mapper = session.getMapper(SimpleTableAnnotatedMapperNewStyle.class);
443+
SimpleTableMapperNewStyle mapper = session.getMapper(SimpleTableMapperNewStyle.class);
388444
long rows = mapper.count(MyBatis3CountHelper.allRows());
389445

390446
assertThat(rows).isEqualTo(6L);
@@ -394,7 +450,7 @@ public void testCountAll() {
394450
@Test
395451
public void testTypeHandledLike() {
396452
try (SqlSession session = sqlSessionFactory.openSession()) {
397-
SimpleTableAnnotatedMapperNewStyle mapper = session.getMapper(SimpleTableAnnotatedMapperNewStyle.class);
453+
SimpleTableMapperNewStyle mapper = session.getMapper(SimpleTableMapperNewStyle.class);
398454

399455
List<SimpleTableRecord> rows = mapper.select(h ->
400456
h.where(lastName, isLike(LastName.of("Fl%")))
@@ -408,7 +464,7 @@ public void testTypeHandledLike() {
408464
@Test
409465
public void testTypeHandledNotLike() {
410466
try (SqlSession session = sqlSessionFactory.openSession()) {
411-
SimpleTableAnnotatedMapperNewStyle mapper = session.getMapper(SimpleTableAnnotatedMapperNewStyle.class);
467+
SimpleTableMapperNewStyle mapper = session.getMapper(SimpleTableMapperNewStyle.class);
412468

413469
List<SimpleTableRecord> rows = mapper.select(h ->
414470
h.where(lastName, isNotLike(LastName.of("Fl%")))

0 commit comments

Comments
 (0)