注入的sql统一去除换行符

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

@@ -48,6 +48,7 @@ public class MybatisXMLLanguageDriver extends XMLLanguageDriver {
     @Override
     public SqlSource createSqlSource(Configuration configuration, String script, Class<?> parameterType) {
         GlobalConfig.DbConfig config = GlobalConfigUtils.getDbConfig(configuration);
+        script = script.replaceAll("\r", "").replaceAll("\n", "");
         if (config.isReplacePlaceholder()) {
             List<String> find = SqlUtils.findPlaceholder(script);
             if (CollectionUtils.isNotEmpty(find)) {

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

@@ -67,7 +67,7 @@ public enum SqlMethod {
     SELECT_LIST("selectList", "查询满足条件所有数据", "<script>%s SELECT %s FROM %s %s %s %s\n</script>"),
     SELECT_PAGE("selectPage", "查询满足条件所有数据（并翻页）", "<script>%s SELECT %s FROM %s %s %s %s\n</script>"),
     SELECT_MAPS("selectMaps", "查询满足条件所有数据", "<script>%s SELECT %s FROM %s %s %s %s\n</script>"),
-    SELECT_MAPS_PAGE("selectMapsPage", "查询满足条件所有数据（并翻页）", "<script>\n %s SELECT %s FROM %s %s %s %s\n</script>"),
+    SELECT_MAPS_PAGE("selectMapsPage", "查询满足条件所有数据（并翻页）", "<script>\n%s SELECT %s FROM %s %s %s %s\n</script>"),
     SELECT_OBJS("selectObjs", "查询满足条件所有数据", "<script>%s SELECT %s FROM %s %s %s %s\n</script>");
 
     private final String method;

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

@@ -17,7 +17,10 @@ package com.baomidou.mybatisplus.core.injector;
 
 import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
-import com.baomidou.mybatisplus.core.toolkit.*;
+import com.baomidou.mybatisplus.core.toolkit.Assert;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.sql.SqlScriptUtils;
 import org.apache.ibatis.builder.MapperBuilderAssistant;
 import org.apache.ibatis.executor.keygen.KeyGenerator;
@@ -45,6 +48,7 @@ import static java.util.stream.Collectors.joining;
  * @author hubin
  * @since 2018-04-06
  */
+@SuppressWarnings("serial")
 public abstract class AbstractMethod implements Constants {
 
     protected final Log logger = LogFactory.getLog(getClass());
@@ -57,6 +61,7 @@ public abstract class AbstractMethod implements Constants {
 
     /**
      * 方法名称
+     *
      * @since 3.5.0
      */
     protected final String methodName;
@@ -131,7 +136,7 @@ public abstract class AbstractMethod implements Constants {
      * @return sql
      */
     protected String sqlComment() {
-        return convertIfEwParam(Q_WRAPPER_SQL_COMMENT, true);
+        return NEWLINE + convertIfEwParam(Q_WRAPPER_SQL_COMMENT, true);
     }
 
     /**
@@ -228,7 +233,7 @@ public abstract class AbstractMethod implements Constants {
             sqlScript = SqlScriptUtils.convertIf(sqlScript, String.format("%s != null", WRAPPER_ENTITY),
                 true);
             sqlScript += (NEWLINE + table.getLogicDeleteSql(true, true) + NEWLINE);
-            String normalSqlScript = SqlScriptUtils.convertIf(String.format("AND ${%s}", WRAPPER_SQLSEGMENT),
+            String normalSqlScript = SqlScriptUtils.convertIf(String.format(" AND ${%s}", WRAPPER_SQLSEGMENT),
                 String.format("%s != null and %s != '' and %s", WRAPPER_SQLSEGMENT, WRAPPER_SQLSEGMENT,
                     WRAPPER_NONEMPTYOFNORMAL), true);
             normalSqlScript += NEWLINE;
@@ -315,6 +320,7 @@ public abstract class AbstractMethod implements Constants {
 
     /**
      * 查询
+     *
      * @since 3.5.0
      */
     protected MappedStatement addSelectMappedStatementForTable(Class<?> mapperClass, SqlSource sqlSource, TableInfo table) {
@@ -351,6 +357,7 @@ public abstract class AbstractMethod implements Constants {
 
     /**
      * 插入
+     *
      * @since 3.5.0
      */
     protected MappedStatement addInsertMappedStatement(Class<?> mapperClass, Class<?> parameterType,

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/Delete.java

@@ -27,6 +27,7 @@ import org.apache.ibatis.mapping.SqlSource;
  * @author hubin
  * @since 2018-04-06
  */
+@SuppressWarnings("serial")
 public class Delete extends AbstractMethod {
 
     public Delete() {

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/DeleteBatchByIds.java

@@ -28,6 +28,7 @@ import org.apache.ibatis.mapping.SqlSource;
  * @author hubin
  * @since 2018-04-06
  */
+@SuppressWarnings("serial")
 public class DeleteBatchByIds extends AbstractMethod {
 
     public DeleteBatchByIds() {

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/DeleteById.java

@@ -35,6 +35,7 @@ import static java.util.stream.Collectors.toList;
  * @author hubin
  * @since 2018-04-06
  */
+@SuppressWarnings("serial")
 public class DeleteById extends AbstractMethod {
 
     public DeleteById() {

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/DeleteByMap.java

@@ -29,6 +29,7 @@ import java.util.Map;
  * @author hubin
  * @since 2018-04-06
  */
+@SuppressWarnings("serial")
 public class DeleteByMap extends AbstractMethod {
 
     public DeleteByMap() {

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/Insert.java

@@ -35,6 +35,7 @@ import org.apache.ibatis.mapping.SqlSource;
  * @author hubin
  * @since 2018-04-06
  */
+@SuppressWarnings("serial")
 public class Insert extends AbstractMethod {
 
     public Insert() {

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/SelectBatchByIds.java

@@ -28,6 +28,7 @@ import org.apache.ibatis.mapping.SqlSource;
  * @author hubin
  * @since 2018-04-06
  */
+@SuppressWarnings("serial")
 public class SelectBatchByIds extends AbstractMethod {
 
     public SelectBatchByIds() {

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/SelectById.java

@@ -28,6 +28,7 @@ import org.apache.ibatis.scripting.defaults.RawSqlSource;
  * @author hubin
  * @since 2018-04-06
  */
+@SuppressWarnings("serial")
 public class SelectById extends AbstractMethod {
 
     public SelectById() {

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/SelectByMap.java

@@ -29,6 +29,7 @@ import java.util.Map;
  * @author hubin
  * @since 2018-04-06
  */
+@SuppressWarnings("serial")
 public class SelectByMap extends AbstractMethod {
 
     public SelectByMap() {

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/SelectCount.java

@@ -27,6 +27,7 @@ import org.apache.ibatis.mapping.SqlSource;
  * @author hubin
  * @since 2018-04-08
  */
+@SuppressWarnings("serial")
 public class SelectCount extends AbstractMethod {
 
     public SelectCount() {

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/SelectList.java

@@ -27,6 +27,7 @@ import org.apache.ibatis.mapping.SqlSource;
  * @author hubin
  * @since 2018-04-06
  */
+@SuppressWarnings("serial")
 public class SelectList extends AbstractMethod {
 
     public SelectList() {

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/SelectMaps.java

@@ -29,6 +29,7 @@ import java.util.Map;
  * @author hubin
  * @since 2018-04-06
  */
+@SuppressWarnings("serial")
 public class SelectMaps extends AbstractMethod {
 
     public SelectMaps() {

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/SelectMapsPage.java

@@ -29,6 +29,7 @@ import java.util.Map;
  * @author hubin
  * @since 2018-04-06
  */
+@SuppressWarnings("serial")
 public class SelectMapsPage extends AbstractMethod {
 
     public SelectMapsPage() {

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/SelectObjs.java

@@ -27,6 +27,7 @@ import org.apache.ibatis.mapping.SqlSource;
  * @author hubin
  * @since 2018-04-06
  */
+@SuppressWarnings("serial")
 public class SelectObjs extends AbstractMethod {
 
     public SelectObjs() {

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/SelectPage.java

@@ -27,6 +27,7 @@ import org.apache.ibatis.mapping.SqlSource;
  * @author hubin
  * @since 2018-04-06
  */
+@SuppressWarnings("serial")
 public class SelectPage extends AbstractMethod {
 
     public SelectPage() {

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/Update.java

@@ -27,6 +27,7 @@ import org.apache.ibatis.mapping.SqlSource;
  * @author hubin
  * @since 2018-04-06
  */
+@SuppressWarnings("serial")
 public class Update extends AbstractMethod {
 
     public Update() {

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/injector/methods/UpdateById.java

@@ -27,6 +27,7 @@ import org.apache.ibatis.mapping.SqlSource;
  * @author hubin
  * @since 2018-04-06
  */
+@SuppressWarnings("serial")
 public class UpdateById extends AbstractMethod {
 
     public UpdateById() {

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

@@ -145,27 +145,4 @@ class ReflectionKitTest {
         Assertions.assertEquals(entity.getParentId(), ReflectionKit.getFieldValue(entity, "parentId"));
         Assertions.assertEquals(entity.getpId(), ReflectionKit.getFieldValue(entity, "pId"));
     }
-
-    @Test
-    void testIsPrimitiveOrWrapper() {
-        Assertions.assertFalse(ReflectionKit.isPrimitiveOrWrapper(String.class));
-        Assertions.assertTrue(ReflectionKit.isPrimitiveOrWrapper(Boolean.class));
-        Assertions.assertTrue(ReflectionKit.isPrimitiveOrWrapper(boolean.class));
-        Assertions.assertTrue(ReflectionKit.isPrimitiveOrWrapper(byte.class));
-        Assertions.assertTrue(ReflectionKit.isPrimitiveOrWrapper(Byte.class));
-        Assertions.assertTrue(ReflectionKit.isPrimitiveOrWrapper(char.class));
-        Assertions.assertTrue(ReflectionKit.isPrimitiveOrWrapper(Character.class));
-        Assertions.assertTrue(ReflectionKit.isPrimitiveOrWrapper(char.class));
-        Assertions.assertTrue(ReflectionKit.isPrimitiveOrWrapper(Character.class));
-        Assertions.assertTrue(ReflectionKit.isPrimitiveOrWrapper(double.class));
-        Assertions.assertTrue(ReflectionKit.isPrimitiveOrWrapper(Double.class));
-        Assertions.assertTrue(ReflectionKit.isPrimitiveOrWrapper(float.class));
-        Assertions.assertTrue(ReflectionKit.isPrimitiveOrWrapper(Float.class));
-        Assertions.assertTrue(ReflectionKit.isPrimitiveOrWrapper(int.class));
-        Assertions.assertTrue(ReflectionKit.isPrimitiveOrWrapper(Integer.class));
-        Assertions.assertTrue(ReflectionKit.isPrimitiveOrWrapper(long.class));
-        Assertions.assertTrue(ReflectionKit.isPrimitiveOrWrapper(Long.class));
-        Assertions.assertTrue(ReflectionKit.isPrimitiveOrWrapper(short.class));
-        Assertions.assertTrue(ReflectionKit.isPrimitiveOrWrapper(Short.class));
-    }
 }

mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/injector/methods/LogicDeleteBatchByIds.java

@@ -49,6 +49,7 @@ import static java.util.stream.Collectors.toList;
  * @author nieqiurong
  * @since 3.5.0
  */
+@SuppressWarnings("serial")
 public class LogicDeleteBatchByIds extends DeleteBatchByIds {
 
     public LogicDeleteBatchByIds() {