ソースを参照

去除多余的@SuppressWarnings("serial")

nieqiurong 1 年間 前
コミット
c23ead2a1b
20 ファイル変更8 行追加30 行削除
  1. 0 1
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/AbstractLambdaWrapper.java
  2. 0 1
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/query/LambdaQueryWrapper.java
  3. 0 1
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/query/QueryWrapper.java
  4. 0 1
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/segments/AbstractISegmentList.java
  5. 0 1
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/segments/GroupBySegmentList.java
  6. 0 1
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/segments/HavingSegmentList.java
  7. 0 1
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/segments/MergeSegments.java
  8. 0 1
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/segments/NormalSegmentList.java
  9. 0 1
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/segments/OrderBySegmentList.java
  10. 0 1
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/update/LambdaUpdateWrapper.java
  11. 0 1
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/update/UpdateWrapper.java
  12. 0 1
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/config/GlobalConfig.java
  13. 3 3
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/AbstractMethod.java
  14. 4 6
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/SqlRunnerInjector.java
  15. 0 2
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/metadata/TableFieldInfo.java
  16. 0 1
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/sql/SqlScriptUtils.java
  17. 0 1
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/sql/SqlUtils.java
  18. 1 1
      mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/metadata/TableInfoHelperTest.java
  19. 0 3
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/injector/methods/LogicDeleteBatchByIds.java
  20. 0 1
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/injector/methods/Upsert.java

+ 0 - 1
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/AbstractLambdaWrapper.java

@@ -36,7 +36,6 @@ import static java.util.stream.Collectors.joining;
  * @author hubin miemie HCL
  * @author hubin miemie HCL
  * @since 2017-05-26
  * @since 2017-05-26
  */
  */
