Sonar fixes

Author: jeffgbutler

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

@@ -29,8 +29,8 @@
 
 public class SelectModel extends AbstractSelectModel {
     private final List<QueryExpressionModel> queryExpressions;
-    private @Nullable final String forClause;
-    private @Nullable final String waitClause;
+    private final @Nullable String forClause;
+    private final @Nullable String waitClause;
 
     private SelectModel(Builder builder) {
         super(builder);

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

@@ -18,7 +18,6 @@
 import java.util.List;
 
 import org.apache.ibatis.annotations.Result;
-import org.apache.ibatis.annotations.Results;
 import org.apache.ibatis.annotations.SelectProvider;
 import org.mybatis.dynamic.sql.select.SelectDSLCompleter;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
@@ -28,10 +27,8 @@
 public interface ColumnComparisonMapper {
 
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
-    @Results({
-        @Result(column="number1", property="number1", id=true),
-        @Result(column="number2", property="number2", id=true)
-    })
+    @Result(column="number1", property="number1", id=true)
+    @Result(column="number2", property="number2", id=true)
     List<ColumnComparisonRecord> selectMany(SelectStatementProvider selectStatement);
 
     default List<ColumnComparisonRecord> select(SelectDSLCompleter completer) {

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

@@ -19,7 +19,6 @@
 
 import org.apache.ibatis.annotations.Result;
 import org.apache.ibatis.annotations.ResultMap;
-import org.apache.ibatis.annotations.Results;
 import org.apache.ibatis.annotations.SelectProvider;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
@@ -30,10 +29,8 @@ public interface JoinMapper {
     List<OrderMaster> selectMany(SelectStatementProvider selectStatement);
 
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
-    @Results ({
-        @Result(column="user_id", property="userId"),
-        @Result(column="user_name", property="userName"),
-        @Result(column="parent_id", property="parentId")
-    })
+    @Result(column="user_id", property="userId")
+    @Result(column="user_name", property="userName")
+    @Result(column="parent_id", property="parentId")
     List<User> selectUsers(SelectStatementProvider selectStatement);
 }

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

@@ -20,7 +20,6 @@
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Result;
-import org.apache.ibatis.annotations.Results;
 import org.apache.ibatis.annotations.SelectProvider;
 import org.mybatis.dynamic.sql.util.mybatis3.CommonCountMapper;
 import org.mybatis.dynamic.sql.util.mybatis3.CommonInsertMapper;
@@ -33,10 +32,8 @@
 public interface PersonMapper extends CommonCountMapper, CommonInsertMapper<PersonRecord>, CommonUpdateMapper {
 
     @SelectProvider(type=SpringBatchProviderAdapter.class, method="select")
-    @Results({
-        @Result(column="id", property="id", id=true),
-        @Result(column="first_name", property="firstName"),
-        @Result(column="last_name", property="lastName")
-    })
+    @Result(column="id", property="id", id=true)
+    @Result(column="first_name", property="firstName")
+    @Result(column="last_name", property="lastName")
     List<PersonRecord> selectMany(Map<String, Object> parameterValues);
 }