Merge pull request #774 from jeffgbutler/modernizer-fixes

jeffgbutler · web-flow · commit d33b7e5021ad · 2024-04-16T11:53:11.000-04:00
Fix Modernizer Nags
diff --git a/src/test/java/examples/simple/PersonMapperTest.java b/src/test/java/examples/simple/PersonMapperTest.java
@@ -422,8 +422,8 @@ void testUpdateByPrimaryKey() {
             assertThat(rows).isEqualTo(1);
 
             Optional<PersonRecord> newRecord = mapper.selectByPrimaryKey(100);
-            assertThat(newRecord).isPresent();
-            assertThat(newRecord.get().getOccupation()).isEqualTo("Programmer");
+            assertThat(newRecord).hasValueSatisfying(r ->
+                    assertThat(r.getOccupation()).isEqualTo("Programmer"));
         }
     }
 
@@ -450,9 +450,10 @@ void testUpdateByPrimaryKeySelective() {
             assertThat(rows).isEqualTo(1);
 
             Optional<PersonRecord> newRecord = mapper.selectByPrimaryKey(100);
-            assertThat(newRecord).isPresent();
-            assertThat(newRecord.get().getOccupation()).isEqualTo("Programmer");
-            assertThat(newRecord.get().getFirstName()).isEqualTo("Joe");
+            assertThat(newRecord).hasValueSatisfying(r -> {
+                assertThat(r.getOccupation()).isEqualTo("Programmer");
+                assertThat(r.getFirstName()).isEqualTo("Joe");
+            });
         }
     }
 
@@ -482,8 +483,8 @@ void testUpdate() {
             assertThat(rows).isEqualTo(1);
 
             Optional<PersonRecord> newRecord = mapper.selectByPrimaryKey(100);
-            assertThat(newRecord).isPresent();
-            assertThat(newRecord.get().getOccupation()).isEqualTo("Programmer");
+            assertThat(newRecord).hasValueSatisfying(r ->
+                    assertThat(r.getOccupation()).isEqualTo("Programmer"));
         }
     }
 
@@ -510,8 +511,8 @@ void testUpdateOneField() {
             assertThat(rows).isEqualTo(1);
 
             Optional<PersonRecord> newRecord = mapper.selectByPrimaryKey(100);
-            assertThat(newRecord).isPresent();
-            assertThat(newRecord.get().getOccupation()).isEqualTo("Programmer");
+            assertThat(newRecord).hasValueSatisfying(r ->
+                    assertThat(r.getOccupation()).isEqualTo("Programmer"));
         }
     }
 
@@ -539,8 +540,8 @@ void testUpdateAll() {
             assertThat(rows).isEqualTo(7);
 
             Optional<PersonRecord> newRecord = mapper.selectByPrimaryKey(100);
-            assertThat(newRecord).isPresent();
-            assertThat(newRecord.get().getOccupation()).isEqualTo("Programmer");
+            assertThat(newRecord).hasValueSatisfying(r ->
+                    assertThat(r.getOccupation()).isEqualTo("Programmer"));
         }
     }
 
@@ -569,8 +570,8 @@ void testUpdateSelective() {
             assertThat(rows).isEqualTo(1);
 
             Optional<PersonRecord> newRecord = mapper.selectByPrimaryKey(100);
-            assertThat(newRecord).isPresent();
-            assertThat(newRecord.get().getOccupation()).isEqualTo("Programmer");
+            assertThat(newRecord).hasValueSatisfying(r ->
+                    assertThat(r.getOccupation()).isEqualTo("Programmer"));
         }
     }
 
diff --git a/src/test/java/examples/spring/PersonTemplateTest.java b/src/test/java/examples/spring/PersonTemplateTest.java
@@ -405,8 +405,7 @@ void testUpdateByPrimaryKey() {
                 .from(person)
                 .where(id, isEqualTo(100));
         Optional<PersonRecord> newRecord = template.selectOne(selectStatement, personRowMapper);
-        assertThat(newRecord).isPresent();
-        assertThat(newRecord.get().getOccupation()).isEqualTo("Programmer");
+        assertThat(newRecord).hasValueSatisfying(r -> assertThat(r.getOccupation()).isEqualTo("Programmer"));
     }
 
     @Test
@@ -435,8 +434,8 @@ void testUpdateByPrimaryKeyWithTypeHandler() {
                 .from(person)
                 .where(id, isEqualTo(100));
         Optional<PersonRecord> newRecord = template.selectOne(selectStatement, personRowMapper);
-        assertThat(newRecord).isPresent();
-        assertThat(newRecord.get().getLastName().getName()).isEqualTo("Smith");
+        assertThat(newRecord).hasValueSatisfying(r ->
+                assertThat(r.getLastName().getName()).isEqualTo("Smith"));
     }
 
     @Test
