代码优化

framework-common/src/main/java/com/chelvc/framework/common/util/AssertUtils.java

@@ -401,58 +401,6 @@ public final class AssertUtils {
         return collection;
     }
 
-    /**
-     * 对象可用性校验
-     *
-     * @param resource 资源对象
-     * @param message  异常信息
-     * @param <T>      对象类型
-     * @return 对象实例
-     */
-    public static <T> T available(T resource, String message) {
-        return available(resource, null, message);
-    }
-
-    /**
-     * 对象可用性校验
-     *
-     * @param resource 资源对象
-     * @param data     异常数据
-     * @param message  异常信息
-     * @param <T>      对象类型
-     * @return 对象实例
-     */
-    public static <T> T available(T resource, Object data, String message) {
-        available(Objects.nonNull(resource), data, message);
-        return resource;
-    }
-
-    /**
-     * 对象可用性校验
-     *
-     * @param resource 资源对象
-     * @param message  异常消息回调函数
-     * @param <T>      对象类型
-     * @return 对象实例
-     */
-    public static <T> T available(T resource, @NonNull Supplier<String> message) {
-        return available(resource, null, message);
-    }
-
-    /**
-     * 对象可用性校验
-     *
-     * @param resource 资源对象
-     * @param data     异常数据
-     * @param message  异常消息回调函数
-     * @param <T>      对象类型
-     * @return 对象实例
-     */
-    public static <T> T available(T resource, Object data, @NonNull Supplier<String> message) {
-        available(Objects.nonNull(resource), data, message);
-        return resource;
-    }
-
     /**
      * 对象可用性校验
      *

framework-download/src/main/java/com/chelvc/framework/download/support/DefaultDownloadHandler.java

@@ -162,7 +162,7 @@ public class DefaultDownloadHandler implements DownloadHandler, ApplicationListe
     @Override
     public void download(long id, @NonNull HttpServletResponse response) throws IOException {
         Download download = this.download(id);
-        AssertUtils.available(download, () -> ApplicationContextHolder.getMessage("Download.Expired"));
+        AssertUtils.nonnull(download, () -> ApplicationContextHolder.getMessage("Download.Expired"));
         boolean completed = ObjectUtils.ifNull(download, Download::getStatus) == Download.Status.COMPLETED;
         AssertUtils.available(completed, () -> ApplicationContextHolder.getMessage("Download.Uncompleted"));
         String filename = ObjectUtils.ifNull(download, Download::getFilename);

framework-sms/src/main/java/com/chelvc/framework/sms/support/DefaultCaptchaSmsHandler.java

@@ -82,7 +82,7 @@ public class DefaultCaptchaSmsHandler implements CaptchaSmsHandler {
         // 短信验证码发送频率限制
         String lock = "sms:captcha:interval:" + mobile;
         String secret = RedisContextHolder.tryLock(lock, Duration.ofSeconds(this.properties.getInterval()));
-        AssertUtils.available(secret, () -> ApplicationContextHolder.getMessage("SMS.Frequency.Limit"));
+        AssertUtils.nonnull(secret, () -> ApplicationContextHolder.getMessage("SMS.Frequency.Limit"));
 
         // 如果目标手机号属于白名单手机号则将手机号后{{length}}位作为验证码，否则获取真实的验证码
         try {