浏览代码

格式化一下秋秋的代码

miemie 6 年之前
父节点
当前提交
36b539b3a4

+ 7 - 6
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/metadata/TableFieldInfo.java

@@ -24,6 +24,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.core.config.GlobalConfig;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+
 import lombok.Getter;
 import lombok.Setter;
 
@@ -105,7 +106,7 @@ public class TableFieldInfo {
      * </p>
      */
     public TableFieldInfo(boolean underCamel, GlobalConfig.DbConfig dbConfig, TableInfo tableInfo,
-                          String column, String el, Field field, TableField tableField,Class<?> parentClass) {
+                          String column, String el, Field field, TableField tableField, Class<?> parentClass) {
         this.property = field.getName();
         this.propertyType = field.getType();
         /*
@@ -151,7 +152,7 @@ public class TableFieldInfo {
         this.parentClass = parentClass;
     }
 
-    public TableFieldInfo(boolean underCamel, GlobalConfig.DbConfig dbConfig, TableInfo tableInfo, Field field,Class<?> parentClass) {
+    public TableFieldInfo(boolean underCamel, GlobalConfig.DbConfig dbConfig, TableInfo tableInfo, Field field, Class<?> parentClass) {
         if (dbConfig.isColumnUnderline()) {
             /* 开启字段下划线申明 */
             this.setColumn(dbConfig, StringUtils.camelToUnderline(field.getName()));
@@ -290,6 +291,10 @@ public class TableFieldInfo {
         return condition;
     }
 
+    public void setCondition(String condition) {
+        this.condition = condition;
+    }
+
     public void setCondition(GlobalConfig.DbConfig dbConfig) {
         /**
          * 全局配置开启字段 LIKE 并且为字符串类型字段
@@ -302,10 +307,6 @@ public class TableFieldInfo {
         }
     }
 
-    public void setCondition(String condition) {
-        this.condition = condition;
-    }
-
     public FieldFill getFieldFill() {
         return fieldFill;
     }

+ 3 - 2
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/metadata/TableInfo.java

@@ -17,8 +17,6 @@ package com.baomidou.mybatisplus.core.metadata;
 
 import java.util.List;
 
-import lombok.Getter;
-import lombok.Setter;
 import org.apache.ibatis.session.Configuration;
 
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -27,6 +25,9 @@ import com.baomidou.mybatisplus.core.config.GlobalConfig;
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 
+import lombok.Getter;
+import lombok.Setter;
+
 /**
  * <p>
  * 数据库表反射信息

+ 14 - 13
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/toolkit/LambdaUtils.java

@@ -65,27 +65,28 @@ public final class LambdaUtils {
      * 缓存实体类名与表字段映射关系
      * </p>
      *
-     * @param clazz 实体
+     * @param clazz     实体
      * @param tableInfo 表信息
      */
     public static void createCache(Class clazz, TableInfo tableInfo) {
-        LAMBDA_CACHE.put(clazz.getName(), createLambdaMap(tableInfo,clazz));
+        LAMBDA_CACHE.put(clazz.getName(), createLambdaMap(tableInfo, clazz));
 
     }
 
     /**
      * 保存缓存信息
+     *
      * @param className 类名
-     * @param property 属性
-     * @param column 字段
+     * @param property  属性
+     * @param column    字段
      */
-    private static void saveCache(String className,String property,String column){
+    private static void saveCache(String className, String property, String column) {
         Map<String, String> cacheMap = LAMBDA_CACHE.get(className);
-        if(cacheMap==null){
+        if (cacheMap == null) {
             cacheMap = new HashMap<>();
         }
-        cacheMap.put(property,column);
-        LAMBDA_CACHE.put(className,cacheMap);
+        cacheMap.put(property, column);
+        LAMBDA_CACHE.put(className, cacheMap);
     }
 
     /**
@@ -96,17 +97,17 @@ public final class LambdaUtils {
      * @param tableInfo 表信息
      * @return
      */
-    private static Map<String, String> createLambdaMap(TableInfo tableInfo,Class clazz) {
+    private static Map<String, String> createLambdaMap(TableInfo tableInfo, Class clazz) {
         Map<String, String> map = new HashMap<>(16);
         if (StringUtils.isNotEmpty(tableInfo.getKeyProperty())) {
-            if(tableInfo.getParentClass()!=clazz){
-                saveCache(tableInfo.getParentClass().getName(),tableInfo.getKeyProperty(), tableInfo.getKeyColumn());
+            if (tableInfo.getParentClass() != clazz) {
+                saveCache(tableInfo.getParentClass().getName(), tableInfo.getKeyProperty(), tableInfo.getKeyColumn());
             }
             map.put(tableInfo.getKeyProperty(), tableInfo.getKeyColumn());
         }
         tableInfo.getFieldList().forEach(i -> {
-            if(i.getParentClass()!=clazz){
-                saveCache(i.getParentClass().getName(),i.getProperty(), i.getColumn());
+            if (i.getParentClass() != clazz) {
+                saveCache(i.getParentClass().getName(), i.getProperty(), i.getColumn());
             }
             map.put(i.getProperty(), i.getColumn());
         });

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

@@ -410,7 +410,7 @@ public class TableInfoHelper {
         if (columns.length == els.length) {
             for (int i = 0; i < columns.length; i++) {
                 fieldList.add(new TableFieldInfo(underCamel, dbConfig, tableInfo,
-                    columns[i], els[i], field, tableField,field.getDeclaringClass()));
+                    columns[i], els[i], field, tableField, field.getDeclaringClass()));
             }
             return true;
         }