Skip to content

Commit cb05e7c

Browse files
jeffgbutlerjeffgbutler
committed
Use List builder when possible
1 parent eaf951c commit cb05e7c

File tree

8 files changed

+60
-96
lines changed

8 files changed

+60
-96
lines changed

‎src/test/java/examples/emptywhere/EmptyWhereTest.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,7 @@ static List<Variation> baseVariations() {
5656

5757
Variation v4 = new Variation(null, null, "");
5858

59-
List<Variation> answer = new ArrayList<>();
60-
answer.add(v1);
61-
answer.add(v2);
62-
answer.add(v3);
63-
answer.add(v4);
64-
return answer;
59+
return List.of(v1, v2, v3, v4);
6560
}
6661

6762
static Stream<Variation> whereVariations() {

‎src/test/java/examples/simple/MyBatisMapToRowTest.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,7 @@ void testInsertMultiple() {
109109
try (SqlSession session = sqlSessionFactory.openSession()) {
110110
CompoundKeyMapper mapper = session.getMapper(CompoundKeyMapper.class);
111111

112-
List<Integer> integers = new ArrayList<>();
113-
integers.add(1);
114-
integers.add(2);
115-
integers.add(3);
112+
List<Integer> integers = List.of(1, 2, 3);
116113

117114
MultiRowInsertStatementProvider<Integer> insertStatement = insertMultiple(integers)
118115
.into(compoundKey)
@@ -142,10 +139,7 @@ void testInsertBatch() {
142139
try (SqlSession session = sqlSessionFactory.openSession(ExecutorType.BATCH)) {
143140
CompoundKeyMapper mapper = session.getMapper(CompoundKeyMapper.class);
144141

145-
List<Integer> integers = new ArrayList<>();
146-
integers.add(1);
147-
integers.add(2);
148-
integers.add(3);
142+
List<Integer> integers = List.of(1, 2, 3);
149143

150144
BatchInsert<Integer> insertStatement = insertBatch(integers)
151145
.into(compoundKey)

‎src/test/java/examples/simple/PersonMapperTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,7 @@ void testFirstNameIn() {
253253

254254
@Test
255255
void testOrderByCollection() {
256-
Collection<SortSpecification> orderByColumns = new ArrayList<>();
257-
orderByColumns.add(firstName);
256+
Collection<SortSpecification> orderByColumns = List.of(firstName);
258257

259258
try (SqlSession session = sqlSessionFactory.openSession()) {
260259
PersonMapper mapper = session.getMapper(PersonMapper.class);

‎src/test/java/examples/spring/SpringMapToRowTest.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,7 @@ void testInsertOne() {
7474

7575
@Test
7676
void testInsertMultiple() {
77-
List<Integer> integers = new ArrayList<>();
78-
integers.add(1);
79-
integers.add(2);
80-
integers.add(3);
77+
List<Integer> integers = List.of(1, 2, 3);
8178

8279
MultiRowInsertStatementProvider<Integer> insertStatement = insertMultiple(integers)
8380
.into(compoundKey)
@@ -102,10 +99,7 @@ void testInsertMultiple() {
10299

103100
@Test
104101
void testInsertBatch() {
105-
List<Integer> integers = new ArrayList<>();
106-
integers.add(1);
107-
integers.add(2);
108-
integers.add(3);
102+
List<Integer> integers = List.of(1, 2, 3);
109103

110104
BatchInsert<Integer> insertStatement = insertBatch(integers)
111105
.into(compoundKey)

‎src/test/java/issues/gh430/NoInitialConditionTest.java

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import static org.mybatis.dynamic.sql.SqlBuilder.*;
2020
import static org.mybatis.dynamic.sql.subselect.FooDynamicSqlSupport.*;
2121

22-
import java.util.ArrayList;
22+
import java.util.Collections;
2323
import java.util.Date;
2424
import java.util.List;
2525

@@ -32,7 +32,7 @@ class NoInitialConditionTest {
3232

3333
@Test
3434
void testNoInitialConditionEmptyList() {
35-
List<AndOrCriteriaGroup> criteria = new ArrayList<>();
35+
List<AndOrCriteriaGroup> criteria = Collections.emptyList();
3636

3737
SelectStatementProvider selectStatement = buildSelectStatement(criteria);
3838

@@ -43,8 +43,7 @@ void testNoInitialConditionEmptyList() {
4343

4444
@Test
4545
void testNoInitialConditionSingleSub() {
46-
List<AndOrCriteriaGroup> criteria = new ArrayList<>();
47-
criteria.add(or(column2, isEqualTo(3)));
46+
List<AndOrCriteriaGroup> criteria = List.of(or(column2, isEqualTo(3)));
4847

4948
SelectStatementProvider selectStatement = buildSelectStatement(criteria);
5049

@@ -56,10 +55,10 @@ void testNoInitialConditionSingleSub() {
5655

5756
@Test
5857
void testNoInitialConditionMultipleSubs() {
59-
List<AndOrCriteriaGroup> criteria = new ArrayList<>();
60-
criteria.add(or(column2, isEqualTo(3)));
61-
criteria.add(or(column2, isEqualTo(4)));
62-
criteria.add(or(column2, isEqualTo(5)));
58+
List<AndOrCriteriaGroup> criteria = List.of(
59+
or(column2, isEqualTo(3)),
60+
or(column2, isEqualTo(4)),
61+
or(column2, isEqualTo(5)));
6362

6463
SelectStatementProvider selectStatement = buildSelectStatement(criteria);
6564

@@ -71,10 +70,10 @@ void testNoInitialConditionMultipleSubs() {
7170

7271
@Test
7372
void testNoInitialConditionWhereMultipleSubs() {
74-
List<AndOrCriteriaGroup> criteria = new ArrayList<>();
75-
criteria.add(or(column2, isEqualTo(3)));
76-
criteria.add(or(column2, isEqualTo(4)));
77-
criteria.add(or(column2, isEqualTo(5)));
73+
List<AndOrCriteriaGroup> criteria = List.of(
74+
or(column2, isEqualTo(3)),
75+
or(column2, isEqualTo(4)),
76+
or(column2, isEqualTo(5)));
7877

7978
SelectStatementProvider selectStatement = select(column1, column2)
8079
.from(foo)
@@ -90,10 +89,10 @@ void testNoInitialConditionWhereMultipleSubs() {
9089

9190
@Test
9291
void testNoInitialConditionWhereNotMultipleSubs() {
93-
List<AndOrCriteriaGroup> criteria = new ArrayList<>();
94-
criteria.add(or(column2, isEqualTo(3)));
95-
criteria.add(or(column2, isEqualTo(4)));
96-
criteria.add(or(column2, isEqualTo(5)));
92+
List<AndOrCriteriaGroup> criteria = List.of(
93+
or(column2, isEqualTo(3)),
94+
or(column2, isEqualTo(4)),
95+
or(column2, isEqualTo(5)));
9796

9897
SelectStatementProvider selectStatement = select(column1, column2)
9998
.from(foo)
@@ -110,10 +109,10 @@ void testNoInitialConditionWhereNotMultipleSubs() {
110109

111110
@Test
112111
void testNoInitialConditionWhereGroupMultipleSubs() {
113-
List<AndOrCriteriaGroup> criteria = new ArrayList<>();
114-
criteria.add(or(column2, isEqualTo(3)));
115-
criteria.add(or(column2, isEqualTo(4)));
116-
criteria.add(or(column2, isEqualTo(5)));
112+
List<AndOrCriteriaGroup> criteria = List.of(
113+
or(column2, isEqualTo(3)),
114+
or(column2, isEqualTo(4)),
115+
or(column2, isEqualTo(5)));
117116

118117
SelectStatementProvider selectStatement = select(column1, column2)
119118
.from(foo)
@@ -130,10 +129,10 @@ void testNoInitialConditionWhereGroupMultipleSubs() {
130129

131130
@Test
132131
void testNoInitialConditionWhereCCAndMultipleSubs() {
133-
List<AndOrCriteriaGroup> criteria = new ArrayList<>();
134-
criteria.add(or(column2, isEqualTo(3)));
135-
criteria.add(or(column2, isEqualTo(4)));
136-
criteria.add(or(column2, isEqualTo(5)));
132+
List<AndOrCriteriaGroup> criteria = List.of(
133+
or(column2, isEqualTo(3)),
134+
or(column2, isEqualTo(4)),
135+
or(column2, isEqualTo(5)));
137136

138137
SelectStatementProvider selectStatement = select(column1, column2)
139138
.from(foo)
@@ -149,10 +148,10 @@ void testNoInitialConditionWhereCCAndMultipleSubs() {
149148

150149
@Test
151150
void testNoInitialConditionWhereCCOrMultipleSubs() {
152-
List<AndOrCriteriaGroup> criteria = new ArrayList<>();
153-
criteria.add(or(column2, isEqualTo(3)));
154-
criteria.add(or(column2, isEqualTo(4)));
155-
criteria.add(or(column2, isEqualTo(5)));
151+
List<AndOrCriteriaGroup> criteria = List.of(
152+
or(column2, isEqualTo(3)),
153+
or(column2, isEqualTo(4)),
154+
or(column2, isEqualTo(5)));
156155

157156
SelectStatementProvider selectStatement = select(column1, column2)
158157
.from(foo)
@@ -168,10 +167,10 @@ void testNoInitialConditionWhereCCOrMultipleSubs() {
168167

169168
@Test
170169
void testNoInitialConditionWhereOrMultipleSubs() {
171-
List<AndOrCriteriaGroup> criteria = new ArrayList<>();
172-
criteria.add(or(column2, isEqualTo(3)));
173-
criteria.add(or(column2, isEqualTo(4)));
174-
criteria.add(or(column2, isEqualTo(5)));
170+
List<AndOrCriteriaGroup> criteria = List.of(
171+
or(column2, isEqualTo(3)),
172+
or(column2, isEqualTo(4)),
173+
or(column2, isEqualTo(5)));
175174

176175
SelectStatementProvider selectStatement = select(column1, column2)
177176
.from(foo)

‎src/test/java/org/mybatis/dynamic/sql/InvalidSQLTest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,7 @@ void testInvalidMultipleInsertStatementNoRecords() {
115115

116116
@Test
117117
void testInvalidMultipleInsertStatementNoMappings() {
118-
List<TestRow> records = new ArrayList<>();
119-
records.add(new TestRow());
118+
List<TestRow> records = List.of(new TestRow());
120119

121120
MultiRowInsertModel.Builder<TestRow> builder = new MultiRowInsertModel.Builder<TestRow>()
122121
.withRecords(records)
@@ -137,8 +136,7 @@ void testInvalidBatchInsertStatementNoRecords() {
137136

138137
@Test
139138
void testInvalidBatchInsertStatementNoMappings() {
140-
List<TestRow> records = new ArrayList<>();
141-
records.add(new TestRow());
139+
List<TestRow> records = List.of(new TestRow());
142140

143141
BatchInsertModel.Builder<TestRow> builder = new BatchInsertModel.Builder<TestRow>()
144142
.withRecords(records)

‎src/test/java/org/mybatis/dynamic/sql/insert/MapToRowTest.java

Lines changed: 20 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import static org.mybatis.dynamic.sql.SqlBuilder.insertMultiple;
2121

2222
import java.sql.JDBCType;
23-
import java.util.ArrayList;
2423
import java.util.List;
2524

2625
import org.junit.jupiter.api.Test;
@@ -37,10 +36,10 @@ class MapToRowTest {
3736

3837
@Test
3938
void testBasicInsertMultipleWithMyBatis() {
40-
List<Record> records = new ArrayList<>();
41-
records.add(new Record(33, 1));
42-
records.add(new Record(33, 2));
43-
records.add(new Record(33, 3));
39+
List<Record> records = List.of(
40+
new Record(33, 1),
41+
new Record(33, 2),
42+
new Record(33, 3));
4443

4544
MultiRowInsertStatementProvider<Record> insertStatement = insertMultiple(records)
4645
.into(foo)
@@ -55,10 +54,10 @@ void testBasicInsertMultipleWithMyBatis() {
5554

5655
@Test
5756
void testBasicInsertMultipleWithSpring() {
58-
List<Record> records = new ArrayList<>();
59-
records.add(new Record(33, 1));
60-
records.add(new Record(33, 2));
61-
records.add(new Record(33, 3));
57+
List<Record> records = List.of(
58+
new Record(33, 1),
59+
new Record(33, 2),
60+
new Record(33, 3));
6261

6362
MultiRowInsertStatementProvider<Record> insertStatement = insertMultiple(records)
6463
.into(foo)
@@ -73,10 +72,7 @@ void testBasicInsertMultipleWithSpring() {
7372

7473
@Test
7574
void testBasicInsertMultipleRowMappingWithMyBatis() {
76-
List<Integer> integers = new ArrayList<>();
77-
integers.add(1);
78-
integers.add(2);
79-
integers.add(3);
75+
List<Integer> integers = List.of(1, 2, 3);
8076

8177
MultiRowInsertStatementProvider<Integer> insertStatement = insertMultiple(integers)
8278
.into(foo)
@@ -91,10 +87,7 @@ void testBasicInsertMultipleRowMappingWithMyBatis() {
9187

9288
@Test
9389
void testBasicInsertMultipleRowMappingWithSpring() {
94-
List<Integer> integers = new ArrayList<>();
95-
integers.add(1);
96-
integers.add(2);
97-
integers.add(3);
90+
List<Integer> integers = List.of(1, 2, 3);
9891

9992
MultiRowInsertStatementProvider<Integer> insertStatement = insertMultiple(integers)
10093
.into(foo)
@@ -109,10 +102,10 @@ void testBasicInsertMultipleRowMappingWithSpring() {
109102

110103
@Test
111104
void testBatchInsertWithMyBatis() {
112-
List<Record> records = new ArrayList<>();
113-
records.add(new Record(33, 1));
114-
records.add(new Record(33, 2));
115-
records.add(new Record(33, 3));
105+
List<Record> records = List.of(
106+
new Record(33, 1),
107+
new Record(33, 2),
108+
new Record(33, 3));
116109

117110
BatchInsert<Record> batchInsert = insertBatch(records)
118111
.into(foo)
@@ -127,10 +120,10 @@ void testBatchInsertWithMyBatis() {
127120

128121
@Test
129122
void testBatchInsertWithSpring() {
130-
List<Record> records = new ArrayList<>();
131-
records.add(new Record(33, 1));
132-
records.add(new Record(33, 2));
133-
records.add(new Record(33, 3));
123+
List<Record> records = List.of(
124+
new Record(33, 1),
125+
new Record(33, 2),
126+
new Record(33, 3));
134127

135128
BatchInsert<Record> batchInsert = insertBatch(records)
136129
.into(foo)
@@ -145,10 +138,7 @@ void testBatchInsertWithSpring() {
145138

146139
@Test
147140
void testBatchInsertRowMappingWithMyBatis() {
148-
List<Integer> integers = new ArrayList<>();
149-
integers.add(1);
150-
integers.add(2);
151-
integers.add(3);
141+
List<Integer> integers = List.of(1, 2, 3);
152142

153143
BatchInsert<Integer> batchInsert = insertBatch(integers)
154144
.into(foo)
@@ -163,10 +153,7 @@ void testBatchInsertRowMappingWithMyBatis() {
163153

164154
@Test
165155
void testBatchInsertRowMappingWithSpring() {
166-
List<Integer> integers = new ArrayList<>();
167-
integers.add(1);
168-
integers.add(2);
169-
integers.add(3);
156+
List<Integer> integers = List.of(1, 2, 3);
170157

171158
BatchInsert<Integer> batchInsert = insertBatch(integers)
172159
.into(foo)

‎src/test/java/org/mybatis/dynamic/sql/select/SelectStatementTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,7 @@ void testOrderByMultipleColumns() {
180180

181181
@Test
182182
void testOrderByMultipleColumnsWithCollection() {
183-
Collection<SortSpecification> orderByColumns = new ArrayList<>();
184-
orderByColumns.add(column2.descending());
185-
orderByColumns.add(column1);
183+
Collection<SortSpecification> orderByColumns = List.of(column2.descending(), column1);
186184

187185
SelectStatementProvider selectStatement = select(column1.as("A_COLUMN1"), column2)
188186
.from(table, "a")

0 commit comments

Comments
 (0)