Bläddra i källkod

:pencil2: PropertyMapper.whenNotBlack to whenNotBlank

Hccake 4 år sedan
förälder
incheckning
ca23d5588d

+ 5 - 5
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/PaginationInnerInterceptor.java

@@ -466,10 +466,10 @@ public class PaginationInnerInterceptor implements InnerInterceptor {
     @Override
     public void setProperties(Properties properties) {
         PropertyMapper.newInstance(properties)
-            .whenNotBlack("overflow", Boolean::parseBoolean, this::setOverflow)
-            .whenNotBlack("dbType", DbType::getDbType, this::setDbType)
-            .whenNotBlack("dialect", ClassUtils::newInstance, this::setDialect)
-            .whenNotBlack("maxLimit", Long::parseLong, this::setMaxLimit)
-            .whenNotBlack("optimizeJoin", Boolean::parseBoolean, this::setOptimizeJoin);
+            .whenNotBlank("overflow", Boolean::parseBoolean, this::setOverflow)
+            .whenNotBlank("dbType", DbType::getDbType, this::setDbType)
+            .whenNotBlank("dialect", ClassUtils::newInstance, this::setDialect)
+            .whenNotBlank("maxLimit", Long::parseLong, this::setMaxLimit)
+            .whenNotBlank("optimizeJoin", Boolean::parseBoolean, this::setOptimizeJoin);
     }
 }

+ 1 - 1
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/inner/TenantLineInnerInterceptor.java

@@ -424,7 +424,7 @@ public class TenantLineInnerInterceptor extends JsqlParserSupport implements Inn
     @Override
     public void setProperties(Properties properties) {
         PropertyMapper.newInstance(properties)
-            .whenNotBlack("tenantLineHandler", ClassUtils::newInstance, this::setTenantLineHandler);
+            .whenNotBlank("tenantLineHandler", ClassUtils::newInstance, this::setTenantLineHandler);
     }
 }
 

+ 2 - 2
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/toolkit/PropertyMapper.java

@@ -45,7 +45,7 @@ public class PropertyMapper {
         return delegate.stringPropertyNames();
     }
 
-    public PropertyMapper whenNotBlack(String key, Consumer<String> consumer) {
+    public PropertyMapper whenNotBlank(String key, Consumer<String> consumer) {
         String value = delegate.getProperty(key);
         if (StringUtils.isNotBlank(value)) {
             consumer.accept(value);
@@ -53,7 +53,7 @@ public class PropertyMapper {
         return this;
     }
 
-    public <T> PropertyMapper whenNotBlack(String key, Function<String, T> function, Consumer<T> consumer) {
+    public <T> PropertyMapper whenNotBlank(String key, Function<String, T> function, Consumer<T> consumer) {
         String value = delegate.getProperty(key);
         if (StringUtils.isNotBlank(value)) {
             consumer.accept(function.apply(value));