lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正常量名错误单词

Browse Source
This commit is contained in:
redkale
2023-09-14 15:52:31 +08:00
parent ddfabc0010
commit fc1487bda4
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/redkale/util/Copier.java
View File

@@ -7,8 +7,8 @@ import java.lang.reflect.*;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.*;
import static org.redkale.asm.ClassWriter.COMPUTE_FRAMES;
import org.redkale.asm.*;
import static org.redkale.asm.ClassWriter.COMPUTE_FRAMES;
import static org.redkale.asm.Opcodes.*;
import org.redkale.asm.Type;
@@ -34,7 +34,7 @@ public interface Copier<S, D> extends BiFunction<S, D, D> {
/**
* 是否跳过值为空字符串的字段
*/
public static final int OPTION_SKIP_RMPTY_STRING = 1 << 2; //4
public static final int OPTION_SKIP_EMPTY_STRING = 1 << 2; //4
/**
* 同名字段类型强制转换
@@ -487,7 +487,7 @@ public interface Copier<S, D> extends BiFunction<S, D, D> {
public static <S, D> Copier<S, D> create(final Class<S> srcClass, final Class<D> destClass, final int options,
final BiPredicate<java.lang.reflect.AccessibleObject, String> srcColumnPredicate, final Map<String, String> nameAlias) {
final boolean skipNullValue = (options & OPTION_SKIP_NULL_VALUE) > 0 || ConcurrentHashMap.class.isAssignableFrom(destClass);
final boolean skipEmptyString = (options & OPTION_SKIP_RMPTY_STRING) > 0;
final boolean skipEmptyString = (options & OPTION_SKIP_EMPTY_STRING) > 0;
final boolean allowTypeCast = (options & OPTION_ALLOW_TYPE_CAST) > 0;
final Predicate<Object> valPredicate = v -> !(skipNullValue && v == null)
&& !(skipEmptyString && v instanceof CharSequence && ((CharSequence) v).length() == 0);

6
src/test/java/org/redkale/test/util/CopierTest.java
View File

@@ -140,7 +140,7 @@ public class CopierTest {
map.put("time", "55555");
map.put("id", null);
map.put("map", Utility.ofMap("aa", "bbb"));
Copier.load(Map.class, TestBean.class, Copier.OPTION_SKIP_RMPTY_STRING).apply(map, bean);
Copier.load(Map.class, TestBean.class, Copier.OPTION_SKIP_EMPTY_STRING).apply(map, bean);
System.out.println(JsonConvert.root().convertTo(bean));
Assertions.assertTrue(bean.getName() == null);
}
@@ -192,7 +192,7 @@ public class CopierTest {
srcBean.time = 55555;
srcBean.remark = null;
srcBean.setMap(Utility.ofMap("aa", "bbb"));
Copier.load(TestXBean.class, TestBean.class, Copier.OPTION_SKIP_RMPTY_STRING).apply(srcBean, bean);
Copier.load(TestXBean.class, TestBean.class, Copier.OPTION_SKIP_EMPTY_STRING).apply(srcBean, bean);
System.out.println(JsonConvert.root().convertTo(bean));
Assertions.assertTrue(bean.getName() == null);
}
@@ -212,7 +212,7 @@ public class CopierTest {
bean.setName(null);
bean.remark = "hehehoho";
Copier.load(TestXBean.class, TestBean.class, Copier.OPTION_SKIP_NULL_VALUE | Copier.OPTION_SKIP_RMPTY_STRING).apply(srcBean, bean);
Copier.load(TestXBean.class, TestBean.class, Copier.OPTION_SKIP_NULL_VALUE | Copier.OPTION_SKIP_EMPTY_STRING).apply(srcBean, bean);
System.out.println(JsonConvert.root().convertTo(bean));
Assertions.assertTrue(bean.getName() == null);
}