lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-05-02 11:49:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复CopyOptions.setIgnoreCase和setIgnoreProperties冲突问题

Browse Source
This commit is contained in:
Looly 2023-09-12 18:28:58 +08:00
parent ead980e246
commit 1deb32aa29
2 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/CopyOptions.java
View File

@ -177,7 +177,13 @@ public class CopyOptions implements Serializable {
* @return CopyOptions
*/
public CopyOptions setIgnoreProperties(final String... ignoreProperties) {
return setPropertiesFilter((field, o) -> !ArrayUtil.contains(ignoreProperties, field.getName()));
return setPropertiesFilter((field, o) -> {
if(ignoreCase){
// issue#I80FP4
return !ArrayUtil.containsIgnoreCase(ignoreProperties, field.getName());
}
return !ArrayUtil.contains(ignoreProperties, field.getName());
});
}
/**

46
hutool-core/src/test/java/org/dromara/hutool/core/bean/IssueI80FP4Test.java Normal file
View File

@ -0,0 +1,46 @@
package org.dromara.hutool.core.bean;
import lombok.Data;
import org.dromara.hutool.core.bean.copier.CopyOptions;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
public class IssueI80FP4Test {
@Test
public void copyPropertiesTest() {
final Dest sourceDest = new Dest();
sourceDest.setCPF(33699);
sourceDest.setEnderDest("abc");
final Dest dest = new Dest();
final CopyOptions copyOptions = CopyOptions.of()
.setIgnoreNullValue(true)
.setIgnoreCase(true)
.setIgnoreProperties("enderDest");
BeanUtil.copyProperties(sourceDest, dest, copyOptions);
Assertions.assertNull(dest.getEnderDest());
}
@Test
public void copyPropertiesTest2() {
final Dest sourceDest = new Dest();
sourceDest.setCPF(33699);
sourceDest.setEnderDest("abc");
final Dest dest = new Dest();
final CopyOptions copyOptions = CopyOptions.of()
.setIgnoreNullValue(true)
.setIgnoreCase(true)
.setIgnoreProperties("enderdest");
BeanUtil.copyProperties(sourceDest, dest, copyOptions);
Assertions.assertNull(dest.getEnderDest());
}
@Data
static class Dest{
private int cPF;
private String enderDest;
}
}