v6.5.5

v6.5.5

Author: 839536

README.md

@@ -6,7 +6,7 @@
 </p>
 <p align="center">
     <a target="_blank" href="https://search.maven.org/search?q=org.aoju">
-		<img src="https://img.shields.io/badge/maven--central-v6.5.3-blue.svg?label=Maven%20Central" />
+		<img src="https://img.shields.io/badge/maven--central-v6.5.5-blue.svg?label=Maven%20Central" />
 	</a>
 	<a target="_blank" href="https://travis-ci.org/aoju/bus">
 		<img src="https://travis-ci.com/aoju/bus.svg?branch=main">
@@ -15,7 +15,7 @@
 		<img src="https://img.shields.io/badge/Java-17+-green.svg">
 	</a>
 	<a target="_blank" href="https://spring.io/projects/spring-boot">
-		<img src="https://img.shields.io/badge/Spring Boot-2.6.6-brightgreen.svg">
+		<img src="https://img.shields.io/badge/Spring Boot-2.7.0-brightgreen.svg">
 	</a>
 	<a target="_blank" href="https://www.mysql.com">
 		<img src="https://img.shields.io/badge/Mysql-8.x-blue.svg">
@@ -97,7 +97,7 @@ Bus (应用/服务总线) 是一个基础框架、服务套件，它基于Java17
 <dependency>
     <groupId>org.aoju</groupId>
     <artifactId>bus-all</artifactId>
-    <version>6.5.3</version>
+    <version>6.5.5</version>
 </dependency>
 ```
 

bus-all/pom.xml

@@ -6,11 +6,11 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-all</artifactId>
-    <version>6.5.3</version>
+    <version>6.5.5</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>
-    <description>Bus All</description>
+    <description>Bus All In One</description>
     <url>https://github.com/aoju/bus</url>
 
     <licenses>

bus-base/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-base</artifactId>
-    <version>6.5.3</version>
+    <version>6.5.5</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>

bus-base/src/main/java/org/aoju/bus/base/advice/ErrorAdvice.java

@@ -26,7 +26,6 @@
 package org.aoju.bus.base.advice;
 
 import org.aoju.bus.base.service.ErrorService;
-import org.aoju.bus.core.toolkit.ObjectKit;
 import org.aoju.bus.core.toolkit.RuntimeKit;
 import org.aoju.bus.logger.Logger;
 import org.aoju.bus.spring.SpringBuilder;
@@ -48,16 +47,17 @@ public class ErrorAdvice {
      * @return 如果执行链应该继续执行, 则为:true 否则:false
      */
     public boolean handler(Exception ex) {
+        ErrorService errorService = null;
         try {
-            ErrorService errorService = SpringBuilder.getBean(ErrorService.class);
-            if (ObjectKit.isNotNull(errorService)) {
-                errorService.before(ex);
-                errorService.after(ex);
-            } else {
-                Logger.error(RuntimeKit.getStackTrace(ex));
-            }
+            errorService = SpringBuilder.getBean(ErrorService.class);
         } catch (RuntimeException ignore) {
-            return false;
+
+        }
+        if (null != errorService) {
+            errorService.before(ex);
+            errorService.after(ex);
+        } else {
+            Logger.error(RuntimeKit.getStackTrace(ex));
         }
         return true;
     }

bus-bom/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-bom</artifactId>
-    <version>6.5.3</version>
+    <version>6.5.5</version>
     <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>

bus-cache/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-cache</artifactId>
-    <version>6.5.3</version>
+    <version>6.5.5</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>

bus-cache/src/main/java/org/aoju/bus/cache/Module.java

@@ -25,7 +25,6 @@
  ********************************************************************************/
 package org.aoju.bus.cache;
 
-import com.google.common.base.Preconditions;
 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
@@ -34,6 +33,7 @@
 import org.aoju.bus.cache.magic.AbstractReader;
 import org.aoju.bus.cache.magic.MultiCacheReader;
 import org.aoju.bus.cache.magic.SingleCacheReader;
+import org.aoju.bus.core.lang.Assert;
 import org.aoju.bus.core.toolkit.CollKit;
 
 import java.util.Optional;
@@ -67,8 +67,8 @@ public synchronized static Complex coreInstance(Context config) {
      */
     @Override
     protected void configure() {
-        Preconditions.checkArgument(null != config, "config param can not be null.");
-        Preconditions.checkArgument(CollKit.isNotEmpty(config.getCaches()), "caches param can not be empty.");
+        Assert.isTrue(null != config, "config param can not be null.");
+        Assert.isTrue(CollKit.isNotEmpty(config.getCaches()), "caches param can not be empty.");
 
         bind(Context.class).toInstance(config);
 

bus-cache/src/main/java/org/aoju/bus/cache/metric/EhCache.java

@@ -25,8 +25,8 @@
  ********************************************************************************/
 package org.aoju.bus.cache.metric;
 
-import com.google.common.collect.Sets;
 import org.aoju.bus.cache.CacheX;
+import org.aoju.bus.core.toolkit.CollKit;
 import org.ehcache.PersistentCacheManager;
 import org.ehcache.config.CacheConfiguration;
 import org.ehcache.config.ResourcePools;
@@ -110,7 +110,7 @@ public void write(Map<String, Object> keyValueMap, long expire) {
 
     @Override
     public void remove(String... keys) {
-        ehcache.removeAll(Sets.newHashSet(keys));
+        ehcache.removeAll(CollKit.newHashSet(keys));
     }
 
     @Override

bus-cache/src/main/java/org/aoju/bus/cache/serialize/AbstractSerializer.java

@@ -33,17 +33,17 @@
  */
 public abstract class AbstractSerializer implements BaseSerializer {
 
-    protected abstract byte[] doSerialize(Object obj) throws Throwable;
+    protected abstract byte[] doSerialize(Object object) throws Throwable;
 
     protected abstract Object doDeserialize(byte[] bytes) throws Throwable;
 
     @Override
-    public <T> byte[] serialize(T obj) {
-        if (null == obj) {
+    public <T> byte[] serialize(T object) {
+        if (null == object) {
             return null;
         }
         try {
-            return doSerialize(obj);
+            return doSerialize(object);
         } catch (Throwable t) {
             Logger.error("{} serialize error.", this.getClass().getName(), t);
             return null;

bus-cache/src/main/java/org/aoju/bus/cache/serialize/BaseSerializer.java

@@ -31,7 +31,7 @@
  */
 public interface BaseSerializer {
 
-    <T> byte[] serialize(T obj);
+    <T> byte[] serialize(T object);
 
     <T> T deserialize(byte[] bytes);
 }