修改部分 jsr305 注解的使用。

Reviewed-on: http://zhouxy.xyz:3000/ZhouXY108/plusone-admin/pulls/1

plusone-basic/plusone-basic-application/src/main/java/xyz/zhouxy/plusone/exception/handler/AllExceptionHandlerConfig.java

@@ -1,10 +1,13 @@
 package xyz.zhouxy.plusone.exception.handler;
 
+import javax.annotation.Nonnull;
+
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import xyz.zhouxy.plusone.exception.handler.BaseExceptionHandler.ExceptionInfoHolder;
+import xyz.zhouxy.plusone.commons.exception.handler.AllExceptionHandler;
+import xyz.zhouxy.plusone.commons.exception.handler.BaseExceptionHandler.ExceptionInfoHolder;
 
 /**
  * AllExceptionHandlerConfig
@@ -14,7 +17,7 @@ import xyz.zhouxy.plusone.exception.handler.BaseExceptionHandler.ExceptionInfoHo
 public class AllExceptionHandlerConfig {
 
     @Bean
-    AllExceptionHandler getAllExceptionHandler(ExceptionInfoHolder exceptionInfoHolder) {
+    AllExceptionHandler getAllExceptionHandler(@Nonnull ExceptionInfoHolder exceptionInfoHolder) {
         return new AllExceptionHandler(exceptionInfoHolder);
     }
 }

plusone-basic/plusone-basic-application/src/main/java/xyz/zhouxy/plusone/exception/handler/DefaultExceptionHandler.java

@@ -1,5 +1,7 @@
 package xyz.zhouxy.plusone.exception.handler;
 
+import javax.annotation.Nonnull;
+
 import org.springframework.context.support.DefaultMessageSourceResolvable;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
@@ -11,7 +13,8 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
 import lombok.extern.slf4j.Slf4j;
-import xyz.zhouxy.plusone.commons.util.RestfulResult;
+import xyz.zhouxy.plusone.commons.exception.handler.BaseExceptionHandler;
+import xyz.zhouxy.plusone.commons.exception.handler.RestfulResult;
 
 /**
  * 默认异常的处理器
@@ -40,7 +43,7 @@ import xyz.zhouxy.plusone.commons.util.RestfulResult;
 @Order(Ordered.LOWEST_PRECEDENCE - 1)
 @Slf4j
 public class DefaultExceptionHandler extends BaseExceptionHandler {
-    public DefaultExceptionHandler(ExceptionInfoHolder exceptionInfoHolder) {
+    public DefaultExceptionHandler(@Nonnull ExceptionInfoHolder exceptionInfoHolder) {
         super(exceptionInfoHolder);
         set(IllegalArgumentException.class, 4010000, "格式错误", HttpStatus.FORBIDDEN);
         set(DataAccessException.class, 6030000, "数据库错误", HttpStatus.INTERNAL_SERVER_ERROR, true);

plusone-basic/plusone-basic-application/src/main/java/xyz/zhouxy/plusone/exception/handler/SysExceptionHandler.java

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
 import lombok.extern.slf4j.Slf4j;
+import xyz.zhouxy.plusone.commons.exception.handler.BaseExceptionHandler;
 import xyz.zhouxy.plusone.commons.util.RestfulResult;
 import xyz.zhouxy.plusone.exception.SysException;
 
@@ -15,7 +16,7 @@ import xyz.zhouxy.plusone.exception.SysException;
 @Slf4j
 public class SysExceptionHandler extends BaseExceptionHandler {
 
-    public SysExceptionHandler(ExceptionInfoHolder exceptionInfoHolder) {
+    public SysExceptionHandler(@Nonnull ExceptionInfoHolder exceptionInfoHolder) {
         super(exceptionInfoHolder);
     }
 

plusone-basic/plusone-basic-common/pom.xml

@@ -44,12 +44,12 @@
         <dependency>
             <groupId>xyz.zhouxy.plusone</groupId>
             <artifactId>plusone-validator</artifactId>
-            <version>0.1.2-SNAPSHOT</version>
+            <version>0.1.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>xyz.zhouxy.plusone</groupId>
             <artifactId>plusone-exception-handler</artifactId>
-            <version>0.0.7-SNAPSHOT</version>
+            <version>0.0.9-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

plusone-basic/plusone-basic-common/src/main/java/xyz/zhouxy/plusone/constant/ErrorCodeConsts.java

@@ -2,4 +2,8 @@ package xyz.zhouxy.plusone.constant;
 
 public class ErrorCodeConsts {
     public static final int DEFAULT_ERROR_CODE = 9999999;
+
+    private ErrorCodeConsts() {
+        throw new IllegalStateException("Utility class");
+    }
 }

plusone-basic/plusone-basic-domain/src/main/java/xyz/zhouxy/plusone/constant/EntityStatus.java

@@ -1,5 +1,9 @@
 package xyz.zhouxy.plusone.constant;
 
+import java.util.Collection;
+
+import javax.annotation.Nonnull;
+
 import xyz.zhouxy.plusone.commons.util.Enumeration;
 
 /**
@@ -9,24 +13,22 @@ import xyz.zhouxy.plusone.commons.util.Enumeration;
  */
 public final class EntityStatus extends Enumeration<EntityStatus> {
 
-    private EntityStatus(int value, String name) {
+    private EntityStatus(int id, @Nonnull String name) {
-        super(value, name);
+        super(id, name);
     }
 
     // 常量
     public static final EntityStatus AVAILABLE = new EntityStatus(0, "正常");
     public static final EntityStatus DISABLED = new EntityStatus(1, "禁用");
 
-    private static final EnumerationValuesHolder<EntityStatus> ENUMERATION_VALUES = new EnumerationValuesHolder<>(
+    private static final ValueSet<EntityStatus> VALUE_SET = new ValueSet<>(
-            AVAILABLE,
+            AVAILABLE, DISABLED);
-            DISABLED);
 
-    public static EntityStatus of(int value) {
+    public static EntityStatus of(int id) {
-        return ENUMERATION_VALUES.get(value);
+        return VALUE_SET.get(id);
     }
 
-    @Override
+    public static Collection<EntityStatus> constants() {
-    public String toString() {
+        return VALUE_SET.getValues();
-        return "EntityStatus" + super.toString();
     }
 }

plusone-basic/plusone-basic-infrastructure/src/main/java/xyz/zhouxy/plusone/exception/config/PlusoneExceptionHandlerConfig.java

@@ -5,7 +5,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import xyz.zhouxy.plusone.constant.ErrorCodeConsts;
-import xyz.zhouxy.plusone.exception.handler.BaseExceptionHandler.ExceptionInfoHolder;
+import xyz.zhouxy.plusone.commons.exception.handler.BaseExceptionHandler.ExceptionInfoHolder;
 
 @Configuration
 public class PlusoneExceptionHandlerConfig {

plusone-basic/plusone-basic-infrastructure/src/main/java/xyz/zhouxy/plusone/validator/InvalidInputExceptionHandler.java

@@ -1,13 +1,15 @@
 package xyz.zhouxy.plusone.validator;
 
+import javax.annotation.Nonnull;
+
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
-import xyz.zhouxy.plusone.exception.handler.BaseExceptionHandler;
+import xyz.zhouxy.plusone.commons.exception.handler.BaseExceptionHandler;
 
 @RestControllerAdvice
 public class InvalidInputExceptionHandler extends BaseExceptionHandler {
 
-    public InvalidInputExceptionHandler(ExceptionInfoHolder exceptionInfoHolder) {
+    public InvalidInputExceptionHandler(@Nonnull ExceptionInfoHolder exceptionInfoHolder) {
         super(exceptionInfoHolder);
         set(InvalidInputException.class, InvalidInputException.ERROR_CODE, "无效的用户输入");
     }

plusone-start/src/test/java/xyz/zhouxy/plusone/TestAop.java

@@ -1,5 +1,7 @@
 package xyz.zhouxy.plusone;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 import javax.annotation.Resource;
 
 import org.junit.jupiter.api.Test;
@@ -25,6 +27,7 @@ class TestAop {
         command.setPrincipal("Code108");
         command.setPassword("2333");
         command.setRememberMe(false);
+        assertNotNull(service);
         LoginInfoViewObject loginInfo = service.loginByPassword(command);
         System.err.println(loginInfo);
     }

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/exception/handler/AccountLoginExceptionHandler.java

@@ -6,14 +6,14 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
-import xyz.zhouxy.plusone.exception.handler.BaseExceptionHandler;
 import xyz.zhouxy.plusone.system.application.exception.AccountLoginException;
-import xyz.zhouxy.plusone.commons.util.RestfulResult;
+import xyz.zhouxy.plusone.commons.exception.handler.BaseExceptionHandler;
+import xyz.zhouxy.plusone.commons.exception.handler.RestfulResult;
 
 @RestControllerAdvice
 public class AccountLoginExceptionHandler extends BaseExceptionHandler {
 
-    public AccountLoginExceptionHandler(ExceptionInfoHolder exceptionInfoHolder) {
+    public AccountLoginExceptionHandler(@Nonnull ExceptionInfoHolder exceptionInfoHolder) {
         super(exceptionInfoHolder);
     }
 

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/exception/handler/SaTokenExceptionHandler.java

@@ -1,5 +1,7 @@
 package xyz.zhouxy.plusone.system.application.exception.handler;
 
+import javax.annotation.Nonnull;
+
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ExceptionHandler;
@@ -14,8 +16,8 @@ import cn.dev33.satoken.exception.NotSafeException;
 import cn.dev33.satoken.exception.SaTokenException;
 import cn.dev33.satoken.exception.SameTokenInvalidException;
 import lombok.extern.slf4j.Slf4j;
-import xyz.zhouxy.plusone.exception.handler.BaseExceptionHandler;
+import xyz.zhouxy.plusone.commons.exception.handler.BaseExceptionHandler;
-import xyz.zhouxy.plusone.commons.util.RestfulResult;
+import xyz.zhouxy.plusone.commons.exception.handler.RestfulResult;
 
 /**
  * Sa-Token 异常处理器
@@ -27,7 +29,7 @@ import xyz.zhouxy.plusone.commons.util.RestfulResult;
 public class SaTokenExceptionHandler extends BaseExceptionHandler {
 
 
-    public SaTokenExceptionHandler(ExceptionInfoHolder exceptionInfoHolder) {
+    public SaTokenExceptionHandler(@Nonnull ExceptionInfoHolder exceptionInfoHolder) {
         super(exceptionInfoHolder);
         set(NotPermissionException.class, 4030103, "会话未能通过权限认证", HttpStatus.FORBIDDEN);
         set(NotRoleException.class, 4030103, "会话未能通过角色认证", HttpStatus.FORBIDDEN);

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/query/AccountQueries.java

@@ -2,6 +2,8 @@ package xyz.zhouxy.plusone.system.application.query;
 
 import java.util.List;
 
+import javax.annotation.Nonnull;
+
 import org.apache.ibatis.annotations.Mapper;
 
 import xyz.zhouxy.plusone.commons.util.PageDTO;
@@ -23,6 +25,7 @@ public interface AccountQueries {
         return PageDTO.of(content, total);
     }
 
+    @Nonnull
     List<AccountOverview> queryAccountOverview(AccountQueryParams queryParams);
 
     long count(AccountQueryParams queryParams);

plusone-system/plusone-system-application/src/main/java/xyz/zhouxy/plusone/system/application/query/result/MenuViewObject.java

@@ -109,7 +109,7 @@ public class MenuViewObject implements IWithOrderNumber {
         viewObject.icon = menu.getIcon();
         viewObject.hidden = menu.isHidden();
         viewObject.orderNumber = menu.getOrderNumber();
-        viewObject.status = menu.getStatus().getValue();
+        viewObject.status = menu.getStatus().getId();
         viewObject.remarks = menu.getRemarks();
         if (viewObject.type == MenuType.MENU_ITEM.ordinal()) {
             viewObject.component = menu.getComponent();

plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/model/account/AccountStatus.java

@@ -1,5 +1,9 @@
 package xyz.zhouxy.plusone.system.domain.model.account;
 
+import java.util.Collection;
+
+import javax.annotation.Nonnull;
+
 import lombok.Getter;
 import xyz.zhouxy.plusone.commons.util.Enumeration;
 import xyz.zhouxy.plusone.domain.IValueObject;
@@ -12,18 +16,22 @@ import xyz.zhouxy.plusone.domain.IValueObject;
 @Getter
 public final class AccountStatus extends Enumeration<AccountStatus> implements IValueObject {
 
-    private AccountStatus(int value, String name) {
+    private AccountStatus(int id, @Nonnull String name) {
-        super(value, name);
+        super(id, name);
     }
 
     public static final AccountStatus AVAILABLE = new AccountStatus(0, "账号正常");
     public static final AccountStatus LOCKED = new AccountStatus(1, "账号被锁定");
 
-    private static final EnumerationValuesHolder<AccountStatus> ENUMERATION_VALUES = new EnumerationValuesHolder<>(
+    private static final ValueSet<AccountStatus> VALUE_SET = new ValueSet<>(
             AVAILABLE,
             LOCKED);
 
-    public static AccountStatus of(int value) {
+    public static AccountStatus of(int id) {
-        return ENUMERATION_VALUES.get(value);
+        return VALUE_SET.get(id);
+    }
+
+    public static Collection<AccountStatus> constants() {
+        return VALUE_SET.getValues();
     }
 }

plusone-system/plusone-system-domain/src/main/java/xyz/zhouxy/plusone/system/domain/model/account/Sex.java

@@ -1,5 +1,7 @@
 package xyz.zhouxy.plusone.system.domain.model.account;
 
+import java.util.Collection;
+
 import javax.annotation.Nonnull;
 
 import xyz.zhouxy.plusone.commons.util.Enumeration;
@@ -18,16 +20,17 @@ public final class Sex extends Enumeration<Sex> implements IValueObject {
     @Nonnull
     public static final Sex FEMALE = new Sex(2, "女性");
 
-    private Sex(int value, String name) {
+    private Sex(int id, @Nonnull String name) {
-        super(value, name);
+        super(id, name);
     }
 
-    private static EnumerationValuesHolder<Sex> values = new EnumerationValuesHolder<>(
+    private static final ValueSet<Sex> VALUE_SET = new ValueSet<>(UNSET, MALE, FEMALE);
-            UNSET,
-            MALE,
-            FEMALE);
 
     public static Sex of(int value) {
-        return values.get(value);
+        return VALUE_SET.get(value);
+    }
+
+    public static Collection<Sex> constants() {
+        return VALUE_SET.getValues();
     }
 }

plusone-system/plusone-system-infrastructure/src/main/java/xyz/zhouxy/plusone/system/domain/model/account/AccountRepositoryImpl.java

@@ -206,9 +206,9 @@ public class AccountRepositoryImpl extends JdbcRepositorySupport<Account, Long>
                 .addValue("password", entity.getPassword().value())
                 .addValue("salt", entity.getPassword().getSalt())
                 .addValue("avatar", accountInfo.getAvatar().toString())
-                .addValue("sex", accountInfo.getSex().getValue())
+                .addValue("sex", accountInfo.getSex().getId())
                 .addValue("nickname", getValueOrNull(accountInfo.getNickname()))
-                .addValue("status", entity.getStatus().getValue())
+                .addValue("status", entity.getStatus().getId())
                 .addValue("createdBy", entity.getCreatedBy())
                 .addValue("createTime", now)
                 .addValue("updatedBy", entity.getUpdatedBy())

plusone-system/plusone-system-infrastructure/src/main/java/xyz/zhouxy/plusone/system/domain/model/menu/MenuRepositoryImpl.java

@@ -188,7 +188,7 @@ public class MenuRepositoryImpl extends JdbcRepositorySupport<Menu, Long> implem
                 .addValue("icon", entity.getIcon())
                 .addValue("hidden", entity.isHidden())
                 .addValue("orderNumber", entity.getOrderNumber())
-                .addValue("status", entity.getStatus().getValue())
+                .addValue("status", entity.getStatus().getId())
                 .addValue("remarks", entity.getRemarks())
                 .addValue("component", entity.getComponent())
                 .addValue("cache", entity.getCache())

plusone-system/plusone-system-infrastructure/src/main/java/xyz/zhouxy/plusone/system/domain/model/role/RoleRepositoryImpl.java

@@ -135,7 +135,7 @@ public class RoleRepositoryImpl extends JdbcRepositorySupport<Role, Long> implem
                 .addValue("id", id)
                 .addValue("name", entity.getName())
                 .addValue("identifier", entity.getIdentifier())
-                .addValue("status", entity.getStatus().getValue())
+                .addValue("status", entity.getStatus().getId())
                 .addValue("remarks", entity.getRemarks())
                 .addValue("createTime", now)
                 .addValue("createdBy", loginId)

pom.xml

@@ -25,9 +25,9 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
 
-        <spring-boot.version>2.7.9</spring-boot.version>
+        <spring-boot.version>2.7.10</spring-boot.version>
         <sa-token.version>1.34.0</sa-token.version>
-        <hutool.version>5.8.15</hutool.version>
+        <hutool.version>5.8.16</hutool.version>
         <mybatis-starter.version>3.0.1</mybatis-starter.version>
         <mybatis-plus.version>3.5.3.1</mybatis-plus.version>
         <commons-io.version>2.11.0</commons-io.version>