From 8809a8ca38e448334166623015dbbe24136d939d Mon Sep 17 00:00:00 2001 From: Jeff Butler Date: Mon, 3 Jun 2024 11:01:58 -0400 Subject: [PATCH] More "record" to "row" fixes for Sonar warnings --- .../always/mybatis/GeneratedAlwaysMapper.java | 34 ++++---- .../always/mybatis/PersonMapper.java | 4 +- .../examples/schema_supplier/UserMapper.java | 4 +- .../java/examples/simple/PersonMapper.java | 86 +++++++++---------- .../bulkinsert/BulkInsertConfiguration.java | 2 +- .../java/issues/gh324/NameTableMapper.java | 10 +-- src/test/java/issues/gh324/TestUtils.java | 12 +-- .../mybatis/dynamic/sql/InvalidSQLTest.java | 1 + 8 files changed, 77 insertions(+), 76 deletions(-) diff --git a/src/test/java/examples/generated/always/mybatis/GeneratedAlwaysMapper.java b/src/test/java/examples/generated/always/mybatis/GeneratedAlwaysMapper.java index fe65f9662..14be40643 100644 --- a/src/test/java/examples/generated/always/mybatis/GeneratedAlwaysMapper.java +++ b/src/test/java/examples/generated/always/mybatis/GeneratedAlwaysMapper.java @@ -100,11 +100,11 @@ default int insertMultiple(Collection records) { ); } - default int insertSelective(GeneratedAlwaysRecord record) { - return MyBatis3Utils.insert(this::insert, record, generatedAlways, c -> - c.map(id).toPropertyWhenPresent("id", record::getId) - .map(firstName).toPropertyWhenPresent("firstName", record::getFirstName) - .map(lastName).toPropertyWhenPresent("lastName", record::getLastName) + default int insertSelective(GeneratedAlwaysRecord row) { + return MyBatis3Utils.insert(this::insert, row, generatedAlways, c -> + c.map(id).toPropertyWhenPresent("id", row::getId) + .map(firstName).toPropertyWhenPresent("firstName", row::getFirstName) + .map(lastName).toPropertyWhenPresent("lastName", row::getLastName) ); } @@ -112,25 +112,25 @@ default int update(UpdateDSLCompleter completer) { return MyBatis3Utils.update(this::update, generatedAlways, completer); } - default int updateByPrimaryKey(GeneratedAlwaysRecord record) { + default int updateByPrimaryKey(GeneratedAlwaysRecord row) { return update(c -> - c.set(firstName).equalTo(record::getFirstName) - .set(lastName).equalTo(record::getLastName) - .where(id, isEqualTo(record::getId)) + c.set(firstName).equalTo(row::getFirstName) + .set(lastName).equalTo(row::getLastName) + .where(id, isEqualTo(row::getId)) ); } - default int updateByPrimaryKeySelective(GeneratedAlwaysRecord record) { + default int updateByPrimaryKeySelective(GeneratedAlwaysRecord row) { return update(c -> - c.set(firstName).equalToWhenPresent(record::getFirstName) - .set(lastName).equalToWhenPresent(record::getLastName) - .where(id, isEqualTo(record::getId)) + c.set(firstName).equalToWhenPresent(row::getFirstName) + .set(lastName).equalToWhenPresent(row::getLastName) + .where(id, isEqualTo(row::getId)) ); } - static UpdateDSL updateSelectiveColumns(GeneratedAlwaysRecord record, UpdateDSL dsl) { - return dsl.set(id).equalToWhenPresent(record::getId) - .set(firstName).equalToWhenPresent(record::getFirstName) - .set(lastName).equalToWhenPresent(record::getLastName); + static UpdateDSL updateSelectiveColumns(GeneratedAlwaysRecord row, UpdateDSL dsl) { + return dsl.set(id).equalToWhenPresent(row::getId) + .set(firstName).equalToWhenPresent(row::getFirstName) + .set(lastName).equalToWhenPresent(row::getLastName); } } diff --git a/src/test/java/examples/generated/always/mybatis/PersonMapper.java b/src/test/java/examples/generated/always/mybatis/PersonMapper.java index d709e4a4a..08058d17d 100644 --- a/src/test/java/examples/generated/always/mybatis/PersonMapper.java +++ b/src/test/java/examples/generated/always/mybatis/PersonMapper.java @@ -74,8 +74,8 @@ default int insertSelect(InsertSelectStatementProvider insertSelectStatement, Ge return insertSelectMultiple(insertSelectStatement.getInsertStatement(), insertSelectStatement.getParameters(), keys); } - default int insert(PersonRecord record) { - return MyBatis3Utils.insert(this::insert, record, person, c -> + default int insert(PersonRecord row) { + return MyBatis3Utils.insert(this::insert, row, person, c -> c.map(firstName).toProperty("firstName") .map(lastName).toProperty("lastName")); } diff --git a/src/test/java/examples/schema_supplier/UserMapper.java b/src/test/java/examples/schema_supplier/UserMapper.java index 540ab6fad..602ed49a3 100644 --- a/src/test/java/examples/schema_supplier/UserMapper.java +++ b/src/test/java/examples/schema_supplier/UserMapper.java @@ -45,8 +45,8 @@ default List select(SelectDSLCompleter completer) { return MyBatis3Utils.selectList(this::selectMany, BasicColumn.columnList(id, name), user, completer); } - default int insert(User record) { - return insert(SqlBuilder.insert(record) + default int insert(User row) { + return insert(SqlBuilder.insert(row) .into(user) .map(id).toProperty("id") .map(name).toProperty("name") diff --git a/src/test/java/examples/simple/PersonMapper.java b/src/test/java/examples/simple/PersonMapper.java index 3ccaa17e4..bb9560f75 100644 --- a/src/test/java/examples/simple/PersonMapper.java +++ b/src/test/java/examples/simple/PersonMapper.java @@ -100,8 +100,8 @@ default int generalInsert(UnaryOperator completer) { return MyBatis3Utils.generalInsert(this::generalInsert, person, completer); } - default int insert(PersonRecord record) { - return MyBatis3Utils.insert(this::insert, record, person, c -> + default int insert(PersonRecord row) { + return MyBatis3Utils.insert(this::insert, row, person, c -> c.map(id).toProperty("id") .map(firstName).toProperty("firstName") .map(lastName).toProperty("lastName") @@ -128,15 +128,15 @@ default int insertMultiple(Collection records) { ); } - default int insertSelective(PersonRecord record) { - return MyBatis3Utils.insert(this::insert, record, person, c -> - c.map(id).toPropertyWhenPresent("id", record::getId) - .map(firstName).toPropertyWhenPresent("firstName", record::getFirstName) - .map(lastName).toPropertyWhenPresent("lastName", record::getLastName) - .map(birthDate).toPropertyWhenPresent("birthDate", record::getBirthDate) - .map(employed).toPropertyWhenPresent("employed", record::getEmployed) - .map(occupation).toPropertyWhenPresent("occupation", record::getOccupation) - .map(addressId).toPropertyWhenPresent("addressId", record::getAddressId) + default int insertSelective(PersonRecord row) { + return MyBatis3Utils.insert(this::insert, row, person, c -> + c.map(id).toPropertyWhenPresent("id", row::getId) + .map(firstName).toPropertyWhenPresent("firstName", row::getFirstName) + .map(lastName).toPropertyWhenPresent("lastName", row::getLastName) + .map(birthDate).toPropertyWhenPresent("birthDate", row::getBirthDate) + .map(employed).toPropertyWhenPresent("employed", row::getEmployed) + .map(occupation).toPropertyWhenPresent("occupation", row::getOccupation) + .map(addressId).toPropertyWhenPresent("addressId", row::getAddressId) ); } @@ -162,49 +162,49 @@ default int update(UpdateDSLCompleter completer) { return MyBatis3Utils.update(this::update, person, completer); } - static UpdateDSL updateAllColumns(PersonRecord record, + static UpdateDSL updateAllColumns(PersonRecord row, UpdateDSL dsl) { - return dsl.set(id).equalTo(record::getId) - .set(firstName).equalTo(record::getFirstName) - .set(lastName).equalTo(record::getLastName) - .set(birthDate).equalTo(record::getBirthDate) - .set(employed).equalTo(record::getEmployed) - .set(occupation).equalTo(record::getOccupation) - .set(addressId).equalTo(record::getAddressId); + return dsl.set(id).equalTo(row::getId) + .set(firstName).equalTo(row::getFirstName) + .set(lastName).equalTo(row::getLastName) + .set(birthDate).equalTo(row::getBirthDate) + .set(employed).equalTo(row::getEmployed) + .set(occupation).equalTo(row::getOccupation) + .set(addressId).equalTo(row::getAddressId); } - static UpdateDSL updateSelectiveColumns(PersonRecord record, + static UpdateDSL updateSelectiveColumns(PersonRecord row, UpdateDSL dsl) { - return dsl.set(id).equalToWhenPresent(record::getId) - .set(firstName).equalToWhenPresent(record::getFirstName) - .set(lastName).equalToWhenPresent(record::getLastName) - .set(birthDate).equalToWhenPresent(record::getBirthDate) - .set(employed).equalToWhenPresent(record::getEmployed) - .set(occupation).equalToWhenPresent(record::getOccupation) - .set(addressId).equalToWhenPresent(record::getAddressId); + return dsl.set(id).equalToWhenPresent(row::getId) + .set(firstName).equalToWhenPresent(row::getFirstName) + .set(lastName).equalToWhenPresent(row::getLastName) + .set(birthDate).equalToWhenPresent(row::getBirthDate) + .set(employed).equalToWhenPresent(row::getEmployed) + .set(occupation).equalToWhenPresent(row::getOccupation) + .set(addressId).equalToWhenPresent(row::getAddressId); } - default int updateByPrimaryKey(PersonRecord record) { + default int updateByPrimaryKey(PersonRecord row) { return update(c -> - c.set(firstName).equalTo(record::getFirstName) - .set(lastName).equalTo(record::getLastName) - .set(birthDate).equalTo(record::getBirthDate) - .set(employed).equalTo(record::getEmployed) - .set(occupation).equalTo(record::getOccupation) - .set(addressId).equalTo(record::getAddressId) - .where(id, isEqualTo(record::getId)) + c.set(firstName).equalTo(row::getFirstName) + .set(lastName).equalTo(row::getLastName) + .set(birthDate).equalTo(row::getBirthDate) + .set(employed).equalTo(row::getEmployed) + .set(occupation).equalTo(row::getOccupation) + .set(addressId).equalTo(row::getAddressId) + .where(id, isEqualTo(row::getId)) ); } - default int updateByPrimaryKeySelective(PersonRecord record) { + default int updateByPrimaryKeySelective(PersonRecord row) { return update(c -> - c.set(firstName).equalToWhenPresent(record::getFirstName) - .set(lastName).equalToWhenPresent(record::getLastName) - .set(birthDate).equalToWhenPresent(record::getBirthDate) - .set(employed).equalToWhenPresent(record::getEmployed) - .set(occupation).equalToWhenPresent(record::getOccupation) - .set(addressId).equalToWhenPresent(record::getAddressId) - .where(id, isEqualTo(record::getId)) + c.set(firstName).equalToWhenPresent(row::getFirstName) + .set(lastName).equalToWhenPresent(row::getLastName) + .set(birthDate).equalToWhenPresent(row::getBirthDate) + .set(employed).equalToWhenPresent(row::getEmployed) + .set(occupation).equalToWhenPresent(row::getOccupation) + .set(addressId).equalToWhenPresent(row::getAddressId) + .where(id, isEqualTo(row::getId)) ); } } diff --git a/src/test/java/examples/springbatch/bulkinsert/BulkInsertConfiguration.java b/src/test/java/examples/springbatch/bulkinsert/BulkInsertConfiguration.java index 91b874579..2e27d3e30 100644 --- a/src/test/java/examples/springbatch/bulkinsert/BulkInsertConfiguration.java +++ b/src/test/java/examples/springbatch/bulkinsert/BulkInsertConfiguration.java @@ -89,7 +89,7 @@ public MyBatisBatchItemWriter writer(SqlSessionFactory sqlSessionF MyBatisBatchItemWriter writer = new MyBatisBatchItemWriter<>(); writer.setSqlSessionFactory(sqlSessionFactory); - writer.setItemToParameterConverter(record -> InsertDSL.insert(record) + writer.setItemToParameterConverter(row -> InsertDSL.insert(row) .into(PersonDynamicSqlSupport.person) .map(firstName).toProperty("firstName") .map(lastName).toProperty("lastName") diff --git a/src/test/java/issues/gh324/NameTableMapper.java b/src/test/java/issues/gh324/NameTableMapper.java index 4a6696427..1ba3d0428 100644 --- a/src/test/java/issues/gh324/NameTableMapper.java +++ b/src/test/java/issues/gh324/NameTableMapper.java @@ -55,8 +55,8 @@ default Optional selectByPrimaryKey(Integer id_) { ); } - default int insert(NameRecord record) { - return MyBatis3Utils.insert(this::insert, record, nameTable, c -> + default int insert(NameRecord row) { + return MyBatis3Utils.insert(this::insert, row, nameTable, c -> c.map(id).toProperty("id") .map(name).toProperty("name") ); @@ -66,10 +66,10 @@ default int update(UpdateDSLCompleter completer) { return MyBatis3Utils.update(this::update, nameTable, completer); } - default int updateByPrimaryKey(NameRecord record) { + default int updateByPrimaryKey(NameRecord row) { return update(c -> - c.set(name).equalTo(record::getName) - .where(id, isEqualTo(record::getId)) + c.set(name).equalTo(row::getName) + .where(id, isEqualTo(row::getId)) ); } diff --git a/src/test/java/issues/gh324/TestUtils.java b/src/test/java/issues/gh324/TestUtils.java index 4b6ec319e..cda71a260 100644 --- a/src/test/java/issues/gh324/TestUtils.java +++ b/src/test/java/issues/gh324/TestUtils.java @@ -18,13 +18,13 @@ import static org.assertj.core.api.Assertions.assertThat; public class TestUtils { - public static void recordIsFred(NameRecord record) { - assertThat(record.getId()).isEqualTo(1); - assertThat(record.getName()).isEqualTo("Fred"); + public static void recordIsFred(NameRecord row) { + assertThat(row.getId()).isEqualTo(1); + assertThat(row.getName()).isEqualTo("Fred"); } - public static void recordIsBarney(NameRecord record) { - assertThat(record.getId()).isEqualTo(1); - assertThat(record.getName()).isEqualTo("Barney"); + public static void recordIsBarney(NameRecord row) { + assertThat(row.getId()).isEqualTo(1); + assertThat(row.getName()).isEqualTo("Barney"); } } diff --git a/src/test/java/org/mybatis/dynamic/sql/InvalidSQLTest.java b/src/test/java/org/mybatis/dynamic/sql/InvalidSQLTest.java index acaff0b4f..4c7afc0b0 100644 --- a/src/test/java/org/mybatis/dynamic/sql/InvalidSQLTest.java +++ b/src/test/java/org/mybatis/dynamic/sql/InvalidSQLTest.java @@ -316,6 +316,7 @@ static class DeprecatedCount implements BindableColumn { private String alias; @Override + @Deprecated public String renderWithTableAlias(TableAliasCalculator tableAliasCalculator) { return "count(*)"; }