Skip to content

Commit 1acab1b

Browse files
committed
Sonar fixes
1 parent 066c1c5 commit 1acab1b

File tree

4 files changed

+10
-19
lines changed

4 files changed

+10
-19
lines changed

src/main/java/org/mybatis/dynamic/sql/select/SelectModel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929

3030
public class SelectModel extends AbstractSelectModel {
3131
private final List<QueryExpressionModel> queryExpressions;
32-
private @Nullable final String forClause;
33-
private @Nullable final String waitClause;
32+
private final @Nullable String forClause;
33+
private final @Nullable String waitClause;
3434

3535
private SelectModel(Builder builder) {
3636
super(builder);

src/test/java/examples/column/comparison/ColumnComparisonMapper.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import java.util.List;
1919

2020
import org.apache.ibatis.annotations.Result;
21-
import org.apache.ibatis.annotations.Results;
2221
import org.apache.ibatis.annotations.SelectProvider;
2322
import org.mybatis.dynamic.sql.select.SelectDSLCompleter;
2423
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
@@ -28,10 +27,8 @@
2827
public interface ColumnComparisonMapper {
2928

3029
@SelectProvider(type=SqlProviderAdapter.class, method="select")
31-
@Results({
32-
@Result(column="number1", property="number1", id=true),
33-
@Result(column="number2", property="number2", id=true)
34-
})
30+
@Result(column="number1", property="number1", id=true)
31+
@Result(column="number2", property="number2", id=true)
3532
List<ColumnComparisonRecord> selectMany(SelectStatementProvider selectStatement);
3633

3734
default List<ColumnComparisonRecord> select(SelectDSLCompleter completer) {

src/test/java/examples/joins/JoinMapper.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import org.apache.ibatis.annotations.Result;
2121
import org.apache.ibatis.annotations.ResultMap;
22-
import org.apache.ibatis.annotations.Results;
2322
import org.apache.ibatis.annotations.SelectProvider;
2423
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
2524
import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@@ -30,10 +29,8 @@ public interface JoinMapper {
3029
List<OrderMaster> selectMany(SelectStatementProvider selectStatement);
3130

3231
@SelectProvider(type=SqlProviderAdapter.class, method="select")
33-
@Results ({
34-
@Result(column="user_id", property="userId"),
35-
@Result(column="user_name", property="userName"),
36-
@Result(column="parent_id", property="parentId")
37-
})
32+
@Result(column="user_id", property="userId")
33+
@Result(column="user_name", property="userName")
34+
@Result(column="parent_id", property="parentId")
3835
List<User> selectUsers(SelectStatementProvider selectStatement);
3936
}

src/test/java/examples/springbatch/mapper/PersonMapper.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
import org.apache.ibatis.annotations.Mapper;
2222
import org.apache.ibatis.annotations.Result;
23-
import org.apache.ibatis.annotations.Results;
2423
import org.apache.ibatis.annotations.SelectProvider;
2524
import org.mybatis.dynamic.sql.util.mybatis3.CommonCountMapper;
2625
import org.mybatis.dynamic.sql.util.mybatis3.CommonInsertMapper;
@@ -33,10 +32,8 @@
3332
public interface PersonMapper extends CommonCountMapper, CommonInsertMapper<PersonRecord>, CommonUpdateMapper {
3433

3534
@SelectProvider(type=SpringBatchProviderAdapter.class, method="select")
36-
@Results({
37-
@Result(column="id", property="id", id=true),
38-
@Result(column="first_name", property="firstName"),
39-
@Result(column="last_name", property="lastName")
40-
})
35+
@Result(column="id", property="id", id=true)
36+
@Result(column="first_name", property="firstName")
37+
@Result(column="last_name", property="lastName")
4138
List<PersonRecord> selectMany(Map<String, Object> parameterValues);
4239
}

0 commit comments

Comments
 (0)