Skip to content

Commit d33b7e5

Browse files
jeffgbutlerjeffgbutler
authored
Merge pull request #774 from jeffgbutler/modernizer-fixes
Fix Modernizer Nags
2 parents ec85ee6 + 9b07b0c commit d33b7e5

File tree

3 files changed

+33
-33
lines changed

3 files changed

+33
-33
lines changed

‎src/test/java/examples/simple/PersonMapperTest.java

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -422,8 +422,8 @@ void testUpdateByPrimaryKey() {
422422
assertThat(rows).isEqualTo(1);
423423

424424
Optional<PersonRecord> newRecord = mapper.selectByPrimaryKey(100);
425-
assertThat(newRecord).isPresent();
426-
assertThat(newRecord.get().getOccupation()).isEqualTo("Programmer");
425+
assertThat(newRecord).hasValueSatisfying(r ->
426+
assertThat(r.getOccupation()).isEqualTo("Programmer"));
427427
}
428428
}
429429

@@ -450,9 +450,10 @@ void testUpdateByPrimaryKeySelective() {
450450
assertThat(rows).isEqualTo(1);
451451

452452
Optional<PersonRecord> newRecord = mapper.selectByPrimaryKey(100);
453-
assertThat(newRecord).isPresent();
454-
assertThat(newRecord.get().getOccupation()).isEqualTo("Programmer");
455-
assertThat(newRecord.get().getFirstName()).isEqualTo("Joe");
453+
assertThat(newRecord).hasValueSatisfying(r -> {
454+
assertThat(r.getOccupation()).isEqualTo("Programmer");
455+
assertThat(r.getFirstName()).isEqualTo("Joe");
456+
});
456457
}
457458
}
458459

@@ -482,8 +483,8 @@ void testUpdate() {
482483
assertThat(rows).isEqualTo(1);
483484

484485
Optional<PersonRecord> newRecord = mapper.selectByPrimaryKey(100);
485-
assertThat(newRecord).isPresent();
486-
assertThat(newRecord.get().getOccupation()).isEqualTo("Programmer");
486+
assertThat(newRecord).hasValueSatisfying(r ->
487+
assertThat(r.getOccupation()).isEqualTo("Programmer"));
487488
}
488489
}
489490

@@ -510,8 +511,8 @@ void testUpdateOneField() {
510511
assertThat(rows).isEqualTo(1);
511512

512513
Optional<PersonRecord> newRecord = mapper.selectByPrimaryKey(100);
513-
assertThat(newRecord).isPresent();
514-
assertThat(newRecord.get().getOccupation()).isEqualTo("Programmer");
514+
assertThat(newRecord).hasValueSatisfying(r ->
515+
assertThat(r.getOccupation()).isEqualTo("Programmer"));
515516
}
516517
}
517518

@@ -539,8 +540,8 @@ void testUpdateAll() {
539540
assertThat(rows).isEqualTo(7);
540541

541542
Optional<PersonRecord> newRecord = mapper.selectByPrimaryKey(100);
542-
assertThat(newRecord).isPresent();
543-
assertThat(newRecord.get().getOccupation()).isEqualTo("Programmer");
543+
assertThat(newRecord).hasValueSatisfying(r ->
544+
assertThat(r.getOccupation()).isEqualTo("Programmer"));
544545
}
545546
}
546547

@@ -569,8 +570,8 @@ void testUpdateSelective() {
569570
assertThat(rows).isEqualTo(1);
570571

571572
Optional<PersonRecord> newRecord = mapper.selectByPrimaryKey(100);
572-
assertThat(newRecord).isPresent();
573-
assertThat(newRecord.get().getOccupation()).isEqualTo("Programmer");
573+
assertThat(newRecord).hasValueSatisfying(r ->
574+
assertThat(r.getOccupation()).isEqualTo("Programmer"));
574575
}
575576
}
576577

‎src/test/java/examples/spring/PersonTemplateTest.java

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -405,8 +405,7 @@ void testUpdateByPrimaryKey() {
405405
.from(person)
406406
.where(id, isEqualTo(100));
407407
Optional<PersonRecord> newRecord = template.selectOne(selectStatement, personRowMapper);
408-
assertThat(newRecord).isPresent();
409-
assertThat(newRecord.get().getOccupation()).isEqualTo("Programmer");
408+
assertThat(newRecord).hasValueSatisfying(r -> assertThat(r.getOccupation()).isEqualTo("Programmer"));
410409
}
411410

