Skip to content

Commit 8809a8c

Browse files
jeffgbutlerjeffgbutler
committed
More "record" to "row" fixes for Sonar warnings
1 parent deb1815 commit 8809a8c

File tree

8 files changed

+77
-76
lines changed

8 files changed

+77
-76
lines changed

‎src/test/java/examples/generated/always/mybatis/GeneratedAlwaysMapper.java

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -100,37 +100,37 @@ default int insertMultiple(Collection<GeneratedAlwaysRecord> records) {
100100
);
101101
}
102102

103-
default int insertSelective(GeneratedAlwaysRecord record) {
104-
return MyBatis3Utils.insert(this::insert, record, generatedAlways, c ->
105-
c.map(id).toPropertyWhenPresent("id", record::getId)
106-
.map(firstName).toPropertyWhenPresent("firstName", record::getFirstName)
107-
.map(lastName).toPropertyWhenPresent("lastName", record::getLastName)
103+
default int insertSelective(GeneratedAlwaysRecord row) {
104+
return MyBatis3Utils.insert(this::insert, row, generatedAlways, c ->
105+
c.map(id).toPropertyWhenPresent("id", row::getId)
106+
.map(firstName).toPropertyWhenPresent("firstName", row::getFirstName)
107+
.map(lastName).toPropertyWhenPresent("lastName", row::getLastName)
108108
);
109109
}
110110

111111
default int update(UpdateDSLCompleter completer) {
112112
return MyBatis3Utils.update(this::update, generatedAlways, completer);
113113
}
114114

115-
default int updateByPrimaryKey(GeneratedAlwaysRecord record) {
115+
default int updateByPrimaryKey(GeneratedAlwaysRecord row) {
116116
return update(c ->
117-
c.set(firstName).equalTo(record::getFirstName)
118-
.set(lastName).equalTo(record::getLastName)
119-
.where(id, isEqualTo(record::getId))
117+
c.set(firstName).equalTo(row::getFirstName)
118+
.set(lastName).equalTo(row::getLastName)
119+
.where(id, isEqualTo(row::getId))
120120
);
121121
}
122122

123-
default int updateByPrimaryKeySelective(GeneratedAlwaysRecord record) {
123+
default int updateByPrimaryKeySelective(GeneratedAlwaysRecord row) {
124124
return update(c ->
125-
c.set(firstName).equalToWhenPresent(record::getFirstName)
126-
.set(lastName).equalToWhenPresent(record::getLastName)
127-
.where(id, isEqualTo(record::getId))
125+
c.set(firstName).equalToWhenPresent(row::getFirstName)
126+
.set(lastName).equalToWhenPresent(row::getLastName)
127+
.where(id, isEqualTo(row::getId))
128128
);
129129
}
130130

131-
static UpdateDSL<UpdateModel> updateSelectiveColumns(GeneratedAlwaysRecord record, UpdateDSL<UpdateModel> dsl) {
132-
return dsl.set(id).equalToWhenPresent(record::getId)
133-
.set(firstName).equalToWhenPresent(record::getFirstName)
134-
.set(lastName).equalToWhenPresent(record::getLastName);
131+
static UpdateDSL<UpdateModel> updateSelectiveColumns(GeneratedAlwaysRecord row, UpdateDSL<UpdateModel> dsl) {
132+
return dsl.set(id).equalToWhenPresent(row::getId)
133+
.set(firstName).equalToWhenPresent(row::getFirstName)
134+
.set(lastName).equalToWhenPresent(row::getLastName);
135135
}
136136
}

‎src/test/java/examples/generated/always/mybatis/PersonMapper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ default int insertSelect(InsertSelectStatementProvider insertSelectStatement, Ge
7474
return insertSelectMultiple(insertSelectStatement.getInsertStatement(), insertSelectStatement.getParameters(), keys);
7575
}
7676

77-
default int insert(PersonRecord record) {
78-
return MyBatis3Utils.insert(this::insert, record, person, c ->
77+
default int insert(PersonRecord row) {
78+
return MyBatis3Utils.insert(this::insert, row, person, c ->
7979
c.map(firstName).toProperty("firstName")
8080
.map(lastName).toProperty("lastName"));
8181
}

‎src/test/java/examples/schema_supplier/UserMapper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ default List<User> select(SelectDSLCompleter completer) {
4545
return MyBatis3Utils.selectList(this::selectMany, BasicColumn.columnList(id, name), user, completer);
4646
}
4747

48-
default int insert(User record) {
49-
return insert(SqlBuilder.insert(record)
48+
default int insert(User row) {
49+
return insert(SqlBuilder.insert(row)
5050
.into(user)
5151
.map(id).toProperty("id")
5252
.map(name).toProperty("name")

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

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ default int generalInsert(UnaryOperator<GeneralInsertDSL> completer) {
100100
return MyBatis3Utils.generalInsert(this::generalInsert, person, completer);
101101
}
102102

103-
default int insert(PersonRecord record) {
104-
return MyBatis3Utils.insert(this::insert, record, person, c ->
103+
default int insert(PersonRecord row) {
104+
return MyBatis3Utils.insert(this::insert, row, person, c ->
105105
c.map(id).toProperty("id")
106106
.map(firstName).toProperty("firstName")
107107
.map(lastName).toProperty("lastName")
@@ -128,15 +128,15 @@ default int insertMultiple(Collection<PersonRecord> records) {
128128
);
129129
}
130130

131-
default int insertSelective(PersonRecord record) {
132-
return MyBatis3Utils.insert(this::insert, record, person, c ->
133-
c.map(id).toPropertyWhenPresent("id", record::getId)
134-
.map(firstName).toPropertyWhenPresent("firstName", record::getFirstName)
135-
.map(lastName).toPropertyWhenPresent("lastName", record::getLastName)
136-
.map(birthDate).toPropertyWhenPresent("birthDate", record::getBirthDate)
137-
.map(employed).toPropertyWhenPresent("employed", record::getEmployed)
138-
.map(occupation).toPropertyWhenPresent("occupation", record::getOccupation)
139-
.map(addressId).toPropertyWhenPresent("addressId", record::getAddressId)
131+
default int insertSelective(PersonRecord row) {
132+
return MyBatis3Utils.insert(this::insert, row, person, c ->
133+
c.map(id).toPropertyWhenPresent("id", row::getId)
134+
.map(firstName).toPropertyWhenPresent("firstName", row::getFirstName)
135+
.map(lastName).toPropertyWhenPresent("lastName", row::getLastName)
136+
.map(birthDate).toPropertyWhenPresent("birthDate", row::getBirthDate)
137+
.map(employed).toPropertyWhenPresent("employed", row::getEmployed)
138+
.map(occupation).toPropertyWhenPresent("occupation", row::getOccupation)
139+
.map(addressId).toPropertyWhenPresent("addressId", row::getAddressId)
140140
);
141141
}
142142

@@ -162,49 +162,49 @@ default int update(UpdateDSLCompleter completer) {
162162
return MyBatis3Utils.update(this::update, person, completer);
163163
}
164164

165-
static UpdateDSL<UpdateModel> updateAllColumns(PersonRecord record,
165+
static UpdateDSL<UpdateModel> updateAllColumns(PersonRecord row,
166166
UpdateDSL<UpdateModel> dsl) {
167-
return dsl.set(id).equalTo(record::getId)
168-
.set(firstName).equalTo(record::getFirstName)
169-
.set(lastName).equalTo(record::getLastName)
170-
.set(birthDate).equalTo(record::getBirthDate)
171-
.set(employed).equalTo(record::getEmployed)
172-
.set(occupation).equalTo(record::getOccupation)
173-
.set(addressId).equalTo(record::getAddressId);
167+
return dsl.set(id).equalTo(row::getId)
168+
.set(firstName).equalTo(row::getFirstName)
169+
.set(lastName).equalTo(row::getLastName)
170+
.set(birthDate).equalTo(row::getBirthDate)
171+
.set(employed).equalTo(row::getEmployed)
172+
.set(occupation).equalTo(row::getOccupation)
173+
.set(addressId).equalTo(row::getAddressId);
174174
}
175175

176-
static UpdateDSL<UpdateModel> updateSelectiveColumns(PersonRecord record,
176+
static UpdateDSL<UpdateModel> updateSelectiveColumns(PersonRecord row,
177177
UpdateDSL<UpdateModel> dsl) {
178-
return dsl.set(id).equalToWhenPresent(record::getId)
179-
.set(firstName).equalToWhenPresent(record::getFirstName)
180-
.set(lastName).equalToWhenPresent(record::getLastName)
181-
.set(birthDate).equalToWhenPresent(record::getBirthDate)
182-
.set(employed).equalToWhenPresent(record::getEmployed)
183-
.set(occupation).equalToWhenPresent(record::getOccupation)
184-
.set(addressId).equalToWhenPresent(record::getAddressId);
178+
return dsl.set(id).equalToWhenPresent(row::getId)
179+
.set(firstName).equalToWhenPresent(row::getFirstName)
180+
.set(lastName).equalToWhenPresent(row::getLastName)
181+
.set(birthDate).equalToWhenPresent(row::getBirthDate)
182+
.set(employed).equalToWhenPresent(row::getEmployed)
183+
.set(occupation).equalToWhenPresent(row::getOccupation)
184+
.set(addressId).equalToWhenPresent(row::getAddressId);
185185
}
186186

187-
default int updateByPrimaryKey(PersonRecord record) {
187+
default int updateByPrimaryKey(PersonRecord row) {
188188
return update(c ->
189-
c.set(firstName).equalTo(record::getFirstName)
190-
.set(lastName).equalTo(record::getLastName)
191-
.set(birthDate).equalTo(record::getBirthDate)
192-
.set(employed).equalTo(record::getEmployed)
193-
.set(occupation).equalTo(record::getOccupation)
194-
.set(addressId).equalTo(record::getAddressId)
195-
.where(id, isEqualTo(record::getId))
189+
c.set(firstName).equalTo(row::getFirstName)
190+
.set(lastName).equalTo(row::getLastName)
191+
.set(birthDate).equalTo(row::getBirthDate)
192+
.set(employed).equalTo(row::getEmployed)
193+
.set(occupation).equalTo(row::getOccupation)
194+
.set(addressId).equalTo(row::getAddressId)
195+
.where(id, isEqualTo(row::getId))
196196
);
197197
}
198198

199-
default int updateByPrimaryKeySelective(PersonRecord record) {
199+
default int updateByPrimaryKeySelective(PersonRecord row) {
200200
return update(c ->
201-
c.set(firstName).equalToWhenPresent(record::getFirstName)
202-
.set(lastName).equalToWhenPresent(record::getLastName)
203-
.set(birthDate).equalToWhenPresent(record::getBirthDate)
204-
.set(employed).equalToWhenPresent(record::getEmployed)
205-
.set(occupation).equalToWhenPresent(record::getOccupation)
206-
.set(addressId).equalToWhenPresent(record::getAddressId)
207-
.where(id, isEqualTo(record::getId))
201+
c.set(firstName).equalToWhenPresent(row::getFirstName)
202+
.set(lastName).equalToWhenPresent(row::getLastName)
203+
.set(birthDate).equalToWhenPresent(row::getBirthDate)
204+
.set(employed).equalToWhenPresent(row::getEmployed)
205+
.set(occupation).equalToWhenPresent(row::getOccupation)
206+
.set(addressId).equalToWhenPresent(row::getAddressId)
207+
.where(id, isEqualTo(row::getId))
208208
);
209209
}
210210
}

‎src/test/java/examples/springbatch/bulkinsert/BulkInsertConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public MyBatisBatchItemWriter<PersonRecord> writer(SqlSessionFactory sqlSessionF
8989
MyBatisBatchItemWriter<PersonRecord> writer = new MyBatisBatchItemWriter<>();
9090
writer.setSqlSessionFactory(sqlSessionFactory);
9191

92-
writer.setItemToParameterConverter(record -> InsertDSL.insert(record)
92+
writer.setItemToParameterConverter(row -> InsertDSL.insert(row)
9393
.into(PersonDynamicSqlSupport.person)
9494
.map(firstName).toProperty("firstName")
9595
.map(lastName).toProperty("lastName")

‎src/test/java/issues/gh324/NameTableMapper.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ default Optional<NameRecord> selectByPrimaryKey(Integer id_) {
5555
);
5656
}
5757

58-
default int insert(NameRecord record) {
59-
return MyBatis3Utils.insert(this::insert, record, nameTable, c ->
58+
default int insert(NameRecord row) {
59+
return MyBatis3Utils.insert(this::insert, row, nameTable, c ->
6060
c.map(id).toProperty("id")
6161
.map(name).toProperty("name")
6262
);
@@ -66,10 +66,10 @@ default int update(UpdateDSLCompleter completer) {
6666
return MyBatis3Utils.update(this::update, nameTable, completer);
6767
}
6868

69-
default int updateByPrimaryKey(NameRecord record) {
69+
default int updateByPrimaryKey(NameRecord row) {
7070
return update(c ->
71-
c.set(name).equalTo(record::getName)
72-
.where(id, isEqualTo(record::getId))
71+
c.set(name).equalTo(row::getName)
72+
.where(id, isEqualTo(row::getId))
7373
);
7474
}
7575

‎src/test/java/issues/gh324/TestUtils.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
import static org.assertj.core.api.Assertions.assertThat;
1919

2020
public class TestUtils {
21-
public static void recordIsFred(NameRecord record) {
22-
assertThat(record.getId()).isEqualTo(1);
23-
assertThat(record.getName()).isEqualTo("Fred");
21+
public static void recordIsFred(NameRecord row) {
22+
assertThat(row.getId()).isEqualTo(1);
23+
assertThat(row.getName()).isEqualTo("Fred");
2424
}
2525

26-
public static void recordIsBarney(NameRecord record) {
27-
assertThat(record.getId()).isEqualTo(1);
28-
assertThat(record.getName()).isEqualTo("Barney");
26+
public static void recordIsBarney(NameRecord row) {
27+
assertThat(row.getId()).isEqualTo(1);
28+
assertThat(row.getName()).isEqualTo("Barney");
2929
}
3030
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,7 @@ static class DeprecatedCount<T> implements BindableColumn<T> {
316316
private String alias;
317317

318318
@Override
319+
@Deprecated
319320
public String renderWithTableAlias(TableAliasCalculator tableAliasCalculator) {
320321
return "count(*)";
321322
}

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy