Forráskód Böngészése

style: 修复阿里规范检查格式

小锅盖 7 éve
szülő
commit
4667ed2629
20 módosított fájl, 70 hozzáadás és 57 törlés
  1. 2 2
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/MybatisDefaultParameterHandler.java
  2. 1 1
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/assist/ISqlRunner.java
  3. 2 2
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/MybatisAbstractSQL.java
  4. 1 0
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/Wrapper.java
  5. 6 6
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/SqlRunnerInjector.java
  6. 3 3
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/parser/SqlParserHelper.java
  7. 4 4
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/ClassUtils.java
  8. 3 3
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/IdWorker.java
  9. 11 11
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/SerializationUtils.java
  10. 5 1
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/StringUtils.java
  11. 5 5
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/TableInfoHelper.java
  12. 1 1
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/sql/SqlFormatter.java
  13. 2 2
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/sql/SqlUtils.java
  14. 5 6
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/pagination/DialectFactory.java
  15. 2 2
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/pagination/optimize/JsqlParserCountOptimize.java
  16. 5 5
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/spring/MybatisMapperRefresh.java
  17. 9 0
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/toolkit/SqlRunner.java
  18. 1 1
      mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/AutoGenerator.java
  19. 1 1
      mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/builder/ConfigBuilder.java
  20. 1 1
      mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/rules/NamingStrategy.java

+ 2 - 2
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/MybatisDefaultParameterHandler.java

@@ -61,7 +61,7 @@ public class MybatisDefaultParameterHandler extends DefaultParameterHandler {
     /**
      * @see BoundSql
      */
-    private static final Field additionalParametersField = getAdditionalParametersField();
+    private static final Field ADDITIONAL_PARAMETERS_FIELD = getAdditionalParametersField();
     private final TypeHandlerRegistry typeHandlerRegistry;
     private final MappedStatement mappedStatement;
     private final Object parameterObject;
@@ -240,7 +240,7 @@ public class MybatisDefaultParameterHandler extends DefaultParameterHandler {
         // 反射获取动态参数
         Map<String, Object> additionalParameters = null;
         try {
-            additionalParameters = (Map<String, Object>) additionalParametersField.get(boundSql);
+            additionalParameters = (Map<String, Object>) ADDITIONAL_PARAMETERS_FIELD.get(boundSql);
         } catch (IllegalAccessException e) {
             // ignored, Because it will never happen.
         }

+ 1 - 1
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/assist/ISqlRunner.java

@@ -22,7 +22,7 @@ public abstract class ISqlRunner {
     public static final String SELECT_LIST = "com.baomidou.mybatisplus.core.mapper.SqlRunner.SelectList";
     public static final String SELECT_OBJS = "com.baomidou.mybatisplus.core.mapper.SqlRunner.SelectObjs";
     public static final String COUNT = "com.baomidou.mybatisplus.core.mapper.SqlRunner.Count";
-    public static final String SQLScript = "${sql}";
+    public static final String SQL_SCRIPT = "${sql}";
     public static final String SQL = "sql";
 
     public static SqlSessionFactory FACTORY;

+ 2 - 2
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/MybatisAbstractSQL.java

@@ -39,7 +39,7 @@ public abstract class MybatisAbstractSQL<T> implements Serializable {
     private static final String OR = " OR ";
     private static final String AND_NEW = ") \nAND (";
     private static final String OR_NEW = ") \nOR (";
-    private static final Pattern pattern = Pattern.compile("[(|)|\\s]+");
+    private static final Pattern PATTERN = Pattern.compile("[(|)|\\s]+");
 
 
     /**
@@ -274,7 +274,7 @@ public abstract class MybatisAbstractSQL<T> implements Serializable {
          * @return true 嵌套
          */
         private boolean checkNest(String args) {
-            return pattern.matcher(args).matches();
+            return PATTERN.matcher(args).matches();
         }
     }
 }

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

@@ -1641,6 +1641,7 @@ public abstract class Wrapper<T> implements Serializable {
      * 克隆本身 fixed github issues/241
      * </p>
      */
+    @Override
     public Wrapper<T> clone() {
         return SerializationUtils.clone(this);
     }

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

@@ -115,7 +115,7 @@ public class SqlRunnerInjector {
             logger.warn("MappedStatement 'SqlRunner.SelectList' Already Exists");
             return;
         }
-        SqlSource sqlSource = languageDriver.createSqlSource(configuration, ISqlRunner.SQLScript, Map.class);
+        SqlSource sqlSource = languageDriver.createSqlSource(configuration, ISqlRunner.SQL_SCRIPT, Map.class);
         createSelectMappedStatement(ISqlRunner.SELECT_LIST, sqlSource, Map.class);
     }
 
@@ -127,7 +127,7 @@ public class SqlRunnerInjector {
             logger.warn("MappedStatement 'SqlRunner.SelectObjs' Already Exists");
             return;
         }
-        SqlSource sqlSource = languageDriver.createSqlSource(configuration, ISqlRunner.SQLScript, Object.class);
+        SqlSource sqlSource = languageDriver.createSqlSource(configuration, ISqlRunner.SQL_SCRIPT, Object.class);
         createSelectMappedStatement(ISqlRunner.SELECT_OBJS, sqlSource, Object.class);
     }
 
@@ -139,7 +139,7 @@ public class SqlRunnerInjector {
             logger.warn("MappedStatement 'SqlRunner.Count' Already Exists");
             return;
         }
-        SqlSource sqlSource = languageDriver.createSqlSource(configuration, ISqlRunner.SQLScript, Map.class);
+        SqlSource sqlSource = languageDriver.createSqlSource(configuration, ISqlRunner.SQL_SCRIPT, Map.class);
         createSelectMappedStatement(ISqlRunner.COUNT, sqlSource, Integer.class);
     }
 
