Polishing

jeffgbutler · jeffgbutler · commit 5f498fa80735 · 2024-06-01T12:59:42.000-04:00
diff --git a/src/test/java/examples/paging/LimitAndOffsetAdapter.java b/src/test/java/examples/paging/LimitAndOffsetAdapter.java
@@ -28,13 +28,13 @@
  * This adapter modifies the generated SQL by adding a LIMIT and OFFSET clause at the end
  * of the generated SQL.  This can be used to create a paginated query.
  *
- * LIMIT and OFFSET has limited support in relational databases, so this cannot be considered
+ * <p>LIMIT and OFFSET has limited support in relational databases, so this cannot be considered
  * a general solution for all paginated queries (and that is why this adapter lives only in the
  * test source tree and is not packaged with the core library code).
  *
- * I believe it works in MySQL, HSQLDB, and Postgres.
+ * <p>I believe it works in MySQL, HSQLDB, and Postgres.
  *
- * <b>Important Note: </b> this adapter is no longer required for limit and offset support as the
+ * <p><b>Important Note: </b> this adapter is no longer required for limit and offset support as the
  * library now supports limit and offset natively. However, this remains a good example of altering the generated
  * SQL before it is executed.
  *
diff --git a/src/test/java/examples/simple/LastName.java b/src/test/java/examples/simple/LastName.java
@@ -50,10 +50,7 @@ public boolean equals(Object obj) {
             return false;
         LastName other = (LastName) obj;
         if (name == null) {
-            if (other.name != null)
-                return false;
-        } else if (!name.equals(other.name))
-            return false;
-        return true;
+            return other.name == null;
+        } else return name.equals(other.name);
     }
 }
diff --git a/src/test/java/examples/spring/LastName.java b/src/test/java/examples/spring/LastName.java
@@ -50,10 +50,7 @@ public boolean equals(Object obj) {
             return false;
         LastName other = (LastName) obj;
         if (name == null) {
-            if (other.name != null)
-                return false;
-        } else if (!name.equals(other.name))
-            return false;
-        return true;
+            return other.name == null;
+        } else return name.equals(other.name);
     }
 }
diff --git a/src/test/java/examples/springbatch/bulkinsert/TestRecordGenerator.java b/src/test/java/examples/springbatch/bulkinsert/TestRecordGenerator.java
@@ -23,7 +23,7 @@ public class TestRecordGenerator implements ItemReader<PersonRecord> {
 
     private int index = 0;
 
-    private static PersonRecord[] testRecords = {
+    private static final PersonRecord[] testRecords = {
             new PersonRecord("Fred", "Flintstone"),
             new PersonRecord("Wilma", "Flintstone"),
             new PersonRecord("Pebbles", "Flintstone"),
diff --git a/src/test/java/issues/gh100/README.md b/src/test/java/issues/gh100/README.md
@@ -1,5 +1,9 @@
 # About these Tests
 
-GitHub issues 100 and 102 exposed issues where calling the `build()` method at an unexpected location caused the rendered SQL to be incorrect. Changes for this issue now allow for the `build()` method to be called on any intermediate object in the select statement chain * regardless if further operations have been performed * and consistent renderings will occur.
+GitHub issues 100 and 102 exposed issues where calling the `build()` method at an unexpected location caused the
+rendered SQL to be incorrect. Changes for this issue now allow for the `build()` method to be called on any
+intermediate object in the select statement chain regardless if further operations have been performed and
+consistent renderings will occur.
 
-Tests in this directory cover many of the possible places where a `build()` method could be called and many of the possible paths through a select statement.
+Tests in this directory cover many of the possible places where a `build()` method could be called and many of the
+possible paths through a select statement.
diff --git a/src/test/java/issues/gh324/NameService.java b/src/test/java/issues/gh324/NameService.java
@@ -40,6 +40,7 @@ public NameService() {
         try {
             Class.forName(JDBC_DRIVER);
             InputStream is = getClass().getResourceAsStream("/issues/gh324/CreateDB.sql");
+            assert is != null;
             try (Connection connection = DriverManager.getConnection(JDBC_URL, "sa", "")) {
                 ScriptRunner sr = new ScriptRunner(connection);
                 sr.setLogWriter(null);

Original file line number	Diff line number	Diff line change
`@@ -28,13 +28,13 @@`
`28`	`28`	`* This adapter modifies the generated SQL by adding a LIMIT and OFFSET clause at the end`
`29`	`29`	`* of the generated SQL. This can be used to create a paginated query.`
`30`	`30`	`*`
`31`		`- * LIMIT and OFFSET has limited support in relational databases, so this cannot be considered`
	`31`	`+ * <p>LIMIT and OFFSET has limited support in relational databases, so this cannot be considered`
`32`	`32`	`* a general solution for all paginated queries (and that is why this adapter lives only in the`
`33`	`33`	`* test source tree and is not packaged with the core library code).`
`34`	`34`	`*`
`35`		`- * I believe it works in MySQL, HSQLDB, and Postgres.`
	`35`	`+ * <p>I believe it works in MySQL, HSQLDB, and Postgres.`
`36`	`36`	`*`
`37`		`- * <b>Important Note: </b> this adapter is no longer required for limit and offset support as the`
	`37`	`+ * <p><b>Important Note: </b> this adapter is no longer required for limit and offset support as the`
`38`	`38`	`* library now supports limit and offset natively. However, this remains a good example of altering the generated`
`39`	`39`	`* SQL before it is executed.`
`40`	`40`	`*`
Original file line number	Diff line number	Diff line change
`@@ -50,10 +50,7 @@ public boolean equals(Object obj) {`
`50`	`50`	`return false;`
`51`	`51`	`LastName other = (LastName) obj;`
`52`	`52`	`if (name == null) {`
`53`		`- if (other.name != null)`
`54`		`- return false;`
`55`		`- } else if (!name.equals(other.name))`
`56`		`- return false;`
`57`		`- return true;`
	`53`	`+ return other.name == null;`
	`54`	`+ } else return name.equals(other.name);`
`58`	`55`	`}`
`59`	`56`	`}`