Merge branch 'v6-dev' of gitee.com:dromara/hutool into v6-dev

This commit is contained in:
Looly 2023-06-07 12:16:26 +08:00
commit 0909188783
2 changed files with 13 additions and 2 deletions

View File

@ -43,7 +43,8 @@ public interface Table<R, C, V> extends Iterable<Table.Cell<R, C, V>> {
* @return 是否包含映射
*/
default boolean contains(final R rowKey, final 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

View File

@ -34,6 +34,16 @@ public class RowKeyTableTest {
// 获取列
final Map<Integer, Integer> column = table.getColumn(6);
Assertions.assertEquals(1, column.size());
Assertions.assertEquals(new Integer(4), column.get(1));
Assertions.assertEquals(Integer.valueOf(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);
Assertions.assertNull(table.getRow(2));
Assertions.assertFalse(table.contains(2, 3));
}
}