@@ -151,7 +151,7 @@ public class SqlRunnerInjector {
             logger.warn("MappedStatement 'SqlRunner.Insert' Already Exists");
             return;
         }
-        SqlSource sqlSource = languageDriver.createSqlSource(configuration, ISqlRunner.SQLScript, Map.class);
+        SqlSource sqlSource = languageDriver.createSqlSource(configuration, ISqlRunner.SQL_SCRIPT, Map.class);
         createUpdateMappedStatement(ISqlRunner.INSERT, sqlSource, SqlCommandType.INSERT);
     }
 
@@ -163,7 +163,7 @@ public class SqlRunnerInjector {
             logger.warn("MappedStatement 'SqlRunner.Update' Already Exists");
             return;
         }
-        SqlSource sqlSource = languageDriver.createSqlSource(configuration, ISqlRunner.SQLScript, Map.class);
+        SqlSource sqlSource = languageDriver.createSqlSource(configuration, ISqlRunner.SQL_SCRIPT, Map.class);
         createUpdateMappedStatement(ISqlRunner.UPDATE, sqlSource, SqlCommandType.UPDATE);
     }
 
@@ -175,7 +175,7 @@ public class SqlRunnerInjector {
             logger.warn("MappedStatement 'SqlRunner.Delete' Already Exists");
             return;
         }
-        SqlSource sqlSource = languageDriver.createSqlSource(configuration, ISqlRunner.SQLScript, Map.class);
+        SqlSource sqlSource = languageDriver.createSqlSource(configuration, ISqlRunner.SQL_SCRIPT, Map.class);
         createUpdateMappedStatement(ISqlRunner.DELETE, sqlSource, SqlCommandType.DELETE);
     }
 }

+ 3 - 3
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/parser/SqlParserHelper.java

