Merge remote-tracking branch 'origin/3.0' into 3.0

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/config/DbConfig.java

@@ -1,20 +1,18 @@
 package com.baomidou.mybatisplus.core.config;
 
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.core.handlers.SqlReservedWordsHandler;
 import com.baomidou.mybatisplus.core.incrementer.IKeyGenerator;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
  * 数据库相关配置
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 public class DbConfig {
 

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

@@ -15,21 +15,20 @@
  */
 package com.baomidou.mybatisplus.core.config;
 
+import java.io.Serializable;
+import java.util.Set;
+import java.util.concurrent.ConcurrentSkipListSet;
+
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
+
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import com.baomidou.mybatisplus.core.incrementer.IKeyGenerator;
 import com.baomidou.mybatisplus.core.injector.ISqlInjector;
 import com.baomidou.mybatisplus.core.toolkit.GlobalConfigUtils;
+
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import org.apache.ibatis.session.SqlSession;
-import org.apache.ibatis.session.SqlSessionFactory;
-
-import java.io.Serializable;
-import java.util.Set;
-import java.util.concurrent.ConcurrentSkipListSet;
-
 /**
  * <p>
  * Mybatis 全局缓存
@@ -39,7 +38,6 @@ import java.util.concurrent.ConcurrentSkipListSet;
  * @since 2016-12-06
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 public class GlobalConfig implements Serializable {
 

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/api/ApiResult.java

@@ -15,9 +15,13 @@
  */
 package com.baomidou.mybatisplus.extension.api;
 
+import java.util.Optional;
+
 import com.baomidou.mybatisplus.extension.enums.ApiErrorCode;
 import com.baomidou.mybatisplus.extension.exceptions.ApiException;
 
+import lombok.Data;
+
 /**
  * <p>
  * REST API 返回结果
@@ -26,6 +30,7 @@ import com.baomidou.mybatisplus.extension.exceptions.ApiException;
  * @author hubin
  * @since 2018-06-05
  */
+@Data
 public class ApiResult<T> {
 
     /**
@@ -46,9 +51,7 @@ public class ApiResult<T> {
     }
 
     public ApiResult(IErrorCode errorCode) {
-        if (errorCode == null) {
-            errorCode = ApiErrorCode.FAILED;
-        }
+        errorCode = Optional.ofNullable(errorCode).orElse(ApiErrorCode.FAILED);
         this.code = errorCode.getCode();
         this.msg = errorCode.getMsg();
     }
@@ -90,28 +93,4 @@ public class ApiResult<T> {
         }
         return data;
     }
-
-    public T getData() {
-        return data;
-    }
-
-    public void setData(T data) {
-        this.data = data;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
 }

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/handlers/SqlParserHandler.java

@@ -28,7 +28,6 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
@@ -40,7 +39,6 @@ import lombok.experimental.Accessors;
  * @since 2016-08-31
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 public abstract class SqlParserHandler {