zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复Table#contains空指针问题

Browse Source
This commit is contained in:
Looly
2023-06-06 22:25:15 +08:00
parent 37ca7779ca
commit 332fd5c346
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hutool-core/src/main/java/cn/hutool/core/map/multi/Table.java
View File

@@ -31,7 +31,8 @@ public interface Table<R, C, V> extends Iterable<Table.Cell<R, C, V>> {
* @return 是否包含映射
*/
default boolean contains(R rowKey, C columnKey) {
return Opt.ofNullable(getRow(rowKey)).map((map) -> map.containsKey(columnKey)).get();
return Opt.ofNullable(getRow(rowKey)).map((map) -> map.containsKey(columnKey))
.orElse(false);
}
//region Row

10
hutool-core/src/test/java/cn/hutool/core/map/RowKeyTableTest.java
View File

@@ -36,4 +36,14 @@ public class RowKeyTableTest {
Assert.assertEquals(1, column.size());
Assert.assertEquals(new Integer(4), column.get(1));
}
@Test
public void issue3135Test() {
final Table<Integer, Integer, Integer> table = new RowKeyTable<>();
table.put(1, 2, 3);
table.put(1, 6, 4);
Assert.assertNull(table.getRow(2));
Assert.assertFalse(table.contains(2, 3));
}
}