Merge pull request #3344 from hazendaz/pom-cleanup

hazendaz · web-flow · commit 7788c291ab2b · 2024-12-28T20:04:30.000-05:00
Further cleanup of tests
diff --git a/src/test/java/org/apache/ibatis/domain/blog/Author.java b/src/test/java/org/apache/ibatis/domain/blog/Author.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -121,8 +121,7 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result;
-    result = id;
+    int result = id;
     result = 31 * result + (username != null ? username.hashCode() : 0);
     result = 31 * result + (password != null ? password.hashCode() : 0);
     result = 31 * result + (email != null ? email.hashCode() : 0);
diff --git a/src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthor.java b/src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthor.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -52,7 +52,7 @@ public boolean equals(Object o) {
 
     final ComplexImmutableAuthor that = (ComplexImmutableAuthor) o;
 
-    if ((bio != null ? !bio.equals(that.bio) : that.bio != null) || (favouriteSection != that.favouriteSection)
+    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
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@ public boolean equals(Object o) {
 
     final ComplexImmutableAuthorId that = (ComplexImmutableAuthorId) o;
 
-    if ((id != that.id) || (email != null ? !email.equals(that.email) : that.email != 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
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -88,8 +88,7 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result;
-    result = id;
+    int result = id;
     result = 31 * result + (username != null ? username.hashCode() : 0);
     result = 31 * result + (password != null ? password.hashCode() : 0);
     result = 31 * result + (email != null ? email.hashCode() : 0);
diff --git a/src/test/java/org/apache/ibatis/domain/blog/PostLite.java b/src/test/java/org/apache/ibatis/domain/blog/PostLite.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -54,7 +54,7 @@ public boolean equals(Object o) {
 
     final PostLite that = (PostLite) o;
 
-    if ((blogId != that.blogId) || (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/loader/SerializableProxyTest.java b/src/test/java/org/apache/ibatis/executor/loader/SerializableProxyTest.java
@@ -15,7 +15,6 @@
  */
 package org.apache.ibatis.executor.loader;
 
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.fail;
diff --git a/src/test/java/org/apache/ibatis/mapping/VendorDatabaseIdProviderTest.java b/src/test/java/org/apache/ibatis/mapping/VendorDatabaseIdProviderTest.java
@@ -15,7 +15,9 @@
  */
 package org.apache.ibatis.mapping;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
diff --git a/src/test/java/org/apache/ibatis/reflection/ArrayUtilTest.java b/src/test/java/org/apache/ibatis/reflection/ArrayUtilTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -27,8 +27,7 @@ class ArrayUtilTest {
 
   @Test
   void testHashCode() {
-    Object arr;
-    arr = new long[] { 1 };
+    Object arr = new long[] { 1 };
     assertEquals(Arrays.hashCode((long[]) arr), ArrayUtil.hashCode(arr));
     arr = new int[] { 1 };
     assertEquals(Arrays.hashCode((int[]) arr), ArrayUtil.hashCode(arr));
@@ -84,8 +83,7 @@ void testequals() {
 
   @Test
   void testToString() {
-    Object arr;
-    arr = new long[] { 1 };
+    Object arr = new long[] { 1 };
     assertEquals(Arrays.toString((long[]) arr), ArrayUtil.toString(arr));
     arr = new int[] { 1 };
     assertEquals(Arrays.toString((int[]) arr), ArrayUtil.toString(arr));
diff --git a/src/test/java/org/apache/ibatis/reflection/property/PropertyTokenizerTest.java b/src/test/java/org/apache/ibatis/reflection/property/PropertyTokenizerTest.java
@@ -16,7 +16,10 @@
 package org.apache.ibatis.reflection.property;
 
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/org/apache/ibatis/reflection/wrapper/BeanWrapperTest.java b/src/test/java/org/apache/ibatis/reflection/wrapper/BeanWrapperTest.java
@@ -15,7 +15,12 @@
  */
 package org.apache.ibatis.reflection.wrapper;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/test/java/org/apache/ibatis/reflection/wrapper/BeanWrapperUnitTest.java b/src/test/java/org/apache/ibatis/reflection/wrapper/BeanWrapperUnitTest.java
@@ -17,7 +17,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/test/java/org/apache/ibatis/reflection/wrapper/MapWrapperTest.java b/src/test/java/org/apache/ibatis/reflection/wrapper/MapWrapperTest.java
@@ -15,7 +15,12 @@
  */
 package org.apache.ibatis.reflection.wrapper;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.Arrays;
 import java.util.HashMap;
diff --git a/src/test/java/org/apache/ibatis/reflection/wrapper/MapWrapperUnitTest.java b/src/test/java/org/apache/ibatis/reflection/wrapper/MapWrapperUnitTest.java
@@ -17,7 +17,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
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
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ public boolean equals(Object obj) {
     if (this == obj) {
       return true;
     }
-    if ((obj == null) || (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/cursor_cache_oom/CursorOomTest.java b/src/test/java/org/apache/ibatis/submitted/cursor_cache_oom/CursorOomTest.java
@@ -69,8 +69,7 @@ private static List<Cursor<?>> getCursors(SqlSession sqlSession) throws NoSuchFi
     DefaultSqlSession session = (DefaultSqlSession) sqlSession;
     Field cursorListField = DefaultSqlSession.class.getDeclaredField("cursorList");
     cursorListField.setAccessible(true);
-    List<Cursor<?>> cursorList = (List<Cursor<?>>) cursorListField.get(session);
-    return cursorList;
+    return (List<Cursor<?>>) cursorListField.get(session);
   }
 
   @Test
diff --git a/src/test/java/org/apache/ibatis/submitted/cursor_simple/CursorSimpleTest.java b/src/test/java/org/apache/ibatis/submitted/cursor_simple/CursorSimpleTest.java
@@ -412,8 +412,7 @@ void shouldNullItemNotStopIteration() {
       // next() has not been called, index is still -1
       Assertions.assertEquals(-1, cursor.getCurrentIndex());
 
-      User user;
-      user = iterator.next();
+      User user = iterator.next();
       Assertions.assertNull(user);
       Assertions.assertEquals(0, cursor.getCurrentIndex());
 
@@ -455,8 +454,7 @@ void shouldRowBoundsCountNullItem() {
       Assertions.assertTrue(cursor.isOpen());
       Assertions.assertFalse(cursor.isConsumed());
 
-      User user;
-      user = iterator.next();
+      User user = iterator.next();
       Assertions.assertEquals("Kate", user.getName());
       Assertions.assertEquals(1, cursor.getCurrentIndex());
 
diff --git a/src/test/java/org/apache/ibatis/submitted/discriminator/Contract.java b/src/test/java/org/apache/ibatis/submitted/discriminator/Contract.java
@@ -20,7 +20,6 @@ public class Contract {
   private Owner owner;
 
   public Contract(Integer id, Owner owner) {
-    super();
     this.id = id;
     this.owner = owner;
   }
diff --git a/src/test/java/org/apache/ibatis/submitted/discriminator/Owner.java b/src/test/java/org/apache/ibatis/submitted/discriminator/Owner.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -21,11 +21,9 @@ public class Owner {
   private Vehicle vehicle;
 
   public Owner() {
-    super();
   }
 
   public Owner(Integer id, Vehicle vehicle) {
-    super();
     this.id = id;
     this.vehicle = vehicle;
   }
diff --git a/src/test/java/org/apache/ibatis/submitted/enum_with_method/Mood.java b/src/test/java/org/apache/ibatis/submitted/enum_with_method/Mood.java
@@ -31,7 +31,7 @@ public String getMessage() {
 
   private int value;
 
-  private Mood(int value) {
+  Mood(int value) {
     this.value = value;
   }
 
diff --git a/src/test/java/org/apache/ibatis/submitted/primitive_result_type/PrimitiveResultTypeTest.java b/src/test/java/org/apache/ibatis/submitted/primitive_result_type/PrimitiveResultTypeTest.java
@@ -42,7 +42,7 @@ void shouldReturnProperPrimitiveType() {
     }
     List<Long> lcodes = ProductDAO.selectProductCodesL();
     for (Object lcode : lcodes) {
-      assertFalse((lcode instanceof Integer));
+      assertFalse(lcode instanceof Integer);
     }
     List<BigDecimal> bcodes = ProductDAO.selectProductCodesB();
     for (Object bcode : bcodes) {
diff --git a/src/test/java/org/apache/ibatis/submitted/unmatched_prop_type/User.java b/src/test/java/org/apache/ibatis/submitted/unmatched_prop_type/User.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@ public class User {
   private Birthday dob;
 
   public User(String id, String name) {
-    super();
     this.id = Integer.valueOf(id);
     this.name = name;
   }
diff --git a/src/test/java/org/apache/ibatis/transaction/jdbc/JdbcTransactionFactoryUnitTest.java b/src/test/java/org/apache/ibatis/transaction/jdbc/JdbcTransactionFactoryUnitTest.java
@@ -15,7 +15,10 @@
  */
 package org.apache.ibatis.transaction.jdbc;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
diff --git a/src/test/java/org/apache/ibatis/transaction/jdbc/JdbcTransactionWithConnectionTest.java b/src/test/java/org/apache/ibatis/transaction/jdbc/JdbcTransactionWithConnectionTest.java
@@ -17,7 +17,9 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import java.sql.Connection;
 import java.sql.SQLException;
diff --git a/src/test/java/org/apache/ibatis/transaction/jdbc/JdbcTransactionWithDataSourceTest.java b/src/test/java/org/apache/ibatis/transaction/jdbc/JdbcTransactionWithDataSourceTest.java
@@ -17,7 +17,9 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import java.sql.Connection;
 import java.sql.SQLException;
diff --git a/src/test/java/org/apache/ibatis/transaction/managed/ManagedTransactionFactoryUnitTest.java b/src/test/java/org/apache/ibatis/transaction/managed/ManagedTransactionFactoryUnitTest.java
@@ -15,7 +15,10 @@
  */
 package org.apache.ibatis.transaction.managed;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
diff --git a/src/test/java/org/apache/ibatis/transaction/managed/ManagedTransactionWithConnectionTest.java b/src/test/java/org/apache/ibatis/transaction/managed/ManagedTransactionWithConnectionTest.java
@@ -45,6 +45,7 @@ void setup() {
     this.transaction = new ManagedTransaction(connection, true);
   }
 
+  @Override
   @Test
   void shouldGetConnection() throws SQLException {
     Connection result = transaction.getConnection();
diff --git a/src/test/java/org/apache/ibatis/transaction/managed/ManagedTransactionWithDataSourceTest.java b/src/test/java/org/apache/ibatis/transaction/managed/ManagedTransactionWithDataSourceTest.java
@@ -17,7 +17,9 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -50,6 +52,7 @@ void setup() {
     this.transaction = new ManagedTransaction(dataSource, TransactionIsolationLevel.READ_COMMITTED, true);
   }
 
+  @Override
   @Test
   void shouldGetConnection() throws SQLException {
     when(dataSource.getConnection()).thenReturn(connection);

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2009-2023 the original author or authors.`
	`2`	`+ * Copyright 2009-2024 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -54,7 +54,7 @@ public boolean equals(Object o) {`
`54`	`54`
`55`	`55`	`final PostLite that = (PostLite) o;`
`56`	`56`
`57`		`- if ((blogId != that.blogId) \|\| (theId != null ? !theId.equals(that.theId) : that.theId != null)) {`
	`57`	`+ if (blogId != that.blogId \|\| (theId != null ? !theId.equals(that.theId) : that.theId != null)) {`
`58`	`58`	`return false;`
`59`	`59`	`}`
`60`	`60`