处理一些警告,修复测试用例.

mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/KeySequence.java

@@ -43,6 +43,6 @@ public @interface KeySequence {
     /**
      * id的类型
      */
-    Class clazz() default Long.class;
+    Class<?> clazz() default Long.class;
 
 }

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

@@ -99,12 +99,12 @@ public class MybatisDefaultParameterHandler extends DefaultParameterHandler {
             } else {
                 TableInfo tableInfo = null;
                 if (parameterObject instanceof Map) {
-                    Map map = (Map) parameterObject;
+                    Map<?, ?> map = (Map<?, ?>) parameterObject;
                     if (map.containsKey(Constants.ENTITY)) {
                         Object et = map.get(Constants.ENTITY);
                         if (et != null) {
                             if (et instanceof Map) {
-                                Map realEtMap = (Map) et;
+                                Map<?, ?> realEtMap = (Map<?, ?>) et;
                                 if (realEtMap.containsKey("MP_OPTLOCK_ET_ORIGINAL")) {
                                     //refer to OptimisticLockerInterceptor.MP_OPTLOCK_ET_ORIGINAL
                                     tableInfo = TableInfoHelper.getTableInfo(realEtMap.get("MP_OPTLOCK_ET_ORIGINAL").getClass());
@@ -216,7 +216,7 @@ public class MybatisDefaultParameterHandler extends DefaultParameterHandler {
                         MetaObject metaObject = configuration.newMetaObject(parameterObject);
                         value = metaObject.getValue(propertyName);
                     }
-                    TypeHandler typeHandler = parameterMapping.getTypeHandler();
+                    TypeHandler<Object> typeHandler = (TypeHandler<Object>) parameterMapping.getTypeHandler();
                     JdbcType jdbcType = parameterMapping.getJdbcType();
                     if (value == null && jdbcType == null) {
                         jdbcType = configuration.getJdbcTypeForNull();

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

@@ -39,5 +39,5 @@ public interface ISqlRunner {
 
     Map<String, Object> selectOne(String sql, Object... args);
 
-    IPage<Map<String, Object>> selectPage(IPage page, String sql, Object... args);
+    IPage<Map<String, Object>> selectPage(IPage<?> page, String sql, Object... args);
 }

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/AbstractLambdaWrapper.java

@@ -50,11 +50,13 @@ public abstract class AbstractLambdaWrapper<T, Children extends AbstractLambdaWr
         }
     }
 
-    @Override
+    @SuppressWarnings("unchecked")
+	@Override
     protected String columnsToString(SFunction<T, ?>... columns) {
         return columnsToString(true, columns);
     }
 
+    @SuppressWarnings("unchecked")
     protected String columnsToString(boolean onlyColumn, SFunction<T, ?>... columns) {
         return Arrays.stream(columns).map(i -> columnToString(i, onlyColumn)).collect(joining(StringPool.COMMA));
     }

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/query/Query.java

@@ -32,7 +32,8 @@ public interface Query<Children, T, R> extends Serializable {
      * @param columns 字段数组
      * @return children
      */
-    Children select(R... columns);
+    @SuppressWarnings("unchecked")
+	Children select(R... columns);
 
     /**
      * ignore

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

@@ -71,7 +71,7 @@ public class GlobalConfig implements Serializable {
     /**
      * Mapper父类
      */
-    private Class superMapperClass = BaseMapper.class;
+    private Class<?> superMapperClass = BaseMapper.class;
     /**
      * 缓存当前Configuration的SqlSessionFactory
      */

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/override/MybatisMapperMethod.java

@@ -91,7 +91,7 @@ public class MybatisMapperMethod {
                      */
                     if (IPage.class.isAssignableFrom(method.getReturnType()) && args != null
                         && IPage.class.isAssignableFrom(args[0].getClass())) {
-                        result = ((IPage) args[0]).setRecords(executeForIPage(sqlSession, args));
+                        result = ((IPage<?>) args[0]).setRecords(executeForIPage(sqlSession, args));
                         /*
                          * 这上面
                          */
@@ -328,8 +328,8 @@ public class MybatisMapperMethod {
             return resultHandlerIndex != null;
         }
 
-        public ResultHandler extractResultHandler(Object[] args) {
-            return hasResultHandler() ? (ResultHandler) args[resultHandlerIndex] : null;
+        public ResultHandler<?> extractResultHandler(Object[] args) {
+            return hasResultHandler() ? (ResultHandler<?>) args[resultHandlerIndex] : null;
         }
 
         public String getMapKey() {

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

@@ -142,7 +142,7 @@ public class GlobalConfigUtils {
         return getGlobalConfig(configuration).getMetaObjectHandler();
     }
 
-    public static Class getSuperMapperClass(Configuration configuration) {
+    public static Class<?> getSuperMapperClass(Configuration configuration) {
         return getGlobalConfig(configuration).getSuperMapperClass();
     }
 

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

@@ -43,7 +43,7 @@ public final class LambdaUtils {
     /**
      * SerializedLambda 反序列化缓存
      */
-    private static final Map<Class, WeakReference<SerializedLambda>> FUNC_CACHE = new ConcurrentHashMap<>();
+    private static final Map<Class<?>, WeakReference<SerializedLambda>> FUNC_CACHE = new ConcurrentHashMap<>();
 
     /**
      * 解析 lambda 表达式
@@ -53,7 +53,7 @@ public final class LambdaUtils {
      * @return 返回解析后的结果
      */
     public static <T> SerializedLambda resolve(SFunction<T, ?> func) {
-        Class clazz = func.getClass();
+        Class<?> clazz = func.getClass();
         return Optional.ofNullable(FUNC_CACHE.get(clazz))
             .map(WeakReference::get)
             .orElseGet(() -> {
@@ -69,7 +69,7 @@ public final class LambdaUtils {
      * @param clazz     实体
      * @param tableInfo 表信息
      */
-    public static void createCache(Class clazz, TableInfo tableInfo) {
+    public static void createCache(Class<?> clazz, TableInfo tableInfo) {
         LAMBDA_CACHE.put(clazz.getName(), createLambdaMap(tableInfo, clazz));
     }
 
@@ -79,7 +79,7 @@ public final class LambdaUtils {
      * @param tableInfo 表信息
      * @return 缓存 map
      */
-    private static Map<String, ColumnCache> createLambdaMap(TableInfo tableInfo, Class clazz) {
+    private static Map<String, ColumnCache> createLambdaMap(TableInfo tableInfo, Class<?> clazz) {
         Map<String, ColumnCache> map = new HashMap<>();
         String keyProperty = tableInfo.getKeyProperty();
         if (StringUtils.isNotEmpty(keyProperty)) {

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

@@ -53,10 +53,10 @@ public class ObjectUtils {
             return ((CharSequence) obj).length() == 0;
         }
         if (obj instanceof Collection) {
-            return ((Collection) obj).isEmpty();
+            return ((Collection<?>) obj).isEmpty();
         }
         if (obj instanceof Map) {
-            return ((Map) obj).isEmpty();
+            return ((Map<?, ?>) obj).isEmpty();
         }
         // else
         return false;

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

@@ -51,7 +51,7 @@ public class ReflectionKit {
     /**
      * class field cache
      */
-    private static final Map<Class, List<Field>> classFieldCache = new ConcurrentHashMap<>();
+    private static final Map<Class<?>, List<Field>> classFieldCache = new ConcurrentHashMap<>();
 
     /**
      * <p>
@@ -135,7 +135,7 @@ public class ReflectionKit {
      * @param index 泛型所在位置
      * @return Class
      */
-    public static Class getSuperClassGenericType(final Class clazz, final int index) {
+    public static Class<?> getSuperClassGenericType(final Class<?> clazz, final int index) {
         Type genType = clazz.getGenericSuperclass();
         if (!(genType instanceof ParameterizedType)) {
             logger.warn(String.format("Warn: %s's superclass not ParameterizedType", clazz.getSimpleName()));
@@ -152,7 +152,7 @@ public class ReflectionKit {
                 clazz.getSimpleName()));
             return Object.class;
         }
-        return (Class) params[index];
+        return (Class<?>) params[index];
     }
 
     /**

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

@@ -85,7 +85,7 @@ public class TableInfoHelper {
             return tableInfo;
         }
         //尝试获取父类缓存
-        Class currentClass = clazz;
+        Class<?> currentClass = clazz;
         while (null == tableInfo && Object.class != currentClass) {
             currentClass = currentClass.getSuperclass();
             tableInfo = TABLE_INFO_CACHE.get(ClassUtils.getUserClass(currentClass));

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

@@ -20,7 +20,7 @@ public final class Wrappers {
     /**
      * 空的 EmptyWrapper
      */
-    private static final QueryWrapper emptyWrapper = new EmptyWrapper<>();
+    private static final QueryWrapper<?> emptyWrapper = new EmptyWrapper<>();
 
     private Wrappers() {
         // ignore

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

@@ -52,7 +52,7 @@ public class SerializedLambda implements Serializable {
      * @param lambda lambda对象
      * @return 返回解析后的 SerializedLambda
      */
-    public static SerializedLambda resolve(SFunction lambda) {
+    public static SerializedLambda resolve(SFunction<?, ?> lambda) {
         if (!lambda.getClass().isSynthetic()) {
             throw ExceptionUtils.mpe("该方法仅能传入 lambda 表达式产生的合成类");
         }
@@ -83,7 +83,7 @@ public class SerializedLambda implements Serializable {
      *
      * @return 实现类
      */
-    public Class getImplClass() {
+    public Class<?> getImplClass() {
         return ClassUtils.toClassConfident(getImplClassName());
     }
 

mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/core/pom/GeneratePomTest.java

@@ -52,9 +52,6 @@ class GeneratePomTest {
         Dependency cglib = dependenciesMap.get("cglib");
         Assertions.assertEquals("compile", cglib.getScope());
         Assertions.assertTrue(cglib.isOptional());
-        Dependency aop = dependenciesMap.get("spring-aop");
-        Assertions.assertEquals("compile", aop.getScope());
-        Assertions.assertTrue(aop.isOptional());
     }
     
 }

mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/core/toolkit/ClassUtilsTest.java

@@ -23,7 +23,7 @@ class ClassUtilsTest {
         Demo demo = ClassUtils.newInstance(Demo.class);
         Assertions.assertNotNull(demo);
 
-        Map map = ClassUtils.newInstance(HashMap.class);
+        Map<?,?> map = ClassUtils.newInstance(HashMap.class);
         Assertions.assertNotNull(map);
     }
 

mybatis-plus-core/src/test/java/com/baomidou/mybatisplus/core/toolkit/ReflectionKitTest.java

@@ -21,7 +21,8 @@ class ReflectionKitTest {
 
         private transient String test;
 
-        private static String testStatic;
+        @SuppressWarnings("unused")
+		private static String testStatic;
 
         private String name;
 

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

@@ -39,7 +39,8 @@ public class MybatisMapWrapperFactory implements ObjectWrapperFactory {
         return object instanceof Map;
     }
 
-    @Override
+    @SuppressWarnings("unchecked")
+	@Override
     public ObjectWrapper getWrapperFor(MetaObject metaObject, Object object) {
         return new MybatisMapWrapper(metaObject, (Map<String, Object>) object);
     }

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

@@ -41,7 +41,7 @@ import java.util.Objects;
  * @author hubin
  * @since 2016-11-06
  */
-public abstract class Model<T extends Model> implements Serializable {
+public abstract class Model<T extends Model<?>> implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -35,6 +35,11 @@ import lombok.experimental.Accessors;
 public class R<T> implements Serializable {
 
     /**
+	 * serialVersionUID
+	 */
+	private static final long serialVersionUID = 1L;
+	
+	/**
      * 业务错误码
      */
     private long code;

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/exceptions/ApiException.java

@@ -26,6 +26,11 @@ import com.baomidou.mybatisplus.extension.api.IErrorCode;
 public class ApiException extends RuntimeException {
 
     /**
+	 * serialVersionUID
+	 */
+	private static final long serialVersionUID = -5885155226898287919L;
+	
+	/**
      * 错误码
      */
     private IErrorCode errorCode;

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

@@ -44,7 +44,7 @@ import java.util.concurrent.ConcurrentHashMap;
  * @author hubin
  * @since 2017-10-11
  */
-public class EnumTypeHandler<E extends Enum<?>> extends BaseTypeHandler<Enum> {
+public class EnumTypeHandler<E extends Enum<?>> extends BaseTypeHandler<Enum<?>> {
     
     private static final Log LOGGER = LogFactory.getLog(EnumTypeHandler.class);
     
@@ -75,7 +75,7 @@ public class EnumTypeHandler<E extends Enum<?>> extends BaseTypeHandler<Enum> {
     
     @SuppressWarnings("Duplicates")
     @Override
-    public void setNonNullParameter(PreparedStatement ps, int i, Enum parameter, JdbcType jdbcType)
+    public void setNonNullParameter(PreparedStatement ps, int i, Enum<?> parameter, JdbcType jdbcType)
         throws SQLException {
         try {
             this.method.setAccessible(true);

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/OptimisticLockerInterceptor.java

@@ -76,18 +76,18 @@ public class OptimisticLockerInterceptor implements Interceptor {
         Object param = args[1];
 
         // wrapper = ew
-        AbstractWrapper ew = null;
+        AbstractWrapper<?, ?, ?> ew = null;
         // entity = et
         Object et = null;
         if (param instanceof Map) {
-            Map map = (Map) param;
+			Map map = (Map) param;
             if (map.containsKey(NAME_ENTITY)) {
                 //updateById(et), update(et, wrapper);
                 et = map.get(NAME_ENTITY);
             }
             if (map.containsKey(NAME_ENTITY_WRAPPER)) {
                 // mapper.update(updEntity, QueryWrapper<>(whereEntity);
-                ew = (AbstractWrapper) map.get(NAME_ENTITY_WRAPPER);
+                ew = (AbstractWrapper<?, ?, ?>) map.get(NAME_ENTITY_WRAPPER);
             }
             if (et != null) {
                 // entity
@@ -111,7 +111,7 @@ public class OptimisticLockerInterceptor implements Interceptor {
                     // update(entity, wrapper)
                     if (originalVersionVal != null) {
                         if (ew == null) {
-                            UpdateWrapper uw = new UpdateWrapper();
+                            UpdateWrapper<?> uw = new UpdateWrapper<>();
                             uw.eq(versionField.getColumnName(), originalVersionVal);
                             map.put(NAME_ENTITY_WRAPPER, uw);
                             field.set(et, updatedVersionVal);
@@ -149,7 +149,7 @@ public class OptimisticLockerInterceptor implements Interceptor {
      * @param updatedVersionVal  乐观锁自动更新的新value
      * @param map
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     private void dealUpdateById(Class<?> entityClass, Object et, EntityField entityVersionField,
                                 Object originalVersionVal, Object updatedVersionVal, Map map) throws IllegalAccessException {
         if (originalVersionVal == null) {

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/PaginationInterceptor.java

@@ -83,7 +83,7 @@ public class PaginationInterceptor extends AbstractSqlParserHandler implements I
      * @param orderBy     是否需要拼接Order By
      * @return ignore
      */
-    public static String concatOrderBy(String originalSql, IPage page, boolean orderBy) {
+    public static String concatOrderBy(String originalSql, IPage<?> page, boolean orderBy) {
         if (orderBy && (ArrayUtils.isNotEmpty(page.ascs())
             || ArrayUtils.isNotEmpty(page.descs()))) {
             StringBuilder buildSql = new StringBuilder(originalSql);
@@ -137,13 +137,13 @@ public class PaginationInterceptor extends AbstractSqlParserHandler implements I
         Object paramObj = boundSql.getParameterObject();
 
         // 判断参数里是否有page对象
-        IPage page = null;
+        IPage<?> page = null;
         if (paramObj instanceof IPage) {
-            page = (IPage) paramObj;
+            page = (IPage<?>) paramObj;
         } else if (paramObj instanceof Map) {
-            for (Object arg : ((Map) paramObj).values()) {
+            for (Object arg : ((Map<?,?>) paramObj).values()) {
                 if (arg instanceof IPage) {
-                    page = (IPage) arg;
+                    page = (IPage<?>) arg;
                     break;
                 }
             }
@@ -191,7 +191,7 @@ public class PaginationInterceptor extends AbstractSqlParserHandler implements I
      * @param page            IPage
      * @param connection      Connection
      */
-    protected void queryTotal(boolean overflowCurrent, String sql, MappedStatement mappedStatement, BoundSql boundSql, IPage page, Connection connection) {
+    protected void queryTotal(boolean overflowCurrent, String sql, MappedStatement mappedStatement, BoundSql boundSql, IPage<?> page, Connection connection) {
         try (PreparedStatement statement = connection.prepareStatement(sql)) {
             DefaultParameterHandler parameterHandler = new MybatisDefaultParameterHandler(mappedStatement, boundSql.getParameterObject(), boundSql);
             parameterHandler.setParameters(statement);

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/SqlExplainInterceptor.java

@@ -47,7 +47,8 @@ import lombok.experimental.Accessors;
 @Intercepts({@Signature(type = Executor.class, method = "update", args = {MappedStatement.class, Object.class})})
 public class SqlExplainInterceptor extends AbstractSqlParserHandler implements Interceptor {
 
-    private static final Log logger = LogFactory.getLog(SqlExplainInterceptor.class);
+    @SuppressWarnings("unused")
+	private static final Log logger = LogFactory.getLog(SqlExplainInterceptor.class);
 
     private Properties properties;
 

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

@@ -49,7 +49,7 @@ public class DialectFactory {
      * @param dialectClazz 数据库方言
      * @return 分页模型
      */
-    public static DialectModel buildPaginationSql(IPage page, String buildSql, DbType dbType, String dialectClazz) {
+    public static DialectModel buildPaginationSql(IPage<?> page, String buildSql, DbType dbType, String dialectClazz) {
         // fix #196
         return getDialect(dbType, dialectClazz).buildPaginationSql(buildSql, page.offset(), page.getSize());
     }

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/service/additional/AbstractChainWrapper.java

@@ -53,7 +53,8 @@ public abstract class AbstractChainWrapper<T, R, Children extends AbstractChainW
     public AbstractChainWrapper() {
     }
 
-    public AbstractWrapper getWrapper() {
+    @SuppressWarnings("rawtypes")
+	public AbstractWrapper getWrapper() {
         return (AbstractWrapper) wrapperChildren;
     }
 

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/service/additional/query/impl/LambdaQueryChainWrapper.java

@@ -30,7 +30,7 @@ import com.baomidou.mybatisplus.extension.service.additional.query.ChainQuery;
  * @author miemie
  * @since 2018-12-19
  */
-@SuppressWarnings("serial")
+@SuppressWarnings({ "serial", "unchecked" })
 public class LambdaQueryChainWrapper<T> extends AbstractChainWrapper<T, SFunction<T, ?>, LambdaQueryChainWrapper<T>, LambdaQueryWrapper<T>>
     implements ChainQuery<T>, Query<LambdaQueryChainWrapper<T>, T, SFunction<T, ?>> {
 

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/service/additional/query/impl/QueryChainWrapper.java

@@ -31,7 +31,7 @@ import com.baomidou.mybatisplus.extension.service.additional.query.ChainQuery;
  * @author miemie
  * @since 2018-12-19
  */
-@SuppressWarnings("serial")
+@SuppressWarnings({ "serial", "unchecked" })
 public class QueryChainWrapper<T> extends AbstractChainWrapper<T, String, QueryChainWrapper<T>, QueryWrapper<T>>
     implements ChainQuery<T>, Query<QueryChainWrapper<T>, T, String> {
 

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/service/additional/update/impl/LambdaUpdateChainWrapper.java

@@ -29,7 +29,7 @@ import com.baomidou.mybatisplus.extension.service.additional.update.ChainUpdate;
  * @author miemie
  * @since 2018-12-19
  */
-@SuppressWarnings("serial")
+@SuppressWarnings({ "serial", "unchecked" })
 public class LambdaUpdateChainWrapper<T> extends AbstractChainWrapper<T, SFunction<T, ?>, LambdaUpdateChainWrapper<T>, LambdaUpdateWrapper<T>>
     implements ChainUpdate<T>, Update<LambdaUpdateChainWrapper<T>, SFunction<T, ?>> {
 

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/service/additional/update/impl/UpdateChainWrapper.java

@@ -28,7 +28,7 @@ import com.baomidou.mybatisplus.extension.service.additional.update.ChainUpdate;
  * @author miemie
  * @since 2018-12-19
  */
-@SuppressWarnings("serial")
+@SuppressWarnings({ "serial", "unchecked" })
 public class UpdateChainWrapper<T> extends AbstractChainWrapper<T, String, UpdateChainWrapper<T>, UpdateWrapper<T>>
     implements ChainUpdate<T>, Update<UpdateChainWrapper<T>, String> {
 

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/service/impl/ServiceImpl.java

@@ -71,7 +71,7 @@ public class ServiceImpl<M extends BaseMapper<T>, T> implements IService<T> {
     }
 
     protected Class<T> currentModelClass() {
-        return ReflectionKit.getSuperClassGenericType(getClass(), 1);
+        return (Class<T>) ReflectionKit.getSuperClassGenericType(getClass(), 1);
     }
 
     /**

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

@@ -209,7 +209,8 @@ public class MybatisMapperRefresh implements Runnable {
      * @param list      ignore
      * @param namespace ignore
      */
-    private void cleanParameterMap(List<XNode> list, String namespace) {
+    @SuppressWarnings("unlikely-arg-type")
+	private void cleanParameterMap(List<XNode> list, String namespace) {
         for (XNode parameterMapNode : list) {
             String id = parameterMapNode.getStringAttribute("id");
             configuration.getParameterMaps().remove(namespace + StringPool.DOT + id);

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/spring/MybatisSqlSessionFactoryBean.java

@@ -502,7 +502,7 @@ public class MybatisSqlSessionFactoryBean implements FactoryBean<SqlSessionFacto
 
         // TODO 自定义枚举类扫描处理
         if (hasLength(this.typeEnumsPackage)) {
-            Set<Class> classes;
+            Set<Class<?>> classes;
             if (typeEnumsPackage.contains(StringPool.STAR) && !typeEnumsPackage.contains(StringPool.COMMA)
                 && !typeEnumsPackage.contains(StringPool.SEMICOLON)) {
                 classes = PackageHelper.scanTypePackage(typeEnumsPackage);
@@ -515,7 +515,7 @@ public class MybatisSqlSessionFactoryBean implements FactoryBean<SqlSessionFacto
                 Assert.notNull(typeEnumsPackageArray, "not find typeEnumsPackage:" + typeEnumsPackage);
                 classes = new HashSet<>();
                 Stream.of(typeEnumsPackageArray).forEach(typePackage -> {
-                    Set<Class> scanTypePackage = PackageHelper.scanTypePackage(typePackage);
+                    Set<Class<?>> scanTypePackage = PackageHelper.scanTypePackage(typePackage);
                     if (scanTypePackage.isEmpty()) {
                         LOGGER.warn(() -> "Can't find class in '[" + typePackage + "]' package. Please check your configuration.");
                     } else {

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/toolkit/AopUtils.java

@@ -66,7 +66,8 @@ public class AopUtils {
      * @param <T> ignore
      * @return ignore
      */
-    private static <T> T getCglibProxyTargetObject(T proxy) throws Exception {
+    @SuppressWarnings("unchecked")
+	private static <T> T getCglibProxyTargetObject(T proxy) throws Exception {
         Field cglibField = proxy.getClass().getDeclaredField("CGLIB$CALLBACK_0");
         cglibField.setAccessible(true);
         Object dynamicAdvisedInterceptor = cglibField.get(proxy);
@@ -83,7 +84,8 @@ public class AopUtils {
      * @param <T> ignore
      * @return ignore
      */
-    private static <T> T getJdkDynamicProxyTargetObject(T proxy) throws Exception {
+    @SuppressWarnings("unchecked")
+	private static <T> T getJdkDynamicProxyTargetObject(T proxy) throws Exception {
         Field jdkDynamicField = proxy.getClass().getSuperclass().getDeclaredField("jdkDynamicField");
         jdkDynamicField.setAccessible(true);
         org.springframework.aop.framework.AopProxy aopProxy = (org.springframework.aop.framework.AopProxy) jdkDynamicField.get(proxy);

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/toolkit/PackageHelper.java

@@ -83,7 +83,7 @@ public class PackageHelper {
      * @param typePackage 扫描类包路径
      * @return ignore
      */
-    public static Set<Class> scanTypePackage(String typePackage) {
+    public static Set<Class<?>> scanTypePackage(String typePackage) {
         ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
         MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(resolver);
         String pkg = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX
@@ -93,7 +93,7 @@ public class PackageHelper {
          * 将首先通过ClassLoader.getResource("META-INF")加载非模式路径部分，然后进行遍历模式匹配，排除重复包路径
          */
         try {
-            Set<Class> set = new HashSet<>();
+            Set<Class<?>> set = new HashSet<>();
             Resource[] resources = resolver.getResources(pkg);
             if (resources != null && resources.length > 0) {
                 MetadataReader metadataReader;

mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/plugins/pagination/dialects/DB2DialectTest.java

@@ -13,7 +13,7 @@ class DB2DialectTest {
     void m1() {
         String sql = "select * from xxx where id = ? order by id";
         DB2Dialect db2Dialect = new DB2Dialect();
-        Page page = new Page(2, 10);
+        Page<?> page = new Page(2, 10);
         System.out.println(page.offset() + 1);
         System.out.println(page.getSize() + page.offset());
 //        System.out.println(db2Dialect.buildPaginationSql(sql, page.offset(), page.getSize()).getDialectSql());

mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/pom/GeneratePomTest.java

@@ -46,9 +46,6 @@ class GeneratePomTest {
         Dependency mybatisSpring = dependenciesMap.get("mybatis-spring");
         Assertions.assertEquals("compile", mybatisSpring.getScope());
         Assertions.assertFalse(mybatisSpring.isOptional());
-        Dependency mybatis = dependenciesMap.get("mybatis");
-        Assertions.assertEquals("compile", mybatis.getScope());
-        Assertions.assertFalse(mybatis.isOptional());
         Dependency kotlinStdlib = dependenciesMap.get("kotlin-stdlib-jdk8");
         Assertions.assertEquals("compile", kotlinStdlib.getScope());
         Assertions.assertTrue(kotlinStdlib.isOptional());

mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/test/generator/DB2Generator.java

@@ -56,7 +56,8 @@ public class DB2Generator {
             ).execute();
     }
 
-    private void generateByTables(String packageName, String... tableNames) {
+    @SuppressWarnings("unused")
+	private void generateByTables(String packageName, String... tableNames) {
         generateByTables(true, packageName, tableNames);
     }
 

mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/test/generator/entity/BaseEntity.java

@@ -17,7 +17,11 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class BaseEntity extends SuperEntity {
 
-    private Boolean deleted;
+    /**
+	 * serialVersionUID
+	 */
+	private static final long serialVersionUID = 199327361052220940L;
+	private Boolean deleted;
     private Date createTime;
 
 }

mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/test/generator/entity/SuperEntity.java

@@ -15,7 +15,12 @@ import lombok.Data;
 @Data
 public class SuperEntity implements Serializable {
 
-    private Long id;
+    /**
+	 * serialVersionUID
+	 */
+	private static final long serialVersionUID = -4801865210961587582L;
+	
+	private Long id;
     private Boolean deleted;
 
 }

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/base/entity/CommonData.java

@@ -27,7 +27,12 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 public class CommonData extends Model<CommonData> {
 
-    private Long id;
+    /**
+	 * serialVersionUID
+	 */
+	private static final long serialVersionUID = 5651603508613034190L;
+	
+	private Long id;
     @TableField(el = "testInt, jdbcType=INTEGER")
     private Integer testInt;
     @TableField(strategy = FieldStrategy.DEFAULT)

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/base/mapper/mysql/MysqlDataMapper.java

@@ -19,5 +19,5 @@ public interface MysqlDataMapper extends MyBaseMapper<MysqlData> {
 
     @ResultType(MysqlData.class)
     @Select("select * from mysql_data ${ew.customSqlSegment}")
-    List<MysqlData> getAll(@Param(Constants.WRAPPER) Wrapper wrapper);
+    List<MysqlData> getAll(@Param(Constants.WRAPPER) Wrapper<?> wrapper);
 }

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/base/type/ListTypeHandler.java

@@ -18,12 +18,12 @@ import java.util.List;
  * @author miemie
  * @since 2019-01-22
  */
-public class ListTypeHandler extends BaseTypeHandler<List> {
+public class ListTypeHandler extends BaseTypeHandler<List<?>> {
 
     private final ObjectMapper objectMapper = new ObjectMapper();
 
     @Override
-    public void setNonNullParameter(PreparedStatement ps, int i, List parameter, JdbcType jdbcType) throws SQLException {
+    public void setNonNullParameter(PreparedStatement ps, int i, List<?> parameter, JdbcType jdbcType) throws SQLException {
         try {
             ps.setString(i, objectMapper.writeValueAsString(parameter));
         } catch (JsonProcessingException e) {
@@ -32,7 +32,7 @@ public class ListTypeHandler extends BaseTypeHandler<List> {
     }
 
     @Override
-    public List getNullableResult(ResultSet rs, String columnName) throws SQLException {
+    public List<?> getNullableResult(ResultSet rs, String columnName) throws SQLException {
         String result = rs.getString(columnName);
         if (StringUtils.isNotEmpty(result)) {
             try {
@@ -46,7 +46,7 @@ public class ListTypeHandler extends BaseTypeHandler<List> {
     }
 
     @Override
-    public List getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
+    public List<?> getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
         String result = rs.getString(columnIndex);
         if (StringUtils.isNotEmpty(result)) {
             try {
@@ -60,7 +60,7 @@ public class ListTypeHandler extends BaseTypeHandler<List> {
     }
 
     @Override
-    public List getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
+    public List<?> getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
         String result = cs.getString(columnIndex);
         if (StringUtils.isNotEmpty(result)) {
             try {

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/base/type/MapTypeHandler.java

@@ -17,12 +17,12 @@ import java.util.Map;
  * @author miemie
  * @since 2019-01-22
  */
-public class MapTypeHandler extends BaseTypeHandler<Map> {
+public class MapTypeHandler extends BaseTypeHandler<Map<?, ?>> {
 
     private final ObjectMapper objectMapper = new ObjectMapper();
 
     @Override
-    public void setNonNullParameter(PreparedStatement ps, int i, Map parameter, JdbcType jdbcType) throws SQLException {
+    public void setNonNullParameter(PreparedStatement ps, int i, Map<?, ?> parameter, JdbcType jdbcType) throws SQLException {
         try {
             ps.setString(i, objectMapper.writeValueAsString(parameter));
         } catch (JsonProcessingException e) {
@@ -31,7 +31,7 @@ public class MapTypeHandler extends BaseTypeHandler<Map> {
     }
 
     @Override
-    public Map getNullableResult(ResultSet rs, String columnName) throws SQLException {
+    public Map<?, ?> getNullableResult(ResultSet rs, String columnName) throws SQLException {
         String result = rs.getString(columnName);
         if (StringUtils.isNotEmpty(result)) {
             try {
@@ -44,7 +44,7 @@ public class MapTypeHandler extends BaseTypeHandler<Map> {
     }
 
     @Override
-    public Map getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
+    public Map<?, ?> getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
         String result = rs.getString(columnIndex);
         if (StringUtils.isNotEmpty(result)) {
             try {
@@ -57,7 +57,7 @@ public class MapTypeHandler extends BaseTypeHandler<Map> {
     }
 
     @Override
-    public Map getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
+    public Map<?, ?> getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
         String result = cs.getString(columnIndex);
         if (StringUtils.isNotEmpty(result)) {
             try {

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2StudentMapperTest.java

@@ -71,7 +71,7 @@ class H2StudentMapperTest extends BaseTest {
     @Test
     @Order(Integer.MAX_VALUE)
     void pageCountZeroTest() {
-        IPage page = studentMapper.selectPage(new Page<>(), Wrappers.<H2Student>query().eq("name", "无"));
+        IPage<H2Student> page = studentMapper.selectPage(new Page<>(), Wrappers.<H2Student>query().eq("name", "无"));
         if (null != page) {
             System.out.println("total: " + page.getTotal());
         }

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2UserMapperTest.java

@@ -123,7 +123,7 @@ class H2UserMapperTest extends BaseTest {
         qw.lambda().eq(H2User::getName, NQQ);
         List<Map<String, Object>> mapList = userMapper.selectMaps(qw);
         if (CollectionUtils.isNotEmpty(mapList)) {
-            for (Map m : mapList) {
+            for (Map<String, Object> m : mapList) {
                 System.out.println(m);
             }
         }

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/entity/SuperEntity.java

@@ -33,7 +33,12 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = true)
 public class SuperEntity extends SuSuperEntity implements Serializable {
 
-    /* 主键ID 注解，value 字段名，type 用户输入ID */
+    /**
+	 *  serialVersionUID
+	 */
+	private static final long serialVersionUID = -3111558058262086115L;
+	
+	/* 主键ID 注解，value 字段名，type 用户输入ID */
     @TableId
     private Long testId;
 

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/entity/SuperEntityCamel.java

@@ -28,7 +28,12 @@ import com.baomidou.mybatisplus.annotation.TableId;
  */
 public class SuperEntityCamel extends SuSuperEntityCamel implements Serializable {
 
-    /* 主键ID 注解，value 字段名，type 用户输入ID */
+    /**
+	 * serialVersionUID
+	 */
+	private static final long serialVersionUID = -531147777357149891L;
+	
+	/* 主键ID 注解，value 字段名，type 用户输入ID */
     @TableId(value = "testId")
     private Long id;
 

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/entity/enums/AgeEnum.java

@@ -14,7 +14,8 @@ public enum AgeEnum implements IEnum<Integer> {
     THREE(3, "三岁");
 
     private final int value;
-    private final String desc;
+    @SuppressWarnings("unused")
+	private final String desc;
 
     AgeEnum(final int value, final String desc) {
         this.value = value;

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/entity/mapper/H2UserMapper.java

@@ -78,5 +78,5 @@ public interface H2UserMapper extends SuperMapper<H2User> {
     int selectCountWithParamInSelectItems(Map<String, Object> param);
 
     @Select("select * from h2user")
-    List<Map> mySelectMaps();
+    List<Map<?,?>> mySelectMaps();
 }

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/entity/persistent/H2Student.java

@@ -25,7 +25,12 @@ import lombok.NoArgsConstructor;
 public class H2Student extends Model<H2Student> {
 
 
-    public H2Student(Long id, String name, Integer age) {
+    /**
+	 * serialVersionUID
+	 */
+	private static final long serialVersionUID = 1290051894415073936L;
+
+	public H2Student(Long id, String name, Integer age) {
         this.id = id;
         this.name = name;
         this.age = age;

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/entity/persistent/H2User.java

@@ -37,7 +37,12 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = true)
 public class H2User extends SuperEntity {
 
-    /* 测试忽略验证 */
+    /**
+	 * serialVersionUID
+	 */
+	private static final long serialVersionUID = 2043176352335589747L;
+
+	/* 测试忽略验证 */
     private String name;
 
     private AgeEnum age;

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/service/IH2UserService.java

@@ -44,7 +44,7 @@ public interface IH2UserService extends IService<H2User> {
 
     int selectCountWithParamInSelectItems(Map<String, Object> param);
 
-    List<Map> mySelectMaps();
+    List<Map<?, ?>> mySelectMaps();
 
     void testBatchTransactional();
 

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/service/impl/H2UserServiceImpl.java

@@ -81,7 +81,7 @@ public class H2UserServiceImpl extends ServiceImpl<H2UserMapper, H2User> impleme
     }
 
     @Override
-    public List<Map> mySelectMaps() {
+    public List<Map<?,?>> mySelectMaps() {
         return baseMapper.mySelectMaps();
     }
 

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/reflection/ExampleObjectFactory.java

@@ -14,7 +14,12 @@ import org.slf4j.LoggerFactory;
  */
 public class ExampleObjectFactory extends DefaultObjectFactory {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ExampleObjectFactory.class);
+    /**
+	 * serialVersionUID
+	 */
+	private static final long serialVersionUID = -2878759377109110945L;
+	
+	private static final Logger LOGGER = LoggerFactory.getLogger(ExampleObjectFactory.class);
 
     public <T> T create(Class<T> type) {
         LOGGER.debug("生成一个对象 type = [" + type + "]");