@@ -15,7 +15,7 @@ public class SqlParserHelper {
     /**
      * SQL 解析缓存
      */
-    private static final Map<String, SqlParserInfo> sqlParserInfoCache = new ConcurrentHashMap<>();
+    private static final Map<String, SqlParserInfo> SQL_PARSER_INFO_CACHE = new ConcurrentHashMap<>();
 
 
     /**
@@ -32,7 +32,7 @@ public class SqlParserHelper {
             if (null != sqlParser) {
                 StringBuilder sid = new StringBuilder();
                 sid.append(mapperClass.getName()).append(".").append(method.getName());
-                sqlParserInfoCache.put(sid.toString(), new SqlParserInfo(sqlParser));
+                SQL_PARSER_INFO_CACHE.put(sid.toString(), new SqlParserInfo(sqlParser));
             }
         }
     }
@@ -47,7 +47,7 @@ public class SqlParserHelper {
      * @return
      */
     public static SqlParserInfo getSqlParserInfo(MetaObject metaObject) {
-        return sqlParserInfoCache.get(getMappedStatement(metaObject).getId());
+        return SQL_PARSER_INFO_CACHE.get(getMappedStatement(metaObject).getId());
     }
 
 

+ 4 - 4
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/ClassUtils.java

@@ -21,10 +21,10 @@ public class ClassUtils {
         if (clazz != null) {
             for (Class<?> cls : clazz.getInterfaces()) {
                 String interfaceName = cls.getName();
-                if (interfaceName.equals("net.sf.cglib.proxy.Factory") //cglib
-                    || interfaceName.equals("org.springframework.cglib.proxy.Factory")
-                    || interfaceName.equals("javassist.util.proxy.ProxyObject") //javassist
-                    || interfaceName.equals("org.apache.ibatis.javassist.util.proxy.ProxyObject")) {
+                if ("net.sf.cglib.proxy.Factory".equals(interfaceName) //cglib
+                    || "org.springframework.cglib.proxy.Factory".equals(interfaceName)
+                    || "javassist.util.proxy.ProxyObject".equals(interfaceName) //javassist
+                    || "org.apache.ibatis.javassist.util.proxy.ProxyObject".equals(interfaceName)) {
                     return true;
                 }
             }

+ 3 - 3
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/IdWorker.java

@@ -32,14 +32,14 @@ public class IdWorker {
     /**
      * 主机和进程的机器码
      */
-    private static final Sequence worker = new Sequence();
+    private static final Sequence WORKER = new Sequence();
 
     public static long getId() {
-        return worker.nextId();
+        return WORKER.nextId();
     }
 
     public static String getIdStr() {
-        return String.valueOf(worker.nextId());
+        return String.valueOf(WORKER.nextId());
     }
 
     /**

+ 11 - 11
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/SerializationUtils.java

@@ -222,19 +222,19 @@ public class SerializationUtils {
      */
     static class ClassLoaderAwareObjectInputStream extends ObjectInputStream {
 
-        private static final Map<String, Class<?>> primitiveTypes =
+        private static final Map<String, Class<?>> PRIMITIVE_TYPES =
             new HashMap<>();
 
         static {
-            primitiveTypes.put("byte", byte.class);
-            primitiveTypes.put("short", short.class);
-            primitiveTypes.put("int", int.class);
-            primitiveTypes.put("long", long.class);
-            primitiveTypes.put("float", float.class);
-            primitiveTypes.put("double", double.class);
-            primitiveTypes.put("boolean", boolean.class);
-            primitiveTypes.put("char", char.class);
-            primitiveTypes.put("void", void.class);
+            PRIMITIVE_TYPES.put("byte", byte.class);
+            PRIMITIVE_TYPES.put("short", short.class);
+            PRIMITIVE_TYPES.put("int", int.class);
+            PRIMITIVE_TYPES.put("long", long.class);
+            PRIMITIVE_TYPES.put("float", float.class);
+            PRIMITIVE_TYPES.put("double", double.class);
+            PRIMITIVE_TYPES.put("boolean", boolean.class);
+            PRIMITIVE_TYPES.put("char", char.class);
+            PRIMITIVE_TYPES.put("void", void.class);
         }
 
         private final ClassLoader classLoader;
@@ -270,7 +270,7 @@ public class SerializationUtils {
                 try {
                     return Class.forName(name, false, Thread.currentThread().getContextClassLoader());
                 } catch (final ClassNotFoundException cnfe) {
-                    final Class<?> cls = primitiveTypes.get(name);
+                    final Class<?> cls = PRIMITIVE_TYPES.get(name);
                     if (cls != null) {
                         return cls;
                     }

+ 5 - 1
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/StringUtils.java

@@ -64,6 +64,10 @@ public class StringUtils {
     private static boolean separatorBeforeDigit = false;
     private static boolean separatorAfterDigit = true;
 
+   private static final Pattern PATTERN_ONE = Pattern.compile(".*[A-Z]+.*");
+
+    private static final Pattern PATTERN_TWO = Pattern.compile(".*[/_]+.*");
+
 
     private StringUtils() {
     }
@@ -413,7 +417,7 @@ public class StringUtils {
      * @return
      */
     public static boolean isMixedMode(String word) {
-        return Pattern.compile(".*[A-Z]+.*").matcher(word).matches() && Pattern.compile(".*[/_]+.*").matcher(word).matches();
+        return PATTERN_ONE.matcher(word).matches() && PATTERN_TWO.matcher(word).matches();
     }
 
     /**

+ 5 - 5
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/TableInfoHelper.java

@@ -62,7 +62,7 @@ public class TableInfoHelper {
     /**
      * 缓存反射类表信息
      */
-    private static final Map<String, TableInfo> tableInfoCache = new ConcurrentHashMap<>();
+    private static final Map<String, TableInfo> TABLE_INFO_CACHE = new ConcurrentHashMap<>();
     /**
      * 默认表主键
      */
@@ -77,7 +77,7 @@ public class TableInfoHelper {
      * @return
      */
     public static TableInfo getTableInfo(Class<?> clazz) {
-        return tableInfoCache.get(ClassUtils.getUserClass(clazz).getName());
+        return TABLE_INFO_CACHE.get(ClassUtils.getUserClass(clazz).getName());
     }
 
     /**
@@ -88,7 +88,7 @@ public class TableInfoHelper {
      * @return
      */
     public static List<TableInfo> getTableInfos() {
-        return new ArrayList<>(tableInfoCache.values());
+        return new ArrayList<>(TABLE_INFO_CACHE.values());
     }
 
     /**
@@ -100,7 +100,7 @@ public class TableInfoHelper {
      * @return
      */
     public synchronized static TableInfo initTableInfo(MapperBuilderAssistant builderAssistant, Class<?> clazz) {
-        TableInfo tableInfo = tableInfoCache.get(clazz.getName());
+        TableInfo tableInfo = TABLE_INFO_CACHE.get(clazz.getName());
         if (StringUtils.checkValNotNull(tableInfo)) {
             if (StringUtils.checkValNotNull(builderAssistant)) {
                 tableInfo.setConfigMark(builderAssistant.getConfiguration());
@@ -190,7 +190,7 @@ public class TableInfoHelper {
         /*
          * 注入
          */
-        tableInfoCache.put(clazz.getName(), tableInfo);
+        TABLE_INFO_CACHE.put(clazz.getName(), tableInfo);
         return tableInfo;
     }
 

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

@@ -155,7 +155,7 @@ public class SqlFormatter {
                     values();
                 } else if ("on".equals(lcToken)) {
                     on();
-                } else if (afterBetween && lcToken.equals("and")) {
+                } else if (afterBetween && "and".equals(lcToken)) {
                     misc();
                     afterBetween = false;
                 } else if (LOGICAL.contains(lcToken)) {

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

@@ -35,7 +35,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
  */
 public class SqlUtils {
 
-    private final static SqlFormatter sqlFormatter = new SqlFormatter();
+    private final static SqlFormatter SQL_FORMATTER = new SqlFormatter();
     public static ISqlParser COUNT_SQL_PARSER = null;
     private static Class<ISqlParser> DEFAULT_CLASS = null;
 
@@ -152,7 +152,7 @@ public class SqlUtils {
      */
     public static String sqlFormat(String boundSql, boolean format) {
         if (format) {
-            return sqlFormatter.format(boundSql);
+            return SQL_FORMATTER.format(boundSql);
         } else {
             return boundSql.replaceAll("[\\s]+", " ");
         }

+ 5 - 6
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/pagination/DialectFactory.java

@@ -22,7 +22,6 @@ import org.apache.ibatis.session.RowBounds;
 
 import com.baomidou.mybatisplus.core.enums.IDBType;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
-import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.core.pagination.PageHelper;
 import com.baomidou.mybatisplus.core.pagination.Pagination;
 import com.baomidou.mybatisplus.core.pagination.dialect.IDialect;
@@ -52,7 +51,7 @@ public class DialectFactory {
     /**
      * 方言缓存
      */
-    private static final Map<String, IDialect> dialectCache = new ConcurrentHashMap<>();
+    private static final Map<String, IDialect> DIALECT_CACHE = new ConcurrentHashMap<>();
 
     /**
      * <p>
@@ -100,11 +99,11 @@ public class DialectFactory {
      * @throws Exception
      */
     private static IDialect getDialect(IDBType dbType, String dialectClazz) throws Exception {
-        IDialect dialect = dialectCache.get(dbType.getDb());
+        IDialect dialect = DIALECT_CACHE.get(dbType.getDb());
         if (null == dialect) {
             // 自定义方言
             if (StringUtils.isNotEmpty(dialectClazz)) {
-                dialect = dialectCache.get(dialectClazz);
+                dialect = DIALECT_CACHE.get(dialectClazz);
                 if (null != dialect) {
                     return dialect;
                 }
@@ -112,7 +111,7 @@ public class DialectFactory {
                     Class<?> clazz = Class.forName(dialectClazz);
                     if (IDialect.class.isAssignableFrom(clazz)) {
                         dialect = (IDialect) clazz.newInstance();
-                        dialectCache.put(dialectClazz, dialect);
+                        DIALECT_CACHE.put(dialectClazz, dialect);
                     }
                 } catch (ClassNotFoundException e) {
                     throw new MybatisPlusException("Class :" + dialectClazz + " is not found");
@@ -120,7 +119,7 @@ public class DialectFactory {
             } else {
                 // 缓存方言
                 dialect = getDialectByDbType(dbType);
-                dialectCache.put(dbType.getDb(), dialect);
+                DIALECT_CACHE.put(dbType.getDb(), dialect);
             }
             /* 未配置方言则抛出异常 */
             if (dialect == null) {

+ 2 - 2
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/pagination/optimize/JsqlParserCountOptimize.java

@@ -53,7 +53,7 @@ public class JsqlParserCountOptimize implements ISqlParser {
      * 日志
      */
     private final Log logger = LogFactory.getLog(JsqlParserCountOptimize.class);
-    private static final List<SelectItem> countSelectItem = countSelectItem();
+    private static final List<SelectItem> COUNT_SELECT_ITEM = countSelectItem();
 
     @Override
     public SqlInfo optimizeSql(MetaObject metaObject, String sql) {
@@ -86,7 +86,7 @@ public class JsqlParserCountOptimize implements ISqlParser {
                 return sqlInfo;
             }
             // 优化 SQL
-            plainSelect.setSelectItems(countSelectItem);
+            plainSelect.setSelectItems(COUNT_SELECT_ITEM);
             sqlInfo.setSql(selectStatement.toString());
             return sqlInfo;
         } catch (Throwable e) {

+ 5 - 5
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/spring/MybatisMapperRefresh.java

@@ -63,7 +63,7 @@ public class MybatisMapperRefresh implements Runnable {
     /**
      * 记录jar包存在的mapper
      */
-    private static final Map<String, List<Resource>> jarMapper = new HashMap<>();
+    private static final Map<String, List<Resource>> JAR_MAPPER = new HashMap<>();
     private SqlSessionFactory sqlSessionFactory;
     private Resource[] mapperLocations;
     private Long beforeTime = 0L;
@@ -126,12 +126,12 @@ public class MybatisMapperRefresh implements Runnable {
                                         String key = new UrlResource(ResourceUtils.extractJarFileURL(mapperLocation.getURL()))
                                             .getFile().getPath();
                                         fileSet.add(key);
-                                        if (jarMapper.get(key) != null) {
-                                            jarMapper.get(key).add(mapperLocation);
+                                        if (JAR_MAPPER.get(key) != null) {
+                                            JAR_MAPPER.get(key).add(mapperLocation);
                                         } else {
                                             List<Resource> resourcesList = new ArrayList<>();
                                             resourcesList.add(mapperLocation);
-                                            jarMapper.put(key, resourcesList);
+                                            JAR_MAPPER.put(key, resourcesList);
                                         }
                                     } else {
                                         fileSet.add(mapperLocation.getFile().getPath());
@@ -153,7 +153,7 @@ public class MybatisMapperRefresh implements Runnable {
                                 File file = new File(filePath);
                                 if (file.isFile() && file.lastModified() > beforeTime) {
                                     globalConfig.setRefresh(true);
-                                    List<Resource> removeList = jarMapper.get(filePath);
+                                    List<Resource> removeList = JAR_MAPPER.get(filePath);
                                     if (removeList != null && !removeList.isEmpty()) {
                                         for (Resource resource : removeList) {
                                             runnable.refresh(resource);

+ 9 - 0
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/toolkit/SqlRunner.java

@@ -83,11 +83,13 @@ public class SqlRunner extends ISqlRunner {
     }
 
     @Transactional
+    @Override
     public boolean insert(String sql, Object... args) {
         return SqlHelper.retBool(sqlSession().insert(INSERT, sqlMap(sql, args)));
     }
 
     @Transactional
+    @Override
     public boolean delete(String sql, Object... args) {
         return SqlHelper.retBool(sqlSession().delete(DELETE, sqlMap(sql, args)));
     }
@@ -106,6 +108,7 @@ public class SqlRunner extends ISqlRunner {
     }
 
     @Transactional
+    @Override
     public boolean update(String sql, Object... args) {
         return SqlHelper.retBool(sqlSession().update(UPDATE, sqlMap(sql, args)));
     }
@@ -118,6 +121,7 @@ public class SqlRunner extends ISqlRunner {
      * @param args 只接受String格式
      * @return
      */
+    @Override
     public List<Map<String, Object>> selectList(String sql, Object... args) {
         return sqlSession().selectList(SELECT_LIST, sqlMap(sql, args));
     }
@@ -130,6 +134,7 @@ public class SqlRunner extends ISqlRunner {
      * @param args 只接受String格式
      * @return
      */
+    @Override
     public List<Object> selectObjs(String sql, Object... args) {
         return sqlSession().selectList(SELECT_OBJS, sqlMap(sql, args));
     }
@@ -142,19 +147,23 @@ public class SqlRunner extends ISqlRunner {
      * @param args 只接受String格式
      * @return
      */
+    @Override
     public Object selectObj(String sql, Object... args) {
         return SqlHelper.getObject(selectObjs(sql, args));
     }
 
+    @Override
     public int selectCount(String sql, Object... args) {
         return SqlHelper.retCount(sqlSession().<Integer>selectOne(COUNT, sqlMap(sql, args)));
     }
 
+    @Override
     public Map<String, Object> selectOne(String sql, Object... args) {
         return SqlHelper.getObject(selectList(sql, args));
     }
 
     @SuppressWarnings({"unchecked", "rawtypes"})
+    @Override
     public Page<Map<String, Object>> selectPage(Page page, String sql, Object... args) {
         if (null == page) {
             return null;

+ 1 - 1
mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/AutoGenerator.java

@@ -159,7 +159,7 @@ public class AutoGenerator {
             // Boolean类型is前缀处理
             if (config.getStrategyConfig().isEntityBooleanColumnRemoveIsPrefix()) {
                 for (TableField field : tableInfo.getFields()) {
-                    if (field.getPropertyType().equalsIgnoreCase("boolean")) {
+                    if ("boolean".equalsIgnoreCase(field.getPropertyType())) {
                         if (field.getPropertyName().startsWith("is")) {
                             field.setPropertyName(config.getStrategyConfig(),
                                 StringUtils.removePrefixAfterPrefixToLower(field.getPropertyName(), 2));

+ 1 - 1
mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/builder/ConfigBuilder.java

@@ -572,7 +572,7 @@ public class ConfigBuilder {
                 TableField field = new TableField();
                 String key = results.getString(dbQuery.fieldKey());
                 // 避免多重主键设置,目前只取第一个找到ID,并放到list中的索引为0的位置
-                boolean isId = StringUtils.isNotEmpty(key) && key.toUpperCase().equals("PRI");
+                boolean isId = StringUtils.isNotEmpty(key) && "PRI".equals(key.toUpperCase());
                 // 处理ID
                 if (isId && !haveId) {
                     field.setKeyFlag(true);

+ 1 - 1
mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/rules/NamingStrategy.java

@@ -47,7 +47,7 @@ public enum NamingStrategy {
         }
         StringBuilder result = new StringBuilder();
         // 用下划线将原始字符串分割
-        String camels[] = tempName.split(ConstVal.UNDERLINE);
+        String[] camels = tempName.split(ConstVal.UNDERLINE);
         for (String camel : camels) {
             // 跳过原始字符串中开头、结尾的下换线或双重下划线
             if (StringUtils.isEmpty(camel)) {