[ci] Various small items cleaning up assignments

hazendaz · hazendaz · commit b1bc2e092ce8 · 2023-02-20T18:09:46.000-05:00
diff --git a/src/test/java/org/apache/ibatis/cache/SoftCacheTest.java b/src/test/java/org/apache/ibatis/cache/SoftCacheTest.java
@@ -34,7 +34,7 @@ void shouldDemonstrateObjectsBeingCollectedAsNeeded() {
       byte[] array = new byte[5001]; // waste a bunch of memory
       array[5000] = 1;
       cache.putObject(i, array);
-      Object value = cache.getObject(i);
+      cache.getObject(i);
       if (cache.getSize() < i + 1) {
         // System.out.println("Cache exceeded with " + (i + 1) + " entries.");
         break;
diff --git a/src/test/java/org/apache/ibatis/cache/SuperCacheTest.java b/src/test/java/org/apache/ibatis/cache/SuperCacheTest.java
@@ -47,7 +47,7 @@ void shouldDemonstrate5LevelSuperCacheHandlesLotsOfEntriesWithoutCrashing() {
       cache.putObject(i, i);
       ((TransactionalCache) cache).commit();
       Object o = cache.getObject(i);
-      assertTrue(o == null || i == ((Integer) o));
+      assertTrue(o == null || i == (Integer) o);
     }
     assertTrue(cache.getSize() < N);
   }
diff --git a/src/test/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSourceTest.java b/src/test/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSourceTest.java
@@ -31,8 +31,8 @@ class UnpooledDataSourceTest {
   @Test
   void shouldNotRegisterTheSameDriverMultipleTimes() throws Exception {
     // https://github.com/mybatis/old-google-code-issues/issues/430
-    UnpooledDataSource dataSource = null;
-    dataSource = new UnpooledDataSource("org.hsqldb.jdbcDriver", "jdbc:hsqldb:mem:multipledrivers", "sa", "");
+    UnpooledDataSource dataSource = new UnpooledDataSource("org.hsqldb.jdbcDriver", "jdbc:hsqldb:mem:multipledrivers",
+        "sa", "");
     dataSource.getConnection().close();
     int before = countRegisteredDrivers();
     dataSource = new UnpooledDataSource("org.hsqldb.jdbcDriver", "jdbc:hsqldb:mem:multipledrivers", "sa", "");
@@ -44,12 +44,10 @@ void shouldNotRegisterTheSameDriverMultipleTimes() throws Exception {
   @Test
   void shouldRegisterDynamicallyLoadedDriver() throws Exception {
     int before = countRegisteredDrivers();
-    ClassLoader driverClassLoader = null;
-    UnpooledDataSource dataSource = null;
-    driverClassLoader = new URLClassLoader(
+    ClassLoader driverClassLoader = new URLClassLoader(
         new URL[] { new URL("jar:file:/PATH_TO/mysql-connector-java-5.1.25.jar!/") });
-    dataSource = new UnpooledDataSource(driverClassLoader, "com.mysql.jdbc.Driver", "jdbc:mysql://127.0.0.1/test",
-        "root", "");
+    UnpooledDataSource dataSource = new UnpooledDataSource(driverClassLoader, "com.mysql.jdbc.Driver",
+        "jdbc:mysql://127.0.0.1/test", "root", "");
     dataSource.getConnection().close();
     assertEquals(before + 1, countRegisteredDrivers());
     driverClassLoader = new URLClassLoader(
diff --git a/src/test/java/org/apache/ibatis/domain/blog/Author.java b/src/test/java/org/apache/ibatis/domain/blog/Author.java
@@ -103,16 +103,9 @@ public boolean equals(Object o) {
 
     Author author = (Author) o;
 
-    if (id != author.id) {
-      return false;
-    }
-    if (bio != null ? !bio.equals(author.bio) : author.bio != null) {
-      return false;
-    }
-    if (email != null ? !email.equals(author.email) : author.email != null) {
-      return false;
-    }
-    if (password != null ? !password.equals(author.password) : author.password != null) {
+    if ((id != author.id) || (bio != null ? !bio.equals(author.bio) : author.bio != null)
+        || (email != null ? !email.equals(author.email) : author.email != null)
+        || (password != null ? !password.equals(author.password) : author.password != null)) {
       return false;
     }
     if (username != null ? !username.equals(author.username) : author.username != null) {
diff --git a/src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthor.java b/src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthor.java
@@ -52,14 +52,9 @@ public boolean equals(Object o) {
 
     final ComplexImmutableAuthor that = (ComplexImmutableAuthor) o;
 
-    if (bio != null ? !bio.equals(that.bio) : that.bio != null) {
-      return false;
-    }
-    if (favouriteSection != that.favouriteSection) {
-      return false;
-    }
-    if (theComplexImmutableAuthorId != null ? !theComplexImmutableAuthorId.equals(that.theComplexImmutableAuthorId)
-        : that.theComplexImmutableAuthorId != null) {
+    if ((bio != null ? !bio.equals(that.bio) : that.bio != null) || (favouriteSection != that.favouriteSection)
+        || (theComplexImmutableAuthorId != null ? !theComplexImmutableAuthorId.equals(that.theComplexImmutableAuthorId)
+            : that.theComplexImmutableAuthorId != null)) {
       return false;
     }
 
diff --git a/src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthorId.java b/src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthorId.java
@@ -55,16 +55,9 @@ public boolean equals(Object o) {
 
     final ComplexImmutableAuthorId that = (ComplexImmutableAuthorId) o;
 
-    if (id != that.id) {
-      return false;
-    }
-    if (email != null ? !email.equals(that.email) : that.email != null) {
-      return false;
-    }
-    if (password != null ? !password.equals(that.password) : that.password != null) {
-      return false;
-    }
-    if (username != null ? !username.equals(that.username) : that.username != null) {
+    if ((id != that.id) || (email != null ? !email.equals(that.email) : that.email != null)
+        || (password != null ? !password.equals(that.password) : that.password != null)
+        || (username != null ? !username.equals(that.username) : that.username != null)) {
       return false;
     }
 
diff --git a/src/test/java/org/apache/ibatis/domain/blog/ImmutableAuthor.java b/src/test/java/org/apache/ibatis/domain/blog/ImmutableAuthor.java
@@ -70,16 +70,9 @@ public boolean equals(Object o) {
 
     Author author = (Author) o;
 
-    if (id != author.id) {
-      return false;
-    }
-    if (bio != null ? !bio.equals(author.bio) : author.bio != null) {
-      return false;
-    }
-    if (email != null ? !email.equals(author.email) : author.email != null) {
-      return false;
-    }
-    if (password != null ? !password.equals(author.password) : author.password != null) {
+    if ((id != author.id) || (bio != null ? !bio.equals(author.bio) : author.bio != null)
+        || (email != null ? !email.equals(author.email) : author.email != null)
+        || (password != null ? !password.equals(author.password) : author.password != null)) {
       return false;
     }
     if (username != null ? !username.equals(author.username) : author.username != null) {
diff --git a/src/test/java/org/apache/ibatis/domain/blog/PostLite.java b/src/test/java/org/apache/ibatis/domain/blog/PostLite.java
@@ -54,10 +54,7 @@ public boolean equals(Object o) {
 
     final PostLite that = (PostLite) o;
 
-    if (blogId != that.blogId) {
-      return false;
-    }
-    if (theId != null ? !theId.equals(that.theId) : that.theId != null) {
+    if ((blogId != that.blogId) || (theId != null ? !theId.equals(that.theId) : that.theId != null)) {
       return false;
     }
 
diff --git a/src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java b/src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java
@@ -167,7 +167,7 @@ void shouldInsertNewAuthorByProc() throws Exception {
       Author author = new Author(97, "someone", "******", "someone@apache.org", null, null);
       MappedStatement insertStatement = ExecutorTestHelper.prepareInsertAuthorProc(config);
       MappedStatement selectStatement = ExecutorTestHelper.prepareSelectOneAuthorMappedStatement(config);
-      int rows = executor.update(insertStatement, author);
+      executor.update(insertStatement, author);
       List<Author> authors = executor.query(selectStatement, 97, RowBounds.DEFAULT, Executor.NO_RESULT_HANDLER);
       executor.flushStatements();
       executor.rollback(true);
diff --git a/src/test/java/org/apache/ibatis/executor/loader/SerializableProxyTest.java b/src/test/java/org/apache/ibatis/executor/loader/SerializableProxyTest.java
@@ -25,7 +25,6 @@
 import java.io.ObjectOutputStream;
 import java.io.ObjectStreamException;
 import java.io.Serializable;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 
 import org.apache.ibatis.domain.blog.Author;
@@ -128,7 +127,7 @@ void shouldGenerateWriteReplace() throws Exception {
     }
     Object proxy = proxyFactory.createProxy(author, new ResultLoaderMap(), new Configuration(),
         new DefaultObjectFactory(), new ArrayList<>(), new ArrayList<>());
-    Method m = proxy.getClass().getDeclaredMethod("writeReplace");
+    proxy.getClass().getDeclaredMethod("writeReplace");
   }
 
   @Test
diff --git a/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java b/src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java
@@ -25,7 +25,6 @@
 
 import org.apache.ibatis.BaseDataTest;
 import org.apache.ibatis.datasource.pooled.PooledDataSource;
-import org.hsqldb.jdbc.JDBCConnection;
 import org.junit.jupiter.api.Test;
 
 class PooledDataSourceTest extends BaseDataTest {
@@ -84,7 +83,7 @@ void shouldNotFailCallingToStringOverAnInvalidConnection() throws Exception {
   void ShouldReturnRealConnection() throws Exception {
     PooledDataSource ds = createPooledDataSource(JPETSTORE_PROPERTIES);
     Connection c = ds.getConnection();
-    JDBCConnection realConnection = (JDBCConnection) PooledDataSource.unwrapConnection(c);
+    PooledDataSource.unwrapConnection(c);
     c.close();
   }
 
diff --git a/src/test/java/org/apache/ibatis/submitted/constructor_columnprefix/EntityKey.java b/src/test/java/org/apache/ibatis/submitted/constructor_columnprefix/EntityKey.java
@@ -39,10 +39,7 @@ public boolean equals(Object obj) {
     if (this == obj) {
       return true;
     }
-    if (obj == null) {
-      return false;
-    }
-    if (getClass() != obj.getClass()) {
+    if ((obj == null) || (getClass() != obj.getClass())) {
       return false;
     }
     EntityKey other = (EntityKey) obj;
diff --git a/src/test/java/org/apache/ibatis/submitted/extendresultmap/TestModel.java b/src/test/java/org/apache/ibatis/submitted/extendresultmap/TestModel.java
@@ -58,10 +58,7 @@ public boolean equals(Object obj) {
     if (this == obj) {
       return true;
     }
-    if (obj == null) {
-      return false;
-    }
-    if (getClass() != obj.getClass()) {
+    if ((obj == null) || (getClass() != obj.getClass())) {
       return false;
     }
     TestModel other = (TestModel) obj;
diff --git a/src/test/java/org/apache/ibatis/submitted/foreach_map/IntBoolMapEntry.java b/src/test/java/org/apache/ibatis/submitted/foreach_map/IntBoolMapEntry.java
@@ -51,10 +51,8 @@ public boolean equals(Object o) {
 
     IntBoolMapEntry mapEntry = (IntBoolMapEntry) o;
 
-    if (key != null ? !key.equals(mapEntry.key) : mapEntry.key != null) {
-      return false;
-    }
-    if (value != null ? !value.equals(mapEntry.value) : mapEntry.value != null) {
+    if ((key != null ? !key.equals(mapEntry.key) : mapEntry.key != null)
+        || (value != null ? !value.equals(mapEntry.value) : mapEntry.value != null)) {
       return false;
     }
 
diff --git a/src/test/java/org/apache/ibatis/submitted/foreach_map/NestedBeanMapEntry.java b/src/test/java/org/apache/ibatis/submitted/foreach_map/NestedBeanMapEntry.java
@@ -71,16 +71,8 @@ public boolean equals(Object o) {
 
     NestedBeanMapEntry map3Entry = (NestedBeanMapEntry) o;
 
-    if (!Objects.equals(keya, map3Entry.keya)) {
-      return false;
-    }
-    if (!Objects.equals(keyb, map3Entry.keyb)) {
-      return false;
-    }
-    if (!Objects.equals(valuea, map3Entry.valuea)) {
-      return false;
-    }
-    if (!Objects.equals(valueb, map3Entry.valueb)) {
+    if (!Objects.equals(keya, map3Entry.keya) || !Objects.equals(keyb, map3Entry.keyb)
+        || !Objects.equals(valuea, map3Entry.valuea) || !Objects.equals(valueb, map3Entry.valueb)) {
       return false;
     }
 
diff --git a/src/test/java/org/apache/ibatis/submitted/foreach_map/StringStringMapEntry.java b/src/test/java/org/apache/ibatis/submitted/foreach_map/StringStringMapEntry.java
@@ -51,10 +51,8 @@ public boolean equals(Object o) {
 
     StringStringMapEntry mapEntry = (StringStringMapEntry) o;
 
-    if (key != null ? !key.equals(mapEntry.key) : mapEntry.key != null) {
-      return false;
-    }
-    if (value != null ? !value.equals(mapEntry.value) : mapEntry.value != null) {
+    if ((key != null ? !key.equals(mapEntry.key) : mapEntry.key != null)
+        || (value != null ? !value.equals(mapEntry.value) : mapEntry.value != null)) {
       return false;
     }
 
diff --git a/src/test/java/org/apache/ibatis/submitted/includes/IncludeTest.java b/src/test/java/org/apache/ibatis/submitted/includes/IncludeTest.java
@@ -16,7 +16,6 @@
 package org.apache.ibatis.submitted.includes;
 
 import java.io.Reader;
-import java.util.Map;
 
 import org.apache.ibatis.BaseDataTest;
 import org.apache.ibatis.io.Resources;
@@ -54,8 +53,7 @@ void testIncludes() {
   @Test
   void testParametrizedIncludes() {
     try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
-      final Map<String, Object> result = sqlSession.selectOne("org.apache.ibatis.submitted.includes.mapper.select");
-      // Assertions.assertEquals(Integer.valueOf(1), result);
+      sqlSession.selectOne("org.apache.ibatis.submitted.includes.mapper.select");
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ void shouldDemonstrate5LevelSuperCacheHandlesLotsOfEntriesWithoutCrashing() {`
`47`	`47`	`cache.putObject(i, i);`
`48`	`48`	`((TransactionalCache) cache).commit();`
`49`	`49`	`Object o = cache.getObject(i);`
`50`		`- assertTrue(o == null \|\| i == ((Integer) o));`
	`50`	`+ assertTrue(o == null \|\| i == (Integer) o);`
`51`	`51`	`}`
`52`	`52`	`assertTrue(cache.getSize() < N);`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,10 +54,7 @@ public boolean equals(Object o) {`
`54`	`54`
`55`	`55`	`final PostLite that = (PostLite) o;`
`56`	`56`
`57`		`- if (blogId != that.blogId) {`
`58`		`- return false;`
`59`		`- }`
`60`		`- if (theId != null ? !theId.equals(that.theId) : that.theId != null) {`
	`57`	`+ if ((blogId != that.blogId) \|\| (theId != null ? !theId.equals(that.theId) : that.theId != null)) {`
`61`	`58`	`return false;`
`62`	`59`	`}`
`63`	`60`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@`
`25`	`25`	`import java.io.ObjectOutputStream;`
`26`	`26`	`import java.io.ObjectStreamException;`
`27`	`27`	`import java.io.Serializable;`
`28`		`-import java.lang.reflect.Method;`
`29`	`28`	`import java.util.ArrayList;`
`30`	`29`
`31`	`30`	`import org.apache.ibatis.domain.blog.Author;`
`@@ -128,7 +127,7 @@ void shouldGenerateWriteReplace() throws Exception {`
`128`	`127`	`}`
`129`	`128`	`Object proxy = proxyFactory.createProxy(author, new ResultLoaderMap(), new Configuration(),`
`130`	`129`	`new DefaultObjectFactory(), new ArrayList<>(), new ArrayList<>());`
`131`		`- Method m = proxy.getClass().getDeclaredMethod("writeReplace");`
	`130`	`+ proxy.getClass().getDeclaredMethod("writeReplace");`
`132`	`131`	`}`
`133`	`132`
`134`	`133`	`@Test`