移除ClassUtils#getPackageAndSimpleName方法.

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

@@ -128,21 +128,6 @@ public final class ClassUtils {
         }
     }
 
-    /**
-     * 获取【 包名 + 类名 】完整路径字符串
-     *
-     * @param clazz
-     * @return
-     */
-    public static String getPackageAndSimpleName(Class<?> clazz) {
-        String pkg = getPackageName(clazz);
-        if (StringUtils.isNotEmpty(pkg)) {
-            pkg += "." + clazz.getSimpleName();
-        } else {
-            pkg = clazz.getSimpleName();
-        }
-        return pkg;
-    }
 
     /**
      * Determine the name of the package of the given class,

mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/StrategyConfig.java

@@ -16,8 +16,6 @@
 package com.baomidou.mybatisplus.generator.config;
 
 import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
-import com.baomidou.mybatisplus.core.toolkit.ClassUtils;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.generator.config.po.TableFill;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
@@ -28,7 +26,6 @@ import lombok.experimental.Accessors;
 
 import java.lang.reflect.Field;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 策略配置项
@@ -271,13 +268,13 @@ public class StrategyConfig {
         if (null != columnNaming) {
             this.columnNaming = columnNaming;
         }
-        this.superEntityClass = ClassUtils.getPackageAndSimpleName(clazz);
+        this.superEntityClass = clazz.getName();
         convertSuperEntityColumns(clazz);
         return this;
     }
 
     public void setSuperControllerClass(Class<?> clazz) {
-        this.superControllerClass = ClassUtils.getPackageAndSimpleName(clazz);
+        this.superControllerClass = clazz.getName();
     }
 
     /**
@@ -289,14 +286,12 @@ public class StrategyConfig {
      */
     protected void convertSuperEntityColumns(Class<?> clazz) {
         List<Field> fields = TableInfoHelper.getAllFields(clazz);
-        if (CollectionUtils.isNotEmpty(fields)) {
-            this.superEntityColumns = fields.stream().map(field -> {
-                if (null == columnNaming || columnNaming == NamingStrategy.no_change) {
-                    return field.getName();
-                }
-                return StringUtils.camelToUnderline(field.getName());
-            }).collect(Collectors.toSet()).stream().toArray(String[]::new);
-        }
+        this.superEntityColumns = fields.stream().map(field -> {
+            if (null == columnNaming || columnNaming == NamingStrategy.no_change) {
+                return field.getName();
+            }
+            return StringUtils.camelToUnderline(field.getName());
+        }).distinct().toArray(String[]::new);
     }
 
     /**