412411
@Test
@@ -435,8 +434,8 @@ void testUpdateByPrimaryKeyWithTypeHandler() {
435434
.from(person)
436435
.where(id, isEqualTo(100));
437436
Optional<PersonRecord> newRecord = template.selectOne(selectStatement, personRowMapper);
438-
assertThat(newRecord).isPresent();
439-
assertThat(newRecord.get().getLastName().getName()).isEqualTo("Smith");
437+
assertThat(newRecord).hasValueSatisfying(r ->
438+
assertThat(r.getLastName().getName()).isEqualTo("Smith"));
440439
}
441440

442441
@Test
@@ -473,9 +472,10 @@ void testUpdateByPrimaryKeySelective() {
473472
.from(person)
474473
.where(id, isEqualTo(100));
475474
Optional<PersonRecord> newRecord = template.selectOne(selectStatement, personRowMapper);
476-
assertThat(newRecord).isPresent();
477-
assertThat(newRecord.get().getOccupation()).isEqualTo("Programmer");
478-
assertThat(newRecord.get().getFirstName()).isEqualTo("Joe");
475+
assertThat(newRecord).hasValueSatisfying(r -> {
476+
assertThat(r.getOccupation()).isEqualTo("Programmer");
477+
assertThat(r.getFirstName()).isEqualTo("Joe");
478+
});
479479
}
480480

481481
@Test
@@ -519,9 +519,10 @@ void testUpdate() {
519519
.from(person)
520520
.where(id, isEqualTo(100));
521521
Optional<PersonRecord> newRecord = template.selectOne(selectStatement, personRowMapper);
522-
assertThat(newRecord).isPresent();
523-
assertThat(newRecord.get().getOccupation()).isEqualTo("Programmer");
524-
assertThat(newRecord.get().getFirstName()).isEqualTo("Joe");
522+
assertThat(newRecord).hasValueSatisfying(r -> {
523+
assertThat(r.getOccupation()).isEqualTo("Programmer");
524+
assertThat(r.getFirstName()).isEqualTo("Joe");
525+
});
525526
}
526527

527528
@Test
@@ -548,8 +549,7 @@ void testUpdateOneField() {
548549
.from(person)
549550
.where(id, isEqualTo(100));
550551
Optional<PersonRecord> newRecord = template.selectOne(selectStatement, personRowMapper);
551-
assertThat(newRecord).isPresent();
552-
assertThat(newRecord.get().getOccupation()).isEqualTo("Programmer");
552+
assertThat(newRecord).hasValueSatisfying(r -> assertThat(r.getOccupation()).isEqualTo("Programmer"));
553553
}
554554

555555
@Test
@@ -577,8 +577,7 @@ void testUpdateAll() {
577577
.where(id, isEqualTo(100));
578578

579579
Optional<PersonRecord> newRecord = template.selectOne(selectStatement, personRowMapper);
580-
assertThat(newRecord).isPresent();
581-
assertThat(newRecord.get().getOccupation()).isEqualTo("Programmer");
580+
assertThat(newRecord).hasValueSatisfying(r -> assertThat(r.getOccupation()).isEqualTo("Programmer"));
582581
}
583582

584583
@Test

‎src/test/java/org/mybatis/dynamic/sql/InvalidSQLTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -248,13 +248,13 @@ void testInvalidPagingModel() {
248248
.withStatementConfiguration(new StatementConfiguration())
249249
.build();
250250

251-
assertThat(pagingModel).isPresent();
251+
assertThat(pagingModel).hasValueSatisfying(pm -> {
252+
FetchFirstPagingModelRenderer renderer = new FetchFirstPagingModelRenderer(renderingContext, pm);
252253

253-
FetchFirstPagingModelRenderer renderer = new FetchFirstPagingModelRenderer(renderingContext, pagingModel.get());
254-
255-
assertThatExceptionOfType(InvalidSqlException.class)
256-
.isThrownBy(renderer::render)
257-
.withMessage(Messages.getInternalErrorString(InternalError.INTERNAL_ERROR_13));
254+
assertThatExceptionOfType(InvalidSqlException.class)
255+
.isThrownBy(renderer::render)
256+
.withMessage(Messages.getInternalErrorString(InternalError.INTERNAL_ERROR_13));
257+
});
258258
}
259259

260260
@Test

0 commit comments

Comments
 (0)