v6.5.6

839128 · Aug 15, 2022 · 9e31c62 · 9e31c62
2 parents 38a567a + e4a39b3
commit 9e31c62
Show file tree

Hide file tree

Showing 75 changed files with 418 additions and 493 deletions.
diff --git a/README.md b/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.5-blue.svg?label=Maven%20Central" />
+		<img src="https://img.shields.io/badge/maven--central-v6.5.6-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">
@@ -97,7 +97,7 @@ Bus (应用/服务总线) 是一个基础框架、服务套件，它基于Java17
 <dependency>
     <groupId>org.aoju</groupId>
     <artifactId>bus-all</artifactId>
-    <version>6.5.5</version>
+    <version>6.5.6</version>
 </dependency>
 ```
 

diff --git a/bus-all/pom.xml b/bus-all/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-all</artifactId>
-    <version>6.5.5</version>
+    <version>6.5.6</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>
@@ -223,7 +223,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.4.0</version>
+                <version>3.4.1</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>

diff --git a/bus-base/pom.xml b/bus-base/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-base</artifactId>
-    <version>6.5.5</version>
+    <version>6.5.6</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>
@@ -42,7 +42,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <project.compiler.version>17</project.compiler.version>
-        <spring.boot.version>2.7.0</spring.boot.version>
+        <spring.boot.version>2.7.2</spring.boot.version>
         <lombok.version>1.18.24</lombok.version>
         <persistence.version>2.2</persistence.version>
     </properties>
@@ -92,7 +92,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.4.0</version>
+                <version>3.4.1</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>

diff --git a/bus-bom/pom.xml b/bus-bom/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-bom</artifactId>
-    <version>6.5.5</version>
+    <version>6.5.6</version>
     <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>
@@ -191,7 +191,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.4.0</version>
+                <version>3.4.1</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>

diff --git a/bus-cache/pom.xml b/bus-cache/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-cache</artifactId>
-    <version>6.5.5</version>
+    <version>6.5.6</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>
@@ -42,17 +42,16 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <project.compiler.version>17</project.compiler.version>
-        <spring.boot.version>2.7.0</spring.boot.version>
+        <spring.boot.version>2.7.2</spring.boot.version>
         <lombok.version>1.18.24</lombok.version>
-        <guice.version>5.0.1</guice.version>
-        <jedis.version>4.2.2</jedis.version>
+        <guice.version>5.1.0</guice.version>
+        <jedis.version>4.2.3</jedis.version>
         <xmemcached.version>2.4.7</xmemcached.version>
-        <ehcache.version>3.9.4</ehcache.version>
-        <curator.version>5.2.1</curator.version>
+        <ehcache.version>3.9.9</ehcache.version>
+        <curator.version>5.3.0</curator.version>
         <guava.version>31.1-jre</guava.version>
-        <hession.version>4.0.65</hession.version>
-        <druid.version>1.2.8</druid.version>
-        <mysql.version>8.0.29</mysql.version>
+        <hession.version>4.0.66</hession.version>
+        <mysql.version>8.0.30</mysql.version>
     </properties>
 
     <dependencies>
@@ -185,7 +184,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.4.0</version>
+                <version>3.4.1</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>

diff --git a/bus-core/README.md b/bus-core/README.md
@@ -14,7 +14,7 @@
 <dependency>
     <groupId>org.aoju</groupId>
     <artifactId>bus-core</artifactId>
-    <version>6.5.5</version>
+    <version>6.5.6</version>
 </dependency>
 ```
 

diff --git a/bus-core/pom.xml b/bus-core/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-core</artifactId>
-    <version>6.5.5</version>
+    <version>6.5.6</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>
@@ -68,7 +68,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.4.0</version>
+                <version>3.4.1</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>

diff --git a/bus-core/src/main/java/org/aoju/bus/core/Version.java b/bus-core/src/main/java/org/aoju/bus/core/Version.java
@@ -60,7 +60,7 @@ public class Version {
      * @return 项目的版本号
      */
     public static String get() {
-        return "6.5.5.RELEASE";
+        return "6.5.6.RELEASE";
     }
 
     /**

diff --git a/bus-core/src/main/java/org/aoju/bus/core/date/Formatter.java b/bus-core/src/main/java/org/aoju/bus/core/date/Formatter.java
@@ -810,7 +810,7 @@ public static DateTime parseUTC(String text) {
         if (null == text) {
             return null;
         }
-        int length = text.length();
+        final int length = text.length();
         if (StringKit.contains(text, 'Z')) {
             if (length == Fields.UTC_PATTERN.length() - 4) {
                 // 格式类似：2020-09-11T06:34:32Z，-4表示减去4个单引号的长度

diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Header.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Header.java
@@ -269,5 +269,9 @@ public class Header {
      * The header Sec-WebSocket-Version
      */
     public static final String STRICT_TRANSPORT_SECURITY = "Strict-Transport-Security";
+    /**
+     * The header SOAPAction
+     */
+    public static final String SOAPACTION = "SOAPAction";
 
 }
diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/MediaType.java b/bus-core/src/main/java/org/aoju/bus/core/lang/MediaType.java
@@ -304,6 +304,24 @@ public class MediaType {
     public final static MediaType MULTIPART_RELATED_APPLICATION_DICOM_XML_TYPE =
             new MediaType("multipart", "related", Collections.singletonMap("type", APPLICATION_DICOM_XML));
 
+    /**
+     * "text/event-stream;type=\"application/event-stream\""
+     */
+    public static final String SERVER_SENT_EVENTS = "text/event-stream";
+    public static final MediaType SERVER_SENT_EVENTS_TYPE = new MediaType("text", "event-stream");
+
+    /**
+     * "application/json-patch+json;type=\"application/json-patch+json\""
+     */
+    public static final String APPLICATION_JSON_PATCH_JSON = "application/json-patch+json";
+    public static final MediaType APPLICATION_JSON_PATCH_JSON_TYPE = new MediaType("application", "json-patch+json");
+
+    /**
+     * "application/soap+xml;type=\"application/soap+xml\""
+     */
+    public static final String APPLICATION_SOAP_XML = "application/soap+xml";
+    public static final MediaType APPLICATION_SOAP_XML_TYPE = new MediaType("application", "soap+xml");
+
 
     public static final String TOKEN = "([a-zA-Z0-9-!#$%&'*+.^_`{|}~]+)";
     public static final String QUOTED = "\"([^\"]*)\"";
@@ -316,7 +334,6 @@ public class MediaType {
     public final String mediaType;
     public Map<String, String> parameters;
 
-
     public MediaType() {
         this(null, MEDIA_TYPE_WILDCARD, MEDIA_TYPE_WILDCARD, null, null);
     }
@@ -325,7 +342,6 @@ public MediaType(String mediaType) {
         this(mediaType, MEDIA_TYPE_WILDCARD, MEDIA_TYPE_WILDCARD, null, null);
     }
 
-
     public MediaType(String type, String subtype) {
         this(null, type, subtype, null, null);
     }
@@ -347,10 +363,10 @@ public MediaType(String type, String subtype, String charset, Map<String, String
     }
 
     public MediaType(String mediaType, String type, String subtype, String charset, Map<String, String> params) {
-        this.mediaType = null == mediaType ? APPLICATION_FORM_URLENCODED : mediaType;
         this.type = null == type ? MEDIA_TYPE_WILDCARD : type;
         this.subtype = null == subtype ? MEDIA_TYPE_WILDCARD : subtype;
         this.charset = null == charset ? Charset.DEFAULT_UTF_8 : charset;
+        this.mediaType = null == mediaType ? this.type + Symbol.C_SLASH + this.subtype + ";charset=" + this.charset : mediaType;
         if (MapKit.isNotEmpty(params)) {
             params = new TreeMap((Comparator<String>) (o1, o2) -> o1.compareToIgnoreCase(o2));
         }

diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/CollKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/CollKit.java
@@ -2472,6 +2472,33 @@ public static List<String> addAll(List<String> list, String part, boolean isTrim
         return list;
     }
 
+    /**
+     * 一个对象不为空且不存在于该集合中时，加入到该集合中
+     * <pre>
+     *     null, null = false
+     *     [], null = false
+     *     null, "123" = false
+     *     ["123"], "123" = false
+     *     [], "123" => true
+     *     ["456"], "123" = true
+     *     [Animal{"name": "jack"}], Dog{"name": "jack"} = true
+     * </pre>
+     *
+     * @param collection 被加入的集合
+     * @param object     要添加到集合的对象
+     * @param <T>        集合元素类型
+     * @param <S>        要添加的元素类型【为集合元素类型的类型或子类型】
+     * @return 是否添加成功
+     * @author Cloud-Style
+     */
+    public static <T, S extends T> boolean addIfAbsent(Collection<T> collection, S object) {
+        if (object == null || collection == null || collection.contains(object)) {
+            return false;
+        }
+
+        return collection.add(object);
+    }
+
     /**
      * 将另一个列表中的元素加入到列表中,如果列表中已经存在此元素则忽略之
      *

diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/RandomKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/RandomKit.java
@@ -390,6 +390,30 @@ public static String randomString(int length) {
         return randomString(Normal.LOWER_NUMBER, length);
     }
 
+    /**
+     * 获得一个随机的字符串
+     *
+     * @param text   随机字符选取的样本
+     * @param length 字符串的长度
+     * @return 随机字符串
+     */
+    public static String randomString(String text, int length) {
+        if (StringKit.isEmpty(text)) {
+            return Normal.EMPTY;
+        }
+        if (length < 1) {
+            length = 1;
+        }
+
+        final StringBuilder sb = new StringBuilder(length);
+        int baseLength = text.length();
+        for (int i = 0; i < length; i++) {
+            int number = randomInt(baseLength);
+            sb.append(text.charAt(number));
+        }
+        return sb.toString();
+    }
+
     /**
      * 获得一个随机的字符串(只包含数字和大写字符)
      *
@@ -438,30 +462,6 @@ public static String randomNumbers(int length) {
         return randomString(Normal.NUMBER, length);
     }
 
-    /**
-     * 获得一个随机的字符串
-     *
-     * @param text   随机字符选取的样本
-     * @param length 字符串的长度
-     * @return 随机字符串
-     */
-    public static String randomString(String text, int length) {
-        if (StringKit.isEmpty(text)) {
-            return Normal.EMPTY;
-        }
-        final StringBuilder sb = new StringBuilder(length);
-
-        if (length < 1) {
-            length = 1;
-        }
-        int baseLength = text.length();
-        for (int i = 0; i < length; i++) {
-            int number = randomInt(baseLength);
-            sb.append(text.charAt(number));
-        }
-        return sb.toString();
-    }
-
     /**
      * 随机数字,数字为0~9单个数字
      *

diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/ReflectKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/ReflectKit.java
@@ -575,10 +575,12 @@ public static Object[] getFieldsValue(Object object) {
 
     /**
      * 设置字段值
+     * 若值类型与字段类型不一致，则会尝试通过 {@link Convert} 进行转换
+     * 若字段类型是原始类型而传入的值是 null，则会将字段设置为对应原始类型的默认值（见 {@link ClassKit#getDefaultValue(Class)}）
      *
      * @param object    对象,static字段则此处传Class
      * @param fieldName 字段名
-     * @param value     值，值类型必须与字段类型匹配，不会自动转换对象类型
+     * @param value     值，当值类型与字段类型不匹配时，会尝试转换
      * @throws InstrumentException 包装IllegalAccessException异常
      */
     public static void setFieldValue(Object object, String fieldName, Object value) throws InstrumentException {
@@ -592,10 +594,12 @@ public static void setFieldValue(Object object, String fieldName, Object value)
 
     /**
      * 设置字段值
+     * 若值类型与字段类型不一致，则会尝试通过 {@link Convert} 进行转换
+     * 若字段类型是原始类型而传入的值是 null，则会将字段设置为对应原始类型的默认值（见 {@link ClassKit#getDefaultValue(Class)}）
      *
      * @param object 对象，如果是static字段，此参数为null
      * @param field  字段
-     * @param value  值，值类型必须与字段类型匹配，不会自动转换对象类型
+     * @param value  值，当值类型与字段类型不匹配时，会尝试转换
      * @throws InstrumentException UtilException 包装IllegalAccessException异常
      */
     public static void setFieldValue(Object object, Field field, Object value) throws InstrumentException {

diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/UriKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/UriKit.java
@@ -1759,12 +1759,7 @@ public URL toURL(URLStreamHandler handler) {
      */
     public URI toURI() {
         try {
-            return new URI(
-                    getSchemeWithDefault(),
-                    getAuthority(),
-                    getPathString(),
-                    getQueryString(),
-                    getFragmentEncoded());
+            return toURL().toURI();
         } catch (URISyntaxException e) {
             return null;
         }

diff --git a/bus-cron/pom.xml b/bus-cron/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-cron</artifactId>
-    <version>6.5.5</version>
+    <version>6.5.6</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>
@@ -66,7 +66,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.4.0</version>
+                <version>3.4.1</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>