From 9b07b0c86319fef10d4cbd1ff0e0bd94d239242e Mon Sep 17 00:00:00 2001
From: Jeff Butler <jeffgbutler@gmail.com>
Date: Tue, 16 Apr 2024 11:46:44 -0400
Subject: [PATCH] Fix Modernizer Nags

---
 .../examples/simple/PersonMapperTest.java     | 27 ++++++++++---------
 .../examples/spring/PersonTemplateTest.java   | 27 +++++++++----------
 .../mybatis/dynamic/sql/InvalidSQLTest.java   | 12 ++++-----
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/test/java/examples/simple/PersonMapperTest.java b/src/test/java/examples/simple/PersonMapperTest.java
index f81fdc1d2..3a8ee5b85 100644
--- 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
index 28175559a..6142e7450 100644
--- 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
index ca27911df..acaff0b4f 100644
--- 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