-@SuppressWarnings("serial")
 public abstract class AbstractLambdaWrapper<T, Children extends AbstractLambdaWrapper<T, Children>>
 public abstract class AbstractLambdaWrapper<T, Children extends AbstractLambdaWrapper<T, Children>>
     extends AbstractWrapper<T, SFunction<T, ?>, Children> {
     extends AbstractWrapper<T, SFunction<T, ?>, Children> {
 
 

+ 0 - 1
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/query/LambdaQueryWrapper.java

@@ -35,7 +35,6 @@ import java.util.function.Predicate;
  * @author hubin miemie HCL
  * @author hubin miemie HCL
  * @since 2017-05-26
  * @since 2017-05-26
  */
  */
-@SuppressWarnings("serial")
 public class LambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, LambdaQueryWrapper<T>>
 public class LambdaQueryWrapper<T> extends AbstractLambdaWrapper<T, LambdaQueryWrapper<T>>
     implements Query<LambdaQueryWrapper<T>, T, SFunction<T, ?>> {
     implements Query<LambdaQueryWrapper<T>, T, SFunction<T, ?>> {
 
 

+ 0 - 1
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/query/QueryWrapper.java

@@ -36,7 +36,6 @@ import java.util.function.Predicate;
  * @author hubin miemie HCL
  * @author hubin miemie HCL
  * @since 2018-05-25
  * @since 2018-05-25
  */
  */
-@SuppressWarnings("serial")
 public class QueryWrapper<T> extends AbstractWrapper<T, String, QueryWrapper<T>>
 public class QueryWrapper<T> extends AbstractWrapper<T, String, QueryWrapper<T>>
     implements Query<QueryWrapper<T>, T, String> {
     implements Query<QueryWrapper<T>, T, String> {
 
 

+ 0 - 1
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/segments/AbstractISegmentList.java

@@ -28,7 +28,6 @@ import java.util.List;
  * @author miemie
  * @author miemie
  * @since 2018-06-27
  * @since 2018-06-27
  */
  */
-@SuppressWarnings("serial")
 public abstract class AbstractISegmentList extends ArrayList<ISqlSegment> implements ISqlSegment, StringPool {
 public abstract class AbstractISegmentList extends ArrayList<ISqlSegment> implements ISqlSegment, StringPool {
 
 
     /**
     /**

+ 0 - 1
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/segments/GroupBySegmentList.java

@@ -28,7 +28,6 @@ import static java.util.stream.Collectors.joining;
  * @author miemie
  * @author miemie
  * @since 2018-06-27
  * @since 2018-06-27
  */
  */
-@SuppressWarnings("serial")
 public class GroupBySegmentList extends AbstractISegmentList {
 public class GroupBySegmentList extends AbstractISegmentList {
 
 
     @Override
     @Override

+ 0 - 1
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/segments/HavingSegmentList.java

@@ -29,7 +29,6 @@ import static java.util.stream.Collectors.joining;
  * @author miemie
  * @author miemie
  * @since 2018-06-27
  * @since 2018-06-27
  */
  */
-@SuppressWarnings("serial")
 public class HavingSegmentList extends AbstractISegmentList {
 public class HavingSegmentList extends AbstractISegmentList {
 
 
     @Override
     @Override

+ 0 - 1
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/segments/MergeSegments.java

@@ -30,7 +30,6 @@ import java.util.List;
  * @since 2018-06-27
  * @since 2018-06-27
  */
  */
 @Getter
 @Getter
-@SuppressWarnings("serial")
 public class MergeSegments implements ISqlSegment {
 public class MergeSegments implements ISqlSegment {
 
 
     private final NormalSegmentList normal = new NormalSegmentList();
     private final NormalSegmentList normal = new NormalSegmentList();

+ 0 - 1
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/segments/NormalSegmentList.java

@@ -27,7 +27,6 @@ import java.util.stream.Collectors;
  * @author miemie
  * @author miemie
  * @since 2018-06-27
  * @since 2018-06-27
  */
  */
-@SuppressWarnings("serial")
 public class NormalSegmentList extends AbstractISegmentList {
 public class NormalSegmentList extends AbstractISegmentList {
 
 
     /**
     /**

+ 0 - 1
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/segments/OrderBySegmentList.java

@@ -29,7 +29,6 @@ import static java.util.stream.Collectors.joining;
  * @author miemie
  * @author miemie
  * @since 2018-06-27
  * @since 2018-06-27
  */
  */
-@SuppressWarnings("serial")
 public class OrderBySegmentList extends AbstractISegmentList {
 public class OrderBySegmentList extends AbstractISegmentList {
 
 
     @Override
     @Override

+ 0 - 1
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/update/LambdaUpdateWrapper.java

@@ -34,7 +34,6 @@ import java.util.concurrent.atomic.AtomicInteger;
  * @author hubin miemie HCL
  * @author hubin miemie HCL
  * @since 2018-05-30
  * @since 2018-05-30
  */
  */
-@SuppressWarnings("serial")
 public class LambdaUpdateWrapper<T> extends AbstractLambdaWrapper<T, LambdaUpdateWrapper<T>>
 public class LambdaUpdateWrapper<T> extends AbstractLambdaWrapper<T, LambdaUpdateWrapper<T>>
     implements Update<LambdaUpdateWrapper<T>, SFunction<T, ?>> {
     implements Update<LambdaUpdateWrapper<T>, SFunction<T, ?>> {
 
 

+ 0 - 1
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/update/UpdateWrapper.java

@@ -33,7 +33,6 @@ import java.util.concurrent.atomic.AtomicInteger;
  * @author hubin miemie HCL
  * @author hubin miemie HCL
  * @since 2018-05-30
  * @since 2018-05-30
  */
  */
-@SuppressWarnings("serial")
 public class UpdateWrapper<T> extends AbstractWrapper<T, String, UpdateWrapper<T>>
 public class UpdateWrapper<T> extends AbstractWrapper<T, String, UpdateWrapper<T>>
     implements Update<UpdateWrapper<T>, String> {
     implements Update<UpdateWrapper<T>, String> {
 
 

+ 0 - 1
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/config/GlobalConfig.java

@@ -43,7 +43,6 @@ import java.util.concurrent.ConcurrentSkipListSet;
  */
  */
 @Data
 @Data
 @Accessors(chain = true)
 @Accessors(chain = true)
-@SuppressWarnings("serial")
 public class GlobalConfig implements Serializable {
 public class GlobalConfig implements Serializable {
     /**
     /**
      * 是否开启 LOGO
      * 是否开启 LOGO

+ 3 - 3
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/AbstractMethod.java

@@ -230,14 +230,14 @@ public abstract class AbstractMethod implements Constants {
      * @return String
      * @return String
      */
      */
     protected String sqlWhereEntityWrapper(boolean newLine, TableInfo table) {
     protected String sqlWhereEntityWrapper(boolean newLine, TableInfo table) {
-        /**
+        /*
          * Wrapper SQL
          * Wrapper SQL
          */
          */
         String _sgEs_ = "<bind name=\"_sgEs_\" value=\"ew.sqlSegment != null and ew.sqlSegment != ''\"/>";
         String _sgEs_ = "<bind name=\"_sgEs_\" value=\"ew.sqlSegment != null and ew.sqlSegment != ''\"/>";
         String andSqlSegment = SqlScriptUtils.convertIf(String.format(" AND ${%s}", WRAPPER_SQLSEGMENT), String.format("_sgEs_ and %s", WRAPPER_NONEMPTYOFNORMAL), true);
         String andSqlSegment = SqlScriptUtils.convertIf(String.format(" AND ${%s}", WRAPPER_SQLSEGMENT), String.format("_sgEs_ and %s", WRAPPER_NONEMPTYOFNORMAL), true);
         String lastSqlSegment = SqlScriptUtils.convertIf(String.format(" ${%s}", WRAPPER_SQLSEGMENT), String.format("_sgEs_ and %s", WRAPPER_EMPTYOFNORMAL), true);
         String lastSqlSegment = SqlScriptUtils.convertIf(String.format(" ${%s}", WRAPPER_SQLSEGMENT), String.format("_sgEs_ and %s", WRAPPER_EMPTYOFNORMAL), true);
 
 
-        /**
+        /*
          * 存在逻辑删除 SQL 注入
          * 存在逻辑删除 SQL 注入
          */
          */
         if (table.isWithLogicDelete()) {
         if (table.isWithLogicDelete()) {
@@ -249,7 +249,7 @@ public abstract class AbstractMethod implements Constants {
             return newLine ? NEWLINE + sqlScript : sqlScript;
             return newLine ? NEWLINE + sqlScript : sqlScript;
         }
         }
 
 
-        /**
+        /*
          * 普通 SQL 注入
          * 普通 SQL 注入
          */
          */
         String sqlScript = table.getAllSqlWhere(false, false, true, WRAPPER_ENTITY_DOT);
         String sqlScript = table.getAllSqlWhere(false, false, true, WRAPPER_ENTITY_DOT);

+ 4 - 6
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/SqlRunnerInjector.java

@@ -56,8 +56,8 @@ public class SqlRunnerInjector {
     /**
     /**
      * 是否已经存在MappedStatement
      * 是否已经存在MappedStatement
      *
      *
-     * @param mappedStatement
-     * @return
+     * @param mappedStatement mappedStatement
+     * @return 是否存在
      */
      */
     private boolean hasMappedStatement(String mappedStatement) {
     private boolean hasMappedStatement(String mappedStatement) {
         return configuration.hasStatement(mappedStatement, false);
         return configuration.hasStatement(mappedStatement, false);
@@ -66,11 +66,10 @@ public class SqlRunnerInjector {
     /**
     /**
      * 创建查询MappedStatement
      * 创建查询MappedStatement
      *
      *
-     * @param mappedStatement
+     * @param mappedStatement mappedStatement
      * @param sqlSource       执行的sqlSource
      * @param sqlSource       执行的sqlSource
      * @param resultType      返回的结果类型
      * @param resultType      返回的结果类型
      */
      */
-    @SuppressWarnings("serial")
     private void createSelectMappedStatement(String mappedStatement, SqlSource sqlSource, final Class<?> resultType) {
     private void createSelectMappedStatement(String mappedStatement, SqlSource sqlSource, final Class<?> resultType) {
         MappedStatement ms = new MappedStatement.Builder(configuration, mappedStatement, sqlSource, SqlCommandType.SELECT)
         MappedStatement ms = new MappedStatement.Builder(configuration, mappedStatement, sqlSource, SqlCommandType.SELECT)
             .resultMaps(new ArrayList<ResultMap>() {
             .resultMaps(new ArrayList<ResultMap>() {
@@ -86,11 +85,10 @@ public class SqlRunnerInjector {
     /**
     /**
      * 创建一个MappedStatement
      * 创建一个MappedStatement
      *
      *
-     * @param mappedStatement
+     * @param mappedStatement mappedStatement
      * @param sqlSource       执行的sqlSource
      * @param sqlSource       执行的sqlSource
      * @param sqlCommandType  执行的sqlCommandType
      * @param sqlCommandType  执行的sqlCommandType
      */
      */
-    @SuppressWarnings("serial")
     private void createUpdateMappedStatement(String mappedStatement, SqlSource sqlSource, SqlCommandType sqlCommandType) {
     private void createUpdateMappedStatement(String mappedStatement, SqlSource sqlSource, SqlCommandType sqlCommandType) {
         MappedStatement ms = new MappedStatement.Builder(configuration, mappedStatement, sqlSource, sqlCommandType).resultMaps(
         MappedStatement ms = new MappedStatement.Builder(configuration, mappedStatement, sqlSource, sqlCommandType).resultMaps(
             new ArrayList<ResultMap>() {
             new ArrayList<ResultMap>() {

+ 0 - 2
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/metadata/TableFieldInfo.java

@@ -52,7 +52,6 @@ import java.util.Map;
 @Getter
 @Getter
 @ToString
 @ToString
 @EqualsAndHashCode
 @EqualsAndHashCode
-@SuppressWarnings("serial")
 public class TableFieldInfo implements Constants {
 public class TableFieldInfo implements Constants {
 
 
     /**
     /**
@@ -192,7 +191,6 @@ public class TableFieldInfo implements Constants {
     /**
     /**
      * 全新的 存在 TableField 注解时使用的构造函数
      * 全新的 存在 TableField 注解时使用的构造函数
      */
      */
-    @SuppressWarnings({"unchecked", "rawtypes"})
     public TableFieldInfo(GlobalConfig globalConfig, TableInfo tableInfo, Field field, TableField tableField,
     public TableFieldInfo(GlobalConfig globalConfig, TableInfo tableInfo, Field field, TableField tableField,
                           Reflector reflector, boolean existTableLogic, boolean isOrderBy) {
                           Reflector reflector, boolean existTableLogic, boolean isOrderBy) {
         this(globalConfig, tableInfo, field, tableField, reflector, existTableLogic);
         this(globalConfig, tableInfo, field, tableField, reflector, existTableLogic);

+ 0 - 1
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/sql/SqlScriptUtils.java

@@ -28,7 +28,6 @@ import org.apache.ibatis.type.TypeHandler;
  * @author miemie
  * @author miemie
  * @since 2018-08-15
  * @since 2018-08-15
  */
  */
-@SuppressWarnings("serial")
 public abstract class SqlScriptUtils implements Constants {
 public abstract class SqlScriptUtils implements Constants {
 
 
     /**
     /**

+ 0 - 1
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/sql/SqlUtils.java

@@ -35,7 +35,6 @@ import java.util.regex.Pattern;
  * @author Caratacus
  * @author Caratacus
  * @since 2016-11-13
  * @since 2016-11-13
  */
  */
-@SuppressWarnings("serial")
 public abstract class SqlUtils implements Constants {
 public abstract class SqlUtils implements Constants {
 
 
     private static final Pattern pattern = Pattern.compile("\\{@((\\w+?)|(\\w+?:\\w+?)|(\\w+?:\\w+?:\\w+?))}");
     private static final Pattern pattern = Pattern.compile("\\{@((\\w+?)|(\\w+?:\\w+?)|(\\w+?:\\w+?:\\w+?))}");

+ 1 - 1
mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/test/metadata/TableInfoHelperTest.java

@@ -255,7 +255,7 @@ class TableInfoHelperTest {
     }
     }
 
 
     @Test
     @Test
-    void testNewInstance() throws ReflectiveOperationException {
+    void testNewInstance() {
         TableInfo tableInfo = TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""), ModelOne.class);
         TableInfo tableInfo = TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""), ModelOne.class);
         ModelOne entity = tableInfo.newInstance();
         ModelOne entity = tableInfo.newInstance();
         tableInfo.setPropertyValue(entity, tableInfo.getKeyColumn(), 1L);
         tableInfo.setPropertyValue(entity, tableInfo.getKeyColumn(), 1L);

+ 0 - 3
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/injector/methods/LogicDeleteBatchByIds.java

@@ -29,9 +29,7 @@ import static java.util.stream.Collectors.toList;
 
 
 /**
 /**
  * 试验功能,不做太复杂的功能,逻辑删除增加填充功能
  * 试验功能,不做太复杂的功能,逻辑删除增加填充功能
- *
  * 如果想做的通用点的话,delete的时候如果是主键,在service层转换实体进行删除,这样根据主键删除的也能自动填充
  * 如果想做的通用点的话,delete的时候如果是主键,在service层转换实体进行删除,这样根据主键删除的也能自动填充
- *
  * 如果是逻辑删除且标记有填充字段的情况下,以第一条记录的填充字段为准(一切以当前的时间点为基准,如果无法接受记录记录时间不准确请使用循环删除)
  * 如果是逻辑删除且标记有填充字段的情况下,以第一条记录的填充字段为准(一切以当前的时间点为基准,如果无法接受记录记录时间不准确请使用循环删除)
  * 由于本身SQL更新的限制限,这里记录集合不能为空,也不支持第一条记录删除人是A或者时间是A时间,第二条记录的时间是B时间
  * 由于本身SQL更新的限制限,这里记录集合不能为空,也不支持第一条记录删除人是A或者时间是A时间,第二条记录的时间是B时间
  * update table set (填充字段1,填充字段2,逻辑删除字段) where id in (主键1,主键2,主键3)
  * update table set (填充字段1,填充字段2,逻辑删除字段) where id in (主键1,主键2,主键3)
@@ -49,7 +47,6 @@ import static java.util.stream.Collectors.toList;
  * @author nieqiurong
  * @author nieqiurong
  * @since 3.5.0
  * @since 3.5.0
  */
  */
-@SuppressWarnings("serial")
 public class LogicDeleteBatchByIds extends DeleteBatchByIds {
 public class LogicDeleteBatchByIds extends DeleteBatchByIds {
 
 
     public LogicDeleteBatchByIds() {
     public LogicDeleteBatchByIds() {

+ 0 - 1
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/injector/methods/Upsert.java

@@ -31,7 +31,6 @@ import org.apache.ibatis.mapping.SqlSource;
  * @author fly
  * @author fly
  * @since 2018-04-06
  * @since 2018-04-06
  */
  */
-@SuppressWarnings("serial")
 public class Upsert extends AbstractMethod {
 public class Upsert extends AbstractMethod {
 
 
     public Upsert() {
     public Upsert() {