Merge pull request #1598 from yangfancoming/master

remove redundant code...

Author: kazuki43zoo

src/test/java/org/apache/ibatis/session/SqlSessionTest.java

@@ -189,11 +189,9 @@ void shouldSelectCountOfPosts() {
 
   @Test
   void shouldEnsureThatBothEarlyAndLateResolutionOfNesteDiscriminatorsResolesToUseNestedResultSetHandler() {
-    try (SqlSession session = sqlMapper.openSession()) {
       Configuration configuration = sqlMapper.getConfiguration();
       assertTrue(configuration.getResultMap("org.apache.ibatis.domain.blog.mappers.BlogMapper.earlyNestedDiscriminatorPost").hasNestedResultMaps());
       assertTrue(configuration.getResultMap("org.apache.ibatis.domain.blog.mappers.BlogMapper.lateNestedDiscriminatorPost").hasNestedResultMaps());
-    }
   }
 
   @Test

src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/CglibNPETest.java

@@ -104,14 +104,13 @@ void testInsertBetweenTwoSelects() {
     try (SqlSession sqlSession = sqlSessionFactory.openSession()){
       PersonMapper personMapper = sqlSession.getMapper(PersonMapper.class);
       Person selected1 = personMapper.selectById(1);
-      Person selected2 = personMapper.selectById(2);
-      Person selected3 = personMapper.selectById(3);
       selected1.setId(4L);
       int rows = personMapper.insertPerson(selected1);
       Assertions.assertEquals(1, rows);
+
       selected1 = personMapper.selectById(1);
-      selected2 = personMapper.selectById(2);
-      selected3 = personMapper.selectById(3);
+      Person selected2 = personMapper.selectById(2);
+      Person selected3 = personMapper.selectById(3);
       Person selected4 = personMapper.selectById(4);
       Assertions.assertEquals(1, selected1.getId().longValue());
       Assertions.assertEquals(2, selected2.getId().longValue());

src/test/java/org/apache/ibatis/submitted/foreach_map/NestedBeanMapEntry.java

@@ -15,6 +15,8 @@
  */
 package org.apache.ibatis.submitted.foreach_map;
 
+import java.util.Objects;
+
 public class NestedBeanMapEntry {
   public NestedBeanMapEntry() {
   }
@@ -67,13 +69,13 @@ public boolean equals(Object o) {
 
     NestedBeanMapEntry map3Entry = (NestedBeanMapEntry) o;
 
-    if (keya != null ? !keya.equals(map3Entry.keya) : map3Entry.keya != null)
+    if (! Objects.equals(keya, map3Entry.keya))
       return false;
-    if (keyb != null ? !keyb.equals(map3Entry.keyb) : map3Entry.keyb != null)
+    if (! Objects.equals(keyb, map3Entry.keyb))
       return false;
-    if (valuea != null ? !valuea.equals(map3Entry.valuea) : map3Entry.valuea != null)
+    if (! Objects.equals(valuea, map3Entry.valuea))
       return false;
-    if (valueb != null ? !valueb.equals(map3Entry.valueb) : map3Entry.valueb != null)
+    if (! Objects.equals(valueb, map3Entry.valueb))
       return false;
 
     return true;