@@ -473,9 +472,10 @@ void testUpdateByPrimaryKeySelective() {
                 .from(person)
                 .where(id, isEqualTo(100));
         Optional<PersonRecord> newRecord = template.selectOne(selectStatement, personRowMapper);
-        assertThat(newRecord).isPresent();
-        assertThat(newRecord.get().getOccupation()).isEqualTo("Programmer");
-        assertThat(newRecord.get().getFirstName()).isEqualTo("Joe");
+        assertThat(newRecord).hasValueSatisfying(r -> {
+            assertThat(r.getOccupation()).isEqualTo("Programmer");
+            assertThat(r.getFirstName()).isEqualTo("Joe");
+        });
     }
 
     @Test
@@ -519,9 +519,10 @@ void testUpdate() {
                 .from(person)
                 .where(id, isEqualTo(100));
         Optional<PersonRecord> newRecord = template.selectOne(selectStatement, personRowMapper);
-        assertThat(newRecord).isPresent();
-        assertThat(newRecord.get().getOccupation()).isEqualTo("Programmer");
-        assertThat(newRecord.get().getFirstName()).isEqualTo("Joe");
+        assertThat(newRecord).hasValueSatisfying(r -> {
+            assertThat(r.getOccupation()).isEqualTo("Programmer");
+            assertThat(r.getFirstName()).isEqualTo("Joe");
+        });
     }
 
     @Test
@@ -548,8 +549,7 @@ void testUpdateOneField() {
                 .from(person)
                 .where(id, isEqualTo(100));
         Optional<PersonRecord> newRecord = template.selectOne(selectStatement, personRowMapper);
-        assertThat(newRecord).isPresent();
-        assertThat(newRecord.get().getOccupation()).isEqualTo("Programmer");
+        assertThat(newRecord).hasValueSatisfying(r -> assertThat(r.getOccupation()).isEqualTo("Programmer"));
     }
 
     @Test
@@ -577,8 +577,7 @@ void testUpdateAll() {
                 .where(id, isEqualTo(100));
 
         Optional<PersonRecord> newRecord = template.selectOne(selectStatement, personRowMapper);
-        assertThat(newRecord).isPresent();
-        assertThat(newRecord.get().getOccupation()).isEqualTo("Programmer");
+        assertThat(newRecord).hasValueSatisfying(r -> assertThat(r.getOccupation()).isEqualTo("Programmer"));
     }
 
     @Test
diff --git a/src/test/java/org/mybatis/dynamic/sql/InvalidSQLTest.java b/src/test/java/org/mybatis/dynamic/sql/InvalidSQLTest.java
@@ -248,13 +248,13 @@ void testInvalidPagingModel() {
                 .withStatementConfiguration(new StatementConfiguration())
                 .build();
 
-        assertThat(pagingModel).isPresent();
+        assertThat(pagingModel).hasValueSatisfying(pm -> {
+            FetchFirstPagingModelRenderer renderer = new FetchFirstPagingModelRenderer(renderingContext, pm);
 
-        FetchFirstPagingModelRenderer renderer = new FetchFirstPagingModelRenderer(renderingContext, pagingModel.get());
-
-        assertThatExceptionOfType(InvalidSqlException.class)
-                .isThrownBy(renderer::render)
-                .withMessage(Messages.getInternalErrorString(InternalError.INTERNAL_ERROR_13));
+            assertThatExceptionOfType(InvalidSqlException.class)
+                    .isThrownBy(renderer::render)
+                    .withMessage(Messages.getInternalErrorString(InternalError.INTERNAL_ERROR_13));
+        });
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -422,8 +422,8 @@ void testUpdateByPrimaryKey() {`
`422`	`422`	`assertThat(rows).isEqualTo(1);`
`423`	`423`
`424`	`424`	`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"));`
`427`	`427`	`}`
`428`	`428`	`}`
`429`	`429`
`@@ -450,9 +450,10 @@ void testUpdateByPrimaryKeySelective() {`
`450`	`450`	`assertThat(rows).isEqualTo(1);`
`451`	`451`
`452`	`452`	`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`	`+ });`
`456`	`457`	`}`
`457`	`458`	`}`
`458`	`459`
`@@ -482,8 +483,8 @@ void testUpdate() {`
`482`	`483`	`assertThat(rows).isEqualTo(1);`
`483`	`484`
`484`	`485`	`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"));`
`487`	`488`	`}`
`488`	`489`	`}`
`489`	`490`
`@@ -510,8 +511,8 @@ void testUpdateOneField() {`
`510`	`511`	`assertThat(rows).isEqualTo(1);`
`511`	`512`
`512`	`513`	`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"));`
`515`	`516`	`}`
`516`	`517`	`}`
`517`	`518`
`@@ -539,8 +540,8 @@ void testUpdateAll() {`
`539`	`540`	`assertThat(rows).isEqualTo(7);`
`540`	`541`
`541`	`542`	`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"));`
`544`	`545`	`}`
`545`	`546`	`}`
`546`	`547`
`@@ -569,8 +570,8 @@ void testUpdateSelective() {`
`569`	`570`	`assertThat(rows).isEqualTo(1);`
`570`	`571`
`571`	`572`	`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"));`
`574`	`575`	`}`
`575`	`576`	`}`
`576`	`577`