nieqiurong 4 年之前
父节点
当前提交
4598d8f080
共有 15 个文件被更改,包括 23 次插入29 次删除
  1. 1 1
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/query/QueryWrapper.java
  2. 3 3
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/handlers/MybatisEnumTypeHandler.java
  3. 6 14
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/AES.java
  4. 1 1
      mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/ReflectionKit.java
  5. 1 1
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/activerecord/Model.java
  6. 1 1
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/conditions/query/LambdaQueryChainWrapper.java
  7. 1 1
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/conditions/query/QueryChainWrapper.java
  8. 1 1
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/conditions/update/LambdaUpdateChainWrapper.java
  9. 1 1
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/conditions/update/UpdateChainWrapper.java
  10. 1 1
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/handlers/FastjsonTypeHandler.java
  11. 1 1
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/handlers/GsonTypeHandler.java
  12. 1 1
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/handlers/JacksonTypeHandler.java
  13. 1 1
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/toolkit/SqlParserUtils.java
  14. 1 1
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/toolkit/SqlRunner.java
  15. 2 0
      mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/toolkit/VersionUtils.java

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

@@ -40,7 +40,7 @@ public class QueryWrapper<T> extends AbstractWrapper<T, String, QueryWrapper<T>>
     /**
      * 查询字段
      */
