style: 适配 Java 16 新特性

1.instanceof 模式匹配（Java 14 预览特性 => Java 16 标准特性）详情请参阅：https://docs.oracle.com/en/java/javase/16/language/pattern-matching-instanceof-operator.html
continew-org · Mar 31, 2023 · cf30443 · cf30443
1 parent 38f52aa
commit cf30443
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 16 deletions.
diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java
@@ -217,8 +217,7 @@ protected T getById(Object id) {
  * 待填充列表信息
  */
  protected void fill(Object baseObj) {
- if (baseObj instanceof BaseVO) {
- BaseVO baseVO = (BaseVO)baseObj;
+ if (baseObj instanceof BaseVO baseVO) {
  Long createUser = baseVO.getCreateUser();
  if (createUser == null) {
  return;
@@ -235,8 +234,7 @@ protected void fill(Object baseObj) {
  * 待填充详情信息
  */
  protected void fillDetail(Object detailObj) {
- if (detailObj instanceof BaseDetailVO) {
- BaseDetailVO detailVO = (BaseDetailVO)detailObj;
+ if (detailObj instanceof BaseDetailVO detailVO) {
  this.fill(detailVO);
 
  Long updateUser = detailVO.getUpdateUser();

diff --git a/...c/main/java/top/charles7c/cnadmin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java b/...c/main/java/top/charles7c/cnadmin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java
@@ -60,9 +60,8 @@ public void insertFill(MetaObject metaObject) {
 
  Long createUser = LoginHelper.getUserId();
  LocalDateTime createTime = LocalDateTime.now();
- if (metaObject.getOriginalObject() instanceof BaseDO) {
+ if (metaObject.getOriginalObject()instanceof BaseDO baseDO) {
  // 继承了 BaseDO 的类，填充创建信息
- BaseDO baseDO = (BaseDO)metaObject.getOriginalObject();
  baseDO.setCreateUser(ObjectUtil.defaultIfNull(baseDO.getCreateUser(), createUser));
  baseDO.setCreateTime(ObjectUtil.defaultIfNull(baseDO.getCreateTime(), createTime));
  baseDO.setUpdateUser(ObjectUtil.defaultIfNull(baseDO.getUpdateUser(), createUser));
@@ -94,9 +93,8 @@ public void updateFill(MetaObject metaObject) {
 
  Long updateUser = LoginHelper.getUserId();
  LocalDateTime updateTime = LocalDateTime.now();
- if (metaObject.getOriginalObject() instanceof BaseDO) {
+ if (metaObject.getOriginalObject()instanceof BaseDO baseDO) {
  // 继承了 BaseDO 的类，填充修改信息
- BaseDO baseDO = (BaseDO)metaObject.getOriginalObject();
  baseDO.setUpdateUser(updateUser);
  baseDO.setUpdateTime(updateTime);
  } else {

diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ExceptionUtils.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ExceptionUtils.java
@@ -44,9 +44,8 @@ public class ExceptionUtils {
  * 异常
  */
  public static void printException(Runnable runnable, Throwable throwable) {
- if (throwable == null && runnable instanceof Future<?>) {
+ if (throwable == null && runnable instanceof Future<?> future) {
  try {
- Future<?> future = (Future<?>)runnable;
  if (future.isDone()) {
  future.get();
  }

diff --git a/...admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java b/...admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java
@@ -131,8 +131,7 @@ public void delete(List<Long> ids) {
  @Override
  public void fillDetail(Object detailObj) {
  super.fillDetail(detailObj);
- if (detailObj instanceof DeptDetailVO) {
- DeptDetailVO detailVO = (DeptDetailVO)detailObj;
+ if (detailObj instanceof DeptDetailVO detailVO) {
  if (Objects.equals(SysConsts.SUPER_PARENT_ID, detailVO.getParentId())) {
  return;
  }

diff --git a/...admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java b/...admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java
@@ -137,8 +137,7 @@ public void delete(List<Long> ids) {
  @Override
  public void fillDetail(Object detailObj) {
  super.fillDetail(detailObj);
- if (detailObj instanceof RoleDetailVO) {
- RoleDetailVO detailVO = (RoleDetailVO)detailObj;
+ if (detailObj instanceof RoleDetailVO detailVO) {
  Long roleId = detailVO.getId();
  if (SysConsts.ADMIN_ROLE_CODE.equals(detailVO.getCode())) {
  List<MenuVO> list = menuService.list(null, null);

diff --git a/...admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java b/...admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java
@@ -147,8 +147,7 @@ public void delete(List<Long> ids) {
  @Override
  public void fillDetail(Object detailObj) {
  super.fillDetail(detailObj);
- if (detailObj instanceof UserDetailVO) {
- UserDetailVO detailVO = (UserDetailVO)detailObj;
+ if (detailObj instanceof UserDetailVO detailVO) {
  detailVO.setDeptName(ExceptionUtils.exToNull(() -> deptService.get(detailVO.getDeptId()).getName()));
  List<Long> roleIdList = userRoleService.listRoleIdByUserId(detailVO.getId());
  detailVO.setRoleIds(roleIdList);