Skip to content

Commit 55f7c39

Browse files
committed
[ci] More direct returns to save on GC
1 parent 7b8f2ea commit 55f7c39

19 files changed

+23
-49
lines changed

src/test/java/org/apache/ibatis/domain/blog/Author.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,7 @@ public int hashCode() {
134134
result = 31 * result + (password != null ? password.hashCode() : 0);
135135
result = 31 * result + (email != null ? email.hashCode() : 0);
136136
result = 31 * result + (bio != null ? bio.hashCode() : 0);
137-
result = 31 * result + (favouriteSection != null ? favouriteSection.hashCode() : 0);
138-
return result;
137+
return 31 * result + (favouriteSection != null ? favouriteSection.hashCode() : 0);
139138
}
140139

141140
@Override

src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthor.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ public boolean equals(Object o) {
7070
public int hashCode() {
7171
int myresult = theComplexImmutableAuthorId != null ? theComplexImmutableAuthorId.hashCode() : 0;
7272
myresult = 31 * myresult + (bio != null ? bio.hashCode() : 0);
73-
myresult = 31 * myresult + (favouriteSection != null ? favouriteSection.hashCode() : 0);
74-
return myresult;
73+
return 31 * myresult + (favouriteSection != null ? favouriteSection.hashCode() : 0);
7574
}
7675
}

src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthorId.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ public int hashCode() {
7676
int myresult = id;
7777
myresult = 31 * myresult + (email != null ? email.hashCode() : 0);
7878
myresult = 31 * myresult + (username != null ? username.hashCode() : 0);
79-
myresult = 31 * myresult + (password != null ? password.hashCode() : 0);
80-
return myresult;
79+
return 31 * myresult + (password != null ? password.hashCode() : 0);
8180
}
8281
}

src/test/java/org/apache/ibatis/domain/blog/ImmutableAuthor.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,7 @@ public int hashCode() {
101101
result = 31 * result + (password != null ? password.hashCode() : 0);
102102
result = 31 * result + (email != null ? email.hashCode() : 0);
103103
result = 31 * result + (bio != null ? bio.hashCode() : 0);
104-
result = 31 * result + (favouriteSection != null ? favouriteSection.hashCode() : 0);
105-
return result;
104+
return 31 * result + (favouriteSection != null ? favouriteSection.hashCode() : 0);
106105
}
107106

108107
@Override

src/test/java/org/apache/ibatis/domain/blog/PostLite.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ public boolean equals(Object o) {
6767
@Override
6868
public int hashCode() {
6969
int myresult = theId != null ? theId.hashCode() : 0;
70-
myresult = 31 * myresult + blogId;
71-
return myresult;
70+
return 31 * myresult + blogId;
7271
}
7372
}

src/test/java/org/apache/ibatis/domain/jpetstore/Cart.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,9 @@ public Item removeItemById(String itemId) {
6464
CartItem cartItem = itemMap.remove(itemId);
6565
if (cartItem == null) {
6666
return null;
67-
} else {
68-
itemList.remove(cartItem);
69-
return cartItem.getItem();
7067
}
68+
itemList.remove(cartItem);
69+
return cartItem.getItem();
7170
}
7271

7372
public void incrementQuantityByItemId(String itemId) {

src/test/java/org/apache/ibatis/domain/misc/CustomBeanWrapperFactory.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ public class CustomBeanWrapperFactory implements ObjectWrapperFactory {
2525
public boolean hasWrapperFor(Object object) {
2626
if (object instanceof Author) {
2727
return true;
28-
} else {
29-
return false;
3028
}
29+
return false;
3130
}
3231

3332
@Override

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ public class Person {
2525
public Person getAncestor() {
2626
if (getParent() == null) {
2727
return this;
28-
} else {
29-
return getParent().getAncestor();
3028
}
29+
return getParent().getAncestor();
3130
}
3231

3332
@Override

src/test/java/org/apache/ibatis/submitted/column_prefix/ColumnPrefixAutoMappingTest.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,12 @@
2525
class ColumnPrefixAutoMappingTest extends ColumnPrefixTest {
2626
@Override
2727
protected List<Pet> getPetAndRoom(SqlSession sqlSession) {
28-
List<Pet> pets = sqlSession.selectList("org.apache.ibatis.submitted.column_prefix.MapperAutoMapping.selectPets");
29-
return pets;
28+
return sqlSession.selectList("org.apache.ibatis.submitted.column_prefix.MapperAutoMapping.selectPets");
3029
}
3130

3231
@Override
3332
protected List<Person> getPersons(SqlSession sqlSession) {
34-
List<Person> list = sqlSession
35-
.selectList("org.apache.ibatis.submitted.column_prefix.MapperAutoMapping.selectPersons");
36-
return list;
33+
return sqlSession.selectList("org.apache.ibatis.submitted.column_prefix.MapperAutoMapping.selectPersons");
3734
}
3835

3936
@Override

src/test/java/org/apache/ibatis/submitted/column_prefix/ColumnPrefixNestedQueryTest.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,12 @@
2222
class ColumnPrefixNestedQueryTest extends ColumnPrefixTest {
2323
@Override
2424
protected List<Pet> getPetAndRoom(SqlSession sqlSession) {
25-
List<Pet> pets = sqlSession.selectList("org.apache.ibatis.submitted.column_prefix.MapperNestedQuery.selectPets");
26-
return pets;
25+
return sqlSession.selectList("org.apache.ibatis.submitted.column_prefix.MapperNestedQuery.selectPets");
2726
}
2827

2928
@Override
3029
protected List<Person> getPersons(SqlSession sqlSession) {
31-
List<Person> list = sqlSession
32-
.selectList("org.apache.ibatis.submitted.column_prefix.MapperNestedQuery.selectPersons");
33-
return list;
30+
return sqlSession.selectList("org.apache.ibatis.submitted.column_prefix.MapperNestedQuery.selectPersons");
3431
}
3532

3633
@Override

0 commit comments

Comments
 (0)