-    private SharedString sqlSelect = new SharedString();
+    private final SharedString sqlSelect = new SharedString();
 
     public QueryWrapper() {
         this(null);

+ 3 - 3
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/handlers/MybatisEnumTypeHandler.java

@@ -48,17 +48,17 @@ import java.util.concurrent.ConcurrentHashMap;
 public class MybatisEnumTypeHandler<E extends Enum<E>> extends BaseTypeHandler<E> {
 
     private static final Map<String, String> TABLE_METHOD_OF_ENUM_TYPES = new ConcurrentHashMap<>();
-    private static ReflectorFactory reflectorFactory = new DefaultReflectorFactory();
+    private static final ReflectorFactory REFLECTOR_FACTORY = new DefaultReflectorFactory();
     private final Class<E> type;
 
-    private Invoker invoker;
+    private final Invoker invoker;
 
     public MybatisEnumTypeHandler(Class<E> type) {
         if (type == null) {
             throw new IllegalArgumentException("Type argument cannot be null");
         }
         this.type = type;
-        MetaClass metaClass = MetaClass.forClass(type, reflectorFactory);
+        MetaClass metaClass = MetaClass.forClass(type, REFLECTOR_FACTORY);
         String name = "value";
         if (!IEnum.class.isAssignableFrom(type)) {
             name = findEnumValueFieldName(this.type).orElseThrow(() -> new IllegalArgumentException(String.format("Could not find @EnumValue in Class: %s.", this.type.getName())));

+ 6 - 14
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/AES.java

@@ -20,7 +20,7 @@ import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
 import javax.crypto.Cipher;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.security.NoSuchAlgorithmException;
 import java.util.Base64;
 
@@ -80,12 +80,8 @@ public class AES {
      * @return
      */
     public static String encrypt(String data, String key) {
-        try {
-            byte[] valueByte = encrypt(data.getBytes(Constants.UTF_8), key.getBytes(Constants.UTF_8));
-            return Base64.getEncoder().encodeToString(valueByte);
-        } catch (UnsupportedEncodingException e) {
-            throw new MybatisPlusException(e);
-        }
+        byte[] valueByte = encrypt(data.getBytes(StandardCharsets.UTF_8), key.getBytes(StandardCharsets.UTF_8));
+        return Base64.getEncoder().encodeToString(valueByte);
     }
 
     /**
@@ -96,13 +92,9 @@ public class AES {
      * @return
      */
     public static String decrypt(String data, String key) {
-        try {
-            byte[] originalData = Base64.getDecoder().decode(data.getBytes());
-            byte[] valueByte = decrypt(originalData, key.getBytes(Constants.UTF_8));
-            return new String(valueByte);
-        } catch (UnsupportedEncodingException e) {
-            throw new MybatisPlusException(e);
-        }
+        byte[] originalData = Base64.getDecoder().decode(data.getBytes());
+        byte[] valueByte = decrypt(originalData, key.getBytes(StandardCharsets.UTF_8));
+        return new String(valueByte);
     }
 
     /**

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

@@ -80,7 +80,7 @@ public final class ReflectionKit {
      * @return 属性值
      */
     public static Object getFieldValue(Object entity, String fieldName) {
-        Class cls = entity.getClass();
+        Class<?> cls = entity.getClass();
         Map<String, Field> fieldMaps = getFieldMap(cls);
         try {
             Field field = fieldMaps.get(fieldName);

+ 1 - 1
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/activerecord/Model.java

@@ -47,7 +47,7 @@ public abstract class Model<T extends Model<?>> implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    private transient Log log = LogFactory.getLog(getClass());
+    private final transient Log log = LogFactory.getLog(getClass());
 
     /**
      * 插入(字段选择插入)

+ 1 - 1
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/conditions/query/LambdaQueryChainWrapper.java

@@ -33,7 +33,7 @@ import java.util.function.Predicate;
 public class LambdaQueryChainWrapper<T> extends AbstractChainWrapper<T, SFunction<T, ?>, LambdaQueryChainWrapper<T>, LambdaQueryWrapper<T>>
     implements ChainQuery<T>, Query<LambdaQueryChainWrapper<T>, T, SFunction<T, ?>> {
 
-    private BaseMapper<T> baseMapper;
+    private final BaseMapper<T> baseMapper;
 
     public LambdaQueryChainWrapper(BaseMapper<T> baseMapper) {
         super();

+ 1 - 1
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/conditions/query/QueryChainWrapper.java

@@ -34,7 +34,7 @@ import java.util.function.Predicate;
 public class QueryChainWrapper<T> extends AbstractChainWrapper<T, String, QueryChainWrapper<T>, QueryWrapper<T>>
     implements ChainQuery<T>, Query<QueryChainWrapper<T>, T, String> {
 
-    private BaseMapper<T> baseMapper;
+    private final BaseMapper<T> baseMapper;
 
     public QueryChainWrapper(BaseMapper<T> baseMapper) {
         super();

+ 1 - 1
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/conditions/update/LambdaUpdateChainWrapper.java

@@ -32,7 +32,7 @@ import com.baomidou.mybatisplus.extension.conditions.AbstractChainWrapper;
 public class LambdaUpdateChainWrapper<T> extends AbstractChainWrapper<T, SFunction<T, ?>, LambdaUpdateChainWrapper<T>, LambdaUpdateWrapper<T>>
     implements ChainUpdate<T>, Update<LambdaUpdateChainWrapper<T>, SFunction<T, ?>> {
 
-    private BaseMapper<T> baseMapper;
+    private final BaseMapper<T> baseMapper;
 
     public LambdaUpdateChainWrapper(BaseMapper<T> baseMapper) {
         super();

+ 1 - 1
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/conditions/update/UpdateChainWrapper.java

@@ -31,7 +31,7 @@ import com.baomidou.mybatisplus.extension.conditions.AbstractChainWrapper;
 public class UpdateChainWrapper<T> extends AbstractChainWrapper<T, String, UpdateChainWrapper<T>, UpdateWrapper<T>>
     implements ChainUpdate<T>, Update<UpdateChainWrapper<T>, String> {
 
-    private BaseMapper<T> baseMapper;
+    private final BaseMapper<T> baseMapper;
 
     public UpdateChainWrapper(BaseMapper<T> baseMapper) {
         super();

+ 1 - 1
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/handlers/FastjsonTypeHandler.java

@@ -33,7 +33,7 @@ import org.apache.ibatis.type.MappedTypes;
 @MappedTypes({Object.class})
 @MappedJdbcTypes(JdbcType.VARCHAR)
 public class FastjsonTypeHandler extends AbstractJsonTypeHandler<Object> {
-    private Class<?> type;
+    private final Class<?> type;
 
     public FastjsonTypeHandler(Class<?> type) {
         if (log.isTraceEnabled()) {

+ 1 - 1
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/handlers/GsonTypeHandler.java

@@ -33,7 +33,7 @@ import org.apache.ibatis.type.MappedTypes;
 @MappedJdbcTypes(JdbcType.VARCHAR)
 public class GsonTypeHandler extends AbstractJsonTypeHandler<Object> {
     private static Gson gson = new Gson();
-    private Class<?> type;
+    private final Class<?> type;
 
     public GsonTypeHandler(Class<?> type) {
         if (log.isTraceEnabled()) {

+ 1 - 1
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/handlers/JacksonTypeHandler.java

@@ -36,7 +36,7 @@ import java.io.IOException;
 @MappedJdbcTypes(JdbcType.VARCHAR)
 public class JacksonTypeHandler extends AbstractJsonTypeHandler<Object> {
     private static ObjectMapper objectMapper = new ObjectMapper();
-    private Class<?> type;
+    private final Class<?> type;
 
     public JacksonTypeHandler(Class<?> type) {
         if (log.isTraceEnabled()) {

+ 1 - 1
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/toolkit/SqlParserUtils.java

@@ -30,7 +30,7 @@ import java.util.Optional;
  */
 public class SqlParserUtils {
 
-    private static ISqlParser COUNT_SQL_PARSER = new JsqlParserCountOptimize();
+    private static final ISqlParser COUNT_SQL_PARSER = new JsqlParserCountOptimize();
 
     /**
      * 获取 COUNT 原生 SQL 包装

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

@@ -38,7 +38,7 @@ import java.util.Map;
  */
 public class SqlRunner implements ISqlRunner {
 
-    private Log log = LogFactory.getLog(SqlRunner.class);
+    private final Log log = LogFactory.getLog(SqlRunner.class);
     // 单例Query
     public static final SqlRunner DEFAULT = new SqlRunner();
     // 默认FACTORY

+ 2 - 0
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/toolkit/VersionUtils.java

@@ -23,7 +23,9 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
  *
  * @author Caratacus
  * @since 2016-12-5
+ * @deprecated 3.4.1
  */
+@Deprecated
 public class VersionUtils {
 
     /**