diff --git a/README.md b/README.md index 9a1bced271..760099f5de 100755 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@

- + @@ -70,7 +70,7 @@ Bus (应用/服务总线) 是一个微服务套件、基础框架,它基于Jav |[ √ ]|bus-oauth|第三方登录,已集成十多家第三方平台(国内外常用的基本都已包含)| |[ √ ]|bus-pager|数据分页,mybatis| |[ √ ]|bus-office|office等相关转换及处理,POI封装实现,使Java操作Excel等文件变得更加简单| -|[ √ ]|bus-opencv|图像识别及分析,提供丰富的徒刑图像处理算法,跨平台支持等| +|[ √ ]|bus-opencv|图像识别及分析,提供丰富的图形图像处理算法,跨平台支持等| |[ √ ]|bus-proxy|公共代理,使动态代理变得简单| |[ √ ]|bus-sensitive|敏感数据脱敏,对应用和使用者透明,业务逻辑无感知,通过配置集成,改动代码量小| |[ √ ]|bus-setting|设置工具类, 用于支持设置/配置| @@ -98,7 +98,7 @@ Bus (应用/服务总线) 是一个微服务套件、基础框架,它基于Jav org.aoju bus-all - 6.1.1 + 6.1.2 ``` 或者单独使用某个组件 @@ -112,7 +112,7 @@ Bus (应用/服务总线) 是一个微服务套件、基础框架,它基于Jav ### Gradle ``` -implementation 'org.aoju:bus-all:6.1.1' +implementation 'org.aoju:bus-all:6.1.2' ``` ### Downlad diff --git a/bus-all/pom.xml b/bus-all/pom.xml index e5f2422c7f..a3c048b43f 100755 --- a/bus-all/pom.xml +++ b/bus-all/pom.xml @@ -6,13 +6,38 @@ org.aoju bus-all - 6.1.1 + 6.1.2 jar ${project.artifactId} Bus All https://github.com/aoju/bus + + + The MIT License (MIT) + https://opensource.org/licenses/MIT + + + + + scm:git@github.com:aoju/bus.git + scm:git@github.com:aoju/bus.git + git@github.com:aoju/bus.git + + + + + Kimi Liu + https://github.com/aoju/bus.git + + + + + Github Issue + https://github.com/aoju/bus/issues + + UTF-8 UTF-8 @@ -190,31 +215,6 @@ - - - The MIT License (MIT) - https://opensource.org/licenses/MIT - - - - - scm:git@github.com:aoju/bus.git - scm:git@github.com:aoju/bus.git - git@github.com:aoju/bus.git - - - - - Kimi Liu - https://github.com/aoju/bus.git - - - - - Github Issue - https://github.com/aoju/bus/issues - - diff --git a/bus-all/src/main/java/org/aoju/bus/Bus.java b/bus-all/src/main/java/org/aoju/bus/Bus.java index 7bb84e5e5a..5820402922 100644 --- a/bus-all/src/main/java/org/aoju/bus/Bus.java +++ b/bus-all/src/main/java/org/aoju/bus/Bus.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus; @@ -42,7 +43,7 @@ *

* * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Bus { diff --git a/bus-base/pom.xml b/bus-base/pom.xml index 9ba89c5c0f..0f73a324d5 100755 --- a/bus-base/pom.xml +++ b/bus-base/pom.xml @@ -6,19 +6,44 @@ org.aoju bus-base - 6.1.1 + 6.1.2 jar ${project.artifactId} Bus Base https://github.com/aoju/bus + + + The MIT License (MIT) + https://opensource.org/licenses/MIT + + + + + scm:git@github.com:aoju/bus.git + scm:git@github.com:aoju/bus.git + git@github.com:aoju/bus.git + + + + + Kimi Liu + https://github.com/aoju/bus.git + + + + + Github Issue + https://github.com/aoju/bus/issues + + UTF-8 UTF-8 1.8 - 2.3.0.RELEASE - 1.18.12 + 2.4.0 + 1.18.16 2.2 @@ -48,31 +73,6 @@ - - - The MIT License (MIT) - https://opensource.org/licenses/MIT - - - - - scm:git@github.com:aoju/bus.git - scm:git@github.com:aoju/bus.git - git@github.com:aoju/bus.git - - - - - Kimi Liu - https://github.com/aoju/bus.git - - - - - Github Issue - https://github.com/aoju/bus/issues - - diff --git a/bus-base/src/main/java/org/aoju/bus/base/advice/BaseAdvice.java b/bus-base/src/main/java/org/aoju/bus/base/advice/BaseAdvice.java index 4e4fec08a6..9f609913c3 100755 --- a/bus-base/src/main/java/org/aoju/bus/base/advice/BaseAdvice.java +++ b/bus-base/src/main/java/org/aoju/bus/base/advice/BaseAdvice.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.base.advice; @@ -47,7 +48,7 @@ * 异常信息拦截处理 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ControllerAdvice diff --git a/bus-base/src/main/java/org/aoju/bus/base/consts/Consts.java b/bus-base/src/main/java/org/aoju/bus/base/consts/Consts.java index 63ada10c97..1261d5072f 100755 --- a/bus-base/src/main/java/org/aoju/bus/base/consts/Consts.java +++ b/bus-base/src/main/java/org/aoju/bus/base/consts/Consts.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.base.consts; @@ -31,7 +32,7 @@ * 公共常量 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Consts extends Normal { diff --git a/bus-base/src/main/java/org/aoju/bus/base/consts/ErrorCode.java b/bus-base/src/main/java/org/aoju/bus/base/consts/ErrorCode.java index d3c388a7fa..417d405de8 100755 --- a/bus-base/src/main/java/org/aoju/bus/base/consts/ErrorCode.java +++ b/bus-base/src/main/java/org/aoju/bus/base/consts/ErrorCode.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.base.consts; @@ -34,7 +35,7 @@ * 系统响应码 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ErrorCode { diff --git a/bus-base/src/main/java/org/aoju/bus/base/entity/BaseEntity.java b/bus-base/src/main/java/org/aoju/bus/base/entity/BaseEntity.java index 198a3136c2..5d95bdf359 100755 --- a/bus-base/src/main/java/org/aoju/bus/base/entity/BaseEntity.java +++ b/bus-base/src/main/java/org/aoju/bus/base/entity/BaseEntity.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.base.entity; @@ -39,7 +40,7 @@ * Entity 基本信息. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-base/src/main/java/org/aoju/bus/base/entity/Entity.java b/bus-base/src/main/java/org/aoju/bus/base/entity/Entity.java index c07f4ad90d..b4141a7a6d 100755 --- a/bus-base/src/main/java/org/aoju/bus/base/entity/Entity.java +++ b/bus-base/src/main/java/org/aoju/bus/base/entity/Entity.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.base.entity; @@ -33,7 +34,7 @@ * Entity 实体 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-base/src/main/java/org/aoju/bus/base/entity/Message.java b/bus-base/src/main/java/org/aoju/bus/base/entity/Message.java index 73909e8139..2410e9dbde 100755 --- a/bus-base/src/main/java/org/aoju/bus/base/entity/Message.java +++ b/bus-base/src/main/java/org/aoju/bus/base/entity/Message.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.base.entity; @@ -33,7 +34,7 @@ * 返回值公用类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-base/src/main/java/org/aoju/bus/base/entity/OAuth2.java b/bus-base/src/main/java/org/aoju/bus/base/entity/OAuth2.java index 5dbf182eb8..fb44e728a9 100755 --- a/bus-base/src/main/java/org/aoju/bus/base/entity/OAuth2.java +++ b/bus-base/src/main/java/org/aoju/bus/base/entity/OAuth2.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.base.entity; @@ -33,7 +34,7 @@ * 授权公用类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-base/src/main/java/org/aoju/bus/base/entity/Result.java b/bus-base/src/main/java/org/aoju/bus/base/entity/Result.java index d07a312338..1c5d6d4ce2 100755 --- a/bus-base/src/main/java/org/aoju/bus/base/entity/Result.java +++ b/bus-base/src/main/java/org/aoju/bus/base/entity/Result.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.base.entity; @@ -35,7 +36,7 @@ * 返回结果公用 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-base/src/main/java/org/aoju/bus/base/entity/Tracer.java b/bus-base/src/main/java/org/aoju/bus/base/entity/Tracer.java index f2f18935d3..3f7b83a7bf 100755 --- a/bus-base/src/main/java/org/aoju/bus/base/entity/Tracer.java +++ b/bus-base/src/main/java/org/aoju/bus/base/entity/Tracer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.base.entity; @@ -33,7 +34,7 @@ * 访问链路跟踪 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-base/src/main/java/org/aoju/bus/base/mapper/BaseMapper.java b/bus-base/src/main/java/org/aoju/bus/base/mapper/BaseMapper.java index c0b3fae888..9623003e1d 100755 --- a/bus-base/src/main/java/org/aoju/bus/base/mapper/BaseMapper.java +++ b/bus-base/src/main/java/org/aoju/bus/base/mapper/BaseMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.base.mapper; @@ -28,7 +29,7 @@ * BaseMapper 接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface BaseMapper extends Mapper { diff --git a/bus-base/src/main/java/org/aoju/bus/base/mapper/Mapper.java b/bus-base/src/main/java/org/aoju/bus/base/mapper/Mapper.java index 6caee012af..b67e5166c4 100755 --- a/bus-base/src/main/java/org/aoju/bus/base/mapper/Mapper.java +++ b/bus-base/src/main/java/org/aoju/bus/base/mapper/Mapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.base.mapper; @@ -28,7 +29,7 @@ * CoreMapper 接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Mapper extends org.aoju.bus.mapper.common.Mapper { diff --git a/bus-base/src/main/java/org/aoju/bus/base/service/BaseService.java b/bus-base/src/main/java/org/aoju/bus/base/service/BaseService.java index 2c359c8990..9ab96802e5 100755 --- a/bus-base/src/main/java/org/aoju/bus/base/service/BaseService.java +++ b/bus-base/src/main/java/org/aoju/bus/base/service/BaseService.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.base.service; @@ -32,7 +33,7 @@ * BaseService 接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface BaseService extends Service { diff --git a/bus-base/src/main/java/org/aoju/bus/base/service/Service.java b/bus-base/src/main/java/org/aoju/bus/base/service/Service.java index 4bcf4c26cc..3c9d2cf3ce 100755 --- a/bus-base/src/main/java/org/aoju/bus/base/service/Service.java +++ b/bus-base/src/main/java/org/aoju/bus/base/service/Service.java @@ -19,8 +19,8 @@ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * - * THE SOFTWARE. * + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ** THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.base.service; @@ -28,7 +28,7 @@ * Service 接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Service { diff --git a/bus-base/src/main/java/org/aoju/bus/base/service/impl/BaseServiceImpl.java b/bus-base/src/main/java/org/aoju/bus/base/service/impl/BaseServiceImpl.java index 17366e41a7..a41f26a15d 100755 --- a/bus-base/src/main/java/org/aoju/bus/base/service/impl/BaseServiceImpl.java +++ b/bus-base/src/main/java/org/aoju/bus/base/service/impl/BaseServiceImpl.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.base.service.impl; @@ -43,7 +44,7 @@ * BaseService 接口实现 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BaseServiceImpl, T extends BaseEntity> diff --git a/bus-base/src/main/java/org/aoju/bus/base/spring/BaseController.java b/bus-base/src/main/java/org/aoju/bus/base/spring/BaseController.java index a6958e8c3e..eb006faeed 100755 --- a/bus-base/src/main/java/org/aoju/bus/base/spring/BaseController.java +++ b/bus-base/src/main/java/org/aoju/bus/base/spring/BaseController.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.base.spring; @@ -35,7 +36,7 @@ * 基础请求封装 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BaseController, T> extends Controller { diff --git a/bus-base/src/main/java/org/aoju/bus/base/spring/Controller.java b/bus-base/src/main/java/org/aoju/bus/base/spring/Controller.java index 0eda1ffd3b..2a63d55eed 100755 --- a/bus-base/src/main/java/org/aoju/bus/base/spring/Controller.java +++ b/bus-base/src/main/java/org/aoju/bus/base/spring/Controller.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.base.spring; @@ -32,7 +33,7 @@ * 基础输出封装 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Controller { diff --git a/bus-bom/pom.xml b/bus-bom/pom.xml index 53cbf3ae78..232735e75a 100755 --- a/bus-bom/pom.xml +++ b/bus-bom/pom.xml @@ -6,13 +6,38 @@ org.aoju bus-bom - 6.1.1 + 6.1.2 pom ${project.artifactId} Bus Bom https://github.com/aoju/bus + + + The MIT License (MIT) + https://opensource.org/licenses/MIT + + + + + scm:git@github.com:aoju/bus.git + scm:git@github.com:aoju/bus.git + git@github.com:aoju/bus.git + + + + + Kimi Liu + https://github.com/aoju/bus.git + + + + + Github Issue + https://github.com/aoju/bus/issues + + UTF-8 UTF-8 @@ -157,31 +182,6 @@ - - - The MIT License (MIT) - https://opensource.org/licenses/MIT - - - - - scm:git@github.com:aoju/bus.git - scm:git@github.com:aoju/bus.git - git@github.com:aoju/bus.git - - - - - Kimi Liu - https://github.com/aoju/bus.git - - - - - Github Issue - https://github.com/aoju/bus/issues - - diff --git a/bus-cache/README.md b/bus-cache/README.md index 76fa2a9a5e..ec8567ae73 100755 --- a/bus-cache/README.md +++ b/bus-cache/README.md @@ -57,7 +57,7 @@ Object func(@CacheKey("#arg0[#i]") List ids) { org.aoju.bus bus-cache - 6.1.1 + 6.1.2 ``` - XML注册 diff --git a/bus-cache/pom.xml b/bus-cache/pom.xml index bbba0095d1..951417f03b 100755 --- a/bus-cache/pom.xml +++ b/bus-cache/pom.xml @@ -6,30 +6,55 @@ org.aoju bus-cache - 6.1.1 + 6.1.2 jar ${project.artifactId} Bus Cache https://github.com/aoju/bus + + + The MIT License (MIT) + https://opensource.org/licenses/MIT + + + + + scm:git@github.com:aoju/bus.git + scm:git@github.com:aoju/bus.git + git@github.com:aoju/bus.git + + + + + Kimi Liu + https://github.com/aoju/bus.git + + + + + Github Issue + https://github.com/aoju/bus/issues + + UTF-8 UTF-8 1.8 - 2.3.0.RELEASE - 1.18.12 - 1.2.73 + 2.4.0 + 1.18.16 + 1.2.75 4.2.3 2.9.0 2.4.6 3.8.1 4.3.0 - 29.0-jre + 30.0-jre 1.26 4.0.63 - 1.1.24 - 8.0.21 + 1.2.3 + 8.0.22 @@ -156,31 +181,6 @@ - - - The MIT License (MIT) - https://opensource.org/licenses/MIT - - - - - scm:git@github.com:aoju/bus.git - scm:git@github.com:aoju/bus.git - git@github.com:aoju/bus.git - - - - - Kimi Liu - https://github.com/aoju/bus.git - - - - - Github Issue - https://github.com/aoju/bus/issues - - diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/CacheX.java b/bus-cache/src/main/java/org/aoju/bus/cache/CacheX.java index 1b2b3dfa7b..ccf21cd2bd 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/CacheX.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/CacheX.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache; @@ -31,7 +32,7 @@ * 缓存接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface CacheX { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/Complex.java b/bus-cache/src/main/java/org/aoju/bus/cache/Complex.java index 1a7083aad8..e4df6eebb1 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/Complex.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/Complex.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache; @@ -44,7 +45,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Singleton diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/Context.java b/bus-cache/src/main/java/org/aoju/bus/cache/Context.java index 1c7950cb7b..4ba532f7ca 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/Context.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/Context.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Context { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/Hitting.java b/bus-cache/src/main/java/org/aoju/bus/cache/Hitting.java index 2d859323f4..47352c69fa 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/Hitting.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/Hitting.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Hitting { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/Manage.java b/bus-cache/src/main/java/org/aoju/bus/cache/Manage.java index df7ef45018..c5bcd7addc 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/Manage.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/Manage.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache; @@ -37,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Singleton diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/Module.java b/bus-cache/src/main/java/org/aoju/bus/cache/Module.java index 653a298581..1dda107886 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/Module.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/Module.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache; @@ -40,7 +41,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Module extends AbstractModule { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/annotation/CacheKey.java b/bus-cache/src/main/java/org/aoju/bus/cache/annotation/CacheKey.java index 10c79ff504..e192043903 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/annotation/CacheKey.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/annotation/CacheKey.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.annotation; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/annotation/Cached.java b/bus-cache/src/main/java/org/aoju/bus/cache/annotation/Cached.java index f3e3a852e4..9d28b86159 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/annotation/Cached.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/annotation/Cached.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.annotation; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/annotation/CachedGet.java b/bus-cache/src/main/java/org/aoju/bus/cache/annotation/CachedGet.java index 61b8d01f23..fa00f21397 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/annotation/CachedGet.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/annotation/CachedGet.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.annotation; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/annotation/Invalid.java b/bus-cache/src/main/java/org/aoju/bus/cache/annotation/Invalid.java index bb962db7c1..289f6a0606 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/annotation/Invalid.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/annotation/Invalid.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.annotation; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/magic/AbstractReader.java b/bus-cache/src/main/java/org/aoju/bus/cache/magic/AbstractReader.java index 8a1f38f4bd..a9555b72e9 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/magic/AbstractReader.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/magic/AbstractReader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.magic; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractReader { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/magic/AnnoHolder.java b/bus-cache/src/main/java/org/aoju/bus/cache/magic/AnnoHolder.java index 30cfcff4a5..f2eecbfa7e 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/magic/AnnoHolder.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/magic/AnnoHolder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.magic; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AnnoHolder { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/magic/CacheExpire.java b/bus-cache/src/main/java/org/aoju/bus/cache/magic/CacheExpire.java index 5ad4f44c4a..122e0f19ce 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/magic/CacheExpire.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/magic/CacheExpire.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.magic; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface CacheExpire { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/magic/CacheKeys.java b/bus-cache/src/main/java/org/aoju/bus/cache/magic/CacheKeys.java index 73ae6a6be6..be460bbecf 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/magic/CacheKeys.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/magic/CacheKeys.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.magic; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CacheKeys { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/magic/CachePair.java b/bus-cache/src/main/java/org/aoju/bus/cache/magic/CachePair.java index 76142f8c45..bfab961d85 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/magic/CachePair.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/magic/CachePair.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.magic; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CachePair { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/magic/MethodHolder.java b/bus-cache/src/main/java/org/aoju/bus/cache/magic/MethodHolder.java index 81c088073b..b2819de0f3 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/magic/MethodHolder.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/magic/MethodHolder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.magic; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/magic/MultiCacheReader.java b/bus-cache/src/main/java/org/aoju/bus/cache/magic/MultiCacheReader.java index 802ca6ae74..2b4281a594 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/magic/MultiCacheReader.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/magic/MultiCacheReader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.magic; @@ -38,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Singleton diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/magic/SingleCacheReader.java b/bus-cache/src/main/java/org/aoju/bus/cache/magic/SingleCacheReader.java index 8e1578c509..6686b91802 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/magic/SingleCacheReader.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/magic/SingleCacheReader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.magic; @@ -37,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Singleton diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/metric/EhCache.java b/bus-cache/src/main/java/org/aoju/bus/cache/metric/EhCache.java index 1799b45635..52391200e1 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/metric/EhCache.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/metric/EhCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.metric; @@ -46,7 +47,7 @@ * 具有快速、精干等特点 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class EhCache implements CacheX { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/metric/ExtendCache.java b/bus-cache/src/main/java/org/aoju/bus/cache/metric/ExtendCache.java index edf8dce61f..26e773cf02 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/metric/ExtendCache.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/metric/ExtendCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.metric; @@ -28,7 +29,7 @@ * 缓存接口,方便用户扩展 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface ExtendCache { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/metric/GuavaCache.java b/bus-cache/src/main/java/org/aoju/bus/cache/metric/GuavaCache.java index 7ba347752f..87c80ce188 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/metric/GuavaCache.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/metric/GuavaCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.metric; @@ -38,7 +39,7 @@ * Guava 缓存支持 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class GuavaCache implements CacheX { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/metric/MemcachedCache.java b/bus-cache/src/main/java/org/aoju/bus/cache/metric/MemcachedCache.java index 4d254ee002..5a7ce4dcd7 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/metric/MemcachedCache.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/metric/MemcachedCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.metric; @@ -43,7 +44,7 @@ * Memcached 缓存支持 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MemcachedCache implements CacheX { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/metric/MemoryCache.java b/bus-cache/src/main/java/org/aoju/bus/cache/metric/MemoryCache.java index 85c468e826..e26dffbb9c 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/metric/MemoryCache.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/metric/MemoryCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.metric; @@ -46,7 +47,7 @@ * 内存缓存支持 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MemoryCache implements CacheX { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/metric/NoOpCache.java b/bus-cache/src/main/java/org/aoju/bus/cache/metric/NoOpCache.java index a812bdde7f..cb22728dbd 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/metric/NoOpCache.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/metric/NoOpCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.metric; @@ -34,7 +35,7 @@ * 无缓存实现,用于快速关闭缓存 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NoOpCache implements CacheX { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/metric/RedisCache.java b/bus-cache/src/main/java/org/aoju/bus/cache/metric/RedisCache.java index 70a7c6314e..757386d557 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/metric/RedisCache.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/metric/RedisCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.metric; @@ -42,7 +43,7 @@ * Redis 单机缓存支持 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RedisCache implements CacheX { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/metric/RedisClusterCache.java b/bus-cache/src/main/java/org/aoju/bus/cache/metric/RedisClusterCache.java index 2088ac68a3..039f5f7771 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/metric/RedisClusterCache.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/metric/RedisClusterCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.metric; @@ -38,7 +39,7 @@ * Redis 集群缓存支持 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RedisClusterCache implements CacheX { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/provider/AbstractHitting.java b/bus-cache/src/main/java/org/aoju/bus/cache/provider/AbstractHitting.java index 1f9f814bca..e793532181 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/provider/AbstractHitting.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/provider/AbstractHitting.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.provider; @@ -43,7 +44,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractHitting implements Hitting { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/provider/H2Hitting.java b/bus-cache/src/main/java/org/aoju/bus/cache/provider/H2Hitting.java index 685e0b3515..d4b70fb2c4 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/provider/H2Hitting.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/provider/H2Hitting.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.provider; @@ -37,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class H2Hitting extends AbstractHitting { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/provider/MemoryHitting.java b/bus-cache/src/main/java/org/aoju/bus/cache/provider/MemoryHitting.java index 69aaaded95..70480161e3 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/provider/MemoryHitting.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/provider/MemoryHitting.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.provider; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MemoryHitting implements Hitting { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/provider/MySQLHitting.java b/bus-cache/src/main/java/org/aoju/bus/cache/provider/MySQLHitting.java index e2341fce2c..f699851c24 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/provider/MySQLHitting.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/provider/MySQLHitting.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.provider; @@ -37,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MySQLHitting extends AbstractHitting { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/provider/SqliteHitting.java b/bus-cache/src/main/java/org/aoju/bus/cache/provider/SqliteHitting.java index 3fb09a2b8e..3fb5f22e02 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/provider/SqliteHitting.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/provider/SqliteHitting.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.provider; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SqliteHitting extends AbstractHitting { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/provider/ZookeeperHitting.java b/bus-cache/src/main/java/org/aoju/bus/cache/provider/ZookeeperHitting.java index f3e1e7dc14..dd715ad661 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/provider/ZookeeperHitting.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/provider/ZookeeperHitting.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.provider; @@ -44,7 +45,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ZookeeperHitting implements Hitting { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/serialize/AbstractSerializer.java b/bus-cache/src/main/java/org/aoju/bus/cache/serialize/AbstractSerializer.java index fee81d6c47..80791bf36c 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/serialize/AbstractSerializer.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/serialize/AbstractSerializer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.serialize; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractSerializer implements BaseSerializer { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/serialize/BaseSerializer.java b/bus-cache/src/main/java/org/aoju/bus/cache/serialize/BaseSerializer.java index d0e30bca35..8d033be308 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/serialize/BaseSerializer.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/serialize/BaseSerializer.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.serialize; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface BaseSerializer { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/serialize/FastJsonSerializer.java b/bus-cache/src/main/java/org/aoju/bus/cache/serialize/FastJsonSerializer.java index 732960f263..6d6335cbf1 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/serialize/FastJsonSerializer.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/serialize/FastJsonSerializer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.serialize; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FastJsonSerializer extends AbstractSerializer { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/serialize/Hessian2Serializer.java b/bus-cache/src/main/java/org/aoju/bus/cache/serialize/Hessian2Serializer.java index 3a6b213dae..86483d8b1b 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/serialize/Hessian2Serializer.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/serialize/Hessian2Serializer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.serialize; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Hessian2Serializer extends AbstractSerializer { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/serialize/JdkGzipSerializer.java b/bus-cache/src/main/java/org/aoju/bus/cache/serialize/JdkGzipSerializer.java index e23a38f0a2..b24f0268b4 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/serialize/JdkGzipSerializer.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/serialize/JdkGzipSerializer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.serialize; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JdkGzipSerializer extends AbstractSerializer { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/serialize/JdkSerializer.java b/bus-cache/src/main/java/org/aoju/bus/cache/serialize/JdkSerializer.java index cdcf05c12a..79e0b0959d 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/serialize/JdkSerializer.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/serialize/JdkSerializer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.serialize; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JdkSerializer extends AbstractSerializer { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/support/Addables.java b/bus-cache/src/main/java/org/aoju/bus/cache/support/Addables.java index c8f30397cb..c62afaaea4 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/support/Addables.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/support/Addables.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.support; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Addables { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/support/ArgNameGenerator.java b/bus-cache/src/main/java/org/aoju/bus/cache/support/ArgNameGenerator.java index d649185396..117703c9b4 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/support/ArgNameGenerator.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/support/ArgNameGenerator.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.support; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ArgNameGenerator { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/support/CacheInfoContainer.java b/bus-cache/src/main/java/org/aoju/bus/cache/support/CacheInfoContainer.java index 97813f2ac3..a37af17a1f 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/support/CacheInfoContainer.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/support/CacheInfoContainer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.support; @@ -48,7 +49,7 @@ * 定位: 将@Cached、@Invalid、@CachedGet、(@CachedPut未来)以及将@CacheKey整体融合到一起 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CacheInfoContainer { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/support/KeyGenerator.java b/bus-cache/src/main/java/org/aoju/bus/cache/support/KeyGenerator.java index 098aa4d811..ddd32ef05f 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/support/KeyGenerator.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/support/KeyGenerator.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.support; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class KeyGenerator { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/support/KeyValue.java b/bus-cache/src/main/java/org/aoju/bus/cache/support/KeyValue.java index 4a045c7768..8dfb5fca7f 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/support/KeyValue.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/support/KeyValue.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.support; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class KeyValue { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/support/PatternGenerator.java b/bus-cache/src/main/java/org/aoju/bus/cache/support/PatternGenerator.java index b2c0adfdcc..cfe1776c81 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/support/PatternGenerator.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/support/PatternGenerator.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.support; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PatternGenerator { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/support/PreventObjects.java b/bus-cache/src/main/java/org/aoju/bus/cache/support/PreventObjects.java index 61826aed11..843d2af114 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/support/PreventObjects.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/support/PreventObjects.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.support; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PreventObjects { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/support/SpelCalculator.java b/bus-cache/src/main/java/org/aoju/bus/cache/support/SpelCalculator.java index 541eac00b6..42e0d8f349 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/support/SpelCalculator.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/support/SpelCalculator.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cache.support; @@ -35,7 +36,7 @@ * Spel表达式的计算功能(@Cached内的condition、@CacheKey内的spel只是作为一个增值服务, 并不作为核心功能, 只是作为key拼装的一个亮点, 并不是必须功能) * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SpelCalculator { diff --git a/bus-core/README.md b/bus-core/README.md index e1fb5ff303..db1ed01abe 100755 --- a/bus-core/README.md +++ b/bus-core/README.md @@ -11,7 +11,7 @@ org.aoju bus-core - 6.1.1 + 6.1.2 ``` diff --git a/bus-core/pom.xml b/bus-core/pom.xml index 2fa1bdde9e..dd6551c78e 100755 --- a/bus-core/pom.xml +++ b/bus-core/pom.xml @@ -6,29 +6,13 @@ org.aoju bus-core - 6.1.1 + 6.1.2 jar ${project.artifactId} Bus Core https://github.com/aoju/bus - - UTF-8 - UTF-8 - 1.8 - 1.18.12 - - - - - org.projectlombok - lombok - ${lombok.version} - true - - - The MIT License (MIT) @@ -54,6 +38,22 @@ https://github.com/aoju/bus/issues + + UTF-8 + UTF-8 + 1.8 + 1.18.16 + + + + + org.projectlombok + lombok + ${lombok.version} + true + + + diff --git a/bus-core/src/main/java/org/aoju/bus/core/Binder.java b/bus-core/src/main/java/org/aoju/bus/core/Binder.java index 7e9c66ceec..8de2dc458b 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/Binder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/Binder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core; @@ -42,7 +43,7 @@ * 属性绑定器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @RequiredArgsConstructor diff --git a/bus-core/src/main/java/org/aoju/bus/core/Order.java b/bus-core/src/main/java/org/aoju/bus/core/Order.java index 516c7cd06e..633624894e 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/Order.java +++ b/bus-core/src/main/java/org/aoju/bus/core/Order.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core; @@ -28,7 +29,7 @@ * 排序 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Order extends Comparable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/Plugin.java b/bus-core/src/main/java/org/aoju/bus/core/Plugin.java index 7e7d293df8..630463cf4c 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/Plugin.java +++ b/bus-core/src/main/java/org/aoju/bus/core/Plugin.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core; @@ -28,7 +29,7 @@ * 插件 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Plugin extends Order { 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 index 1db9f473cc..a4603dd091 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/Version.java +++ b/bus-core/src/main/java/org/aoju/bus/core/Version.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core; @@ -34,7 +35,7 @@ * Version is Licensed under the MIT License, Version 3.0.0 (the "License") * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum Version { @@ -87,7 +88,7 @@ public static Version parse(String code) { } public static String get() { - return "6.1.1.RELEASE"; + return "6.1.2.RELEASE"; } /** diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/Alias.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/Alias.java index 1678b89533..f5b67a2087 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/Alias.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/Alias.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.annotation; @@ -33,7 +34,7 @@ * 用于字段、方法、参数等提供别名 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Retention(RetentionPolicy.RUNTIME) diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/Async.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/Async.java index 752c9bee31..ef0be12009 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/Async.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/Async.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.annotation; @@ -35,7 +36,7 @@ * 将类或方法标记为异步 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Retention(RetentionPolicy.RUNTIME) diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/Binding.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/Binding.java index 6c5db8fdce..7cd80efee9 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/Binding.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/Binding.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.annotation; @@ -33,7 +34,7 @@ * 用于绑定的注解 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Target(ElementType.ANNOTATION_TYPE) diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/Copyable.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/Copyable.java index 5901deb486..12cc67f6e8 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/Copyable.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/Copyable.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.annotation; @@ -28,7 +29,7 @@ * 设置返回元素的类型 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @FunctionalInterface diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/Element.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/Element.java index e986be10df..5d633982f8 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/Element.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/Element.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.annotation; @@ -38,7 +39,7 @@ * 核心实现使用了递归获取指定元素上的注解以及注解的注解,以实现复合注解的获取 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Element implements AnnotatedElement { diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/GuardeBy.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/GuardeBy.java index 6456474cba..f0c917b2be 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/GuardeBy.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/GuardeBy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.annotation; @@ -33,7 +34,7 @@ * 有助于代码的维护与审查,以及一些自动化的分析工具找到潜在的安全性错误 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/Ignore.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/Ignore.java index ec29fd73d1..fd2300450c 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/Ignore.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/Ignore.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.annotation; @@ -29,9 +30,9 @@ /** * 忽略该属性 */ -@Target({ElementType.FIELD}) -@Retention(RetentionPolicy.RUNTIME) @Documented +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER}) public @interface Ignore { } diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/Immutable.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/Immutable.java index 09fd9d8cda..0bbeae9f27 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/Immutable.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/Immutable.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.annotation; @@ -30,7 +31,7 @@ * 不可变类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/Inject.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/Inject.java index 99795305b6..c98f53fa09 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/Inject.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/Inject.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.annotation; @@ -30,7 +31,7 @@ * 注释实现类的成员(构造函数、方法和字段) * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Target({ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.FIELD}) diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/Label.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/Label.java index 9dcd9b9bc9..ce025fd268 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/Label.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/Label.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.annotation; @@ -33,7 +34,7 @@ * 用于在输出到CLI表或Excel/CSV等时为字段/getter提供标签. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Retention(RetentionPolicy.RUNTIME) diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/Lazy.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/Lazy.java index 3cabbe0ea1..9b4c26e9ad 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/Lazy.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/Lazy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.annotation; @@ -34,7 +35,7 @@ * 或者标记为不受立即加载影响的方法(例如,AppConfig中的方法) * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Target({ElementType.TYPE, ElementType.METHOD}) diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/Metadata.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/Metadata.java index 087c205b76..19a1ac915b 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/Metadata.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/Metadata.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.annotation; @@ -30,7 +31,7 @@ * 元注解 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Retention(RetentionPolicy.RUNTIME) diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/Named.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/Named.java index d878f75ce6..740643505a 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/Named.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/Named.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.annotation; @@ -33,7 +34,7 @@ * 注解命名 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Binding diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/NotThreadSafe.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/NotThreadSafe.java index c4906fab19..ceff62f50f 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/NotThreadSafe.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/NotThreadSafe.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.annotation; @@ -30,7 +31,7 @@ * 线程不安全安全注解 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/Qualifier.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/Qualifier.java index bc88247be5..402a9503fa 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/Qualifier.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/Qualifier.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.annotation; @@ -31,7 +32,7 @@ * 标识qualifier注解 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Target(ElementType.ANNOTATION_TYPE) diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/SPI.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/SPI.java index 61e7d2e72c..ebb7b7d1f7 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/SPI.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/SPI.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.annotation; @@ -47,7 +48,7 @@ * * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/Scheduled.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/Scheduled.java index 8fff8e39eb..09ccf4cc5c 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/Scheduled.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/Scheduled.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.annotation; @@ -32,7 +33,7 @@ * 定时任务注解 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/Scope.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/Scope.java index 7e8d8a390a..1d099940df 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/Scope.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/Scope.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.annotation; @@ -34,7 +35,7 @@ * 注释用于确定作用域的注释. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Target(ElementType.ANNOTATION_TYPE) diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/Singleton.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/Singleton.java index 0d752d4405..56b5a8413e 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/Singleton.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/Singleton.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.annotation; @@ -33,7 +34,7 @@ * 当您希望仅对该绑定的所有注入重用一个实例时,将此应用于实现类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Scope diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/ThreadSafe.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/ThreadSafe.java index 8f9ea566a7..97c66907ce 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/ThreadSafe.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/ThreadSafe.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.annotation; @@ -36,7 +37,7 @@ * 后期用途:可能会直接基于 class 进行反射创建,要求有些类需要显示指定这个注解 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/Trace.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/Trace.java index 2d17f64a81..e91d48bc5d 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/Trace.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/Trace.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.annotation; diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/Values.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/Values.java index 1896885f05..fb0ff76feb 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/Values.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/Values.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.annotation; diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/env/Dev.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/env/Dev.java index 6ebebbefe4..f7edf3a038 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/env/Dev.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/env/Dev.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.annotation.env; @@ -31,7 +32,7 @@ * 表示当前方法禁止用于生产环境,仅可用于开发测试 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Inherited diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/env/Prod.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/env/Prod.java index 43f1dbb1ec..b605f560b2 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/env/Prod.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/env/Prod.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.annotation.env; @@ -31,7 +32,7 @@ * 表示当前方法性能安全性各方面达标,可以用于生产环境 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Inherited diff --git a/bus-core/src/main/java/org/aoju/bus/core/beans/BeanDesc.java b/bus-core/src/main/java/org/aoju/bus/core/beans/BeanDesc.java index 5c4ce68910..4a00323315 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/beans/BeanDesc.java +++ b/bus-core/src/main/java/org/aoju/bus/core/beans/BeanDesc.java @@ -21,12 +21,16 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.beans; import org.aoju.bus.core.annotation.Alias; +import org.aoju.bus.core.annotation.Ignore; +import org.aoju.bus.core.convert.Convert; import org.aoju.bus.core.lang.Assert; import org.aoju.bus.core.lang.Normal; +import org.aoju.bus.core.lang.exception.InstrumentException; import org.aoju.bus.core.map.CaseInsensitiveMap; import org.aoju.bus.core.toolkit.*; @@ -51,7 +55,7 @@ * * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BeanDesc implements Serializable { @@ -171,7 +175,7 @@ private BeanDesc init() { if (false == BeanKit.isStatic(field)) { //只针对非static属性 prop = createProp(field, methods); - this.propMap.put(prop.getFieldName(), prop); + this.propMap.putIfAbsent(prop.getFieldName(), prop); } } return this; @@ -365,15 +369,15 @@ public static class PropDesc { /** * 字段 */ - private Field field; + protected final Field field; /** * Getter方法 */ - private Method getter; + protected Method getter; /** * Setter方法 */ - private Method setter; + protected Method setter; /** * 构造 @@ -398,6 +402,15 @@ public String getFieldName() { return ReflectKit.getFieldName(this.field); } + /** + * 获取字段名称 + * + * @return 字段名 + */ + public String getRawFieldName() { + return null == this.field ? null : this.field.getName(); + } + /** * 获取字段 * @@ -452,8 +465,30 @@ public Method getSetter() { } /** - * 获取字段值 - * 首先调用字段对应的Getter方法获取值,如果Getter方法不存在,则判断字段如果为public,则直接获取字段值 + * 检查属性是否可读(即是否可以通过{@link #getValue(Object)}获取到值) + * + * @param checkTransient 是否检查Transient关键字或注解 + * @return 是否可读 + */ + public boolean isReadable(boolean checkTransient) { + // 检查是否有getter方法或是否为public修饰 + if (null == this.getter && false == BeanKit.isPublic(this.field)) { + return false; + } + + // 检查transient关键字和@Transient注解 + if (checkTransient && isTransientForGet()) { + return false; + } + + // 检查@PropIgnore注解 + return false == isIgnoreGet(); + } + + /** + * 获取属性值 + * 首先调用字段对应的Getter方法获取值,如果Getter方法不存在,则判断字段如果为public,则直接获取字段值 + * 此方法不检查任何注解,使用前需调用 {@link #isReadable(boolean)} 检查是否可读 * * @param bean Bean对象 * @return 字段值 @@ -467,12 +502,63 @@ public Object getValue(Object bean) { return null; } + /** + * 获取属性值,自动转换属性值类型 + * 首先调用字段对应的Getter方法获取值,如果Getter方法不存在,则判断字段如果为public,则直接获取字段值 + * + * @param bean Bean对象 + * @param targetType 返回属性值需要转换的类型,null表示不转换 + * @param ignoreError 是否忽略错误,包括转换错误和注入错误 + * @return this + */ + public Object getValue(Object bean, Type targetType, boolean ignoreError) { + Object result = null; + try { + result = getValue(bean); + } catch (Exception e) { + if (false == ignoreError) { + throw new InstrumentException("Get value of [{}] error!", getFieldName()); + } + } + + if (null != result && null != targetType) { + // 尝试将结果转换为目标类型,如果转换失败,返回原类型。 + final Object convertValue = Convert.convertWithCheck(targetType, result, null, ignoreError); + if (null != convertValue) { + result = convertValue; + } + } + return result; + } + + /** + * 检查属性是否可读(即是否可以通过{@link #getValue(Object)}获取到值) + * + * @param checkTransient 是否检查Transient关键字或注解 + * @return 是否可读 + */ + public boolean isWritable(boolean checkTransient) { + // 检查是否有getter方法或是否为public修饰 + if (null == this.setter && false == BeanKit.isPublic(this.field)) { + return false; + } + + // 检查transient关键字和@Transient注解 + if (checkTransient && isTransientForSet()) { + return false; + } + + // 检查@PropIgnore注解 + return false == isIgnoreSet(); + } + /** * 设置Bean的字段值 - * 首先调用字段对应的Setter方法,如果Setter方法不存在,则判断字段如果为public,则直接赋值字段值 + * 首先调用字段对应的Setter方法,如果Setter方法不存在,则判断字段如果为public,则直接赋值字段值 + * 此方法不检查任何注解,使用前需调用 {@link #isWritable(boolean)} 检查是否可写 * * @param bean Bean对象 - * @param value 值 + * @param value 值,必须与字段值类型匹配 * @return this */ public PropDesc setValue(Object bean, Object value) { @@ -485,24 +571,40 @@ public PropDesc setValue(Object bean, Object value) { } /** - * 字段和Getter方法是否为Transient关键字修饰的 + * 设置属性值,可以自动转换字段类型为目标类型 * - * @return 是否为Transient关键字修饰的 + * @param bean Bean对象 + * @param value 属性值,可以为任意类型 + * @param ignoreNull 是否忽略{@code null}值,true表示忽略 + * @param ignoreError 是否忽略错误,包括转换错误和注入错误 + * @return this */ - public boolean isTransient() { - boolean isTransient = BeanKit.hasModifier(this.field, BeanKit.ModifierType.TRANSIENT); + public PropDesc setValue(Object bean, Object value, boolean ignoreNull, boolean ignoreError) { + if (ignoreNull && null == value) { + return this; + } - // 检查Getter方法 - if (false == isTransient && null != this.getter) { - isTransient = BeanKit.hasModifier(this.getter, BeanKit.ModifierType.TRANSIENT); + // 当类型不匹配的时候,执行默认转换 + if (null != value) { + final Class propClass = getFieldClass(); + if (false == propClass.isInstance(value)) { + value = Convert.convertWithCheck(propClass, value, null, ignoreError); + } + } - // 检查注解 - if (false == isTransient) { - isTransient = null != AnnoKit.getAnnotation(this.getter, Transient.class); + // 属性赋值 + if (null != value || false == ignoreNull) { + try { + this.setValue(bean, value); + } catch (Exception e) { + if (false == ignoreError) { + throw new InstrumentException("Set value of [{}] error!", getFieldName()); + } + // 忽略注入失败 } } - return isTransient; + return this; } /** @@ -540,6 +642,77 @@ private Class findPropClass(Method getter, Method setter) { } return type; } + + /** + * 检查字段是否被忽略写,通过{@link Ignore} 注解完成,规则为: + *
+         *     1. 在字段上有{@link Ignore} 注解
+         *     2. 在setXXX方法上有{@link Ignore} 注解
+         * 
+ * + * @return 是否忽略写 + */ + private boolean isIgnoreSet() { + return AnnoKit.hasAnnotation(this.field, Ignore.class) + || AnnoKit.hasAnnotation(this.setter, Ignore.class); + } + + /** + * 检查字段是否被忽略读,通过{@link Ignore} 注解完成,规则为: + *
+         *     1. 在字段上有{@link Ignore} 注解
+         *     2. 在getXXX方法上有{@link Ignore} 注解
+         * 
+ * + * @return 是否忽略读 + */ + private boolean isIgnoreGet() { + return AnnoKit.hasAnnotation(this.field, Ignore.class) + || AnnoKit.hasAnnotation(this.getter, Ignore.class); + } + + /** + * 字段和Getter方法是否为Transient关键字修饰的 + * + * @return 是否为Transient关键字修饰的 + */ + private boolean isTransientForGet() { + boolean isTransient = BeanKit.hasModifier(this.field, BeanKit.ModifierType.TRANSIENT); + + // 检查Getter方法 + if (false == isTransient && null != this.getter) { + isTransient = BeanKit.hasModifier(this.getter, BeanKit.ModifierType.TRANSIENT); + + // 检查注解 + if (false == isTransient) { + isTransient = AnnoKit.hasAnnotation(this.getter, Transient.class); + } + } + + return isTransient; + } + + /** + * 字段和Getter方法是否为Transient关键字修饰的 + * + * @return 是否为Transient关键字修饰的 + */ + private boolean isTransientForSet() { + boolean isTransient = BeanKit.hasModifier(this.field, BeanKit.ModifierType.TRANSIENT); + + // 检查Getter方法 + if (false == isTransient && null != this.setter) { + isTransient = BeanKit.hasModifier(this.setter, BeanKit.ModifierType.TRANSIENT); + + // 检查注解 + if (false == isTransient) { + isTransient = AnnoKit.hasAnnotation(this.setter, Transient.class); + } + } + + return isTransient; + } + } } diff --git a/bus-core/src/main/java/org/aoju/bus/core/beans/BeanDescCache.java b/bus-core/src/main/java/org/aoju/bus/core/beans/BeanDescCache.java index 6ff2297c13..cc81ad6cb6 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/beans/BeanDescCache.java +++ b/bus-core/src/main/java/org/aoju/bus/core/beans/BeanDescCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.beans; @@ -32,7 +33,7 @@ * 缓存用于防止多次反射造成的性能问题 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum BeanDescCache { diff --git a/bus-core/src/main/java/org/aoju/bus/core/beans/BeanInfoCache.java b/bus-core/src/main/java/org/aoju/bus/core/beans/BeanInfoCache.java index 88d00b0dc7..a681f51778 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/beans/BeanInfoCache.java +++ b/bus-core/src/main/java/org/aoju/bus/core/beans/BeanInfoCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.beans; @@ -35,7 +36,7 @@ * 缓存用于防止多次反射造成的性能问题 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum BeanInfoCache { diff --git a/bus-core/src/main/java/org/aoju/bus/core/beans/BeanPath.java b/bus-core/src/main/java/org/aoju/bus/core/beans/BeanPath.java index 05ef385283..f1a090377e 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/beans/BeanPath.java +++ b/bus-core/src/main/java/org/aoju/bus/core/beans/BeanPath.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.beans; @@ -50,7 +51,7 @@ * * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BeanPath implements Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/beans/DynaBean.java b/bus-core/src/main/java/org/aoju/bus/core/beans/DynaBean.java index ac72d245de..cf291300e9 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/beans/DynaBean.java +++ b/bus-core/src/main/java/org/aoju/bus/core/beans/DynaBean.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.beans; @@ -40,7 +41,7 @@ * 支持Map和普通Bean * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DynaBean extends Support implements Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/beans/WrapperBean.java b/bus-core/src/main/java/org/aoju/bus/core/beans/WrapperBean.java new file mode 100644 index 0000000000..b3b0ec4eda --- /dev/null +++ b/bus-core/src/main/java/org/aoju/bus/core/beans/WrapperBean.java @@ -0,0 +1,56 @@ +/********************************************************************************* + * * + * The MIT License (MIT) * + * * + * Copyright (c) 2015-2020 aoju.org and other contributors. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy * + * of this software and associated documentation files (the "Software"), to deal * + * in the Software without restriction, including without limitation the rights * + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * + * THE SOFTWARE. * + * * + ********************************************************************************/ +package org.aoju.bus.core.beans; + +/** + * 为了解决反射过程中,需要传递null参数,但是会丢失参数类型而设立的包装类 + * + * @param Null值对应的类型 + * @author Kimi Liu + * @version 6.1.2 + * @since JDK 1.8+ + */ +public class WrapperBean { + + private final Class clazz; + + /** + * @param clazz null的类型 + */ + public WrapperBean(Class clazz) { + this.clazz = clazz; + } + + /** + * 获取null值对应的类型 + * + * @return 类型 + */ + public Class getWrappedClass() { + return clazz; + } + +} diff --git a/bus-core/src/main/java/org/aoju/bus/core/beans/copier/BeanCopier.java b/bus-core/src/main/java/org/aoju/bus/core/beans/copier/BeanCopier.java index 9711cb1d0a..6c9df51646 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/beans/copier/BeanCopier.java +++ b/bus-core/src/main/java/org/aoju/bus/core/beans/copier/BeanCopier.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.beans.copier; @@ -44,7 +45,7 @@ * * @param 目标对象类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BeanCopier implements Copier, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/beans/copier/CopyOptions.java b/bus-core/src/main/java/org/aoju/bus/core/beans/copier/CopyOptions.java index ce55306f8c..7ee60e0f8a 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/beans/copier/CopyOptions.java +++ b/bus-core/src/main/java/org/aoju/bus/core/beans/copier/CopyOptions.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.beans.copier; @@ -37,7 +38,7 @@ * 3、忽略的属性列表,设置一个属性列表,不拷贝这些属性值 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CopyOptions { @@ -89,7 +90,7 @@ public CopyOptions(Class editable, boolean ignoreNullValue, String... ignoreP /** * 创建拷贝选项 * - * @return 拷贝选项 + * @return this */ public static CopyOptions create() { return new CopyOptions(); @@ -101,7 +102,7 @@ public static CopyOptions create() { * @param editable 限制的类或接口,必须为目标对象的实现接口或父类,用于限制拷贝的属性 * @param ignoreNullValue 是否忽略空值,当源对象的值为null时,true: 忽略而不注入此值,false: 注入null * @param ignoreProperties 忽略的属性列表,设置一个属性列表,不拷贝这些属性值 - * @return 拷贝选项 + * @return this */ public static CopyOptions create(Class editable, boolean ignoreNullValue, String... ignoreProperties) { return new CopyOptions(editable, ignoreNullValue, ignoreProperties); @@ -111,7 +112,7 @@ public static CopyOptions create(Class editable, boolean ignoreNullValue, Str * 设置限制的类或接口,必须为目标对象的实现接口或父类,用于限制拷贝的属性 * * @param editable 限制的类或接口 - * @return CopyOptions + * @return this */ public CopyOptions setEditable(Class editable) { this.editable = editable; @@ -122,7 +123,7 @@ public CopyOptions setEditable(Class editable) { * 设置是否忽略空值,当源对象的值为null时,true: 忽略而不注入此值,false: 注入null * * @param ignoreNullVall 是否忽略空值,当源对象的值为null时,true: 忽略而不注入此值,false: 注入null - * @return CopyOptions + * @return this */ public CopyOptions setIgnoreNullValue(boolean ignoreNullVall) { this.ignoreNullValue = ignoreNullVall; @@ -133,7 +134,7 @@ public CopyOptions setIgnoreNullValue(boolean ignoreNullVall) { * 设置忽略的目标对象中属性列表,设置一个属性列表,不拷贝这些属性值 * * @param ignoreProperties 忽略的目标对象中属性列表,设置一个属性列表,不拷贝这些属性值 - * @return CopyOptions + * @return this */ public CopyOptions setIgnoreProperties(String... ignoreProperties) { this.ignoreProperties = ignoreProperties; @@ -144,7 +145,7 @@ public CopyOptions setIgnoreProperties(String... ignoreProperties) { * 设置是否忽略字段的注入错误 * * @param ignoreError 是否忽略注入错误 - * @return CopyOptions + * @return this */ public CopyOptions setIgnoreError(boolean ignoreError) { this.ignoreError = ignoreError; @@ -155,7 +156,7 @@ public CopyOptions setIgnoreError(boolean ignoreError) { * 设置是否忽略字段的注入错误 * * @param ignoreCase 是否忽略大小写 - * @return CopyOptions + * @return this */ public CopyOptions setIgnoreCase(boolean ignoreCase) { this.ignoreCase = ignoreCase; @@ -166,7 +167,7 @@ public CopyOptions setIgnoreCase(boolean ignoreCase) { * 设置拷贝属性的字段映射,用于不同的属性之前拷贝做对应表用 * * @param fieldMapping 拷贝属性的字段映射,用于不同的属性之前拷贝做对应表用 - * @return CopyOptions + * @return this */ public CopyOptions setFieldMapping(Map fieldMapping) { this.fieldMapping = fieldMapping; diff --git a/bus-core/src/main/java/org/aoju/bus/core/beans/copier/ValueProvider.java b/bus-core/src/main/java/org/aoju/bus/core/beans/copier/ValueProvider.java index 8c94025f1c..8cd53e41a7 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/beans/copier/ValueProvider.java +++ b/bus-core/src/main/java/org/aoju/bus/core/beans/copier/ValueProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.beans.copier; @@ -34,7 +35,7 @@ * * @param KEY类型,一般情况下为 {@link String} * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface ValueProvider { diff --git a/bus-core/src/main/java/org/aoju/bus/core/beans/copier/provider/BeanValueProvider.java b/bus-core/src/main/java/org/aoju/bus/core/beans/copier/provider/BeanValueProvider.java index 738795374b..c05c6b657a 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/beans/copier/provider/BeanValueProvider.java +++ b/bus-core/src/main/java/org/aoju/bus/core/beans/copier/provider/BeanValueProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.beans.copier.provider; @@ -40,7 +41,7 @@ * Bean的值提供者 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BeanValueProvider implements ValueProvider { diff --git a/bus-core/src/main/java/org/aoju/bus/core/beans/copier/provider/MapValueProvider.java b/bus-core/src/main/java/org/aoju/bus/core/beans/copier/provider/MapValueProvider.java index 722f4801f2..3c19650484 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/beans/copier/provider/MapValueProvider.java +++ b/bus-core/src/main/java/org/aoju/bus/core/beans/copier/provider/MapValueProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.beans.copier.provider; @@ -36,7 +37,7 @@ * Map值提供者 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MapValueProvider implements ValueProvider { diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/Builder.java b/bus-core/src/main/java/org/aoju/bus/core/builder/Builder.java index ad1da79b6f..ce6b68dabd 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/Builder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/Builder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.builder; @@ -31,7 +32,7 @@ * * @param 建造对象类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Builder extends Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/CompareBuilder.java b/bus-core/src/main/java/org/aoju/bus/core/builder/CompareBuilder.java index 25904947be..4012677eb4 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/CompareBuilder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/CompareBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.builder; @@ -69,7 +70,7 @@ * * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CompareBuilder implements Builder { diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/Different.java b/bus-core/src/main/java/org/aoju/bus/core/builder/Different.java index ebeb382f64..2c328b490d 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/Different.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/Different.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.builder; @@ -37,7 +38,7 @@ * * @param 这个{@code Diff}中包含的对象类型. * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class Different extends Pair { diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/DifferentBuilder.java b/bus-core/src/main/java/org/aoju/bus/core/builder/DifferentBuilder.java index fc4e36ba5e..f247847c07 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/DifferentBuilder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/DifferentBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.builder; @@ -58,7 +59,7 @@ * {@link DifferentResult#toString(ToStringStyle)}覆盖此样式选择。. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @see Differentable * @see Different * @see DifferentResult diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/DifferentResult.java b/bus-core/src/main/java/org/aoju/bus/core/builder/DifferentResult.java index a628eb24f2..03c9e005b6 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/DifferentResult.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/DifferentResult.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.builder; @@ -37,7 +38,7 @@ * 该方法返回一个字符串,该字符串描述对象之间不同的字段. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DifferentResult implements Iterable> { diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/Differentable.java b/bus-core/src/main/java/org/aoju/bus/core/builder/Differentable.java index 77e43fc64a..f8bcd051ce 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/Differentable.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/Differentable.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.builder; @@ -40,7 +41,7 @@ * * @param 这个对象可能被区分的对象类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Differentable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/EqualsBuilder.java b/bus-core/src/main/java/org/aoju/bus/core/builder/EqualsBuilder.java index f49fcd791f..ec2f039b9e 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/EqualsBuilder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/EqualsBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.builder; @@ -62,7 +63,7 @@ * * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class EqualsBuilder implements Builder { diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/EqualsExclude.java b/bus-core/src/main/java/org/aoju/bus/core/builder/EqualsExclude.java index 4cf7e8bba8..b6494608bb 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/EqualsExclude.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/EqualsExclude.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.builder; @@ -34,7 +35,7 @@ * 上的各种reflectionEquals方法使用. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Retention(RetentionPolicy.RUNTIME) diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/HashCodeBuilder.java b/bus-core/src/main/java/org/aoju/bus/core/builder/HashCodeBuilder.java index 002d6503e4..ad8d87ed05 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/HashCodeBuilder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/HashCodeBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.builder; @@ -63,7 +64,7 @@ * * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HashCodeBuilder implements Builder { diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/HashCodeExclude.java b/bus-core/src/main/java/org/aoju/bus/core/builder/HashCodeExclude.java index 862add919d..8ee3ad8b4a 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/HashCodeExclude.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/HashCodeExclude.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.builder; @@ -34,7 +35,7 @@ * 上的各种reflectionHashcode方法使用. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Retention(RetentionPolicy.RUNTIME) diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/MultilineToStringStyle.java b/bus-core/src/main/java/org/aoju/bus/core/builder/MultilineToStringStyle.java index a2b1354834..65e62694f8 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/MultilineToStringStyle.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/MultilineToStringStyle.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.builder; @@ -53,7 +54,7 @@ * * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MultilineToStringStyle extends RecursiveToStringStyle { diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/RecursiveToStringStyle.java b/bus-core/src/main/java/org/aoju/bus/core/builder/RecursiveToStringStyle.java index 15f7222326..e247c7df8d 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/RecursiveToStringStyle.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/RecursiveToStringStyle.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.builder; @@ -53,7 +54,7 @@ * * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RecursiveToStringStyle extends ToStringStyle { diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/ReflectionBuilder.java b/bus-core/src/main/java/org/aoju/bus/core/builder/ReflectionBuilder.java index 61107a8f79..c659cbaefc 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/ReflectionBuilder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/ReflectionBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.builder; @@ -58,7 +59,7 @@ *

* * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ReflectionBuilder implements Builder { diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/ReflectionToStringBuilder.java b/bus-core/src/main/java/org/aoju/bus/core/builder/ReflectionToStringBuilder.java index a5cf51b519..80624c158d 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/ReflectionToStringBuilder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/ReflectionToStringBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.builder; @@ -55,7 +56,7 @@ *

* * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ReflectionToStringBuilder extends ToStringBuilder { diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/StandardToStringStyle.java b/bus-core/src/main/java/org/aoju/bus/core/builder/StandardToStringStyle.java index b5638c14ae..06eacf009e 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/StandardToStringStyle.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/StandardToStringStyle.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.builder; @@ -33,7 +34,7 @@ *

* * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class StandardToStringStyle extends ToStringStyle { diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringBuilder.java b/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringBuilder.java index 8723585239..21219dfc38 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringBuilder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.builder; @@ -63,7 +64,7 @@ * * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ToStringBuilder implements Builder { diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringExclude.java b/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringExclude.java index 94dc4c2033..d71c5b3f29 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringExclude.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringExclude.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.builder; @@ -33,7 +34,7 @@ * 使用这个注释来排除字段被{@link ReflectionToStringBuilder}使用. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Retention(RetentionPolicy.RUNTIME) diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringStyle.java b/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringStyle.java index 7c88b31159..1bff130d09 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringStyle.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringStyle.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.builder; @@ -62,7 +63,7 @@ * * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class ToStringStyle implements Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringSummary.java b/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringSummary.java index 1b0545c000..32839ae2f7 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringSummary.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringSummary.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.builder; @@ -34,7 +35,7 @@ * 在字段上使用这个注释来获得摘要,而不是详细信息. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Retention(RetentionPolicy.RUNTIME) diff --git a/bus-core/src/main/java/org/aoju/bus/core/clone/Cloneable.java b/bus-core/src/main/java/org/aoju/bus/core/clone/Cloneable.java index 18b4c4633a..0b7f5a1ddc 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/clone/Cloneable.java +++ b/bus-core/src/main/java/org/aoju/bus/core/clone/Cloneable.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.clone; @@ -31,7 +32,7 @@ * * @param 实现克隆接口的类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Cloneable extends java.lang.Cloneable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/clone/Support.java b/bus-core/src/main/java/org/aoju/bus/core/clone/Support.java index 860823cccb..0557acd722 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/clone/Support.java +++ b/bus-core/src/main/java/org/aoju/bus/core/clone/Support.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.clone; @@ -33,7 +34,7 @@ * * @param 继承类的类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Support implements Cloneable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/codec/BCD.java b/bus-core/src/main/java/org/aoju/bus/core/codec/BCD.java index ed62429d05..e2f0d385f7 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/codec/BCD.java +++ b/bus-core/src/main/java/org/aoju/bus/core/codec/BCD.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.codec; @@ -32,7 +33,7 @@ * 使二进制和十进制之间的转换得以快捷的进行 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BCD { diff --git a/bus-core/src/main/java/org/aoju/bus/core/codec/Base32.java b/bus-core/src/main/java/org/aoju/bus/core/codec/Base32.java index be2f3c9cac..d90dff39ce 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/codec/Base32.java +++ b/bus-core/src/main/java/org/aoju/bus/core/codec/Base32.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.codec; @@ -36,7 +37,7 @@ * see http://blog.csdn.net/earbao/article/details/44453937 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Base32 { diff --git a/bus-core/src/main/java/org/aoju/bus/core/codec/Base64.java b/bus-core/src/main/java/org/aoju/bus/core/codec/Base64.java index bf4465508b..de87b81355 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/codec/Base64.java +++ b/bus-core/src/main/java/org/aoju/bus/core/codec/Base64.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.codec; @@ -39,7 +40,7 @@ * 也就是三位二进制数组经过编码后变为四位的ASCII字符显示,长度比原来增加1/3 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Base64 { diff --git a/bus-core/src/main/java/org/aoju/bus/core/codec/Base64Decoder.java b/bus-core/src/main/java/org/aoju/bus/core/codec/Base64Decoder.java index 72661c3e81..3b4dfc5859 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/codec/Base64Decoder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/codec/Base64Decoder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.codec; @@ -37,7 +38,7 @@ * Base64解码实现 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Base64Decoder { diff --git a/bus-core/src/main/java/org/aoju/bus/core/codec/Base64Encoder.java b/bus-core/src/main/java/org/aoju/bus/core/codec/Base64Encoder.java index e741d0e267..0e98789519 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/codec/Base64Encoder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/codec/Base64Encoder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.codec; @@ -34,7 +35,7 @@ * Base64编码 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Base64Encoder { diff --git a/bus-core/src/main/java/org/aoju/bus/core/codec/Caesar.java b/bus-core/src/main/java/org/aoju/bus/core/codec/Caesar.java index 49ed0a947f..591966c472 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/codec/Caesar.java +++ b/bus-core/src/main/java/org/aoju/bus/core/codec/Caesar.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.codec; @@ -30,7 +31,7 @@ * 凯撒密码实现 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Caesar { diff --git a/bus-core/src/main/java/org/aoju/bus/core/codec/Morse.java b/bus-core/src/main/java/org/aoju/bus/core/codec/Morse.java index c8c7c9684e..3fedf4fa62 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/codec/Morse.java +++ b/bus-core/src/main/java/org/aoju/bus/core/codec/Morse.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.codec; @@ -36,7 +37,7 @@ * 莫尔斯电码的编码和解码 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Morse { diff --git a/bus-core/src/main/java/org/aoju/bus/core/collection/ArrayIterator.java b/bus-core/src/main/java/org/aoju/bus/core/collection/ArrayIterator.java index 92a56e02f6..82dcacdc82 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/collection/ArrayIterator.java +++ b/bus-core/src/main/java/org/aoju/bus/core/collection/ArrayIterator.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.collection; @@ -37,7 +38,7 @@ * * @param 元素类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ArrayIterator implements Iterator, Iterable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/collection/ConcurrentHashSet.java b/bus-core/src/main/java/org/aoju/bus/core/collection/ConcurrentHashSet.java index a482323868..c9bc1c0f5c 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/collection/ConcurrentHashSet.java +++ b/bus-core/src/main/java/org/aoju/bus/core/collection/ConcurrentHashSet.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.collection; @@ -34,7 +35,7 @@ * * @param 元素类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ConcurrentHashSet extends AbstractSet implements java.io.Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/collection/CopiedIter.java b/bus-core/src/main/java/org/aoju/bus/core/collection/CopiedIter.java index 79d8a9c258..0fefe07a9d 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/collection/CopiedIter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/collection/CopiedIter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.collection; @@ -40,7 +41,7 @@ * * @param 元素类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CopiedIter implements Iterator, Iterable, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/collection/EnumerationIter.java b/bus-core/src/main/java/org/aoju/bus/core/collection/EnumerationIter.java index d442f7d9a3..059f2d3c5c 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/collection/EnumerationIter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/collection/EnumerationIter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.collection; @@ -32,7 +33,7 @@ * * @param 元素类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class EnumerationIter implements Iterator, Iterable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/collection/IteratorEnumeration.java b/bus-core/src/main/java/org/aoju/bus/core/collection/IteratorEnumeration.java index f42db9ec6a..ef5e6a9130 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/collection/IteratorEnumeration.java +++ b/bus-core/src/main/java/org/aoju/bus/core/collection/IteratorEnumeration.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.collection; @@ -32,7 +33,7 @@ * * @param 元素类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class IteratorEnumeration implements Enumeration { diff --git a/bus-core/src/main/java/org/aoju/bus/core/collection/LineIter.java b/bus-core/src/main/java/org/aoju/bus/core/collection/LineIter.java index fff503acb2..bf9db75665 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/collection/LineIter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/collection/LineIter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.collection; @@ -38,7 +39,7 @@ * 此对象遍历结束后,应关闭之,推荐使用方式: * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class LineIter implements Iterator, Iterable, Closeable, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/collection/PriorityQueue.java b/bus-core/src/main/java/org/aoju/bus/core/collection/PriorityQueue.java index c3f64cac76..9cfd0d3944 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/collection/PriorityQueue.java +++ b/bus-core/src/main/java/org/aoju/bus/core/collection/PriorityQueue.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.collection; @@ -32,7 +33,7 @@ * 按照给定的排序规则淘汰末尾元素 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PriorityQueue extends java.util.PriorityQueue { diff --git a/bus-core/src/main/java/org/aoju/bus/core/compare/Comparables.java b/bus-core/src/main/java/org/aoju/bus/core/compare/Comparables.java index 3905d4fb6c..fedb67b01e 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/compare/Comparables.java +++ b/bus-core/src/main/java/org/aoju/bus/core/compare/Comparables.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.compare; @@ -32,7 +33,7 @@ * * @param 比较对象类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Comparables> implements Comparator, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/compare/CompareChain.java b/bus-core/src/main/java/org/aoju/bus/core/compare/CompareChain.java index 7411215969..b1d32feea0 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/compare/CompareChain.java +++ b/bus-core/src/main/java/org/aoju/bus/core/compare/CompareChain.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.compare; @@ -35,7 +36,7 @@ * 此类copy from Apache-commons-collections * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CompareChain implements Chain, CompareChain>, Comparator, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/compare/FieldCompare.java b/bus-core/src/main/java/org/aoju/bus/core/compare/FieldCompare.java index f3be36fbed..c3457e6928 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/compare/FieldCompare.java +++ b/bus-core/src/main/java/org/aoju/bus/core/compare/FieldCompare.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.compare; @@ -40,7 +41,7 @@ * * @param 被比较的Bean * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FieldCompare implements Comparator, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/compare/IndexedCompare.java b/bus-core/src/main/java/org/aoju/bus/core/compare/IndexedCompare.java index cc3d16e365..3fbcd28db9 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/compare/IndexedCompare.java +++ b/bus-core/src/main/java/org/aoju/bus/core/compare/IndexedCompare.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.compare; @@ -35,7 +36,7 @@ * * @param 被排序元素类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class IndexedCompare implements Comparator { diff --git a/bus-core/src/main/java/org/aoju/bus/core/compare/InstanceCompare.java b/bus-core/src/main/java/org/aoju/bus/core/compare/InstanceCompare.java index b6f1c8677d..99f5f54d5f 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/compare/InstanceCompare.java +++ b/bus-core/src/main/java/org/aoju/bus/core/compare/InstanceCompare.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.compare; @@ -33,7 +34,7 @@ * * @param 用于比较的对象类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class InstanceCompare implements Comparator { diff --git a/bus-core/src/main/java/org/aoju/bus/core/compare/PinyinCompare.java b/bus-core/src/main/java/org/aoju/bus/core/compare/PinyinCompare.java index db0335ffe5..37054266bd 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/compare/PinyinCompare.java +++ b/bus-core/src/main/java/org/aoju/bus/core/compare/PinyinCompare.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.compare; @@ -33,7 +34,7 @@ * 按照GBK拼音顺序对给定的汉字字符串排序 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PinyinCompare implements Comparator, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/compare/PropertyCompare.java b/bus-core/src/main/java/org/aoju/bus/core/compare/PropertyCompare.java index 4164d7ccee..636a7f423b 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/compare/PropertyCompare.java +++ b/bus-core/src/main/java/org/aoju/bus/core/compare/PropertyCompare.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.compare; @@ -37,7 +38,7 @@ * * @param 被比较的Bean * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PropertyCompare implements Comparator, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/compare/ReverseCompare.java b/bus-core/src/main/java/org/aoju/bus/core/compare/ReverseCompare.java index 12db5c4ec3..3783d7be95 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/compare/ReverseCompare.java +++ b/bus-core/src/main/java/org/aoju/bus/core/compare/ReverseCompare.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.compare; @@ -32,7 +33,7 @@ * * @param 被比较对象类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ReverseCompare implements Comparator, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/compare/VersionCompare.java b/bus-core/src/main/java/org/aoju/bus/core/compare/VersionCompare.java index 38d746016c..4da2e19a4d 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/compare/VersionCompare.java +++ b/bus-core/src/main/java/org/aoju/bus/core/compare/VersionCompare.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.compare; @@ -38,7 +39,7 @@ * 支持如:1.3.20.8,6.82.20160101,8.5a/8.5c等版本形式 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class VersionCompare implements Comparator, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/AbstractConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/AbstractConverter.java index ae0cb72b68..d09a8a6af6 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/AbstractConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/AbstractConverter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -36,7 +37,7 @@ * 转换器不会抛出转换异常,转换失败时会返回{@code null} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractConverter implements Converter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/ArrayConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/ArrayConverter.java index 6860abbb8b..4800ac8e1f 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/ArrayConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/ArrayConverter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -40,7 +41,7 @@ * 数组转换器,包括原始类型数组 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ArrayConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/AtomicBooleanConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/AtomicBooleanConverter.java index a64fbdd9d5..e30a259283 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/AtomicBooleanConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/AtomicBooleanConverter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -32,7 +33,7 @@ * {@link AtomicBoolean}转换器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AtomicBooleanConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/AtomicIntegerArrayConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/AtomicIntegerArrayConverter.java new file mode 100644 index 0000000000..0593d1195f --- /dev/null +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/AtomicIntegerArrayConverter.java @@ -0,0 +1,44 @@ +/********************************************************************************* + * * + * The MIT License (MIT) * + * * + * Copyright (c) 2015-2020 aoju.org and other contributors. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy * + * of this software and associated documentation files (the "Software"), to deal * + * in the Software without restriction, including without limitation the rights * + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * + * THE SOFTWARE. * + * * + ********************************************************************************/ +package org.aoju.bus.core.convert; + +import java.util.concurrent.atomic.AtomicIntegerArray; + +/** + * {@link AtomicIntegerArray}转换器 + * + * @author Kimi Liu + * @version 6.1.2 + * @since JDK 1.8+ + */ +public class AtomicIntegerArrayConverter extends AbstractConverter { + + @Override + protected AtomicIntegerArray convertInternal(Object value) { + return new AtomicIntegerArray(Convert.convert(int[].class, value)); + } + +} diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/AtomicLongArrayConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/AtomicLongArrayConverter.java new file mode 100644 index 0000000000..68c1753659 --- /dev/null +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/AtomicLongArrayConverter.java @@ -0,0 +1,44 @@ +/********************************************************************************* + * * + * The MIT License (MIT) * + * * + * Copyright (c) 2015-2020 aoju.org and other contributors. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy * + * of this software and associated documentation files (the "Software"), to deal * + * in the Software without restriction, including without limitation the rights * + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * + * THE SOFTWARE. * + * * + ********************************************************************************/ +package org.aoju.bus.core.convert; + +import java.util.concurrent.atomic.AtomicLongArray; + +/** + * {@link AtomicLongArray}转换器 + * + * @author Kimi Liu + * @version 6.1.2 + * @since JDK 1.8+ + */ +public class AtomicLongArrayConverter extends AbstractConverter { + + @Override + protected AtomicLongArray convertInternal(Object value) { + return new AtomicLongArray(Convert.convert(long[].class, value)); + } + +} diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/AtomicReferenceConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/AtomicReferenceConverter.java index 6fabdf6c2a..d40bd60dd6 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/AtomicReferenceConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/AtomicReferenceConverter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -33,7 +34,7 @@ * {@link AtomicReference}转换器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AtomicReferenceConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/BasicType.java b/bus-core/src/main/java/org/aoju/bus/core/convert/BasicType.java index b88b593b6b..71f91637d1 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/BasicType.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/BasicType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -32,7 +33,7 @@ * 基本类型枚举包括原始类型和包装类型 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum BasicType { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/BeanConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/BeanConverter.java index 7b37b255a4..8663fa3614 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/BeanConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/BeanConverter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -46,7 +47,7 @@ * * @param Bean类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BeanConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/BooleanConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/BooleanConverter.java index b7f48d085f..01752e87e3 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/BooleanConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/BooleanConverter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -30,7 +31,7 @@ * 波尔转换器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BooleanConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/ByteArrayConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/ByteArrayConverter.java index 3e74c233cd..1ad0231ad5 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/ByteArrayConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/ByteArrayConverter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -30,7 +31,7 @@ * byte 类型数组转换器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ByteArrayConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/CalendarConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/CalendarConverter.java index 0dda485edb..a9505df00b 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/CalendarConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/CalendarConverter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -34,7 +35,7 @@ * 日期转换器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CalendarConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/CastConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/CastConverter.java index 2933fbe281..9908d187de 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/CastConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/CastConverter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -31,7 +32,7 @@ * * @param 强制转换到的类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CastConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/CharacterConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/CharacterConverter.java index 665e56622b..058ce510ba 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/CharacterConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/CharacterConverter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -31,7 +32,7 @@ * 字符转换器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CharacterConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/CharsetConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/CharsetConverter.java index 292c1ab28b..0070515114 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/CharsetConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/CharsetConverter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -30,7 +31,7 @@ * 编码对象转换器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CharsetConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/ClassConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/ClassConverter.java index 9b8dfce9b2..af22756127 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/ClassConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/ClassConverter.java @@ -21,10 +21,10 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; -import org.aoju.bus.core.lang.exception.InstrumentException; import org.aoju.bus.core.toolkit.ClassKit; /** @@ -32,19 +32,32 @@ * 将类名转换为类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ClassConverter extends AbstractConverter> { + private final boolean isInitialized; + + /** + * 构造 + */ + public ClassConverter() { + this(true); + } + + /** + * 构造 + * + * @param isInitialized 是否初始化类(调用static模块内容和初始化static属性) + */ + public ClassConverter(boolean isInitialized) { + this.isInitialized = isInitialized; + } + @Override protected Class convertInternal(Object value) { - String valueStr = convertString(value); - try { - return ClassKit.getClassLoader().loadClass(valueStr); - } catch (Exception e) { - throw new InstrumentException(e); - } + return ClassKit.loadClass(convertString(value), isInitialized); } } diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/CollectionConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/CollectionConverter.java index a4c691c183..4b3bdf4245 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/CollectionConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/CollectionConverter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -35,7 +36,7 @@ * 各种集合类转换器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CollectionConverter implements Converter> { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/Convert.java b/bus-core/src/main/java/org/aoju/bus/core/convert/Convert.java index 07feb7e9ae..dd9704ec58 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/Convert.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/Convert.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -45,7 +46,7 @@ * 类型转换器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Convert { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/Converter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/Converter.java index 2c0e5a50ab..90b52bb23d 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/Converter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/Converter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -28,7 +29,7 @@ * 转换器接口,实现类型转换 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Converter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/ConverterRegistry.java b/bus-core/src/main/java/org/aoju/bus/core/convert/ConverterRegistry.java index 37012cac86..d907bc3e97 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/ConverterRegistry.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/ConverterRegistry.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -45,10 +46,7 @@ import java.time.temporal.TemporalAccessor; import java.util.*; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.atomic.AtomicReference; +import java.util.concurrent.atomic.*; /** * 转换器登记中心,将各种类型Convert对象放入登记中心,通过convert方法查找 @@ -56,7 +54,7 @@ * 转换器,默认转换器预定义的一些转换器,自定义转换器存放用户自定的转换器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ConverterRegistry { @@ -368,6 +366,9 @@ private ConverterRegistry defaultConverter() { defaultConverterMap.put(SoftReference.class, new ReferenceConverter(SoftReference.class)); defaultConverterMap.put(AtomicReference.class, new AtomicReferenceConverter()); + defaultConverterMap.put(AtomicIntegerArray.class, new AtomicIntegerArrayConverter()); + defaultConverterMap.put(AtomicLongArray.class, new AtomicLongArrayConverter()); + // 其它类型 defaultConverterMap.put(Class.class, new ClassConverter()); defaultConverterMap.put(TimeZone.class, new TimeZoneConverter()); diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/CurrencyConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/CurrencyConverter.java index a919c1aa73..bfd31eb3b6 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/CurrencyConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/CurrencyConverter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -30,7 +31,7 @@ * 货币{@link Currency} 转换器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CurrencyConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/DateConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/DateConverter.java index a766ae4467..0b562c8ee4 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/DateConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/DateConverter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -36,7 +37,7 @@ * 日期转换器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DateConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/DurationConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/DurationConverter.java index 2e1a28acd7..eca6e601de 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/DurationConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/DurationConverter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -31,7 +32,7 @@ * {@link Duration}对象转换器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DurationConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/EnumConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/EnumConverter.java index 9bc7ed6062..58a6adf2b0 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/EnumConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/EnumConverter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -36,7 +37,7 @@ * 无泛型检查的枚举转换器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class EnumConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/GenericEnumConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/GenericEnumConverter.java index 8c489f61c4..f6bcdb98e1 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/GenericEnumConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/GenericEnumConverter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -28,7 +29,7 @@ * 泛型枚举转换器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class GenericEnumConverter> extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/LocaleConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/LocaleConverter.java index d8e8c12b8e..8476417115 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/LocaleConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/LocaleConverter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -34,7 +35,7 @@ * 只提供String转换支持 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class LocaleConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/MapConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/MapConverter.java index d659ca6538..f091905c43 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/MapConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/MapConverter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -38,7 +39,7 @@ * {@link Map} 转换器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MapConverter extends AbstractConverter> { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/NumberChinese.java b/bus-core/src/main/java/org/aoju/bus/core/convert/NumberChinese.java index e726a80923..793bdf5ea0 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/NumberChinese.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/NumberChinese.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -37,7 +38,7 @@ * * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NumberChinese { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/NumberConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/NumberConverter.java index 4b53bc6926..dd9029a63a 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/NumberConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/NumberConverter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -36,6 +37,9 @@ import java.util.Date; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.atomic.DoubleAdder; +import java.util.concurrent.atomic.LongAdder; +import java.util.function.Function; /** * 数字转换器 @@ -52,7 +56,7 @@ * * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NumberConverter extends AbstractConverter { @@ -72,30 +76,35 @@ public NumberConverter(Class clazz) { this.targetType = (null == clazz) ? Number.class : clazz; } - @Override - protected Number convertInternal(Object value) { - return convertInternal(value, this.targetType); - } + /** + * 转换对象为数字 + * + * @param value 对象值 + * @param targetType 目标的数字类型 + * @param toStrFunc 转换为字符串的函数 + * @return 转换后的数字 + */ + protected static Number convert(Object value, Class targetType, Function toStrFunc) { + if (value instanceof Enum) { + return convert(((Enum) value).ordinal(), targetType, toStrFunc); + } - private Number convertInternal(Object value, Class targetType) { if (Byte.class == targetType) { if (value instanceof Number) { return ((Number) value).byteValue(); } else if (value instanceof Boolean) { return BooleanKit.toByteObj((Boolean) value); } - final String valueStr = convertString(value); + final String valueStr = toStrFunc.apply(value); return StringKit.isBlank(valueStr) ? null : Byte.valueOf(valueStr); - } else if (Short.class == targetType) { if (value instanceof Number) { return ((Number) value).shortValue(); } else if (value instanceof Boolean) { return BooleanKit.toShortObj((Boolean) value); } - final String valueStr = convertString(value); + final String valueStr = toStrFunc.apply((value)); return StringKit.isBlank(valueStr) ? null : Short.valueOf(valueStr); - } else if (Integer.class == targetType) { if (value instanceof Number) { return ((Number) value).intValue(); @@ -108,17 +117,15 @@ private Number convertInternal(Object value, Class targetType) { } else if (value instanceof TemporalAccessor) { return (int) DateKit.toInstant((TemporalAccessor) value).toEpochMilli(); } - final String valueStr = convertString(value); + final String valueStr = toStrFunc.apply((value)); return StringKit.isBlank(valueStr) ? null : MathKit.parseInt(valueStr); - } else if (AtomicInteger.class == targetType) { - final Number number = convertInternal(value, Integer.class); + final Number number = convert(value, Integer.class, toStrFunc); if (null != number) { final AtomicInteger intValue = new AtomicInteger(); intValue.set(number.intValue()); return intValue; } - return null; } else if (Long.class == targetType) { if (value instanceof Number) { return ((Number) value).longValue(); @@ -131,24 +138,30 @@ private Number convertInternal(Object value, Class targetType) { } else if (value instanceof TemporalAccessor) { return DateKit.toInstant((TemporalAccessor) value).toEpochMilli(); } - final String valueStr = convertString(value); + final String valueStr = toStrFunc.apply((value)); return StringKit.isBlank(valueStr) ? null : MathKit.parseLong(valueStr); - } else if (AtomicLong.class == targetType) { - final Number number = convertInternal(value, Long.class); + final Number number = convert(value, Long.class, toStrFunc); if (null != number) { final AtomicLong longValue = new AtomicLong(); longValue.set(number.longValue()); return longValue; } - return null; + } else if (LongAdder.class == targetType) { + //jdk8 新增 + final Number number = convert(value, Long.class, toStrFunc); + if (null != number) { + final LongAdder longValue = new LongAdder(); + longValue.add(number.longValue()); + return longValue; + } } else if (Float.class == targetType) { if (value instanceof Number) { return ((Number) value).floatValue(); } else if (value instanceof Boolean) { return BooleanKit.toFloatObj((Boolean) value); } - final String valueStr = convertString(value); + final String valueStr = toStrFunc.apply((value)); return StringKit.isBlank(valueStr) ? null : Float.valueOf(valueStr); } else if (Double.class == targetType) { @@ -157,26 +170,30 @@ private Number convertInternal(Object value, Class targetType) { } else if (value instanceof Boolean) { return BooleanKit.toDoubleObj((Boolean) value); } - final String valueStr = convertString(value); + final String valueStr = toStrFunc.apply((value)); return StringKit.isBlank(valueStr) ? null : Double.valueOf(valueStr); - + } else if (DoubleAdder.class == targetType) { + final Number number = convert(value, Long.class, toStrFunc); + if (null != number) { + final DoubleAdder doubleAdder = new DoubleAdder(); + doubleAdder.add(number.doubleValue()); + return doubleAdder; + } } else if (BigDecimal.class == targetType) { - return toBigDecimal(value); - + return toBigDecimal(value, toStrFunc); } else if (BigInteger.class == targetType) { - return toBigInteger(value); - + return toBigInteger(value, toStrFunc); } else if (Number.class == targetType) { if (value instanceof Number) { return (Number) value; } else if (value instanceof Boolean) { return BooleanKit.toInteger((Boolean) value); } - final String valueStr = convertString(value); + final String valueStr = toStrFunc.apply((value)); return StringKit.isBlank(valueStr) ? null : MathKit.parseNumber(valueStr); } - throw new UnsupportedOperationException(StringKit.format("Unsupport Number type: {}", this.targetType.getName())); + throw new UnsupportedOperationException(StringKit.format("Unsupport Number type: {}", targetType.getName())); } /** @@ -184,26 +201,18 @@ private Number convertInternal(Object value, Class targetType) { * 如果给定的值为空,或者转换失败,返回默认值 * 转换失败不会报错 * - * @param value 被转换的值 + * @param value 被转换的值 + * @param strFunc 转换为字符串的函数规则 * @return 结果 */ - private BigDecimal toBigDecimal(Object value) { - if (value instanceof Long) { - return new BigDecimal((Long) value); - } else if (value instanceof Integer) { - return new BigDecimal((Integer) value); - } else if (value instanceof BigInteger) { - return new BigDecimal((BigInteger) value); + private static BigDecimal toBigDecimal(Object value, Function strFunc) { + if (value instanceof Number) { + return MathKit.toBigDecimal((Number) value); } else if (value instanceof Boolean) { return new BigDecimal((boolean) value ? 1 : 0); } - //对于Double类型,先要转换为String,避免精度问题 - final String valueStr = convertString(value); - if (StringKit.isBlank(valueStr)) { - return null; - } - return new BigDecimal(valueStr); + return MathKit.toBigDecimal(strFunc.apply(value)); } /** @@ -211,20 +220,23 @@ private BigDecimal toBigDecimal(Object value) { * 如果给定的值为空,或者转换失败,返回默认值 * 转换失败不会报错 * - * @param value 被转换的值 + * @param value 被转换的值 + * @param strFunc 转换为字符串的函数规则 * @return 结果 */ - private BigInteger toBigInteger(Object value) { + private static BigInteger toBigInteger(Object value, Function strFunc) { if (value instanceof Long) { return BigInteger.valueOf((Long) value); } else if (value instanceof Boolean) { return BigInteger.valueOf((boolean) value ? 1 : 0); } - final String valueStr = convertString(value); - if (StringKit.isBlank(valueStr)) { - return null; - } - return new BigInteger(valueStr); + + return MathKit.toBigInteger(strFunc.apply(value)); + } + + @Override + protected Number convertInternal(Object value) { + return convert(value, this.targetType, this::convertString); } @Override diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/NumberWord.java b/bus-core/src/main/java/org/aoju/bus/core/convert/NumberWord.java index 9528ea97fd..3eaad873d1 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/NumberWord.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/NumberWord.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -33,7 +34,7 @@ * 将浮点数类型的number转换成英语的表达方式 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NumberWord { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/OptionalConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/OptionalConverter.java index b5460d1e3d..12ad538f9f 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/OptionalConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/OptionalConverter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -30,7 +31,7 @@ * {@link Optional}对象转换器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class OptionalConverter extends AbstractConverter> { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/PathConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/PathConverter.java index 36f4b3f83b..1f8423a164 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/PathConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/PathConverter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -34,7 +35,7 @@ * 字符串转换器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PathConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/PeriodConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/PeriodConverter.java index 784f16a5e5..480d539344 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/PeriodConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/PeriodConverter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -31,7 +32,7 @@ * {@link Period}对象转换器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PeriodConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/PrimitiveConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/PrimitiveConverter.java index aa4a58bbb0..396ee2e954 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/PrimitiveConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/PrimitiveConverter.java @@ -21,14 +21,16 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; import org.aoju.bus.core.lang.exception.InstrumentException; -import org.aoju.bus.core.toolkit.BooleanKit; -import org.aoju.bus.core.toolkit.MathKit; +import org.aoju.bus.core.toolkit.ObjectKit; import org.aoju.bus.core.toolkit.StringKit; +import java.util.function.Function; + /** * 原始类型转换器 * 支持类型为: @@ -44,7 +46,7 @@ * * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PrimitiveConverter extends AbstractConverter { @@ -66,103 +68,34 @@ public PrimitiveConverter(Class clazz) { this.targetType = clazz; } - @Override - protected Object convertInternal(Object value) { - try { - if (byte.class == this.targetType) { - if (value instanceof Number) { - return ((Number) value).byteValue(); - } else if (value instanceof Boolean) { - return BooleanKit.toByte((Boolean) value); - } - final String valueStr = convertString(value); - if (StringKit.isBlank(valueStr)) { - return 0; - } - return Byte.parseByte(valueStr); - - } else if (short.class == this.targetType) { - if (value instanceof Number) { - return ((Number) value).shortValue(); - } else if (value instanceof Boolean) { - return BooleanKit.toShort((Boolean) value); - } - final String valueStr = convertString(value); - if (StringKit.isBlank(valueStr)) { - return 0; - } - return Short.parseShort(valueStr); - - } else if (int.class == this.targetType) { - if (value instanceof Number) { - return ((Number) value).intValue(); - } else if (value instanceof Boolean) { - return BooleanKit.toInt((Boolean) value); - } - final String valueStr = convertString(value); - if (StringKit.isBlank(valueStr)) { - return 0; - } - return MathKit.parseInt(valueStr); - - } else if (long.class == this.targetType) { - if (value instanceof Number) { - return ((Number) value).longValue(); - } else if (value instanceof Boolean) { - return BooleanKit.toLong((Boolean) value); - } - final String valueStr = convertString(value); - if (StringKit.isBlank(valueStr)) { - return 0; - } - return MathKit.parseLong(valueStr); - - } else if (float.class == this.targetType) { - if (value instanceof Number) { - return ((Number) value).floatValue(); - } else if (value instanceof Boolean) { - return BooleanKit.toFloat((Boolean) value); - } - final String valueStr = convertString(value); - if (StringKit.isBlank(valueStr)) { - return 0; - } - return Float.parseFloat(valueStr); - - } else if (double.class == this.targetType) { - if (value instanceof Number) { - return ((Number) value).doubleValue(); - } else if (value instanceof Boolean) { - return BooleanKit.toDouble((Boolean) value); - } - final String valueStr = convertString(value); - if (StringKit.isBlank(valueStr)) { - return 0; - } - return Double.parseDouble(valueStr); - - } else if (char.class == this.targetType) { - if (value instanceof Character) { - return ((Character) value).charValue(); - } else if (value instanceof Boolean) { - return BooleanKit.toChar((Boolean) value); - } - final String valueStr = convertString(value); - if (StringKit.isBlank(valueStr)) { - return 0; - } - return valueStr.charAt(0); - } else if (boolean.class == this.targetType) { - if (value instanceof Boolean) { - return ((Boolean) value).booleanValue(); - } - String valueStr = convertString(value); - return BooleanKit.toBoolean(valueStr); - } - } catch (Exception e) { - throw new InstrumentException(e); + /** + * 将指定值转换为原始类型的值 + * + * @param value 值 + * @param primitiveClass 原始类型 + * @param toStringFunc 当无法直接转换时,转为字符串后再转换的函数 + * @return 转换结果 + */ + protected static Object convert(Object value, Class primitiveClass, Function toStringFunc) { + if (byte.class == primitiveClass) { + return ObjectKit.defaultIfNull(NumberConverter.convert(value, Byte.class, toStringFunc), 0); + } else if (short.class == primitiveClass) { + return ObjectKit.defaultIfNull(NumberConverter.convert(value, Short.class, toStringFunc), 0); + } else if (int.class == primitiveClass) { + return ObjectKit.defaultIfNull(NumberConverter.convert(value, Integer.class, toStringFunc), 0); + } else if (long.class == primitiveClass) { + return ObjectKit.defaultIfNull(NumberConverter.convert(value, Long.class, toStringFunc), 0); + } else if (float.class == primitiveClass) { + return ObjectKit.defaultIfNull(NumberConverter.convert(value, Float.class, toStringFunc), 0); + } else if (double.class == primitiveClass) { + return ObjectKit.defaultIfNull(NumberConverter.convert(value, Double.class, toStringFunc), 0); + } else if (char.class == primitiveClass) { + return Convert.convert(Character.class, value); + } else if (boolean.class == primitiveClass) { + return Convert.convert(Boolean.class, value); } - return 0; + + throw new InstrumentException("Unsupported target type: {}", primitiveClass); } @Override @@ -175,4 +108,9 @@ public Class getTargetType() { return (Class) this.targetType; } + @Override + protected Object convertInternal(Object value) { + return PrimitiveConverter.convert(value, this.targetType, this::convertString); + } + } diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/ReferenceConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/ReferenceConverter.java index 1ab074a32a..70cac93610 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/ReferenceConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/ReferenceConverter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -36,7 +37,7 @@ * {@link Reference}转换器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ReferenceConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/StackTraceConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/StackTraceConverter.java index 46cc578b01..35c3ae981e 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/StackTraceConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/StackTraceConverter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -34,7 +35,7 @@ * 只支持Map方式转换 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class StackTraceConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/StringConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/StringConverter.java index fb36e73d83..ab94106d67 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/StringConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/StringConverter.java @@ -21,20 +21,79 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; +import org.aoju.bus.core.lang.Charset; +import org.aoju.bus.core.lang.exception.InstrumentException; +import org.aoju.bus.core.toolkit.IoKit; +import org.aoju.bus.core.toolkit.XmlKit; + +import java.io.InputStream; +import java.io.Reader; +import java.sql.Blob; +import java.sql.Clob; +import java.sql.SQLException; +import java.util.TimeZone; + /** * 字符串转换器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class StringConverter extends AbstractConverter { + /** + * Clob字段值转字符串 + * + * @param clob {@link Clob} + * @return 字符串 + */ + private static String clobToString(Clob clob) { + Reader reader = null; + try { + reader = clob.getCharacterStream(); + return IoKit.read(reader); + } catch (SQLException e) { + throw new InstrumentException(e); + } finally { + IoKit.close(reader); + } + } + + /** + * Blob字段值转字符串 + * + * @param blob {@link Blob} + * @return 字符串 + */ + private static String blobToString(Blob blob) { + InputStream in = null; + try { + in = blob.getBinaryStream(); + return IoKit.read(in, Charset.UTF_8); + } catch (SQLException e) { + throw new InstrumentException(e); + } finally { + IoKit.close(in); + } + } + @Override protected String convertInternal(Object value) { + if (value instanceof TimeZone) { + return ((TimeZone) value).getID(); + } else if (value instanceof org.w3c.dom.Node) { + return XmlKit.toString((org.w3c.dom.Node) value); + } else if (value instanceof Clob) { + return clobToString((Clob) value); + } else if (value instanceof Blob) { + return blobToString((Blob) value); + } + return convertString(value); } diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/TemporalConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/TemporalConverter.java index 22d528895f..bf2044250a 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/TemporalConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/TemporalConverter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -51,7 +52,7 @@ * * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TemporalConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/TimeZoneConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/TimeZoneConverter.java index 118c35b3f2..8ef96f222a 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/TimeZoneConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/TimeZoneConverter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -30,7 +31,7 @@ * TimeZone转换器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TimeZoneConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/URIConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/URIConverter.java index 1230fd7b2d..bee2ea69e6 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/URIConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/URIConverter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -32,7 +33,7 @@ * URI对象转换器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class URIConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/URLConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/URLConverter.java index 5c25aed953..6cbacba5a9 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/URLConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/URLConverter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -32,7 +33,7 @@ * URL对象转换器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class URLConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/UUIDConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/UUIDConverter.java index 5885dbb70a..05e3b69c35 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/UUIDConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/UUIDConverter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.convert; @@ -30,7 +31,7 @@ * UUID对象转换器转换器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class UUIDConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/date/Between.java b/bus-core/src/main/java/org/aoju/bus/core/date/Between.java index e8002b6e34..81aaefd760 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/date/Between.java +++ b/bus-core/src/main/java/org/aoju/bus/core/date/Between.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.date; @@ -35,7 +36,7 @@ * 日期间隔 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Between { diff --git a/bus-core/src/main/java/org/aoju/bus/core/date/Boundary.java b/bus-core/src/main/java/org/aoju/bus/core/date/Boundary.java index b07f9c4e67..46e42aaed0 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/date/Boundary.java +++ b/bus-core/src/main/java/org/aoju/bus/core/date/Boundary.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.date; @@ -34,7 +35,7 @@ * 日期范围 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Boundary extends Range { diff --git a/bus-core/src/main/java/org/aoju/bus/core/date/DateTime.java b/bus-core/src/main/java/org/aoju/bus/core/date/DateTime.java index b679a17662..57220a191a 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/date/DateTime.java +++ b/bus-core/src/main/java/org/aoju/bus/core/date/DateTime.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.date; @@ -51,7 +52,7 @@ * 包装java.utils.Date * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DateTime extends Date { diff --git a/bus-core/src/main/java/org/aoju/bus/core/date/StopWatch.java b/bus-core/src/main/java/org/aoju/bus/core/date/StopWatch.java index 09380c7701..902f8564fe 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/date/StopWatch.java +++ b/bus-core/src/main/java/org/aoju/bus/core/date/StopWatch.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.date; @@ -57,7 +58,7 @@ * * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class StopWatch { diff --git a/bus-core/src/main/java/org/aoju/bus/core/date/SystemClock.java b/bus-core/src/main/java/org/aoju/bus/core/date/SystemClock.java index 2df67bdb06..f868b51661 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/date/SystemClock.java +++ b/bus-core/src/main/java/org/aoju/bus/core/date/SystemClock.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.date; @@ -37,7 +38,7 @@ * 后台定时更新时钟,JVM退出时,线程自动回收 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SystemClock { diff --git a/bus-core/src/main/java/org/aoju/bus/core/date/TimeInterval.java b/bus-core/src/main/java/org/aoju/bus/core/date/TimeInterval.java index 433ff348d9..9f2a71748e 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/date/TimeInterval.java +++ b/bus-core/src/main/java/org/aoju/bus/core/date/TimeInterval.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.date; @@ -32,7 +33,7 @@ * 计算某个过程花费的时间,精确到毫秒 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TimeInterval { diff --git a/bus-core/src/main/java/org/aoju/bus/core/date/format/AbstractFormater.java b/bus-core/src/main/java/org/aoju/bus/core/date/format/AbstractFormater.java index c26100cb27..4777b97a52 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/date/format/AbstractFormater.java +++ b/bus-core/src/main/java/org/aoju/bus/core/date/format/AbstractFormater.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.date.format; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractFormater implements Formatter, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/date/format/DateParser.java b/bus-core/src/main/java/org/aoju/bus/core/date/format/DateParser.java index 852355b0ad..92db7ee374 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/date/format/DateParser.java +++ b/bus-core/src/main/java/org/aoju/bus/core/date/format/DateParser.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.date.format; @@ -33,7 +34,7 @@ * 日期解析接口,用于解析日期字符串为 {@link Date} 对象 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface DateParser extends Formatter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/date/format/DatePeriod.java b/bus-core/src/main/java/org/aoju/bus/core/date/format/DatePeriod.java index 0b41112dd3..4b8f2bcb80 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/date/format/DatePeriod.java +++ b/bus-core/src/main/java/org/aoju/bus/core/date/format/DatePeriod.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.date.format; @@ -31,7 +32,7 @@ * 时长格式化器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DatePeriod { diff --git a/bus-core/src/main/java/org/aoju/bus/core/date/format/DatePrinter.java b/bus-core/src/main/java/org/aoju/bus/core/date/format/DatePrinter.java index a6eaec27b9..96822af736 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/date/format/DatePrinter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/date/format/DatePrinter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.date.format; @@ -31,7 +32,7 @@ * 日期格式化输出接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface DatePrinter extends Formatter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/date/format/FastDateParser.java b/bus-core/src/main/java/org/aoju/bus/core/date/format/FastDateParser.java index 6f2a587850..362f5063d2 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/date/format/FastDateParser.java +++ b/bus-core/src/main/java/org/aoju/bus/core/date/format/FastDateParser.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.date.format; @@ -42,7 +43,7 @@ * 用于解析日期字符串并转换为 {@link Date} 对象 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FastDateParser extends AbstractFormater implements DateParser { diff --git a/bus-core/src/main/java/org/aoju/bus/core/date/format/FastDatePrinter.java b/bus-core/src/main/java/org/aoju/bus/core/date/format/FastDatePrinter.java index fbb53db5eb..4f7284a823 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/date/format/FastDatePrinter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/date/format/FastDatePrinter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.date.format; @@ -38,7 +39,7 @@ * {@link java.text.SimpleDateFormat} 的线程安全版本,用于将 {@link Date} 格式化输出 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FastDatePrinter extends AbstractFormater implements DatePrinter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/date/format/FormatBuilder.java b/bus-core/src/main/java/org/aoju/bus/core/date/format/FormatBuilder.java index 8d1fabd85a..30aa207fcf 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/date/format/FormatBuilder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/date/format/FormatBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.date.format; @@ -39,7 +40,7 @@ * {@link #getDateTimeInstance(int, int, TimeZone, Locale)} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FormatBuilder extends Format implements DateParser, DatePrinter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/date/format/FormatCache.java b/bus-core/src/main/java/org/aoju/bus/core/date/format/FormatCache.java index f00c4ae9e8..06d4286e65 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/date/format/FormatCache.java +++ b/bus-core/src/main/java/org/aoju/bus/core/date/format/FormatCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.date.format; @@ -39,7 +40,7 @@ * 日期格式化器缓存 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class FormatCache { diff --git a/bus-core/src/main/java/org/aoju/bus/core/date/format/Formatter.java b/bus-core/src/main/java/org/aoju/bus/core/date/format/Formatter.java index 7aafc9573e..96e46c5d5f 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/date/format/Formatter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/date/format/Formatter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.date.format; @@ -31,7 +32,7 @@ * 日期基本信息获取接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Formatter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/getter/ArrayType.java b/bus-core/src/main/java/org/aoju/bus/core/getter/ArrayType.java index d08f92147b..f68af8e157 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/getter/ArrayType.java +++ b/bus-core/src/main/java/org/aoju/bus/core/getter/ArrayType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.getter; @@ -31,7 +32,7 @@ * 数组类型的Get接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface ArrayType { diff --git a/bus-core/src/main/java/org/aoju/bus/core/getter/BasicType.java b/bus-core/src/main/java/org/aoju/bus/core/getter/BasicType.java index f1bacc6faa..54dbb08d48 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/getter/BasicType.java +++ b/bus-core/src/main/java/org/aoju/bus/core/getter/BasicType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.getter; @@ -33,7 +34,7 @@ * 提供一个统一的接口定义返回不同类型的值(基本类型) * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface BasicType { diff --git a/bus-core/src/main/java/org/aoju/bus/core/getter/GroupedType.java b/bus-core/src/main/java/org/aoju/bus/core/getter/GroupedType.java index 9f4881683b..44b64182f6 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/getter/GroupedType.java +++ b/bus-core/src/main/java/org/aoju/bus/core/getter/GroupedType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.getter; @@ -31,7 +32,7 @@ * 基于分组的Get接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface GroupedType { diff --git a/bus-core/src/main/java/org/aoju/bus/core/getter/ListType.java b/bus-core/src/main/java/org/aoju/bus/core/getter/ListType.java index 49b9c105fb..63969ea09f 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/getter/ListType.java +++ b/bus-core/src/main/java/org/aoju/bus/core/getter/ListType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.getter; @@ -32,7 +33,7 @@ * 列表类型的Get接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface ListType { diff --git a/bus-core/src/main/java/org/aoju/bus/core/getter/OptArrayType.java b/bus-core/src/main/java/org/aoju/bus/core/getter/OptArrayType.java index b469cd8916..ae69228151 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/getter/OptArrayType.java +++ b/bus-core/src/main/java/org/aoju/bus/core/getter/OptArrayType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.getter; @@ -33,7 +34,7 @@ * 如果值不存在或获取错误,返回默认值 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface OptArrayType { diff --git a/bus-core/src/main/java/org/aoju/bus/core/getter/OptBasicType.java b/bus-core/src/main/java/org/aoju/bus/core/getter/OptBasicType.java index 9eff09ea48..0c230b6fc7 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/getter/OptBasicType.java +++ b/bus-core/src/main/java/org/aoju/bus/core/getter/OptBasicType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.getter; @@ -34,7 +35,7 @@ * 如果值不存在或获取错误,返回默认值 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface OptBasicType { diff --git a/bus-core/src/main/java/org/aoju/bus/core/getter/OptNullObject.java b/bus-core/src/main/java/org/aoju/bus/core/getter/OptNullObject.java index ad2045ab5e..bd0d8ebd7e 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/getter/OptNullObject.java +++ b/bus-core/src/main/java/org/aoju/bus/core/getter/OptNullObject.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.getter; @@ -36,7 +37,7 @@ * 在不提供默认值的情况下, 如果值不存在或获取错误,返回null * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface OptNullObject extends OptNullType { diff --git a/bus-core/src/main/java/org/aoju/bus/core/getter/OptNullString.java b/bus-core/src/main/java/org/aoju/bus/core/getter/OptNullString.java index 13b19b84e2..665807d4b1 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/getter/OptNullString.java +++ b/bus-core/src/main/java/org/aoju/bus/core/getter/OptNullString.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.getter; @@ -35,7 +36,7 @@ * 用户只需实现getStr方法即可,其他类型将会从String结果中转换 在不提供默认值的情况下, 如果值不存在或获取错误,返回null * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface OptNullString extends OptNullType { diff --git a/bus-core/src/main/java/org/aoju/bus/core/getter/OptNullType.java b/bus-core/src/main/java/org/aoju/bus/core/getter/OptNullType.java index fd2913d312..fcba7a0d28 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/getter/OptNullType.java +++ b/bus-core/src/main/java/org/aoju/bus/core/getter/OptNullType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.getter; @@ -34,7 +35,7 @@ * 在不提供默认值的情况下, 如果值不存在或获取错误,返回null * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface OptNullType extends BasicType, OptBasicType { diff --git a/bus-core/src/main/java/org/aoju/bus/core/image/GifDecoder.java b/bus-core/src/main/java/org/aoju/bus/core/image/GifDecoder.java index 88fef1bb68..f3b63f1f8e 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/image/GifDecoder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/image/GifDecoder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.image; @@ -53,7 +54,7 @@ * * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class GifDecoder { diff --git a/bus-core/src/main/java/org/aoju/bus/core/image/GifEncoder.java b/bus-core/src/main/java/org/aoju/bus/core/image/GifEncoder.java index c2a77b0ffb..6d6f166e55 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/image/GifEncoder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/image/GifEncoder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.image; @@ -47,7 +48,7 @@ *

* * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class GifEncoder { diff --git a/bus-core/src/main/java/org/aoju/bus/core/image/Graphics.java b/bus-core/src/main/java/org/aoju/bus/core/image/Graphics.java index adfdcb2ba0..7c77b52009 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/image/Graphics.java +++ b/bus-core/src/main/java/org/aoju/bus/core/image/Graphics.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.image; @@ -33,7 +34,7 @@ * {@link java.awt.Graphics}相关工具类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Graphics { diff --git a/bus-core/src/main/java/org/aoju/bus/core/image/Image.java b/bus-core/src/main/java/org/aoju/bus/core/image/Image.java index b84a3c1b3d..ed6b73d70a 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/image/Image.java +++ b/bus-core/src/main/java/org/aoju/bus/core/image/Image.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.image; @@ -56,7 +57,7 @@ * 图像编辑器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Image implements Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/image/NeuQuant.java b/bus-core/src/main/java/org/aoju/bus/core/image/NeuQuant.java index b1eb103831..c0bc1b3c72 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/image/NeuQuant.java +++ b/bus-core/src/main/java/org/aoju/bus/core/image/NeuQuant.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.image; @@ -28,7 +29,7 @@ * NeuQuant Neural-Net Quantization Algorithm * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NeuQuant { diff --git a/bus-core/src/main/java/org/aoju/bus/core/image/element/AbstractElement.java b/bus-core/src/main/java/org/aoju/bus/core/image/element/AbstractElement.java index 0fe157769d..f71cd48fbf 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/image/element/AbstractElement.java +++ b/bus-core/src/main/java/org/aoju/bus/core/image/element/AbstractElement.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.image.element; @@ -28,7 +29,7 @@ * 合并元素抽象类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractElement { diff --git a/bus-core/src/main/java/org/aoju/bus/core/image/element/ImageElement.java b/bus-core/src/main/java/org/aoju/bus/core/image/element/ImageElement.java index 2f841e875e..afac4366ca 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/image/element/ImageElement.java +++ b/bus-core/src/main/java/org/aoju/bus/core/image/element/ImageElement.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.image.element; @@ -34,7 +35,7 @@ * 图片合并元素 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ImageElement extends AbstractElement { diff --git a/bus-core/src/main/java/org/aoju/bus/core/image/element/TextElement.java b/bus-core/src/main/java/org/aoju/bus/core/image/element/TextElement.java index d84e60721e..0cb6cea39b 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/image/element/TextElement.java +++ b/bus-core/src/main/java/org/aoju/bus/core/image/element/TextElement.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.image.element; @@ -32,7 +33,7 @@ * 文本元素合成 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-core/src/main/java/org/aoju/bus/core/image/painter/ImagePainter.java b/bus-core/src/main/java/org/aoju/bus/core/image/painter/ImagePainter.java index 983cd0273c..e49f6bdf7c 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/image/painter/ImagePainter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/image/painter/ImagePainter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.image.painter; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ImagePainter implements Painter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/image/painter/Painter.java b/bus-core/src/main/java/org/aoju/bus/core/image/painter/Painter.java index bca19cfe6d..9a94cccc2a 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/image/painter/Painter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/image/painter/Painter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.image.painter; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Painter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/image/painter/PainterFactory.java b/bus-core/src/main/java/org/aoju/bus/core/image/painter/PainterFactory.java index 269819633e..3342e97f15 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/image/painter/PainterFactory.java +++ b/bus-core/src/main/java/org/aoju/bus/core/image/painter/PainterFactory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.image.painter; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PainterFactory { diff --git a/bus-core/src/main/java/org/aoju/bus/core/image/painter/TextPainter.java b/bus-core/src/main/java/org/aoju/bus/core/image/painter/TextPainter.java index 5ecb88c302..32bc641b9c 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/image/painter/TextPainter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/image/painter/TextPainter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.image.painter; @@ -38,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TextPainter implements Painter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/instance/Instance.java b/bus-core/src/main/java/org/aoju/bus/core/instance/Instance.java index 1b6a67231a..7e3513c6a1 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/instance/Instance.java +++ b/bus-core/src/main/java/org/aoju/bus/core/instance/Instance.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.instance; @@ -32,7 +33,7 @@ * 2. 当前类出于测试阶段 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Instance { diff --git a/bus-core/src/main/java/org/aoju/bus/core/instance/InstanceFactory.java b/bus-core/src/main/java/org/aoju/bus/core/instance/InstanceFactory.java index 69cc0a6cbd..f684db1ca7 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/instance/InstanceFactory.java +++ b/bus-core/src/main/java/org/aoju/bus/core/instance/InstanceFactory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.instance; @@ -38,7 +39,7 @@ * 实例化工厂类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class InstanceFactory implements Instance { diff --git a/bus-core/src/main/java/org/aoju/bus/core/instance/Instances.java b/bus-core/src/main/java/org/aoju/bus/core/instance/Instances.java index e970d42d65..17b85a2255 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/instance/Instances.java +++ b/bus-core/src/main/java/org/aoju/bus/core/instance/Instances.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.instance; @@ -32,7 +33,7 @@ * 对于 {@link InstanceFactory} 的便于使用 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/AbstractBlending.java b/bus-core/src/main/java/org/aoju/bus/core/io/AbstractBlending.java index 5eecde0e2f..2e2c9f4ca4 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/AbstractBlending.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/AbstractBlending.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -30,7 +31,7 @@ * 可以读取的一组索引值 {@link BufferSource#select}. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AbstractBlending extends AbstractList implements RandomAccess { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/AsyncTimeout.java b/bus-core/src/main/java/org/aoju/bus/core/io/AsyncTimeout.java index 622edcd21e..c7a2e69fcb 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/AsyncTimeout.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/AsyncTimeout.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -35,7 +36,7 @@ * 在本地不支持超时的地方实现超时,例如对阻塞的套接字操作. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AsyncTimeout extends Timeout { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/Buffer.java b/bus-core/src/main/java/org/aoju/bus/core/io/Buffer.java index 0153c7a2a6..75d5c9af75 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/Buffer.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/Buffer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -46,7 +47,7 @@ * 内存中字节的集合. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Buffer implements BufferSource, BufferSink, Cloneable, ByteChannel { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/BufferPool.java b/bus-core/src/main/java/org/aoju/bus/core/io/BufferPool.java index adc8d8c06f..5de86e03ab 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/BufferPool.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/BufferPool.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -32,7 +33,7 @@ * ByteBuffer内存池 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BufferPool { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/BufferSink.java b/bus-core/src/main/java/org/aoju/bus/core/io/BufferSink.java index 2ca9480ab1..be4cf4a21d 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/BufferSink.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/BufferSink.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -34,7 +35,7 @@ * 以便调用者可以进行小的写操作没有性能损失 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface BufferSink extends Sink, WritableByteChannel { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/BufferSource.java b/bus-core/src/main/java/org/aoju/bus/core/io/BufferSource.java index 7a44eb9aaa..f89cb4388f 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/BufferSource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/BufferSource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -34,7 +35,7 @@ * 它还允许客户端提前读取,在消费之前进行必要的缓冲输入 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface BufferSource extends Source, ReadableByteChannel { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/ByteBuffer.java b/bus-core/src/main/java/org/aoju/bus/core/io/ByteBuffer.java index 4e83ed54dc..c0db8293f4 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/ByteBuffer.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/ByteBuffer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -37,7 +38,7 @@ * 两个半部分,描述段如何组成这个字节字符串 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ByteBuffer extends ByteString { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/ByteString.java b/bus-core/src/main/java/org/aoju/bus/core/io/ByteString.java index 48b7066e2f..59dceea07d 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/ByteString.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/ByteString.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -45,7 +46,7 @@ * 不可变的字节序列. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ByteString implements Serializable, Comparable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/DeflaterSink.java b/bus-core/src/main/java/org/aoju/bus/core/io/DeflaterSink.java index 50ec251539..fd88024222 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/DeflaterSink.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/DeflaterSink.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -36,7 +37,7 @@ * 这种早期压缩可能不如执行的压缩有效 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DeflaterSink implements Sink { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/Delegate.java b/bus-core/src/main/java/org/aoju/bus/core/io/Delegate.java index dc3f32f2b7..90be630c10 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/Delegate.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/Delegate.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -31,7 +32,7 @@ * 将调用转发给另一个调用的 {@link Timeout}. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Delegate extends Timeout { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/DelegateSink.java b/bus-core/src/main/java/org/aoju/bus/core/io/DelegateSink.java index 91ea0ea66c..5b57ebd323 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/DelegateSink.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/DelegateSink.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -32,7 +33,7 @@ * 将调用转发给另一个调用的{@link Sink} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class DelegateSink implements Sink { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/DelegateSource.java b/bus-core/src/main/java/org/aoju/bus/core/io/DelegateSource.java index 22aa38c797..4e2a54a35f 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/DelegateSource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/DelegateSource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -32,7 +33,7 @@ * 将调用转发给另一个调用的{@link Source} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class DelegateSource implements Source { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/EventFactory.java b/bus-core/src/main/java/org/aoju/bus/core/io/EventFactory.java index f03bca0e5f..859f33f1d9 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/EventFactory.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/EventFactory.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface EventFactory { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/FastByteBuffer.java b/bus-core/src/main/java/org/aoju/bus/core/io/FastByteBuffer.java index a222640840..2827c7dcda 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/FastByteBuffer.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/FastByteBuffer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -29,7 +30,7 @@ * 快速缓冲,将数据存放在缓冲集中,取代以往的单一数组 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FastByteBuffer { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/FaultHideSink.java b/bus-core/src/main/java/org/aoju/bus/core/io/FaultHideSink.java index 5e8304c3a0..194604fd99 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/FaultHideSink.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/FaultHideSink.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -31,7 +32,7 @@ * 即使底层接收器抛出了IOExceptions * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FaultHideSink extends DelegateSink { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/FileOperator.java b/bus-core/src/main/java/org/aoju/bus/core/io/FileOperator.java index 150c02277c..365af11e3b 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/FileOperator.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/FileOperator.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -32,7 +33,7 @@ * 读取和写入目标文件 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class FileOperator { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/FileSystem.java b/bus-core/src/main/java/org/aoju/bus/core/io/FileSystem.java index be065941e4..76a73c0fca 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/FileSystem.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/FileSystem.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -37,7 +38,7 @@ * 例如加密) * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface FileSystem { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/GzipSink.java b/bus-core/src/main/java/org/aoju/bus/core/io/GzipSink.java index 6d7a235781..5109ff713a 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/GzipSink.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/GzipSink.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -36,7 +37,7 @@ * 只在应用程序行为需要时调用{@link #flush} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class GzipSink implements Sink { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/GzipSource.java b/bus-core/src/main/java/org/aoju/bus/core/io/GzipSource.java index fe3ca32529..795bee9957 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/GzipSource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/GzipSource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -35,7 +36,7 @@ * 解压读取数据 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class GzipSource implements Source { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/HashSink.java b/bus-core/src/main/java/org/aoju/bus/core/io/HashSink.java index 30ccde2eba..e963f4741a 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/HashSink.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/HashSink.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -40,7 +41,7 @@ * {@link #hash()}来计算最终的哈希值 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class HashSink extends DelegateSink { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/HashSource.java b/bus-core/src/main/java/org/aoju/bus/core/io/HashSource.java index 2109d387b8..c944273fe6 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/HashSource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/HashSource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -39,7 +40,7 @@ * 然后调用{@link #hash()}来计算最终的哈希值 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class HashSource extends DelegateSource { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/InflaterSource.java b/bus-core/src/main/java/org/aoju/bus/core/io/InflaterSource.java index 25320ee019..9fa8e0b011 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/InflaterSource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/InflaterSource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -36,7 +37,7 @@ * 解压从另一个源读取的数据. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class InflaterSource implements Source { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/LifeCycle.java b/bus-core/src/main/java/org/aoju/bus/core/io/LifeCycle.java index 6847b983cb..c70f847aab 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/LifeCycle.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/LifeCycle.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -29,7 +30,7 @@ * 这个池是一个线程安全的静态单例 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class LifeCycle { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/LineHandler.java b/bus-core/src/main/java/org/aoju/bus/core/io/LineHandler.java index e6ab46be77..c80b3d1fe6 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/LineHandler.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/LineHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -28,7 +29,7 @@ * 行处理器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface LineHandler { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/PageBuffer.java b/bus-core/src/main/java/org/aoju/bus/core/io/PageBuffer.java index 874f74a039..41d162d250 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/PageBuffer.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/PageBuffer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -37,7 +38,7 @@ * ByteBuffer内存页 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PageBuffer { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/PeekSource.java b/bus-core/src/main/java/org/aoju/bus/core/io/PeekSource.java index 3f90a9f7ab..e5a47d793d 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/PeekSource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/PeekSource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -35,7 +36,7 @@ * 无效,在以后的读取中抛出{@link IllegalStateException} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ final class PeekSource implements Source { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/Pipe.java b/bus-core/src/main/java/org/aoju/bus/core/io/Pipe.java index e259926194..f3d73d8e24 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/Pipe.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/Pipe.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -31,7 +32,7 @@ * 通常每个线程都由自己的线程访问:生产者线程向接收器写入数据,消费者线程从源读取数据 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Pipe { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/RealSink.java b/bus-core/src/main/java/org/aoju/bus/core/io/RealSink.java index 731e533692..682f802484 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/RealSink.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/RealSink.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class RealSink implements BufferSink { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/RealSource.java b/bus-core/src/main/java/org/aoju/bus/core/io/RealSource.java index 3bc5b9859b..7fddc77316 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/RealSource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/RealSource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class RealSource implements BufferSource { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/RelayBuffer.java b/bus-core/src/main/java/org/aoju/bus/core/io/RelayBuffer.java index c0cfd80f14..817207a9a7 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/RelayBuffer.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/RelayBuffer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -37,7 +38,7 @@ * 这个类保留一个最近从上游读取的字节的小缓冲区。减少文件I/O和数据复制 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ final class RelayBuffer { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/RingBuffer.java b/bus-core/src/main/java/org/aoju/bus/core/io/RingBuffer.java index e2d8719631..56fef23096 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/RingBuffer.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/RingBuffer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class RingBuffer { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/Segment.java b/bus-core/src/main/java/org/aoju/bus/core/io/Segment.java index 8ed56c5fc5..ec4445c134 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/Segment.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/Segment.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -36,7 +37,7 @@ * 限制、prev和next引用不共享 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Segment { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/Sink.java b/bus-core/src/main/java/org/aoju/bus/core/io/Sink.java index bcd2e856cc..b0f7edfb22 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/Sink.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/Sink.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -35,7 +36,7 @@ * {@link BufferSink#outputStream}使一个接收器适应{@code outputStream} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Sink extends Closeable, Flushable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/Source.java b/bus-core/src/main/java/org/aoju/bus/core/io/Source.java index 90660033d4..c0619438e7 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/Source.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/Source.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -33,7 +34,7 @@ * 分层以转换提供的数据,例如解压、解密或移除协议框架 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Source extends Closeable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/StreamProgress.java b/bus-core/src/main/java/org/aoju/bus/core/io/StreamProgress.java index 862154f137..b9ac021b51 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/StreamProgress.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/StreamProgress.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -28,7 +29,7 @@ * Stream进度条 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface StreamProgress { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/Timeout.java b/bus-core/src/main/java/org/aoju/bus/core/io/Timeout.java index dbd6755c18..d97a8f649a 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/Timeout.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/Timeout.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -36,7 +37,7 @@ * 适用规则:关闭洗涤槽,稍后重试 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Timeout { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/VirtualBuffer.java b/bus-core/src/main/java/org/aoju/bus/core/io/VirtualBuffer.java index 7ca20a0364..d19ea86788 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/VirtualBuffer.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/VirtualBuffer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io; @@ -30,7 +31,7 @@ * 虚拟ByteBuffer缓冲区 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class VirtualBuffer { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/file/FileAppender.java b/bus-core/src/main/java/org/aoju/bus/core/io/file/FileAppender.java index b03ba04221..098e80fffa 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/file/FileAppender.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/file/FileAppender.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.file; @@ -39,7 +40,7 @@ * 在调用append方法后会缓存于内存,只有超过容量后才会一次性写入文件,因此内存中随时有剩余未写入文件的内容,在最后必须调用flush方法将剩余内容刷入文件 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FileAppender implements Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/file/FileCopier.java b/bus-core/src/main/java/org/aoju/bus/core/io/file/FileCopier.java index d30d506cbb..f65e4fb5fb 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/file/FileCopier.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/file/FileCopier.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.file; @@ -48,7 +49,7 @@ * 4、目录下的文件和目录复制到另一个目录 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FileCopier extends Duplicate { @@ -86,7 +87,7 @@ public FileCopier(File src, File dest) { * * @param srcPath 源文件路径(相对ClassPath路径或绝对路径) * @param destPath 目标文件路径(相对ClassPath路径或绝对路径) - * @return {@link FileCopier} + * @return this */ public static FileCopier create(String srcPath, String destPath) { return new FileCopier(FileKit.file(srcPath), FileKit.file(destPath)); @@ -97,7 +98,7 @@ public static FileCopier create(String srcPath, String destPath) { * * @param src 源文件 * @param dest 目标文件 - * @return {@link FileCopier} + * @return this */ public static FileCopier create(File src, File dest) { return new FileCopier(src, dest); @@ -218,8 +219,8 @@ public File copy() throws InstrumentException { //源为目录,目标为文件,抛出IO异常 throw new InstrumentException("Src is a directory but dest is a file!"); } - final File subDest = isCopyContentIfDir ? dest : FileKit.mkdir(FileKit.file(dest, src.getName())); - internalCopyDirContent(src, subDest); + final File subTarget = isCopyContentIfDir ? dest : FileKit.mkdir(FileKit.file(dest, src.getName())); + internalCopyDirContent(src, subTarget); } else {// 复制文件 internalCopyFile(src, dest); } diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/file/FileMode.java b/bus-core/src/main/java/org/aoju/bus/core/io/file/FileMode.java index 09f9693358..02c79fca35 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/file/FileMode.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/file/FileMode.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.file; @@ -28,7 +29,7 @@ * 文件读写模式,常用于RandomAccessFile * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum FileMode { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/file/FileReader.java b/bus-core/src/main/java/org/aoju/bus/core/io/file/FileReader.java index 1478ffe36b..051f18b38d 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/file/FileReader.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/file/FileReader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.file; @@ -40,7 +41,7 @@ * 文件读取器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FileReader extends FileWrapper { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/file/FileWrapper.java b/bus-core/src/main/java/org/aoju/bus/core/io/file/FileWrapper.java index 51417a97ed..fd83963aef 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/file/FileWrapper.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/file/FileWrapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.file; @@ -34,7 +35,7 @@ * 文件包装器,扩展文件对象 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FileWrapper { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/file/FileWriter.java b/bus-core/src/main/java/org/aoju/bus/core/io/file/FileWriter.java index b6001c490c..8656393dcc 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/file/FileWriter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/file/FileWriter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.file; @@ -40,7 +41,7 @@ * 文件写入器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FileWriter extends FileWrapper { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/file/LineReadWatcher.java b/bus-core/src/main/java/org/aoju/bus/core/io/file/LineReadWatcher.java index b6d813c671..07c721d5d9 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/file/LineReadWatcher.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/file/LineReadWatcher.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.file; @@ -39,7 +40,7 @@ * 行处理的Watcher实现 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class LineReadWatcher extends SimpleWatcher implements Runnable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/file/LineSeparator.java b/bus-core/src/main/java/org/aoju/bus/core/io/file/LineSeparator.java index 868b3d9b76..c64fa3761d 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/file/LineSeparator.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/file/LineSeparator.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.file; @@ -36,7 +37,7 @@ * * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @see #MAC * @see #LINUX * @see #WINDOWS diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/file/Tailer.java b/bus-core/src/main/java/org/aoju/bus/core/io/file/Tailer.java index d41a81cca5..035cf48509 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/file/Tailer.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/file/Tailer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.file; @@ -43,7 +44,7 @@ * 文件内容跟随器,实现类似Linux下"tail -f"命令功能 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Tailer implements Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/resource/BytesResource.java b/bus-core/src/main/java/org/aoju/bus/core/io/resource/BytesResource.java index 961eb0ba6f..58d1033700 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/resource/BytesResource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/resource/BytesResource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.resource; @@ -39,7 +40,7 @@ * 注意:此对象中getUrl方法始终返回null * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BytesResource implements Resource { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/resource/ClassPathResource.java b/bus-core/src/main/java/org/aoju/bus/core/io/resource/ClassPathResource.java index e85cbec94d..fd7e78d4d6 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/resource/ClassPathResource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/resource/ClassPathResource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.resource; @@ -35,7 +36,7 @@ * 传入的path所指向的资源必须存在,否则报错 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ClassPathResource extends UriResource { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/resource/FileResource.java b/bus-core/src/main/java/org/aoju/bus/core/io/resource/FileResource.java index eb9edf2bdc..28ab635dd1 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/resource/FileResource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/resource/FileResource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.resource; @@ -34,7 +35,7 @@ * 文件资源访问对象 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FileResource extends UriResource { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/resource/InputStreamResource.java b/bus-core/src/main/java/org/aoju/bus/core/io/resource/InputStreamResource.java index 90d7e0abe3..608c48eac0 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/resource/InputStreamResource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/resource/InputStreamResource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.resource; @@ -37,7 +38,7 @@ * 注意:此对象中getUrl方法始终返回null * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class InputStreamResource implements Resource { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/resource/MultiFileResource.java b/bus-core/src/main/java/org/aoju/bus/core/io/resource/MultiFileResource.java index 447ed1bf87..cd6f0318df 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/resource/MultiFileResource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/resource/MultiFileResource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.resource; @@ -32,7 +33,7 @@ * 此资源为一个利用游标自循环资源,只有调用{@link #next()} 方法才会获取下一个资源,使用完毕后调用{@link #reset()}方法重置游标 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MultiFileResource extends MultiResource { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/resource/MultiResource.java b/bus-core/src/main/java/org/aoju/bus/core/io/resource/MultiResource.java index 754242ca0f..b093e47933 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/resource/MultiResource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/resource/MultiResource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.resource; @@ -41,7 +42,7 @@ * 此资源为一个利用游标自循环资源,只有调用{@link #next()} 方法才会获取下一个资源,使用完毕后调用{@link #reset()}方法重置游标 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MultiResource implements Resource, Iterable, Iterator { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/resource/PropertySource.java b/bus-core/src/main/java/org/aoju/bus/core/io/resource/PropertySource.java index 91a6abd8e7..3aee003173 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/resource/PropertySource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/resource/PropertySource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.resource; @@ -32,7 +33,7 @@ * 配置文件源 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @FunctionalInterface diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/resource/Resource.java b/bus-core/src/main/java/org/aoju/bus/core/io/resource/Resource.java index 1e6d78e876..4dcb863166 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/resource/Resource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/resource/Resource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.resource; @@ -39,7 +40,7 @@ * 资源可以是文件、URL、ClassPath中的文件亦或者jar包中的文件 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Resource { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/resource/StringResource.java b/bus-core/src/main/java/org/aoju/bus/core/io/resource/StringResource.java index 8652c05481..7a63b90ccd 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/resource/StringResource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/resource/StringResource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.resource; @@ -38,7 +39,7 @@ * 字符串资源,字符串做为资源 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class StringResource implements Resource { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/resource/UriResource.java b/bus-core/src/main/java/org/aoju/bus/core/io/resource/UriResource.java index f7e1a4f19c..de39e2d1b1 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/resource/UriResource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/resource/UriResource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.resource; @@ -41,7 +42,7 @@ * URL资源访问类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class UriResource implements Resource { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/resource/WebAppResource.java b/bus-core/src/main/java/org/aoju/bus/core/io/resource/WebAppResource.java index d8217dffd7..d1dea9ae41 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/resource/WebAppResource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/resource/WebAppResource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.resource; @@ -32,7 +33,7 @@ * Web root资源访问对象 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class WebAppResource extends FileResource { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/streams/BOMInputStream.java b/bus-core/src/main/java/org/aoju/bus/core/io/streams/BOMInputStream.java index de50801ef3..cb9dd313cb 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/streams/BOMInputStream.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/streams/BOMInputStream.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.streams; @@ -49,7 +50,7 @@ * * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BOMInputStream extends InputStream { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/streams/ByteArrayOutputStream.java b/bus-core/src/main/java/org/aoju/bus/core/io/streams/ByteArrayOutputStream.java index e2284bac1f..d089245ea2 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/streams/ByteArrayOutputStream.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/streams/ByteArrayOutputStream.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.streams; @@ -37,7 +38,7 @@ * 避免重新分配内存块而是分配新增的缓冲区,缓冲区不会被GC,数据也不会被拷贝到其他缓冲区 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ByteArrayOutputStream extends OutputStream { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/streams/NullOutputStream.java b/bus-core/src/main/java/org/aoju/bus/core/io/streams/NullOutputStream.java index 72cb21bb1b..da847a8355 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/streams/NullOutputStream.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/streams/NullOutputStream.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.streams; @@ -32,7 +33,7 @@ * 来自 Apache Commons io * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NullOutputStream extends OutputStream { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/streams/QueueInputStream.java b/bus-core/src/main/java/org/aoju/bus/core/io/streams/QueueInputStream.java index ac6f0ccba2..38d40d1827 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/streams/QueueInputStream.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/streams/QueueInputStream.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.streams; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class QueueInputStream extends InputStream { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/streams/QueueReader.java b/bus-core/src/main/java/org/aoju/bus/core/io/streams/QueueReader.java index fb6f64b602..4134992b6f 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/streams/QueueReader.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/streams/QueueReader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.streams; @@ -34,7 +35,7 @@ * 队列InputStream * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class QueueReader extends Reader { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/streams/RandomFileInputStream.java b/bus-core/src/main/java/org/aoju/bus/core/io/streams/RandomFileInputStream.java index f746858847..af618c2784 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/streams/RandomFileInputStream.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/streams/RandomFileInputStream.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.streams; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RandomFileInputStream extends InputStream { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/streams/RandomFileOutputStream.java b/bus-core/src/main/java/org/aoju/bus/core/io/streams/RandomFileOutputStream.java index 4e3bf66564..ce97caea57 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/streams/RandomFileOutputStream.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/streams/RandomFileOutputStream.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.streams; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RandomFileOutputStream extends OutputStream { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/streams/StreamBuffer.java b/bus-core/src/main/java/org/aoju/bus/core/io/streams/StreamBuffer.java index 2dc9e36247..f2f06ae09c 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/streams/StreamBuffer.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/streams/StreamBuffer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.streams; @@ -36,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class StreamBuffer extends InputStream { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/streams/StringInputStream.java b/bus-core/src/main/java/org/aoju/bus/core/io/streams/StringInputStream.java index 0ff96649af..1fbe9bc80e 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/streams/StringInputStream.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/streams/StringInputStream.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.streams; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class StringInputStream extends ByteArrayInputStream { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/streams/StringOutputStream.java b/bus-core/src/main/java/org/aoju/bus/core/io/streams/StringOutputStream.java index c1fb94f8d7..caf14a80c5 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/streams/StringOutputStream.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/streams/StringOutputStream.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.streams; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class StringOutputStream extends OutputStream { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/streams/StringReader.java b/bus-core/src/main/java/org/aoju/bus/core/io/streams/StringReader.java index 20c34a7097..fa200a0280 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/streams/StringReader.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/streams/StringReader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.streams; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class StringReader extends Reader { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/streams/StringWriter.java b/bus-core/src/main/java/org/aoju/bus/core/io/streams/StringWriter.java index 448a772af2..5b1021a529 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/streams/StringWriter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/streams/StringWriter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.streams; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class StringWriter extends Writer { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/streams/VoidInputStream.java b/bus-core/src/main/java/org/aoju/bus/core/io/streams/VoidInputStream.java index 3a1b69a3c3..c98369dfe2 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/streams/VoidInputStream.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/streams/VoidInputStream.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.streams; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class VoidInputStream extends InputStream { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/streams/VoidOutputStream.java b/bus-core/src/main/java/org/aoju/bus/core/io/streams/VoidOutputStream.java index c399328c64..02e7864515 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/streams/VoidOutputStream.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/streams/VoidOutputStream.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.streams; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class VoidOutputStream extends OutputStream { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/watchers/DelayWatcher.java b/bus-core/src/main/java/org/aoju/bus/core/io/watchers/DelayWatcher.java index a327ccd796..876a780c4e 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/watchers/DelayWatcher.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/watchers/DelayWatcher.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.watchers; @@ -41,7 +42,7 @@ * 此类通过维护一个Set将短时间内相同文件多次modify的事件合并处理触发,从而避免以上问题 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DelayWatcher implements Watcher { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/watchers/IgnoreWatcher.java b/bus-core/src/main/java/org/aoju/bus/core/io/watchers/IgnoreWatcher.java index e843d9678b..82d8f9a76f 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/watchers/IgnoreWatcher.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/watchers/IgnoreWatcher.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.watchers; @@ -32,7 +33,7 @@ * 用户继承此类后实现需要监听的方法 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class IgnoreWatcher implements Watcher { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/watchers/SimpleWatcher.java b/bus-core/src/main/java/org/aoju/bus/core/io/watchers/SimpleWatcher.java index 242b995518..042f3764d5 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/watchers/SimpleWatcher.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/watchers/SimpleWatcher.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.watchers; @@ -29,7 +30,7 @@ * 用户继承此类后实现需要监听的方法 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SimpleWatcher extends IgnoreWatcher { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/watchers/WatchMonitor.java b/bus-core/src/main/java/org/aoju/bus/core/io/watchers/WatchMonitor.java index 21e3715f66..480a76556e 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/watchers/WatchMonitor.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/watchers/WatchMonitor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.watchers; @@ -44,7 +45,7 @@ * 递归监听目录时,并不会监听新创建的目录 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class WatchMonitor extends WatchServer { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/watchers/WatchServer.java b/bus-core/src/main/java/org/aoju/bus/core/io/watchers/WatchServer.java index ed83f4bf3a..7463af3974 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/watchers/WatchServer.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/watchers/WatchServer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.watchers; @@ -41,7 +42,7 @@ * 文件监听服务,此服务可以同时监听多个路径 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class WatchServer extends Thread implements Closeable, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/watchers/Watcher.java b/bus-core/src/main/java/org/aoju/bus/core/io/watchers/Watcher.java index 60e3c35e75..2382f5a2c3 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/watchers/Watcher.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/watchers/Watcher.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.watchers; @@ -31,7 +32,7 @@ * 观察者(监视器) * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Watcher { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/watchers/WatcherChain.java b/bus-core/src/main/java/org/aoju/bus/core/io/watchers/WatcherChain.java index 09713974bf..49116d97eb 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/watchers/WatcherChain.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/watchers/WatcherChain.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.io.watchers; @@ -37,7 +38,7 @@ * 用于加入多个观察者 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class WatcherChain implements Watcher, Chain { diff --git a/bus-core/src/main/java/org/aoju/bus/core/key/HashID.java b/bus-core/src/main/java/org/aoju/bus/core/key/HashID.java index 1375668fe9..fca4057659 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/key/HashID.java +++ b/bus-core/src/main/java/org/aoju/bus/core/key/HashID.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.key; @@ -37,7 +38,7 @@ * 数据库id,将它们用作忘记密码散列、邀请码、存储碎片号 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HashID { diff --git a/bus-core/src/main/java/org/aoju/bus/core/key/LongID.java b/bus-core/src/main/java/org/aoju/bus/core/key/LongID.java index 45f13030f4..832e2dbb08 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/key/LongID.java +++ b/bus-core/src/main/java/org/aoju/bus/core/key/LongID.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.key; @@ -48,7 +49,7 @@ * * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class LongID { diff --git a/bus-core/src/main/java/org/aoju/bus/core/key/ObjectID.java b/bus-core/src/main/java/org/aoju/bus/core/key/ObjectID.java index ab31a20718..4527a46e50 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/key/ObjectID.java +++ b/bus-core/src/main/java/org/aoju/bus/core/key/ObjectID.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.key; @@ -40,7 +41,7 @@ * 由12个字节组成,分割如下: * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ObjectID implements Comparable, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/key/Snowflake.java b/bus-core/src/main/java/org/aoju/bus/core/key/Snowflake.java index 656edd708c..f8bf35e01d 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/key/Snowflake.java +++ b/bus-core/src/main/java/org/aoju/bus/core/key/Snowflake.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.key; @@ -31,52 +32,80 @@ import java.util.Date; /** + * 分布式自增Id生成器(基于Twitter的Snowflake算法实现分布式高效有序ID) + *

+ * SnowFlake的结构如下(每部分用-分开):
  * 0 - 0000000000 0000000000 0000000000 0000000000 0 - 00000 - 00000 - 000000000000
- * 1位标识,由于long基本类型在Java中是带符号的,最高位是符号位,正数是0,负数是1,所以id一般是正数,最高位是0
- * 41位时间截(毫秒级),注意,41位时间截不是存储当前时间的时间截,而是存储时间截的差值(当前时间截 - 开始时间截)
- * 得到的值),这里的的开始时间截,一般是我们的id生成器开始使用的时间,由我们程序来指定的
- * 41位的时间截,可以使用69年 10位的数据机器位,可以部署在1024个节点,包括5位datacenterId和5位workerId
- * 12位序列,毫秒内的计数,12位的计数顺序号支持每个节点每毫秒(同一机器,同一时间截)产生4096个ID序号
- * 加起来刚好64位,为一个Long型
- * SnowFlake的优点是,整体上按照时间自增排序,并且整个分布式系统内不会产生ID碰撞
- * (由数据中心ID和机器ID作区分),并且效率较高,经测试,SnowFlake每秒能够产生26万ID左右
+ * 1位标识,由于long基本类型在Java中是带符号的,最高位是符号位,正数是0,负数是1,所以id一般是正数,最高位是0
+ * 41位时间截(毫秒级),注意,41位时间截不是存储当前时间的时间截,而是存储时间截的差值(当前时间截 - 开始时间截)
+ * 得到的值),这里的的开始时间截,一般是我们的id生成器开始使用的时间,由我们程序来指定的(如下下面程序IdWorker类的startTime属性)
+ * 41位的时间截,可以使用69年,年T = (1L >> 41) / (1000L * 60 * 60 * 24 * 365) = 69
+ * 10位的数据机器位,可以部署在1024个节点,包括5位datacenterId和5位workerId
+ * 12位序列,毫秒内的计数,12位的计数顺序号支持每个节点每毫秒(同一机器,同一时间截)产生4096个ID序号
+ * 加起来刚好64位,为一个Long型。
+ * SnowFlake的优点是,整体上按照时间自增排序,并且整个分布式系统内不会产生ID碰撞(由数据中心ID和机器ID作区分),并且效率较高,
+ * 经测试,SnowFlake每秒能够产生26万ID左右
+ * 
* * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Snowflake implements Serializable { private static final long serialVersionUID = 1L; - - private final long twepoch; + /** + * 起始时间戳,用于用当前时间戳减去这个时间戳,算出偏移量 + */ + private final long startTime; + /** + * workerId占用的位数5(表示只允许workId的范围为:0-1023) + */ private final long workerIdBits = 5L; + /** + * dataCenterId占用的位数:5 + */ private final long dataCenterIdBits = 5L; - //// 最大支持机器节点数0~31,一共32个 - // 最大支持数据中心节点数0~31,一共32个 + /** + * workerId可以使用的最大数值:31,0~31一共32个 + */ private final long maxWorkerId = -1L ^ (-1L << workerIdBits); + /** + * dataCenterId可以使用的最大数值:31,0~31一共32个 + */ private final long maxDataCenterId = -1L ^ (-1L << dataCenterIdBits); - // 序列号12位 + /** + * 序列号占用的位数:12(表示只允许workId的范围为:0-4095) + */ private final long sequenceBits = 12L; - // 机器节点左移12位 + /** + * 机器节点左移12位 + */ private final long workerIdShift = sequenceBits; - // 数据中心节点左移17位 + /** + * 数据中心节点左移17位 + */ private final long dataCenterIdShift = sequenceBits + workerIdBits; - // 时间毫秒数左移22位 + /** + * 时间毫秒数左移22位 + */ private final long timestampLeftShift = sequenceBits + workerIdBits + dataCenterIdBits; - private final long sequenceMask = -1L ^ (-1L << sequenceBits);// 4095 + /** + * 用mask防止溢出:位与运算保证计算的结果范围始终是 0-4095 + */ + private final long sequenceMask = -1L ^ (-1L << sequenceBits); private long workerId; private long dataCenterId; private long sequence = 0L; private long lastTimestamp = -1L; - private boolean useSystemClock; + private boolean isClock; /** * 构造 * - * @param workerId 终端ID - * @param dataCenterId 数据中心ID + * @param workerId 工作机器ID,数据范围为0~31 + * @param dataCenterId 数据中心ID,数据范围为0~31 */ public Snowflake(long workerId, long dataCenterId) { this(workerId, dataCenterId, false); @@ -85,25 +114,25 @@ public Snowflake(long workerId, long dataCenterId) { /** * 构造 * - * @param workerId 终端ID - * @param dataCenterId 数据中心ID - * @param isUseSystemClock 是否使用{@link SystemClock} 获取当前时间戳 + * @param workerId 终端ID + * @param dataCenterId 数据中心ID + * @param isClock 是否使用{@link SystemClock} 获取当前时间戳 */ - public Snowflake(long workerId, long dataCenterId, boolean isUseSystemClock) { - this(null, workerId, dataCenterId, isUseSystemClock); + public Snowflake(long workerId, long dataCenterId, boolean isClock) { + this(null, workerId, dataCenterId, isClock); } /** - * @param epochDate 初始化时间起点(null表示默认起始日期),后期修改会导致id重复,如果要修改连workerId dataCenterId,慎用 - * @param workerId 工作机器节点id - * @param dataCenterId 数据中心id - * @param isUseSystemClock 是否使用{@link SystemClock} 获取当前时间戳 + * @param epochDate 初始化时间起点(null表示默认起始日期),后期修改会导致id重复,如果要修改连workerId dataCenterId,慎用 + * @param workerId 工作机器节点id + * @param dataCenterId 数据中心id + * @param isClock 是否使用{@link SystemClock} 获取当前时间戳 */ - public Snowflake(Date epochDate, long workerId, long dataCenterId, boolean isUseSystemClock) { + public Snowflake(Date epochDate, long workerId, long dataCenterId, boolean isClock) { if (null != epochDate) { - this.twepoch = epochDate.getTime(); + this.startTime = epochDate.getTime(); } else { - this.twepoch = 1288834974657L; + this.startTime = 1288834974657L; } if (workerId > maxWorkerId || workerId < 0) { throw new IllegalArgumentException(StringKit.format("worker Id can't be greater than {} or less than 0", maxWorkerId)); @@ -113,7 +142,7 @@ public Snowflake(Date epochDate, long workerId, long dataCenterId, boolean isUse } this.workerId = workerId; this.dataCenterId = dataCenterId; - this.useSystemClock = isUseSystemClock; + this.isClock = isClock; } /** @@ -143,7 +172,7 @@ public long getDataCenterId(long id) { * @return 生成的时间 */ public long getGenerateDateTime(long id) { - return (id >> timestampLeftShift & ~(-1L << 41L)) + twepoch; + return (id >> timestampLeftShift & ~(-1L << 41L)) + this.startTime; } /** @@ -153,6 +182,8 @@ public long getGenerateDateTime(long id) { */ public synchronized long nextId() { long timestamp = genTime(); + + // 闰秒:如果当前时间小于上一次ID生成的时间戳,说明系统时钟回退过这个时候应当抛出异常 if (timestamp < lastTimestamp) { if (lastTimestamp - timestamp < 2000) { // 容忍2秒内的回拨,避免NTP校时造成的异常 @@ -163,18 +194,29 @@ public synchronized long nextId() { } } + // 解决跨毫秒生成ID序列号始终为偶数的缺陷:如果是同一时间生成的,则进行毫秒内序列 if (timestamp == lastTimestamp) { + // 通过位与运算保证计算的结果范围始终是 0-4095 sequence = (sequence + 1) & sequenceMask; if (sequence == 0) { timestamp = tilNextMillis(lastTimestamp); } } else { + // 时间戳改变,毫秒内序列重置 sequence = 0L; } lastTimestamp = timestamp; - return ((timestamp - twepoch) << timestampLeftShift) | (dataCenterId << dataCenterIdShift) | (workerId << workerIdShift) | sequence; + /* + * 1.左移运算是为了将数值移动到对应的段(41、5、5,12那段因为本来就在最右,因此不用左移) + * 2.然后对每个左移后的值(la、lb、lc、sequence)做位或运算,是为了把各个短的数据合并起来,合并成一个二进制数 + * 3.最后转换成10进制,就是最终生成的id + */ + return ((timestamp - startTime) << timestampLeftShift) | + (dataCenterId << dataCenterIdShift) | + (workerId << workerIdShift) | + sequence; } /** @@ -187,7 +229,7 @@ public String nextIdStr() { } /** - * 循环等待下一个时间 + * 保证返回的毫秒数在参数之后(阻塞到下一个毫秒,直到获得新的时间戳) * * @param lastTimestamp 上次记录的时间 * @return 下一个时间 @@ -201,12 +243,12 @@ private long tilNextMillis(long lastTimestamp) { } /** - * 生成时间戳 + * 获得系统当前毫秒数 * * @return 时间戳 */ private long genTime() { - return this.useSystemClock ? SystemClock.now() : System.currentTimeMillis(); + return this.isClock ? SystemClock.now() : System.currentTimeMillis(); } } diff --git a/bus-core/src/main/java/org/aoju/bus/core/key/UUID.java b/bus-core/src/main/java/org/aoju/bus/core/key/UUID.java index 291534b379..3b15de53ec 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/key/UUID.java +++ b/bus-core/src/main/java/org/aoju/bus/core/key/UUID.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.key; @@ -61,7 +62,7 @@ * 这些类型的 version 值分别为 1、2、3 和 4 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class UUID implements java.io.Serializable, Comparable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Algorithm.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Algorithm.java index c3057561db..823ae66f0b 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Algorithm.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Algorithm.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; @@ -28,7 +29,7 @@ * 加解密算法类型 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Algorithm { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Ansi.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Ansi.java index f1e887eba2..3fd68e03e9 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Ansi.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Ansi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; @@ -41,7 +42,7 @@ * 注意:同时出现多种组合FG颜色或BG颜色,只有最后一个会显示 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Ansi { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Assert.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Assert.java index e0fb1a13ff..af47337f84 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Assert.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Assert.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; @@ -30,17 +31,37 @@ import java.util.Collection; import java.util.Map; +import java.util.function.Supplier; /** * 断言 * 断言某些对象或值是否符合规定,否则抛出异常 经常用于做变量检查 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Assert { + /** + * 断言是否为真,如果为 {@code false} 抛出异常 + * 并使用指定的函数获取错误信息返回 + *
+     *  Assert.isTrue(i > 0, () -> {
+     *      return "relation message to return";
+     *  });
+     * 
+ * + * @param expression 布尔值 + * @param errorMsgSupplier 错误抛出异常附带的消息生产接口 + * @throws IllegalArgumentException if expression is {@code false} + */ + public static void isTrue(boolean expression, Supplier errorMsgSupplier) throws IllegalArgumentException { + if (!expression) { + isTrue(false, errorMsgSupplier.get()); + } + } + /** * 断言是否为真,如果为 {@code false} 抛出给定的异常 * @@ -91,6 +112,25 @@ public static void isTrue(boolean expression) throws IllegalArgumentException { isTrue(expression, "[Assertion failed] - this expression must be true"); } + /** + * 断言是否为假,如果为 {@code true} 抛出 {@code IllegalArgumentException} 异常 + * 并使用指定的函数获取错误信息返回 + *
+     *  Assert.isFalse(i > 0, () -> {
+     *      return "relation message to return";
+     *  });
+     * 
+ * + * @param expression 布尔值 + * @param errorMsgSupplier 错误抛出异常附带的消息生产接口 + * @throws IllegalArgumentException if expression is {@code false} + */ + public static void isFalse(boolean expression, Supplier errorMsgSupplier) throws IllegalArgumentException { + if (expression) { + isFalse(true, errorMsgSupplier.get()); + } + } + /** * 断言是否为假,如果为 {@code true} 抛出 {@code IllegalArgumentException} 异常 * @@ -123,6 +163,25 @@ public static void isFalse(boolean expression) throws IllegalArgumentException { isFalse(expression, "[Assertion failed] - this expression must be false"); } + /** + * 断言对象是否为{@code null} ,如果不为{@code null} 抛出{@link IllegalArgumentException} 异常 + * 并使用指定的函数获取错误信息返回 + *
+     * Assert.isNull(value,  () -> {
+     *      return "relation message to return";
+     *  });
+     * 
+ * + * @param object 被检查的对象 + * @param errorMsgSupplier 错误抛出异常附带的消息生产接口 + * @throws IllegalArgumentException if the object is not {@code null} + */ + public static void isNull(Object object, Supplier errorMsgSupplier) throws IllegalArgumentException { + if (object != null) { + isNull(object, errorMsgSupplier.get()); + } + } + /** * 断言对象是否为{@code null} ,如果不为{@code null} 抛出{@link IllegalArgumentException} 异常 * @@ -155,6 +214,28 @@ public static void isNull(Object object) throws NullPointerException { isNull(object, "[Assertion failed] - the object argument must be null"); } + /** + * 断言对象是否不为{@code null} ,如果为{@code null} 抛出{@link IllegalArgumentException} 异常 Assert that an object is not {@code null} . + * 并使用指定的函数获取错误信息返回 + *
+     * Assert.notNull(clazz, () -> {
+     *      return "relation message to return";
+     *  });
+     * 
+ * + * @param 被检查对象泛型类型 + * @param object 被检查对象 + * @param errorMsgSupplier 错误抛出异常附带的消息生产接口 + * @return 被检查后的对象 + * @throws IllegalArgumentException if the object is {@code null} + */ + public static T notNull(T object, Supplier errorMsgSupplier) throws IllegalArgumentException { + if (object == null) { + notNull(null, errorMsgSupplier.get()); + } + return object; + } + /** * 断言对象是否不为{@code null} ,如果为{@code null} 抛出{@link IllegalArgumentException} 异常 Assert that an object is not {@code null} . * @@ -192,6 +273,29 @@ public static T notNull(T object) throws NullPointerException { return notNull(object, "[Assertion failed] - this argument is required; it must not be null"); } + /** + * 检查给定字符串是否为空,为空抛出 {@link IllegalArgumentException} + * 并使用指定的函数获取错误信息返回 + *
+     * Assert.notEmpty(name, () -> {
+     *      return "relation message to return";
+     *  });
+     * 
+ * + * @param 字符串类型 + * @param text 被检查字符串 + * @param errorMsgSupplier 错误抛出异常附带的消息生产接口 + * @return 非空字符串 + * @throws IllegalArgumentException 被检查字符串为空 + * @see StringKit#isNotEmpty(CharSequence) + */ + public static T notEmpty(T text, Supplier errorMsgSupplier) throws IllegalArgumentException { + if (StringKit.isEmpty(text)) { + notEmpty(text, errorMsgSupplier.get()); + } + return text; + } + /** * 检查给定字符串是否为空,为空抛出 {@link IllegalArgumentException} * @@ -229,6 +333,29 @@ public static T notEmpty(T text) throws IllegalArgument return notEmpty(text, "[Assertion failed] - this String argument must have length; it must not be null or empty"); } + /** + * 检查给定字符串是否为空白(null、空串或只包含空白符),为空抛出 {@link IllegalArgumentException} + * 并使用指定的函数获取错误信息返回 + *
+     * Assert.notBlank(name, () -> {
+     *      return "relation message to return";
+     *  });
+     * 
+ * + * @param 字符串类型 + * @param text 被检查字符串 + * @param errorMsgSupplier 错误抛出异常附带的消息生产接口 + * @return 非空字符串 + * @throws IllegalArgumentException 被检查字符串为空白 + * @see StringKit#isNotBlank(CharSequence) + */ + public static T notBlank(T text, Supplier errorMsgSupplier) throws IllegalArgumentException { + if (StringKit.isBlank(text)) { + notBlank(text, errorMsgSupplier.get()); + } + return text; + } + /** * 检查给定字符串是否为空白(null、空串或只包含空白符),为空抛出 {@link IllegalArgumentException} * @@ -267,6 +394,28 @@ public static T notBlank(T text) throws IllegalArgument return notBlank(text, "[Assertion failed] - this String argument must have text; it must not be null, empty, or blank"); } + /** + * 断言给定字符串是否不被另一个字符串包含(即是否为子串) + * 并使用指定的函数获取错误信息返回 + *
+     * Assert.doesNotContain(name, "rod", () -> {
+     *      return "relation message to return";
+     *  });
+     * 
+ * + * @param textToSearch 被搜索的字符串 + * @param substring 被检查的子串 + * @param errorMsgSupplier 错误抛出异常附带的消息生产接口 + * @return 被检查的子串 + * @throws IllegalArgumentException 非子串抛出异常 + */ + public static String notContain(String textToSearch, String substring, Supplier errorMsgSupplier) throws IllegalArgumentException { + if (StringKit.isNotEmpty(textToSearch) && StringKit.isNotEmpty(substring) && textToSearch.contains(substring)) { + throw new IllegalArgumentException(errorMsgSupplier.get()); + } + return substring; + } + /** * 断言给定字符串是否不被另一个字符串包含(既是否为子串) * @@ -304,6 +453,27 @@ public static String notContain(String textToSearch, String substring) throws Il return notContain(textToSearch, substring, "[Assertion failed] - this String argument must not contain the substring [{}]", substring); } + /** + * 断言给定数组是否包含元素,数组必须不为 {@code null} 且至少包含一个元素 + * 并使用指定的函数获取错误信息返回 + *
+     * Assert.notEmpty(array, () -> {
+     *      return "relation message to return";
+     *  });
+     * 
+ * + * @param array 被检查的数组 + * @param errorMsgSupplier 错误抛出异常附带的消息生产接口 + * @return 被检查的数组 + * @throws IllegalArgumentException if the object array is {@code null} or has no elements + */ + public static Object[] notEmpty(Object[] array, Supplier errorMsgSupplier) throws IllegalArgumentException { + if (ArrayKit.isEmpty(array)) { + throw new IllegalArgumentException(errorMsgSupplier.get()); + } + return array; + } + /** * 断言给定数组是否包含元素,数组必须不为 {@code null} 且至少包含一个元素 * @@ -339,6 +509,30 @@ public static Object[] notEmpty(Object[] array) throws IllegalArgumentException return notEmpty(array, "[Assertion failed] - this array must not be empty: it must contain at least 1 element"); } + /** + * 断言给定数组是否不包含{@code null}元素,如果数组为空或 {@code null}将被认为不包含 + * 并使用指定的函数获取错误信息返回 + *
+     * Assert.noNullElements(array, ()->{
+     *      return new IllegalArgumentException("relation message to return ");
+     *  });
+     * 
+ * + * @param 数组元素类型 + * @param 异常类型 + * @param array 被检查的数组 + * @param errorSupplier 错误抛出异常附带的消息生产接口 + * @return 被检查的数组 + * @throws X if the object array contains a {@code null} element + * @see ArrayKit#hasNull(Object[]) + */ + public static T[] noNullElements(T[] array, Supplier errorSupplier) throws X { + if (ArrayKit.hasNull(array)) { + throw errorSupplier.get(); + } + return array; + } + /** * 断言给定数组是否不包含{@code null}元素,如果数组为空或 {@code null}将被认为不包含 * @@ -376,6 +570,28 @@ public static T[] noNullElements(T[] array) throws IllegalArgumentException return noNullElements(array, "[Assertion failed] - this array must not contain any null elements"); } + /** + * 断言给定集合非空 + * 并使用指定的函数获取错误信息返回 + *
+     * Assert.notEmpty(collection, () -> {
+     *      return "relation message to return";
+     *  });
+     * 
+ * + * @param 集合元素类型 + * @param collection 被检查的集合 + * @param errorMsgSupplier 错误抛出异常附带的消息生产接口 + * @return 非空集合 + * @throws IllegalArgumentException if the collection is {@code null} or has no elements + */ + public static Collection notEmpty(Collection collection, Supplier errorMsgSupplier) throws IllegalArgumentException { + if (CollKit.isEmpty(collection)) { + throw new IllegalArgumentException(errorMsgSupplier.get()); + } + return collection; + } + /** * 断言给定集合非空 * @@ -413,6 +629,29 @@ public static Collection notEmpty(Collection collection) throws Illega return notEmpty(collection, "[Assertion failed] - this collection must not be empty: it must contain at least 1 element"); } + /** + * 断言给定Map非空 + * 并使用指定的函数获取错误信息返回 + *
+     * Assert.notEmpty(map, () -> {
+     *      return "relation message to return";
+     *  });
+     * 
+ * + * @param Key类型 + * @param Value类型 + * @param map 被检查的Map + * @param errorMsgSupplier 错误抛出异常附带的消息生产接口 + * @return 被检查的Map + * @throws IllegalArgumentException if the map is {@code null} or has no entries + */ + public static Map notEmpty(Map map, Supplier errorMsgSupplier) throws IllegalArgumentException { + if (CollKit.isEmpty(map)) { + throw new IllegalArgumentException(errorMsgSupplier.get()); + } + return map; + } + /** * 断言给定Map非空 * @@ -495,7 +734,7 @@ public static T isInstanceOf(Class type, T obj, String errorMsgTemplate, } /** - * {@code superType.isAssignableFrom(subType)} 是否为 {@code true}. + * {@code superType.isAssignableFrom(subType)} 是否为 {@code true} * *
      * Assert.isAssignable(Number.class, myClass);
@@ -510,7 +749,7 @@ public static void isAssignable(Class superType, Class subType) throws Ill
     }
 
     /**
-     * {@code superType.isAssignableFrom(subType)} 是否为 {@code true}.
+     * {@code superType.isAssignableFrom(subType)} 是否为 {@code true}
      *
      * 
      * Assert.isAssignable(Number.class, myClass);
@@ -529,6 +768,25 @@ public static void isAssignable(Class superType, Class subType, String err
         }
     }
 
+    /**
+     * 检查boolean表达式,当检查结果为false时抛出 {@code IllegalStateException}
+     * 并使用指定的函数获取错误信息返回
+     * 
+     * Assert.state(id == null, () -> {
+     *      return "relation message to return";
+     *  });
+     * 
+ * + * @param expression boolean 表达式 + * @param errorMsgSupplier 错误抛出异常附带的消息生产接口 + * @throws IllegalStateException 表达式为 {@code false} 抛出此异常 + */ + public static void state(boolean expression, Supplier errorMsgSupplier) throws IllegalStateException { + if (false == expression) { + throw new IllegalStateException(errorMsgSupplier.get()); + } + } + /** * 检查boolean表达式,当检查结果为false时抛出 {@code IllegalStateException}. * diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Chain.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Chain.java index 518b002cfc..3bae10ecad 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Chain.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Chain.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; @@ -30,7 +31,7 @@ * @param 元素类型 * @param 目标类类型,用于返回this对象 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Chain extends Iterable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Charset.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Charset.java index 02ae8db0b5..b221b751d4 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Charset.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Charset.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; @@ -35,7 +36,7 @@ * 编码常量 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Charset { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Console.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Console.java index 9fab0243d8..82c0f959bf 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Console.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Console.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; @@ -39,7 +40,7 @@ * 此类主要针对{@link java.lang.System#out} 和 {@link java.lang.System#err} 做封装 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Console { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Dict.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Dict.java index 69563e594e..40fd55e280 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Dict.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Dict.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; @@ -40,7 +41,7 @@ * 字典对象,扩充了HashMap中的方法 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Dict extends LinkedHashMap implements BasicType { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Editor.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Editor.java index c913c7be64..9ad0df0656 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Editor.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Editor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; @@ -35,7 +36,7 @@ * * @param 被编辑对象类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Editor { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Fields.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Fields.java index 2e5dc022de..520d51255f 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Fields.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Fields.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; @@ -35,7 +36,7 @@ * 日期场景属性 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Fields { @@ -992,6 +993,11 @@ public enum Month { */ UNDECIMBER(Calendar.UNDECIMBER); + /** + * 每月最后一天 + */ + private static final int[] MOHTH_OF_LASTDAY = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, -1}; + private int value; Month(int value) { @@ -1050,9 +1056,36 @@ public static Month of(int calendarMonthIntValue) { } } + /** + * 获得指定月的最后一天 + * + * @param month 月份 + * @param isLeapYear 是否为闰年,闰年只对二月有影响 + * @return 最后一天,可能为28,29,30,31 + */ + public static int getLastDay(int month, boolean isLeapYear) { + int lastDay = MOHTH_OF_LASTDAY[month]; + if (isLeapYear && Calendar.FEBRUARY == month) { + // 闰年二月 + lastDay += 1; + } + return lastDay; + } + public int getValue() { return this.value; } + + /** + * 获取此月份最后一天的值,不支持的月份(例如UNDECIMBER)返回-1 + * + * @param isLeapYear 是否闰年 + * @return 此月份最后一天的值 + */ + public int getLastDay(boolean isLeapYear) { + return getLastDay(this.value, isLeapYear); + } + } /** diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/FileType.java b/bus-core/src/main/java/org/aoju/bus/core/lang/FileType.java index 54b5549ddf..11e6cd6069 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/FileType.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/FileType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; @@ -40,7 +41,7 @@ * 文件类型(扩展名) * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FileType { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Filter.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Filter.java index b312cf42b6..1b14b95a10 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Filter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Filter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; @@ -28,7 +29,7 @@ * 过滤器接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Filter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Func.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Func.java index 5445624a8b..4f826b26c3 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Func.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Func.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; @@ -31,7 +32,7 @@ * 此接口用于将一个函数包装成为一个对象,从而传递对象 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @FunctionalInterface 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 index 08663ead04..b548b8a9e1 100755 --- 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 @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; @@ -28,7 +29,7 @@ * Header 常量 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Header { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Holder.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Holder.java index 1698c29167..4eb8c62ae7 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Holder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Holder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; @@ -31,7 +32,7 @@ * * @param 所持有值类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Holder extends MutableObject { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Http.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Http.java index af2e3942ba..59128bb5cc 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Http.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Http.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; @@ -30,7 +31,7 @@ * HTTP 相关常量 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Http { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Job.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Job.java index a00b03c295..b992ff3759 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Job.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Job.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Lang.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Lang.java index c5c399a500..1117ec4707 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Lang.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Lang.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; @@ -30,7 +31,7 @@ * Lang 相关方法 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Lang { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Lazy.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Lazy.java index ee16cdf765..0f8ff1b07c 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Lazy.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Lazy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; @@ -31,7 +32,7 @@ * 持有一个计算延迟的值 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Lazy implements Supplier, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Locale.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Locale.java index 5a16e45baa..312bf6a18f 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Locale.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Locale.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; @@ -28,7 +29,7 @@ * 翻译语言枚举 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum Locale { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Matcher.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Matcher.java index caa27720f8..3d0c902eb9 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Matcher.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Matcher.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; @@ -29,7 +30,7 @@ * * @param 匹配的对象类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Matcher { 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 index 875760b075..eb9b298fd7 100755 --- 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 @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; @@ -37,7 +38,7 @@ * HTTP 媒体类型 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Murmur.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Murmur.java index 403fa8e203..8d0d9d3a97 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Murmur.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Murmur.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; @@ -32,7 +33,7 @@ * Murmur3 32bit、64bit、128bit 哈希算法实现 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Murmur implements Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Normal.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Normal.java index f1226e89e4..67f95f4385 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Normal.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Normal.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; @@ -34,7 +35,7 @@ * 默认常量 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Normal { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Range.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Range.java index 5bf8e19b3f..08bcb87cea 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Range.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Range.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; @@ -44,7 +45,7 @@ * * @param 生成范围对象的类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Range implements Iterable, Iterator, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/RegEx.java b/bus-core/src/main/java/org/aoju/bus/core/lang/RegEx.java index c2112cbc43..40bc99b456 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/RegEx.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/RegEx.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; @@ -33,7 +34,7 @@ * 正则表达式 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RegEx { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Replacer.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Replacer.java index 533be555b5..0a8eba12af 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Replacer.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Replacer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; @@ -30,7 +31,7 @@ * * @param 被替换操作的类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Replacer { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Scale.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Scale.java index de349525e5..b36dde3aee 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Scale.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Scale.java @@ -6,7 +6,7 @@ * 缩放常量信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Scale { @@ -37,7 +37,7 @@ public enum Mode { * 图片缩略类型 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum Type { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Scaner.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Scaner.java index 51abea97ec..1ae6cbf398 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Scaner.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Scaner.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; @@ -42,7 +43,7 @@ * 类扫描器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Scaner { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/SimpleCache.java b/bus-core/src/main/java/org/aoju/bus/core/lang/SimpleCache.java index 0f8cffed6d..dfa7dde121 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/SimpleCache.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/SimpleCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; @@ -36,7 +37,7 @@ * @param 键类型 * @param 值类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SimpleCache implements Iterable>, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Symbol.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Symbol.java index cac71c1f6c..255cf1b616 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Symbol.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Symbol.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; @@ -28,7 +29,7 @@ * 标点符号常量 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Symbol { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/System.java b/bus-core/src/main/java/org/aoju/bus/core/lang/System.java index 517e869b4e..f9962923fe 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/System.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/System.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; @@ -30,7 +31,7 @@ * 系统常量 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class System { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Typed.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Typed.java index 61df613d7f..0009a68987 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Typed.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Typed.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; @@ -35,7 +36,7 @@ * {@link ParameterizedType} 接口实现,用于重新定义泛型类型 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Typed implements ParameterizedType, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Types.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Types.java index 27478bd338..4060feb259 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Types.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Types.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; @@ -38,7 +39,7 @@ * * @param 需要自定义的参考类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class Types implements Type { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Validator.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Validator.java index 654e250052..964e87a5a9 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Validator.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Validator.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; @@ -35,7 +36,7 @@ * 字段验证器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Validator { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/VoidFunc.java b/bus-core/src/main/java/org/aoju/bus/core/lang/VoidFunc.java index 96e66bca45..b7054e360e 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/VoidFunc.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/VoidFunc.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; @@ -32,7 +33,7 @@ * * @param

参数类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @FunctionalInterface diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Weighing.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Weighing.java index 6ae0a3e8c1..1193d9b914 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Weighing.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Weighing.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang; @@ -46,7 +47,7 @@ * * @param 权重随机获取的对象类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Weighing implements Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/caller/Caller.java b/bus-core/src/main/java/org/aoju/bus/core/lang/caller/Caller.java index 955ba440ed..03bcda2385 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/caller/Caller.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/caller/Caller.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.caller; @@ -31,7 +32,7 @@ * 可以通过此接口的实现类方法获取调用者、多级调用者以及判断是否被调用 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Caller { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/caller/SecurityCaller.java b/bus-core/src/main/java/org/aoju/bus/core/lang/caller/SecurityCaller.java index cc3ee7b717..bddcb9b120 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/caller/SecurityCaller.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/caller/SecurityCaller.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.caller; @@ -30,7 +31,7 @@ * 方式获取调用者 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SecurityCaller extends SecurityManager implements Caller { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/caller/StackTraceCaller.java b/bus-core/src/main/java/org/aoju/bus/core/lang/caller/StackTraceCaller.java index 68ef10edbb..5fc8332c26 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/caller/StackTraceCaller.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/caller/StackTraceCaller.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.caller; @@ -30,7 +31,7 @@ * 通过StackTrace方式获取调用者 此方式效率最低,不推荐使用 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class StackTraceCaller implements Caller { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/copier/Copier.java b/bus-core/src/main/java/org/aoju/bus/core/lang/copier/Copier.java index 1e1b18f964..ca021a281a 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/copier/Copier.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/copier/Copier.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.copier; @@ -29,7 +30,7 @@ * * @param 拷贝目标类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Copier { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/copier/Duplicate.java b/bus-core/src/main/java/org/aoju/bus/core/lang/copier/Duplicate.java index 98b7a4004f..4bfeca82a0 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/copier/Duplicate.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/copier/Duplicate.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.copier; @@ -34,7 +35,7 @@ * @param 拷贝的对象 * @param 本类的类型 用于set方法返回本对象,方便流式编程 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class Duplicate> implements Copier { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/AuthorizedException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/AuthorizedException.java index 37c4af550d..ab50618037 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/AuthorizedException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/AuthorizedException.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.exception; @@ -28,7 +29,7 @@ * 自定义异常: 认证异常 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AuthorizedException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/BusinessException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/BusinessException.java index c26035d91e..208af843e9 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/BusinessException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/BusinessException.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.exception; @@ -28,7 +29,7 @@ * 自定义异常: 业务异常 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BusinessException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/CrontabException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/CrontabException.java index 0419b13b21..0a176fd56e 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/CrontabException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/CrontabException.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.exception; @@ -28,7 +29,7 @@ * 自定义异常: 定时任务执行异常 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CrontabException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/DisableException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/DisableException.java index 43895e9310..2a7e4a9f5f 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/DisableException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/DisableException.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.exception; @@ -28,7 +29,7 @@ * 自定义异常: 数据被禁用异常 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DisableException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/ExistsException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/ExistsException.java index d547acc4cf..ab5ef817bd 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/ExistsException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/ExistsException.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.exception; @@ -28,7 +29,7 @@ * 自定义异常: 对象已存在异常 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ExistsException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/ForbiddenException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/ForbiddenException.java index 25710bf63d..0276676541 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/ForbiddenException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/ForbiddenException.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.exception; @@ -28,7 +29,7 @@ * 自定义异常: 权限不足异常 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ForbiddenException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/HttpUncheckException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/HttpUncheckException.java index a40bf1a31a..e7a707e0a4 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/HttpUncheckException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/HttpUncheckException.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.exception; @@ -28,7 +29,7 @@ * HTTP请求异常 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HttpUncheckException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/InstanceException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/InstanceException.java index 11c83a8a23..35ee68bc13 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/InstanceException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/InstanceException.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.exception; @@ -28,7 +29,7 @@ * 自定义异常: 实例化异常 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class InstanceException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/InstrumentException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/InstrumentException.java index 075961c1fb..64027f5b47 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/InstrumentException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/InstrumentException.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.exception; @@ -28,7 +29,7 @@ * 自定义异常: 内部处理异常 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class InstrumentException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/InvalidClaimException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/InvalidClaimException.java index 54502acf6b..27b870cdfc 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/InvalidClaimException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/InvalidClaimException.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.exception; @@ -28,7 +29,7 @@ * 自定义异常: 无效的范围要求 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class InvalidClaimException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/InvalidParamsException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/InvalidParamsException.java index 1b83ddc59a..7c8a9283c7 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/InvalidParamsException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/InvalidParamsException.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.exception; @@ -28,7 +29,7 @@ * 无效的参数异常 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class InvalidParamsException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/NoSuchException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/NoSuchException.java index d1ca9c003f..fc2724a93c 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/NoSuchException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/NoSuchException.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.exception; @@ -28,7 +29,7 @@ * 自定义异常: 无法找到方法 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NoSuchException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/NotExistsException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/NotExistsException.java index d9f988eb10..e437b0a6cb 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/NotExistsException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/NotExistsException.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.exception; @@ -28,7 +29,7 @@ * 自定义异常: 对象不存在 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NotExistsException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/NotFoundException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/NotFoundException.java index ba3de85c8c..751b61cea5 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/NotFoundException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/NotFoundException.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.exception; @@ -28,7 +29,7 @@ * 自定义异常: 资源不存在 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NotFoundException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/NotInitedException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/NotInitedException.java index 254cae493b..20cfdb1b80 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/NotInitedException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/NotInitedException.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.exception; @@ -28,7 +29,7 @@ * 自定义异常: 未初始化异常 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NotInitedException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/RelevantException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/RelevantException.java index 66e4fadfb7..044b171403 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/RelevantException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/RelevantException.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.exception; @@ -34,7 +35,7 @@ * 自定义异常: 未受检异常 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/RevisedException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/RevisedException.java index 16fd682c8d..05eebae023 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/RevisedException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/RevisedException.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.exception; @@ -28,7 +29,7 @@ * 自定义异常: 无法找到方法 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RevisedException extends RelevantException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/SignatureException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/SignatureException.java index c335ab7b5d..ebad9ceb75 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/SignatureException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/SignatureException.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.exception; @@ -28,7 +29,7 @@ * 自定义异常: 签名异常 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SignatureException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/SocketException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/SocketException.java index 197f4241b1..5422d191d3 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/SocketException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/SocketException.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.exception; @@ -28,7 +29,7 @@ * 自定义异常: Socket异常 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SocketException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/TokenExpiredException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/TokenExpiredException.java index 1f309654cf..f60e4a9d1c 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/TokenExpiredException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/TokenExpiredException.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.exception; @@ -28,7 +29,7 @@ * 自定义异常: 令牌过期 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TokenExpiredException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/UncheckedException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/UncheckedException.java index 92204b9667..38a0f82e40 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/UncheckedException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/UncheckedException.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.exception; @@ -34,7 +35,7 @@ * 自定义异常: 未受检异常 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/ValidateException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/ValidateException.java index 787e0a6b8d..cece657f4c 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/ValidateException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/ValidateException.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.exception; @@ -28,7 +29,7 @@ * 自定义异常: 参数验证失败 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ValidateException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/Mutable.java b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/Mutable.java index 162aa55be2..0448dacf5b 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/Mutable.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/Mutable.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.mutable; @@ -29,7 +30,7 @@ * * @param 值得类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Mutable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableBool.java b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableBool.java index 8103d5ef42..162b7061d6 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableBool.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableBool.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.mutable; @@ -28,7 +29,7 @@ * 可变 boolean 类型 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @see Boolean * @since JDK 1.8+ */ diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableByte.java b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableByte.java index f891b2aca6..688959f735 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableByte.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableByte.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.mutable; @@ -31,7 +32,7 @@ * 可变 byte 类型 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @see Byte * @since JDK 1.8+ */ diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableDouble.java b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableDouble.java index 518d7e49c3..10d21f7627 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableDouble.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableDouble.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.mutable; @@ -31,7 +32,7 @@ * 可变 double 类型 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @see Double * @since JDK 1.8+ */ diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableFloat.java b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableFloat.java index 2d9763d71a..b18f35b40a 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableFloat.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableFloat.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.mutable; @@ -31,7 +32,7 @@ * 可变 float 类型 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @see Float * @since JDK 1.8+ */ diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableInt.java b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableInt.java index 5deaea2c63..9cbe103352 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableInt.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableInt.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.mutable; @@ -31,7 +32,7 @@ * 可变 int 类型 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @see Integer * @since JDK 1.8+ */ diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableLong.java b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableLong.java index b48de54d97..ef25f786db 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableLong.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableLong.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.mutable; @@ -30,7 +31,7 @@ * 可变 long 类型 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @see Long * @since JDK 1.8+ */ diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableObject.java b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableObject.java index d4e8c69d01..9a8c2902ea 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableObject.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableObject.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.mutable; @@ -33,7 +34,7 @@ * * @param 可变的类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MutableObject implements Mutable, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableShort.java b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableShort.java index c302064091..0db7234bf4 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableShort.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableShort.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.mutable; @@ -31,7 +32,7 @@ * 可变 short 类型 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @see Short * @since JDK 1.8+ */ diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/tree/Node.java b/bus-core/src/main/java/org/aoju/bus/core/lang/tree/Node.java index 2fe230aa31..0ff962be3c 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/tree/Node.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/tree/Node.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.tree; @@ -29,7 +30,7 @@ * * @param 类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Node extends Comparable> { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/tree/TreeEntity.java b/bus-core/src/main/java/org/aoju/bus/core/lang/tree/TreeEntity.java index ce61a8507d..096c823a45 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/tree/TreeEntity.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/tree/TreeEntity.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.tree; @@ -28,7 +29,7 @@ * 树配置属性相关 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TreeEntity { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/tree/TreeMap.java b/bus-core/src/main/java/org/aoju/bus/core/lang/tree/TreeMap.java index 7245a22e6a..78d65a429a 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/tree/TreeMap.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/tree/TreeMap.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.tree; @@ -36,7 +37,7 @@ * * @param ID类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TreeMap extends LinkedHashMap implements Node { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/tree/TreeNode.java b/bus-core/src/main/java/org/aoju/bus/core/lang/tree/TreeNode.java index e8938e1c37..f64a219e2b 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/tree/TreeNode.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/tree/TreeNode.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.tree; @@ -30,7 +31,7 @@ * 类树节点实体: 包含key,父Key.不限于这些属性的可以构造成一颗树的实体对象 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TreeNode implements Node { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/tree/parser/DefaultNodeParser.java b/bus-core/src/main/java/org/aoju/bus/core/lang/tree/parser/DefaultNodeParser.java index 2e664fd29b..bb6baa714c 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/tree/parser/DefaultNodeParser.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/tree/parser/DefaultNodeParser.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.tree.parser; @@ -32,7 +33,7 @@ * * @param ID类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DefaultNodeParser implements NodeParser, T> { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/tree/parser/NodeParser.java b/bus-core/src/main/java/org/aoju/bus/core/lang/tree/parser/NodeParser.java index cbeda8920e..43cabd97ee 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/tree/parser/NodeParser.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/tree/parser/NodeParser.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.tree.parser; @@ -31,7 +32,7 @@ * * @param 转换的实体 为数据源里的对象类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface NodeParser { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/ImmutablePair.java b/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/ImmutablePair.java index 179d8174a4..bf8a0aaace 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/ImmutablePair.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/ImmutablePair.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.tuple; @@ -37,7 +38,7 @@ * @param the left element type * @param the right element type * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class ImmutablePair extends Pair { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/ImmutableTriple.java b/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/ImmutableTriple.java index a2e7b779f1..8a84273101 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/ImmutableTriple.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/ImmutableTriple.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.tuple; @@ -38,7 +39,7 @@ * @param the middle element type * @param the right element type * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class ImmutableTriple extends Triple { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/MutablePair.java b/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/MutablePair.java index 4d811dcdb8..588cff00eb 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/MutablePair.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/MutablePair.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.tuple; @@ -30,7 +31,7 @@ * @param 左元素类型 * @param 左元素类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MutablePair extends Pair { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/MutableTriple.java b/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/MutableTriple.java index fbad88bb88..471fe4317f 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/MutableTriple.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/MutableTriple.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.tuple; @@ -31,7 +32,7 @@ * @param 中间元素类型 * @param 左元素类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MutableTriple extends Triple { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/Pair.java b/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/Pair.java index 43cc954c59..2c27e87a8a 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/Pair.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/Pair.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.tuple; @@ -45,7 +46,7 @@ * @param the left element type * @param the right element type * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/Quartet.java b/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/Quartet.java index 461ad1b889..f4679b4a03 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/Quartet.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/Quartet.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.tuple; diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/Quintet.java b/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/Quintet.java index c3c7a8e11e..29d2313e92 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/Quintet.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/Quintet.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.tuple; diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/Triple.java b/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/Triple.java index a3a8ac1105..1db2211d42 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/Triple.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/Triple.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.lang.tuple; @@ -43,7 +44,7 @@ * @param the middle element type * @param the right element type * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/AllFilter.java b/bus-core/src/main/java/org/aoju/bus/core/loader/AllFilter.java index d7b804f329..a1b408e049 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/AllFilter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/AllFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.loader; @@ -33,7 +34,7 @@ * 如果没有过滤器的时候则认为所有过滤器都满足 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AllFilter extends MixFilter implements Filter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/AntFilter.java b/bus-core/src/main/java/org/aoju/bus/core/loader/AntFilter.java index 1d7a8f0f28..8d2c68a013 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/AntFilter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/AntFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.loader; @@ -30,7 +31,7 @@ * ANT风格路径过滤器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AntFilter extends RegexFilter implements Filter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/AntLoader.java b/bus-core/src/main/java/org/aoju/bus/core/loader/AntLoader.java index d386d02218..ee8d3b06de 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/AntLoader.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/AntLoader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.loader; @@ -34,7 +35,7 @@ * ANT风格路径资源加载器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AntLoader extends PatternLoader implements Loader { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/AnyFilter.java b/bus-core/src/main/java/org/aoju/bus/core/loader/AnyFilter.java index 4e65b8b82d..d7ed95e82b 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/AnyFilter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/AnyFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.loader; @@ -31,7 +32,7 @@ * ANY逻辑复合过滤器,即任意一个过滤器满足时就满足,当没有过滤器的时候则认为没有过滤器满足,也就是不满足 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AnyFilter extends MixFilter implements Filter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/DelegateLoader.java b/bus-core/src/main/java/org/aoju/bus/core/loader/DelegateLoader.java index 122cb21475..bfe9e43941 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/DelegateLoader.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/DelegateLoader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.loader; @@ -28,7 +29,7 @@ * 委派的资源加载器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class DelegateLoader extends ResourceLoader implements Loader { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/FileLoader.java b/bus-core/src/main/java/org/aoju/bus/core/loader/FileLoader.java index 617a965ac9..2260f7eaa6 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/FileLoader.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/FileLoader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.loader; @@ -40,7 +41,7 @@ * 文件资源加载器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FileLoader extends ResourceLoader implements Loader { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/Filter.java b/bus-core/src/main/java/org/aoju/bus/core/loader/Filter.java index 33ffa35dae..91aeec2dd4 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/Filter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/Filter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.loader; @@ -30,7 +31,7 @@ * 资源过滤器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Filter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/Filters.java b/bus-core/src/main/java/org/aoju/bus/core/loader/Filters.java index 1df3ea09e2..c570562a8c 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/Filters.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/Filters.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.loader; @@ -30,7 +31,7 @@ * 过滤器工具类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class Filters { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/JarLoader.java b/bus-core/src/main/java/org/aoju/bus/core/loader/JarLoader.java index c740a99323..00cfc7fd49 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/JarLoader.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/JarLoader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.loader; @@ -43,7 +44,7 @@ * Jar包资源加载器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JarLoader extends ResourceLoader implements Loader { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/JarLoaders.java b/bus-core/src/main/java/org/aoju/bus/core/loader/JarLoaders.java index 19f471e7a6..cde4364633 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/JarLoaders.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/JarLoaders.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.loader; @@ -39,7 +40,7 @@ * 外部Jar的类加载器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JarLoaders extends URLClassLoader { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/Loader.java b/bus-core/src/main/java/org/aoju/bus/core/loader/Loader.java index 034d33b025..a2bc681207 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/Loader.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/Loader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.loader; @@ -35,7 +36,7 @@ * 调用时,避免无用的提前全部预加载 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Loader { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/Loaders.java b/bus-core/src/main/java/org/aoju/bus/core/loader/Loaders.java index 85c7cecc99..8e4e54d2d0 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/Loaders.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/Loaders.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.loader; @@ -33,7 +34,7 @@ * 资源加载器工具类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class Loaders { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/MixFilter.java b/bus-core/src/main/java/org/aoju/bus/core/loader/MixFilter.java index 3a8f13c439..23d3c358a5 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/MixFilter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/MixFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.loader; @@ -33,7 +34,7 @@ * 复合过滤器,实际上内部维护一个过滤器的{@link LinkedHashSet}集合,提供添加/删除以及链式拼接的方法来混合多个子过滤器,该过滤器的具体逻辑由子类拓展 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class MixFilter implements Filter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/NatLoader.java b/bus-core/src/main/java/org/aoju/bus/core/loader/NatLoader.java index 6ebe3c2e91..524da1efc9 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/NatLoader.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/NatLoader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.loader; @@ -41,7 +42,7 @@ * Jar包资源加载器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NatLoader extends StdLoader implements Loader { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/PatternLoader.java b/bus-core/src/main/java/org/aoju/bus/core/loader/PatternLoader.java index 02f1c0e6c2..f947bfa3b2 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/PatternLoader.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/PatternLoader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.loader; @@ -33,7 +34,7 @@ * 模式匹配资源加载器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class PatternLoader extends DelegateLoader implements Loader { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/PkgLoader.java b/bus-core/src/main/java/org/aoju/bus/core/loader/PkgLoader.java index d00488a022..9d673f2500 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/PkgLoader.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/PkgLoader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.loader; @@ -34,7 +35,7 @@ * 包名表达式资源加载器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PkgLoader extends DelegateLoader implements Loader { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/RegexFilter.java b/bus-core/src/main/java/org/aoju/bus/core/loader/RegexFilter.java index 5423a73538..308b61204b 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/RegexFilter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/RegexFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.loader; @@ -31,7 +32,7 @@ * 正则表达式过滤器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RegexFilter implements Filter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/RegexLoader.java b/bus-core/src/main/java/org/aoju/bus/core/loader/RegexLoader.java index a4788d35d0..818de3912b 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/RegexLoader.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/RegexLoader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.loader; @@ -30,7 +31,7 @@ * 正则表达式资源加载器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RegexLoader extends PatternLoader implements Loader { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/ResourceLoader.java b/bus-core/src/main/java/org/aoju/bus/core/loader/ResourceLoader.java index 89cb846e3b..f0471a2dea 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/ResourceLoader.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/ResourceLoader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.loader; @@ -34,7 +35,7 @@ * 资源加载器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class ResourceLoader implements Loader { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/StdLoader.java b/bus-core/src/main/java/org/aoju/bus/core/loader/StdLoader.java index 8b71e271c0..7d8c0652f4 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/StdLoader.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/StdLoader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.loader; @@ -44,7 +45,7 @@ * 标准的资源加载器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class StdLoader extends ResourceLoader implements Loader { diff --git a/bus-core/src/main/java/org/aoju/bus/core/map/CamelCaseLinkedMap.java b/bus-core/src/main/java/org/aoju/bus/core/map/CamelCaseLinkedMap.java index cadc1346b0..a2544da7b6 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/map/CamelCaseLinkedMap.java +++ b/bus-core/src/main/java/org/aoju/bus/core/map/CamelCaseLinkedMap.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.map; @@ -34,7 +35,7 @@ * @param 键类型 * @param 值类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CamelCaseLinkedMap extends CamelCaseMap { diff --git a/bus-core/src/main/java/org/aoju/bus/core/map/CamelCaseMap.java b/bus-core/src/main/java/org/aoju/bus/core/map/CamelCaseMap.java index 5aca8c952d..349c00c992 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/map/CamelCaseMap.java +++ b/bus-core/src/main/java/org/aoju/bus/core/map/CamelCaseMap.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.map; @@ -36,7 +37,7 @@ * @param 键类型 * @param 值类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CamelCaseMap extends CustomKeyMap { diff --git a/bus-core/src/main/java/org/aoju/bus/core/map/CaseInsensitiveLinkedMap.java b/bus-core/src/main/java/org/aoju/bus/core/map/CaseInsensitiveLinkedMap.java index b578d420a5..3a9af4ed05 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/map/CaseInsensitiveLinkedMap.java +++ b/bus-core/src/main/java/org/aoju/bus/core/map/CaseInsensitiveLinkedMap.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.map; @@ -34,7 +35,7 @@ * @param 键类型 * @param 值类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CaseInsensitiveLinkedMap extends CaseInsensitiveMap { diff --git a/bus-core/src/main/java/org/aoju/bus/core/map/CaseInsensitiveMap.java b/bus-core/src/main/java/org/aoju/bus/core/map/CaseInsensitiveMap.java index 3aa57e15fb..e87326231d 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/map/CaseInsensitiveMap.java +++ b/bus-core/src/main/java/org/aoju/bus/core/map/CaseInsensitiveMap.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.map; @@ -34,7 +35,7 @@ * @param 键类型 * @param 值类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CaseInsensitiveMap extends CustomKeyMap { diff --git a/bus-core/src/main/java/org/aoju/bus/core/map/CustomKeyMap.java b/bus-core/src/main/java/org/aoju/bus/core/map/CustomKeyMap.java index 5f39f083b3..d15af76f37 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/map/CustomKeyMap.java +++ b/bus-core/src/main/java/org/aoju/bus/core/map/CustomKeyMap.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.map; @@ -32,7 +33,7 @@ * @param 键类型 * @param 值类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class CustomKeyMap extends MapWrapper { @@ -67,6 +68,26 @@ public boolean containsKey(Object key) { return super.containsKey(customKey(key)); } + @Override + public V remove(Object key) { + return super.remove(customKey(key)); + } + + @Override + public boolean remove(Object key, Object value) { + return super.remove(customKey(key), value); + } + + @Override + public boolean replace(K key, V oldValue, V newValue) { + return super.replace((K) customKey(key), oldValue, newValue); + } + + @Override + public V replace(K key, V value) { + return super.replace((K) customKey(key), value); + } + /** * 自定义键 * diff --git a/bus-core/src/main/java/org/aoju/bus/core/map/FixedLinkedHashMap.java b/bus-core/src/main/java/org/aoju/bus/core/map/FixedLinkedHashMap.java index 3691d8f485..b573066c09 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/map/FixedLinkedHashMap.java +++ b/bus-core/src/main/java/org/aoju/bus/core/map/FixedLinkedHashMap.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.map; @@ -32,7 +33,7 @@ * @param 键类型 * @param 值类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FixedLinkedHashMap extends LinkedHashMap { diff --git a/bus-core/src/main/java/org/aoju/bus/core/map/MapBuilder.java b/bus-core/src/main/java/org/aoju/bus/core/map/MapBuilder.java index c5ebdb6e7b..d7f1fca95e 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/map/MapBuilder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/map/MapBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.map; @@ -35,7 +36,7 @@ * @param Key类型 * @param Value类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MapBuilder implements Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/map/MapProxy.java b/bus-core/src/main/java/org/aoju/bus/core/map/MapProxy.java index c413f0e35a..b94ae38c60 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/map/MapProxy.java +++ b/bus-core/src/main/java/org/aoju/bus/core/map/MapProxy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.map; @@ -44,7 +45,7 @@ * Map代理,提供各种getXXX方法,并提供默认值支持 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MapProxy implements Map, OptNullObject, InvocationHandler, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/map/MapWrapper.java b/bus-core/src/main/java/org/aoju/bus/core/map/MapWrapper.java index 871d142144..9a7c50cd59 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/map/MapWrapper.java +++ b/bus-core/src/main/java/org/aoju/bus/core/map/MapWrapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.map; @@ -36,7 +37,7 @@ * @param 键类型 * @param 值类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MapWrapper implements Map, Iterable>, Serializable, Cloneable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/map/TableMap.java b/bus-core/src/main/java/org/aoju/bus/core/map/TableMap.java index 1a96e98cf9..62f65ee5ac 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/map/TableMap.java +++ b/bus-core/src/main/java/org/aoju/bus/core/map/TableMap.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.map; @@ -36,7 +37,7 @@ * @param 键类型 * @param 值类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TableMap implements Map, Iterable>, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/map/TolerantMap.java b/bus-core/src/main/java/org/aoju/bus/core/map/TolerantMap.java index f3b2a90f32..1e35cc6625 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/map/TolerantMap.java +++ b/bus-core/src/main/java/org/aoju/bus/core/map/TolerantMap.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.map; @@ -32,7 +33,7 @@ * 提供默认值的Map * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TolerantMap extends MapWrapper { diff --git a/bus-core/src/main/java/org/aoju/bus/core/map/multi/CollectionValueMap.java b/bus-core/src/main/java/org/aoju/bus/core/map/multi/CollectionValueMap.java index b9ebd47c41..837c81245c 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/map/multi/CollectionValueMap.java +++ b/bus-core/src/main/java/org/aoju/bus/core/map/multi/CollectionValueMap.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.map.multi; @@ -37,7 +38,7 @@ * @param 键类型 * @param 值类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class CollectionValueMap extends MapWrapper> { diff --git a/bus-core/src/main/java/org/aoju/bus/core/map/multi/ListValueMap.java b/bus-core/src/main/java/org/aoju/bus/core/map/multi/ListValueMap.java index ee8e6d4868..b1e1a7d809 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/map/multi/ListValueMap.java +++ b/bus-core/src/main/java/org/aoju/bus/core/map/multi/ListValueMap.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.map.multi; @@ -32,7 +33,7 @@ * @param 键类型 * @param 值类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ListValueMap extends CollectionValueMap { diff --git a/bus-core/src/main/java/org/aoju/bus/core/map/multi/SetValueMap.java b/bus-core/src/main/java/org/aoju/bus/core/map/multi/SetValueMap.java index 865e5abeac..03b5672f0d 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/map/multi/SetValueMap.java +++ b/bus-core/src/main/java/org/aoju/bus/core/map/multi/SetValueMap.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.map.multi; @@ -32,7 +33,7 @@ * @param 键类型 * @param 值类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SetValueMap extends CollectionValueMap { diff --git a/bus-core/src/main/java/org/aoju/bus/core/math/Arrangement.java b/bus-core/src/main/java/org/aoju/bus/core/math/Arrangement.java index 4f290bfe1b..4f4e5fd217 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/math/Arrangement.java +++ b/bus-core/src/main/java/org/aoju/bus/core/math/Arrangement.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.math; @@ -35,7 +36,7 @@ * 排列组合相关类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Arrangement { diff --git a/bus-core/src/main/java/org/aoju/bus/core/math/Calculator.java b/bus-core/src/main/java/org/aoju/bus/core/math/Calculator.java index c62a5529d0..e59418519c 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/math/Calculator.java +++ b/bus-core/src/main/java/org/aoju/bus/core/math/Calculator.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.math; @@ -36,7 +37,7 @@ * 数学表达式计算 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Calculator { @@ -93,7 +94,7 @@ private static String transform(String expression) { } } } - if (arr[0] == Symbol.C_TILDE || arr[1] == Symbol.C_PARENTHESE_LEFT) { + if (arr[0] == Symbol.C_TILDE || (arr.length > 1 && arr[1] == Symbol.C_PARENTHESE_LEFT)) { arr[0] = Symbol.C_HYPHEN; return Symbol.ZERO + new String(arr); } else { diff --git a/bus-core/src/main/java/org/aoju/bus/core/math/Combination.java b/bus-core/src/main/java/org/aoju/bus/core/math/Combination.java index 9efd7c3ec8..ac8bbeb4ce 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/math/Combination.java +++ b/bus-core/src/main/java/org/aoju/bus/core/math/Combination.java @@ -21,10 +21,12 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.math; import org.aoju.bus.core.toolkit.MathKit; +import org.aoju.bus.core.toolkit.StringKit; import java.util.ArrayList; import java.util.Arrays; @@ -35,7 +37,7 @@ * 排列组合相关类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Combination { @@ -76,11 +78,10 @@ public static long count(int n, int m) { * @return 组合数 */ public static long countAll(int n) { - long total = 0; - for (int i = 1; i <= n; i++) { - total += count(n, i); + if (n < 0 || n > 63) { + throw new IllegalArgumentException(StringKit.format("countAll must have n >= 0 and n <= 63, but got n={}", n)); } - return total; + return n == 63 ? Long.MAX_VALUE : (1L << n) - 1; } /** diff --git a/bus-core/src/main/java/org/aoju/bus/core/math/Money.java b/bus-core/src/main/java/org/aoju/bus/core/math/Money.java index 554e2889e5..401cae2ca0 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/math/Money.java +++ b/bus-core/src/main/java/org/aoju/bus/core/math/Money.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.math; @@ -60,7 +61,7 @@ * * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Money implements Serializable, Comparable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/swing/ClipboardListener.java b/bus-core/src/main/java/org/aoju/bus/core/swing/ClipboardListener.java index 8474cedd70..3baf5b1a2c 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/swing/ClipboardListener.java +++ b/bus-core/src/main/java/org/aoju/bus/core/swing/ClipboardListener.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.swing; @@ -32,7 +33,7 @@ * 用户通过实现此接口,实现监听剪贴板内容变化 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface ClipboardListener { diff --git a/bus-core/src/main/java/org/aoju/bus/core/swing/ClipboardMonitor.java b/bus-core/src/main/java/org/aoju/bus/core/swing/ClipboardMonitor.java index d73599dbf9..e9864297af 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/swing/ClipboardMonitor.java +++ b/bus-core/src/main/java/org/aoju/bus/core/swing/ClipboardMonitor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.swing; @@ -39,7 +40,7 @@ * 剪贴板监听 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum ClipboardMonitor implements ClipboardOwner, Runnable, Closeable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/swing/ImageSelection.java b/bus-core/src/main/java/org/aoju/bus/core/swing/ImageSelection.java index 52674751f4..a742b0bd7f 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/swing/ImageSelection.java +++ b/bus-core/src/main/java/org/aoju/bus/core/swing/ImageSelection.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.swing; @@ -36,7 +37,7 @@ * 此对象也用于将图像文件和{@link DataFlavor#imageFlavor} 元信息对应 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ImageSelection implements Transferable, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/swing/StringListener.java b/bus-core/src/main/java/org/aoju/bus/core/swing/StringListener.java index ceeda234cc..c1e2b9cb01 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/swing/StringListener.java +++ b/bus-core/src/main/java/org/aoju/bus/core/swing/StringListener.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.swing; @@ -35,7 +36,7 @@ * 剪贴板字符串内容监听 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class StringListener implements ClipboardListener, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/Builders.java b/bus-core/src/main/java/org/aoju/bus/core/text/Builders.java index 9bbc480143..0ea6dcdb25 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/Builders.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/Builders.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.text; @@ -40,16 +41,17 @@ * 提供比StringBuffer更灵活和更强大的API. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Builders implements CharSequence, Appendable, Serializable, Builder { + private static final long serialVersionUID = 1L; + /** * 默认容量 */ - static final int CAPACITY = 32; - private static final long serialVersionUID = 1L; + private static final int CAPACITY = 16; /** * 存放的字符数组 */ @@ -66,14 +68,6 @@ public class Builders implements CharSequence, Appendable, Serializable, Builder * null字符串 */ private String nullText; - /** - * 存放的字符数组 - */ - private char[] value; - /** - * 当前指针位置,或者叫做已经加入的字符数,此位置总在最后一个字符之后 - */ - private int position; /** * 构造 @@ -92,7 +86,7 @@ public Builders(int initialCapacity) { if (initialCapacity <= 0) { initialCapacity = CAPACITY; } - buffer = new char[initialCapacity]; + this.buffer = new char[initialCapacity]; } /** @@ -103,9 +97,9 @@ public Builders(int initialCapacity) { public Builders(final String str) { super(); if (str == null) { - buffer = new char[CAPACITY]; + this.buffer = new char[CAPACITY]; } else { - buffer = new char[str.length() + CAPACITY]; + this.buffer = new char[str.length() + CAPACITY]; append(str); } } @@ -160,26 +154,26 @@ public static Builders create(CharSequence... strs) { */ private static int totalLength(CharSequence... strs) { int totalLength = 0; - for (int i = 0; i < strs.length; i++) { - totalLength += (null == strs[i] ? 4 : strs[i].length()); + for (CharSequence str : strs) { + totalLength += (null == str ? 4 : str.length()); } return totalLength; } @Override public int length() { - return size; + return this.size; } @Override public char charAt(int index) { if (index < 0) { - index = this.position + index; + index = this.size + index; } - if ((index < 0) || (index > this.position)) { + if ((index < 0) || (index > this.size)) { throw new StringIndexOutOfBoundsException(index); } - return this.value[index]; + return this.buffer[index]; } public String getNewLineText() { @@ -214,15 +208,15 @@ public Builders setLength(final int length) { if (length < 0) { throw new StringIndexOutOfBoundsException(length); } - if (length < size) { - size = length; - } else if (length > size) { + if (length < this.size) { + this.size = length; + } else if (length > this.size) { ensureCapacity(length); - final int oldEnd = size; + final int oldEnd = this.size; final int newEnd = length; - size = length; + this.size = length; for (int i = oldEnd; i < newEnd; i++) { - buffer[i] = '\0'; + this.buffer[i] = '\0'; } } return this; @@ -247,26 +241,16 @@ public Builders ensureCapacity(final int capacity) { return this; } - public Builders minimizeCapacity() { - if (buffer.length > length()) { - final char[] old = buffer; - buffer = new char[length()]; - System.arraycopy(old, 0, buffer, 0, size); - } - return this; - } - public int size() { - return size; + return this.size; } public boolean isEmpty() { - return size == 0; + return this.size == 0; } public Builders clear() { - size = 0; - return this; + return reset(); } /** @@ -275,7 +259,7 @@ public Builders clear() { * @return this */ public Builders reset() { - this.position = 0; + this.size = 0; return this; } @@ -2306,6 +2290,23 @@ public String toString() { return new String(buffer, 0, size); } + /** + * 生成字符串 + * + * @param isReset 是否重置,重置后相当于空的构建器 + * @return 生成的字符串 + */ + public String toString(boolean isReset) { + if (this.size > 0) { + final String s = new String(this.buffer, 0, this.size); + if (isReset) { + reset(); + } + return s; + } + return Normal.EMPTY; + } + /** * 获取字符串生成器的StringBuffer版本,在每次调用该方法时创建一个新实例 * diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/Lookups.java b/bus-core/src/main/java/org/aoju/bus/core/text/Lookups.java index 250ba40f32..68ff9f0800 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/Lookups.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/Lookups.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.text; @@ -32,7 +33,7 @@ * 查找字符串值的字符串键. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class Lookups { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/Matchers.java b/bus-core/src/main/java/org/aoju/bus/core/text/Matchers.java index c30f9b7d55..95186fa37e 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/Matchers.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/Matchers.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.text; @@ -35,7 +36,7 @@ * 如果这些还不够,您可以子类化并实现自己的匹配器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class Matchers { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/Replacers.java b/bus-core/src/main/java/org/aoju/bus/core/text/Replacers.java index 812f2ec49b..3387c4abaf 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/Replacers.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/Replacers.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.text; @@ -33,7 +34,7 @@ * 按值替换字符串中的变量. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Replacers { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/Similarity.java b/bus-core/src/main/java/org/aoju/bus/core/text/Similarity.java index 8bb95e8ed2..9d4300f8bb 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/Similarity.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/Similarity.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.text; @@ -38,7 +39,7 @@ * 在hash之后,仍然能保持这种相似性,就称之为局部敏感hash * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Similarity { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvConfig.java b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvConfig.java index 11112bb18a..dda6635a63 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvConfig.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvConfig.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.text.csv; @@ -32,7 +33,7 @@ * CSV基础配置项 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CsvConfig implements Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvData.java b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvData.java index c676ae671a..ab7839571d 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvData.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvData.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.text.csv; @@ -31,7 +32,7 @@ * CSV数据,包括头部信息和行数据,参考:FastCSV * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class CsvData { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvHandler.java b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvHandler.java index 35d961fa78..9356c1b481 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvHandler.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.text.csv; @@ -28,7 +29,7 @@ * CSV的行处理器,实现此接口用于按照行处理数据 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @FunctionalInterface diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvParser.java b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvParser.java index 5ecc268d11..46aaa82d25 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvParser.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvParser.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.text.csv; @@ -40,7 +41,7 @@ * CSV行解析器,参考:FastCSV * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class CsvParser implements Closeable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvReadConfig.java b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvReadConfig.java index 7f797ac00b..0598c625ec 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvReadConfig.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvReadConfig.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.text.csv; @@ -30,7 +31,7 @@ * CSV读取配置项 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CsvReadConfig extends CsvConfig implements Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvReader.java b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvReader.java index 594084e00a..0fdf63b8f2 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvReader.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvReader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.text.csv; @@ -45,7 +46,7 @@ * CSV文件读取器,参考:FastCSV * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class CsvReader { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvRow.java b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvRow.java index ddd32eb141..63f5bad1c9 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvRow.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvRow.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.text.csv; @@ -33,7 +34,7 @@ * CSV中一行的表示 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class CsvRow implements List { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvWriteConfig.java b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvWriteConfig.java index 90d5edf6d1..73c7f206b4 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvWriteConfig.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvWriteConfig.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.text.csv; @@ -32,7 +33,7 @@ * CSV写出配置项 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CsvWriteConfig extends CsvConfig implements Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvWriter.java b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvWriter.java index 5d5f1c9879..c31d83bac7 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvWriter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvWriter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.text.csv; @@ -36,7 +37,7 @@ * CSV数据写出器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class CsvWriter implements Closeable, Flushable { @@ -260,8 +261,8 @@ private void appendLine(final String... fields) throws InstrumentException { */ private void doAppendLine(final String... fields) throws IOException { if (null != fields) { - for (int i = 0; i < fields.length; i++) { - appendField(fields[i]); + for (String field : fields) { + appendField(field); } writer.write(config.lineDelimiter); newline = true; diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/escape/EscapeCodeValues.java b/bus-core/src/main/java/org/aoju/bus/core/text/escape/EscapeCodeValues.java index b676364c7c..24da269d00 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/escape/EscapeCodeValues.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/escape/EscapeCodeValues.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.text.escape; @@ -42,7 +43,7 @@ * ESCAPE信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class EscapeCodeValues { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/escape/JavaUnicodeEscaper.java b/bus-core/src/main/java/org/aoju/bus/core/text/escape/JavaUnicodeEscaper.java index 9e89f030d1..dc480097f2 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/escape/JavaUnicodeEscaper.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/escape/JavaUnicodeEscaper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.text.escape; @@ -28,7 +29,7 @@ * Translates codepoints to their Unicode escaped value suitable for Java source. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JavaUnicodeEscaper extends UnicodeEscaper { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/escape/NumericEscaper.java b/bus-core/src/main/java/org/aoju/bus/core/text/escape/NumericEscaper.java index 604a22a174..4c9d0b7397 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/escape/NumericEscaper.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/escape/NumericEscaper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.text.escape; @@ -36,7 +37,7 @@ * Translates codepoints to their XML numeric entity escaped value. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NumericEscaper extends CodePointTranslator { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/escape/NumericUnescaper.java b/bus-core/src/main/java/org/aoju/bus/core/text/escape/NumericUnescaper.java index f89745c200..42af36378c 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/escape/NumericUnescaper.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/escape/NumericUnescaper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.text.escape; @@ -39,7 +40,7 @@ * Note that the semi-colon is optional. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NumericUnescaper extends CharSequenceTranslator { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/escape/OctalUnescaper.java b/bus-core/src/main/java/org/aoju/bus/core/text/escape/OctalUnescaper.java index 6d4d4bfcef..0f61010ee8 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/escape/OctalUnescaper.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/escape/OctalUnescaper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.text.escape; @@ -39,7 +40,7 @@ * 1 to 377. This is because parsing Java is the main use case. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class OctalUnescaper extends CharSequenceTranslator { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/escape/UnicodeEscaper.java b/bus-core/src/main/java/org/aoju/bus/core/text/escape/UnicodeEscaper.java index 9892e72014..4b54377213 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/escape/UnicodeEscaper.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/escape/UnicodeEscaper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.text.escape; @@ -34,7 +35,7 @@ * Translates codepoints to their Unicode escaped value. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class UnicodeEscaper extends CodePointTranslator { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/escape/UnicodeUnescaper.java b/bus-core/src/main/java/org/aoju/bus/core/text/escape/UnicodeUnescaper.java index 4d157cdbd8..d2417ddca2 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/escape/UnicodeUnescaper.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/escape/UnicodeUnescaper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.text.escape; @@ -36,7 +37,7 @@ * without the +. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class UnicodeUnescaper extends CharSequenceTranslator { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/escape/UnicodeUnpaired.java b/bus-core/src/main/java/org/aoju/bus/core/text/escape/UnicodeUnpaired.java index 5e68ae8d0a..96f9bbca4a 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/escape/UnicodeUnpaired.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/escape/UnicodeUnpaired.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.text.escape; @@ -32,7 +33,7 @@ * Helper subclass to CharSequenceTranslator to remove unpaired surrogates. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class UnicodeUnpaired extends CodePointTranslator { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/translate/AggregateTranslator.java b/bus-core/src/main/java/org/aoju/bus/core/text/translate/AggregateTranslator.java index aa66319a07..f2a51e0227 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/translate/AggregateTranslator.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/translate/AggregateTranslator.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.text.translate; @@ -34,7 +35,7 @@ * 第一个转换器使用输入中的代码点. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AggregateTranslator extends CharSequenceTranslator { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/translate/CharSequenceTranslator.java b/bus-core/src/main/java/org/aoju/bus/core/text/translate/CharSequenceTranslator.java index 6ddcae1d40..e134a1da2b 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/translate/CharSequenceTranslator.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/translate/CharSequenceTranslator.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.text.translate; @@ -34,7 +35,7 @@ * 其核心用途是转义和反转义文本 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class CharSequenceTranslator { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/translate/CodePointTranslator.java b/bus-core/src/main/java/org/aoju/bus/core/text/translate/CodePointTranslator.java index 0683f56f74..cdff3782ac 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/translate/CodePointTranslator.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/translate/CodePointTranslator.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.text.translate; @@ -32,7 +33,7 @@ * 以支持翻译一次最多替换一个字符. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class CodePointTranslator extends CharSequenceTranslator { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/translate/LookupTranslator.java b/bus-core/src/main/java/org/aoju/bus/core/text/translate/LookupTranslator.java index a899c5a7d9..f105bc5bc7 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/translate/LookupTranslator.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/translate/LookupTranslator.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.text.translate; @@ -36,7 +37,7 @@ * 使用查找表转换值. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class LookupTranslator extends CharSequenceTranslator { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/translate/SinglePassTranslator.java b/bus-core/src/main/java/org/aoju/bus/core/text/translate/SinglePassTranslator.java index ede5484c7a..18b3ebdb51 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/translate/SinglePassTranslator.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/translate/SinglePassTranslator.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.text.translate; @@ -32,7 +33,7 @@ * 处理初始索引检查和返回代码点的计数. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ abstract class SinglePassTranslator extends CharSequenceTranslator { diff --git a/bus-core/src/main/java/org/aoju/bus/core/thread/AtomicNoLock.java b/bus-core/src/main/java/org/aoju/bus/core/thread/AtomicNoLock.java index 0a730e45cf..c99bdf9551 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/thread/AtomicNoLock.java +++ b/bus-core/src/main/java/org/aoju/bus/core/thread/AtomicNoLock.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.thread; @@ -32,7 +33,7 @@ * 无锁实现 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AtomicNoLock implements Lock { diff --git a/bus-core/src/main/java/org/aoju/bus/core/thread/DelegatedService.java b/bus-core/src/main/java/org/aoju/bus/core/thread/DelegatedService.java index 404b3e6be1..63fce3323e 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/thread/DelegatedService.java +++ b/bus-core/src/main/java/org/aoju/bus/core/thread/DelegatedService.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.thread; @@ -33,7 +34,7 @@ * ExecutorService 代理 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DelegatedService extends AbstractExecutorService { diff --git a/bus-core/src/main/java/org/aoju/bus/core/thread/ExecutorBuilder.java b/bus-core/src/main/java/org/aoju/bus/core/thread/ExecutorBuilder.java index 28fcb63ad5..bda7e4d608 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/thread/ExecutorBuilder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/thread/ExecutorBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.thread; @@ -40,7 +41,7 @@ * * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ExecutorBuilder implements Builder { diff --git a/bus-core/src/main/java/org/aoju/bus/core/thread/ExecutorService.java b/bus-core/src/main/java/org/aoju/bus/core/thread/ExecutorService.java index 8b6fe194f3..383c75c8b5 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/thread/ExecutorService.java +++ b/bus-core/src/main/java/org/aoju/bus/core/thread/ExecutorService.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.thread; @@ -28,7 +29,7 @@ * 保证ExecutorService在对象回收时正常结束 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ExecutorService extends DelegatedService { diff --git a/bus-core/src/main/java/org/aoju/bus/core/thread/GlobalThread.java b/bus-core/src/main/java/org/aoju/bus/core/thread/GlobalThread.java index 21cab96cf9..74e588c1f2 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/thread/GlobalThread.java +++ b/bus-core/src/main/java/org/aoju/bus/core/thread/GlobalThread.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.thread; @@ -34,7 +35,7 @@ * 全局公共线程池 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class GlobalThread { diff --git a/bus-core/src/main/java/org/aoju/bus/core/thread/NamedThread.java b/bus-core/src/main/java/org/aoju/bus/core/thread/NamedThread.java index b3767bc4fe..8710533f73 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/thread/NamedThread.java +++ b/bus-core/src/main/java/org/aoju/bus/core/thread/NamedThread.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.thread; @@ -30,7 +31,7 @@ * * @param 值类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NamedThread extends InheritableThreadLocal { diff --git a/bus-core/src/main/java/org/aoju/bus/core/thread/NamedThreadFactory.java b/bus-core/src/main/java/org/aoju/bus/core/thread/NamedThreadFactory.java index 1cea994306..609d776f18 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/thread/NamedThreadFactory.java +++ b/bus-core/src/main/java/org/aoju/bus/core/thread/NamedThreadFactory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.thread; @@ -40,7 +41,7 @@ * * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NamedThreadFactory implements ThreadFactory { diff --git a/bus-core/src/main/java/org/aoju/bus/core/thread/NamedThreadLocal.java b/bus-core/src/main/java/org/aoju/bus/core/thread/NamedThreadLocal.java index 20abc8c4c0..62f52ab650 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/thread/NamedThreadLocal.java +++ b/bus-core/src/main/java/org/aoju/bus/core/thread/NamedThreadLocal.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.thread; @@ -30,7 +31,7 @@ * * @param 值类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NamedThreadLocal extends ThreadLocal { diff --git a/bus-core/src/main/java/org/aoju/bus/core/thread/RejectPolicy.java b/bus-core/src/main/java/org/aoju/bus/core/thread/RejectPolicy.java index 70ab1a8e50..84dad71f21 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/thread/RejectPolicy.java +++ b/bus-core/src/main/java/org/aoju/bus/core/thread/RejectPolicy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.thread; @@ -36,7 +37,7 @@ * 此枚举为JDK预定义的几种策略枚举表示 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum RejectPolicy { diff --git a/bus-core/src/main/java/org/aoju/bus/core/thread/Semaphore.java b/bus-core/src/main/java/org/aoju/bus/core/thread/Semaphore.java index 8310e3a938..efb09c03f2 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/thread/Semaphore.java +++ b/bus-core/src/main/java/org/aoju/bus/core/thread/Semaphore.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.thread; @@ -34,7 +35,7 @@ *

* * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Semaphore implements Runnable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/thread/SyncFinisher.java b/bus-core/src/main/java/org/aoju/bus/core/thread/SyncFinisher.java index acddd02d71..c1133b0ea4 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/thread/SyncFinisher.java +++ b/bus-core/src/main/java/org/aoju/bus/core/thread/SyncFinisher.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.thread; @@ -39,7 +40,7 @@ * 不能保证同时开始 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SyncFinisher { diff --git a/bus-core/src/main/java/org/aoju/bus/core/thread/ThreadBuilder.java b/bus-core/src/main/java/org/aoju/bus/core/thread/ThreadBuilder.java index f1c3629111..915adb775c 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/thread/ThreadBuilder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/thread/ThreadBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.thread; @@ -36,7 +37,7 @@ * ThreadFactory创建器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ThreadBuilder implements Builder { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/$.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/$.java index 23b676cc55..6a3364958f 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/$.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/$.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -31,7 +32,7 @@ * 工具包集合,工具类快捷方式 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class $ { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/AnnoKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/AnnoKit.java index 1f586eb387..b8f9362fcc 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/AnnoKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/AnnoKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -38,7 +39,7 @@ * 快速获取注解对象、注解值等工具封装 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AnnoKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/ArrayKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/ArrayKit.java index be32235e03..fa79cf7059 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/ArrayKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/ArrayKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -41,7 +42,7 @@ * 数组工具类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ArrayKit { @@ -8783,6 +8784,40 @@ public static boolean containsIgnoreCase(CharSequence[] array, CharSequence valu return indexOfIgnoreCase(array, value) > INDEX_NOT_FOUND; } + /** + * 数组中是否包含指定元素中的任意一个 + * + * @param 数组元素类型 + * @param array 数组 + * @param values 被检查的多个元素 + * @return 是否包含指定元素中的任意一个 + */ + public static boolean containsAny(T[] array, T... values) { + for (T value : values) { + if (contains(array, value)) { + return true; + } + } + return false; + } + + /** + * 数组中是否包含指定元素中的全部 + * + * @param 数组元素类型 + * @param array 数组 + * @param values 被检查的多个元素 + * @return 是否包含指定元素中的全部 + */ + public static boolean containsAll(T[] array, T... values) { + for (T value : values) { + if (false == contains(array, value)) { + return false; + } + } + return true; + } + /** * 返回指定数组的长度 * @@ -8908,4 +8943,94 @@ public static boolean equals(Object array1, Object array2) { } } + /** + * 查找子数组的位置 + * + * @param array 数组 + * @param subArray 子数组 + * @param 数组元素类型 + * @return 子数组的开始位置,即子数字第一个元素在数组中的位置 + */ + public static boolean isSub(T[] array, T[] subArray) { + return indexOfSub(array, subArray) > INDEX_NOT_FOUND; + } + + /** + * 查找子数组的位置 + * + * @param array 数组 + * @param subArray 子数组 + * @param 数组元素类型 + * @return 子数组的开始位置,即子数字第一个元素在数组中的位置 + */ + public static int indexOfSub(T[] array, T[] subArray) { + if (isEmpty(array) || isEmpty(subArray) || subArray.length > array.length) { + return INDEX_NOT_FOUND; + } + int firstIndex = indexOf(array, subArray[0]); + if (firstIndex < 0 || firstIndex + subArray.length > array.length) { + return INDEX_NOT_FOUND; + } + + for (int i = 0; i < subArray.length; i++) { + if (false == ObjectKit.equal(array[i + firstIndex], subArray[i])) { + return INDEX_NOT_FOUND; + } + } + + return firstIndex; + } + + /** + * 查找最后一个子数组的开始位置 + * + * @param array 数组 + * @param subArray 子数组 + * @param 数组元素类型 + * @return 最后一个子数组的开始位置,即子数字第一个元素在数组中的位置 + */ + public static int lastIndexOfSub(T[] array, T[] subArray) { + if (isEmpty(array) || isEmpty(subArray) || subArray.length > array.length) { + return INDEX_NOT_FOUND; + } + + int firstIndex = lastIndexOf(array, subArray[0]); + if (firstIndex < 0 || firstIndex + subArray.length > array.length) { + return INDEX_NOT_FOUND; + } + + for (int i = 0; i < subArray.length; i++) { + if (false == ObjectKit.equal(array[i + firstIndex], subArray[i])) { + return INDEX_NOT_FOUND; + } + } + + return firstIndex; + } + + /** + * 获取数组长度 + * 如果参数为{@code null},返回0 + * + *
+     * ArrayUtil.length(null)            = 0
+     * ArrayUtil.length([])              = 0
+     * ArrayUtil.length([null])          = 1
+     * ArrayUtil.length([true, false])   = 2
+     * ArrayUtil.length([1, 2, 3])       = 3
+     * ArrayUtil.length(["a", "b", "c"]) = 3
+     * 
+ * + * @param array 数组对象 + * @return 数组长度 + * @throws IllegalArgumentException 如果参数不为数组,抛出此异常 + * @see Array#getLength(Object) + */ + public static int length(Object array) throws IllegalArgumentException { + if (null == array) { + return 0; + } + return Array.getLength(array); + } + } diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/BeanKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/BeanKit.java index f56569b977..ba56d0a5ad 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/BeanKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/BeanKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -41,13 +42,14 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.*; +import java.util.function.Consumer; /** * Bean工具类 * 把一个拥有对属性进行set和get方法的类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BeanKit { @@ -1047,6 +1049,16 @@ private static int modifiersToInt(BeanKit.ModifierType... modifierTypes) { return modifier; } + /** + * 遍历Bean的属性 + * + * @param clazz Bean类 + * @param action 每个元素的处理类 + */ + public static void forEach(Class clazz, Consumer action) { + getBeanDesc(clazz).getProps().forEach(action); + } + /** * 修饰符枚举 */ diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/BooleanKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/BooleanKit.java index 7804bf2d80..2f85c6b73a 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/BooleanKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/BooleanKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -31,7 +32,7 @@ * Boolean类型相关工具类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BooleanKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/BufferKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/BufferKit.java index 9a13c90fb0..e460fa3fbe 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/BufferKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/BufferKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -36,7 +37,7 @@ * ByteBuffer的相关介绍见:https://www.cnblogs.com/ruber/p/6857159.html * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BufferKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/ByteKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/ByteKit.java index da73721575..861150b634 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/ByteKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/ByteKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ByteKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/CallerKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/CallerKit.java index 152ecbea95..3539fc3a48 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/CallerKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/CallerKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -33,7 +34,7 @@ * 调用者 可以通过此类的方法获取调用者、多级调用者以及判断是否被调用 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CallerKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/CardKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/CardKit.java index 5e841740a7..48d642e584 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/CardKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/CardKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -34,7 +35,7 @@ * 银行卡工具类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CardKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/CertKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/CertKit.java new file mode 100644 index 0000000000..2559b5bb48 --- /dev/null +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/CertKit.java @@ -0,0 +1,95 @@ +/********************************************************************************* + * * + * The MIT License (MIT) * + * * + * Copyright (c) 2015-2020 aoju.org and other contributors. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy * + * of this software and associated documentation files (the "Software"), to deal * + * in the Software without restriction, including without limitation the rights * + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * + * THE SOFTWARE. * + * * + ********************************************************************************/ +package org.aoju.bus.core.toolkit; + +import javax.net.ssl.*; +import java.net.URL; +import java.security.SecureRandom; +import java.security.cert.Certificate; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; + +/** + * 获取ssl证书信息工具类 + * + * @author zhaocy + * @version 6.1.2 + * @since JDK 1.8+ + */ +public class CertKit { + + static TrustManager[] trustAllCerts = new TrustManager[]{new X509TrustManager() { + @Override + public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException { + } + + @Override + public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException { + } + + @Override + public X509Certificate[] getAcceptedIssuers() { + return null; + } + }}; + + /** + * @param httpsUrl https url + * @return x509Certificate 证书信息 + */ + public static X509Certificate getCertInfo(String httpsUrl) { + X509Certificate x509Certificate = null; + try { + HttpsURLConnection.setDefaultHostnameVerifier(new CertKit().new NullHostNameVerifier()); + SSLContext sslContext = SSLContext.getInstance("TLS"); + sslContext.init(null, trustAllCerts, new SecureRandom()); + HttpsURLConnection.setDefaultSSLSocketFactory(sslContext.getSocketFactory()); + URL url = new URL(httpsUrl); + HttpsURLConnection conn = (HttpsURLConnection) url.openConnection(); + conn.setRequestMethod("GET"); + conn.setRequestProperty("Content-Type", "application/json;charset=utf-8"); + conn.setConnectTimeout(3000); + conn.setReadTimeout(5000); + conn.connect(); + Certificate[] certificates = conn.getServerCertificates(); + //证书链第一个就是证书 + x509Certificate = (X509Certificate) certificates[0]; + conn.disconnect(); + return x509Certificate; + } catch (Exception e) { + e.printStackTrace(); + } + return x509Certificate; + } + + public class NullHostNameVerifier implements HostnameVerifier { + @Override + public boolean verify(String arg0, SSLSession arg1) { + return true; + } + } + +} diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/CharKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/CharKit.java index 0675a6bea9..5358fe8884 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/CharKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/CharKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -35,7 +36,7 @@ * 部分工具来自于Apache * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CharKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/CitizenIdKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/CitizenIdKit.java index 2625ca8f44..6d50c9a5b0 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/CitizenIdKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/CitizenIdKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -36,7 +37,7 @@ * 身份证相关工具类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CitizenIdKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/ClassKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/ClassKit.java index b89f97fb12..a3591e9f3b 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/ClassKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/ClassKit.java @@ -21,10 +21,12 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; import org.aoju.bus.core.beans.BeanDesc; +import org.aoju.bus.core.beans.WrapperBean; import org.aoju.bus.core.beans.copier.BeanCopier; import org.aoju.bus.core.beans.copier.CopyOptions; import org.aoju.bus.core.beans.copier.ValueProvider; @@ -51,7 +53,7 @@ * Class工具类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ClassKit { @@ -149,7 +151,13 @@ public static Class[] getClasses(Object... objects) { Object obj; for (int i = 0; i < objects.length; i++) { obj = objects[i]; - classes[i] = (null == obj) ? Object.class : obj.getClass(); + if (obj instanceof WrapperBean) { + classes[i] = ((WrapperBean) obj).getWrappedClass(); + } else if (null == obj) { + classes[i] = Object.class; + } else { + classes[i] = obj.getClass(); + } } return classes; } @@ -803,7 +811,7 @@ public static Class getTypeArgument(Class clazz, int index) { /** * 获得给定类所在包的名称 - * 例如:org.aoju.bus.core.utils + * 例如:org.aoju.bus.core.toolkit * * @param clazz 类 * @return 包名 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 index 7b65cc5d52..0d7ae4a0c5 100755 --- 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 @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -46,6 +47,7 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.LinkedBlockingDeque; +import java.util.function.BiFunction; import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; @@ -54,7 +56,7 @@ * 集合相关工具类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CollKit { @@ -1356,6 +1358,30 @@ public static List sub(Collection list, int start, int end, int step) return sub(new ArrayList<>(list), start, end, step); } + /** + * 对集合按照指定长度分段,每一个段为单独的集合,返回这个集合的列表 + * + * @param 集合元素类型 + * @param list 列表 + * @param size 每个段的长度 + * @return 分段列表 + */ + public static List> split(List list, int size) { + if (isEmpty(list)) { + return Collections.emptyList(); + } + + List> result = new ArrayList<>(list.size() / size + 1); + int offset = 0; + for (int toIdx = size; toIdx <= list.size(); offset = toIdx, toIdx += size) { + result.add(list.subList(offset, toIdx)); + } + if (offset < list.size()) { + result.add(list.subList(offset, list.size())); + } + return result; + } + /** * 对集合按照指定长度分段,每一个段为单独的集合,返回这个集合的列表 * @@ -1571,7 +1597,7 @@ public static List extract(Iterable collection, Editor editor * @param 结果类型 * @param collection 原集合 * @param func 编辑函数 - * @param ignoreNull 是否忽略空值 + * @param ignoreNull 是否忽略空值,这里的空值包括函数处理前和处理后的null值 * @return 抽取后的新列表 */ public static List map(Iterable collection, Function func, boolean ignoreNull) { @@ -1581,8 +1607,11 @@ public static List map(Iterable collection, Function T findOne(Iterable collection, Filter filter) { * @return 满足条件的第一个元素 */ public static T findOneByField(Iterable collection, final String fieldName, final Object fieldValue) { - return findOne(collection, new Filter() { - @Override - public boolean accept(T t) { - if (t instanceof Map) { - final Map map = (Map) t; - final Object value = map.get(fieldName); - return ObjectKit.equal(value, fieldValue); - } - - // 普通Bean - final Object value = ReflectKit.getFieldValue(t, fieldName); + return findOne(collection, t -> { + if (t instanceof Map) { + final Map map = (Map) t; + final Object value = map.get(fieldName); return ObjectKit.equal(value, fieldValue); } + + // 普通Bean + final Object value = ReflectKit.getFieldValue(t, fieldName); + return ObjectKit.equal(value, fieldValue); }); } @@ -3057,6 +3083,223 @@ public static List of(T... ts) { return Collections.unmodifiableList(unmodifiableList); } + /** + * 获取Collection或者iterator的大小,此方法可以处理的对象类型如下: + *
    + *
  • Collection - the collection size + *
  • Map - the map size + *
  • Array - the array size + *
  • Iterator - the number of elements remaining in the iterator + *
  • Enumeration - the number of elements remaining in the enumeration + *
+ * + * @param object 可以为空的对象 + * @return 如果object为空则返回0 + * @throws IllegalArgumentException 参数object不是Collection或者iterator + */ + public static int size(final Object object) { + if (object == null) { + return 0; + } + + int total = 0; + if (object instanceof Map) { + total = ((Map) object).size(); + } else if (object instanceof Collection) { + total = ((Collection) object).size(); + } else if (object instanceof Iterable) { + total = size(object); + } else if (object instanceof Iterator) { + total = size(object); + } else if (object instanceof Enumeration) { + final Enumeration it = (Enumeration) object; + while (it.hasMoreElements()) { + total++; + it.nextElement(); + } + } else if (ArrayKit.isArray(object)) { + total = ArrayKit.length(object); + } else { + throw new IllegalArgumentException("Unsupported object type: " + object.getClass().getName()); + } + return total; + } + + /** + * 将collection转化为类型不变的map + * {@code Collection ----> Map} + * + * @param collection 需要转化的集合 + * @param key E类型转化为T类型的lambda方法 + * @param collection中的泛型 + * @param map中的key类型 + * @return 转化后的map + */ + public static Map toIdentityMap(Collection collection, Function key) { + if (isEmpty(collection)) { + return Collections.emptyMap(); + } + return collection.stream().collect(Collectors.toMap(key, Function.identity())); + } + + /** + * 将Collection转化为map(value类型与collection的泛型不同) + * {@code Collection -----> Map } + * + * @param collection 需要转化的集合 + * @param key E类型转化为T类型的lambda方法 + * @param value E类型转化为U类型的lambda方法 + * @param collection中的泛型 + * @param map中的key类型 + * @param map中的value类型 + * @return 转化后的map + */ + public static Map toMap(Collection collection, Function key, Function value) { + if (isEmpty(collection)) { + return Collections.emptyMap(); + } + return collection.stream().collect(Collectors.toMap(key, value)); + } + + /** + * 将collection按照规则(比如有相同的班级id)分类成map + * {@code Collection -------> Map> } + * + * @param collection 需要分类的集合 + * @param key 分类的规则 + * @param collection中的泛型 + * @param map中的key类型 + * @return 分类后的map + */ + public static Map> groupByKey(Collection collection, Function key) { + if (isEmpty(collection)) { + return Collections.emptyMap(); + } + return collection + .stream() + .collect(Collectors.groupingBy(key, Collectors.toList())); + } + + /** + * 将collection按照两个规则(比如有相同的年级id,班级id)分类成双层map + * {@code Collection ---> Map>> } + * + * @param collection 需要分类的集合 + * @param key1 第一个分类的规则 + * @param key2 第二个分类的规则 + * @param 集合元素类型 + * @param 第一个map中的key类型 + * @param 第二个map中的key类型 + * @return 分类后的map + */ + public static Map>> groupBy2Key(Collection collection, Function key1, Function key2) { + if (isEmpty(collection)) { + return Collections.emptyMap(); + } + return collection + .stream() + .collect(Collectors.groupingBy(key1, Collectors.groupingBy(key2, Collectors.toList()))); + } + + /** + * 将collection按照两个规则(比如有相同的年级id,班级id)分类成双层map + * {@code Collection ---> Map> } + * + * @param collection 需要分类的集合 + * @param key1 第一个分类的规则 + * @param key2 第二个分类的规则 + * @param 第一个map中的key类型 + * @param 第二个map中的key类型 + * @param collection中的泛型 + * @return 分类后的map + */ + public static Map> group2Map(Collection collection, Function key1, Function key2) { + if (isEmpty(collection) || key1 == null || key2 == null) { + return Collections.emptyMap(); + } + return collection + .stream() + .collect(Collectors.groupingBy(key1, Collectors.toMap(key2, Function.identity()))); + } + + /** + * 将collection转化为List集合,但是两者的泛型不同 + * {@code Collection ------> List } + * + * @param collection 需要转化的集合 + * @param function collection中的泛型转化为list泛型的lambda表达式 + * @param collection中的泛型 + * @param List中的泛型 + * @return 转化后的list + */ + public static List toList(Collection collection, Function function) { + if (isEmpty(collection)) { + return Collections.emptyList(); + } + return collection + .stream() + .map(function) + .filter(Objects::nonNull) + .collect(Collectors.toList()); + } + + /** + * 将collection转化为Set集合,但是两者的泛型不同 + * {@code Collection ------> Set } + * + * @param collection 需要转化的集合 + * @param function collection中的泛型转化为set泛型的lambda表达式 + * @param collection中的泛型 + * @param Set中的泛型 + * @return 转化后的Set + */ + public static Set toSet(Collection collection, Function function) { + if (isEmpty(collection) || function == null) { + return Collections.emptySet(); + } + return collection + .stream() + .map(function) + .filter(Objects::nonNull) + .collect(Collectors.toSet()); + } + + + /** + * 合并两个相同key类型的map + * + * @param map1 第一个需要合并的 map + * @param map2 第二个需要合并的 map + * @param merge 合并的lambda,将key value1 value2合并成最终的类型,注意value可能为空的情况 + * @param map中的key类型 + * @param 第一个 map的value类型 + * @param 第二个 map的value类型 + * @param 最终map的value类型 + * @return 合并后的map + */ + public static Map merge(Map map1, Map map2, BiFunction merge) { + if (MapKit.isEmpty(map1) && MapKit.isEmpty(map2)) { + return Collections.emptyMap(); + } else if (MapKit.isEmpty(map1)) { + map1 = Collections.emptyMap(); + } else if (MapKit.isEmpty(map2)) { + map2 = Collections.emptyMap(); + } + Set key = new HashSet<>(); + key.addAll(map1.keySet()); + key.addAll(map2.keySet()); + Map map = new HashMap<>(); + for (K t : key) { + X x = map1.get(t); + Y y = map2.get(t); + V z = merge.apply(x, y); + if (z != null) { + map.put(t, z); + } + } + return map; + } + /** * 针对一个参数做相应的操作 * diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/CsvKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/CsvKit.java index 7e6589f359..5be0b0197c 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/CsvKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/CsvKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -37,7 +38,7 @@ * CSV工具 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CsvKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/DateKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/DateKit.java index fac54c57e7..1cbc7e0e68 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/DateKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/DateKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -52,7 +53,7 @@ * 时间工具类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DateKit extends GregorianCalendar { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/EnumKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/EnumKit.java index 89283d54bb..6fb7b8c0b5 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/EnumKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/EnumKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -33,7 +34,7 @@ * 枚举工具类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class EnumKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/EscapeKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/EscapeKit.java index a50db02dfe..911d919c6e 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/EscapeKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/EscapeKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -33,7 +34,7 @@ * Java, Java Script, HTML and XML. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class EscapeKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/FileKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/FileKit.java index 1ce77eb61a..c17d18b936 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/FileKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/FileKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -54,7 +55,7 @@ * 文件工具类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FileKit { @@ -196,6 +197,17 @@ public static boolean isDirectory(String path) { return (path != null) && file(path).isDirectory(); } + /** + * 判断是否为目录,如果file为null,则返回false + * 此方法不会追踪到软链对应的真实地址,即软链被当作文件 + * + * @param path {@link Path} + * @return 如果为目录true + */ + public static boolean isDirectory(Path path) { + return isDirectory(path, false); + } + /** * 判断是否为目录,如果file为null,则返回false * @@ -234,6 +246,53 @@ public static File file(String path) { return new File(getAbsolutePath(path)); } + /** + * 通过多层目录创建文件 + *

+ * 元素名(多层目录名) + * + * @param names 文件名 + * @return the file 文件 + */ + public static File file(String... names) { + if (ArrayKit.isEmpty(names)) { + return null; + } + + File file = null; + for (String name : names) { + if (file == null) { + file = file(name); + } else { + file = file(file, name); + } + } + return file; + } + + /** + * 创建File对象 + * + * @param uri 文件URI + * @return File + */ + public static File file(URI uri) { + if (uri == null) { + throw new NullPointerException("File uri is null!"); + } + return new File(uri); + } + + /** + * 创建File对象 + * + * @param url 文件URL + * @return File + */ + public static File file(URL url) { + return new File(UriKit.toURI(url)); + } + /** * 创建File对象 * 此方法会检查slip漏洞,漏洞说明见http://blog.nsfocus.net/zip-slip-2/ @@ -258,7 +317,7 @@ public static File file(File parent, String path) { if (StringKit.isBlank(path)) { throw new NullPointerException("File path is blank!"); } - return checkSlip(parent, new File(parent, path)); + return checkSlip(parent, buildFile(parent, path)); } /** @@ -270,7 +329,7 @@ public static File file(File parent, String path) { * @return the file 文件 */ public static File file(File directory, String... names) { - Assert.notNull(directory, "directorydirectory must not be null"); + Assert.notNull(directory, "Directory must not be null"); if (ArrayKit.isEmpty(names)) { return directory; } @@ -285,50 +344,23 @@ public static File file(File directory, String... names) { } /** - * 通过多层目录创建文件 - *

- * 元素名(多层目录名) - * - * @param names 文件名 - * @return the file 文件 - */ - public static File file(String... names) { - if (ArrayKit.isEmpty(names)) { - return null; - } - - File file = null; - for (String name : names) { - if (file == null) { - file = file(name); - } else { - file = file(file, name); - } - } - return file; - } - - /** - * 创建File对象 + * 递归遍历目录以及子目录中的所有文件 * - * @param uri 文件URI - * @return File + * @param path 当前遍历文件或目录的路径 + * @return 文件列表 */ - public static File file(URI uri) { - if (uri == null) { - throw new NullPointerException("File uri is null!"); - } - return new File(uri); + public static List loopFiles(String path) { + return loopFiles(file(path)); } /** - * 创建File对象 + * 递归遍历目录以及子目录中的所有文件 * - * @param url 文件URL - * @return File + * @param file 当前遍历文件 + * @return 文件列表 */ - public static File file(URL url) { - return new File(UriKit.toURI(url)); + public static List loopFiles(File file) { + return loopFiles(file, null); } /** @@ -352,7 +384,7 @@ public static List loopFiles(String path, FileFilter fileFilter) { * @return 文件列表 */ public static List loopFiles(File file, FileFilter fileFilter) { - List fileList = new ArrayList(); + List fileList = new ArrayList<>(); if (null == file) { return fileList; } else if (false == file.exists()) { @@ -379,62 +411,57 @@ public static List loopFiles(File file, FileFilter fileFilter) { * 递归遍历目录以及子目录中的所有文件 * 如果提供file为文件,直接返回过滤结果 * - * @param file 当前遍历文件或目录 + * @param path 当前遍历文件或目录 * @param maxDepth 遍历最大深度,-1表示遍历到没有目录为止 * @param fileFilter 文件过滤规则对象,选择要保留的文件,只对文件有效,不过滤目录,null表示接收全部文件 * @return 文件列表 */ - public static List loopFiles(File file, int maxDepth, final FileFilter fileFilter) { + public static List loopFiles(Path path, int maxDepth, final FileFilter fileFilter) { final List fileList = new ArrayList<>(); - if (null == file || false == file.exists()) { + + if (null == path || false == Files.exists(path)) { return fileList; - } else if (false == file.isDirectory()) { + } else if (false == isDirectory(path)) { + final File file = path.toFile(); if (null == fileFilter || fileFilter.accept(file)) { fileList.add(file); } return fileList; } - if (maxDepth < 0) { - maxDepth = Integer.MAX_VALUE; - } + loopFiles(path, maxDepth, new SimpleFileVisitor() { - try { - Files.walkFileTree(file.toPath(), EnumSet.noneOf(FileVisitOption.class), maxDepth, new SimpleFileVisitor() { - @Override - public FileVisitResult visitFile(Path path, BasicFileAttributes attrs) { - final File file = path.toFile(); - if (null == fileFilter || fileFilter.accept(file)) { - fileList.add(file); - } - return FileVisitResult.CONTINUE; + @Override + public FileVisitResult visitFile(Path path, BasicFileAttributes attrs) { + final File file = path.toFile(); + if (null == fileFilter || fileFilter.accept(file)) { + fileList.add(file); } - }); - } catch (IOException e) { - throw new InstrumentException(e); - } + return FileVisitResult.CONTINUE; + } + }); return fileList; } /** - * 递归遍历目录以及子目录中的所有文件 + * 遍历指定path下的文件并做处理 * - * @param path 当前遍历文件或目录的路径 - * @return 文件列表 + * @param start 起始路径,必须为目录 + * @param maxDepth 最大遍历深度,-1表示不限制深度 + * @param visitor {@link FileVisitor} 接口,用于自定义在访问文件时,访问目录前后等节点做的操作 + * @see Files#walkFileTree(Path, java.util.Set, int, FileVisitor) */ - public static List loopFiles(String path) { - return loopFiles(file(path)); - } + public static void loopFiles(Path start, int maxDepth, FileVisitor visitor) { + if (maxDepth < 0) { + maxDepth = Integer.MAX_VALUE; + } - /** - * 递归遍历目录以及子目录中的所有文件 - * - * @param file 当前遍历文件 - * @return 文件列表 - */ - public static List loopFiles(File file) { - return loopFiles(file, null); + try { + Files.walkFileTree(start, EnumSet.noneOf(FileVisitOption.class), maxDepth, visitor); + } catch (IOException e) { + throw new InstrumentException(e); + } } /** @@ -658,7 +685,7 @@ public static boolean delete(Path path) throws InstrumentException { } try { - if (Files.isDirectory(path)) { + if (isDirectory(path)) { Files.walkFileTree(path, new SimpleFileVisitor() { @Override @@ -821,7 +848,7 @@ public static File createTempFile(String prefix, String suffix, File dir, boolea */ public static File copyFile(String src, String dest, StandardCopyOption... options) throws InstrumentException { Assert.notBlank(src, "Source File path is blank !"); - Assert.notNull(src, "Destination File path is null !"); + Assert.notBlank(dest, "Destination File path is blank !"); return copyFile(Paths.get(src), Paths.get(dest), options).toFile(); } @@ -857,9 +884,9 @@ public static File copyFile(File src, File dest, StandardCopyOption... options) */ public static Path copyFile(Path src, Path dest, StandardCopyOption... options) throws InstrumentException { Assert.notNull(src, "Source File is null !"); - Assert.notNull(dest, "Destination File or directiory is null !"); + Assert.notNull(dest, "Dest File or directiory is null !"); - Path destPath = dest.toFile().isDirectory() ? dest.resolve(src.getFileName()) : dest; + Path destPath = isDirectory(dest) ? dest.resolve(src.getFileName()) : dest; try { return Files.copy(src, destPath, options); } catch (IOException e) { @@ -958,99 +985,99 @@ public static File copyContent(File src, File dest, boolean isOverride) throws I } /** - * 移动文件或者目录 + * 修改文件或目录的文件名,不变更路径,只是简单修改文件名,不保留扩展名 * - * @param src 源文件或者目录 - * @param dest 目标文件或者目录 - * @param isOverride 是否覆盖目标,只有目标为文件才覆盖 - * @throws InstrumentException 异常 + *

+     * FileKit.rename(file, "aaa.png", true) xx/xx.png =》xx/aaa.png
+     * 
+ * + * @param file 被修改的文件 + * @param newName 新的文件名,如需扩展名,需自行在此参数加上,原文件名的扩展名不会被保留 + * @param isOverride 是否覆盖目标文件 + * @return 目标文件 */ - public static void move(File src, File dest, boolean isOverride) throws InstrumentException { - // check - if (false == src.exists()) { - throw new InstrumentException("File not found: " + src); - } - - // 来源为文件夹,目标为文件 - if (src.isDirectory() && dest.isFile()) { - throw new InstrumentException(StringKit.format("Can not move directory [{}] to file [{}]", src, dest)); - } - - if (isOverride && dest.isFile()) {// 只有目标为文件的情况下覆盖之 - dest.delete(); - } - - // 来源为文件,目标为文件夹 - if (src.isFile() && dest.isDirectory()) { - dest = new File(dest, src.getName()); - } - - if (false == src.renameTo(dest)) { - // 在文件系统不同的情况下,renameTo会失败,此时使用copy,然后删除原文件 - try { - copy(src, dest, isOverride); - src.delete(); - } catch (Exception e) { - throw new InstrumentException(StringKit.format("Move [{}] to [{}] failed!", src, dest), e); - } - - } + public static File rename(File file, String newName, boolean isOverride) { + return rename(file, newName, false, isOverride); } /** * 修改文件或目录的文件名,不变更路径,只是简单修改文件名 - * 重命名有两种模式: - * isRetainExt为true时,保留原扩展名: * *
-     * FileKit.rename(file, "aaa", true) xx/xx.png = xx/aaa.png
+     * FileKit.rename(file, "aaa.jpg", false) xx/xx.png =》xx/aaa.jpg
      * 
* - *
-     * FileKit.rename(file, "aaa.jpg", false) xx/xx.png = xx/aaa.jpg
-     * 
- * - * @param file 被修改的文件 + * @param path 被修改的文件 * @param newName 新的文件名,包括扩展名 * @param isOverride 是否覆盖目标文件 - * @return 目标文件 + * @return 目标文件Path */ - public static File rename(File file, String newName, boolean isOverride) { - return rename(file, newName, false, isOverride); + public static Path rename(Path path, String newName, boolean isOverride) { + return move(path, path.resolveSibling(newName), isOverride); } /** - * 修改文件或目录的文件名,不变更路径,只是简单修改文件名 + * 修改文件或目录的文件名,不变更路径,只是简单修改文件名 * 重命名有两种模式: - * 1、isRetainExt为true时,保留原扩展名: + * 1、isRetainExt为true时,保留原扩展名: * *
-     *  rename(file, "aaa", true) xx/xx.png = xx/aaa.png
+     * FileKit.rename(file, "aaa", true) xx/xx.png =》xx/aaa.png
      * 
+ * *

- * 2、isRetainExt为false时,不保留原扩展名,需要在newName中 + * 2、isRetainExt为false时,不保留原扩展名,需要在newName中 * *

-     *  rename(file, "aaa.jpg", false) xx/xx.png = xx/aaa.jpg
+     * FileKit.rename(file, "aaa.jpg", false) xx/xx.png =》xx/aaa.jpg
      * 
* * @param file 被修改的文件 - * @param newName 新的文件名,包括扩展名 - * @param isRetainExt 是否保留原文件的扩展名,如果保留,则newName不需要加扩展名 + * @param newName 新的文件名,包括扩展名 + * @param isRetainExt 是否保留原文件的扩展名,如果保留,则newName不需要加扩展名 * @param isOverride 是否覆盖目标文件 * @return 目标文件 */ public static File rename(File file, String newName, boolean isRetainExt, boolean isOverride) { if (isRetainExt) { - final String extName = FileKit.extName(file); + final String extName = extName(file); if (StringKit.isNotBlank(extName)) { - newName = newName.concat(Symbol.DOT).concat(extName); + newName = newName.concat(".").concat(extName); } } - final Path path = file.toPath(); + return rename(file.toPath(), newName, isOverride).toFile(); + } + + /** + * 移动文件或者目录 + * + * @param src 源文件或者目录 + * @param target 目标文件或者目录 + * @param isOverride 是否覆盖目标,只有目标为文件才覆盖 + * @throws InstrumentException IO异常 + */ + public static void move(File src, File target, boolean isOverride) throws InstrumentException { + move(src.toPath(), target.toPath(), isOverride); + } + + /** + * 移动文件或目录 + * 当目标是目录时,会将源文件或文件夹整体移动至目标目录下 + * + * @param src 源文件或目录路径 + * @param target 目标路径,如果为目录,则移动到此目录下 + * @param isOverride 是否覆盖目标文件 + * @return 目标文件Path + */ + public static Path move(Path src, Path target, boolean isOverride) { + Assert.notNull(src, "Src path must be not null !"); + Assert.notNull(target, "Target path must be not null !"); final CopyOption[] options = isOverride ? new CopyOption[]{StandardCopyOption.REPLACE_EXISTING} : new CopyOption[]{}; + if (isDirectory(target)) { + target = target.resolve(src.getFileName()); + } try { - return Files.move(path, path.resolveSibling(newName), options).toFile(); + return Files.move(src, target, options); } catch (IOException e) { throw new InstrumentException(e); } @@ -1073,7 +1100,6 @@ public static String getCanonicalPath(File file) { } } - /** * 获取绝对路径,相对于ClassPath的目录 * 如果给定就是绝对路径,则返回原路径,原路径把所有\替换为/ @@ -1389,7 +1415,7 @@ public static Date lastModifiedTime(String path) { * @return 总大小, bytes长度 */ public static long size(File file) { - if (null == file || false == file.exists()) { + if (null == file || false == file.exists() || isSymlink(file)) { return 0; } @@ -1408,6 +1434,16 @@ public static long size(File file) { } } + /** + * 判断是否为符号链接文件 + * + * @param file 被检查的文件 + * @return 是否为符号链接文件 + */ + public static boolean isSymlink(File file) { + return Files.isSymbolicLink(file.toPath()); + } + /** * 比较两个文件内容是否相同 * 首先比较长度,长度一致再比较内容 @@ -3838,4 +3874,33 @@ public static Resource getResourceObj(String path) { return FileKit.isAbsolutePath(path) ? new FileResource(path) : new ClassPathResource(path); } + /** + * 根据压缩包中的路径构建目录结构,在Win下直接构建,在Linux下拆分路径单独构建 + * + * @param outFile 最外部路径 + * @param fileName 文件名,可以包含路径 + * @return 文件或目录 + */ + private static File buildFile(File outFile, String fileName) { + // 替换Windows路径分隔符为Linux路径分隔符,便于统一处理 + fileName = fileName.replace(Symbol.C_BACKSLASH, Symbol.C_SLASH); + if (false == isWindows() + // 检查文件名中是否包含"/",不考虑以"/"结尾的情况 + && fileName.lastIndexOf(Symbol.C_SLASH, fileName.length() - 2) > 0) { + // 在Linux下多层目录创建存在问题,/会被当成文件名的一部分,此处做处理 + // 使用/拆分路径(zip中无\),级联创建父目录 + final List pathParts = StringKit.split(fileName, Symbol.C_SLASH, false, true); + final int lastPartIndex = pathParts.size() - 1;//目录个数 + for (int i = 0; i < lastPartIndex; i++) { + //由于路径拆分,slip不检查,在最后一步检查 + outFile = new File(outFile, pathParts.get(i)); + } + //noinspection ResultOfMethodCallIgnored + outFile.mkdirs(); + // 最后一个部分如果非空,作为文件名 + fileName = pathParts.get(lastPartIndex); + } + return new File(outFile, fileName); + } + } diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/GeoKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/GeoKit.java index 45595c45e5..ed1bbb33d6 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/GeoKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/GeoKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -39,7 +40,7 @@ * 地理区域坐标距离计算工具类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class GeoKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/HashKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/HashKit.java index e262e949e6..5418e3f739 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/HashKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/HashKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -29,7 +30,7 @@ * 推荐使用FNV1算法 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HashKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/HexKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/HexKit.java index ae94657b82..6ecf154bea 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/HexKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/HexKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -38,7 +39,7 @@ *

* * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HexKit { @@ -204,8 +205,7 @@ public static byte[] decodeHex(String hexStr) { if (StringKit.isEmpty(hexStr)) { return null; } - hexStr = StringKit.removeAll(hexStr, Symbol.C_SPACE); - return decodeHex(hexStr.toCharArray()); + return decodeHex(StringKit.cleanBlank(hexStr).toCharArray()); } /** @@ -360,4 +360,23 @@ public static BigInteger toBigInteger(String hexStr) { return new BigInteger(hexStr, 16); } + /** + * 格式化Hex字符串,结果为每2位加一个空格,类似于: + *

+     *     e8 8c 67 03 80 cb 22 00 95 26 8f
+     * 
+ * + * @param hexStr Hex字符串 + * @return 格式化后的字符串 + */ + public static String format(String hexStr) { + final int length = hexStr.length(); + final StringBuilder builder = StringKit.builder(length + length / 2); + builder.append(hexStr.charAt(0)).append(hexStr.charAt(1)); + for (int i = 1; i < length - 1; i += 2) { + builder.append(Symbol.C_SPACE).append(hexStr.charAt(i)).append(hexStr.charAt(i + 1)); + } + return builder.toString(); + } + } diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/ImageKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/ImageKit.java index d5d7b51ea7..6d3fa318f7 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/ImageKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/ImageKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -55,7 +56,7 @@ * 彩色转黑白、文字水印、图片水印等 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ImageKit { @@ -1062,41 +1063,52 @@ public static RenderedImage toRenderedImage(java.awt.Image image) { /** * {@link java.awt.Image} 转 {@link BufferedImage} - * 首先尝试强转,否则新建一个{@link BufferedImage}后重新绘制 + * 首先尝试强转,否则新建一个{@link BufferedImage}后重新绘制,使用 {@link BufferedImage#TYPE_INT_RGB} 模式 * - * @param image {@link java.awt.Image} + * @param img {@link java.awt.Image} * @return {@link BufferedImage} */ - public static BufferedImage toBufferedImage(java.awt.Image image) { - if (image instanceof BufferedImage) { - return (BufferedImage) image; + public static BufferedImage toBufferedImage(java.awt.Image img) { + if (img instanceof BufferedImage) { + return (BufferedImage) img; } - return copyImage(image, BufferedImage.TYPE_INT_RGB); + return copyImage(img, BufferedImage.TYPE_INT_RGB); } /** * {@link java.awt.Image} 转 {@link BufferedImage} - * 如果源图片的RGB模式与目标模式一致,则直接转换,否则重新绘制 + * 如果源图片的RGB模式与目标模式一致,则直接转换,否则重新绘制 + * 默认的,png图片使用 {@link BufferedImage#TYPE_INT_ARGB}模式,其它使用 {@link BufferedImage#TYPE_INT_RGB} 模式 * * @param image {@link java.awt.Image} - * @param imageType 目标图片类型 + * @param imageType 目标图片类型,例如jpg或png等 * @return {@link BufferedImage} */ public static BufferedImage toBufferedImage(java.awt.Image image, String imageType) { + final int type = imageType.equalsIgnoreCase(FileType.TYPE_PNG) + ? BufferedImage.TYPE_INT_ARGB + : BufferedImage.TYPE_INT_RGB; + return toBufferedImage(image, type); + } + + /** + * {@link java.awt.Image} 转 {@link BufferedImage} + * 如果源图片的RGB模式与目标模式一致,则直接转换,否则重新绘制 + * + * @param image {@link java.awt.Image} + * @param imageType 目标图片类型,{@link BufferedImage}中的常量,例如黑白等 + * @return {@link BufferedImage} + */ + public static BufferedImage toBufferedImage(java.awt.Image image, int imageType) { BufferedImage bufferedImage; - if (false == imageType.equalsIgnoreCase(FileType.TYPE_PNG)) { - // 当目标为非PNG类图片时,源图片统一转换为RGB格式 - if (image instanceof BufferedImage) { - bufferedImage = (BufferedImage) image; - if (BufferedImage.TYPE_INT_RGB != bufferedImage.getType()) { - bufferedImage = copyImage(image, BufferedImage.TYPE_INT_RGB); - } - } else { - bufferedImage = copyImage(image, BufferedImage.TYPE_INT_RGB); + if (image instanceof BufferedImage) { + bufferedImage = (BufferedImage) image; + if (imageType != bufferedImage.getType()) { + bufferedImage = copyImage(image, imageType); } } else { - bufferedImage = toBufferedImage(image); + bufferedImage = copyImage(image, imageType); } return bufferedImage; } @@ -1426,8 +1438,9 @@ public static boolean write(java.awt.Image image, String imageType, ImageOutputS imageType = FileType.TYPE_JPG; } - final ImageWriter writer = getWriter(image, imageType); - return write(toBufferedImage(image, imageType), writer, destImageStream, quality); + final BufferedImage bufferedImage = toBufferedImage(image, imageType); + final ImageWriter writer = getWriter(bufferedImage, imageType); + return write(bufferedImage, writer, destImageStream, quality); } /** diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/IoKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/IoKit.java index 51ed2a9bb9..d6afd9177d 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/IoKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/IoKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -58,7 +59,7 @@ * 原因是流可能被多次读写,读写关闭后容易造成问题 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class IoKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/IterKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/IterKit.java index b3f87c15ce..1fb0866bbc 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/IterKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/IterKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -37,7 +38,7 @@ * {@link Iterable} 和 {@link Iterator} 相关工具类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class IterKit { @@ -773,4 +774,39 @@ public static Iterator empty() { return Collections.emptyIterator(); } + /** + * 返回 Iterable 对象的元素数量 + * + * @param iterable Iterable对象 + * @return Iterable对象的元素数量 + */ + public static int size(final Iterable iterable) { + if (null == iterable) { + return 0; + } + + if (iterable instanceof Collection) { + return ((Collection) iterable).size(); + } else { + return size(iterable.iterator()); + } + } + + /** + * 返回 Iterator 对象的元素数量 + * + * @param iterator Iterator对象 + * @return Iterator对象的元素数量 + */ + public static int size(final Iterator iterator) { + int size = 0; + if (iterator != null) { + while (iterator.hasNext()) { + iterator.next(); + size++; + } + } + return size; + } + } diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/MapKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/MapKit.java index a15c247093..71954ce594 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/MapKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/MapKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -39,7 +40,7 @@ * Map相关工具类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MapKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/MathKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/MathKit.java index 5cc4815952..df784dde5e 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/MathKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/MathKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -46,7 +47,7 @@ * 计量标准 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MathKit { @@ -1778,14 +1779,14 @@ public static String toStr(Number number, String defaultValue) { * @return A String. */ public static String toStr(Number number) { - if (null == number) { - throw new NullPointerException("Number is null !"); - } + Assert.notNull(number, "Number is null !"); - if (false == ObjectKit.isValidIfNumber(number)) { - throw new IllegalArgumentException("Number is non-finite!"); + // BigDecimal单独处理,使用非科学计数法 + if (number instanceof BigDecimal) { + return toStr((BigDecimal) number); } + Assert.isTrue(isValidNumber(number), "Number is non-finite!"); // 去掉小数点儿后多余的0 String string = number.toString(); if (string.indexOf(Symbol.C_DOT) > 0 && string.indexOf('e') < 0 && string.indexOf('E') < 0) { @@ -1799,6 +1800,18 @@ public static String toStr(Number number) { return string; } + /** + * {@link BigDecimal}数字转字符串 + * 调用{@link BigDecimal#toPlainString()},并去除尾小数点儿后多余的0 + * + * @param bigDecimal A {@link BigDecimal} + * @return A String. + */ + public static String toStr(BigDecimal bigDecimal) { + Assert.notNull(bigDecimal, "BigDecimal is null !"); + return bigDecimal.stripTrailingZeros().toPlainString(); + } + /** * 数字转{@link BigDecimal} * @@ -1809,6 +1822,17 @@ public static BigDecimal toBigDecimal(Number number) { if (null == number) { return BigDecimal.ZERO; } + + if (number instanceof BigDecimal) { + return (BigDecimal) number; + } else if (number instanceof Long) { + return new BigDecimal((Long) number); + } else if (number instanceof Integer) { + return new BigDecimal((Integer) number); + } else if (number instanceof BigInteger) { + return new BigDecimal((BigInteger) number); + } + return toBigDecimal(number.toString()); } @@ -1822,6 +1846,36 @@ public static BigDecimal toBigDecimal(String number) { return (null == number) ? BigDecimal.ZERO : new BigDecimal(number); } + /** + * 数字转{@link BigInteger} + * + * @param number 数字 + * @return {@link BigInteger} + */ + public static BigInteger toBigInteger(Number number) { + if (null == number) { + return BigInteger.ZERO; + } + + if (number instanceof BigInteger) { + return (BigInteger) number; + } else if (number instanceof Long) { + return BigInteger.valueOf((Long) number); + } + + return toBigInteger(number.longValue()); + } + + /** + * 数字转{@link BigInteger} + * + * @param number 数字 + * @return {@link BigInteger} + */ + public static BigInteger toBigInteger(String number) { + return (null == number) ? BigInteger.ZERO : new BigInteger(number); + } + /** * 计算等份个数 * @@ -2176,6 +2230,10 @@ private static int mathNode(int selectNum) { * @return 去掉标识的字符串 */ private static String removeNumberFlag(String number) { + // 去掉千位分隔符 + if (StringKit.contains(number, Symbol.C_COMMA)) { + number = StringKit.removeAll(number, Symbol.C_COMMA); + } // 去掉类型标识的结尾 final int lastPos = number.length() - 1; final char lastCharUpper = Character.toUpperCase(number.charAt(lastPos)); @@ -2816,6 +2874,23 @@ private static String determineDataUnit(String suffix, String defaultUnit) { return (StringKit.isNotEmpty(suffix) ? Normal.getCapacity(suffix) : defaultUnitToUse); } + /** + * 检查是否为有效的数字 + * 检查Double和Float是否为无限大,或者Not a Number + * 非数字类型和Null将返回true + * + * @param number 被检查类型 + * @return 检查结果,非数字类型和Null将返回true + */ + public static boolean isValidNumber(Number number) { + if (number instanceof Double) { + return (false == ((Double) number).isInfinite()) && (false == ((Double) number).isNaN()); + } else if (number instanceof Float) { + return (false == ((Float) number).isInfinite()) && (false == ((Float) number).isNaN()); + } + return true; + } + /** * 是否为负数,不包括0 * diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/NameKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/NameKit.java index 9f92c0f7e3..468615fbee 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/NameKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/NameKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -31,7 +32,7 @@ * 生成姓名 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NameKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/NetKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/NetKit.java index c45baefb42..646f9843f9 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/NetKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/NetKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -38,7 +39,7 @@ * 网络相关工具 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NetKit { @@ -201,7 +202,7 @@ public static TreeSet getUsableLocalPorts(int numRequested, int minPort /** * 判定是否为内网IP - * 私有IP:A类 10.0.0.0-10.255.255.255 B类 172.16.1.1-172.31.255.255 C类 192.168.0.0-192.168.255.255 当然,还有127这个网段是环回地址 + * 私有IP:A类 10.0.0.0-10.255.255.255 B类 172.16.1.2-172.31.255.255 C类 192.168.0.0-192.168.255.255 当然,还有127这个网段是环回地址 * * @param ipAddress IP地址 * @return 是否为内网IP @@ -213,7 +214,7 @@ public static boolean isInnerIP(String ipAddress) { long aBegin = ipv4ToLong("10.0.0.0"); long aEnd = ipv4ToLong("10.255.255.255"); - long bBegin = ipv4ToLong("172.16.1.1"); + long bBegin = ipv4ToLong("172.16.1.2"); long bEnd = ipv4ToLong("172.31.255.255"); long cBegin = ipv4ToLong("192.168.0.0"); @@ -460,7 +461,7 @@ public static InetAddress getLocalhost() { final LinkedHashSet localAddressList = localAddressList(address -> { // 非loopback地址,指127.*.*.*的地址 return false == address.isLoopbackAddress() - // 非地区本地地址,指10.0.0.0 ~ 10.255.255.255、172.16.1.1 ~ 172.31.255.255、192.168.0.0 ~ 192.168.255.255 + // 非地区本地地址,指10.0.0.0 ~ 10.255.255.255、172.16.1.2 ~ 172.31.255.255、192.168.0.0 ~ 192.168.255.255 && false == address.isSiteLocalAddress() // 需为IPV4地址 && address instanceof Inet4Address; diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/ObjectKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/ObjectKit.java index 933f419553..d99eabe92c 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/ObjectKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/ObjectKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -38,12 +39,13 @@ import java.math.BigDecimal; import java.util.*; import java.util.function.Function; +import java.util.function.Supplier; /** * 一些通用的函数 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ObjectKit { @@ -80,6 +82,38 @@ public static T defaultIfNull(final T object, final T defaultValue) { return (null != object) ? object : defaultValue; } + /** + * 如果给定对象为{@code null} 返回默认值, 如果不为null 返回自定义handle处理后的返回值 + * + * @param source Object 类型对象 + * @param handle 自定义的处理方法 + * @param defaultValue 默认为空的返回值 + * @param 被检查对象为{@code null}返回默认值,否则返回自定义handle处理后的返回值 + * @return 被检查对象为{ null}返回默认值,否则返回原值 + */ + public static T defaultIfNull(final Object source, Supplier handle, final T defaultValue) { + if (Objects.nonNull(source)) { + return handle.get(); + } + return defaultValue; + } + + /** + * 如果给定对象为{@code null}或者""返回默认值, 否则返回自定义handle处理后的返回值 + * + * @param str String 类型 + * @param handle 自定义的处理方法 + * @param defaultValue 默认为空的返回值 + * @param 被检查对象为{@code null}或者 ""返回默认值,否则返回自定义handle处理后的返回值 + * @return 被检查对象为{ null}返回默认值,否则返回原值 + */ + public static T defaultIfEmpty(final String str, Supplier handle, final T defaultValue) { + if (StringKit.isNotEmpty(str)) { + return handle.get(); + } + return defaultValue; + } + /** * 如果给定对象为{@code null}或者 "" 返回默认值 * @@ -233,25 +267,6 @@ public static final boolean isNotEmpty(Object... object) { return !isEmpty(object); } - /** - * 检查是否为有效的数字 - * 检查Double和Float是否为无限大,或者Not a Number - * 非数字类型和Null将返回true - * - * @param obj 被检查类型 - * @return 检查结果, 非数字类型和Null将返回true - */ - public static boolean isValidIfNumber(Object obj) { - if (obj != null && obj instanceof Number) { - if (obj instanceof Double) { - return !((Double) obj).isInfinite() && !((Double) obj).isNaN(); - } else if (obj instanceof Float) { - return !((Float) obj).isInfinite() && !((Float) obj).isNaN(); - } - } - return true; - } - /** * 比较两个对象是否相等 * diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/PatternKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/PatternKit.java index 938a81a49e..b684b27a74 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/PatternKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/PatternKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -39,7 +40,7 @@ * 常用正则表达式集合 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PatternKit { 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 index 23c2917892..ebc1e99d4d 100755 --- 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 @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -43,7 +44,7 @@ * 随机工具类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RandomKit { @@ -76,21 +77,27 @@ public static Random getRandom(boolean isSecure) { * @return {@link SecureRandom} */ public static SecureRandom getSecureRandom() { - try { - return SecureRandom.getInstance(Algorithm.SHAPRNG); - } catch (NoSuchAlgorithmException e) { - throw new InstrumentException(e); - } + return getSecureRandom(null); } /** - * 创建{@link SecureRandom},类提供加密的强随机数生成器 (RNG) + * 获取SHA1PRNG的{@link SecureRandom},类提供加密的强随机数生成器 (RNG) + * 注意:此方法获取的是伪随机序列发生器PRNG(pseudo-random number generator) * - * @param seed 自定义随机种子 + * @param seed 随机数种子 * @return {@link SecureRandom} */ public static SecureRandom getSecureRandom(byte[] seed) { - return (null == seed) ? new SecureRandom() : new SecureRandom(seed); + SecureRandom random; + try { + random = SecureRandom.getInstance(Algorithm.SHAPRNG); + } catch (NoSuchAlgorithmException e) { + throw new InstrumentException(e); + } + if (null != seed) { + random.setSeed(seed); + } + return random; } /** @@ -281,6 +288,9 @@ public static T randomEle(List list) { * @return 随机元素 */ public static T randomEle(List list, int limit) { + if (list.size() < limit) { + limit = list.size(); + } return list.get(randomInt(limit)); } 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 index 327ac2b427..39f8636b64 100755 --- 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 @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -37,7 +38,7 @@ * 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ReflectKit { @@ -410,7 +411,7 @@ public static Constructor[] getConstructors(Class beanClass) throws Se } /** - * 获得一个类中所有字段列表,直接反射获取,无缓存 + * 获得一个类中所有构造列表,直接反射获取,无缓存 * * @param beanClass 类 * @return 字段列表 @@ -431,14 +432,7 @@ public static Constructor[] getConstructorsDirectly(Class beanClass) throw */ public static Field getField(Class beanClass, String name) throws SecurityException { final Field[] fields = getFields(beanClass); - if (ArrayKit.isNotEmpty(fields)) { - for (Field field : fields) { - if ((name.equals(getFieldName(field)))) { - return field; - } - } - } - return null; + return ArrayKit.firstNonNull((field) -> name.equals(getFieldName(field)), fields); } /** @@ -461,12 +455,12 @@ public static Field[] getFields(Class beanClass) throws SecurityException { /** * 获得一个类中所有字段列表,直接反射获取,无缓存 * - * @param beanClass 类 - * @param withSuperClassFieds 是否包括父类的字段列表 + * @param beanClass 类 + * @param withSuperClassFields 是否包括父类的字段列表 * @return 字段列表 * @throws SecurityException 安全检查异常 */ - public static Field[] getFields(Class beanClass, boolean withSuperClassFieds) throws SecurityException { + public static Field[] getFields(Class beanClass, boolean withSuperClassFields) throws SecurityException { Assert.notNull(beanClass); Field[] allFields = null; @@ -479,7 +473,7 @@ public static Field[] getFields(Class beanClass, boolean withSuperClassFieds) } else { allFields = ArrayKit.append(allFields, declaredFields); } - searchType = withSuperClassFieds ? searchType.getSuperclass() : null; + searchType = withSuperClassFields ? searchType.getSuperclass() : null; } return allFields; @@ -1019,7 +1013,6 @@ public static String getSetMethodName(String fieldName) { return Normal.SET + fieldName.substring(0, 1).toUpperCase() + fieldName.substring(1); } - /** * 设置方法为可访问(私有方法可以被外部调用) * diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/RuntimeKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/RuntimeKit.java index a19442bc87..4e8f22e41f 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/RuntimeKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/RuntimeKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -46,7 +47,7 @@ * 用于执行系统命令的工具 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RuntimeKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/StreamKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/StreamKit.java index 35f958cc8c..110bcaa0dc 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/StreamKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/StreamKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class StreamKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/StringKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/StringKit.java index 59d7a39f72..3d0abb8581 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/StringKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/StringKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -44,7 +45,7 @@ * 用于MD5,加解密和字符串编码转换 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class StringKit { @@ -1642,21 +1643,20 @@ public static String subBetween(CharSequence str, CharSequence beforeAndAfter) { return subBetween(str, beforeAndAfter, beforeAndAfter); } - /** * 截取指定字符串多段中间部分,不包括标识字符串 *
-     * subBetweenAll("wx[b]y[z]", "[", "]") 		= ["b","z"]
-     * subBetweenAll(null, *, *)          			= []
-     * subBetweenAll(*, null, *)          			= []
-     * subBetweenAll(*, *, null)          			= []
-     * subBetweenAll("", "", "")          			= []
-     * subBetweenAll("", "", "]")         			= []
-     * subBetweenAll("", "[", "]")        			= []
-     * subBetweenAll("yabcz", "", "")     			= []
-     * subBetweenAll("yabcz", "y", "z")   			= ["abc"]
-     * subBetweenAll("yabczyabcz", "y", "z")   		= ["abc","abc"]
-     * subBetweenAll("[yabc[zy]abcz]", "[", "]");   = ["zy"]           重叠时只截取内部,
+     * StringKit.subBetweenAll("wx[b]y[z]", "[", "]") 		= ["b","z"]
+     * StringKit.subBetweenAll(null, *, *)          			= []
+     * StringKit.subBetweenAll(*, null, *)          			= []
+     * StringKit.subBetweenAll(*, *, null)          			= []
+     * StringKit.subBetweenAll("", "", "")          			= []
+     * StringKit.subBetweenAll("", "", "]")         			= []
+     * StringKit.subBetweenAll("", "[", "]")        			= []
+     * StringKit.subBetweenAll("yabcz", "", "")     			= []
+     * StringKit.subBetweenAll("yabcz", "y", "z")   			= ["abc"]
+     * StringKit.subBetweenAll("yabczyabcz", "y", "z")   		= ["abc","abc"]
+     * StringKit.subBetweenAll("[yabc[zy]abcz]", "[", "]");   = ["zy"]           重叠时只截取内部,
      * 
* * @param str 被切割的字符串 @@ -1665,21 +1665,54 @@ public static String subBetween(CharSequence str, CharSequence beforeAndAfter) { * @return 截取后的字符串 */ public static String[] subBetweenAll(CharSequence str, CharSequence prefix, CharSequence suffix) { - if (hasEmpty(str, prefix, suffix) || false == contains(str, prefix)) { + if (hasEmpty(str, prefix, suffix) || + // 不包含起始字符串,则肯定没有子串 + false == contains(str, prefix)) { return new String[0]; } final List result = new LinkedList<>(); - for (String fragment : split(str, prefix)) { - int suffixIndex = fragment.indexOf(suffix.toString()); - if (suffixIndex > 0) { - result.add(fragment.substring(0, suffixIndex)); + final String[] split = split(str, prefix); + if (prefix.equals(suffix)) { + // 前后缀字符相同,单独处理 + for (int i = 1, length = split.length - 1; i < length; i += 2) { + result.add(split[i]); + } + } else { + int suffixIndex; + for (String fragment : split) { + suffixIndex = fragment.indexOf(suffix.toString()); + if (suffixIndex > 0) { + result.add(fragment.substring(0, suffixIndex)); + } } } return result.toArray(new String[0]); } + /** + * 截取指定字符串多段中间部分,不包括标识字符串 + *
+     * StringKit.subBetweenAll(null, *)          			= []
+     * StringKit.subBetweenAll(*, null)          			= []
+     * StringKit.subBetweenAll(*, *)          			= []
+     * StringKit.subBetweenAll("", "")          			= []
+     * StringKit.subBetweenAll("", "#")         			= []
+     * StringKit.subBetweenAll("abcd", "")     		    = []
+     * StringKit.subBetweenAll("#abcd#", "#")   		    = ["abcd"]
+     * StringKit.subBetweenAll("#hello# #world#!", "#")   = ["hello", "world"]
+     * StringKit.subBetweenAll("#hello# world#!", "#");   = ["hello"]
+     * 
+ * + * @param str 被切割的字符串 + * @param prefixAndSuffix 截取开始和结束的字符串标识 + * @return 截取后的字符串 + */ + public static String[] subBetweenAll(CharSequence str, CharSequence prefixAndSuffix) { + return subBetweenAll(str, prefixAndSuffix, prefixAndSuffix); + } + /** * 切割指定长度的后部分的字符串 * @@ -2568,7 +2601,7 @@ public static int lastIndexOf(final CharSequence str, final CharSequence searchS return str.toString().lastIndexOf(searchStr.toString(), fromIndex); } - for (int i = fromIndex; i > 0; i--) { + for (int i = fromIndex; i >= 0; i--) { if (isSubEquals(str, i, searchStr, 0, searchStr.length(), true)) { return i; } diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/SwingKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/SwingKit.java index dd8adedc15..b664afe335 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/SwingKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/SwingKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -43,7 +44,7 @@ * 显示器等相关工具 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SwingKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/TextKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/TextKit.java index 32822bd5dd..425fcf7a4b 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/TextKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/TextKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -35,7 +36,7 @@ * 可复用的字符串生成器,非线程安全 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TextKit implements CharSequence, Appendable, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/ThreadKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/ThreadKit.java index 4761fc9734..89f265f7c6 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/ThreadKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/ThreadKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -36,7 +37,7 @@ * 线程池工具 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ThreadKit { @@ -191,6 +192,21 @@ public static Future execAsync(Runnable runnable) { return GlobalThread.submit(runnable); } + /** + * 执行异步方法 + * + * @param runnable 需要执行的方法体 + * @param isDaemon 是否守护线程。守护线程会在主线程结束后自动结束 + * @return 执行的方法体 + */ + public static Runnable execAsync(Runnable runnable, boolean isDaemon) { + Thread thread = new Thread(runnable); + thread.setDaemon(isDaemon); + thread.start(); + + return runnable; + } + /** * 新建一个CompletionService,调用其submit方法可以异步执行多个任务,最后调用take方法按照完成的顺序获得其结果 * 若未完成,则会阻塞 diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/TreeKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/TreeKit.java index 9cf3abc5ef..e248af172b 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/TreeKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/TreeKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -45,7 +46,7 @@ * 6、代码简洁轻量无额外依赖 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TreeKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/TypeKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/TypeKit.java index 897f8503ae..337c02285d 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/TypeKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/TypeKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -43,7 +44,7 @@ * * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TypeKit { 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 index 6e1ad849ac..ce3b59efef 100755 --- 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 @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -38,7 +39,7 @@ * URL相关工具 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class UriKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/WatchKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/WatchKit.java index 2becbd9b0a..79f830ab7f 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/WatchKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/WatchKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -39,7 +40,7 @@ * 主要负责文件监听器的快捷创建 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class WatchKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/XmlKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/XmlKit.java index 6277666550..64373a5189 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/XmlKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/XmlKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -60,7 +61,7 @@ * 工具类封装了XML文档的创建、读取、写出和部分XML操作 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class XmlKit { @@ -295,10 +296,22 @@ public static Document parseXml(String xmlStr) { * @param doc XML文档 * @return XML字符串 */ - public static String toString(Document doc) { + public static String toString(Node doc) { return toString(doc, false); } + /** + * 将XML文档转换为String + * 字符编码使用XML文档中的编码,获取不到则使用UTF-8 + * 默认非格式化输出,若想格式化请使用{@link #format(Document)} + * + * @param doc XML文档 + * @return XML字符串 + */ + public static String toString(Document doc) { + return toString((Node) doc); + } + /** * 将XML文档转换为String * 字符编码使用XML文档中的编码,获取不到则使用UTF-8 @@ -307,10 +320,22 @@ public static String toString(Document doc) { * @param isPretty 是否格式化输出 * @return XML字符串 */ - public static String toString(Document doc, boolean isPretty) { + public static String toString(Node doc, boolean isPretty) { return toString(doc, Charset.DEFAULT_UTF_8, isPretty); } + /** + * 将XML文档转换为String + * 字符编码使用XML文档中的编码,获取不到则使用UTF-8 + * + * @param doc XML文档 + * @param isPretty 是否格式化输出 + * @return XML字符串 + */ + public static String toString(Document doc, boolean isPretty) { + return toString((Node) doc, isPretty); + } + /** * 将XML文档转换为String * 字符编码使用XML文档中的编码,获取不到则使用UTF-8 @@ -320,10 +345,23 @@ public static String toString(Document doc, boolean isPretty) { * @param isPretty 是否格式化输出 * @return XML字符串 */ - public static String toString(Document doc, String charset, boolean isPretty) { + public static String toString(Node doc, String charset, boolean isPretty) { return toString(doc, charset, isPretty, false); } + /** + * 将XML文档转换为String + * 字符编码使用XML文档中的编码,获取不到则使用UTF-8 + * + * @param doc XML文档 + * @param charset 编码 + * @param isPretty 是否格式化输出 + * @return XML字符串 + */ + public static String toString(Document doc, String charset, boolean isPretty) { + return toString((Node) doc, charset, isPretty); + } + /** * 将XML文档转换为String * 字符编码使用XML文档中的编码,获取不到则使用UTF-8 @@ -334,7 +372,7 @@ public static String toString(Document doc, String charset, boolean isPretty) { * @param omitXmlDeclaration 是否输出 xml Declaration * @return XML字符串 */ - public static String toString(Document doc, String charset, boolean isPretty, boolean omitXmlDeclaration) { + public static String toString(Node doc, String charset, boolean isPretty, boolean omitXmlDeclaration) { final StringWriter writer = StringKit.getWriter(); try { write(doc, writer, charset, isPretty ? 2 : 0, omitXmlDeclaration); diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/ZipKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/ZipKit.java index a75125931b..767ed2f22d 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/ZipKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/ZipKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.core.toolkit; @@ -40,7 +41,7 @@ * 压缩工具类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ZipKit { @@ -454,7 +455,7 @@ public static File unzip(ZipFile zipFile, File outFile) { File outItemFile; while (em.hasMoreElements()) { zipEntry = em.nextElement(); - outItemFile = buildFile(outFile, zipEntry.getName()); + outItemFile = FileKit.file(outFile, zipEntry.getName()); if (zipEntry.isDirectory()) { // 创建对应目录 outItemFile.mkdirs(); @@ -1065,13 +1066,13 @@ private static void deflater(InputStream in, OutputStream out, int level, boolea */ private static File buildFile(File outFile, String fileName) { // 替换Windows路径分隔符为Linux路径分隔符,便于统一处理 - fileName = fileName.replace('\\', '/'); + fileName = fileName.replace(Symbol.C_BACKSLASH, Symbol.C_SLASH); if (false == FileKit.isWindows() // 检查文件名中是否包含"/",不考虑以"/"结尾的情况 && fileName.lastIndexOf(Symbol.SLASH, fileName.length() - 2) > 0) { // 在Linux下多层目录创建存在问题,/会被当成文件名的一部分,此处做处理 // 使用/拆分路径(zip中无\),级联创建父目录 - final List pathParts = StringKit.split(fileName, '/', false, true); + final List pathParts = StringKit.split(fileName, Symbol.C_SLASH, false, true); final int lastPartIndex = pathParts.size() - 1;//目录个数 for (int i = 0; i < lastPartIndex; i++) { //由于路径拆分,slip不检查,在最后一步检查 diff --git a/bus-cron/pom.xml b/bus-cron/pom.xml index 632533ced5..84c35327a5 100755 --- a/bus-cron/pom.xml +++ b/bus-cron/pom.xml @@ -6,27 +6,13 @@ org.aoju bus-cron - 6.1.1 + 6.1.2 jar ${project.artifactId} Bus Cron https://github.com/aoju/bus - - UTF-8 - UTF-8 - 1.8 - - - - - ${project.groupId} - bus-setting - ${project.version} - - - The MIT License (MIT) @@ -52,6 +38,20 @@ https://github.com/aoju/bus/issues + + UTF-8 + UTF-8 + 1.8 + + + + + ${project.groupId} + bus-setting + ${project.version} + + + diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/Builder.java b/bus-cron/src/main/java/org/aoju/bus/cron/Builder.java index 799113274b..854a19efd7 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/Builder.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/Builder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cron; @@ -43,7 +44,7 @@ * {@link #setMatchSecond(boolean)} 方法用于定义是否使用秒匹配模式,如果为true,则定时任务表达式中的第一位为秒,否则为分,默认是分 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Builder { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/Configure.java b/bus-cron/src/main/java/org/aoju/bus/cron/Configure.java new file mode 100644 index 0000000000..0eaf87a7ee --- /dev/null +++ b/bus-cron/src/main/java/org/aoju/bus/cron/Configure.java @@ -0,0 +1,92 @@ +/********************************************************************************* + * * + * The MIT License (MIT) * + * * + * Copyright (c) 2015-2020 aoju.org and other contributors. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy * + * of this software and associated documentation files (the "Software"), to deal * + * in the Software without restriction, including without limitation the rights * + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * + * THE SOFTWARE. * + * * + ********************************************************************************/ +package org.aoju.bus.cron; + +import java.util.TimeZone; + +/** + * 定时任务配置类 + * + * @author Kimi Liu + * @version 6.1.2 + * @since JDK 1.8+ + */ +public class Configure { + + /** + * 时区 + */ + protected TimeZone timezone = TimeZone.getDefault(); + /** + * 是否支持秒匹配 + */ + protected boolean matchSecond; + + public Configure() { + + } + + /** + * 获得时区,默认为 {@link TimeZone#getDefault()} + * + * @return 时区 + */ + public TimeZone getTimeZone() { + return this.timezone; + } + + /** + * 设置时区 + * + * @param timezone 时区 + * @return this + */ + public Configure setTimeZone(TimeZone timezone) { + this.timezone = timezone; + return this; + } + + /** + * 是否支持秒匹配 + * + * @return true使用,false不使用 + */ + public boolean isMatchSecond() { + return this.matchSecond; + } + + /** + * 设置是否支持秒匹配,默认不使用 + * + * @param isMatchSecond true支持,false不支持 + * @return this + */ + public Configure setMatchSecond(boolean isMatchSecond) { + this.matchSecond = isMatchSecond; + return this; + } + +} diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/CronTimer.java b/bus-cron/src/main/java/org/aoju/bus/cron/CronTimer.java index 205d07e467..584f419840 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/CronTimer.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/CronTimer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cron; @@ -33,7 +34,7 @@ * 计时器线程每隔一分钟检查一次任务列表,一旦匹配到执行对应的Task * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CronTimer extends Thread { @@ -80,7 +81,7 @@ private static boolean isValidSleepMillis(long millis, long timerUnit) { @Override public void run() { - final long timerUnit = this.scheduler.matchSecond ? TIMER_UNIT_SECOND : TIMER_UNIT_MINUTE; + final long timerUnit = this.scheduler.config.matchSecond ? TIMER_UNIT_SECOND : TIMER_UNIT_MINUTE; long thisTime = System.currentTimeMillis(); long nextTime; @@ -98,9 +99,12 @@ public void run() { //执行点,时间记录为执行开始的时间,而非结束时间 thisTime = System.currentTimeMillis(); spawnLauncher(thisTime); + } else { + // 非正常时间重新计算(issue#1224@Github) + thisTime = System.currentTimeMillis(); } } - Logger.debug("Cron timer stoped."); + Logger.debug("Cron timer stopped."); } /** diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/Executor.java b/bus-cron/src/main/java/org/aoju/bus/cron/Executor.java index 42cf2c9552..dd7e45cadd 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/Executor.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/Executor.java @@ -21,9 +21,11 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cron; +import org.aoju.bus.cron.factory.CronTask; import org.aoju.bus.cron.factory.Task; /** @@ -31,26 +33,41 @@ * 执行具体的作业,执行完毕销毁 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Executor implements Runnable { - private Scheduler scheduler; - private Task task; + private final Scheduler scheduler; + private final CronTask task; - public Executor(Scheduler scheduler, Task task) { + /** + * 构造 + * + * @param scheduler 调度器 + * @param task 被执行的任务 + */ + public Executor(Scheduler scheduler, CronTask task) { this.scheduler = scheduler; this.task = task; } /** - * 获得任务对象 + * 获得原始任务对象 * * @return 任务对象 */ public Task getTask() { - return task; + return this.task.getRaw(); + } + + /** + * 获得原始任务对象 + * + * @return 任务对象 + */ + public CronTask getCronTask() { + return this.task; } @Override diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/Expression.java b/bus-cron/src/main/java/org/aoju/bus/cron/Expression.java index 4664f641ac..35598b382c 100644 --- a/bus-cron/src/main/java/org/aoju/bus/cron/Expression.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/Expression.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cron; @@ -35,7 +36,7 @@ * Crontab表达式提供了指定复杂时间组合的能力 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Expression implements Serializable, Cloneable { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/Launcher.java b/bus-cron/src/main/java/org/aoju/bus/cron/Launcher.java index 5f29c584b6..449ac1b176 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/Launcher.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/Launcher.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cron; @@ -30,14 +31,20 @@ * 检查完毕后启动器结束 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Launcher implements Runnable { - private Scheduler scheduler; - private long millis; + private final Scheduler scheduler; + private final long millis; + /** + * 构造 + * + * @param scheduler {@link Scheduler} + * @param millis 毫秒数 + */ public Launcher(Scheduler scheduler, long millis) { this.scheduler = scheduler; this.millis = millis; @@ -46,7 +53,7 @@ public Launcher(Scheduler scheduler, long millis) { @Override public void run() { //匹配秒部分由用户定义决定,始终不匹配年 - scheduler.repertoire.executeTaskIfMatchInternal(millis); + scheduler.repertoire.executeTaskIfMatch(this.scheduler, this.millis); //结束通知 scheduler.supervisor.notifyLauncherCompleted(this); diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/Manager.java b/bus-cron/src/main/java/org/aoju/bus/cron/Manager.java index db5b570562..28e1ef0fcb 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/Manager.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/Manager.java @@ -21,9 +21,11 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cron; +import org.aoju.bus.cron.factory.CronTask; import org.aoju.bus.cron.factory.Task; import java.util.ArrayList; @@ -34,7 +36,7 @@ * 负责管理作业的启动、停止等 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Manager { @@ -55,14 +57,11 @@ public Manager(Scheduler scheduler) { * @param task {@link Task} * @return {@link Executor} */ - public Executor spawnExecutor(Task task) { + public Executor spawnExecutor(CronTask task) { final Executor executor = new Executor(this.scheduler, task); synchronized (this.executors) { this.executors.add(executor); } - // 子线程是否为deamon线程取决于父线程,因此此处无需显示调用 - // executor.setDaemon(this.scheduler.daemon); -// executor.start(); this.scheduler.threadExecutor.execute(executor); return executor; } diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/Repertoire.java b/bus-cron/src/main/java/org/aoju/bus/cron/Repertoire.java index 506ba4d037..4dfbde7d75 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/Repertoire.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/Repertoire.java @@ -21,16 +21,18 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cron; import org.aoju.bus.core.lang.exception.InstrumentException; +import org.aoju.bus.cron.factory.CronTask; import org.aoju.bus.cron.factory.Task; import org.aoju.bus.cron.pattern.CronPattern; import java.util.ArrayList; +import java.util.Collections; import java.util.List; -import java.util.TimeZone; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; @@ -41,29 +43,38 @@ * 任务的添加、移除使用读写锁保证线程安全性 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Repertoire { - private ReadWriteLock lock = new ReentrantReadWriteLock(); + public static final int DEFAULT_CAPACITY = 10; - private Scheduler scheduler; - private TimeZone timezone; + private final ReadWriteLock lock; - private List ids = new ArrayList<>(); - private List patterns = new ArrayList<>(); - private List tasks = new ArrayList<>(); + private final List ids; + private final List patterns; + private final List tasks; private int size; + /** + * 构造 + */ + public Repertoire() { + this(DEFAULT_CAPACITY); + } + /** * 构造 * - * @param scheduler {@link Scheduler} + * @param initialCapacity 容量,即预估的最大任务数 */ - public Repertoire(Scheduler scheduler) { - this.scheduler = scheduler; - this.timezone = scheduler.getTimeZone(); + public Repertoire(int initialCapacity) { + lock = new ReentrantReadWriteLock(); + + ids = new ArrayList<>(initialCapacity); + patterns = new ArrayList<>(initialCapacity); + tasks = new ArrayList<>(initialCapacity); } /** @@ -76,8 +87,8 @@ public Repertoire(Scheduler scheduler) { */ public Repertoire add(String id, CronPattern pattern, Task task) { final Lock writeLock = lock.writeLock(); + writeLock.lock(); try { - writeLock.lock(); if (ids.contains(id)) { throw new InstrumentException("Id [{}] has been existed!", id); } @@ -91,6 +102,51 @@ public Repertoire add(String id, CronPattern pattern, Task task) { return this; } + /** + * 获取所有ID,返回不可变列表,即列表不可修改 + * + * @return ID列表 + */ + public List getIds() { + final Lock readLock = lock.readLock(); + readLock.lock(); + try { + return Collections.unmodifiableList(this.ids); + } finally { + readLock.unlock(); + } + } + + /** + * 获取所有定时任务表达式,返回不可变列表,即列表不可修改 + * + * @return 定时任务表达式列表 + */ + public List getPatterns() { + final Lock readLock = lock.readLock(); + readLock.lock(); + try { + return Collections.unmodifiableList(this.patterns); + } finally { + readLock.unlock(); + } + } + + /** + * 获取所有定时任务,返回不可变列表,即列表不可修改 + * + * @return 定时任务列表 + */ + public List getTasks() { + final Lock readLock = lock.readLock(); + readLock.lock(); + try { + return Collections.unmodifiableList(this.tasks); + } finally { + readLock.unlock(); + } + } + /** * 移除Task * @@ -98,8 +154,8 @@ public Repertoire add(String id, CronPattern pattern, Task task) { */ public void remove(String id) { final Lock writeLock = lock.writeLock(); + writeLock.lock(); try { - writeLock.lock(); final int index = ids.indexOf(id); if (index > -1) { tasks.remove(index); @@ -117,12 +173,12 @@ public void remove(String id) { * * @param id Task的ID * @param pattern 新的表达式 - * @return 是否更新成功, 如果id对应的规则不存在则不更新 + * @return 是否更新成功,如果id对应的规则不存在则不更新 */ public boolean updatePattern(String id, CronPattern pattern) { final Lock writeLock = lock.writeLock(); + writeLock.lock(); try { - writeLock.lock(); final int index = ids.indexOf(id); if (index > -1) { patterns.set(index, pattern); @@ -142,8 +198,8 @@ public boolean updatePattern(String id, CronPattern pattern) { */ public Task getTask(int index) { final Lock readLock = lock.readLock(); + readLock.lock(); try { - readLock.lock(); return tasks.get(index); } finally { readLock.unlock(); @@ -172,8 +228,8 @@ public Task getTask(String id) { */ public CronPattern getPattern(int index) { final Lock readLock = lock.readLock(); + readLock.lock(); try { - readLock.lock(); return patterns.get(index); } finally { readLock.unlock(); @@ -215,13 +271,14 @@ public CronPattern getPattern(String id) { /** * 如果时间匹配则执行相应的Task,带读锁 * - * @param millis 时间毫秒 + * @param scheduler {@link Scheduler} + * @param millis 时间毫秒 */ - public void executeTaskIfMatch(long millis) { + public void executeTaskIfMatch(Scheduler scheduler, long millis) { final Lock readLock = lock.readLock(); + readLock.lock(); try { - readLock.lock(); - executeTaskIfMatchInternal(millis); + executeTaskIfMatchInternal(scheduler, millis); } finally { readLock.unlock(); } @@ -230,12 +287,13 @@ public void executeTaskIfMatch(long millis) { /** * 如果时间匹配则执行相应的Task,无锁 * - * @param millis 时间毫秒 + * @param scheduler {@link Scheduler} + * @param millis 时间毫秒 */ - protected void executeTaskIfMatchInternal(long millis) { + protected void executeTaskIfMatchInternal(Scheduler scheduler, long millis) { for (int i = 0; i < size; i++) { - if (patterns.get(i).match(timezone, millis, this.scheduler.matchSecond)) { - this.scheduler.manager.spawnExecutor(tasks.get(i)); + if (patterns.get(i).match(scheduler.config.timezone, millis, scheduler.config.matchSecond)) { + scheduler.manager.spawnExecutor(new CronTask(ids.get(i), patterns.get(i), tasks.get(i))); } } } diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/Scheduler.java b/bus-cron/src/main/java/org/aoju/bus/cron/Scheduler.java index 6cacec134b..0fb343fbca 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/Scheduler.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/Scheduler.java @@ -21,9 +21,11 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cron; +import org.aoju.bus.core.key.UUID; import org.aoju.bus.core.lang.Symbol; import org.aoju.bus.core.lang.exception.InstrumentException; import org.aoju.bus.core.thread.ExecutorBuilder; @@ -36,13 +38,15 @@ import org.aoju.bus.cron.listener.TaskListener; import org.aoju.bus.cron.listener.TaskListenerManager; import org.aoju.bus.cron.pattern.CronPattern; +import org.aoju.bus.logger.Logger; import org.aoju.bus.setting.magic.PopSetting; import java.util.LinkedHashMap; import java.util.Map.Entry; import java.util.TimeZone; -import java.util.UUID; import java.util.concurrent.ExecutorService; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; /** * 任务调度器 @@ -50,65 +54,64 @@ * 调度器启动流程: * *
- * 启动Timer -  启动TaskLauncher -  启动TaskExecutor
+ * 启动Timer -  启动Launcher -  启动Executor
  * 
*

* 调度器关闭流程: * *

- * 关闭Timer -  关闭所有运行中的TaskLauncher -  关闭所有运行中的TaskExecutor
+ * 关闭Timer -  关闭所有运行中的Launcher -  关闭所有运行中的Executor
  * 
*

* 其中: * *

- * TaskLauncher:定时器每分钟调用一次(如果{@link Scheduler#isMatchSecond()}为true每秒调用一次),
- * 负责检查TaskTable是否有匹配到此时间运行的Task
+ * Launcher:定时器每分钟调用一次(如果{@link Scheduler#isMatchSecond()}为true每秒调用一次),
+ * 负责检查Repertoire是否有匹配到此时间运行的Task
  * 
* *
- * TaskExecutor:TaskLauncher匹配成功后,触发TaskExecutor执行具体的作业,执行完毕销毁
+ * Executor:Launcher匹配成功后,触发Executor执行具体的作业,执行完毕销毁
  * 
* * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Scheduler { /** - * 是否支持秒匹配 + * 同步锁 */ - protected boolean matchSecond = false; + private final Lock lock = new ReentrantLock(); /** * 是否为守护线程 */ protected boolean daemon; /** - * 定时任务表 - */ - protected Repertoire repertoire = new Repertoire(this); - /** - * 启动器管理器 + * 启动管理器 */ protected Supervisor supervisor; /** - * 执行器管理器 + * 执行管理器 */ protected Manager manager; - /** - * 监听管理器列表 - */ - protected TaskListenerManager listenerManager = new TaskListenerManager(); /** * 线程池 */ protected ExecutorService threadExecutor; - private Object lock = new Object(); /** - * 时区 + * 定时任务配置 + */ + protected Configure config = new Configure(); + /** + * 定时任务表 + */ + protected Repertoire repertoire = new Repertoire(); + /** + * 监听管理器列表 */ - private TimeZone timezone; + protected TaskListenerManager listenerManager = new TaskListenerManager(); /** * 是否已经启动 */ @@ -119,23 +122,23 @@ public class Scheduler { private CronTimer timer; /** - * 获得时区,默认为 {@link TimeZone#getDefault()} + * 设置时区 * - * @return 时区 + * @param timeZone 时区 + * @return this */ - public TimeZone getTimeZone() { - return timezone != null ? timezone : TimeZone.getDefault(); + public Scheduler setTimeZone(TimeZone timeZone) { + this.config.setTimeZone(timeZone); + return this; } /** - * 设置时区 + * 是否为守护线程 * - * @param timezone 时区 - * @return this + * @return 是否为守护线程 */ - public Scheduler setTimeZone(TimeZone timezone) { - this.timezone = timezone; - return this; + public boolean isDaemon() { + return this.daemon; } /** @@ -147,31 +150,25 @@ public Scheduler setTimeZone(TimeZone timezone) { * @throws InstrumentException 定时任务已经启动抛出此异常 */ public Scheduler setDaemon(boolean on) throws InstrumentException { - synchronized (lock) { - if (started) { + lock.lock(); + try { + if (this.started) { throw new InstrumentException("Scheduler already started!"); } this.daemon = on; + } finally { + lock.unlock(); } return this; } - /** - * 是否为守护线程 - * - * @return 是否为守护线程 - */ - public boolean isDeamon() { - return this.daemon; - } - /** * 是否支持秒匹配 * * @return true使用,false不使用 */ public boolean isMatchSecond() { - return this.matchSecond; + return this.config.isMatchSecond(); } /** @@ -181,7 +178,7 @@ public boolean isMatchSecond() { * @return this */ public Scheduler setMatchSecond(boolean isMatchSecond) { - this.matchSecond = isMatchSecond; + this.config.setMatchSecond(isMatchSecond); return this; } @@ -225,6 +222,7 @@ public Scheduler schedule(PopSetting cronSetting) { jobClass = group + Symbol.DOT + jobClass; } final String pattern = entry.getValue(); + Logger.debug("Load job: {} {}", pattern, jobClass); try { schedule(pattern, new InvokeTask(jobClass)); } catch (Exception e) { @@ -320,6 +318,15 @@ public Scheduler updatePattern(String id, CronPattern pattern) { return this; } + /** + * 获取定时任务表,注意此方法返回非复制对象,对返回对象的修改将影响已有定时任务 + * + * @return 定时任务表 {@link Repertoire} + */ + public Repertoire getTaskTable() { + return this.repertoire; + } + /** * 获得指定id的{@link CronPattern} * @@ -364,7 +371,7 @@ public int size() { * @return this */ public Scheduler clear() { - this.repertoire = new Repertoire(this); + this.repertoire = new Repertoire(); return this; } @@ -392,7 +399,8 @@ public Scheduler start(boolean isDeamon) { * @return this */ public Scheduler start() { - synchronized (lock) { + lock.lock(); + try { if (this.started) { throw new InstrumentException("Schedule is started!"); } @@ -408,6 +416,8 @@ public Scheduler start() { timer.setDaemon(this.daemon); timer.start(); this.started = true; + } finally { + lock.unlock(); } return this; } @@ -431,7 +441,8 @@ public Scheduler stop() { * @return this */ public Scheduler stop(boolean clearTasks) { - synchronized (lock) { + lock.lock(); + try { if (false == started) { throw new IllegalStateException("Scheduler not started !"); } @@ -451,6 +462,8 @@ public Scheduler stop(boolean clearTasks) { // 修改标志 started = false; + } finally { + lock.unlock(); } return this; } diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/Strategy.java b/bus-cron/src/main/java/org/aoju/bus/cron/Strategy.java index 8ccce3d481..966e41ac72 100644 --- a/bus-cron/src/main/java/org/aoju/bus/cron/Strategy.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/Strategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cron; @@ -28,7 +29,7 @@ * 任务执行规则 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum Strategy { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/Supervisor.java b/bus-cron/src/main/java/org/aoju/bus/cron/Supervisor.java index 8b779438b2..455dc9d0ba 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/Supervisor.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/Supervisor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cron; @@ -31,7 +32,7 @@ * 作业启动管理器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Supervisor { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/annotation/Crontab.java b/bus-cron/src/main/java/org/aoju/bus/cron/annotation/Crontab.java index 15f247421e..daf691754f 100644 --- a/bus-cron/src/main/java/org/aoju/bus/cron/annotation/Crontab.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/annotation/Crontab.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cron.annotation; @@ -32,7 +33,7 @@ * annotation for cron handler * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Target({ElementType.TYPE}) diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/factory/CronTask.java b/bus-cron/src/main/java/org/aoju/bus/cron/factory/CronTask.java new file mode 100644 index 0000000000..8bc41fecc3 --- /dev/null +++ b/bus-cron/src/main/java/org/aoju/bus/cron/factory/CronTask.java @@ -0,0 +1,99 @@ +/********************************************************************************* + * * + * The MIT License (MIT) * + * * + * Copyright (c) 2015-2020 aoju.org and other contributors. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy * + * of this software and associated documentation files (the "Software"), to deal * + * in the Software without restriction, including without limitation the rights * + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * + * THE SOFTWARE. * + * * + ********************************************************************************/ +package org.aoju.bus.cron.factory; + +import org.aoju.bus.cron.pattern.CronPattern; + +/** + * 定时作业,除了定义了作业,也定义了作业的执行周期以及ID + * + * @author Kimi Liu + * @version 6.1.2 + * @since JDK 1.8+ + */ +public class CronTask implements Task { + + private final String id; + private final Task task; + private CronPattern pattern; + + /** + * 构造 + * + * @param id ID + * @param pattern 表达式 + * @param task 作业 + */ + public CronTask(String id, CronPattern pattern, Task task) { + this.id = id; + this.pattern = pattern; + this.task = task; + } + + @Override + public void execute() { + task.execute(); + } + + /** + * 获取作业ID + * + * @return 作业ID + */ + public String getId() { + return id; + } + + /** + * 获取表达式 + * + * @return 表达式 + */ + public CronPattern getPattern() { + return pattern; + } + + /** + * 设置新的定时表达式 + * + * @param pattern 表达式 + * @return this + */ + public CronTask setPattern(CronPattern pattern) { + this.pattern = pattern; + return this; + } + + /** + * 获取原始作业 + * + * @return 作业 + */ + public Task getRaw() { + return this.task; + } + +} diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/factory/InvokeTask.java b/bus-cron/src/main/java/org/aoju/bus/cron/factory/InvokeTask.java index d94cd33628..369dc922c2 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/factory/InvokeTask.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/factory/InvokeTask.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cron.factory; @@ -38,7 +39,7 @@ * 如果是静态方法直接执行,如果是对象方法,需要类有默认的构造方法 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class InvokeTask implements Task { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/factory/RunnableTask.java b/bus-cron/src/main/java/org/aoju/bus/cron/factory/RunnableTask.java index 1a712d7d5b..55ec8de4b3 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/factory/RunnableTask.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/factory/RunnableTask.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cron.factory; @@ -28,7 +29,7 @@ * {@link Runnable} 的 {@link Task}包装 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RunnableTask implements Task { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/factory/Task.java b/bus-cron/src/main/java/org/aoju/bus/cron/factory/Task.java index bd905f46b3..732444cf1b 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/factory/Task.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/factory/Task.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cron.factory; @@ -28,9 +29,10 @@ * 定时作业接口,通过实现execute方法执行具体的任务 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ +@FunctionalInterface public interface Task { /** diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/listener/SimpleTaskListener.java b/bus-cron/src/main/java/org/aoju/bus/cron/listener/SimpleTaskListener.java index 4d216fe556..6c7239b8e3 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/listener/SimpleTaskListener.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/listener/SimpleTaskListener.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cron.listener; @@ -31,7 +32,7 @@ * 继承此监听后实现需要的方法即可 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SimpleTaskListener implements TaskListener { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/listener/TaskListener.java b/bus-cron/src/main/java/org/aoju/bus/cron/listener/TaskListener.java index e82ff54992..3bbbd85750 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/listener/TaskListener.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/listener/TaskListener.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cron.listener; @@ -31,7 +32,7 @@ * 通过实现此接口,实现对定时任务的各个环节做监听 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface TaskListener { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/listener/TaskListenerManager.java b/bus-cron/src/main/java/org/aoju/bus/cron/listener/TaskListenerManager.java index 77e9aa321a..198685beae 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/listener/TaskListenerManager.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/listener/TaskListenerManager.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cron.listener; @@ -34,7 +35,7 @@ * 监听调度器,统一管理监听 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TaskListenerManager { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/CronPattern.java b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/CronPattern.java index bfeaa7de21..65b9057afc 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/CronPattern.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/CronPattern.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cron.pattern; @@ -92,7 +93,7 @@ * * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CronPattern { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/AlwaysTrueValueMatcher.java b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/AlwaysTrueValueMatcher.java index 245691967a..cf37de3da3 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/AlwaysTrueValueMatcher.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/AlwaysTrueValueMatcher.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cron.pattern.matcher; @@ -30,7 +31,7 @@ * 值匹配,始终返回true * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AlwaysTrueValueMatcher implements ValueMatcher { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/BoolArrayValueMatcher.java b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/BoolArrayValueMatcher.java index 69ea092e7c..9a3169dccc 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/BoolArrayValueMatcher.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/BoolArrayValueMatcher.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cron.pattern.matcher; @@ -33,7 +34,7 @@ * 将表达式中的数字值列表转换为Boolean数组,匹配时匹配相应数组位 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BoolArrayValueMatcher implements ValueMatcher { @@ -57,6 +58,7 @@ public boolean match(Integer value) { @Override public String toString() { - return StringKit.format("Matcher:{}", this.bValues); + return StringKit.format("Matcher:{}", new Object[]{this.bValues}); } + } diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/DayOfMonthValueMatcher.java b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/DayOfMonthValueMatcher.java index a8c80cdf2e..808c6a464e 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/DayOfMonthValueMatcher.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/DayOfMonthValueMatcher.java @@ -21,9 +21,12 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cron.pattern.matcher; +import org.aoju.bus.core.lang.Fields; + import java.util.List; /** @@ -31,19 +34,26 @@ * 考虑每月的天数不同,切存在闰年情况,日匹配单独使用 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DayOfMonthValueMatcher extends BoolArrayValueMatcher { - private static final int[] LAST_DAYS = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; - + /** + * 构造 + * + * @param intValueList 匹配的日值 + */ public DayOfMonthValueMatcher(List intValueList) { super(intValueList); } /** - * 是否为本月最后一天 + * 是否为本月最后一天,规则如下: + *
+     * 1、闰年2月匹配是否为29
+     * 2、其它月份是否匹配最后一天的日期(可能为30或者31)
+     * 
* * @param value 被检查的值 * @param month 月份 @@ -51,23 +61,20 @@ public DayOfMonthValueMatcher(List intValueList) { * @return 是否为本月最后一天 */ private static boolean isLastDayOfMonth(int value, int month, boolean isLeapYear) { - if (isLeapYear && month == 2) { - return value == 29; - } else { - return value == LAST_DAYS[month - 1]; - } + return value == Fields.Month.getLastDay(month, isLeapYear); } /** - * 是否匹配 + * 给定的日期是否匹配当前匹配器 * - * @param value 被检查的值 - * @param month 月份 + * @param value 被检查的值,此处为日 + * @param month 实际的月份 * @param isLeapYear 是否闰年 * @return 是否匹配 */ public boolean match(int value, int month, boolean isLeapYear) { - return (super.match(value) || (value > 27 && match(32) && isLastDayOfMonth(value, month, isLeapYear))); + return (super.match(value) + || (value > 27 && match(32) && isLastDayOfMonth(value, month, isLeapYear))); } } diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/ValueMatcher.java b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/ValueMatcher.java index c1dac252a2..4a845bba33 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/ValueMatcher.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/ValueMatcher.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cron.pattern.matcher; @@ -31,7 +32,7 @@ * 用于匹配日期位中对应数字是否匹配 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface ValueMatcher extends Matcher { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/ValueMatcherBuilder.java b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/ValueMatcherBuilder.java index b95c9bf012..daf4d23325 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/ValueMatcherBuilder.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/ValueMatcherBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cron.pattern.matcher; @@ -40,7 +41,7 @@ * {@link ValueMatcher} 构建器,用于构建表达式中每一项的匹配器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ValueMatcherBuilder { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/YearValueMatcher.java b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/YearValueMatcher.java index 12a948fbe8..87a29f9a2e 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/YearValueMatcher.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/YearValueMatcher.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cron.pattern.matcher; @@ -31,7 +32,7 @@ * 考虑年数字太大,不适合boolean数组,单独使用列表遍历匹配 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class YearValueMatcher implements ValueMatcher { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/DayOfMonthValueParser.java b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/DayOfMonthValueParser.java index d2378a291d..0b20f13f90 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/DayOfMonthValueParser.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/DayOfMonthValueParser.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cron.pattern.parser; @@ -32,7 +33,7 @@ * 每月最多31天,32和“L”都表示最后一天 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DayOfMonthValueParser extends SimpleValueParser { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/DayOfWeekValueParser.java b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/DayOfWeekValueParser.java index 7eccbd0be0..ff99f13547 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/DayOfWeekValueParser.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/DayOfWeekValueParser.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cron.pattern.parser; @@ -31,7 +32,7 @@ * 1表示星期一,2表示星期二,依次类推,0和7都可以表示星期日 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DayOfWeekValueParser extends SimpleValueParser { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/HourValueParser.java b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/HourValueParser.java index 95914011cd..df726c6bd5 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/HourValueParser.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/HourValueParser.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cron.pattern.parser; @@ -28,7 +29,7 @@ * 小时值处理 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HourValueParser extends SimpleValueParser { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/MinuteValueParser.java b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/MinuteValueParser.java index 24c5e6e430..6f55949bdd 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/MinuteValueParser.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/MinuteValueParser.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cron.pattern.parser; @@ -28,7 +29,7 @@ * 分钟值处理 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MinuteValueParser extends SimpleValueParser { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/MonthValueParser.java b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/MonthValueParser.java index a54e639d4b..a71d0c4cbd 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/MonthValueParser.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/MonthValueParser.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cron.pattern.parser; @@ -30,7 +31,7 @@ * 月份值处理 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MonthValueParser extends SimpleValueParser { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/SecondValueParser.java b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/SecondValueParser.java index a44ad2fcf2..e683c08f95 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/SecondValueParser.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/SecondValueParser.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cron.pattern.parser; @@ -28,7 +29,7 @@ * 秒值处理 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SecondValueParser extends MinuteValueParser { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/SimpleValueParser.java b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/SimpleValueParser.java index e336536057..55823feb32 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/SimpleValueParser.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/SimpleValueParser.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cron.pattern.parser; @@ -30,7 +31,7 @@ * 简易值转换器 将给定String值转为int * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SimpleValueParser implements ValueParser { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/ValueParser.java b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/ValueParser.java index fc5ac4e727..b65f64877e 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/ValueParser.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/ValueParser.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cron.pattern.parser; @@ -29,7 +30,7 @@ * 值处理用于限定表达式中相应位置的值范围,并转换表达式值为int值 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface ValueParser { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/YearValueParser.java b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/YearValueParser.java index ad77f89ede..d6f21bc15b 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/YearValueParser.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/YearValueParser.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.cron.pattern.parser; @@ -28,7 +29,7 @@ * 年值处理 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class YearValueParser extends SimpleValueParser { diff --git a/bus-crypto/pom.xml b/bus-crypto/pom.xml index b3bd12a7b4..dc2787e517 100755 --- a/bus-crypto/pom.xml +++ b/bus-crypto/pom.xml @@ -6,34 +6,13 @@ org.aoju bus-crypto - 6.1.1 + 6.1.2 jar ${project.artifactId} Bus Crypto https://github.com/aoju/bus - - UTF-8 - UTF-8 - 1.8 - 1.66 - - - - - ${project.groupId} - bus-logger - ${project.version} - - - org.bouncycastle - bcprov-jdk15on - ${bouncycastle.version} - true - - - The MIT License (MIT) @@ -59,6 +38,27 @@ https://github.com/aoju/bus/issues + + UTF-8 + UTF-8 + 1.8 + 1.67 + + + + + ${project.groupId} + bus-logger + ${project.version} + + + org.bouncycastle + bcprov-jdk15on + ${bouncycastle.version} + true + + + diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/Builder.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/Builder.java index 3e8b356ed1..cdf9e29b15 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/Builder.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/Builder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto; @@ -87,7 +88,7 @@ * 3、摘要加密(digest),例如:MD5、SHA-1、SHA-256、HMAC等 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Builder { @@ -227,16 +228,7 @@ public static SecretKey generateKey(String algorithm) { * @return {@link SecretKey} */ public static SecretKey generateKey(String algorithm, int keySize) { - algorithm = getMainAlgorithm(algorithm); - - final KeyGenerator keyGenerator = getKeyGenerator(algorithm); - if (keySize > 0) { - keyGenerator.init(keySize); - } else if (Algorithm.AES.equals(algorithm)) { - // 对于AES的密钥,除非指定,否则强制使用128位 - keyGenerator.init(128); - } - return keyGenerator.generateKey(); + return generateKey(algorithm, keySize, null); } /** @@ -251,7 +243,7 @@ public static SecretKey generateKey(String algorithm, byte[] key) { SecretKey secretKey; if (algorithm.startsWith("PBE")) { // PBE密钥 - secretKey = generatePBEKey(algorithm, (null == key) ? null : StringKit.toString(key, Charset.UTF_8).toCharArray()); + secretKey = generatePBEKey(algorithm, (null == key) ? null : StringKit.toString(key).toCharArray()); } else if (algorithm.startsWith(Algorithm.DES)) { // DES密钥 secretKey = generateDESKey(algorithm, key); @@ -262,6 +254,34 @@ public static SecretKey generateKey(String algorithm, byte[] key) { return secretKey; } + /** + * 生成 {@link SecretKey},仅用于对称加密和摘要算法密钥生成
+ * 当指定keySize<0时,AES默认长度为128,其它算法不指定。 + * + * @param algorithm 算法,支持PBE算法 + * @param keySize 密钥长度,<0表示不设定密钥长度,即使用默认长度 + * @param random 随机数生成器,null表示默认 + * @return {@link SecretKey} + */ + public static SecretKey generateKey(String algorithm, int keySize, SecureRandom random) { + algorithm = getMainAlgorithm(algorithm); + + final KeyGenerator keyGenerator = getKeyGenerator(algorithm); + if (keySize <= 0 && Algorithm.AES.equals(algorithm)) { + // 对于AES的密钥,除非指定,否则强制使用128位 + keySize = 128; + } + + if (keySize > 0) { + if (null == random) { + keyGenerator.init(keySize); + } else { + keyGenerator.init(keySize, random); + } + } + return keyGenerator.generateKey(); + } + /** * 生成 {@link SecretKey} * diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/Holder.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/Holder.java index daba0e7da8..284afb0473 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/Holder.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/Holder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto; @@ -30,7 +31,7 @@ * 全局单例的 org.bouncycastle.jce.provider.BouncyCastleProvider 对象 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Holder { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/Mode.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/Mode.java index c7c4c74a3b..ff2e8cc8af 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/Mode.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/Mode.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto; @@ -30,7 +31,7 @@ * 在加密时对明文分组的模式,它代表了不同的分组方式 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum Mode { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/Padding.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/Padding.java index 528072c865..7bab7c9a6a 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/Padding.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/Padding.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto; @@ -30,7 +31,7 @@ * 需要在最后一个分组中填充一些数据使其凑满一个分组的长度。 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum Padding { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/Provider.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/Provider.java index c9a072762b..b993192370 100755 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/Provider.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/Provider.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Provider { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/Registry.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/Registry.java index e8faf81fad..08f183e628 100755 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/Registry.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/Registry.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto; @@ -37,7 +38,7 @@ * 注解和实现之间映射 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Registry { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/Asymmetric.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/Asymmetric.java index 0e51f731de..095b37bbbd 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/Asymmetric.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/Asymmetric.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto.asymmetric; @@ -49,7 +50,7 @@ * * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Asymmetric extends Safety { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/KeyType.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/KeyType.java index 85817f8605..d46dcb6b86 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/KeyType.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/KeyType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto.asymmetric; @@ -28,7 +29,7 @@ * 密钥类型 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum KeyType { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/Keys.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/Keys.java index b5eff28690..ac42f2e842 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/Keys.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/Keys.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto.asymmetric; @@ -40,7 +41,7 @@ * 非对称基础,提供锁、私钥和公钥的持有 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Keys> { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/RSA.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/RSA.java index 98bb928e29..68b7429fc7 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/RSA.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/RSA.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto.asymmetric; @@ -51,7 +52,7 @@ *

* * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RSA extends Asymmetric { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/SM2.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/SM2.java index 669aba359b..1001a338d5 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/SM2.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/SM2.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto.asymmetric; @@ -52,7 +53,7 @@ * SM2算法只支持公钥加密,私钥解密 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SM2 extends Safety { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/Safety.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/Safety.java index c58aa5e1a9..16fda53794 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/Safety.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/Safety.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto.asymmetric; @@ -42,7 +43,7 @@ * * @param 返回自身类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class Safety> extends Keys { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/Sign.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/Sign.java index a1af6af8aa..b2cacb8e24 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/Sign.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/Sign.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto.asymmetric; @@ -39,7 +40,7 @@ * 签名包装,{@link Signature} 包装类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Sign extends Keys { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/BCrypt.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/BCrypt.java index ea2af2263e..57c298e7fd 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/BCrypt.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/BCrypt.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto.digest; @@ -36,7 +37,7 @@ * 它的口令必须是8至56个字符,并将在内部被转化为448位的密钥 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BCrypt { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/Digester.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/Digester.java index f1e38251de..ce3a28a6d4 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/Digester.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/Digester.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto.digest; @@ -42,7 +43,7 @@ * 注意:此对象实例化后为非线程安全! * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Digester implements Serializable { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/HMac.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/HMac.java index 346754bb1d..9380b624c0 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/HMac.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/HMac.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto.digest; @@ -50,7 +51,7 @@ * 注意:此对象实例化后为非线程安全! * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HMac implements Serializable { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/MD5.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/MD5.java index ee63b9da0d..3b58103d5c 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/MD5.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/MD5.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto.digest; @@ -35,7 +36,7 @@ * MD5算法 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MD5 extends Digester { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/SM3.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/SM3.java index 0bad827b4d..7c2c694b92 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/SM3.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/SM3.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto.digest; @@ -30,7 +31,7 @@ * SM3算法 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SM3 extends Digester { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/mac/BCHMacEngine.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/mac/BCHMacEngine.java index 084336308d..c5a9aad6ba 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/mac/BCHMacEngine.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/mac/BCHMacEngine.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto.digest.mac; @@ -40,7 +41,7 @@ * 当引入BouncyCastle库时自动使用其作为Provider * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BCHMacEngine implements MacEngine { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/mac/DefaultHMacEngine.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/mac/DefaultHMacEngine.java index 18528da16d..7a66e42118 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/mac/DefaultHMacEngine.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/mac/DefaultHMacEngine.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto.digest.mac; @@ -40,7 +41,7 @@ * 当引入BouncyCastle库时自动使用其作为Provider * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DefaultHMacEngine implements MacEngine { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/mac/MacEngine.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/mac/MacEngine.java index 44ab945b7a..0a40bbc732 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/mac/MacEngine.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/mac/MacEngine.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto.digest.mac; @@ -32,7 +33,7 @@ * MAC(Message Authentication Code)算法引擎 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface MacEngine { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/mac/MacEngineFactory.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/mac/MacEngineFactory.java index b8e44d6db2..885c79936c 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/mac/MacEngineFactory.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/mac/MacEngineFactory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto.digest.mac; @@ -33,7 +34,7 @@ * {@link MacEngine} 实现工厂类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MacEngineFactory { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/AESProvider.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/AESProvider.java index 8ef29251c1..a6bfd02c5a 100755 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/AESProvider.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/AESProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto.provider; @@ -38,7 +39,7 @@ * 达到十亿量级 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AESProvider implements Provider { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/DESProvider.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/DESProvider.java index 6af546a58a..5ddb19bc43 100755 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/DESProvider.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/DESProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto.provider; @@ -34,7 +35,7 @@ * 数据加密标准,速度较快,适用于加密大量数据的场合 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DESProvider implements Provider { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/RC4Provider.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/RC4Provider.java index 250dbcfd8b..2dad1e0ee2 100755 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/RC4Provider.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/RC4Provider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto.provider; @@ -38,7 +39,7 @@ * 达到十亿量级 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RC4Provider implements Provider { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/RSAProvider.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/RSAProvider.java index f4a03b256f..db8ef4379e 100755 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/RSAProvider.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/RSAProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto.provider; @@ -36,7 +37,7 @@ * RSA 加密解密算法 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RSAProvider implements Provider { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/SM2Provider.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/SM2Provider.java index 6ef85384ec..6df714970a 100755 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/SM2Provider.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/SM2Provider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto.provider; @@ -37,7 +38,7 @@ * RSA 加密解密算法 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SM2Provider implements Provider { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/SM4Provider.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/SM4Provider.java index 6de8098521..84a93f44ba 100755 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/SM4Provider.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/SM4Provider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto.provider; @@ -39,7 +40,7 @@ * 达到十亿量级 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SM4Provider implements Provider { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/AES.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/AES.java index a73c7798e6..e4651c46b7 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/AES.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/AES.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto.symmetric; @@ -48,7 +49,7 @@ * 相关概念见:https://blog.csdn.net/OrangeJack/article/details/82913804 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AES extends Symmetric { @@ -71,6 +72,15 @@ public AES(byte[] key) { super(Algorithm.AES, key); } + /** + * 构造,使用默认的AES/ECB/PKCS5Padding + * + * @param key 密钥 + */ + public AES(SecretKey key) { + super(Algorithm.AES, key); + } + /** * 构造,使用随机密钥 * diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/DES.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/DES.java index 3bbde68548..5c0643111f 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/DES.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/DES.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto.symmetric; @@ -39,7 +40,7 @@ * Java中默认实现为:DES/CBC/PKCS5Padding * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DES extends Symmetric { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/DESede.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/DESede.java index 9b88ab1df6..933ea8eb75 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/DESede.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/DESede.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto.symmetric; @@ -40,7 +41,7 @@ * Java中默认实现为:DESede/ECB/PKCS5Padding * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DESede extends Symmetric { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/RC4.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/RC4.java index c7dd4cd225..c88f6a9bd7 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/RC4.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/RC4.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto.symmetric; @@ -39,7 +40,7 @@ * RC4加密解密算法实现 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RC4 implements Serializable { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/SM4.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/SM4.java index 49c8bf36cd..8bae222567 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/SM4.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/SM4.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto.symmetric; @@ -38,7 +39,7 @@ * SM4实现 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SM4 extends Symmetric { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/Symmetric.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/Symmetric.java index f61fe4836d..54cfc54585 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/Symmetric.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/Symmetric.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto.symmetric; @@ -49,7 +50,7 @@ * 在对称加密算法中,使用的密钥只有一个,发收信双方都使用这个密钥对数据进行加密和解密,这就要求解密方事先必须知道加密密钥。 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Symmetric implements Serializable { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/Vigenere.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/Vigenere.java index 6f51c034d1..3dc8a7c008 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/Vigenere.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/Vigenere.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.crypto.symmetric; @@ -30,7 +31,7 @@ * 算法实现来自:https://github.com/zhaorenjie110/SymmetricEncryptionAndDecryption * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Vigenere { diff --git a/bus-extra/pom.xml b/bus-extra/pom.xml index 224fb62c46..f8c2428fb8 100755 --- a/bus-extra/pom.xml +++ b/bus-extra/pom.xml @@ -6,25 +6,51 @@ org.aoju bus-extra - 6.1.1 + 6.1.2 jar ${project.artifactId} Bus Extra https://github.com/aoju/bus + + + The MIT License (MIT) + https://opensource.org/licenses/MIT + + + + + scm:git@github.com:aoju/bus.git + scm:git@github.com:aoju/bus.git + git@github.com:aoju/bus.git + + + + + Kimi Liu + https://github.com/aoju/bus.git + + + + + Github Issue + https://github.com/aoju/bus/issues + + UTF-8 UTF-8 1.8 - 1.18.12 - 1.2.73 + 1.18.16 + 1.2.75 2.8.6 2.11.2 1.26 1.1.8 2.5.1 2.0.3.RELEASE + 1.0.0 0.1.54 3.4.1 3.7 @@ -90,6 +116,12 @@ ${tiny.version} true + + com.rnkrsoft.bopomofo4j + bopomofo4j + ${bopomofo4j.version} + true + com.jcraft jsch @@ -108,6 +140,19 @@ ${net.version} true + + org.apache.ftpserver + ftpserver-core + 1.1.1 + compile + + + slf4j-api + org.slf4j + + + true + com.vdurmont emoji-java @@ -146,31 +191,6 @@ - - - The MIT License (MIT) - https://opensource.org/licenses/MIT - - - - - scm:git@github.com:aoju/bus.git - scm:git@github.com:aoju/bus.git - git@github.com:aoju/bus.git - - - - - Kimi Liu - https://github.com/aoju/bus.git - - - - - Github Issue - https://github.com/aoju/bus/issues - - diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/CaptchaBuilder.java b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/CaptchaBuilder.java index 2c8c7d06d2..fbfa001179 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/CaptchaBuilder.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/CaptchaBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.captcha; @@ -32,7 +33,7 @@ * 图形验证码工具 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CaptchaBuilder { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/CaptchaProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/CaptchaProvider.java index 38d5d637b5..36516a7e8b 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/CaptchaProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/CaptchaProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.captcha; @@ -30,7 +31,7 @@ * 验证码接口,提供验证码对象接口定义 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface CaptchaProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/AbstractProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/AbstractProvider.java index 99899bd201..15d6b42e94 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/AbstractProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/AbstractProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.captcha.provider; @@ -46,7 +47,7 @@ * 实现类通过实现{@link #createImage(String)} 方法生成图片对象 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractProvider implements CaptchaProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/CircleProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/CircleProvider.java index 82247120a2..d0b66f7123 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/CircleProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/CircleProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.captcha.provider; @@ -36,7 +37,7 @@ * 圆圈干扰验证码 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CircleProvider extends AbstractProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/ClickWordProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/ClickWordProvider.java index 9431ace314..e0c9db5b54 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/ClickWordProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/ClickWordProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.captcha.provider; @@ -32,7 +33,7 @@ * 点选文字验证码 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ClickWordProvider extends AbstractProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/LineProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/LineProvider.java index 00522c17e7..1e338037ec 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/LineProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/LineProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.captcha.provider; @@ -36,7 +37,7 @@ * 普通干扰线验证码 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class LineProvider extends AbstractProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/PuzzleProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/PuzzleProvider.java index 3373413abc..f0cd79dbfa 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/PuzzleProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/PuzzleProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.captcha.provider; @@ -32,7 +33,7 @@ * 滑动验证码 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PuzzleProvider extends AbstractProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/ShearProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/ShearProvider.java index fb0404ad80..f25eb2f3ce 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/ShearProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/ShearProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.captcha.provider; @@ -35,7 +36,7 @@ * 扭曲干扰验证码 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ShearProvider extends AbstractProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/strategy/AbstractStrategy.java b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/strategy/AbstractStrategy.java index 6f27a23f61..9f646a1785 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/strategy/AbstractStrategy.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/strategy/AbstractStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.captcha.strategy; @@ -31,7 +32,7 @@ * 可以通过传入的基础集合和长度随机生成验证码字符 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractStrategy implements CodeStrategy { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/strategy/CodeStrategy.java b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/strategy/CodeStrategy.java index d38d328768..8809907927 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/strategy/CodeStrategy.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/strategy/CodeStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.captcha.strategy; @@ -28,7 +29,7 @@ * 验证码文字生成器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface CodeStrategy { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/strategy/MathStrategy.java b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/strategy/MathStrategy.java index bc13127c1e..813af0ea43 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/strategy/MathStrategy.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/strategy/MathStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.captcha.strategy; @@ -33,7 +34,7 @@ * 数字计算验证码生成器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MathStrategy implements CodeStrategy { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/strategy/RandomStrategy.java b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/strategy/RandomStrategy.java index defba35898..5dc2535d62 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/strategy/RandomStrategy.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/strategy/RandomStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.captcha.strategy; @@ -32,7 +33,7 @@ * 可以通过传入的基础集合和长度随机生成验证码字符 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RandomStrategy extends AbstractStrategy { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/effect/EffectFactory.java b/bus-extra/src/main/java/org/aoju/bus/extra/effect/EffectFactory.java index 2b72f2d007..ddda43a18d 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/effect/EffectFactory.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/effect/EffectFactory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.effect; @@ -34,7 +35,7 @@ * 解压缩服务工厂 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum EffectFactory { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/effect/EffectProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/effect/EffectProvider.java index fd3068aa51..e660e573be 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/effect/EffectProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/effect/EffectProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.effect; @@ -30,7 +31,7 @@ * 数据压缩/解压缩 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface EffectProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/Bzip2Provider.java b/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/Bzip2Provider.java index 3c428917f4..7fbe7c5ad3 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/Bzip2Provider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/Bzip2Provider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.effect.provider; @@ -36,7 +37,7 @@ * 基于bzip2算法的数据解压缩 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Bzip2Provider implements EffectProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/DeflaterProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/DeflaterProvider.java index a24179a4ba..711bd0d26d 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/DeflaterProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/DeflaterProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.effect.provider; @@ -35,7 +36,7 @@ * 基于deflater算法的数据解压缩 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DeflaterProvider implements EffectProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/GzipProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/GzipProvider.java index 71766ab859..4260faff62 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/GzipProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/GzipProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.effect.provider; @@ -36,7 +37,7 @@ * 基于gzip算法的数据解压缩 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class GzipProvider implements EffectProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/Lz4Provider.java b/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/Lz4Provider.java index 9b08c23765..c507942302 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/Lz4Provider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/Lz4Provider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.effect.provider; @@ -35,7 +36,7 @@ * 基于lz4算法的数据解压缩 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Lz4Provider implements EffectProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/LzoProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/LzoProvider.java index eeab983d97..c28fc22d24 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/LzoProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/LzoProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.effect.provider; @@ -35,7 +36,7 @@ * 基于lzo算法的数据解压缩 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class LzoProvider implements EffectProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/SnappyProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/SnappyProvider.java index 71741b153f..d6f08d4dfa 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/SnappyProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/SnappyProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.effect.provider; @@ -33,7 +34,7 @@ * 基于snappy的数据压缩 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SnappyProvider implements EffectProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/emoji/EmojiKit.java b/bus-extra/src/main/java/org/aoju/bus/extra/emoji/EmojiKit.java index e415796ca0..961edcbae5 100755 --- a/bus-extra/src/main/java/org/aoju/bus/extra/emoji/EmojiKit.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/emoji/EmojiKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.emoji; @@ -36,7 +37,7 @@ * 基于emoji-java的Emoji表情工具类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class EmojiKit { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/ftp/AbstractFtp.java b/bus-extra/src/main/java/org/aoju/bus/extra/ftp/AbstractFtp.java index 6044570717..9bcced6134 100755 --- a/bus-extra/src/main/java/org/aoju/bus/extra/ftp/AbstractFtp.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/ftp/AbstractFtp.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.ftp; @@ -38,7 +39,7 @@ * 抽象FTP类,用于定义通用的FTP方法 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractFtp implements Closeable { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/ftp/Ftp.java b/bus-extra/src/main/java/org/aoju/bus/extra/ftp/Ftp.java index a4803b3bc4..1c3fc91486 100755 --- a/bus-extra/src/main/java/org/aoju/bus/extra/ftp/Ftp.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/ftp/Ftp.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.ftp; @@ -50,7 +51,7 @@ * 此客户端基于Apache-Commons-Net * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Ftp extends AbstractFtp { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/ftp/FtpConfig.java b/bus-extra/src/main/java/org/aoju/bus/extra/ftp/FtpConfig.java index 8faaa9f5f9..44391ad6d7 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/ftp/FtpConfig.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/ftp/FtpConfig.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.ftp; @@ -31,7 +32,7 @@ * FTP配置项参数信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FtpConfig implements Serializable { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/ftp/FtpMode.java b/bus-extra/src/main/java/org/aoju/bus/extra/ftp/FtpMode.java index 1b19c2bac5..ab8409bd58 100755 --- a/bus-extra/src/main/java/org/aoju/bus/extra/ftp/FtpMode.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/ftp/FtpMode.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.ftp; @@ -28,7 +29,7 @@ * FTP连接模式 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum FtpMode { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/ftp/FtpServer.java b/bus-extra/src/main/java/org/aoju/bus/extra/ftp/FtpServer.java new file mode 100644 index 0000000000..2e0700b262 --- /dev/null +++ b/bus-extra/src/main/java/org/aoju/bus/extra/ftp/FtpServer.java @@ -0,0 +1,250 @@ +/********************************************************************************* + * * + * The MIT License (MIT) * + * * + * Copyright (c) 2015-2020 aoju.org and other contributors. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy * + * of this software and associated documentation files (the "Software"), to deal * + * in the Software without restriction, including without limitation the rights * + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * + * THE SOFTWARE. * + * * + ********************************************************************************/ +package org.aoju.bus.extra.ftp; + +import org.aoju.bus.core.lang.Assert; +import org.aoju.bus.core.lang.exception.InstrumentException; +import org.aoju.bus.core.toolkit.NetKit; +import org.apache.ftpserver.ConnectionConfig; +import org.apache.ftpserver.FtpServerFactory; +import org.apache.ftpserver.ftplet.Authority; +import org.apache.ftpserver.ftplet.Ftplet; +import org.apache.ftpserver.ftplet.User; +import org.apache.ftpserver.ftplet.UserManager; +import org.apache.ftpserver.listener.ListenerFactory; +import org.apache.ftpserver.ssl.SslConfiguration; +import org.apache.ftpserver.ssl.SslConfigurationFactory; +import org.apache.ftpserver.usermanager.PropertiesUserManagerFactory; +import org.apache.ftpserver.usermanager.impl.BaseUser; +import org.apache.ftpserver.usermanager.impl.WritePermission; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +/** + * 基于 Apache FtpServer的服务端简单封装 + * + * @author Kimi Liu + * @version 6.1.2 + * @since JDK 1.8+ + */ +public class FtpServer { + + FtpServerFactory serverFactory; + ListenerFactory listenerFactory; + + /** + * 构造 + */ + public FtpServer() { + serverFactory = new FtpServerFactory(); + listenerFactory = new ListenerFactory(); + } + + /** + * 创建FTP服务器,调用{@link FtpServer#start()}启动即可 + * + * @return SimpleFtpServer + */ + public static FtpServer create() { + return new FtpServer(); + } + + /** + * 获取 {@link FtpServerFactory},用于设置FTP服务器相关信息 + * + * @return {@link FtpServerFactory} + */ + public FtpServerFactory getServerFactory() { + return this.serverFactory; + } + + /** + * 设置连接相关配置,使用ConnectionConfigFactory创建{@link ConnectionConfig}对象 + * + * @param connectionConfig 连接配置 + * @return this + */ + public FtpServer setConnectionConfig(ConnectionConfig connectionConfig) { + this.serverFactory.setConnectionConfig(connectionConfig); + return this; + } + + /** + * 获取{@link ListenerFactory},用于设置端口、用户、SSL等信息 + * + * @return {@link ListenerFactory} + */ + public ListenerFactory getListenerFactory() { + return this.listenerFactory; + } + + /** + * 自定义默认端口,如果不设置,使用默认端口:21 + * + * @param port 端口 + * @return this + */ + public FtpServer setPort(int port) { + Assert.isTrue(NetKit.isValidPort(port), "Invalid port!"); + this.listenerFactory.setPort(port); + return this; + } + + /** + * 获取用户管理器,用于新增、查找和删除用户信息 + * + * @return 用户管理器 + */ + public UserManager getUserManager() { + return this.serverFactory.getUserManager(); + } + + /** + * 自定义用户管理器,一般用于使用配置文件配置用户信息 + * + * @param userManager {@link UserManager} + * @return this + */ + public FtpServer setUserManager(UserManager userManager) { + this.serverFactory.setUserManager(userManager); + return this; + } + + /** + * 增加FTP用户 + * + * @param user FTP用户信息 + * @return this + */ + public FtpServer addUser(User user) { + try { + getUserManager().save(user); + } catch (org.apache.ftpserver.ftplet.FtpException e) { + throw new InstrumentException(e); + } + return this; + } + + /** + * 添加匿名用户 + * + * @param homePath 用户路径,匿名用户对此路径有读写权限 + * @return this + */ + public FtpServer addAnonymous(String homePath) { + BaseUser user = new BaseUser(); + user.setName("anonymous"); + user.setHomeDirectory(homePath); + List authorities = new ArrayList<>(); + // 添加用户读写权限 + authorities.add(new WritePermission()); + user.setAuthorities(authorities); + return addUser(user); + } + + /** + * 删除用户 + * + * @param userName 用户名 + * @return this + */ + public FtpServer delUser(String userName) { + try { + getUserManager().delete(userName); + } catch (org.apache.ftpserver.ftplet.FtpException e) { + throw new InstrumentException(e); + } + return this; + } + + /** + * 使用SSL安全连接,可以使用SslConfigurationFactory创建{@link SslConfiguration} + * + * @param ssl {@link SslConfiguration} + * @return this + */ + public FtpServer setSsl(SslConfiguration ssl) { + this.listenerFactory.setSslConfiguration(ssl); + listenerFactory.setImplicitSsl(true); + return this; + } + + /** + * 使用SSL安全连接 + * + * @param keystoreFile 密钥文件 + * @param password 密钥文件密码 + * @return this + */ + public FtpServer setSsl(File keystoreFile, String password) { + SslConfigurationFactory sslFactory = new SslConfigurationFactory(); + sslFactory.setKeystoreFile(keystoreFile); + sslFactory.setKeystorePassword(password); + return setSsl(sslFactory.createSslConfiguration()); + } + + /** + * 自定义用户信息配置文件,此方法会重置用户管理器 + * + * @param propertiesFile 配置文件 + * @return this + */ + public FtpServer setUsersConfig(File propertiesFile) { + final PropertiesUserManagerFactory userManagerFactory = new PropertiesUserManagerFactory(); + userManagerFactory.setFile(propertiesFile); + return this.setUserManager(userManagerFactory.createUserManager()); + } + + /** + * 增加FTP动作行为监听处理器,通过实现{@link Ftplet},可以对用户的行为监听并执行相应动作 + * + * @param name 名称 + * @param ftplet {@link Ftplet},用户自定义监听规则 + * @return this + */ + public FtpServer addFtplet(String name, Ftplet ftplet) { + this.serverFactory.getFtplets().put(name, ftplet); + return this; + } + + /** + * 启动FTP服务,阻塞当前线程 + * 一个Listener对应一个监听端口 + * 可以创建多个监听,此处默认只监听一个 + */ + public void start() { + + serverFactory.addListener("default", listenerFactory.createListener()); + try { + serverFactory.createServer().start(); + } catch (org.apache.ftpserver.ftplet.FtpException e) { + throw new InstrumentException(e); + } + } + +} diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/json/JsonFactory.java b/bus-extra/src/main/java/org/aoju/bus/extra/json/JsonFactory.java index 98cceeb706..e5fa128e6c 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/json/JsonFactory.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/json/JsonFactory.java @@ -21,24 +21,23 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.json; import org.aoju.bus.core.instance.Instances; import org.aoju.bus.core.lang.exception.InstrumentException; +import org.aoju.bus.core.toolkit.ClassKit; import org.aoju.bus.core.toolkit.StringKit; +import org.aoju.bus.extra.pinyin.PinyinProvider; import org.aoju.bus.logger.Logger; -import java.util.Iterator; -import java.util.ServiceConfigurationError; -import java.util.ServiceLoader; - /** * 用于根据用户引入的json库 * 自动创建对应的json解析器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JsonFactory { @@ -53,35 +52,18 @@ public static JsonProvider get() { } /** - * 根据用户引入的json解析工具jar,自动创建对应的json解析对象 - * 推荐创建的解析单例使用,此方法每次调用会返回新的解析器 + * 根据用户引入的拼音引擎jar,自动创建对应的拼音引擎对象 + * 推荐创建的引擎单例使用,此方法每次调用会返回新的引擎 * - * @return {@link JsonProvider} + * @return {@link PinyinProvider} */ public static JsonProvider create() { - final JsonProvider engine = doCreate(JsonProvider.class); + final JsonProvider engine = ClassKit.loadFirstAvailable(JsonProvider.class); + if (null == engine) { + throw new InstrumentException("No json jar found ! Please add one of it to your project !"); + } Logger.debug("Use [{}] provider as default.", StringKit.removeSuffix(engine.getClass().getSimpleName(), "Provider")); return engine; } - /** - * 根据用户引入的json解析工具jar,自动创建对应的json解析对象 - * 推荐创建的解析单例使用,此方法每次调用会返回新的解析 - * - * @param clazz 解析器 - * @param 泛型参数类型 - * @return {@link JsonProvider} - */ - public static T doCreate(Class clazz) { - final Iterator iterator = ServiceLoader.load(clazz).iterator(); - while (iterator.hasNext()) { - try { - return iterator.next(); - } catch (ServiceConfigurationError e) { - throw new InstrumentException("No json jar found ! Please add one of it to your project !"); - } - } - return null; - } - } diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/json/JsonKit.java b/bus-extra/src/main/java/org/aoju/bus/extra/json/JsonKit.java index e458a2b797..801ac45a30 100755 --- a/bus-extra/src/main/java/org/aoju/bus/extra/json/JsonKit.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/json/JsonKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.json; @@ -32,7 +33,7 @@ * json工具类,通过SPI自动识别 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JsonKit { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/json/JsonProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/json/JsonProvider.java index 903aa789aa..8224e683fa 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/json/JsonProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/json/JsonProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.json; @@ -32,7 +33,7 @@ * JSON服务提供者 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface JsonProvider { @@ -78,9 +79,10 @@ public interface JsonProvider { * 解析json字符串到List * * @param json 要解析的json字符串 + * @param 泛型参数类型 * @return 返回List */ - List toList(String json); + List toList(String json); /** * 按指定的Type解析json字符串到List @@ -106,17 +108,21 @@ public interface JsonProvider { * 解析json字符串到Map * * @param json 要解析的json字符串 + * @param 键类型 + * @param 值类型 * @return 返回Map */ - Map toMap(String json); + Map toMap(String json); /** * 转换对象到Map * * @param object 与Map可兼容的对象 + * @param 键类型 + * @param 值类型 * @return 返回Map对象 */ - Map toMap(Object object); + Map toMap(Object object); /** * 判断是否为标准json diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/json/provider/AbstractJsonProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/json/provider/AbstractJsonProvider.java index a43d384c35..eaaf1eaa97 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/json/provider/AbstractJsonProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/json/provider/AbstractJsonProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.json.provider; @@ -30,7 +31,7 @@ * 默认解析器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractJsonProvider implements JsonProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/json/provider/FastJsonProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/json/provider/FastJsonProvider.java index d323414cae..9e236e3dd6 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/json/provider/FastJsonProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/json/provider/FastJsonProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.json.provider; @@ -29,7 +30,6 @@ import com.alibaba.fastjson.serializer.SerializerFeature; import java.lang.reflect.Type; -import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -38,7 +38,7 @@ * FastJson 解析器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FastJsonProvider extends AbstractJsonProvider { @@ -84,7 +84,7 @@ public T toPojo(Map map, Class clazz) { } @Override - public List toList(String json) { + public List toList(String json) { return JSON.parseObject(json, LinkedList.class); } @@ -105,13 +105,13 @@ public Type getType() { } @Override - public Map toMap(String json) { - return JSON.parseObject(json, LinkedHashMap.class); + public Map toMap(String json) { + return JSON.parseObject(json, Map.class); } @Override - public Map toMap(Object object) { - return JSON.parseObject(JSON.toJSONString(object), LinkedHashMap.class); + public Map toMap(Object object) { + return toMap(JSON.toJSONString(object)); } @Override diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/json/provider/GsonProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/json/provider/GsonProvider.java index fe331e7201..a3e0209889 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/json/provider/GsonProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/json/provider/GsonProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.json.provider; @@ -34,7 +35,7 @@ * Gson 解析器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class GsonProvider extends AbstractJsonProvider { @@ -46,10 +47,10 @@ public class GsonProvider extends AbstractJsonProvider { */ public GsonProvider() { gson = new GsonBuilder() - .setLenient() // 解决gson序列化时出现整型变为浮点型的问题 .registerTypeAdapter(new TypeToken>() { - }.getType(), (JsonDeserializer>) (jsonElement, type, jsonDeserializationContext) -> { + }.getType(), + (JsonDeserializer>) (jsonElement, type, jsonDeserializationContext) -> { Map map = new LinkedHashMap<>(); JsonObject jsonObject = jsonElement.getAsJsonObject(); Set> entrySet = jsonObject.entrySet(); @@ -104,7 +105,7 @@ public T toPojo(Map map, Class clazz) { } @Override - public List toList(String json) { + public List toList(String json) { TypeToken> typeToken = new TypeToken>() { }; return gson.fromJson(json, typeToken.getType()); @@ -121,14 +122,14 @@ public List toList(String json, Type type) { } @Override - public Map toMap(String json) { + public Map toMap(String json) { TypeToken> typeToken = new TypeToken>() { }; return gson.fromJson(json, typeToken.getType()); } @Override - public Map toMap(Object object) { + public Map toMap(Object object) { TypeToken> typeToken = new TypeToken>() { }; return gson.fromJson(gson.toJson(object), typeToken.getType()); diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/json/provider/JacksonProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/json/provider/JacksonProvider.java index 12fd63af53..2ac8ad3376 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/json/provider/JacksonProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/json/provider/JacksonProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.json.provider; @@ -32,7 +33,6 @@ import java.io.IOException; import java.lang.reflect.Type; import java.text.SimpleDateFormat; -import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -41,7 +41,7 @@ * Jackson 解析器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JacksonProvider extends AbstractJsonProvider { @@ -91,7 +91,7 @@ public T toPojo(Map fromMap, Class clazz) { } @Override - public List toList(String json) { + public List toList(String json) { try { return objectMapper.readValue(json, LinkedList.class); } catch (IOException e) { @@ -124,17 +124,17 @@ public Type getType() { } @Override - public Map toMap(String json) { + public Map toMap(String json) { try { - return objectMapper.readValue(json, LinkedHashMap.class); + return objectMapper.readValue(json, Map.class); } catch (IOException e) { throw new RuntimeException(e); } } @Override - public Map toMap(Object object) { - return objectMapper.convertValue(object, LinkedHashMap.class); + public Map toMap(Object object) { + return objectMapper.convertValue(object, Map.class); } @Override diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/PinyinFactory.java b/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/PinyinFactory.java index 86c278cc1f..d6e4619811 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/PinyinFactory.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/PinyinFactory.java @@ -21,24 +21,22 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.pinyin; import org.aoju.bus.core.instance.Instances; import org.aoju.bus.core.lang.exception.InstrumentException; +import org.aoju.bus.core.toolkit.ClassKit; import org.aoju.bus.core.toolkit.StringKit; import org.aoju.bus.logger.Logger; -import java.util.Iterator; -import java.util.ServiceConfigurationError; -import java.util.ServiceLoader; - /** * 用于根据用户引入的拼音库jar * 自动创建对应的拼音引擎对象 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PinyinFactory { @@ -59,29 +57,12 @@ public static PinyinProvider get() { * @return {@link PinyinProvider} */ public static PinyinProvider create() { - final PinyinProvider engine = doCreate(PinyinProvider.class); + final PinyinProvider engine = ClassKit.loadFirstAvailable(PinyinProvider.class); + if (null == engine) { + throw new InstrumentException("No pinyin jar found ! Please add one of it to your project !"); + } Logger.debug("Use [{}] provider as default.", StringKit.removeSuffix(engine.getClass().getSimpleName(), "Provider")); return engine; } - /** - * 根据用户引入的拼音引擎jar,自动创建对应的拼音引擎对象 - * 推荐创建的引擎单例使用,此方法每次调用会返回新的引擎 - * - * @param clazz 解析器 - * @param 泛型参数类型 - * @return {@link PinyinProvider} - */ - public static T doCreate(Class clazz) { - final Iterator iterator = ServiceLoader.load(clazz).iterator(); - while (iterator.hasNext()) { - try { - return iterator.next(); - } catch (ServiceConfigurationError e) { - throw new InstrumentException("No pinyin jar found ! Please add one of it to your project !"); - } - } - return null; - } - } diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/PinyinKit.java b/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/PinyinKit.java index 2e3c3b90b4..1b49d46632 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/PinyinKit.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/PinyinKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.pinyin; @@ -37,7 +38,7 @@ * 3. Pinyin4j * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PinyinKit { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/PinyinProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/PinyinProvider.java index e9fc5cd52f..357d4051fd 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/PinyinProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/PinyinProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.pinyin; @@ -32,7 +33,7 @@ * 拼音服务提供者 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface PinyinProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/AbstractPinyinProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/AbstractPinyinProvider.java index 3545c28db0..40d7eb173e 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/AbstractPinyinProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/AbstractPinyinProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.pinyin.provider; @@ -30,7 +31,7 @@ * 拼音默认实现 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractPinyinProvider implements PinyinProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/Bopomofo4jProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/Bopomofo4jProvider.java new file mode 100644 index 0000000000..c646b299d1 --- /dev/null +++ b/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/Bopomofo4jProvider.java @@ -0,0 +1,55 @@ +/********************************************************************************* + * * + * The MIT License (MIT) * + * * + * Copyright (c) 2015-2020 aoju.org and other contributors. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy * + * of this software and associated documentation files (the "Software"), to deal * + * in the Software without restriction, including without limitation the rights * + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * + * THE SOFTWARE. * + * * + ********************************************************************************/ +package org.aoju.bus.extra.pinyin.provider; + +import com.rnkrsoft.bopomofo4j.Bopomofo4j; +import com.rnkrsoft.bopomofo4j.ToneType; +import org.aoju.bus.core.lang.Normal; + +/** + * 封装了Bopomofo4j的引擎 + * + * @author Kimi Liu + * @version 6.1.2 + * @since JDK 1.8+ + */ +public class Bopomofo4jProvider extends AbstractPinyinProvider { + + public Bopomofo4jProvider() { + Bopomofo4j.local(); + } + + @Override + public String getPinyin(char c) { + return Bopomofo4j.pinyin(String.valueOf(c), ToneType.WITHOUT_TONE, false, false, Normal.EMPTY); + } + + @Override + public String getPinyin(String str, String separator) { + return Bopomofo4j.pinyin(str, ToneType.WITHOUT_TONE, false, false, separator); + } + +} \ No newline at end of file diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/JPinyinProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/JPinyinProvider.java index ce0d5932ed..c05c1fcc90 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/JPinyinProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/JPinyinProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.pinyin.provider; @@ -34,7 +35,7 @@ * Jpinyin引擎 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JPinyinProvider extends AbstractPinyinProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/Pinyin4JProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/Pinyin4JProvider.java index 7ae292eccf..aac13d8243 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/Pinyin4JProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/Pinyin4JProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.pinyin.provider; @@ -39,7 +40,7 @@ * Pinyin4j引擎 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Pinyin4JProvider extends AbstractPinyinProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/TinyPinyinProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/TinyPinyinProvider.java index 6ceb2be502..ea15c3b9d0 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/TinyPinyinProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/TinyPinyinProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.pinyin.provider; @@ -30,7 +31,7 @@ * TinyPinyin引擎 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TinyPinyinProvider extends AbstractPinyinProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/qrcode/LuminanceSource.java b/bus-extra/src/main/java/org/aoju/bus/extra/qrcode/LuminanceSource.java index c76fc4433d..246759f0b4 100755 --- a/bus-extra/src/main/java/org/aoju/bus/extra/qrcode/LuminanceSource.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/qrcode/LuminanceSource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.qrcode; @@ -34,7 +35,7 @@ * 此类同样在zxing-j2se包中也有提供 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class LuminanceSource extends com.google.zxing.LuminanceSource { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/qrcode/QrCodeKit.java b/bus-extra/src/main/java/org/aoju/bus/extra/qrcode/QrCodeKit.java index cdc1e79535..cade9f7c8d 100755 --- a/bus-extra/src/main/java/org/aoju/bus/extra/qrcode/QrCodeKit.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/qrcode/QrCodeKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.qrcode; @@ -45,7 +46,7 @@ * 基于Zxing的二维码工具类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class QrCodeKit { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/qrcode/QrConfig.java b/bus-extra/src/main/java/org/aoju/bus/extra/qrcode/QrConfig.java index 90de937c3a..e1b110dd1a 100755 --- a/bus-extra/src/main/java/org/aoju/bus/extra/qrcode/QrConfig.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/qrcode/QrConfig.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.qrcode; @@ -39,7 +40,7 @@ * 二维码设置 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class QrConfig { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/servlet/ServletKit.java b/bus-extra/src/main/java/org/aoju/bus/extra/servlet/ServletKit.java index a261c58896..fabf31f60e 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/servlet/ServletKit.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/servlet/ServletKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.servlet; @@ -47,7 +48,7 @@ * Servlet 工具类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ServletKit { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/ssh/ChannelType.java b/bus-extra/src/main/java/org/aoju/bus/extra/ssh/ChannelType.java index 70236f8d8b..425f18e712 100755 --- a/bus-extra/src/main/java/org/aoju/bus/extra/ssh/ChannelType.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/ssh/ChannelType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.ssh; @@ -28,7 +29,7 @@ * Jsch支持的Channel类型 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum ChannelType { @@ -72,7 +73,7 @@ public enum ChannelType { /** * channel值 */ - private String value; + private final String value; /** * 构造 diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/ssh/Connector.java b/bus-extra/src/main/java/org/aoju/bus/extra/ssh/Connector.java index 3fd4eb9433..cc8f6cc150 100755 --- a/bus-extra/src/main/java/org/aoju/bus/extra/ssh/Connector.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/ssh/Connector.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.ssh; @@ -28,7 +29,7 @@ * 连接者对象,提供一些连接的基本信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Connector { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/ssh/JschSessionPool.java b/bus-extra/src/main/java/org/aoju/bus/extra/ssh/JschSessionPool.java index 1221569718..57de14670e 100755 --- a/bus-extra/src/main/java/org/aoju/bus/extra/ssh/JschSessionPool.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/ssh/JschSessionPool.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.ssh; @@ -36,7 +37,7 @@ * Jsch会话池 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum JschSessionPool { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/ssh/Sftp.java b/bus-extra/src/main/java/org/aoju/bus/extra/ssh/Sftp.java index 9067f0660f..44b2cf02c7 100755 --- a/bus-extra/src/main/java/org/aoju/bus/extra/ssh/Sftp.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/ssh/Sftp.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.ssh; @@ -55,7 +56,7 @@ *

* * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Sftp extends AbstractFtp { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/ssh/SshKit.java b/bus-extra/src/main/java/org/aoju/bus/extra/ssh/SshKit.java index a857d74b08..bf7f736cb2 100755 --- a/bus-extra/src/main/java/org/aoju/bus/extra/ssh/SshKit.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/ssh/SshKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.extra.ssh; @@ -42,7 +43,7 @@ * 它允许你连接到一个SSH服务器,并且可以使用端口转发,X11转发,文件传输等 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SshKit { diff --git a/bus-extra/src/main/resources/META-INF/services/org.aoju.bus.extra.pinyin.PinyinProvider b/bus-extra/src/main/resources/META-INF/services/org.aoju.bus.extra.pinyin.PinyinProvider index 6f7a9d1981..d6c5c253f0 100644 --- a/bus-extra/src/main/resources/META-INF/services/org.aoju.bus.extra.pinyin.PinyinProvider +++ b/bus-extra/src/main/resources/META-INF/services/org.aoju.bus.extra.pinyin.PinyinProvider @@ -1,3 +1,4 @@ +org.aoju.bus.extra.pinyin.provider.Bopomofo4jProvider org.aoju.bus.extra.pinyin.provider.JPinyinProvider org.aoju.bus.extra.pinyin.provider.Pinyin4JProvider org.aoju.bus.extra.pinyin.provider.TinyPinyinProvider \ No newline at end of file diff --git a/bus-forest/pom.xml b/bus-forest/pom.xml index ebaaf258af..8af676a46e 100755 --- a/bus-forest/pom.xml +++ b/bus-forest/pom.xml @@ -6,17 +6,42 @@ org.aoju bus-forest - 6.1.1 + 6.1.2 jar ${project.artifactId} Bus Forest https://github.com/aoju/bus + + + The MIT License (MIT) + https://opensource.org/licenses/MIT + + + + + scm:git@github.com:aoju/bus.git + scm:git@github.com:aoju/bus.git + git@github.com:aoju/bus.git + + + + + Kimi Liu + https://github.com/aoju/bus.git + + + + + Github Issue + https://github.com/aoju/bus/issues + + UTF-8 UTF-8 - 2.3.0.RELEASE + 2.4.0 1.8 1.8 1.19 @@ -42,31 +67,6 @@ - - - The MIT License (MIT) - https://opensource.org/licenses/MIT - - - - - scm:git@github.com:aoju/bus.git - scm:git@github.com:aoju/bus.git - git@github.com:aoju/bus.git - - - - - Kimi Liu - https://github.com/aoju/bus.git - - - - - Github Issue - https://github.com/aoju/bus/issues - - diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/Builder.java b/bus-forest/src/main/java/org/aoju/bus/forest/Builder.java index 455cbfd7a9..593d1f9034 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/Builder.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/Builder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest; @@ -50,7 +51,7 @@ * Jar 工具类,包含I/O,密钥,过滤器的工具方法 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class Builder { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/Complex.java b/bus-forest/src/main/java/org/aoju/bus/forest/Complex.java index c033bdaf15..f60ac105a8 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/Complex.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/Complex.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest; @@ -28,7 +29,7 @@ * 记录加/解密规则 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Complex { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/Injector.java b/bus-forest/src/main/java/org/aoju/bus/forest/Injector.java index 48737f6818..2a7a63fb5f 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/Injector.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/Injector.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest; @@ -40,7 +41,7 @@ * 框架注入器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Injector { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/Launcher.java b/bus-forest/src/main/java/org/aoju/bus/forest/Launcher.java index be84f376c5..7dc8745c48 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/Launcher.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/Launcher.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest; @@ -48,7 +49,7 @@ * Spring-Boot 启动器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Launcher { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/AsymmetricKey.java b/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/AsymmetricKey.java index b9cbc7707d..f1418f3d3d 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/AsymmetricKey.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/AsymmetricKey.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.algorithm; @@ -28,7 +29,7 @@ * 非对称密钥 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface AsymmetricKey extends Key { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/AsymmetricSecureKey.java b/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/AsymmetricSecureKey.java index 7a12130a2b..b5d00e1f9f 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/AsymmetricSecureKey.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/AsymmetricSecureKey.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.algorithm; @@ -28,7 +29,7 @@ * 非对称密钥 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class AsymmetricSecureKey extends SecureKey implements AsymmetricKey { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/Key.java b/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/Key.java index 97501a4a42..3e0bedac2b 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/Key.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/Key.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.algorithm; @@ -28,7 +29,7 @@ * 密钥 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Key { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/SecureKey.java b/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/SecureKey.java index 090b6e69a5..8a7d0ced83 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/SecureKey.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/SecureKey.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.algorithm; @@ -30,7 +31,7 @@ * 密钥 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class SecureKey implements Key, Serializable { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/SecureRandom.java b/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/SecureRandom.java index 964239d5e5..ffadc00471 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/SecureRandom.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/SecureRandom.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.algorithm; @@ -31,7 +32,7 @@ * 安全随机数 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SecureRandom extends java.security.SecureRandom { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/SymmetricKey.java b/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/SymmetricKey.java index 9a44d6932e..599ffea193 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/SymmetricKey.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/SymmetricKey.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.algorithm; @@ -28,7 +29,7 @@ * 对称密钥 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface SymmetricKey extends Key { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/SymmetricSecureKey.java b/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/SymmetricSecureKey.java index ead1736e26..b05041148a 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/SymmetricSecureKey.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/SymmetricSecureKey.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.algorithm; @@ -28,7 +29,7 @@ * 对称密钥 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class SymmetricSecureKey extends SecureKey implements SymmetricKey { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/archive/DirAntComplex.java b/bus-forest/src/main/java/org/aoju/bus/forest/archive/DirAntComplex.java index ae33958e01..88c3d98026 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/archive/DirAntComplex.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/archive/DirAntComplex.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.archive; @@ -33,7 +34,7 @@ * 文件记录Ant表达式规则 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DirAntComplex extends AntComplex implements Complex { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/archive/DirDecryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/archive/DirDecryptorProvider.java index 5cb11b3fc2..b09ebc42ca 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/archive/DirDecryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/archive/DirDecryptorProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.archive; @@ -36,7 +37,7 @@ * 文件夹解密器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DirDecryptorProvider extends EntryDecryptorProvider implements DecryptorProvider { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/archive/DirEncryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/archive/DirEncryptorProvider.java index 0d3fdf4b8f..4cde64b45a 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/archive/DirEncryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/archive/DirEncryptorProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.archive; @@ -36,7 +37,7 @@ * 文件夹加密器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DirEncryptorProvider extends EntryEncryptorProvider implements EncryptorProvider { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/archive/DirRegexComplex.java b/bus-forest/src/main/java/org/aoju/bus/forest/archive/DirRegexComplex.java index 6e2bc7265a..144de84ddb 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/archive/DirRegexComplex.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/archive/DirRegexComplex.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.archive; @@ -34,7 +35,7 @@ * 文件记录正则表达式规则 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DirRegexComplex extends RegexComplex implements Complex { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/archive/ZipAntComplex.java b/bus-forest/src/main/java/org/aoju/bus/forest/archive/ZipAntComplex.java index 5676ca82c5..cea78bdeac 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/archive/ZipAntComplex.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/archive/ZipAntComplex.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.archive; @@ -32,7 +33,7 @@ * Zip记录Ant表达式规则 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ZipAntComplex extends AntComplex implements Complex { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/archive/ZipDecryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/archive/ZipDecryptorProvider.java index 7488bcd54e..c80c5dc9f5 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/archive/ZipDecryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/archive/ZipDecryptorProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.archive; @@ -41,7 +42,7 @@ * ZIP压缩包解密器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ZipDecryptorProvider extends EntryDecryptorProvider implements DecryptorProvider { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/archive/ZipEncryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/archive/ZipEncryptorProvider.java index 12bf991903..791bc4734f 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/archive/ZipEncryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/archive/ZipEncryptorProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.archive; @@ -41,7 +42,7 @@ * ZIP压缩包加密器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ZipEncryptorProvider extends EntryEncryptorProvider implements EncryptorProvider { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/archive/ZipRegexComplex.java b/bus-forest/src/main/java/org/aoju/bus/forest/archive/ZipRegexComplex.java index 3737f327c7..027cb1acda 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/archive/ZipRegexComplex.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/archive/ZipRegexComplex.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.archive; @@ -34,7 +35,7 @@ * Zip记录正则表达式规则 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ZipRegexComplex extends RegexComplex implements Complex { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/Boot.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/Boot.java index f60f278a42..6516d3bbb2 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/Boot.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/Boot.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.boot; @@ -39,7 +40,7 @@ * Spring-Boot JAR包加解密工具类,在不提供过滤器的情况下会加密BOOT-INF/下的所有资源,及包括项目本身的资源和依赖jar资源 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Boot { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootClassLoader.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootClassLoader.java index 66affcc383..56f3378165 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootClassLoader.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootClassLoader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.boot; @@ -42,7 +43,7 @@ * 类加载器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BootClassLoader extends LaunchedURLClassLoader { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootDecryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootDecryptorProvider.java index ec6b9977b2..c468344818 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootDecryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootDecryptorProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.boot; @@ -48,7 +49,7 @@ * Spring-Boot JAR包解密器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BootDecryptorProvider extends EntryDecryptorProvider diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootEncryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootEncryptorProvider.java index b5e43e3952..309a43a7ac 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootEncryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootEncryptorProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.boot; @@ -53,7 +54,7 @@ * Spring-Boot JAR包加密器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BootEncryptorProvider extends EntryEncryptorProvider diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootJarArchiveEntry.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootJarArchiveEntry.java index 6f43db3aa8..89d8f0688e 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootJarArchiveEntry.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootJarArchiveEntry.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.boot; @@ -34,7 +35,7 @@ * 为了兼容Spring-Boot FatJar 和普通Jar 的包内资源URL一致 所以去掉路径前面的 BOOT-INF/classes/ * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BootJarArchiveEntry extends JarArchiveEntry { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootJarLauncher.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootJarLauncher.java index d3716b364c..d8c428b46a 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootJarLauncher.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootJarLauncher.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.boot; @@ -33,7 +34,7 @@ * Spring-Boot Jar 启动器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BootJarLauncher extends JarLauncher { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootPropertiesLauncher.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootPropertiesLauncher.java index c92bb2bdb5..fb42fe5a34 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootPropertiesLauncher.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootPropertiesLauncher.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.boot; @@ -36,7 +37,7 @@ * Spring-Boot Properties 启动器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BootPropertiesLauncher extends PropertiesLauncher { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootURLConnection.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootURLConnection.java index fcdbfcf135..22a8d64132 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootURLConnection.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootURLConnection.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.boot; @@ -47,7 +48,7 @@ * 加密的URL连接 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BootURLConnection extends JarURLConnection { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootURLHandler.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootURLHandler.java index 47680384b7..fd2d52528e 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootURLHandler.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootURLHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.boot; @@ -45,7 +46,7 @@ * 加密的URL处理器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BootURLHandler extends Handler { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootWarLauncher.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootWarLauncher.java index c645a14ae6..1692eb2321 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootWarLauncher.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootWarLauncher.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.boot; @@ -33,7 +34,7 @@ * Spring-Boot Jar 启动器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BootWarLauncher extends WarLauncher { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/Jar.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/Jar.java index 431f59172e..0f274e3c19 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/Jar.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/Jar.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.boot.jar; @@ -39,7 +40,7 @@ * 普通JAR包加解密工具类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Jar { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarAllComplex.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarAllComplex.java index 651c7676a1..bcb715476b 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarAllComplex.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarAllComplex.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.boot.jar; @@ -31,7 +32,7 @@ * Spring-Boot 所有资源加密规则 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JarAllComplex implements Complex { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarAntComplex.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarAntComplex.java index c6918972b6..9c4335bdad 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarAntComplex.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarAntComplex.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.boot.jar; @@ -32,7 +33,7 @@ * Jar记录Ant表达式规则 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JarAntComplex extends AntComplex implements Complex { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarClassLoader.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarClassLoader.java index b64403340e..49d0c51894 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarClassLoader.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarClassLoader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.boot.jar; @@ -42,7 +43,7 @@ * JAR包类加载器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JarClassLoader extends URLClassLoader { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarDecryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarDecryptorProvider.java index 16a15c0aac..cf1f3aefb0 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarDecryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarDecryptorProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.boot.jar; @@ -44,7 +45,7 @@ * 普通JAR包解密器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JarDecryptorProvider extends EntryDecryptorProvider implements DecryptorProvider { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarEncryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarEncryptorProvider.java index f17413d545..57cbc871e9 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarEncryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarEncryptorProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.boot.jar; @@ -47,7 +48,7 @@ * 普通JAR包加密器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JarEncryptorProvider extends EntryEncryptorProvider implements EncryptorProvider { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarLauncher.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarLauncher.java index 3cff59d9ce..68d4e6a41f 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarLauncher.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarLauncher.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.boot.jar; @@ -42,7 +43,7 @@ * JAR包启动器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JarLauncher { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarRegexComplex.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarRegexComplex.java index d0927ebbcc..6e1b4f724c 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarRegexComplex.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarRegexComplex.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.boot.jar; @@ -34,7 +35,7 @@ * Jar记录正则表达式规则 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JarRegexComplex extends RegexComplex implements Complex { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarURLConnection.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarURLConnection.java index 8b5aa29517..9cfe28f83b 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarURLConnection.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarURLConnection.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.boot.jar; @@ -46,7 +47,7 @@ * 加密的URL连接 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JarURLConnection extends java.net.JarURLConnection { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarURLHandler.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarURLHandler.java index 0733401c69..15bfb11733 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarURLHandler.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarURLHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.boot.jar; @@ -44,7 +45,7 @@ * 加密的URL处理器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JarURLHandler extends URLStreamHandler { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/complex/AllComplex.java b/bus-forest/src/main/java/org/aoju/bus/forest/complex/AllComplex.java index 70cf4fddf5..29f4f49fea 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/complex/AllComplex.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/complex/AllComplex.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.complex; @@ -34,7 +35,7 @@ * 如果没有规则的时候则认为所有规则都满足 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AllComplex extends MixComplex implements Complex { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/complex/AntComplex.java b/bus-forest/src/main/java/org/aoju/bus/forest/complex/AntComplex.java index c98b42fcf3..39a2dabc3a 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/complex/AntComplex.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/complex/AntComplex.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.complex; @@ -32,7 +33,7 @@ * Ant表达式过规则 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AntComplex extends RegexComplex implements Complex { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/complex/AnyComplex.java b/bus-forest/src/main/java/org/aoju/bus/forest/complex/AnyComplex.java index 7c7df50abd..91d9340680 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/complex/AnyComplex.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/complex/AnyComplex.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.complex; @@ -33,7 +34,7 @@ * 当没有规则的时候,就是不满足 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AnyComplex extends MixComplex implements Complex { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/complex/MixComplex.java b/bus-forest/src/main/java/org/aoju/bus/forest/complex/MixComplex.java index a1f7670a19..051ab88800 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/complex/MixComplex.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/complex/MixComplex.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.complex; @@ -34,7 +35,7 @@ * 混合过滤器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class MixComplex implements Complex { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/complex/NotComplex.java b/bus-forest/src/main/java/org/aoju/bus/forest/complex/NotComplex.java index 75cc574066..7bada9d043 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/complex/NotComplex.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/complex/NotComplex.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.complex; @@ -30,7 +31,7 @@ * 非门逻辑规则 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NotComplex implements Complex { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/complex/RegexComplex.java b/bus-forest/src/main/java/org/aoju/bus/forest/complex/RegexComplex.java index 63a53eb832..e7ee08acd5 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/complex/RegexComplex.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/complex/RegexComplex.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.complex; @@ -32,7 +33,7 @@ * 正则表达式规则 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class RegexComplex implements Complex { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/provider/DecryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/provider/DecryptorProvider.java index 1cee464555..c779d03963 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/provider/DecryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/provider/DecryptorProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.provider; @@ -35,7 +36,7 @@ * 解密器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface DecryptorProvider { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/provider/EncryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/provider/EncryptorProvider.java index 672df58e73..1567fc9b6b 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/provider/EncryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/provider/EncryptorProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.provider; @@ -35,7 +36,7 @@ * 加密器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface EncryptorProvider { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/provider/EntryDecryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/provider/EntryDecryptorProvider.java index dde5a8ec4f..23381b051d 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/provider/EntryDecryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/provider/EntryDecryptorProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.provider; @@ -30,7 +31,7 @@ * 记录可过滤的解密器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class EntryDecryptorProvider extends WrappedDecryptorProvider implements DecryptorProvider, Complex { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/provider/EntryEncryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/provider/EntryEncryptorProvider.java index 464b3b903d..04b5e95efe 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/provider/EntryEncryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/provider/EntryEncryptorProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.provider; @@ -30,7 +31,7 @@ * 记录可过滤的加密器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class EntryEncryptorProvider extends WrappedEncryptorProvider implements EncryptorProvider, Complex { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/provider/JdkDecryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/provider/JdkDecryptorProvider.java index 535c2e6696..1c0286b6f1 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/provider/JdkDecryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/provider/JdkDecryptorProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.provider; @@ -37,7 +38,7 @@ * JDK内置解密算法的解密器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JdkDecryptorProvider implements DecryptorProvider { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/provider/JdkEncryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/provider/JdkEncryptorProvider.java index 36450a65cc..67e866c4b3 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/provider/JdkEncryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/provider/JdkEncryptorProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.provider; @@ -37,7 +38,7 @@ * JDK内置加密算法的加密器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JdkEncryptorProvider implements EncryptorProvider { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/provider/NopDecryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/provider/NopDecryptorProvider.java index 61eb355a4b..04ba5e40e2 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/provider/NopDecryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/provider/NopDecryptorProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.provider; @@ -33,7 +34,7 @@ * 无操作解密器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NopDecryptorProvider implements DecryptorProvider { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/provider/NopEncryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/provider/NopEncryptorProvider.java index ac8ecf6b3b..b21c7c0ca1 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/provider/NopEncryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/provider/NopEncryptorProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.provider; @@ -33,7 +34,7 @@ * 无操作加密器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NopEncryptorProvider implements EncryptorProvider { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/provider/WrappedDecryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/provider/WrappedDecryptorProvider.java index 9b3d8e2818..96eab00c91 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/provider/WrappedDecryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/provider/WrappedDecryptorProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.provider; @@ -35,7 +36,7 @@ * 包装的解密器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class WrappedDecryptorProvider implements DecryptorProvider { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/provider/WrappedEncryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/provider/WrappedEncryptorProvider.java index fda2d1240b..6ba5b42a5c 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/provider/WrappedEncryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/provider/WrappedEncryptorProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.provider; @@ -35,7 +36,7 @@ * 包装的加密器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class WrappedEncryptorProvider implements EncryptorProvider { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/streams/AlwaysInputStream.java b/bus-forest/src/main/java/org/aoju/bus/forest/streams/AlwaysInputStream.java index 9bfd11ddb1..9aa53b9820 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/streams/AlwaysInputStream.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/streams/AlwaysInputStream.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.streams; @@ -31,7 +32,7 @@ * 不关闭的输入流 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AlwaysInputStream extends InputStream { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/streams/AlwaysOutputStream.java b/bus-forest/src/main/java/org/aoju/bus/forest/streams/AlwaysOutputStream.java index 4632270bd3..d94ce63698 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/streams/AlwaysOutputStream.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/streams/AlwaysOutputStream.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.forest.streams; @@ -31,7 +32,7 @@ * 不关闭的输出流 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AlwaysOutputStream extends OutputStream { diff --git a/bus-gitlab/README.md b/bus-gitlab/README.md index b5a4b03b9d..9686e8f1ab 100755 --- a/bus-gitlab/README.md +++ b/bus-gitlab/README.md @@ -46,7 +46,7 @@ To utilize GitLab™ API in your Java project, simply add the following depe ``` dependencies { ... - compile group: 'org.aoju', name: 'bus-gitlab', version: '6.1.1' + compile group: 'org.aoju', name: 'bus-gitlab', version: '6.1.2' } ``` @@ -55,7 +55,7 @@ dependencies { org.aoju bus-gitlab - 6.1.1 + 6.1.2 ``` diff --git a/bus-gitlab/pom.xml b/bus-gitlab/pom.xml index 8ac1fc8b96..a1aae48b4f 100755 --- a/bus-gitlab/pom.xml +++ b/bus-gitlab/pom.xml @@ -6,13 +6,38 @@ org.aoju bus-gitlab - 6.1.1 + 6.1.2 jar ${project.artifactId} Bus Gitlab https://github.com/aoju/bus + + + The MIT License (MIT) + https://opensource.org/licenses/MIT + + + + + scm:git@github.com:aoju/bus.git + scm:git@github.com:aoju/bus.git + git@github.com:aoju/bus.git + + + + + Kimi Liu + https://github.com/aoju/bus.git + + + + + Github Issue + https://github.com/aoju/bus/issues + + UTF-8 UTF-8 @@ -66,31 +91,6 @@ - - - The MIT License (MIT) - https://opensource.org/licenses/MIT - - - - - scm:git@github.com:aoju/bus.git - scm:git@github.com:aoju/bus.git - git@github.com:aoju/bus.git - - - - - Kimi Liu - https://github.com/aoju/bus.git - - - - - Github Issue - https://github.com/aoju/bus/issues - - diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/AbstractApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/AbstractApi.java index 08ce1e3656..547f955462 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/AbstractApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/AbstractApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -43,7 +44,7 @@ * delete(), get(), post() and put() that are re-used by all the sub-classes. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractApi implements Constants { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/AccessToken.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/AccessToken.java index 58309ad938..565d2b5066 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/AccessToken.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/AccessToken.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -51,7 +52,7 @@ * proper functionality. It may not work on earlier or later versions.

* * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class AccessToken { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ApplicationSettingsApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ApplicationSettingsApi.java index 8e35405b04..361a8c1ac1 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ApplicationSettingsApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ApplicationSettingsApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -36,7 +37,7 @@ * See Application Settings API at GitLab for more information. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ApplicationSettingsApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ApplicationsApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ApplicationsApi.java index 32bf836c5e..49a663fb22 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ApplicationsApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ApplicationsApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -38,7 +39,7 @@ * See Applications API at GitLab for more information. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ApplicationsApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/AwardEmojiApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/AwardEmojiApi.java index cacf6c0ff2..69ef47b226 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/AwardEmojiApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/AwardEmojiApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -34,7 +35,7 @@ * This class implements the client side API for the GitLab Award Emoji API calls. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @see GitLab Award Emoji API Documentaion * @since v4.8.31 * @since JDK 1.8+ diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/BoardsApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/BoardsApi.java index e6dd5c2e25..3349a39ef2 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/BoardsApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/BoardsApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -40,7 +41,7 @@ * a GET request on that group will result to a 404 status code. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @see GitLab Issue Boards API Documentaion * @since JDK 1.8+ */ diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/CommitsApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/CommitsApi.java index 6b9fa97285..0671d878c4 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/CommitsApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/CommitsApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -41,7 +42,7 @@ * See Commits API at GitLab for more information. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CommitsApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/Constants.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/Constants.java index 6d7ce10eb1..fbaa5b5e06 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/Constants.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/Constants.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Constants { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ContainerRegistryApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ContainerRegistryApi.java index 7111dd0466..5a243fffc1 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ContainerRegistryApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ContainerRegistryApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -39,7 +40,7 @@ * for more information.

* * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ContainerRegistryApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/DeployKeysApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/DeployKeysApi.java index b2b421689b..ecadde5a9b 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/DeployKeysApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/DeployKeysApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -37,7 +38,7 @@ * This class implements the client side API for the GitLab Deploy Keys API calls. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DeployKeysApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/DeployTokensApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/DeployTokensApi.java index 9ceb7e09f6..bcb9fc841b 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/DeployTokensApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/DeployTokensApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -36,7 +37,7 @@ * See https://docs.gitlab.com/ee/api/deploy_tokens.html * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DeployTokensApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/DiscussionsApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/DiscussionsApi.java index 546fa5c73f..8c89ecfe49 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/DiscussionsApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/DiscussionsApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -40,7 +41,7 @@ * See Discussions API at GitLab for more information. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DiscussionsApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/EnvironmentsApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/EnvironmentsApi.java index c263de24b5..9963e3ce77 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/EnvironmentsApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/EnvironmentsApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -35,7 +36,7 @@ * This class provides an entry point to all the GitLab API Environments API calls. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @see Environments API * @since JDK 1.8+ */ diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/EpicsApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/EpicsApi.java index 7a0f1d8735..a3f0c53437 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/EpicsApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/EpicsApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -43,7 +44,7 @@ * - Epics are available only in Ultimate. If epics feature is not available a 403 status code will be returned. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @see GitLab Epics API Documentaion * @see GitLab Epic Issues API Documentation * @since JDK 1.8+ diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/EventsApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/EventsApi.java index f4f4a713d0..43f65d070f 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/EventsApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/EventsApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -36,7 +37,7 @@ * This class implements the client side API for the GitLab events calls. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class EventsApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GitLabApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GitLabApi.java index 3ec24ef413..e686fed704 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GitLabApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GitLabApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -40,7 +41,7 @@ * a separate API class for each concern. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class GitLabApi implements AutoCloseable { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GitLabApiClient.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GitLabApiClient.java index 9e5dbc33cc..e640de816f 100755 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GitLabApiClient.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GitLabApiClient.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -56,7 +57,7 @@ * This class utilizes the Jersey client package to communicate with a GitLab API endpoint. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class GitLabApiClient implements AutoCloseable { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GitLabApiException.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GitLabApiException.java index b64b6c01ce..b0c3ae95ec 100755 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GitLabApiException.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GitLabApiException.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -39,7 +40,7 @@ * with a GitLab API endpoint. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class GitLabApiException extends Exception { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GitLabApiForm.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GitLabApiForm.java index e0d7f75867..6a1e2d24e0 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GitLabApiForm.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GitLabApiForm.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -38,7 +39,7 @@ * This class extends the standard JAX-RS Form class to make it fluent. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class GitLabApiForm extends Form { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GroupApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GroupApi.java index b59591bcbc..437af422a3 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GroupApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GroupApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -40,7 +41,7 @@ * This class implements the client side API for the GitLab groups calls. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @see Groups API at GitLab * @see Group and project members API at GitLab * @see Group and project access requests API diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/HealthCheckApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/HealthCheckApi.java index ab6f617eb3..7dfa53280e 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/HealthCheckApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/HealthCheckApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HealthCheckApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/HookManager.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/HookManager.java index d3fb724673..0265d1040b 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/HookManager.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/HookManager.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -30,7 +31,7 @@ * This interface provides a base class handler for processing GitLab Web Hook and System Hook callouts. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface HookManager { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ISO8601.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ISO8601.java index 4369ad3c04..4ab37ec00b 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ISO8601.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ISO8601.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -40,7 +41,7 @@ * This class provides utility methods for parsing and formatting org.aoju.bus.gitlab.ISO8601 formatted dates. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ISO8601 { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ImportExportApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ImportExportApi.java index bb1d1bae62..13ecec1c8c 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ImportExportApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ImportExportApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -44,7 +45,7 @@ * This class provides an entry point to all the GitLab API project import/export calls. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @see Project import/export API at GitLab * @since JDK 1.8+ */ diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/IssuesApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/IssuesApi.java index 51dcfc65b4..94a88a77ba 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/IssuesApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/IssuesApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -39,7 +40,7 @@ * This class provides an entry point to all the GitLab API Issue calls. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @see Issues API at GitLab * @see Issue Links API at GitLab * @see Issues Statistics API at GitLab diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/JacksonJson.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/JacksonJson.java index 5564b61373..a54d829cf6 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/JacksonJson.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/JacksonJson.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -45,7 +46,7 @@ * Jackson JSON Configuration and utility class. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Produces(MediaType.APPLICATION_JSON) diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/JacksonJsonEnumHelper.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/JacksonJsonEnumHelper.java index df450c20d0..5857decb60 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/JacksonJsonEnumHelper.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/JacksonJsonEnumHelper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JacksonJsonEnumHelper> { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/JobApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/JobApi.java index 6b3a9fd502..670e707adc 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/JobApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/JobApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -46,7 +47,7 @@ * This class provides an entry point to all the GitLab API job calls. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JobApi extends AbstractApi implements Constants { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/LabelsApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/LabelsApi.java index 7d843521c1..412aef8c95 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/LabelsApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/LabelsApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -36,7 +37,7 @@ * This class provides an entry point to all the GitLab API project and group label calls. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @see Labels API at GitLab * @see Group Labels API at GitLab * @since JDK 1.8+ diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/LicenseApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/LicenseApi.java index aa7169c8ab..a1ecabd5bc 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/LicenseApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/LicenseApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -35,7 +36,7 @@ * This class provides an entry point to all the GitLab API license calls. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @see License API * @since JDK 1.8+ */ diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/LicenseTemplatesApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/LicenseTemplatesApi.java index 3f18bec385..3a8d354160 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/LicenseTemplatesApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/LicenseTemplatesApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -35,7 +36,7 @@ * This class provides an entry point to all the GitLab API licenses calls. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @see Licenses API * @since JDK 1.8+ */ diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/MarkdownApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/MarkdownApi.java index 91354b541b..efa46df2a0 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/MarkdownApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/MarkdownApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -34,7 +35,7 @@ * This class provides an entry point to all the GitLab API markdown calls. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MarkdownApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/MaskingLoggingFilter.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/MaskingLoggingFilter.java index f77f66672b..a02cadabc3 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/MaskingLoggingFilter.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/MaskingLoggingFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -55,7 +56,7 @@ * such a way that it could be sub-classed and have its behavior modified. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Priority(Integer.MIN_VALUE) diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/MergeRequestApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/MergeRequestApi.java index d6c611fd03..de37d18b3e 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/MergeRequestApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/MergeRequestApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -39,7 +40,7 @@ * This class implements the client side API for the GitLab merge request calls. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @see Merge requests API at GitLab * @see Merge request approvals API at GitLab * @since JDK 1.8+ diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/MilestonesApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/MilestonesApi.java index 8951da138e..1ae6530c53 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/MilestonesApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/MilestonesApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -39,7 +40,7 @@ * This class implements the client side API for the GitLab milestones calls. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @see Project milestones API * @see Group milestones API * @since JDK 1.8+ diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/NamespaceApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/NamespaceApi.java index 6f4644ae3f..8d5a89ac08 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/NamespaceApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/NamespaceApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -35,7 +36,7 @@ * This class implements the client side API for the GitLab namespace calls. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NamespaceApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/NotesApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/NotesApi.java index c27382ee27..42bf7fa8f9 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/NotesApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/NotesApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NotesApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/NotificationSettingsApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/NotificationSettingsApi.java index 195e98b1eb..4800bc882f 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/NotificationSettingsApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/NotificationSettingsApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NotificationSettingsApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/Oauth2LoginStreamingOutput.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/Oauth2LoginStreamingOutput.java index c4c0e6d567..930d94f029 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/Oauth2LoginStreamingOutput.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/Oauth2LoginStreamingOutput.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -35,7 +36,7 @@ * contained in a SecretString that is cleared when an instance of this class is finalized. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Oauth2LoginStreamingOutput implements StreamingOutput, AutoCloseable { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/PackagesApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/PackagesApi.java index 7e77815f08..dafcb6210e 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/PackagesApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/PackagesApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -39,7 +40,7 @@ * NOTE: This API is not available in the Community edition of GitLab. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PackagesApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/Pager.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/Pager.java index c5c3893154..22b0943604 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/Pager.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/Pager.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -60,7 +61,7 @@ * * @param the GitLab type contained in the List. * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Pager implements Iterator>, Constants { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/PagerSpliterator.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/PagerSpliterator.java index 3ab755dd61..b11a66a46c 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/PagerSpliterator.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/PagerSpliterator.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ class PagerSpliterator implements Spliterator { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/PipelineApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/PipelineApi.java index 4fa5ed284f..c8107bf273 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/PipelineApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/PipelineApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -43,7 +44,7 @@ * Pipeline Triggers API * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PipelineApi extends AbstractApi implements Constants { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ProjectApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ProjectApi.java index 77e5b41a10..bbf2d1abc9 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ProjectApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ProjectApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -45,7 +46,7 @@ * This class provides an entry point to all the GitLab API project calls. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @see Projects API at GitLab * @see Project statistics API * @see Group and project members API at GitLab diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ProjectLicense.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ProjectLicense.java index 084b4ae3bd..47435de4c7 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ProjectLicense.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ProjectLicense.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ProjectLicense { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ProtectedBranchesApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ProtectedBranchesApi.java index 9b295d749f..ef43b04cb2 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ProtectedBranchesApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ProtectedBranchesApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -38,7 +39,7 @@ * This class provides an entry point to all the Protected Branches API calls. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @see Protected branches API at GitLab * @since JDK 1.8+ */ diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ProxyClientConfig.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ProxyClientConfig.java index 17b03c01a6..5f80010883 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ProxyClientConfig.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ProxyClientConfig.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -38,7 +39,7 @@ * This class provides convenience methods to create ClientConfig properties so GitLabApi can use a proxy server. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ProxyClientConfig { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ReleasesApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ReleasesApi.java index 94a1ca80d9..59becabe47 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ReleasesApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ReleasesApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -37,7 +38,7 @@ * This class provides an entry point to all the GitLab Releases API calls. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @see Releases API at GitLab * @since JDK 1.8+ */ diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/RepositoryApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/RepositoryApi.java index c288f931f0..7db5c52c3d 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/RepositoryApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/RepositoryApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -46,7 +47,7 @@ * Branches API * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RepositoryApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/RepositoryFileApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/RepositoryFileApi.java index b756b6c305..206cf7392c 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/RepositoryFileApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/RepositoryFileApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -45,7 +46,7 @@ * See Repository Files API at GitLab for more information. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RepositoryFileApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ResourceLabelEventsApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ResourceLabelEventsApi.java index 27277b7a28..f717486fdd 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ResourceLabelEventsApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ResourceLabelEventsApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -36,7 +37,7 @@ * This class provides an entry point to all the GitLab Resource label events API * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @see Resource label events API at GitLab * @since JDK 1.8+ */ diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/RunnersApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/RunnersApi.java index 8e1cfe1a88..cbe99cc1f9 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/RunnersApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/RunnersApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -38,7 +39,7 @@ * This class provides an entry point to all the GitLab API repository files calls. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RunnersApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/SearchApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/SearchApi.java index 0c30457b04..c41f147bf2 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/SearchApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/SearchApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -33,7 +34,7 @@ * This class provides an entry point to all the GitLab API Search API calls. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @see Search API * @since JDK 1.8+ */ diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/SecretString.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/SecretString.java index 4052427757..b40a96b9aa 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/SecretString.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/SecretString.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -31,7 +32,7 @@ * This class is utilized to pass around secrets (passwords) instead of a String instance. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SecretString implements CharSequence, AutoCloseable { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ServicesApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ServicesApi.java index 2902dc1dd4..9498d45b34 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ServicesApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ServicesApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -35,7 +36,7 @@ * See GitLab documentation for more info. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ServicesApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/SnippetsApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/SnippetsApi.java index 5a1f34ed90..cf11d3cd31 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/SnippetsApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/SnippetsApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -37,7 +38,7 @@ * This class provides an entry point to all the GitLab Snippets API project calls. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SnippetsApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/SystemHooksApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/SystemHooksApi.java index d7478958e1..f214052659 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/SystemHooksApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/SystemHooksApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -36,7 +37,7 @@ * This class implements the client side API for the GitLab System Hooks Keys API calls. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SystemHooksApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/TagsApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/TagsApi.java index b36991097e..02654543f9 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/TagsApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/TagsApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -44,7 +45,7 @@ * This class provides an entry point to all the GitLab Tags and Protected Tags API calls. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @see Tags API at GitLab * @see Protected Tags API at GitLab * @since JDK 1.8+ diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/TodosApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/TodosApi.java index 7170a5feee..a075b62e57 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/TodosApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/TodosApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -34,7 +35,7 @@ * This class implements the client side API for the GitLab Todos API. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TodosApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/UserApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/UserApi.java index 853ded3de5..ee851e8a0c 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/UserApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/UserApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -42,7 +43,7 @@ * This class provides an entry point to all the GitLab API users calls. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @see Users API at GitLab * @since JDK 1.8+ */ diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/WikisApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/WikisApi.java index 6ee9bb83bc..73f9ab6fa8 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/WikisApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/WikisApi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab; @@ -41,7 +42,7 @@ * See Wikis API at GitLab for more information. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class WikisApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/AbstractSystemHookEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/AbstractSystemHookEvent.java index 53e470a87a..a180f5eafb 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/AbstractSystemHookEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/AbstractSystemHookEvent.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractSystemHookEvent implements SystemHookEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/GroupMemberSystemHookEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/GroupMemberSystemHookEvent.java index f985abeb28..bf94422121 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/GroupMemberSystemHookEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/GroupMemberSystemHookEvent.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class GroupMemberSystemHookEvent extends AbstractSystemHookEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/GroupSystemHookEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/GroupSystemHookEvent.java index 9ccfe7652d..6ff8b89e77 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/GroupSystemHookEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/GroupSystemHookEvent.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class GroupSystemHookEvent extends AbstractSystemHookEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/KeySystemHookEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/KeySystemHookEvent.java index e6fcf0b609..135fd6b620 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/KeySystemHookEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/KeySystemHookEvent.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class KeySystemHookEvent extends AbstractSystemHookEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/MergeRequestSystemHookEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/MergeRequestSystemHookEvent.java index 68856a916d..87af89f8be 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/MergeRequestSystemHookEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/MergeRequestSystemHookEvent.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MergeRequestSystemHookEvent extends MergeRequestEvent implements SystemHookEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/ProjectSystemHookEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/ProjectSystemHookEvent.java index b8207ef067..b6f582ed23 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/ProjectSystemHookEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/ProjectSystemHookEvent.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ProjectSystemHookEvent extends AbstractSystemHookEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/PushSystemHookEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/PushSystemHookEvent.java index 60f5147c1d..c40978956e 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/PushSystemHookEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/PushSystemHookEvent.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PushSystemHookEvent extends AbstractPushEvent implements SystemHookEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/RepositoryChange.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/RepositoryChange.java index 9ee5129347..152200c577 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/RepositoryChange.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/RepositoryChange.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RepositoryChange { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/RepositorySystemHookEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/RepositorySystemHookEvent.java index 2dc974f12d..b5d4900eb3 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/RepositorySystemHookEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/RepositorySystemHookEvent.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RepositorySystemHookEvent extends AbstractSystemHookEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/SystemHookEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/SystemHookEvent.java index 747e1149e5..6c71180988 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/SystemHookEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/SystemHookEvent.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/SystemHookListener.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/SystemHookListener.java index eb234653a0..11315a6728 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/SystemHookListener.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/SystemHookListener.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks; @@ -29,7 +30,7 @@ * a System Hook notification has been received from a GitLab server. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface SystemHookListener extends java.util.EventListener { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/SystemHookManager.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/SystemHookManager.java index a0a595cb00..2fa5fa8abd 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/SystemHookManager.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/SystemHookManager.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks; @@ -44,7 +45,7 @@ * This class provides a handler for processing GitLab System Hook callouts. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SystemHookManager implements HookManager { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/TagPushSystemHookEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/TagPushSystemHookEvent.java index 688a41b3b7..90bbf24c3e 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/TagPushSystemHookEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/TagPushSystemHookEvent.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TagPushSystemHookEvent extends AbstractPushEvent implements SystemHookEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/TeamMemberSystemHookEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/TeamMemberSystemHookEvent.java index 67b4fcdeac..10f9d8b135 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/TeamMemberSystemHookEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/TeamMemberSystemHookEvent.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TeamMemberSystemHookEvent extends AbstractSystemHookEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/UserSystemHookEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/UserSystemHookEvent.java index e232817995..dd419d5be5 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/UserSystemHookEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/UserSystemHookEvent.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class UserSystemHookEvent extends AbstractSystemHookEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/AbstractEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/AbstractEvent.java index f7f54fad86..56e850a021 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/AbstractEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/AbstractEvent.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks.web; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractEvent implements Event { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/AbstractPushEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/AbstractPushEvent.java index ece7a2c1dd..260729afb5 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/AbstractPushEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/AbstractPushEvent.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks.web; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractPushEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/BuildCommit.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/BuildCommit.java index ffa31a2a0f..9957b6964a 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/BuildCommit.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/BuildCommit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks.web; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BuildCommit { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/BuildEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/BuildEvent.java index 0f25d971cc..734bbd1d1f 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/BuildEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/BuildEvent.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks.web; @@ -34,7 +35,7 @@ * Job Events is incorrect, this class represents the actual content of the Job Hook event. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BuildEvent extends AbstractEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/ChangeContainer.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/ChangeContainer.java index 2052a6db0d..aee5ca8555 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/ChangeContainer.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/ChangeContainer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks.web; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ChangeContainer { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/Event.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/Event.java index 6962fdb74b..1277666a32 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/Event.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/Event.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks.web; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventChanges.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventChanges.java index 518e884baa..7f38b6c2de 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventChanges.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventChanges.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks.web; @@ -36,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class EventChanges { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventCommit.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventCommit.java index 47ba9e7477..02707d3d25 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventCommit.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventCommit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks.web; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class EventCommit { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventIssue.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventIssue.java index b320233fc1..a41ff1ce10 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventIssue.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventIssue.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks.web; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class EventIssue { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventLabel.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventLabel.java index df7c49025a..35e3526927 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventLabel.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventLabel.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks.web; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class EventLabel { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventMergeRequest.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventMergeRequest.java index 629d48aec8..b9dd1a9f1a 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventMergeRequest.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventMergeRequest.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks.web; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class EventMergeRequest { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventProject.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventProject.java index f20be8403c..9c3dd7ebe2 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventProject.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventProject.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks.web; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class EventProject { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventRepository.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventRepository.java index d583add814..9c84b0078f 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventRepository.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventRepository.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks.web; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class EventRepository { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventSnippet.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventSnippet.java index 0d873afce4..410cfc88e1 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventSnippet.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventSnippet.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks.web; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class EventSnippet { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/IssueChanges.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/IssueChanges.java index f2d0f1e255..7e959e3e0e 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/IssueChanges.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/IssueChanges.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks.web; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class IssueChanges extends EventChanges { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/IssueEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/IssueEvent.java index 47dc99ce25..286ac682bc 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/IssueEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/IssueEvent.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks.web; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class IssueEvent extends AbstractEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/JobEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/JobEvent.java index 4ca176e5c4..36aa9fddcd 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/JobEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/JobEvent.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks.web; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JobEvent extends AbstractEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/MergeRequestChanges.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/MergeRequestChanges.java index ab010f64ca..ac7c26daf8 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/MergeRequestChanges.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/MergeRequestChanges.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks.web; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MergeRequestChanges extends EventChanges { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/MergeRequestEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/MergeRequestEvent.java index c743df3f54..d210769696 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/MergeRequestEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/MergeRequestEvent.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks.web; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MergeRequestEvent extends AbstractEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/NoteEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/NoteEvent.java index 342a8d1f91..322857a6ee 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/NoteEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/NoteEvent.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks.web; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NoteEvent extends AbstractEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/PipelineEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/PipelineEvent.java index 9d9b679f55..2305183d6a 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/PipelineEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/PipelineEvent.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks.web; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PipelineEvent extends AbstractEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/PushEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/PushEvent.java index dd35fd55f1..6d3772f08c 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/PushEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/PushEvent.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks.web; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PushEvent extends AbstractPushEvent implements Event { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/TagPushEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/TagPushEvent.java index a2dcfb7a4c..a4f2435200 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/TagPushEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/TagPushEvent.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks.web; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TagPushEvent extends AbstractPushEvent implements Event { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/WebHookListener.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/WebHookListener.java index 273eff3e2e..cf7e7cff3d 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/WebHookListener.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/WebHookListener.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks.web; @@ -29,7 +30,7 @@ * a WebHook notification has been received from a GitLab server. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface WebHookListener extends java.util.EventListener { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/WebHookManager.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/WebHookManager.java index f192f05741..5d4a276c54 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/WebHookManager.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/WebHookManager.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks.web; @@ -42,7 +43,7 @@ * This class provides a handler for processing GitLab WebHook callouts. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class WebHookManager implements HookManager { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/WikiPageEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/WikiPageEvent.java index 5a92c4b2bb..e1779422bf 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/WikiPageEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/WikiPageEvent.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.hooks.web; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class WikiPageEvent extends AbstractEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AbstractUser.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AbstractUser.java index 190a21f2db..e96c974ff8 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AbstractUser.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AbstractUser.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AcceptMergeRequestParams.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AcceptMergeRequestParams.java index eda461f522..f22d73c248 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AcceptMergeRequestParams.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AcceptMergeRequestParams.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AcceptMergeRequestParams { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AccessLevel.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AccessLevel.java index 4df978ffdd..ddaee2f007 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AccessLevel.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AccessLevel.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum AccessLevel { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AccessRequest.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AccessRequest.java index c6a363071c..d0f4d70ada 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AccessRequest.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AccessRequest.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AccessRequest extends AbstractUser { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AllowedTo.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AllowedTo.java index f293744bfa..1d95947643 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AllowedTo.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AllowedTo.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -31,7 +32,7 @@ * allowed_to_push, allowed_to_merge, and allowed_to_unprotect values. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AllowedTo { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Application.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Application.java index beab418fa6..8d1eb6b039 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Application.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Application.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Application { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApplicationSettings.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApplicationSettings.java index eaa102703e..ef77aa5fac 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApplicationSettings.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApplicationSettings.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -36,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ApplicationSettings { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApprovalRule.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApprovalRule.java index 057c71924c..1d75672296 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApprovalRule.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApprovalRule.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ApprovalRule { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApprovalRuleParams.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApprovalRuleParams.java index a2e677c250..0499187a38 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApprovalRuleParams.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApprovalRuleParams.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ApprovalRuleParams { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApprovalState.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApprovalState.java index a2a864d3da..efbabad8ad 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApprovalState.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApprovalState.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ApprovalState { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApprovedBy.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApprovedBy.java index 3f43d1bcf2..441fe85331 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApprovedBy.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApprovedBy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -31,7 +32,7 @@ * which can contain a User or Group instance. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ApprovedBy { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Artifact.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Artifact.java index 2007ffa4d4..2556c2b196 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Artifact.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Artifact.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Artifact { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ArtifactsFile.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ArtifactsFile.java index 2274f243fb..d733b86cb7 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ArtifactsFile.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ArtifactsFile.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ArtifactsFile { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Assets.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Assets.java index 8a582f36f0..ac5103188a 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Assets.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Assets.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -33,7 +34,7 @@ * This class is part of the Release class model. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Assets { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Assignee.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Assignee.java index 55bb679c54..b79017698a 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Assignee.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Assignee.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Assignee extends AbstractUser { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Author.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Author.java index 74a18548c2..cd4a320bb4 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Author.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Author.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Author extends AbstractUser { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AwardEmoji.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AwardEmoji.java index 671c85b72d..fbfba664a9 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AwardEmoji.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AwardEmoji.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AwardEmoji { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Badge.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Badge.java index 7ae6ecf9a4..a845d1c014 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Badge.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Badge.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Badge { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Blame.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Blame.java index 6ba03ce4e3..6dfd6c0bf2 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Blame.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Blame.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Blame { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Board.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Board.java index 4b82084f96..a3022d0e28 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Board.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Board.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Board { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/BoardList.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/BoardList.java index 37b3571a06..31639f828f 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/BoardList.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/BoardList.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BoardList { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Branch.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Branch.java index 6daa55b06f..ecb4f4d6a0 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Branch.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Branch.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Branch { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/BranchAccessLevel.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/BranchAccessLevel.java index 6eddebc16c..b937c12d9a 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/BranchAccessLevel.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/BranchAccessLevel.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BranchAccessLevel { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Changes.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Changes.java index c1534cc05b..7420c37111 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Changes.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Changes.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Changes { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Comment.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Comment.java index aeb6a69c70..559c28a19c 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Comment.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Comment.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Comment { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Commit.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Commit.java index 6736a0017a..5f504ada76 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Commit.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Commit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Commit { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitAction.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitAction.java index c599b2c694..8f198432d5 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitAction.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitAction.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -39,7 +40,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CommitAction { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitPayload.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitPayload.java index 60e5456df6..8faf8bdacb 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitPayload.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitPayload.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CommitPayload { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitRef.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitRef.java index 37f75c6711..ec08c9077d 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitRef.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitRef.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CommitRef { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitStats.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitStats.java index d680d78258..5e1798e601 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitStats.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitStats.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CommitStats { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitStatus.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitStatus.java index 73cb400a95..060b162939 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitStatus.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitStatus.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CommitStatus { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitStatusFilter.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitStatusFilter.java index d4277eaaa1..4b15ee578f 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitStatusFilter.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitStatusFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -32,7 +33,7 @@ * This class is used to filter commit status when getting lists of them. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CommitStatusFilter { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CompareResults.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CompareResults.java index 15ad4d0d86..6ca01c27f0 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CompareResults.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CompareResults.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CompareResults { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Contributor.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Contributor.java index 752fbc9623..322ebb0de3 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Contributor.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Contributor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -29,7 +30,7 @@ * See Contributors at GitLab. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Contributor extends AbstractUser { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CustomAttribute.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CustomAttribute.java index e6d839b317..a227ba0299 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CustomAttribute.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CustomAttribute.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CustomAttribute { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/DeployKey.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/DeployKey.java index 3f9144f46d..acd8cbfe5c 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/DeployKey.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/DeployKey.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DeployKey { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/DeployToken.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/DeployToken.java index 3778e24e9f..a1f17d2e8d 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/DeployToken.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/DeployToken.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DeployToken { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Deployable.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Deployable.java index afcf8f4516..6738ac593d 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Deployable.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Deployable.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Deployable { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Deployment.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Deployment.java index 0379a2cfd2..c4225010b2 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Deployment.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Deployment.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Deployment { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/DetailedStatus.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/DetailedStatus.java index d93a4671fd..d9d0202fd5 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/DetailedStatus.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/DetailedStatus.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -30,7 +31,7 @@ * This class is part of the Pipeline message. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DetailedStatus { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Diff.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Diff.java index 14f627587d..de34ac5940 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Diff.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Diff.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Diff { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/DiffRef.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/DiffRef.java index 90449bd11b..b0c5605582 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/DiffRef.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/DiffRef.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DiffRef { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Discussion.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Discussion.java index f57253542b..4f22adcde8 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Discussion.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Discussion.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Discussion { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Duration.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Duration.java index 574ef229a8..b37894710c 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Duration.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Duration.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -34,7 +35,7 @@ * This class represents a duration in time. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Duration { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Email.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Email.java index da2fa9304a..e6046ea7fd 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Email.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Email.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Email { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Environment.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Environment.java index 335af8f65c..268e646501 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Environment.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Environment.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Environment { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Epic.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Epic.java index 55ed5575ae..03abcd5673 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Epic.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Epic.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Epic { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/EpicIssue.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/EpicIssue.java index fad357da76..8037c5a88d 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/EpicIssue.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/EpicIssue.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class EpicIssue extends Issue { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Event.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Event.java index 068bff5f31..a41256bf9b 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Event.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Event.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Event { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/EventData.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/EventData.java index 7b493ea7b9..57da6fad47 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/EventData.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/EventData.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class EventData { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ExportStatus.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ExportStatus.java index dda9c34a14..661417cc94 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ExportStatus.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ExportStatus.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -36,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ExportStatus { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/FileUpload.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/FileUpload.java index 966f99ec01..db4fceea94 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/FileUpload.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/FileUpload.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FileUpload { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/GpgSignature.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/GpgSignature.java index 692fd5b7d4..cc2db2fe5f 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/GpgSignature.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/GpgSignature.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class GpgSignature { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Group.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Group.java index d72fca8c31..7299bcd274 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Group.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Group.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Group { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/GroupFilter.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/GroupFilter.java index 5979ab252a..8504643ba1 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/GroupFilter.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/GroupFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -34,7 +35,7 @@ * This class is used to filter Projects when getting lists of projects for a specified group. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class GroupFilter { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/GroupParams.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/GroupParams.java index 8331e468ac..3c4fcf13d9 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/GroupParams.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/GroupParams.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -33,7 +34,7 @@ * the parameters for the call to the GitLab API. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class GroupParams { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/GroupProjectsFilter.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/GroupProjectsFilter.java index 6d84254edd..03643aaf59 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/GroupProjectsFilter.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/GroupProjectsFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -32,7 +33,7 @@ * This class is used to filter Projects when getting lists of projects for a specified group. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class GroupProjectsFilter { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/HealthCheckInfo.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/HealthCheckInfo.java index 586f51c6f8..5801e487bf 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/HealthCheckInfo.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/HealthCheckInfo.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -37,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HealthCheckInfo { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/HealthCheckItem.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/HealthCheckItem.java index daff175f07..43b39eaa43 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/HealthCheckItem.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/HealthCheckItem.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HealthCheckItem { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/HealthCheckStatus.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/HealthCheckStatus.java index 5be9540a55..17de186555 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/HealthCheckStatus.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/HealthCheckStatus.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum HealthCheckStatus { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Identity.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Identity.java index a5db2522cd..f02d27f407 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Identity.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Identity.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Identity { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ImpersonationToken.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ImpersonationToken.java index 7f6714fc70..91c12467ce 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ImpersonationToken.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ImpersonationToken.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ImpersonationToken { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ImportStatus.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ImportStatus.java index 650806f117..8e768ffdd5 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ImportStatus.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ImportStatus.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ImportStatus { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Issue.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Issue.java index 208d9d86fd..e3ba9b9c0b 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Issue.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Issue.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -37,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Issue { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/IssueFilter.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/IssueFilter.java index 8c3724f35b..5024d39b1b 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/IssueFilter.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/IssueFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -40,7 +41,7 @@ * This class is used to filter issues when getting lists of them. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class IssueFilter { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/IssueLink.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/IssueLink.java index 33dfe57dfa..bb4de84a07 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/IssueLink.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/IssueLink.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class IssueLink { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/IssuesStatistics.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/IssuesStatistics.java index 12f8be53e4..72da4c2d28 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/IssuesStatistics.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/IssuesStatistics.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class IssuesStatistics { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/IssuesStatisticsFilter.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/IssuesStatisticsFilter.java index b4abb2ec79..923a43dae6 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/IssuesStatisticsFilter.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/IssuesStatisticsFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -37,7 +38,7 @@ * This class is used to filter issues when getting issue statistics. of them. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class IssuesStatisticsFilter { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Job.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Job.java index 3bff6db22c..4a4d387ba6 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Job.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Job.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Job { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/JobStatus.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/JobStatus.java index 4099168656..19c96599e8 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/JobStatus.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/JobStatus.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -32,7 +33,7 @@ * Enum for the various Job status values. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum JobStatus { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Key.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Key.java index 0b782f0df3..9f9e95b063 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Key.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Key.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Key { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Label.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Label.java index 2be5ff18d7..3730989682 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Label.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Label.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Label { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/LabelEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/LabelEvent.java index 04a2faa268..87d1f5d372 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/LabelEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/LabelEvent.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class LabelEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/License.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/License.java index 7d418f0104..5cdfd702d3 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/License.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/License.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class License { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/LicenseTemplate.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/LicenseTemplate.java index 04df605171..ac7c03a65a 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/LicenseTemplate.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/LicenseTemplate.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class LicenseTemplate { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Markdown.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Markdown.java index abe8b7f39f..e1fcad5d83 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Markdown.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Markdown.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Markdown { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Member.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Member.java index a6dedff65e..8845827e40 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Member.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Member.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Member extends AbstractUser { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/MergeRequest.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/MergeRequest.java index 84901fb7f7..3848f1387e 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/MergeRequest.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/MergeRequest.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MergeRequest { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/MergeRequestDiff.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/MergeRequestDiff.java index b6661207a4..f4db00deae 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/MergeRequestDiff.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/MergeRequestDiff.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MergeRequestDiff { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/MergeRequestFilter.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/MergeRequestFilter.java index f02921bc30..e0646efd1c 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/MergeRequestFilter.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/MergeRequestFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -36,7 +37,7 @@ * This class is used to filter merge requests when getting lists of them. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MergeRequestFilter { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/MergeRequestParams.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/MergeRequestParams.java index c8aeb3767c..b7e3778afb 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/MergeRequestParams.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/MergeRequestParams.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -34,7 +35,7 @@ * This class provides the form parameters for creating and updating merge requests. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MergeRequestParams { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Milestone.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Milestone.java index 5abaec26d6..0168f57f78 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Milestone.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Milestone.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Milestone { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Namespace.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Namespace.java index bb6a19acc3..612b7cb106 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Namespace.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Namespace.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Namespace { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Note.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Note.java index e720fc1f8a..eda959362d 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Note.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Note.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Note { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/NotificationSettings.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/NotificationSettings.java index 2a6942049e..3adebd0684 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/NotificationSettings.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/NotificationSettings.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NotificationSettings { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/OauthTokenResponse.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/OauthTokenResponse.java index e35c604e8e..25a6aaf4af 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/OauthTokenResponse.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/OauthTokenResponse.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class OauthTokenResponse { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Owner.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Owner.java index 640b376803..046c295a52 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Owner.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Owner.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Owner extends AbstractUser { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Package.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Package.java index c52d137cb9..2bd6c5b9a0 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Package.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Package.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Package { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PackageFile.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PackageFile.java index 168cc267fe..b6f61ea873 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PackageFile.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PackageFile.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PackageFile { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PackageType.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PackageType.java index d31febd773..41f6b3cb02 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PackageType.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PackageType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum PackageType { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Participant.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Participant.java index 5722f73543..1ec7bd8271 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Participant.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Participant.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Participant extends AbstractUser { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Permissions.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Permissions.java index d694eb1588..c448543c36 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Permissions.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Permissions.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Permissions { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Pipeline.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Pipeline.java index bd6afcfae1..e572ef9ab0 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Pipeline.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Pipeline.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Pipeline { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PipelineFilter.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PipelineFilter.java index c679a18f48..ace786fc06 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PipelineFilter.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PipelineFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -37,7 +38,7 @@ * This class is used to filter Pipelines when getting lists of them. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PipelineFilter { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PipelineSchedule.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PipelineSchedule.java index c5a37049e1..0fd3ea4f97 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PipelineSchedule.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PipelineSchedule.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PipelineSchedule { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PipelineStatus.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PipelineStatus.java index 5dc0cc2a97..290e665cc8 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PipelineStatus.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PipelineStatus.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -34,7 +35,7 @@ * Enum for the various Pipeline status values. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum PipelineStatus { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Position.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Position.java index 74a6c229ca..ec45384ab9 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Position.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Position.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Position { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Project.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Project.java index 4f0c92fce2..39fab381be 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Project.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Project.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -36,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Project { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectAccess.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectAccess.java index ee783112bd..4e8030c7ed 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectAccess.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectAccess.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ProjectAccess { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectApprovalsConfig.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectApprovalsConfig.java index a5b8159459..0ecc261af9 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectApprovalsConfig.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectApprovalsConfig.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ProjectApprovalsConfig { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectFetches.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectFetches.java index 11c14aa746..cb70f59fd4 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectFetches.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectFetches.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ProjectFetches { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectFilter.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectFilter.java index 59212eaf76..c96442e77b 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectFilter.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -33,7 +34,7 @@ * This class is used to filter Projects when getting lists of projects for a specified user. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ProjectFilter { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectHook.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectHook.java index b7111caa94..154a75df95 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectHook.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectHook.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ProjectHook { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectSharedGroup.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectSharedGroup.java index d942b2bda4..4674558a15 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectSharedGroup.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectSharedGroup.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ProjectSharedGroup { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectStatistics.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectStatistics.java index 22a01fe909..472f4ccf07 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectStatistics.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectStatistics.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -33,7 +34,7 @@ * which is only allowed for GitLab admins. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ProjectStatistics { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectUser.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectUser.java index e1c126c335..1e9208b67b 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectUser.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectUser.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ProjectUser extends AbstractUser { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProtectedBranch.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProtectedBranch.java index 6d59ebf67b..291d21779d 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProtectedBranch.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProtectedBranch.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ProtectedBranch { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProtectedTag.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProtectedTag.java index 7194c5e49e..5b19c177f1 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProtectedTag.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProtectedTag.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ProtectedTag { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PushData.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PushData.java index 51d2ba7c27..9dc1c01d13 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PushData.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PushData.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PushData { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PushRules.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PushRules.java index 405d3e63ca..fb64b5efdd 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PushRules.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PushRules.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PushRules { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/References.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/References.java index ab29689aed..23f5e4fd7a 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/References.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/References.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class References { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/RegistryRepository.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/RegistryRepository.java index c181030114..86be8fc49e 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/RegistryRepository.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/RegistryRepository.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RegistryRepository { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/RegistryRepositoryTag.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/RegistryRepositoryTag.java index b46458a9c4..e65d196c9f 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/RegistryRepositoryTag.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/RegistryRepositoryTag.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RegistryRepositoryTag { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Release.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Release.java index 1b5d8558fd..b0fc57efac 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Release.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Release.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Release { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ReleaseParams.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ReleaseParams.java index 4aeb99fcdd..69afade620 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ReleaseParams.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ReleaseParams.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ReleaseParams { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Repository.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Repository.java index 8242673abe..3d12bae082 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Repository.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Repository.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Repository { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/RepositoryFile.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/RepositoryFile.java index 2cbe7774e1..9d6081aff7 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/RepositoryFile.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/RepositoryFile.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RepositoryFile { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Runner.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Runner.java index 012a25af60..50b9aa1f49 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Runner.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Runner.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Runner { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/RunnerDetail.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/RunnerDetail.java index 24d2c0e55c..187425f41f 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/RunnerDetail.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/RunnerDetail.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RunnerDetail extends Runner { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/SearchBlob.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/SearchBlob.java index 73f3c2a86c..ebda460084 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/SearchBlob.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/SearchBlob.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SearchBlob { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Setting.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Setting.java index 8b9addacf1..e134966e27 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Setting.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Setting.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -36,7 +37,7 @@ * List of settings that can be accessed via API calls for more information. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum Setting { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Snippet.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Snippet.java index c79cdebbc5..617837dc7b 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Snippet.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Snippet.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Snippet { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/SshKey.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/SshKey.java index a8db1f5bdd..c2db5eccd0 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/SshKey.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/SshKey.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SshKey { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/SystemHook.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/SystemHook.java index 13ac47a8c2..d04f6455c4 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/SystemHook.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/SystemHook.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SystemHook { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Tag.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Tag.java index c8667374fe..8c884cfb3d 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Tag.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Tag.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Tag { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/TaskCompletionStatus.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/TaskCompletionStatus.java index a406238128..52cf155cba 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/TaskCompletionStatus.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/TaskCompletionStatus.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TaskCompletionStatus { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/TimeStats.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/TimeStats.java index 5ae5aa1551..51a4f634d9 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/TimeStats.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/TimeStats.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TimeStats { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Todo.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Todo.java index 8ace0220a0..3e30dd70d7 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Todo.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Todo.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -42,7 +43,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Todo { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/TreeItem.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/TreeItem.java index c615631c89..699e15f514 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/TreeItem.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/TreeItem.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TreeItem { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Trigger.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Trigger.java index fe65069af8..8740614100 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Trigger.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Trigger.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Trigger { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/User.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/User.java index 78d49851c3..e2e643d295 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/User.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/User.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class User extends AbstractUser { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Variable.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Variable.java index 16012e30c7..1429e3afc9 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Variable.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Variable.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -36,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Variable { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Version.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Version.java index cd3c64dead..48af14c498 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Version.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Version.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Version { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Visibility.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Visibility.java index d397bceef0..bfc59a2ca9 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Visibility.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Visibility.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum Visibility { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/WikiAttachment.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/WikiAttachment.java index ad8a4f5173..614ff937b9 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/WikiAttachment.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/WikiAttachment.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class WikiAttachment { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/WikiPage.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/WikiPage.java index 71fd9e6a5c..37808a069a 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/WikiPage.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/WikiPage.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.models; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class WikiPage { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/BugzillaService.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/BugzillaService.java index e31a849d9e..a87fcfca07 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/BugzillaService.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/BugzillaService.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.service; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BugzillaService extends NotificationService { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/CustomIssueTrackerService.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/CustomIssueTrackerService.java index d1310c282e..9d7d55e367 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/CustomIssueTrackerService.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/CustomIssueTrackerService.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.service; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CustomIssueTrackerService extends NotificationService { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/ExternalWikiService.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/ExternalWikiService.java index 1fdc7ee0cb..59daf1a984 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/ExternalWikiService.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/ExternalWikiService.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.service; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ExternalWikiService extends NotificationService { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/HipChatService.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/HipChatService.java index 665b59c100..ef44520122 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/HipChatService.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/HipChatService.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.service; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HipChatService extends NotificationService { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/JiraService.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/JiraService.java index 395cdf4b7d..1409d1d2a2 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/JiraService.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/JiraService.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.service; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JiraService extends NotificationService { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/MattermostService.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/MattermostService.java index 9bcf6ad354..efb3c0586f 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/MattermostService.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/MattermostService.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.service; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MattermostService extends NotificationService { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/NotificationService.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/NotificationService.java index b5f480edb4..7af983a25c 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/NotificationService.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/NotificationService.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.service; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class NotificationService { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/SlackService.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/SlackService.java index 37000db2c3..45f60b076c 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/SlackService.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/SlackService.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.gitlab.service; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SlackService extends NotificationService { diff --git a/bus-goalie/README.md b/bus-goalie/README.md index 375792ce1b..d80f04f10c 100644 --- a/bus-goalie/README.md +++ b/bus-goalie/README.md @@ -133,4 +133,17 @@ public class TController { } } -``` \ No newline at end of file +``` + + +### reactor server config + +- .e.g + +``` +extend: + server: + port: #start port + path: # router patten +``` + \ No newline at end of file diff --git a/bus-goalie/pom.xml b/bus-goalie/pom.xml index ada9e40dfb..4fadf41aa4 100644 --- a/bus-goalie/pom.xml +++ b/bus-goalie/pom.xml @@ -6,32 +6,63 @@ org.aoju bus-goalie - 6.1.1 + 6.1.2 jar ${project.artifactId} Bus Goalie https://github.com/aoju/bus + + + The MIT License (MIT) + https://opensource.org/licenses/MIT + + + + + scm:git@github.com:aoju/bus.git + scm:git@github.com:aoju/bus.git + git@github.com:aoju/bus.git + + + + + Kimi Liu + https://github.com/aoju/bus.git + + + + + Github Issue + https://github.com/aoju/bus/issues + + org.springframework.boot spring-boot-starter-parent - 2.3.0.RELEASE + 2.4.0 UTF-8 UTF-8 1.8 - 1.18.12 - 29.0-jre + 1.18.16 + 30.0-jre 4.1.51.Final - 1.2.73 + 1.2.75 2.0.5.Final 7.2 + + ${project.groupId} + bus-base + ${project.version} + true + ${project.groupId} bus-http @@ -54,36 +85,6 @@ ${fastjson.version} true - - com.google.guava - guava - ${guava.version} - true - - - io.netty - netty-all - 4.1.50.Final - true - - - org.jboss.marshalling - jboss-marshalling-serial - ${marshalling.version} - true - - - org.ow2.asm - asm - ${asm.version} - true - - - javax.servlet - javax.servlet-api - 4.0.1 - true - org.springframework.boot spring-boot-starter-web @@ -91,36 +92,11 @@ org.springframework.boot - spring-boot-starter-validation + spring-boot-starter-webflux true - - - The MIT License (MIT) - https://opensource.org/licenses/MIT - - - - - scm:git@github.com:aoju/bus.git - scm:git@github.com:aoju/bus.git - git@github.com:aoju/bus.git - - - - - Kimi Liu - https://github.com/aoju/bus.git - - - - - Github Issue - https://github.com/aoju/bus/issues - - diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/annotation/ApiVersion.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/annotation/ApiVersion.java index 73067a366f..36044da0da 100644 --- a/bus-goalie/src/main/java/org/aoju/bus/goalie/annotation/ApiVersion.java +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/annotation/ApiVersion.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.goalie.annotation; @@ -34,7 +35,7 @@ * 规则,自动放置于路径开始部分;不做method做版本,避免难以维护 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8++ */ @Target({ElementType.METHOD, ElementType.TYPE}) diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/annotation/ClientVersion.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/annotation/ClientVersion.java index 60c15a38f9..8396bc5e6b 100644 --- a/bus-goalie/src/main/java/org/aoju/bus/goalie/annotation/ClientVersion.java +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/annotation/ClientVersion.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.goalie.annotation; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8++ */ @Target({ElementType.METHOD, ElementType.TYPE}) diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/annotation/TerminalVersion.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/annotation/TerminalVersion.java index 3a40fef5fc..de469f45b4 100644 --- a/bus-goalie/src/main/java/org/aoju/bus/goalie/annotation/TerminalVersion.java +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/annotation/TerminalVersion.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.goalie.annotation; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8++ */ @Retention(RetentionPolicy.RUNTIME) diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/annotation/VersionMapping.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/annotation/VersionMapping.java index 5593ac2d59..c47226ace5 100644 --- a/bus-goalie/src/main/java/org/aoju/bus/goalie/annotation/VersionMapping.java +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/annotation/VersionMapping.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.goalie.annotation; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8++ */ @Target({ElementType.METHOD, ElementType.TYPE}) diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/CustomRequestMappingHandlerMapping.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/CustomRequestMappingHandlerMapping.java index c44c2af8c3..4613b52896 100644 --- a/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/CustomRequestMappingHandlerMapping.java +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/CustomRequestMappingHandlerMapping.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.goalie.handler; @@ -36,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8++ */ public class CustomRequestMappingHandlerMapping extends RequestMappingHandlerMapping { diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/CustomWebMvcRegistrations.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/CustomWebMvcRegistrations.java index 05365504cb..4c0aa54733 100644 --- a/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/CustomWebMvcRegistrations.java +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/CustomWebMvcRegistrations.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.goalie.handler; @@ -33,7 +34,7 @@ * spring boot专用,避免继承webconfigurationsupport对spring的自动配置侵入和破坏 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8++ */ public class CustomWebMvcRegistrations implements WebMvcRegistrations { diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/VersionRequestCondition.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/VersionRequestCondition.java index 9f4f7f07bd..f62426797b 100644 --- a/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/VersionRequestCondition.java +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/VersionRequestCondition.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.goalie.handler; @@ -38,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8++ */ public class VersionRequestCondition extends AbstractRequestCondition { diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/reactor/Asset.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/reactor/Asset.java new file mode 100644 index 0000000000..0d0889455a --- /dev/null +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/reactor/Asset.java @@ -0,0 +1,68 @@ +/********************************************************************************* + * * + * The MIT License (MIT) * + * * + * Copyright (c) 2015-2020 aoju.org and other contributors. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy * + * of this software and associated documentation files (the "Software"), to deal * + * in the Software without restriction, including without limitation the rights * + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * + * THE SOFTWARE. * + * * + ********************************************************************************/ +package org.aoju.bus.goalie.reactor; + +import lombok.Data; +import org.springframework.http.HttpMethod; + +import java.util.Objects; + +/** + * api definition + * + * @author Justubborn + * @since 2020/10/27 + */ +@Data +public class Asset { + + private String id; + private String name; + private String host; + private int port; + private String url; + private String method; + private HttpMethod httpMethod; + private boolean token; + private boolean sign; + private boolean firewall; + private String version; + private String description; + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + Asset asset = (Asset) o; + return id.equals(asset.id); + } + + @Override + public int hashCode() { + return Objects.hash(id); + } + +} diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/reactor/AssetRegistry.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/reactor/AssetRegistry.java new file mode 100644 index 0000000000..2de2a710bc --- /dev/null +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/reactor/AssetRegistry.java @@ -0,0 +1,40 @@ +/********************************************************************************* + * * + * The MIT License (MIT) * + * * + * Copyright (c) 2015-2020 aoju.org and other contributors. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy * + * of this software and associated documentation files (the "Software"), to deal * + * in the Software without restriction, including without limitation the rights * + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * + * THE SOFTWARE. * + * * + ********************************************************************************/ +package org.aoju.bus.goalie.reactor; + +import java.util.Set; + +/** + * api registry + * + * @author Justubborn + * @since 2020/10/27 + */ +public interface AssetRegistry { + + Set init(); + +} diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/reactor/Athlete.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/reactor/Athlete.java new file mode 100644 index 0000000000..17fe2fa924 --- /dev/null +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/reactor/Athlete.java @@ -0,0 +1,75 @@ +/********************************************************************************* + * * + * The MIT License (MIT) * + * * + * Copyright (c) 2015-2020 aoju.org and other contributors. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy * + * of this software and associated documentation files (the "Software"), to deal * + * in the Software without restriction, including without limitation the rights * + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * + * THE SOFTWARE. * + * * + ********************************************************************************/ +package org.aoju.bus.goalie.reactor; + +import org.aoju.bus.core.collection.ConcurrentHashSet; +import org.aoju.bus.core.toolkit.CollKit; +import org.aoju.bus.logger.Logger; +import reactor.netty.DisposableServer; +import reactor.netty.http.server.HttpServer; + +import java.util.List; +import java.util.Set; + +/** + * 服务端 + * + * @author Justubborn + * @since 2020/10/27 + */ +public class Athlete { + + private final HttpServer httpServer; + private final Set assets = new ConcurrentHashSet<>(); + private final List assetRegistries; + private DisposableServer disposableServer; + + + public Athlete(HttpServer httpServer, List assetRegistries) { + this.httpServer = httpServer; + this.assetRegistries = assetRegistries; + } + + public Set getAssets() { + return assets; + } + + private void init() { + if (CollKit.isNotEmpty(assetRegistries)) { + assetRegistries.forEach(assetRegistry -> { + assets.addAll(assetRegistry.init()); + }); + } + disposableServer = httpServer.bindNow(); + Logger.info("reactor server start on port:{} success", disposableServer.port()); + } + + private void destroy() { + disposableServer.disposeNow(); + Logger.info("reactor server stop on port:{} success", disposableServer.port()); + } + +} diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/reactor/Constant.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/reactor/Constant.java new file mode 100644 index 0000000000..b34bf006f3 --- /dev/null +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/reactor/Constant.java @@ -0,0 +1,42 @@ +/********************************************************************************* + * * + * The MIT License (MIT) * + * * + * Copyright (c) 2015-2020 aoju.org and other contributors. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy * + * of this software and associated documentation files (the "Software"), to deal * + * in the Software without restriction, including without limitation the rights * + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * + * THE SOFTWARE. * + * * + ********************************************************************************/ +package org.aoju.bus.goalie.reactor; + +/** + * 常量 + * + * @author Justubborn + * @since 2020/11/6 + */ +public interface Constant { + + String METHOD = "method"; + + String VERSION = "v"; + + String X_ACCESS_TOKEN = "X-Access-Token"; + +} diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/reactor/ExchangeContext.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/reactor/ExchangeContext.java new file mode 100644 index 0000000000..f686b21fe6 --- /dev/null +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/reactor/ExchangeContext.java @@ -0,0 +1,81 @@ +/********************************************************************************* + * * + * The MIT License (MIT) * + * * + * Copyright (c) 2015-2020 aoju.org and other contributors. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy * + * of this software and associated documentation files (the "Software"), to deal * + * in the Software without restriction, including without limitation the rights * + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * + * THE SOFTWARE. * + * * + ********************************************************************************/ +package org.aoju.bus.goalie.reactor; + +import lombok.Data; +import org.springframework.core.io.buffer.DataBuffer; +import org.springframework.web.reactive.function.server.ServerRequest; +import org.springframework.web.server.ServerWebExchange; +import reactor.core.publisher.Flux; + +import java.util.Map; +import java.util.Optional; + +/** + * 上下文传参 + * + * @author Justubborn + * @since 2020/10/30 + */ +@Data +public class ExchangeContext { + + /** + * 交换内容 + */ + private final static String $ = "exchange_context"; + + /** + * 请求参数 + */ + private Map requestMap; + + /** + * 返回body + */ + private Flux body; + + private Asset asset; + + public static ExchangeContext get(ServerWebExchange exchange) { + ExchangeContext context = exchange.getAttribute(ExchangeContext.$); + + return Optional.ofNullable(context).orElseGet(() -> { + ExchangeContext empty = new ExchangeContext(); + exchange.getAttributes().put(ExchangeContext.$, empty); + return empty; + }); + } + + public static ExchangeContext get(ServerRequest request) { + return (ExchangeContext) request.attribute(ExchangeContext.$).orElseGet(() -> { + ExchangeContext empty = new ExchangeContext(); + request.attributes().put(ExchangeContext.$, empty); + return empty; + }); + } + +} diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/reactor/GlobalExceptionHandler.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/reactor/GlobalExceptionHandler.java new file mode 100644 index 0000000000..2e1d343518 --- /dev/null +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/reactor/GlobalExceptionHandler.java @@ -0,0 +1,86 @@ +/********************************************************************************* + * * + * The MIT License (MIT) * + * * + * Copyright (c) 2015-2020 aoju.org and other contributors. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy * + * of this software and associated documentation files (the "Software"), to deal * + * in the Software without restriction, including without limitation the rights * + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * + * THE SOFTWARE. * + * * + ********************************************************************************/ +package org.aoju.bus.goalie.reactor; + +import com.alibaba.fastjson.JSON; +import org.aoju.bus.base.consts.ErrorCode; +import org.aoju.bus.base.spring.Controller; +import org.aoju.bus.core.lang.exception.BusinessException; +import org.aoju.bus.core.toolkit.RuntimeKit; +import org.aoju.bus.core.toolkit.StringKit; +import org.aoju.bus.logger.Logger; +import org.springframework.boot.web.reactive.error.ErrorWebExceptionHandler; +import org.springframework.core.io.buffer.DataBuffer; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.server.reactive.ServerHttpResponse; +import org.springframework.web.server.ServerWebExchange; +import reactor.core.publisher.Mono; +import reactor.util.annotation.NonNull; + +import java.net.ConnectException; +import java.util.Map; + +/** + * 异常处理 + * + * @author Justubborn + * @since 2020/10/27 + */ +public class GlobalExceptionHandler extends Controller implements ErrorWebExceptionHandler { + + + @NonNull + @Override + public Mono handle(ServerWebExchange exchange, Throwable ex) { + + ServerHttpResponse response = exchange.getResponse(); + response.setStatusCode(HttpStatus.BAD_REQUEST); + response.getHeaders().setContentType(MediaType.APPLICATION_JSON); + Map map = ExchangeContext.get(exchange).getRequestMap(); + String method = null; + if (null != map) { + method = map.get(Constant.METHOD); + } + Logger.error("request: {},error:{}", method, RuntimeKit.getMessage(ex)); + Object message; + if (ex instanceof ConnectException) { + message = Controller.write(ErrorCode.EM_FAILURE); + } else if (ex instanceof BusinessException) { + BusinessException e = (BusinessException) ex; + if (StringKit.isNotBlank(e.getErrcode())) { + message = Controller.write(e.getErrcode()); + } else { + message = Controller.write(ErrorCode.EM_100513, e.getMessage()); + } + } else { + message = Controller.write(ErrorCode.EM_100513); + } + DataBuffer db = response.bufferFactory().wrap(JSON.toJSONString(message).getBytes()); + return response.writeWith(Mono.just(db)); + } + +} diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/reactor/RouterHandler.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/reactor/RouterHandler.java new file mode 100644 index 0000000000..7983e5e549 --- /dev/null +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/reactor/RouterHandler.java @@ -0,0 +1,98 @@ +/********************************************************************************* + * * + * The MIT License (MIT) * + * * + * Copyright (c) 2015-2020 aoju.org and other contributors. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy * + * of this software and associated documentation files (the "Software"), to deal * + * in the Software without restriction, including without limitation the rights * + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * + * THE SOFTWARE. * + * * + ********************************************************************************/ +package org.aoju.bus.goalie.reactor; + +import org.aoju.bus.base.consts.ErrorCode; +import org.aoju.bus.core.lang.Symbol; +import org.aoju.bus.core.lang.exception.BusinessException; +import org.springframework.core.io.buffer.DataBuffer; +import org.springframework.http.HttpMethod; +import org.springframework.http.MediaType; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.web.reactive.function.BodyExtractors; +import org.springframework.web.reactive.function.client.WebClient; +import org.springframework.web.reactive.function.server.ServerRequest; +import org.springframework.web.reactive.function.server.ServerResponse; +import org.springframework.web.util.UriComponentsBuilder; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; +import reactor.util.annotation.NonNull; + +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +/** + * router handler + * + * @author Justubborn + * @since 2020/10/27 + */ +public class RouterHandler { + + private final Map clients = new ConcurrentHashMap<>(); + + + @NonNull + public Mono handle(ServerRequest request) { + + ExchangeContext context = ExchangeContext.get(request); + + Asset asset = context.getAsset(); + + Map params = context.getRequestMap(); + + String baseUrl = asset.getHost() + Symbol.C_COLON + asset.getPort(); + + WebClient webClient = clients.computeIfAbsent(baseUrl, client -> WebClient.create(baseUrl)); + UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(baseUrl).path(asset.getUrl()); + MultiValueMap multiValueMap = new LinkedMultiValueMap<>(); + multiValueMap.setAll(params); + if (HttpMethod.GET.equals(asset.getHttpMethod())) { + + builder.queryParams(multiValueMap); + } + WebClient.RequestBodySpec bodySpec = webClient + .method(asset.getHttpMethod()) + .uri(builder.build().toUri()) + .headers((headers) -> request.headers()); + if (!HttpMethod.GET.equals(asset.getHttpMethod())) { + bodySpec.bodyValue(multiValueMap); + } + return bodySpec + .exchange() + .flatMap(clientResponse -> { + if (clientResponse.statusCode().is2xxSuccessful()) { + Flux flux = clientResponse.body(BodyExtractors.toDataBuffers()); + context.setBody(flux); + return ServerResponse.ok().contentType(MediaType.APPLICATION_JSON).body(flux, DataBuffer.class); + } + return Mono.error(new BusinessException(ErrorCode.EM_100509)); + }); + + } + +} diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/reactor/login/AuthProvider.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/reactor/login/AuthProvider.java new file mode 100644 index 0000000000..166c53dfc4 --- /dev/null +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/reactor/login/AuthProvider.java @@ -0,0 +1,44 @@ +/********************************************************************************* + * * + * The MIT License (MIT) * + * * + * Copyright (c) 2015-2020 aoju.org and other contributors. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy * + * of this software and associated documentation files (the "Software"), to deal * + * in the Software without restriction, including without limitation the rights * + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * + * THE SOFTWARE. * + * * + ********************************************************************************/ +package org.aoju.bus.goalie.reactor.login; + +/** + * @author Justubborn + * @since 2020/11/6 + */ +public interface AuthProvider { + + /** + * 认证接口 + * + * @param token 授权令牌 + * @return OAuth2 + */ + default LoginResponse authorize(String token) { + return new LoginResponse(); + } + +} diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/reactor/login/LoginResponse.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/reactor/login/LoginResponse.java new file mode 100644 index 0000000000..d6692a0e01 --- /dev/null +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/reactor/login/LoginResponse.java @@ -0,0 +1,47 @@ +/********************************************************************************* + * * + * The MIT License (MIT) * + * * + * Copyright (c) 2015-2020 aoju.org and other contributors. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy * + * of this software and associated documentation files (the "Software"), to deal * + * in the Software without restriction, including without limitation the rights * + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * + * THE SOFTWARE. * + * * + ********************************************************************************/ +package org.aoju.bus.goalie.reactor.login; + +import lombok.Data; +import org.aoju.bus.base.consts.Consts; +import org.aoju.bus.base.entity.Message; +import org.aoju.bus.base.entity.OAuth2; + +/** + * @author Justubborn + * @since 2020/11/6 + */ +@Data +public class LoginResponse { + + private Message message; + private OAuth2 oAuth2; + + public boolean isOk() { + return Consts.STATUS_ZERO.equals(message.getErrcode()); + } + +} diff --git a/bus-health/pom.xml b/bus-health/pom.xml index 01efdd5a44..0b1ec36946 100755 --- a/bus-health/pom.xml +++ b/bus-health/pom.xml @@ -6,13 +6,38 @@ org.aoju bus-health - 6.1.1 + 6.1.2 jar ${project.artifactId} Bus Health https://github.com/aoju/bus + + + The MIT License (MIT) + https://opensource.org/licenses/MIT + + + + + scm:git@github.com:aoju/bus.git + scm:git@github.com:aoju/bus.git + git@github.com:aoju/bus.git + + + + + Kimi Liu + https://github.com/aoju/bus.git + + + + + Github Issue + https://github.com/aoju/bus/issues + + UTF-8 UTF-8 @@ -45,31 +70,6 @@ - - - The MIT License (MIT) - https://opensource.org/licenses/MIT - - - - - scm:git@github.com:aoju/bus.git - scm:git@github.com:aoju/bus.git - git@github.com:aoju/bus.git - - - - - Kimi Liu - https://github.com/aoju/bus.git - - - - - Github Issue - https://github.com/aoju/bus/issues - - diff --git a/bus-health/src/main/java/org/aoju/bus/health/Builder.java b/bus-health/src/main/java/org/aoju/bus/health/Builder.java index 47bd68e953..2242c61b6b 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/Builder.java +++ b/bus-health/src/main/java/org/aoju/bus/health/Builder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health; @@ -63,7 +64,7 @@ * String parsing utility. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe @@ -869,11 +870,8 @@ public static double parseLastDouble(String s, double d) { */ public static String parseLastString(String s) { String[] ss = RegEx.SPACES.split(s); - if (ss.length < 1) { - return s; - } else { - return ss[ss.length - 1]; - } + // guaranteed at least one element + return ss[ss.length - 1]; } /** @@ -1305,7 +1303,9 @@ public static long[] parseStringToLongArray(String s, int[] indices, int length, // Flag as nonnumeric and continue unless we've seen a numeric // error on everything else if (numberFound) { - Logger.error("Illegal character parsing string '{}' to long array: {}", s, s.charAt(charIndex)); + if (!noLog(s)) { + Logger.error("Illegal character parsing string '{}' to long array: {}", s, s.charAt(charIndex)); + } return new long[indices.length]; } parsed[parsedIndex] = 0; @@ -1313,12 +1313,25 @@ public static long[] parseStringToLongArray(String s, int[] indices, int length, } } if (parsedIndex > 0) { - Logger.error("Not enough fields in string '{}' parsing to long array: {}", s, indices.length - parsedIndex); + if (!noLog(s)) { + Logger.error("Not enough fields in string '{}' parsing to long array: {}", s, + indices.length - parsedIndex); + } return new long[indices.length]; } return parsed; } + /** + * Test whether to log this message + * + * @param s The string to log + * @return True if the string begins with {@code NOLOG} + */ + private static boolean noLog(String s) { + return s.startsWith("NOLOG: "); + } + /** * Parses a delimited string to count elements of an array of longs. Intended to * be called once to calculate the {@code length} field for diff --git a/bus-health/src/main/java/org/aoju/bus/health/Config.java b/bus-health/src/main/java/org/aoju/bus/health/Config.java index ef72837847..4592c8f486 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/Config.java +++ b/bus-health/src/main/java/org/aoju/bus/health/Config.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health; @@ -32,7 +33,7 @@ * The global configuration utility. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @NotThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/Executor.java b/bus-health/src/main/java/org/aoju/bus/health/Executor.java index e79467641d..af5b9bef7b 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/Executor.java +++ b/bus-health/src/main/java/org/aoju/bus/health/Executor.java @@ -21,12 +21,12 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health; import org.aoju.bus.core.annotation.ThreadSafe; import org.aoju.bus.core.lang.Normal; -import org.aoju.bus.core.lang.Symbol; import org.aoju.bus.logger.Logger; import java.io.BufferedReader; @@ -42,7 +42,7 @@ * execution. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe @@ -77,7 +77,7 @@ private static String[] getDefaultEnv() { * string if the command failed */ public static List runNative(String cmdToRun) { - String[] cmd = cmdToRun.split(Symbol.SPACE); + String[] cmd = cmdToRun.split(" "); return runNative(cmd); } @@ -94,15 +94,34 @@ public static List runNative(String cmdToRun) { * string if the command failed */ public static List runNative(String[] cmdToRunWithArgs) { - Process p = null; + return runNative(cmdToRunWithArgs, DEFAULT_ENV); + } + + /** + * Executes a command on the native command line and returns the result line by + * line. This is a convenience method to call + * {@link java.lang.Runtime#exec(String[])} and capture the resulting output in + * a list of Strings. On Windows, built-in commands not associated with an + * executable program may require the strings {@code cmd.exe} and {@code /c} to + * be prepended to the array. + * + * @param cmdToRunWithArgs Command to run and args, in an array + * @param envp array of strings, each element of which has environment variable + * settings in the format name=value, or null if the subprocess + * should inherit the environment of the current process. + * @return A list of Strings representing the result of the command, or empty + * string if the command failed + */ + public static List runNative(String[] cmdToRunWithArgs, String[] envp) { + Process p; try { - p = Runtime.getRuntime().exec(cmdToRunWithArgs, DEFAULT_ENV); + p = Runtime.getRuntime().exec(cmdToRunWithArgs, envp); } catch (SecurityException | IOException e) { Logger.trace("Couldn't run command {}: {}", Arrays.toString(cmdToRunWithArgs), e.getMessage()); return new ArrayList<>(0); } - List sa = new ArrayList<>(); + ArrayList sa = new ArrayList<>(); try (BufferedReader reader = new BufferedReader( new InputStreamReader(p.getInputStream(), Charset.defaultCharset()))) { String line; diff --git a/bus-health/src/main/java/org/aoju/bus/health/Formats.java b/bus-health/src/main/java/org/aoju/bus/health/Formats.java index d0e047df27..ba194d136a 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/Formats.java +++ b/bus-health/src/main/java/org/aoju/bus/health/Formats.java @@ -21,21 +21,20 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health; import org.aoju.bus.core.annotation.ThreadSafe; -import java.math.BigDecimal; import java.math.BigInteger; -import java.math.RoundingMode; import java.util.concurrent.TimeUnit; /** * 用于附加单元或在数字类型之间转换的格式化实用程序 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe @@ -192,18 +191,6 @@ public static String formatElapsedSecs(long secs) { return String.format("%d days, %02d:%02d:%02d", days, hr, min, sec); } - /** - * Round to certain number of decimals. - * - * @param d Number to be rounded - * @param decimalPlace Number of decimal places to round to - * @return rounded result - */ - public static float round(float d, int decimalPlace) { - final BigDecimal bd = new BigDecimal(Float.toString(d)).setScale(decimalPlace, RoundingMode.HALF_UP); - return bd.floatValue(); - } - /** * Convert unsigned int to signed long. * diff --git a/bus-health/src/main/java/org/aoju/bus/health/Memoize.java b/bus-health/src/main/java/org/aoju/bus/health/Memoize.java index 3d8fdc75f5..8a8b0036f0 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/Memoize.java +++ b/bus-health/src/main/java/org/aoju/bus/health/Memoize.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health; @@ -35,7 +36,7 @@ * rather than recalculating it. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/Platform.java b/bus-health/src/main/java/org/aoju/bus/health/Platform.java index 6a2d841e99..59840271dd 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/Platform.java +++ b/bus-health/src/main/java/org/aoju/bus/health/Platform.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health; @@ -52,7 +53,7 @@ * 操作系统信息支持 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Platform { diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/Cpu.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/Cpu.java index cdf7963979..64b06841f1 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/Cpu.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/Cpu.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Cpu { diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/Java.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/Java.java index fe9fc3fe31..81c3afafc9 100755 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/Java.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/Java.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin; @@ -34,7 +35,7 @@ * 代表Java Implementation的信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Java implements Serializable { diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/JavaRuntime.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/JavaRuntime.java index 7fb688918f..e5ec07cba2 100755 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/JavaRuntime.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/JavaRuntime.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin; @@ -34,7 +35,7 @@ * 代表当前运行的JRE的信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JavaRuntime implements Serializable { diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/JavaSpec.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/JavaSpec.java index 59e31a7d7e..9edec52952 100755 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/JavaSpec.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/JavaSpec.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin; @@ -33,7 +34,7 @@ * 代表Java Specification的信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JavaSpec implements Serializable { diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/Jvm.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/Jvm.java index e65ec4eb05..bdf3691b99 100755 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/Jvm.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/Jvm.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin; @@ -33,7 +34,7 @@ * 代表Java Virtual Machine Implementation的信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Jvm implements Serializable { diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/JvmRuntime.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/JvmRuntime.java index 84d88ba43a..aff24fe765 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/JvmRuntime.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/JvmRuntime.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin; @@ -33,7 +34,7 @@ * 运行时信息,包括内存总大小、已用大小、可用大小等 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JvmRuntime implements Serializable { diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/JvmSpec.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/JvmSpec.java index 8720c84466..82ea9179ff 100755 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/JvmSpec.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/JvmSpec.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin; @@ -33,7 +34,7 @@ * 代表Java Virutal Machine Specification的信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JvmSpec implements Serializable { diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/User.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/User.java index d688aed7a3..7b367b5c61 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/User.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/User.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin; @@ -31,7 +32,7 @@ * OSUser class * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class User { diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractBaseboard.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractBaseboard.java index fcf437f4be..c33b202d1f 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractBaseboard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractBaseboard.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.hardware; @@ -30,7 +31,7 @@ * 主板数据 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractCentralProcessor.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractCentralProcessor.java index 9b83b76c3c..641791c7d5 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractCentralProcessor.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractCentralProcessor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.hardware; @@ -40,7 +41,7 @@ * A CPU. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractComputerSystem.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractComputerSystem.java index 9b8aae96ea..81d0896f2e 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractComputerSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractComputerSystem.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.hardware; @@ -33,7 +34,7 @@ * 计算机系统数据 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractDisplay.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractDisplay.java index 58a1854895..1221726328 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractDisplay.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractDisplay.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.hardware; @@ -33,7 +34,7 @@ * 显示器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractFirmware.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractFirmware.java index a4da8b3d3d..b121be82ec 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractFirmware.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractFirmware.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.hardware; @@ -31,7 +32,7 @@ * 固件数据 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractGlobalMemory.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractGlobalMemory.java index 79753a6f0f..d5b723490e 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractGlobalMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractGlobalMemory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.hardware; @@ -38,7 +39,7 @@ * 内存信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractGraphicsCard.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractGraphicsCard.java index 13ed7bb0ff..f9b1c76afc 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractGraphicsCard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractGraphicsCard.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.hardware; @@ -30,7 +31,7 @@ * 抽象声卡 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractHWDiskStore.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractHWDiskStore.java index 0c91c57625..a483c362e9 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractHWDiskStore.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractHWDiskStore.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.hardware; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractHardwareAbstractionLayer.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractHardwareAbstractionLayer.java index f32f47059d..92aa1aeda5 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractHardwareAbstractionLayer.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractHardwareAbstractionLayer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.hardware; @@ -34,7 +35,7 @@ * 硬件信息特定于平台的实现所使用的公共字段或方法 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractNetworkIF.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractNetworkIF.java index 5a8175cd08..0d9e842f5c 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractNetworkIF.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractNetworkIF.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.hardware; @@ -44,7 +45,7 @@ * 网络接口信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractPowerSource.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractPowerSource.java index 0f4832e11d..e725b25a74 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractPowerSource.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractPowerSource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.hardware; @@ -42,7 +43,7 @@ * 电源支持 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractSensors.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractSensors.java index 2cc99f9baf..0300e8bf38 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractSensors.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractSensors.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.hardware; @@ -34,7 +35,7 @@ * 来自WMI或Open Hardware Monitor的传感器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractSoundCard.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractSoundCard.java index 1589dc3eeb..91f8f768d3 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractSoundCard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractSoundCard.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.hardware; @@ -30,7 +31,7 @@ * 抽象声卡 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractUsbDevice.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractUsbDevice.java index 1ea50eea02..89e9032706 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractUsbDevice.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractUsbDevice.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.hardware; @@ -35,7 +36,7 @@ * USB设备 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractVirtualMemory.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractVirtualMemory.java index 6a9938431f..39cdd1cf86 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractVirtualMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractVirtualMemory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.hardware; @@ -32,7 +33,7 @@ * 虚拟内存信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/Baseboard.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/Baseboard.java index 86824d85a7..bb91c2c6f0 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/Baseboard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/Baseboard.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.hardware; @@ -30,7 +31,7 @@ * 主板信息数据 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/CentralProcessor.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/CentralProcessor.java index 5a57e7fd7b..e73b64ec2b 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/CentralProcessor.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/CentralProcessor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.hardware; @@ -44,7 +45,7 @@ * 多个逻辑处理器(操作系统看到的内容,可能包括超线程内核) * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe @@ -360,6 +361,14 @@ public int getNumaNode() { public int getProcessorGroup() { return processorGroup; } + + @Override + public String toString() { + return "LogicalProcessor [processorNumber=" + processorNumber + ", coreNumber=" + physicalProcessorNumber + + ", packageNumber=" + physicalPackageNumber + ", numaNode=" + numaNode + ", processorGroup=" + + processorGroup + "]"; + } + } /** @@ -410,7 +419,7 @@ public ProcessorIdentifier(String cpuVendor, String cpuName, String cpuFamily, S sb.append(" Stepping ").append(cpuStepping); this.cpuIdentifier = sb.toString(); - if (vendorFreq >= 0) { + if (vendorFreq > 0) { this.cpuVendorFreq = vendorFreq; } else { // Parse Freq from name string diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/ComputerSystem.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/ComputerSystem.java index 9f22a8e725..2d6731f0b5 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/ComputerSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/ComputerSystem.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.hardware; @@ -32,7 +33,7 @@ * etc. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/Display.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/Display.java index b74d517410..a3aa8e390a 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/Display.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/Display.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.hardware; @@ -31,7 +32,7 @@ * identified by the EDID standard. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/Firmware.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/Firmware.java index 6034187af2..02a40e3f70 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/Firmware.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/Firmware.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.hardware; @@ -30,7 +31,7 @@ * The Firmware represents the low level BIOS or equivalent. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/GlobalMemory.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/GlobalMemory.java index 21e88bcc94..678b87b78b 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/GlobalMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/GlobalMemory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.hardware; @@ -33,7 +34,7 @@ * physical memory (RAM) as well as any available virtual memory. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/GraphicsCard.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/GraphicsCard.java index 9685e0680c..d97126e458 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/GraphicsCard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/GraphicsCard.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.hardware; @@ -30,7 +31,7 @@ * GraphicsCard interface. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/HWDiskStore.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/HWDiskStore.java index 79c2cc4a7e..c249e0a28b 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/HWDiskStore.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/HWDiskStore.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.hardware; @@ -34,7 +35,7 @@ * 方式,磁盘存储代表文件系统用于文件存储的硬件 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/HWPartition.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/HWPartition.java index fdf17c5d39..a6c563a192 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/HWPartition.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/HWPartition.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.hardware; @@ -36,7 +37,7 @@ * actual disk. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/HardwareAbstractionLayer.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/HardwareAbstractionLayer.java index f1769b7385..91e4c6bb15 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/HardwareAbstractionLayer.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/HardwareAbstractionLayer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.hardware; @@ -33,7 +34,7 @@ * processors, memory, battery, and disks. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/NetworkIF.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/NetworkIF.java index 53d14f1018..d62b6664b7 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/NetworkIF.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/NetworkIF.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.hardware; @@ -37,7 +38,7 @@ * usage to ensure consistent calculations. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/PhysicalMemory.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/PhysicalMemory.java index bceecc0fa6..1f9ddf3adf 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/PhysicalMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/PhysicalMemory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.hardware; @@ -32,7 +33,7 @@ * computer system and available to the operating system. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/PowerSource.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/PowerSource.java index 4151fb5575..cd5c9e8932 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/PowerSource.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/PowerSource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.hardware; @@ -33,7 +34,7 @@ * of charge/discharge * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/Sensors.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/Sensors.java index 2890a96d75..aef9bbeebf 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/Sensors.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/Sensors.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.hardware; @@ -31,7 +32,7 @@ * information. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/SoundCard.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/SoundCard.java index bb5bb7cf95..1c7ee1a339 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/SoundCard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/SoundCard.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.hardware; @@ -30,7 +31,7 @@ * SoundCard interface. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/UsbDevice.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/UsbDevice.java index e200b9523a..adfed2605c 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/UsbDevice.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/UsbDevice.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.hardware; @@ -34,7 +35,7 @@ * in a recursive fashion. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/VirtualMemory.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/VirtualMemory.java index 1d54c83d0e..ada438bb03 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/VirtualMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/VirtualMemory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.hardware; @@ -32,7 +33,7 @@ * information to a disk or other storage device. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractFileSystem.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractFileSystem.java index a630324d46..84354f82da 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractFileSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractFileSystem.java @@ -21,83 +21,38 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.software; import org.aoju.bus.core.annotation.ThreadSafe; +import org.aoju.bus.core.lang.Normal; +import org.aoju.bus.core.lang.Symbol; +import org.aoju.bus.health.Config; import java.util.Arrays; import java.util.List; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe public abstract class AbstractFileSystem implements FileSystem { + public static final String OSHI_NETWORK_FILESYSTEM_TYPES = "health.network.filesystem.types"; + public static final String OSHI_PSEUDO_FILESYSTEM_TYPES = "health.pseudo.filesystem.types"; + /** * FileSystem types which are network-based and should be excluded from * local-only lists */ - protected static final List NETWORK_FS_TYPES = Arrays.asList("afs", "cifs", "smbfs", "sshfs", "ncpfs", - "ncp", "nfs", "nfs4", "gfs", "gds2", "glusterfs"); + protected static final List NETWORK_FS_TYPES = Arrays.asList( + Config.get(OSHI_NETWORK_FILESYSTEM_TYPES, Normal.EMPTY).split(Symbol.COMMA)); - protected static final List PSEUDO_FS_TYPES = Arrays.asList(// - // Linux defines a set of virtual file systems - "anon_inodefs", // anonymous inodes - inodes without filenames - "autofs", // automounter file system, used by Linux, Solaris, FreeBSD - "bdev", // keep track of block_device vs major/minor mapping - "binfmt_misc", // Binary format support file system - "bpf", // Virtual filesystem for Berkeley Paket Filter - "cgroup", // Cgroup file system - "cgroup2", // Cgroup file system - "configfs", // Config file system - "cpuset", // pseudo-filesystem interface to the kernel cpuset mechanism - "dax", // Direct Access (DAX) can be used on memory-backed block devices - "debugfs", // Debug file system - "devpts", // Dev pseudo terminal devices file system - "devtmpfs", // Dev temporary file system - "drm", // Direct Rendering Manager - "ecryptfs", // POSIX-compliant enterprise cryptographic filesystem for Linux - "efivarfs", // (U)EFI variable filesystem - "fuse", // - // NOTE: FUSE's fuseblk is not evalued because used as file system - // representation of a FUSE block storage - // "fuseblk" // FUSE block file system - "fusectl", // FUSE control file system - "hugetlbfs", // Huge pages support file system - "inotifyfs", // support inotify - "mqueue", // Message queue file system - "nfsd", // NFS file system - "overlay", // Overlay file system https://wiki.archlinux.org/index.php/Overlay_filesystem - // "pipefs", // for pipes but only visible inside kernel - "proc", // Proc file system, used by Linux and Solaris - "pstore", // Pstore file system - // "ramfs", // Old filesystem used for RAM disks - "rootfs", // Minimal fs to support kernel boot - "rpc_pipefs", // Sun RPC file system - "securityfs", // Kernel security file system - "selinuxfs", // SELinux file system - "sunrpc", // Sun RPC file system - "sysfs", // SysFS file system - "systemd-1", // Systemd file system - // "tmpfs", // Temporary file system - // NOTE: tmpfs is evaluated apart, because Linux, Solaris, FreeBSD use it for - // RAMdisks - "tracefs", // thin stackable file system for capturing file system traces - "usbfs", // removed in linux 3.5 but still seen in some systems - // FreeBSD / Solaris defines a set of virtual file systems - "procfs", // Proc file system - "devfs", // Dev temporary file system - "ctfs", // Contract file system - "fdescfs", // fd - "objfs", // Object file system - "mntfs", // Mount file system - "sharefs", // Share file system - "lofs" // Library file system - ); + protected static final List PSEUDO_FS_TYPES = Arrays.asList( + Config.get(OSHI_PSEUDO_FILESYSTEM_TYPES, Normal.EMPTY).split(Symbol.COMMA)); @Override public List getFileStores() { diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractNetworkParams.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractNetworkParams.java index 332eb06b5e..b8d7e768dc 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractNetworkParams.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractNetworkParams.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.software; @@ -41,7 +42,7 @@ * Common NetworkParams implementation. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractOSFileStore.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractOSFileStore.java index 33a73cfefa..f4b134d41c 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractOSFileStore.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractOSFileStore.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.software; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractOSProcess.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractOSProcess.java index 87c0148765..fd9c25081e 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractOSProcess.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractOSProcess.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.software; @@ -36,7 +37,7 @@ * execution that execute instructions concurrently. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractOSThread.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractOSThread.java index 79e924482f..a5fb3de5fd 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractOSThread.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractOSThread.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.software; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractOSThread implements OSThread { diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractOperatingSystem.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractOperatingSystem.java index 4689b41891..5308e66709 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractOperatingSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractOperatingSystem.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.software; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractOperatingSystem implements OperatingSystem { diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/FileSystem.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/FileSystem.java index acf0a05b3c..878b110fa4 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/FileSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/FileSystem.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.software; @@ -34,7 +35,7 @@ * more file stores. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/InternetProtocolStats.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/InternetProtocolStats.java index bf14b63c3c..1679d47d01 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/InternetProtocolStats.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/InternetProtocolStats.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.software; @@ -30,7 +31,7 @@ * Includes key statistics of TCP and UDP protocols * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/NetworkParams.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/NetworkParams.java index 5e150323a0..92ebd483c6 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/NetworkParams.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/NetworkParams.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.software; @@ -31,7 +32,7 @@ * name etc. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSFileStore.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSFileStore.java index e1ca93dcf5..805ab55615 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSFileStore.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSFileStore.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.software; @@ -33,7 +34,7 @@ * {@link java.nio.file.FileStore} class, with additional information. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSProcess.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSProcess.java index f7595c191a..0b2d33fab0 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSProcess.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSProcess.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.software; @@ -34,7 +35,7 @@ * threads. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSService.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSService.java index 0c58446ce0..41a77012fc 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSService.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSService.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.software; @@ -32,7 +33,7 @@ * generally shield applications from the implementation details of the machine. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSSession.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSSession.java index 5ed8721d4c..6fedcfe637 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSSession.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSSession.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.software; @@ -36,7 +37,7 @@ * to an operating system. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSThread.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSThread.java index c1c87e42d6..db34555049 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSThread.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSThread.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.software; @@ -28,7 +29,7 @@ * Represents a Thread/Task on the operating system. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface OSThread { diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OperatingSystem.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OperatingSystem.java index 78bc0943eb..00ba58b25a 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OperatingSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OperatingSystem.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.builtin.software; @@ -40,7 +41,7 @@ * controls the computer. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/LinuxLibc.java b/bus-health/src/main/java/org/aoju/bus/health/linux/LinuxLibc.java index a0edc97e0e..4a78479f0e 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/LinuxLibc.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/LinuxLibc.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux; @@ -35,7 +36,7 @@ * 因为如果/当它的代码被合并到JNA项目中时,它可能会被删除 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface LinuxLibc extends LibC, CLibrary { diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/ProcPath.java b/bus-health/src/main/java/org/aoju/bus/health/linux/ProcPath.java index 09870a2875..2bde46cc42 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/ProcPath.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/ProcPath.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux; @@ -35,7 +36,7 @@ * 提供对Linux上某些/proc文件系统信息的访问 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/CpuInfo.java b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/CpuInfo.java index 09738c4901..0ce9631d24 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/CpuInfo.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/CpuInfo.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux.drivers; @@ -38,7 +39,7 @@ * Utility to read CPU info from {@code /proc/cpuinfo} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/CpuStat.java b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/CpuStat.java index 6d7ad10923..1bff9c1f49 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/CpuStat.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/CpuStat.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux.drivers; @@ -37,7 +38,7 @@ * Utility to read CPU statistics from {@code /proc/stat} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Devicetree.java b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Devicetree.java index a20808138f..9288d76c46 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Devicetree.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Devicetree.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux.drivers; @@ -32,7 +33,7 @@ * Utility to read info from the devicetree * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/DiskStats.java b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/DiskStats.java index 67d12699fd..2691b434a7 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/DiskStats.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/DiskStats.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux.drivers; @@ -39,7 +40,7 @@ * Utility to read disk statistics from {@code /proc/diskstats} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Dmidecode.java b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Dmidecode.java index 0b10f2ae07..cdc0fb5eb8 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Dmidecode.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Dmidecode.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux.drivers; @@ -34,7 +35,7 @@ * Utility to read info from {@code dmidecode} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Lshal.java b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Lshal.java index 433ed9a0c7..cda6cd3f35 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Lshal.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Lshal.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux.drivers; @@ -32,7 +33,7 @@ * Utility to read info from {@code lshal} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Lshw.java b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Lshw.java index db21072c6d..9337d7b131 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Lshw.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Lshw.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux.drivers; @@ -32,7 +33,7 @@ * Utility to read info from {@code lshw} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/ProcessStat.java b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/ProcessStat.java index 7f783d8da7..a329b76145 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/ProcessStat.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/ProcessStat.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux.drivers; @@ -40,7 +41,7 @@ * Utility to read process statistics from {@code /proc/[pid]/stat} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Sysfs.java b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Sysfs.java index cad9988a44..46cfc445b9 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Sysfs.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Sysfs.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux.drivers; @@ -33,7 +34,7 @@ * Utility to read info from {@code sysfs} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/UpTime.java b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/UpTime.java index 0cda04bfc0..ecb680f0cf 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/UpTime.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/UpTime.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux.drivers; @@ -33,7 +34,7 @@ * Utility to read system uptime from {@code /proc/uptime} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/UserGroup.java b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/UserGroup.java index 6af182dc51..e01d84ca4c 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/UserGroup.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/UserGroup.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux.drivers; @@ -41,7 +42,7 @@ * parsing process ownership. Cache expires after one minute. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Who.java b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Who.java index 4744e57c94..bd434c5700 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Who.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Who.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux.drivers; @@ -39,7 +40,7 @@ * Utility to query logged in users. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxBaseboard.java b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxBaseboard.java index 7af36ceaf8..492a2fb718 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxBaseboard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxBaseboard.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux.hardware; @@ -38,7 +39,7 @@ * Baseboard data obtained by sysfs * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxCentralProcessor.java b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxCentralProcessor.java index 0c66be8e22..d14cd41d37 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxCentralProcessor.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxCentralProcessor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux.hardware; @@ -42,12 +43,13 @@ import java.io.File; import java.util.*; +import java.util.stream.LongStream; /** * A CPU as defined in Linux /proc. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe @@ -159,6 +161,7 @@ protected CentralProcessor.ProcessorIdentifier queryProcessorId() { String cpuFamily = Normal.EMPTY; String cpuModel = Normal.EMPTY; String cpuStepping = Normal.EMPTY; + long cpuFreq = 0L; String processorID; boolean cpu64bit = false; @@ -211,10 +214,23 @@ protected CentralProcessor.ProcessorIdentifier queryProcessorId() { case "cpu family": cpuFamily = splitLine[1]; break; + case "cpu MHz": + cpuFreq = Builder.parseHertz(splitLine[1]); + break; default: // Do nothing } } + if (cpuName.contains("Hz")) { + // if Name contains CPU vendor frequency, ignore cpuinfo and use it + cpuFreq = -1L; + } else { + // Try lshw and use it in preference to cpuinfo + long cpuCapacity = Lshw.queryCpuCapacity(); + if (cpuCapacity > cpuFreq) { + cpuFreq = cpuCapacity; + } + } if (cpuStepping.isEmpty()) { cpuStepping = armStepping.toString(); } @@ -227,7 +243,8 @@ protected CentralProcessor.ProcessorIdentifier queryProcessorId() { } } } - return new CentralProcessor.ProcessorIdentifier(cpuVendor, cpuName, cpuFamily, cpuModel, cpuStepping, processorID, cpu64bit); + return new CentralProcessor.ProcessorIdentifier(cpuVendor, cpuName, cpuFamily, cpuModel, cpuStepping, processorID, cpu64bit, + cpuFreq); } @Override @@ -266,6 +283,10 @@ protected List initProcessorCounts() { public long[] querySystemCpuLoadTicks() { // convert the Linux Jiffies to Milliseconds. long[] ticks = CpuStat.getSystemCpuLoadTicks(); + // In rare cases, /proc/stat reading fails. If so, try again. + if (LongStream.of(ticks).sum() == 0) { + ticks = CpuStat.getSystemCpuLoadTicks(); + } long hz = LinuxOperatingSystem.getHz(); for (int i = 0; i < ticks.length; i++) { ticks[i] = ticks[i] * 1000L / hz; @@ -314,6 +335,10 @@ public long[] queryCurrentFreq() { public long queryMaxFreq() { String cpuFreqPath = Config.get(CPUFREQ_PATH, Normal.EMPTY); long max = Arrays.stream(this.getCurrentFreq()).max().orElse(-1L); + // Max of current freq, if populated, is in units of Hz, convert to kHz + if (max > 0) { + max /= 1000L; + } // Iterating CPUs only gets the existing policy, so we need to iterate the // policy directories to find the system-wide policy max File cpufreqdir = new File(cpuFreqPath + "/cpufreq"); @@ -361,6 +386,12 @@ public double[] getSystemLoadAverage(int nelem) { @Override public long[][] queryProcessorCpuLoadTicks() { long[][] ticks = CpuStat.getProcessorCpuLoadTicks(getLogicalProcessorCount()); + // In rare cases, /proc/stat reading fails. If so, try again. + // In theory we should check all of them, but on failure we can expect all 0's + // so we only need to check for processor 0 + if (LongStream.of(ticks[0]).sum() == 0) { + ticks = CpuStat.getProcessorCpuLoadTicks(getLogicalProcessorCount()); + } // convert the Linux Jiffies to Milliseconds. long hz = LinuxOperatingSystem.getHz(); for (int i = 0; i < ticks.length; i++) { diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxComputerSystem.java b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxComputerSystem.java index 8ae76b862e..c342fb8ff5 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxComputerSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxComputerSystem.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux.hardware; @@ -38,7 +39,7 @@ * Hardware data obtained from sysfs. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxDisplay.java b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxDisplay.java index bdf77c8dd0..99702096c6 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxDisplay.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxDisplay.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux.hardware; @@ -39,12 +40,14 @@ * A Display * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable final class LinuxDisplay extends AbstractDisplay { + private static final String[] XRANDR_VERBOSE = {"xrandr", "--verbose"}; + /** * Constructor for LinuxDisplay. * @@ -61,7 +64,7 @@ final class LinuxDisplay extends AbstractDisplay { * @return An array of Display objects representing monitors, etc. */ public static List getDisplays() { - List xrandr = Executor.runNative("xrandr --verbose"); + List xrandr = Executor.runNative(XRANDR_VERBOSE, null); // xrandr reports edid in multiple lines. After seeing a line containing // EDID, read subsequent lines of hex until 256 characters are reached if (xrandr.isEmpty()) { diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxFirmware.java b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxFirmware.java index 16754a140f..8b574a10ae 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxFirmware.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxFirmware.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux.hardware; @@ -44,7 +45,7 @@ * Firmware data obtained by sysfs. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxGlobalMemory.java b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxGlobalMemory.java index 40c8976752..a5eab18c8a 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxGlobalMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxGlobalMemory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux.hardware; @@ -42,7 +43,7 @@ * Memory obtained by /proc/meminfo and sysinfo.totalram * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxGraphicsCard.java b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxGraphicsCard.java index c2fe7db06c..ea8ec7d51e 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxGraphicsCard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxGraphicsCard.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux.hardware; @@ -42,7 +43,7 @@ * Graphics card info obtained by lshw * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxHWDiskStore.java b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxHWDiskStore.java index 5acbe79b98..36d09332b6 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxHWDiskStore.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxHWDiskStore.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux.hardware; @@ -47,7 +48,7 @@ * Linux hard disk implementation. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxHardwareAbstractionLayer.java b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxHardwareAbstractionLayer.java index 23cad3e54b..707794e930 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxHardwareAbstractionLayer.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxHardwareAbstractionLayer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux.hardware; @@ -33,7 +34,7 @@ * LinuxHardwareAbstractionLayer class. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxNetworkIF.java b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxNetworkIF.java index 1562223372..1e5f475e43 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxNetworkIF.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxNetworkIF.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux.hardware; @@ -39,7 +40,7 @@ * LinuxNetworks class. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxPowerSource.java b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxPowerSource.java index a18d80aab1..893e6060cc 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxPowerSource.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxPowerSource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux.hardware; @@ -40,7 +41,7 @@ * A Power Source * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxSensors.java b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxSensors.java index b09ccdc953..b2d9484853 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxSensors.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxSensors.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux.hardware; @@ -43,7 +44,7 @@ * Sensors from WMI or Open Hardware Monitor * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxSoundCard.java b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxSoundCard.java index 95ffbf9dca..5c7516ce2b 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxSoundCard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxSoundCard.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux.hardware; @@ -44,7 +45,7 @@ * Sound card data obtained via /proc/asound directory * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxUsbDevice.java b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxUsbDevice.java index df9295852e..b790b19600 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxUsbDevice.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxUsbDevice.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux.hardware; @@ -38,7 +39,7 @@ * Linux Usb Device * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxVirtualMemory.java b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxVirtualMemory.java index be012c7829..358097fa7b 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxVirtualMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxVirtualMemory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux.hardware; @@ -41,7 +42,7 @@ * Memory obtained by /proc/meminfo and /proc/vmstat * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxFileSystem.java b/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxFileSystem.java index 34e5cba23f..1289a1c5e4 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxFileSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxFileSystem.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux.software; @@ -49,7 +50,7 @@ * the /proc/mount filesystem, excluding temporary and kernel mounts. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe @@ -195,14 +196,32 @@ private static long getFileDescriptors(int index) { @Override public List getFileStores(boolean localOnly) { + //Map of volume with device path as key + Map volumeDeviceMap = new HashMap<>(); + File devMapper = new File("/dev/mapper"); + File[] volumes = devMapper.listFiles(); + if (volumes != null) { + for (File volume : volumes) { + try { + volumeDeviceMap.put(volume.getCanonicalPath(), volume.getAbsolutePath()); + } catch (IOException e) { + Logger.error("Couldn't get canonical path for {}. {}", volume.getName(), e.getMessage()); + } + } + } // Map uuids with device path as key Map uuidMap = new HashMap<>(); File uuidDir = new File("/dev/disk/by-uuid"); - if (uuidDir.listFiles() != null) { - for (File uuid : uuidDir.listFiles()) { + File[] uuids = uuidDir.listFiles(); + if (uuids != null) { + for (File uuid : uuids) { try { - // Store UUID as value with path (e.g., /dev/sda1) as key - uuidMap.put(uuid.getCanonicalPath(), uuid.getName().toLowerCase()); + // Store UUID as value with path (e.g., /dev/sda1) as key and also as volumes as key + String canonicalPath = uuid.getCanonicalPath(); + uuidMap.put(canonicalPath, uuid.getName().toLowerCase()); + if (volumeDeviceMap.containsKey(canonicalPath)) { + uuidMap.put(volumeDeviceMap.get(canonicalPath), uuid.getName().toLowerCase()); + } } catch (IOException e) { Logger.error("Couldn't get canonical path for {}. {}", uuid.getName(), e.getMessage()); } diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxInternetProtocolStats.java b/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxInternetProtocolStats.java index 0ca344952d..b61499f809 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxInternetProtocolStats.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxInternetProtocolStats.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux.software; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxNetworkParams.java b/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxNetworkParams.java index 76ad7cfbac..a406d0be78 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxNetworkParams.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxNetworkParams.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux.software; @@ -46,7 +47,7 @@ * LinuxNetworkParams class. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxOSFileStore.java b/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxOSFileStore.java index 2287fedff8..3c3bb88cb7 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxOSFileStore.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxOSFileStore.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux.software; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxOSProcess.java b/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxOSProcess.java index 4e48cc572a..fb571c571e 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxOSProcess.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxOSProcess.java @@ -21,11 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux.software; import org.aoju.bus.core.annotation.ThreadSafe; import org.aoju.bus.core.lang.RegEx; +import org.aoju.bus.core.toolkit.StringKit; import org.aoju.bus.health.Builder; import org.aoju.bus.health.Executor; import org.aoju.bus.health.Memoize; @@ -53,7 +55,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe @@ -105,6 +107,33 @@ public LinuxOSProcess(int pid) { updateAttributes(); } + /** + * If some details couldn't be read from ProcPath.PID_STATUS try reading it from + * ProcPath.PID_STAT + * + * @param status status map to fill. + * @param stat string to read from. + */ + private static void getMissingDetails(Map status, String stat) { + if (status == null || stat == null) { + return; + } + + int nameStart = stat.indexOf('('); + int nameEnd = stat.indexOf(')'); + if (StringKit.isBlank(status.get("Name")) && nameStart > 0 && nameStart < nameEnd) { + // remove leading and trailing parentheses + String statName = stat.substring(nameStart + 1, nameEnd); + status.put("Name", statName); + } + + // As per man, the next item after the name is the state + if (StringKit.isBlank(status.get("State")) && nameEnd > 0 && stat.length() > nameEnd + 2) { + String statState = String.valueOf(stat.charAt(nameEnd + 2)); + status.put("State", statState); + } + } + @Override public String getName() { return this.name; @@ -298,6 +327,11 @@ public boolean updateAttributes() { this.state = State.INVALID; return false; } + + // If some details couldn't be read from ProcPath.PID_STATUS try reading it from + // ProcPath.PID_STAT + getMissingDetails(status, stat); + long now = System.currentTimeMillis(); // We can get name and status more easily from /proc/pid/status which we diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxOSThread.java b/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxOSThread.java index ac333401d7..bdc3b69f1b 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxOSThread.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxOSThread.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux.software; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class LinuxOSThread extends AbstractOSThread { diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxOperatingSystem.java b/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxOperatingSystem.java index 779bf18f36..bff43b0062 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxOperatingSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxOperatingSystem.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.linux.software; @@ -54,7 +55,7 @@ * 1991, by Linus Torvalds. Linux is typically packaged in a Linux distribution. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe @@ -600,7 +601,7 @@ public OSService[] getServices() { List systemctl = Executor.runNative("systemctl list-unit-files"); for (String str : systemctl) { String[] split = RegEx.SPACES.split(str); - if (split.length == 2 && split[0].endsWith(".service") && "enabled".equals(split[1])) { + if (split.length >= 2 && split[0].endsWith(".service") && "enabled".equals(split[1])) { // remove .service extension String name = split[0].substring(0, split[0].length() - 8); int index = name.lastIndexOf(Symbol.C_DOT); diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/IOKit.java b/bus-health/src/main/java/org/aoju/bus/health/mac/IOKit.java index a3c2ec7eee..3c69f2bd3e 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/IOKit.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/IOKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.mac; @@ -33,7 +34,7 @@ * I/O Kit框架通过设备接口机制实现对I/O Kit对象(驱动程序和nub)的非内核访问 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface IOKit extends com.sun.jna.platform.mac.IOKit { diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/SmcKit.java b/bus-health/src/main/java/org/aoju/bus/health/mac/SmcKit.java index 879f8d8641..087b382de6 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/SmcKit.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/SmcKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.mac; @@ -46,7 +47,7 @@ * 提供对Mac OS上SMC调用的访问 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/SysctlKit.java b/bus-health/src/main/java/org/aoju/bus/health/mac/SysctlKit.java index fb0ebbccb8..c6692e83cb 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/SysctlKit.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/SysctlKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.mac; @@ -37,7 +38,7 @@ * 提供对Mac OS上的sysctl调用的访问 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/SystemB.java b/bus-health/src/main/java/org/aoju/bus/health/mac/SystemB.java index b6d29ae02f..6a74b420ba 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/SystemB.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/SystemB.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.mac; @@ -34,7 +35,7 @@ * 它的代码被合并到JNA项目中时,它可能会被删除 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface SystemB extends com.sun.jna.platform.mac.SystemB, CLibrary { diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/ThreadInfo.java b/bus-health/src/main/java/org/aoju/bus/health/mac/ThreadInfo.java index 4a37fa3cf6..99b4396341 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/ThreadInfo.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/ThreadInfo.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.mac; diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/drivers/DiskKit.java b/bus-health/src/main/java/org/aoju/bus/health/mac/drivers/DiskKit.java index cf3743d69e..644dd5744b 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/drivers/DiskKit.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/drivers/DiskKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.mac.drivers; @@ -37,7 +38,7 @@ * Utility to query diskutil * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/drivers/Fsstat.java b/bus-health/src/main/java/org/aoju/bus/health/mac/drivers/Fsstat.java index ad8736ccff..da55675968 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/drivers/Fsstat.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/drivers/Fsstat.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.mac.drivers; @@ -37,7 +38,7 @@ * Utility to query fsstat * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/drivers/NetStat.java b/bus-health/src/main/java/org/aoju/bus/health/mac/drivers/NetStat.java index dfc25d8bce..f303afe15a 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/drivers/NetStat.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/drivers/NetStat.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.mac.drivers; @@ -41,7 +42,7 @@ * Utility to query NetStat. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe @@ -99,10 +100,10 @@ public static Map queryIFdata(int index) { if2m.read(); if (index < 0 || index == if2m.ifm_index) { data.put((int) if2m.ifm_index, - new IFdata(if2m.ifm_data.ifi_type, if2m.ifm_data.ifi_opackets, if2m.ifm_data.ifi_ipackets, - if2m.ifm_data.ifi_obytes, if2m.ifm_data.ifi_ibytes, if2m.ifm_data.ifi_oerrors, - if2m.ifm_data.ifi_ierrors, if2m.ifm_data.ifi_collisions, if2m.ifm_data.ifi_iqdrops, - if2m.ifm_data.ifi_baudrate, now)); + new IFdata(0xff & if2m.ifm_data.ifi_type, if2m.ifm_data.ifi_opackets, + if2m.ifm_data.ifi_ipackets, if2m.ifm_data.ifi_obytes, if2m.ifm_data.ifi_ibytes, + if2m.ifm_data.ifi_oerrors, if2m.ifm_data.ifi_ierrors, if2m.ifm_data.ifi_collisions, + if2m.ifm_data.ifi_iqdrops, if2m.ifm_data.ifi_baudrate, now)); if (index >= 0) { return data; } diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/drivers/Who.java b/bus-health/src/main/java/org/aoju/bus/health/mac/drivers/Who.java index 1ea0488dc0..e9729ab2a1 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/drivers/Who.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/drivers/Who.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.mac.drivers; @@ -38,7 +39,7 @@ * Utility to query logged in users. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacBaseboard.java b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacBaseboard.java index a905781375..6e17ac4699 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacBaseboard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacBaseboard.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.mac.hardware; @@ -40,7 +41,7 @@ * Baseboard data obtained from ioreg * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacCentralProcessor.java b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacCentralProcessor.java index 6e83315a0c..4561ea092f 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacCentralProcessor.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacCentralProcessor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.mac.hardware; @@ -64,8 +65,10 @@ protected CentralProcessor.ProcessorIdentifier queryProcessorId() { processorIdBits |= (SysctlKit.sysctl("machdep.cpu.feature_bits", 0L) & 0xffffffff) << 32; String processorID = String.format("%016X", processorIdBits); boolean cpu64bit = SysctlKit.sysctl("hw.cpu64bit_capable", 0) != 0; + long cpuFreq = SysctlKit.sysctl("hw.cpufrequency", 0L); - return new CentralProcessor.ProcessorIdentifier(cpuVendor, cpuName, cpuFamily, cpuModel, cpuStepping, processorID, cpu64bit); + return new ProcessorIdentifier(cpuVendor, cpuName, cpuFamily, cpuModel, cpuStepping, processorID, cpu64bit, + cpuFreq); } @Override diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacComputerSystem.java b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacComputerSystem.java index 9fdfa9f8d4..1edd98f3a5 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacComputerSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacComputerSystem.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.mac.hardware; @@ -42,7 +43,7 @@ * Hardware data obtained from ioreg. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacDisplay.java b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacDisplay.java index 2d5eff9519..18bbc92e2b 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacDisplay.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacDisplay.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.mac.hardware; @@ -44,7 +45,7 @@ * A Display * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacFirmware.java b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacFirmware.java index cd64d59f3b..1c03792479 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacFirmware.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacFirmware.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.mac.hardware; @@ -41,7 +42,7 @@ * Firmware data obtained from ioreg. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacGlobalMemory.java b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacGlobalMemory.java index ce0bdf59c7..c63d3d5a9b 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacGlobalMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacGlobalMemory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.mac.hardware; @@ -49,7 +50,7 @@ * Memory obtained by host_statistics (vm_stat) and sysctl. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacGraphicsCard.java b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacGraphicsCard.java index 7dc236b78e..b24cafb178 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacGraphicsCard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacGraphicsCard.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.mac.hardware; @@ -41,7 +42,7 @@ * Graphics card info obtained by system_profiler SPDisplaysDataType. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacHWDiskStore.java b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacHWDiskStore.java index 9f1ee92446..423e1dc6e4 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacHWDiskStore.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacHWDiskStore.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.mac.hardware; @@ -50,7 +51,7 @@ * Mac hard disk implementation. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacHardwareAbstractionLayer.java b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacHardwareAbstractionLayer.java index 692fb5bcb2..127c74e42d 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacHardwareAbstractionLayer.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacHardwareAbstractionLayer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.mac.hardware; @@ -33,7 +34,7 @@ * MacHardwareAbstractionLayer class. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacNetworkIF.java b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacNetworkIF.java index df691d6c41..fa3e6abd63 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacNetworkIF.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacNetworkIF.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.mac.hardware; @@ -39,7 +40,7 @@ * MacNetworks class. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacPowerSource.java b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacPowerSource.java index ef5c219161..61077e1b97 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacPowerSource.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacPowerSource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.mac.hardware; @@ -44,7 +45,7 @@ * A Power Source * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacSensors.java b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacSensors.java index 078580b21a..b6255ca5ed 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacSensors.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacSensors.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.mac.hardware; @@ -33,7 +34,7 @@ * Sensors from SMC * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacSoundCard.java b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacSoundCard.java index 2b95f15372..19079210b1 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacSoundCard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacSoundCard.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.mac.hardware; @@ -39,7 +40,7 @@ * Sound card data obtained via AppleHDA kext * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacUsbDevice.java b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacUsbDevice.java index c1bd886610..110b6c5d9f 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacUsbDevice.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacUsbDevice.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.mac.hardware; @@ -44,7 +45,7 @@ * Mac Usb Device * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacVirtualMemory.java b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacVirtualMemory.java index cdb9c84301..bf19376a03 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacVirtualMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacVirtualMemory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.mac.hardware; @@ -43,7 +44,7 @@ * Memory obtained by host_statistics (vm_stat) and sysctl. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacFileSystem.java b/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacFileSystem.java index e6ffcbf90b..6e38833fb0 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacFileSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacFileSystem.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.mac.software; @@ -61,7 +62,7 @@ * in the /Volumes directory. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacInternetProtocolStats.java b/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacInternetProtocolStats.java index 9d6d6ed868..b86ff205ed 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacInternetProtocolStats.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacInternetProtocolStats.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.mac.software; @@ -38,20 +39,20 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe public class MacInternetProtocolStats implements InternetProtocolStats { - private boolean isElevated; - private Supplier> establishedv4v6 = Memoize.memoize(NetStatTcp::queryTcpnetstat, Memoize.defaultExpiration()); private final Supplier tcpstat = Memoize.memoize(MacInternetProtocolStats::queryTcpstat, Memoize.defaultExpiration()); private final Supplier udpstat = Memoize.memoize(MacInternetProtocolStats::queryUdpstat, Memoize.defaultExpiration()); // With elevated permissions use tcpstat only // Backup estimate get ipstat and subtract off udp private final Supplier ipstat = Memoize.memoize(MacInternetProtocolStats::queryIpstat, Memoize.defaultExpiration()); private final Supplier ip6stat = Memoize.memoize(MacInternetProtocolStats::queryIp6stat, Memoize.defaultExpiration()); + private boolean isElevated; + private Supplier> establishedv4v6 = Memoize.memoize(NetStatTcp::queryTcpnetstat, Memoize.defaultExpiration()); public MacInternetProtocolStats(boolean elevated) { diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacNetworkParams.java b/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacNetworkParams.java index 03d0568b29..11f5702d73 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacNetworkParams.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacNetworkParams.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.mac.software; @@ -45,7 +46,7 @@ * MacNetworkParams class. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacOSFileStore.java b/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacOSFileStore.java index 38f8fc1c72..5a9dcd0cf9 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacOSFileStore.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacOSFileStore.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.mac.software; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacOSProcess.java b/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacOSProcess.java index 1a368800f1..55999e00fb 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacOSProcess.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacOSProcess.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.mac.software; @@ -48,7 +49,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacOSThread.java b/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacOSThread.java index e7cb24775b..b78a653a46 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacOSThread.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacOSThread.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.mac.software; diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacOperatingSystem.java b/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacOperatingSystem.java index 7d8af7e203..abf5c0e7c4 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacOperatingSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacOperatingSystem.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.mac.software; @@ -47,7 +48,7 @@ * It is the primary operating system for Apple's Mac computers. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe @@ -79,9 +80,21 @@ public class MacOperatingSystem extends AbstractOperatingSystem { private int maxProc = 1024; public MacOperatingSystem() { - this.osXVersion = System.getProperty("os.version"); - this.major = Builder.getFirstIntValue(this.osXVersion); - this.minor = Builder.getNthIntValue(this.osXVersion, 2); + String version = System.getProperty("os.version"); + int verMajor = Builder.getFirstIntValue(version); + int verMinor = Builder.getNthIntValue(version, 2); + // Big Sur (11.x) may return 10.16 + if (verMajor == 10 && verMinor > 15) { + String swVers = Executor.getFirstAnswer("sw_vers -productVersion"); + if (!swVers.isEmpty()) { + version = swVers; + } + verMajor = Builder.getFirstIntValue(version); + verMinor = Builder.getNthIntValue(version, 2); + } + this.osXVersion = version; + this.major = verMajor; + this.minor = verMinor; // Set max processes this.maxProc = SysctlKit.sysctl("kern.maxproc", 0x1000); } @@ -101,14 +114,15 @@ public String queryManufacturer() { @Override public FamilyVersionInfo queryFamilyVersionInfo() { - String family = this.major == 10 && this.minor >= 12 ? "macOS" : System.getProperty("os.name"); + String family = this.major > 10 || (this.major == 10 && this.minor >= 12) ? "macOS" + : System.getProperty("os.name"); String codeName = parseCodeName(); String buildNumber = SysctlKit.sysctl("kern.osversion", Normal.EMPTY); return new FamilyVersionInfo(family, new OperatingSystem.OSVersionInfo(this.osXVersion, codeName, buildNumber)); } private String parseCodeName() { - if (this.major == 10) { + if (this.major >= 10) { switch (this.minor) { case 15: return "Catalina"; diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/CLibrary.java b/bus-health/src/main/java/org/aoju/bus/health/unix/CLibrary.java index 803d3820b1..385ea6c62c 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/CLibrary.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/CLibrary.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix; @@ -36,7 +37,7 @@ * 因为如果/当它的代码被合并到JNA项目中时,它可能会被删除。 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface CLibrary extends LibCAPI, Library { @@ -49,6 +50,58 @@ public interface CLibrary extends LibCAPI, Library { int LOGIN_PROCESS = 6; // Session leader of a logged in user. int USER_PROCESS = 7; // Normal process. + /** + * Returns the process ID of the calling process. The ID is guaranteed to be + * unique and is useful for constructing temporary file names. + * + * @return the process ID of the calling process. + */ + int getpid(); + + /** + * Given node and service, which identify an Internet host and a service, + * getaddrinfo() returns one or more addrinfo structures, each of which contains + * an Internet address that can be specified in a call to bind(2) or connect(2). + * + * @param node a numerical network address or a network hostname, whose network + * addresses are looked up and resolved. + * @param service sets the port in each returned address structure. + * @param hints specifies criteria for selecting the socket address structures + * returned in the list pointed to by res. + * @param res returned address structure + * @return 0 on success; sets errno on failure + */ + int getaddrinfo(String node, String service, Addrinfo hints, PointerByReference res); + + /** + * Frees the memory that was allocated for the dynamically allocated linked list + * res. + * + * @param res Pointer to linked list returned by getaddrinfo + */ + void freeaddrinfo(Pointer res); + + /** + * Translates getaddrinfo error codes to a human readable string, suitable for + * error reporting. + * + * @param e Error code from getaddrinfo + * @return A human-readable version of the error code + */ + String gai_strerror(int e); + + /** + * Rewinds the file pointer to the beginning of the utmp file. It is generally a + * good idea to call it before any of the other functions. + */ + void setutxent(); + + /** + * Closes the utmp file. It should be called when the user code is done + * accessing the file with the other functions. + */ + void endutxent(); + @FieldOrder({"sa_family", "sa_data"}) class Sockaddr extends Structure { public short sa_family; @@ -129,56 +182,4 @@ class BsdIp6stat { public long ip6s_localout; // 88 } - /** - * Returns the process ID of the calling process. The ID is guaranteed to be - * unique and is useful for constructing temporary file names. - * - * @return the process ID of the calling process. - */ - int getpid(); - - /** - * Given node and service, which identify an Internet host and a service, - * getaddrinfo() returns one or more addrinfo structures, each of which contains - * an Internet address that can be specified in a call to bind(2) or connect(2). - * - * @param node a numerical network address or a network hostname, whose network - * addresses are looked up and resolved. - * @param service sets the port in each returned address structure. - * @param hints specifies criteria for selecting the socket address structures - * returned in the list pointed to by res. - * @param res returned address structure - * @return 0 on success; sets errno on failure - */ - int getaddrinfo(String node, String service, Addrinfo hints, PointerByReference res); - - /** - * Frees the memory that was allocated for the dynamically allocated linked list - * res. - * - * @param res Pointer to linked list returned by getaddrinfo - */ - void freeaddrinfo(Pointer res); - - /** - * Translates getaddrinfo error codes to a human readable string, suitable for - * error reporting. - * - * @param e Error code from getaddrinfo - * @return A human-readable version of the error code - */ - String gai_strerror(int e); - - /** - * Rewinds the file pointer to the beginning of the utmp file. It is generally a - * good idea to call it before any of the other functions. - */ - void setutxent(); - - /** - * Closes the utmp file. It should be called when the user code is done - * accessing the file with the other functions. - */ - void endutxent(); - } diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/NetStatTcp.java b/bus-health/src/main/java/org/aoju/bus/health/unix/NetStatTcp.java index 9a6d8c983d..affcd85623 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/NetStatTcp.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/NetStatTcp.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix; @@ -34,7 +35,7 @@ * Utility to query TCP connections * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/Who.java b/bus-health/src/main/java/org/aoju/bus/health/unix/Who.java index 5699c99ff6..d5ced60c21 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/Who.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/Who.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix; @@ -48,7 +49,7 @@ * Utility to query logged in users. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/Xrandr.java b/bus-health/src/main/java/org/aoju/bus/health/unix/Xrandr.java index b66d8fec1c..95f9f8b0d4 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/Xrandr.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/Xrandr.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix; @@ -36,7 +37,7 @@ * Utility to query xrandr * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/AixLibc.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/AixLibc.java index a4d1c4c11e..d66f32372d 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/AixLibc.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/AixLibc.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix; @@ -32,7 +33,7 @@ * if/when its code is incorporated into the JNA project. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface AixLibc extends CLibrary { diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/Perfstat.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/Perfstat.java index 9025600e67..2d05317543 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/Perfstat.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/Perfstat.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix; @@ -41,7 +42,7 @@ * The perfstat API is thread–safe, and does not require root authority. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Perfstat extends Library { diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Ls.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Ls.java index 7f2499f6b3..77c3819cd9 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Ls.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Ls.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix.drivers; @@ -36,7 +37,7 @@ * Utility to query ls * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Lscfg.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Lscfg.java index 42638aa80f..c6c7043390 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Lscfg.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Lscfg.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix.drivers; @@ -36,7 +37,7 @@ * Utility to query lscfg * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Lspv.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Lspv.java index 4f68781681..c2f3d1b030 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Lspv.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Lspv.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix.drivers; @@ -38,7 +39,7 @@ * Utility to query lspv * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Lssrad.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Lssrad.java index dc16132752..6716d9a963 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Lssrad.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Lssrad.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix.drivers; @@ -38,7 +39,7 @@ * Utility to query lssrad * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Who.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Who.java index eacca46a74..fc65c8326b 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Who.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Who.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix.drivers; @@ -39,7 +40,7 @@ * Utility to query logged in users. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatConfig.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatConfig.java index 7cbe7f9150..09e609f23f 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatConfig.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatConfig.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix.drivers.perfstat; @@ -31,7 +32,7 @@ * Utility to query partition config * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatCpu.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatCpu.java index e2ae24e643..7564fc0e93 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatCpu.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatCpu.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix.drivers.perfstat; @@ -31,7 +32,7 @@ * Utility to query performance stats for cpu * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatDisk.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatDisk.java index d802c2ebc1..768cabf122 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatDisk.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatDisk.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix.drivers.perfstat; @@ -32,7 +33,7 @@ * Utility to query performance stats for disk_stats * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatMemory.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatMemory.java index c75b60b119..aef0f84c1c 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatMemory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix.drivers.perfstat; @@ -31,7 +32,7 @@ * Utility to query performance stats for memory * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatNetInterface.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatNetInterface.java index 675f85a1cb..341f8e9f45 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatNetInterface.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatNetInterface.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix.drivers.perfstat; @@ -31,7 +32,7 @@ * Utility to query performance stats for network interfaces * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatProcess.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatProcess.java index 19d5d84239..e771dd9dfa 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatProcess.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatProcess.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix.drivers.perfstat; @@ -34,7 +35,7 @@ * Utility to query performance stats for processes * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatProtocol.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatProtocol.java index fe504823cc..0c340848b1 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatProtocol.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatProtocol.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix.drivers.perfstat; @@ -31,7 +32,7 @@ * Utility to query performance stats for network interfaces * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixBaseboard.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixBaseboard.java index 29d8641455..2ce12cf6f4 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixBaseboard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixBaseboard.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix.hardware; @@ -39,7 +40,7 @@ * Baseboard data obtained by lscfg * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixCentralProcessor.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixCentralProcessor.java index 70960b3387..e4efb08525 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixCentralProcessor.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixCentralProcessor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix.hardware; @@ -48,7 +49,7 @@ * A CPU * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixComputerSystem.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixComputerSystem.java index dce4ec916b..d380d98396 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixComputerSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixComputerSystem.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix.hardware; @@ -42,7 +43,7 @@ * Hardware data obtained from lsattr * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixDisplay.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixDisplay.java index 2263c58707..5b8e23df88 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixDisplay.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixDisplay.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix.hardware; @@ -37,7 +38,7 @@ * A Display * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixFirmware.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixFirmware.java index ab5e98bcbc..b956e3e760 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixFirmware.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixFirmware.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix.hardware; @@ -31,7 +32,7 @@ * Firmware data. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixGlobalMemory.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixGlobalMemory.java index 514a12fee3..e650eb04d5 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixGlobalMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixGlobalMemory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix.hardware; @@ -43,7 +44,7 @@ * Memory obtained by perfstat_memory_total_t * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixGraphicsCard.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixGraphicsCard.java index b92cae2dfc..a53aaf95cc 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixGraphicsCard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixGraphicsCard.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix.hardware; @@ -41,7 +42,7 @@ * Graphics Card info obtained from lscfg * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixHWDiskStore.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixHWDiskStore.java index be7051014d..986fa0bb1f 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixHWDiskStore.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixHWDiskStore.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix.hardware; @@ -44,7 +45,7 @@ * AIX hard disk implementation. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixHardwareAbstractionLayer.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixHardwareAbstractionLayer.java index f3ccd2011c..5d68ab4745 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixHardwareAbstractionLayer.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixHardwareAbstractionLayer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix.hardware; @@ -39,7 +40,7 @@ * AIXHardwareAbstractionLayer class. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixNetworkIF.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixNetworkIF.java index 30f73190ba..e34d842229 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixNetworkIF.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixNetworkIF.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix.hardware; @@ -42,7 +43,7 @@ * AIXNetworks class. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixPowerSource.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixPowerSource.java index 0b0528ada7..d483f9d9f2 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixPowerSource.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixPowerSource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix.hardware; @@ -37,7 +38,7 @@ * A Power Source * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixSensors.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixSensors.java index a60da23a81..3302d6832e 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixSensors.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixSensors.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix.hardware; @@ -34,7 +35,7 @@ * Sensors not available except counting fans from lscfg * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixSoundCard.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixSoundCard.java index 88120e7665..d34631300c 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixSoundCard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixSoundCard.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix.hardware; @@ -39,7 +40,7 @@ * AIX Sound Card. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixUsbDevice.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixUsbDevice.java index 9e404c446e..644ea94b3e 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixUsbDevice.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixUsbDevice.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix.hardware; @@ -39,7 +40,7 @@ * AIX Usb Device * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixVirtualMemory.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixVirtualMemory.java index 9f85ee61b7..e0b1bd8cfa 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixVirtualMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixVirtualMemory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix.hardware; @@ -34,7 +35,7 @@ * Memory obtained by perfstat_memory_total_t * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixFileSystem.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixFileSystem.java index 97f01c57e7..5c3d1aa0c4 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixFileSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixFileSystem.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix.software; @@ -42,7 +43,7 @@ * implementation specific means of file storage. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixInternetProtocolStats.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixInternetProtocolStats.java index 2a2b8bcd07..39c96311e6 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixInternetProtocolStats.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixInternetProtocolStats.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix.software; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixNetworkParams.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixNetworkParams.java index 79accd6ae9..35a2652c42 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixNetworkParams.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixNetworkParams.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix.software; @@ -37,7 +38,7 @@ * AixNetworkParams class. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixOSFileStore.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixOSFileStore.java index 9711d79852..9ab649ba87 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixOSFileStore.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixOSFileStore.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix.software; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixOSProcess.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixOSProcess.java index 46c5f727b6..18921c0af1 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixOSProcess.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixOSProcess.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix.software; @@ -42,7 +43,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixOSThread.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixOSThread.java index 2c45d8f7af..f3894ee709 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixOSThread.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixOSThread.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix.software; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AixOSThread extends AbstractOSThread { diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixOperatingSystem.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixOperatingSystem.java index ee62e3d2d6..3f086df115 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixOperatingSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixOperatingSystem.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.aix.software; @@ -51,7 +52,7 @@ * platforms. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/BsdSysctlKit.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/BsdSysctlKit.java index 4778789df2..e0b2b57797 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/BsdSysctlKit.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/BsdSysctlKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.freebsd; @@ -37,7 +38,7 @@ * 提供对FreeBSD上的sysctl调用的访问 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/FreeBsdLibc.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/FreeBsdLibc.java index a3257ff81b..348e9fa4fb 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/FreeBsdLibc.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/FreeBsdLibc.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.freebsd; @@ -36,7 +37,7 @@ * 它的代码被合并到JNA项目中时,它可能会被删除 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface FreeBsdLibc extends CLibrary { diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/drivers/GeomDiskList.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/drivers/GeomDiskList.java index b146257d1d..916a4a9ad6 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/drivers/GeomDiskList.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/drivers/GeomDiskList.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.freebsd.drivers; @@ -40,7 +41,7 @@ * Utility to query geom part list * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/drivers/GeomPartList.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/drivers/GeomPartList.java index 0c7c7ccb34..d9b3370f97 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/drivers/GeomPartList.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/drivers/GeomPartList.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.freebsd.drivers; @@ -39,7 +40,7 @@ * Utility to query geom part list * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/drivers/Mount.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/drivers/Mount.java index 954bd75ba5..096371e725 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/drivers/Mount.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/drivers/Mount.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.freebsd.drivers; @@ -36,7 +37,7 @@ * Utility to query mount * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/drivers/Who.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/drivers/Who.java index c2d6447aa3..71b74e6382 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/drivers/Who.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/drivers/Who.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.freebsd.drivers; @@ -38,7 +39,7 @@ * Utility to query logged in users. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdBaseboard.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdBaseboard.java index c9fbff5048..4c6f20ad81 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdBaseboard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdBaseboard.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.freebsd.hardware; @@ -31,7 +32,7 @@ * Baseboard data obtained by dmidecode * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdCentralProcessor.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdCentralProcessor.java index e97d7bb652..e5d0b9ff18 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdCentralProcessor.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdCentralProcessor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.freebsd.hardware; @@ -52,7 +53,7 @@ * A CPU * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe @@ -137,7 +138,7 @@ private static List matchBitmasks(long group1 private static int getMatchingBitmask(List bitmasks, int lp) { for (int j = 0; j < bitmasks.size(); j++) { - if ((bitmasks.get(j).longValue() & (1L << lp)) > 0) { + if ((bitmasks.get(j).longValue() & (1L << lp)) != 0) { return j; } } @@ -178,6 +179,8 @@ protected CentralProcessor.ProcessorIdentifier queryProcessorId() { String cpuModel = Normal.EMPTY; String cpuStepping = Normal.EMPTY; String processorID; + long cpuFreq = BsdSysctlKit.sysctl("hw.clockrate", 0L) * 1_000_000L; + boolean cpu64bit; // Parsing dmesg.boot is apparently the only reliable source for processor @@ -210,7 +213,8 @@ protected CentralProcessor.ProcessorIdentifier queryProcessorId() { cpu64bit = Executor.getFirstAnswer("uname -m").trim().contains("64"); processorID = getProcessorIDfromDmiDecode(processorIdBits); - return new CentralProcessor.ProcessorIdentifier(cpuVendor, cpuName, cpuFamily, cpuModel, cpuStepping, processorID, cpu64bit); + return new CentralProcessor.ProcessorIdentifier(cpuVendor, cpuName, cpuFamily, cpuModel, cpuStepping, processorID, cpu64bit, + cpuFreq); } @Override diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdComputerSystem.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdComputerSystem.java index c4548581aa..0fe6a438a3 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdComputerSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdComputerSystem.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.freebsd.hardware; @@ -41,7 +42,7 @@ * Hardware data obtained from dmidecode. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdDisplay.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdDisplay.java index 4cbf209844..3b25c422ed 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdDisplay.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdDisplay.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.freebsd.hardware; @@ -38,7 +39,7 @@ * A Display * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdFirmware.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdFirmware.java index 815ccd48f4..81cea0afc0 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdFirmware.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdFirmware.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.freebsd.hardware; @@ -39,7 +40,7 @@ * Firmware information from dmidecode * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdGlobalMemory.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdGlobalMemory.java index b370c44f98..3155cbd4f7 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdGlobalMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdGlobalMemory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.freebsd.hardware; @@ -36,7 +37,7 @@ * Memory obtained by sysctl vm.stats * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdGraphicsCard.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdGraphicsCard.java index 680e05a03a..5bd209ee61 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdGraphicsCard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdGraphicsCard.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.freebsd.hardware; diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdHWDiskStore.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdHWDiskStore.java index 7cb49e43aa..d15244cab6 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdHWDiskStore.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdHWDiskStore.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.freebsd.hardware; diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdHardwareAbstractionLayer.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdHardwareAbstractionLayer.java index 5928bb5f82..d1c60d34a5 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdHardwareAbstractionLayer.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdHardwareAbstractionLayer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.freebsd.hardware; @@ -33,7 +34,7 @@ * FreeBsdHardwareAbstractionLayer class. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdNetworkIF.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdNetworkIF.java index d88772c729..d119ef68e6 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdNetworkIF.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdNetworkIF.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.freebsd.hardware; @@ -40,7 +41,7 @@ * FreeBsdNetworks class. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdPowerSource.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdPowerSource.java index e4ad406a68..88cc048c25 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdPowerSource.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdPowerSource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.freebsd.hardware; @@ -40,7 +41,7 @@ * A Power Source * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdSensors.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdSensors.java index 46cdec0aec..439fcb0fd9 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdSensors.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdSensors.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.freebsd.hardware; @@ -35,7 +36,7 @@ * Sensors from coretemp * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdSoundCard.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdSoundCard.java index f2c2e4d8ba..c9357bfb28 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdSoundCard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdSoundCard.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.freebsd.hardware; @@ -38,7 +39,7 @@ * FreeBSD soundcard. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdUsbDevice.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdUsbDevice.java index c3ff2f24a0..f0a5a9b5c9 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdUsbDevice.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdUsbDevice.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.freebsd.hardware; @@ -37,7 +38,7 @@ * FreeBsd Usb Device * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdVirtualMemory.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdVirtualMemory.java index 99fb9d9868..dcf2bffa0a 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdVirtualMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdVirtualMemory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.freebsd.hardware; @@ -38,7 +39,7 @@ * Memory obtained by swapinfo * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdFileSystem.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdFileSystem.java index 62b846b593..c4f0943a1a 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdFileSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdFileSystem.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.freebsd.software; @@ -45,7 +46,7 @@ * the /proc/mount filesystem, excluding temporary and kernel mounts. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdInternetProtocolStats.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdInternetProtocolStats.java index dfd772e5a0..9ff6a2b69c 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdInternetProtocolStats.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdInternetProtocolStats.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.freebsd.software; @@ -39,9 +40,9 @@ @ThreadSafe public class FreeBsdInternetProtocolStats implements InternetProtocolStats { - private Supplier> establishedv4v6 = Memoize.memoize(NetStatTcp::queryTcpnetstat, Memoize.defaultExpiration()); private final Supplier tcpstat = Memoize.memoize(FreeBsdInternetProtocolStats::queryTcpstat, Memoize.defaultExpiration()); private final Supplier udpstat = Memoize.memoize(FreeBsdInternetProtocolStats::queryUdpstat, Memoize.defaultExpiration()); + private Supplier> establishedv4v6 = Memoize.memoize(NetStatTcp::queryTcpnetstat, Memoize.defaultExpiration()); private static CLibrary.BsdTcpstat queryTcpstat() { CLibrary.BsdTcpstat ft = new CLibrary.BsdTcpstat(); diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdNetworkParams.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdNetworkParams.java index 49f06678e1..f2bcbf233c 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdNetworkParams.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdNetworkParams.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.freebsd.software; @@ -39,7 +40,7 @@ * FreeBsdNetworkParams class. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdOSFileStore.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdOSFileStore.java index b9fff119f0..d1dac98b22 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdOSFileStore.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdOSFileStore.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.freebsd.software; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdOSProcess.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdOSProcess.java index b23f771207..2cdbc47c59 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdOSProcess.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdOSProcess.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.freebsd.software; @@ -44,7 +45,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdOSThread.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdOSThread.java index e1079eae89..380af9e3a7 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdOSThread.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdOSThread.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.freebsd.software; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FreeBsdOSThread extends AbstractOSThread { diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdOperatingSystem.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdOperatingSystem.java index 5a29de7c45..21c7b34322 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdOperatingSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdOperatingSystem.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.freebsd.software; diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/KstatKit.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/KstatKit.java index 04b8abd760..1a031cb887 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/KstatKit.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/KstatKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.solaris; @@ -43,7 +44,7 @@ * Provides access to kstat information on Solaris * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/SolarisLibc.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/SolarisLibc.java index 4eebb4c159..253f6b1f48 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/SolarisLibc.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/SolarisLibc.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.solaris; @@ -35,7 +36,7 @@ * 它的代码被合并到JNA项目中时,它可能会被删除 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface SolarisLibc extends CLibrary { diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/Iostat.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/Iostat.java index 3859e04106..663952d88d 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/Iostat.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/Iostat.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.solaris.drivers; @@ -41,7 +42,7 @@ * Utility to query iostat * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/Lshal.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/Lshal.java index 39bc34983e..e8e3e401f5 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/Lshal.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/Lshal.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.solaris.drivers; @@ -37,7 +38,7 @@ * Utility to query lshal * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/Prtvtoc.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/Prtvtoc.java index 1bc193ac4b..063232f858 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/Prtvtoc.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/Prtvtoc.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.solaris.drivers; @@ -39,7 +40,7 @@ * Utility to query iostat * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/SystemPages.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/SystemPages.java index 849267d79d..7a3ac5ea1e 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/SystemPages.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/SystemPages.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.solaris.drivers; diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/Who.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/Who.java index 002db7197f..dc73b83aba 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/Who.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/Who.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.solaris.drivers; diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisBaseboard.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisBaseboard.java index e7516d74a3..a958a1e2a1 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisBaseboard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisBaseboard.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.solaris.hardware; @@ -31,7 +32,7 @@ * Baseboard data obtained by smbios * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisCentralProcessor.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisCentralProcessor.java index bd24cb8611..9f361af8b1 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisCentralProcessor.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisCentralProcessor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.solaris.hardware; @@ -43,7 +44,7 @@ * A CPU * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe @@ -103,6 +104,7 @@ protected CentralProcessor.ProcessorIdentifier queryProcessorId() { String cpuFamily = Normal.EMPTY; String cpuModel = Normal.EMPTY; String cpuStepping = Normal.EMPTY; + long cpuFreq = 0L; // Get first result try (KstatChain kc = KstatKit.openChain()) { @@ -119,7 +121,8 @@ protected CentralProcessor.ProcessorIdentifier queryProcessorId() { boolean cpu64bit = "64".equals(Executor.getFirstAnswer("isainfo -b").trim()); String processorID = getProcessorID(cpuStepping, cpuModel, cpuFamily); - return new CentralProcessor.ProcessorIdentifier(cpuVendor, cpuName, cpuFamily, cpuModel, cpuStepping, processorID, cpu64bit); + return new CentralProcessor.ProcessorIdentifier(cpuVendor, cpuName, cpuFamily, cpuModel, cpuStepping, processorID, cpu64bit, + cpuFreq); } @Override diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisComputerSystem.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisComputerSystem.java index 37500581f7..16dc2401a9 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisComputerSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisComputerSystem.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.solaris.hardware; @@ -40,7 +41,7 @@ * Hardware data obtained from smbios. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisDisplay.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisDisplay.java index 7ed404343e..37c73beaca 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisDisplay.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisDisplay.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.solaris.hardware; @@ -38,7 +39,7 @@ * A Display * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisFirmware.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisFirmware.java index da64bc596d..8345ad6526 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisFirmware.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisFirmware.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.solaris.hardware; @@ -31,7 +32,7 @@ * Firmware data. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisGlobalMemory.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisGlobalMemory.java index 0e8c345f63..0fe0c6177b 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisGlobalMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisGlobalMemory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.solaris.hardware; @@ -39,7 +40,7 @@ * Memory obtained by kstat * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisGraphicsCard.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisGraphicsCard.java index 7c3c62cf6e..9948404d0c 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisGraphicsCard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisGraphicsCard.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.solaris.hardware; @@ -41,7 +42,7 @@ * Graphics Card info obtained from prtconf * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisHWDiskStore.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisHWDiskStore.java index c528370b36..dd5c1d55f3 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisHWDiskStore.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisHWDiskStore.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.solaris.hardware; @@ -47,7 +48,7 @@ * Solaris hard disk implementation. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisHardwareAbstractionLayer.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisHardwareAbstractionLayer.java index f79a11fba5..87a3064c25 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisHardwareAbstractionLayer.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisHardwareAbstractionLayer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.solaris.hardware; @@ -33,7 +34,7 @@ * SolarisHardwareAbstractionLayer class. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisNetworkIF.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisNetworkIF.java index e6af4099a7..33ddc32d77 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisNetworkIF.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisNetworkIF.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.solaris.hardware; @@ -39,7 +40,7 @@ * SolarisNetworks class. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisPowerSource.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisPowerSource.java index 98d32ccac6..ed1b225658 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisPowerSource.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisPowerSource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.solaris.hardware; @@ -40,7 +41,7 @@ * A Power Source * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisSensors.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisSensors.java index b5bc42d28b..86bee00eb5 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisSensors.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisSensors.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.solaris.hardware; @@ -37,7 +38,7 @@ * Sensors from prtpicl * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisSoundCard.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisSoundCard.java index cec8f2533b..7fbdade3cc 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisSoundCard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisSoundCard.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.solaris.hardware; @@ -38,7 +39,7 @@ * Solaris Sound Card. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisUsbDevice.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisUsbDevice.java index 6177979565..3ed9e570d8 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisUsbDevice.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisUsbDevice.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.solaris.hardware; @@ -38,7 +39,7 @@ * Solaris Usb Device * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisVirtualMemory.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisVirtualMemory.java index 432b04d5cd..653d7e8c2f 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisVirtualMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisVirtualMemory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.solaris.hardware; @@ -40,7 +41,7 @@ * Memory obtained by kstat and swap * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisFileSystem.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisFileSystem.java index 61a36a3aaf..5ea07f4729 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisFileSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisFileSystem.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.solaris.software; @@ -46,7 +47,7 @@ * the /proc/mount filesystem, excluding temporary and kernel mounts. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisInternetProtocolStats.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisInternetProtocolStats.java index a1af49d39a..847140150d 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisInternetProtocolStats.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisInternetProtocolStats.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.solaris.software; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisNetworkParams.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisNetworkParams.java index 5f90fb214c..70cd36dab9 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisNetworkParams.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisNetworkParams.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.solaris.software; @@ -35,7 +36,7 @@ * SolarisNetworkParams class. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisOSFileStore.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisOSFileStore.java index a36eb4563d..987b61f8c8 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisOSFileStore.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisOSFileStore.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.solaris.software; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisOSProcess.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisOSProcess.java index 1b1b03f8df..df0d860b88 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisOSProcess.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisOSProcess.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.solaris.software; @@ -43,7 +44,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisOSThread.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisOSThread.java index d07ad1664e..3523ffeac3 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisOSThread.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisOSThread.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.solaris.software; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SolarisOSThread extends AbstractOSThread { diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisOperatingSystem.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisOperatingSystem.java index 19669c1ff1..803fbce59d 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisOperatingSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisOperatingSystem.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.unix.solaris.software; @@ -47,7 +48,7 @@ * after the Sun acquisition by Oracle, it was renamed Oracle Solaris. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/PerfCounterQuery.java b/bus-health/src/main/java/org/aoju/bus/health/windows/PerfCounterQuery.java index 06916f617e..daadf93f57 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/PerfCounterQuery.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/PerfCounterQuery.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows; @@ -45,7 +46,7 @@ * 封装性能计数器查询的信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/PerfCounterQueryHandler.java b/bus-health/src/main/java/org/aoju/bus/health/windows/PerfCounterQueryHandler.java index 00af41e83d..21b541176e 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/PerfCounterQueryHandler.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/PerfCounterQueryHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows; @@ -37,7 +38,7 @@ * 处理性能计数器查询 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @NotThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/PerfCounterWildcardQuery.java b/bus-health/src/main/java/org/aoju/bus/health/windows/PerfCounterWildcardQuery.java index 3982804f08..ab07dbd1d0 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/PerfCounterWildcardQuery.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/PerfCounterWildcardQuery.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows; @@ -43,7 +44,7 @@ * 封装性能计数器查询的信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/PerfDataKit.java b/bus-health/src/main/java/org/aoju/bus/health/windows/PerfDataKit.java index 22697778f6..3843102c00 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/PerfDataKit.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/PerfDataKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows; @@ -42,7 +43,7 @@ * 帮助类来集中PDH计数器设置的样板部分,并允许应用程序轻松地添加、查询和删除计数器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/PowrProf.java b/bus-health/src/main/java/org/aoju/bus/health/windows/PowrProf.java index 4ac4984fcf..a36e269b73 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/PowrProf.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/PowrProf.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows; @@ -34,7 +35,7 @@ * 果/当它的代码被合并到JNA项目中时,它可能会被删除 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface PowrProf extends com.sun.jna.platform.win32.PowrProf { diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/ThreadInformation.java b/bus-health/src/main/java/org/aoju/bus/health/windows/ThreadInformation.java index 42caa73870..4285d5d2b0 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/ThreadInformation.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/ThreadInformation.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows; @@ -34,7 +35,7 @@ * Utility to query Thread Information performance counter * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/WmiKit.java b/bus-health/src/main/java/org/aoju/bus/health/windows/WmiKit.java index ab5ebf4e00..cbcbe4a929 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/WmiKit.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/WmiKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows; @@ -38,7 +39,7 @@ * Helper class for WMI * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/WmiQueryHandler.java b/bus-health/src/main/java/org/aoju/bus/health/windows/WmiQueryHandler.java index b60e3bdeec..cf274c384a 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/WmiQueryHandler.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/WmiQueryHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows; @@ -44,7 +45,7 @@ * 处理WMI查询 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/HkeyPerformance.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/HkeyPerformance.java index a9bb880523..a217664bd6 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/HkeyPerformance.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/HkeyPerformance.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -40,7 +41,7 @@ * Utility to read HKEY_PERFORMANCE_DATA information. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/HkeyUserData.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/HkeyUserData.java index 5e7e7bc6ac..59f9c434bd 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/HkeyUserData.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/HkeyUserData.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -42,7 +43,7 @@ * Utility to read session data from HKEY_USERS * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/LogicalProcessorInformation.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/LogicalProcessorInformation.java index 10656da902..ec1bac8e0f 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/LogicalProcessorInformation.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/LogicalProcessorInformation.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -37,7 +38,7 @@ * Utility to query Logical Processor Information pre-Win7 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe @@ -57,21 +58,25 @@ public static List getLogicalProcessorInforma // package. These will be 64-bit bitmasks. WinNT.SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX[] procInfo = Kernel32Util .getLogicalProcessorInformationEx(WinNT.LOGICAL_PROCESSOR_RELATIONSHIP.RelationAll); + // Used to cross-reference a processor to package pr core List packages = new ArrayList<>(); - List numaNodes = new ArrayList<>(); List cores = new ArrayList<>(); + // Used to iterate + List numaNodes = new ArrayList<>(); for (int i = 0; i < procInfo.length; i++) { switch (procInfo[i].relationship) { case WinNT.LOGICAL_PROCESSOR_RELATIONSHIP.RelationProcessorPackage: + // could assign a package to more than one processor group packages.add(((WinNT.PROCESSOR_RELATIONSHIP) procInfo[i]).groupMask); break; - case WinNT.LOGICAL_PROCESSOR_RELATIONSHIP.RelationNumaNode: - numaNodes.add((WinNT.NUMA_NODE_RELATIONSHIP) procInfo[i]); - break; case WinNT.LOGICAL_PROCESSOR_RELATIONSHIP.RelationProcessorCore: + // for Core, groupCount is always 1 cores.add(((WinNT.PROCESSOR_RELATIONSHIP) procInfo[i]).groupMask[0]); break; + case WinNT.LOGICAL_PROCESSOR_RELATIONSHIP.RelationNumaNode: + numaNodes.add((WinNT.NUMA_NODE_RELATIONSHIP) procInfo[i]); + break; default: // Ignore Group and Cache info break; @@ -81,36 +86,38 @@ public static List getLogicalProcessorInforma // so core and package numbers increment consistently with processor // numbers/bitmasks, ordered in groups cores.sort(Comparator.comparing(c -> c.group * 64L + c.mask.longValue())); + // if package in multiple groups will still use first group for sorting packages.sort(Comparator.comparing(p -> p[0].group * 64L + p[0].mask.longValue())); // Iterate Logical Processors and use bitmasks to match packages, cores, - // and NUMA nodes + // and NUMA nodes. Perfmon instances are numa node + processor number, so we + // iterate by numa node so the returned list will properly index perfcounter + // numa/proc-per-numa indices with all numa nodes grouped together + numaNodes.sort(Comparator.comparing(n -> n.nodeNumber)); List logProcs = new ArrayList<>(); - for (WinNT.GROUP_AFFINITY coreMask : cores) { - int group = coreMask.group; - long mask = coreMask.mask.longValue(); - // Iterate mask for logical processor numbers + for (WinNT.NUMA_NODE_RELATIONSHIP node : numaNodes) { + int nodeNum = node.nodeNumber; + int group = node.groupMask.group; + long mask = node.groupMask.mask.longValue(); + // Processor numbers are uniquely identified by processor group and processor + // number on that group, which matches the bitmask. int lowBit = Long.numberOfTrailingZeros(mask); int hiBit = 63 - Long.numberOfLeadingZeros(mask); for (int lp = lowBit; lp <= hiBit; lp++) { - if ((mask & (1L << lp)) > 0) { + if ((mask & (1L << lp)) != 0) { CentralProcessor.LogicalProcessor logProc = new CentralProcessor.LogicalProcessor(lp, getMatchingCore(cores, group, lp), - getMatchingPackage(packages, group, lp), getMatchingNumaNode(numaNodes, group, lp), group); + getMatchingPackage(packages, group, lp), nodeNum, group); logProcs.add(logProc); } } } - // Sort by numaNode and then logical processor number to match - // PerfCounter/WMI ordering - logProcs.sort(Comparator.comparing(CentralProcessor.LogicalProcessor::getNumaNode) - .thenComparing(CentralProcessor.LogicalProcessor::getProcessorNumber)); return logProcs; } private static int getMatchingPackage(List packages, int g, int lp) { for (int i = 0; i < packages.size(); i++) { for (int j = 0; j < packages.get(i).length; j++) { - if ((packages.get(i)[j].mask.longValue() & (1L << lp)) > 0 && packages.get(i)[j].group == g) { + if ((packages.get(i)[j].mask.longValue() & (1L << lp)) != 0 && packages.get(i)[j].group == g) { return i; } } @@ -118,19 +125,9 @@ private static int getMatchingPackage(List packages, int return 0; } - private static int getMatchingNumaNode(List numaNodes, int g, int lp) { - for (int j = 0; j < numaNodes.size(); j++) { - if ((numaNodes.get(j).groupMask.mask.longValue() & (1L << lp)) > 0 - && numaNodes.get(j).groupMask.group == g) { - return numaNodes.get(j).nodeNumber; - } - } - return 0; - } - private static int getMatchingCore(List cores, int g, int lp) { for (int j = 0; j < cores.size(); j++) { - if ((cores.get(j).mask.longValue() & (1L << lp)) > 0 && cores.get(j).group == g) { + if ((cores.get(j).mask.longValue() & (1L << lp)) != 0 && cores.get(j).group == g) { return j; } } @@ -173,7 +170,7 @@ public static List getLogicalProcessorInforma int hiBit = 63 - Long.numberOfLeadingZeros(coreMask); // Create logical processors for this core for (int i = lowBit; i <= hiBit; i++) { - if ((coreMask & (1L << i)) > 0) { + if ((coreMask & (1L << i)) != 0) { CentralProcessor.LogicalProcessor logProc = new CentralProcessor.LogicalProcessor(i, core, LogicalProcessorInformation.getBitMatchingPackageNumber(packageMaskList, i)); logProcs.add(logProc); @@ -192,7 +189,7 @@ public static List getLogicalProcessorInforma */ private static int getBitMatchingPackageNumber(List packageMaskList, int logProc) { for (int i = 0; i < packageMaskList.size(); i++) { - if ((packageMaskList.get(i).longValue() & (1L << logProc)) > 0) { + if ((packageMaskList.get(i).longValue() & (1L << logProc)) != 0) { return i; } } diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/MSAcpiThermalZoneTemperature.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/MSAcpiThermalZoneTemperature.java index 4bc212ed70..50e8d29c7e 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/MSAcpiThermalZoneTemperature.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/MSAcpiThermalZoneTemperature.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -33,7 +34,7 @@ * Utility to query WMI class {@code MSAcpi_ThermalZoneTemperature} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/MemoryInformation.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/MemoryInformation.java index ad81b78580..c74b349cd8 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/MemoryInformation.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/MemoryInformation.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -34,7 +35,7 @@ * Utility to query Memory performance counter * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/NetSessionData.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/NetSessionData.java index 0f6bd0e609..665e0c4d7e 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/NetSessionData.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/NetSessionData.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -40,7 +41,7 @@ * backup from Performance Counters or WMI * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/OhmHardware.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/OhmHardware.java index 0f98f8dde0..9f1e85d1b8 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/OhmHardware.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/OhmHardware.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -34,7 +35,7 @@ * Utility to query Open Hardware Monitor WMI data for Hardware * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/OhmSensor.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/OhmSensor.java index 167b3a13b9..555eeb0e69 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/OhmSensor.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/OhmSensor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -34,7 +35,7 @@ * Utility to query Open Hardware Monitor WMI data for Sensors * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/PagingFile.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/PagingFile.java index 11cc0a120d..8103ed9af9 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/PagingFile.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/PagingFile.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -34,7 +35,7 @@ * Utility to query Paging File performance counter * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/PhysicalDisk.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/PhysicalDisk.java index 4dbaa8fa02..5f62a3f9fb 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/PhysicalDisk.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/PhysicalDisk.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -37,7 +38,7 @@ * Utility to query PhysicalDisk performance counter * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ProcessInformation.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ProcessInformation.java index 7d105f46d4..1d41281dbf 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ProcessInformation.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ProcessInformation.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -37,7 +38,7 @@ * Utility to query Process Information performance counter * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ProcessPerformanceData.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ProcessPerformanceData.java index c018a2969f..a17ead080d 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ProcessPerformanceData.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ProcessPerformanceData.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -41,7 +42,7 @@ * backup from Performance Counters or WMI * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ProcessWtsData.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ProcessWtsData.java index 00960f4c22..338bfe7dde 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ProcessWtsData.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ProcessWtsData.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -47,7 +48,7 @@ * backup from Performance Counters or WMI * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ProcessorInformation.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ProcessorInformation.java index c91d44f9c3..d2a37ceb1e 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ProcessorInformation.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ProcessorInformation.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -39,7 +40,7 @@ * Utility to query Processor performance counter * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe @@ -72,16 +73,6 @@ public static Pair, Map>> qu WIN32_PERF_RAW_DATA_PERF_OS_PROCESSOR_WHERE_NOT_NAME_TOTAL); } - /** - * Returns system performance counters. - * - * @return Performance Counters for the total of all processors. - */ - public static Map querySystemCounters() { - return PerfCounterQuery.queryValues(SystemTickCountProperty.class, PROCESSOR, - WIN32_PERF_RAW_DATA_PERF_OS_PROCESSOR_WHERE_NAME_TOTAL); - } - /** * Returns system interrupts counters. * @@ -127,32 +118,6 @@ public String getCounter() { } } - /** - * System performance counters - */ - public enum SystemTickCountProperty implements PdhCounterProperty { - PERCENTDPCTIME(PerfCounterQuery.TOTAL_INSTANCE, "% DPC Time"), // - PERCENTINTERRUPTTIME(PerfCounterQuery.TOTAL_INSTANCE, "% Interrupt Time"); - - private final String instance; - private final String counter; - - SystemTickCountProperty(String instance, String counter) { - this.instance = instance; - this.counter = counter; - } - - @Override - public String getInstance() { - return instance; - } - - @Override - public String getCounter() { - return counter; - } - } - /** * System interrupts counters */ diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/SessionWtsData.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/SessionWtsData.java index 7ff10dbd8b..7fff79743b 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/SessionWtsData.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/SessionWtsData.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -49,7 +50,7 @@ * backup from Performance Counters or WMI * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/SystemInformation.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/SystemInformation.java index b9d74abec7..ca19e22763 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/SystemInformation.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/SystemInformation.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -34,7 +35,7 @@ * Utility to query System performance counter * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ThreadPerformanceData.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ThreadPerformanceData.java index bcb5d445e2..5d10c909b9 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ThreadPerformanceData.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ThreadPerformanceData.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -42,7 +43,7 @@ * backup from Performance Counters or WMI * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe @@ -92,7 +93,11 @@ public static Map buildThreadMapFromRegistry(Collecti .longValue() / 10_000L; int priority = ((Integer) threadInstanceMap.get(ThreadInformation.ThreadPerformanceProperty.PRIORITYCURRENT)).intValue(); int threadState = ((Integer) threadInstanceMap.get(ThreadInformation.ThreadPerformanceProperty.THREADSTATE)).intValue(); - long startAddr = ((Long) threadInstanceMap.get(ThreadInformation.ThreadPerformanceProperty.STARTADDRESS)).longValue(); + // Start address is pointer sized when fetched from registry, so this could be + // either Integer (uint32) or Long depending on OS bitness + Object addr = threadInstanceMap.get(ThreadInformation.ThreadPerformanceProperty.STARTADDRESS); + long startAddr = addr.getClass().equals(Long.class) ? (Long) addr + : Integer.toUnsignedLong((Integer) addr); int contextSwitches = ((Integer) threadInstanceMap.get(ThreadInformation.ThreadPerformanceProperty.CONTEXTSWITCHESPERSEC)) .intValue(); threadMap.put(tid, new PerfCounterBlock(name, tid, pid, now - upTime, user, kernel, priority, diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32BaseBoard.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32BaseBoard.java index 54e7347e3e..10e88b0c85 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32BaseBoard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32BaseBoard.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -33,7 +34,7 @@ * Utility to query WMI class {@code Win32_BaseBoard} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32Bios.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32Bios.java index 79fe3ee6d2..38ebcdcaa0 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32Bios.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32Bios.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -33,7 +34,7 @@ * Utility to query WMI class {@code Win32_BIOS} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32ComputerSystem.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32ComputerSystem.java index 71de209cc0..98136c334a 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32ComputerSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32ComputerSystem.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -33,7 +34,7 @@ * Utility to query WMI class {@code Win32_ComputerSystem} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32ComputerSystemProduct.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32ComputerSystemProduct.java index b35f124b9f..ad3249d1d5 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32ComputerSystemProduct.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32ComputerSystemProduct.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -33,7 +34,7 @@ * Utility to query WMI class {@code Win32_ComputerSystemProduct} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32DiskDrive.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32DiskDrive.java index 1137eb28ad..25dae32d65 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32DiskDrive.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32DiskDrive.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -33,7 +34,7 @@ * Utility to query WMI class {@code Win32_DiskDrive} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32DiskDriveToDiskPartition.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32DiskDriveToDiskPartition.java index b61f580a7c..eb3728dcf6 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32DiskDriveToDiskPartition.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32DiskDriveToDiskPartition.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -33,7 +34,7 @@ * Utility to query WMI class {@code Win32_DiskDriveToDiskPartition} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32DiskPartition.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32DiskPartition.java index 124ead280b..3ba83ccd83 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32DiskPartition.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32DiskPartition.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -33,7 +34,7 @@ * Utility to query WMI class {@code Win32_DiskPartition} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32Fan.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32Fan.java index 8f82e73232..a21fad7054 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32Fan.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32Fan.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -33,7 +34,7 @@ * Utility to query WMI class {@code Win32_Fan} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32LogicalDisk.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32LogicalDisk.java index f590d0eeb4..5d31535b0d 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32LogicalDisk.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32LogicalDisk.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -33,7 +34,7 @@ * Utility to query WMI class {@code Win32_LogicalDisk} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32LogicalDiskToPartition.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32LogicalDiskToPartition.java index 65c3b83fe0..0dbfae2453 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32LogicalDiskToPartition.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32LogicalDiskToPartition.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -33,7 +34,7 @@ * Utility to query WMI class {@code Win32_LogicalDiskToPartition} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32OperatingSystem.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32OperatingSystem.java index a8e9041adc..eb9c603257 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32OperatingSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32OperatingSystem.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -33,7 +34,7 @@ * Utility to query WMI class {@code Win32_OperatingSystem} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32PhysicalMemory.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32PhysicalMemory.java index 0ef4a2bf3d..e4a58752b3 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32PhysicalMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32PhysicalMemory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -33,7 +34,7 @@ * Utility to query WMI class {@code Win32_PhysicalMemory} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32PnPEntity.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32PnPEntity.java index 7a098dfeba..503f9469f9 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32PnPEntity.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32PnPEntity.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -33,7 +34,7 @@ * Utility to query WMI class {@code Win32_PnPEntity} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32Process.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32Process.java index dfdd0324af..14ffa70256 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32Process.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32Process.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -36,7 +37,7 @@ * Utility to query WMI class {@code Win32_Process} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32ProcessCached.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32ProcessCached.java index 046701869a..96a9f56374 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32ProcessCached.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32ProcessCached.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -41,7 +42,7 @@ * Utility to query WMI class {@code Win32_Process} using cache * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32Processor.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32Processor.java index 4bcb240591..8c6bc75249 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32Processor.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32Processor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -33,7 +34,7 @@ * Utility to query WMI class {@code Win32_Processor} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32USBController.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32USBController.java index dafef648f3..ea5f29e50a 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32USBController.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32USBController.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -33,7 +34,7 @@ * Utility to query WMI class {@code Win32_USBController} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32VideoController.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32VideoController.java index 26471c4924..5985b2521d 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32VideoController.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32VideoController.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.drivers; @@ -33,7 +34,7 @@ * Utility to query WMI class {@code Win32_VideoController} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsBaseboard.java b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsBaseboard.java index 401191723e..087ca6abd5 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsBaseboard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsBaseboard.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.hardware; diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsCentralProcessor.java b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsCentralProcessor.java index c18235e953..98fbe5a47c 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsCentralProcessor.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsCentralProcessor.java @@ -21,11 +21,11 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.hardware; import com.sun.jna.Memory; -import com.sun.jna.Native; import com.sun.jna.platform.win32.*; import com.sun.jna.platform.win32.COM.WbemcliUtil.WmiResult; import com.sun.jna.platform.win32.PowrProf.POWER_INFORMATION_LEVEL; @@ -54,7 +54,7 @@ * individual Physical and Logical processors. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe @@ -141,6 +141,7 @@ protected CentralProcessor.ProcessorIdentifier queryProcessorId() { String cpuFamily = Normal.EMPTY; String cpuModel = Normal.EMPTY; String cpuStepping = Normal.EMPTY; + long cpuVendorFreq = 0L; String processorID; boolean cpu64bit = false; @@ -154,6 +155,12 @@ protected CentralProcessor.ProcessorIdentifier queryProcessorId() { "ProcessorNameString"); cpuIdentifier = Advapi32Util.registryGetStringValue(WinReg.HKEY_LOCAL_MACHINE, cpuRegistryPath, "Identifier"); + try { + cpuVendorFreq = Advapi32Util.registryGetIntValue(WinReg.HKEY_LOCAL_MACHINE, cpuRegistryPath, "~MHz") + * 1_000_000L; + } catch (Win32Exception e) { + // Leave as 0, parse the identifier as backup + } } if (!cpuIdentifier.isEmpty()) { cpuFamily = parseIdentifier(cpuIdentifier, "Family"); @@ -175,7 +182,8 @@ protected CentralProcessor.ProcessorIdentifier queryProcessorId() { processorID = createProcessorID(cpuStepping, cpuModel, cpuFamily, cpu64bit ? new String[]{"ia64"} : new String[0]); } - return new CentralProcessor.ProcessorIdentifier(cpuVendor, cpuName, cpuFamily, cpuModel, cpuStepping, processorID, cpu64bit); + return new CentralProcessor.ProcessorIdentifier(cpuVendor, cpuName, cpuFamily, cpuModel, cpuStepping, processorID, cpu64bit, + cpuVendorFreq); } @Override @@ -183,11 +191,21 @@ protected List initProcessorCounts() { if (VersionHelpers.IsWindows7OrGreater()) { List logProcs = LogicalProcessorInformation.getLogicalProcessorInformationEx(); // Save numaNode,Processor lookup for future PerfCounter instance lookup - this.numaNodeProcToLogicalProcMap = new HashMap<>(); + // The processor number is based on the Processor Group, so we keep a separate + // index by NUMA node. + int curNode = -1; + int procNum = 0; + // 0-indexed list of all lps for array lookup int lp = 0; + this.numaNodeProcToLogicalProcMap = new HashMap<>(); for (LogicalProcessor logProc : logProcs) { - numaNodeProcToLogicalProcMap - .put(String.format("%d,%d", logProc.getNumaNode(), logProc.getProcessorNumber()), lp++); + int node = logProc.getNumaNode(); + // This list is grouped by NUMA node so a change in node will reset this counter + if (node != curNode) { + curNode = node; + procNum = 0; + } + numaNodeProcToLogicalProcMap.put(String.format("%d,%d", logProc.getNumaNode(), procNum++), lp++); } return logProcs; } else { @@ -296,33 +314,20 @@ private List getLogicalProcessorInformation() @Override public long[] querySystemCpuLoadTicks() { - long[] ticks = new long[CentralProcessor.TickType.values().length]; - WinBase.FILETIME lpIdleTime = new WinBase.FILETIME(); - WinBase.FILETIME lpKernelTime = new WinBase.FILETIME(); - WinBase.FILETIME lpUserTime = new WinBase.FILETIME(); - if (!Kernel32.INSTANCE.GetSystemTimes(lpIdleTime, lpKernelTime, lpUserTime)) { - Logger.error("Failed to update system idle/kernel/user times. Error code: {}", Native.getLastError()); - return ticks; + // To get load in processor group scenario, we need perfmon counters, but the + // _Total instance is an average rather than total (scaled) number of ticks + // which matches GetSystemTimes() results. We can just query the per-processor + // ticks and add them up. Calling the get() method gains the benefit of + // synchronizing this output with the memoized result of per-processor ticks as + // well. + long[] ticks = new long[TickType.values().length]; + // Sum processor ticks + long[][] procTicks = getProcessorCpuLoadTicks(); + for (int i = 0; i < ticks.length; i++) { + for (long[] procTick : procTicks) { + ticks[i] += procTick[i]; + } } - // IOwait: - // Windows does not measure IOWait. - - // IRQ and ticks: - // Percent time raw value is cumulative 100NS-ticks - // Divide by 10_000 to get milliseconds - - Map valueMap = ProcessorInformation.querySystemCounters(); - ticks[CentralProcessor.TickType.IRQ.getIndex()] = valueMap.getOrDefault(ProcessorInformation.SystemTickCountProperty.PERCENTINTERRUPTTIME, 0L) - / 10_000L; - ticks[CentralProcessor.TickType.SOFTIRQ.getIndex()] = valueMap.getOrDefault(ProcessorInformation.SystemTickCountProperty.PERCENTDPCTIME, 0L) - / 10_000L; - - ticks[CentralProcessor.TickType.IDLE.getIndex()] = lpIdleTime.toDWordLong().longValue() / 10_000L; - ticks[CentralProcessor.TickType.SYSTEM.getIndex()] = lpKernelTime.toDWordLong().longValue() / 10_000L - - ticks[CentralProcessor.TickType.IDLE.getIndex()]; - ticks[CentralProcessor.TickType.USER.getIndex()] = lpUserTime.toDWordLong().longValue() / 10_000L; - // Additional decrement to avoid double counting in the total array - ticks[CentralProcessor.TickType.SYSTEM.getIndex()] -= ticks[CentralProcessor.TickType.IRQ.getIndex()] + ticks[CentralProcessor.TickType.SOFTIRQ.getIndex()]; return ticks; } diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsComputerSystem.java b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsComputerSystem.java index 1b0395380e..07a1bf1822 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsComputerSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsComputerSystem.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.hardware; @@ -44,7 +45,7 @@ * Hardware data obtained from WMI. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsDisplay.java b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsDisplay.java index 8b7d40bfa9..e08a0fa135 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsDisplay.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsDisplay.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.hardware; @@ -42,7 +43,7 @@ * A Display * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsFirmware.java b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsFirmware.java index 895c7274f8..9a8b7951f7 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsFirmware.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsFirmware.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.hardware; @@ -40,7 +41,7 @@ * Firmware data obtained from WMI * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsGlobalMemory.java b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsGlobalMemory.java index 9892b7ffe6..fa5539e77c 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsGlobalMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsGlobalMemory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.hardware; @@ -47,7 +48,7 @@ * Memory obtained by Performance Info. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsGraphicsCard.java b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsGraphicsCard.java index 7f5136b652..d755e39108 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsGraphicsCard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsGraphicsCard.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.hardware; @@ -45,7 +46,7 @@ * Graphics Card obtained from WMI * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsHWDiskStore.java b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsHWDiskStore.java index 31f75da395..97cf01db7a 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsHWDiskStore.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsHWDiskStore.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.hardware; @@ -44,7 +45,7 @@ * Windows hard disk implementation. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsHardwareAbstractionLayer.java b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsHardwareAbstractionLayer.java index 8f3cbf7a4f..29799acc52 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsHardwareAbstractionLayer.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsHardwareAbstractionLayer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.hardware; @@ -33,7 +34,7 @@ * WindowsHardwareAbstractionLayer class. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsNetworkIF.java b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsNetworkIF.java index ef86475356..d5bae3f2b2 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsNetworkIF.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsNetworkIF.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.hardware; @@ -43,7 +44,7 @@ * WindowsNetworks class. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsPowerSource.java b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsPowerSource.java index 720d4db184..707696d092 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsPowerSource.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsPowerSource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.hardware; @@ -53,7 +54,7 @@ * A Power Source * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsSensors.java b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsSensors.java index e4d9c3271b..deed2d6132 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsSensors.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsSensors.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.hardware; @@ -36,7 +37,7 @@ * Sensors from WMI or Open Hardware Monitor * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsSoundCard.java b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsSoundCard.java index caadbe3bca..76aecbc8d1 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsSoundCard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsSoundCard.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.hardware; @@ -41,7 +42,7 @@ * Sound Card data obtained from registry * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsUsbDevice.java b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsUsbDevice.java index 3e163cd5c5..00e86816b9 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsUsbDevice.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsUsbDevice.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.hardware; @@ -48,7 +49,7 @@ * Windows Usb Device * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsVirtualMemory.java b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsVirtualMemory.java index ff707efb9d..300af4dfba 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsVirtualMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsVirtualMemory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.hardware; @@ -43,7 +44,7 @@ * Memory obtained from WMI * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsFileSystem.java b/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsFileSystem.java index 749092b74b..c22dba01eb 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsFileSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsFileSystem.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.software; @@ -54,7 +55,7 @@ * represented by a drive letter, e.g., "A:\" and "C:\" * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsInternetProtocolStats.java b/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsInternetProtocolStats.java index 084240b6a7..290c53fd27 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsInternetProtocolStats.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsInternetProtocolStats.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.software; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsNetworkParams.java b/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsNetworkParams.java index 967348538b..c7ff61d461 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsNetworkParams.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsNetworkParams.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.software; @@ -47,7 +48,7 @@ * WindowsNetworkParams class. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOSFileStore.java b/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOSFileStore.java index f346fb7529..24926552a9 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOSFileStore.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOSFileStore.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.software; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOSProcess.java b/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOSProcess.java index 161c475053..53305815f3 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOSProcess.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOSProcess.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.software; @@ -53,7 +54,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOSSystemInfo.java b/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOSSystemInfo.java index 7ab208529e..762b794084 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOSSystemInfo.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOSSystemInfo.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.software; @@ -35,7 +36,7 @@ * Windows OS native system information. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class WindowsOSSystemInfo { diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOSThread.java b/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOSThread.java index 3ee8ab7bad..1606809d24 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOSThread.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOSThread.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.software; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class WindowsOSThread extends AbstractOSThread { diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOperatingSystem.java b/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOperatingSystem.java index ecaf306042..5a648c331a 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOperatingSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOperatingSystem.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.health.windows.software; @@ -59,7 +60,7 @@ * and marketed by Microsoft. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ThreadSafe @@ -270,11 +271,13 @@ private static boolean enableDebugPrivilege() { WinNT.TOKEN_PRIVILEGES tkp = new WinNT.TOKEN_PRIVILEGES(1); tkp.Privileges[0] = new WinNT.LUID_AND_ATTRIBUTES(luid, new DWORD(WinNT.SE_PRIVILEGE_ENABLED)); success = Advapi32.INSTANCE.AdjustTokenPrivileges(hToken.getValue(), false, tkp, 0, null, null); - // Possible to partially succeed, only need to check LastError int err = Native.getLastError(); - if (err != WinError.ERROR_SUCCESS) { + if (!success) { Logger.error("AdjustTokenPrivileges failed. Error: {}", err); return false; + } else if (err == WinError.ERROR_NOT_ALL_ASSIGNED) { + Logger.debug("Debug privileges not enabled."); + return false; } } finally { Kernel32.INSTANCE.CloseHandle(hToken.getValue()); @@ -384,7 +387,7 @@ public List getChildProcesses(int parentPid, int limit, ProcessSort s } finally { Kernel32.INSTANCE.CloseHandle(snapshot); } - List procList = getProcesses(childPids); + List procList = processMapToList(childPids); List sorted = processSort(procList, limit, sort); return Collections.unmodifiableList(sorted); } diff --git a/bus-health/src/main/resources/META-INF/healthy/bus-health.properties b/bus-health/src/main/resources/META-INF/healthy/bus-health.properties index 6d67b8531f..3536dfe74c 100644 --- a/bus-health/src/main/resources/META-INF/healthy/bus-health.properties +++ b/bus-health/src/main/resources/META-INF/healthy/bus-health.properties @@ -58,4 +58,60 @@ health.os.windows.eventlog=System # Must be positive (negative value will never refresh) # Should be less than 1 second # Default is 300 milliseconds -health.memoize.expiration=300 \ No newline at end of file +health.memoize.expiration=300 +# FileSystem types which are network-based and should be excluded from local-only lists +health.network.filesystem.types=afs,cifs,smbfs,sshfs,ncpfs,ncp,nfs,nfs4,gfs,gds2,glusterfs +# Linux defines a set of virtual file systems +# "anon_inodefs", anonymous inodes - inodes without filenames +# "autofs", automounter file system, used by Linux, Solaris, FreeBSD +# "bdev", keep track of block_device vs major/minor mapping +# "binfmt_misc", Binary format support file system +# "bpf", Virtual filesystem for Berkeley Paket Filter +# "cgroup", Cgroup file system +# "cgroup2", Cgroup file system +# "configfs", Config file system +# "cpuset", pseudo-filesystem interface to the kernel cpuset mechanism +# "dax", Direct Access (DAX) can be used on memory-backed block devices +# "debugfs", Debug file system +# "devpts", Dev pseudo terminal devices file system +# "devtmpfs", Dev temporary file system +# "drm", Direct Rendering Manager +# "ecryptfs", POSIX-compliant enterprise cryptographic filesystem for Linux +# "efivarfs", (U)EFI variable filesystem +# "fuse", // +# NOTE: FUSE's fuseblk is not evalued because used as file system +# representation of a FUSE block storage +# "fuseblk" FUSE block file system +# "fusectl", FUSE control file system +# "hugetlbfs", Huge pages support file system +# "inotifyfs", support inotify +# "mqueue", Message queue file system +# "nfsd", NFS file system +# "overlay", Overlay file system https://wiki.archlinux.org/index.php/Overlay_filesystem +# "pipefs", for pipes but only visible inside kernel +# "proc", Proc file system, used by Linux and Solaris +# "pstore", Pstore file system +# "ramfs", Old filesystem used for RAM disks +# "rootfs", Minimal fs to support kernel boot +# "rpc_pipefs", Sun RPC file system +# "securityfs", Kernel security file system +# "selinuxfs", SELinux file system +# "sunrpc", Sun RPC file system +# "sysfs", SysFS file system +# "systemd-1", Systemd file system +# "tmpfs", Temporary file system +# NOTE: tmpfs is evaluated apart, because Linux, Solaris, FreeBSD use it for +# RAMdisks +# "tracefs", thin stackable file system for capturing file system traces +# "usbfs", removed in linux 3.5 but still seen in some systems +# FreeBSD / Solaris defines a set of virtual file systems +# "procfs", Proc file system +# "devfs", Dev temporary file system +# "ctfs", Contract file system +# "fdescfs", fd +# "objfs", Object file system +# "mntfs", Mount file system +# "sharefs", Share file system +# "lofs" Library file system +# "SquashFS" read-only filesystem used by snap on eg. Ubuntu +health.pseudo.filesystem.types=anon_inodefs,autofs,bdev,binfmt_misc,bpf,cgroup,cgroup2,configfs,cpuset,dax,debugfs,devpts,devtmpfs,drm,ecryptfs,efivarfs,fuse,fusectl,hugetlbfs,inotifyfs,mqueue,nfsd,overlay,proc,pstore,rootfs,rpc_pipefs,securityfs,selinuxfs,sunrpc,sysfs,systemd-1,tracefs,usbfs,procfs,devfs,ctfs,fdescfs,objfs,mntfs,sharefs,lofs,squashfs \ No newline at end of file diff --git a/bus-http/pom.xml b/bus-http/pom.xml index 4b02b6bb86..c806fa3814 100755 --- a/bus-http/pom.xml +++ b/bus-http/pom.xml @@ -6,34 +6,13 @@ org.aoju bus-http - 6.1.1 + 6.1.2 jar ${project.artifactId} Bus Http https://github.com/aoju/bus - - UTF-8 - UTF-8 - 1.8 - 1.18.12 - - - - - ${project.groupId} - bus-logger - ${project.version} - - - org.projectlombok - lombok - ${lombok.version} - true - - - The MIT License (MIT) @@ -59,6 +38,27 @@ https://github.com/aoju/bus/issues + + UTF-8 + UTF-8 + 1.8 + 1.18.16 + + + + + ${project.groupId} + bus-logger + ${project.version} + + + org.projectlombok + lombok + ${lombok.version} + true + + + diff --git a/bus-http/src/main/java/org/aoju/bus/http/Address.java b/bus-http/src/main/java/org/aoju/bus/http/Address.java index cb531a5198..425ce04d1f 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/Address.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Address.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http; @@ -46,7 +47,7 @@ * 共享相同的{@code Address}的HTTP请求也可能共享相同的{@link Connection} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Address { diff --git a/bus-http/src/main/java/org/aoju/bus/http/Builder.java b/bus-http/src/main/java/org/aoju/bus/http/Builder.java index 7f9ed5c073..1aa7221e5f 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/Builder.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Builder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http; @@ -58,7 +59,7 @@ * 实用方法工具 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class Builder { diff --git a/bus-http/src/main/java/org/aoju/bus/http/Callback.java b/bus-http/src/main/java/org/aoju/bus/http/Callback.java index 1f3b13c433..51a6340fd7 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/Callback.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Callback.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http; @@ -32,7 +33,7 @@ * 异步回调信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Callback { diff --git a/bus-http/src/main/java/org/aoju/bus/http/Cookie.java b/bus-http/src/main/java/org/aoju/bus/http/Cookie.java index 94247d924c..d9356ee4fd 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/Cookie.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Cookie.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http; @@ -37,7 +38,7 @@ * 这个类不支持cookies上的附加属性,比如Chromium的Priority=HIGH extension * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Cookie { diff --git a/bus-http/src/main/java/org/aoju/bus/http/DnsX.java b/bus-http/src/main/java/org/aoju/bus/http/DnsX.java index ce1455114b..3395e70edc 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/DnsX.java +++ b/bus-http/src/main/java/org/aoju/bus/http/DnsX.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http; @@ -36,7 +37,7 @@ * 选择IPv6地址、选择IPv4地址或强制使用特定的已知IP地址 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface DnsX { diff --git a/bus-http/src/main/java/org/aoju/bus/http/GiveCall.java b/bus-http/src/main/java/org/aoju/bus/http/GiveCall.java index f66d23d17c..9f49434e50 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/GiveCall.java +++ b/bus-http/src/main/java/org/aoju/bus/http/GiveCall.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface GiveCall extends Cancelable { diff --git a/bus-http/src/main/java/org/aoju/bus/http/Headers.java b/bus-http/src/main/java/org/aoju/bus/http/Headers.java index 4f53f7cb3d..8b8f68cf29 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/Headers.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Headers.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http; @@ -37,7 +38,7 @@ * 这个类从值中删除空白。它从不返回带开头或结尾空白的值 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Headers { diff --git a/bus-http/src/main/java/org/aoju/bus/http/Httpd.java b/bus-http/src/main/java/org/aoju/bus/http/Httpd.java index facb76627a..8107e95003 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/Httpd.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Httpd.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http; @@ -66,7 +67,7 @@ * Httpd还为HTTP/2连接使用守护进程线程。如果它们保持空闲,就会自动退出 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Httpd implements Cloneable, NewCall.Factory, WebSocket.Factory { diff --git a/bus-http/src/main/java/org/aoju/bus/http/Httpv.java b/bus-http/src/main/java/org/aoju/bus/http/Httpv.java index 1256a2ed53..c0304f42a6 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/Httpv.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Httpv.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http; @@ -47,7 +48,7 @@ * Httpv 客户端接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Httpv { diff --git a/bus-http/src/main/java/org/aoju/bus/http/Httpx.java b/bus-http/src/main/java/org/aoju/bus/http/Httpx.java index ca2187edc4..ca01039cd4 100755 --- a/bus-http/src/main/java/org/aoju/bus/http/Httpx.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Httpx.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http; @@ -53,7 +54,7 @@ * 发送HTTP请求辅助类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Httpx { @@ -560,7 +561,7 @@ private static String execute(final Builder builder) { Logger.info(">>>>>>>>Url[{}],Response[{}]<<<<<<<<", builder.url, result); } } catch (Exception e) { - Logger.error(">>>>>>>>Builder[{}] Error<<<<<<<<", builder.toString(), e); + Logger.error(e, ">>>>>>>>Builder[{}] Error<<<<<<<<", builder.toString()); } return result; } diff --git a/bus-http/src/main/java/org/aoju/bus/http/Httpz.java b/bus-http/src/main/java/org/aoju/bus/http/Httpz.java index 503efc877a..4e35a3e56b 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/Httpz.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Httpz.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http; @@ -35,7 +36,7 @@ * 发送HTTP请求辅助类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Httpz { diff --git a/bus-http/src/main/java/org/aoju/bus/http/NewCall.java b/bus-http/src/main/java/org/aoju/bus/http/NewCall.java index c729ef708e..6f81295dc8 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/NewCall.java +++ b/bus-http/src/main/java/org/aoju/bus/http/NewCall.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http; @@ -34,7 +35,7 @@ * 由于此对象表示单个请求/响应对(流),因此不能执行两次. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface NewCall extends Cloneable { diff --git a/bus-http/src/main/java/org/aoju/bus/http/OnBack.java b/bus-http/src/main/java/org/aoju/bus/http/OnBack.java index 653a8a97f4..5ad66ac91d 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/OnBack.java +++ b/bus-http/src/main/java/org/aoju/bus/http/OnBack.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http; @@ -28,7 +29,7 @@ * 数据回调接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface OnBack { diff --git a/bus-http/src/main/java/org/aoju/bus/http/Process.java b/bus-http/src/main/java/org/aoju/bus/http/Process.java index 81c2af2eaa..f9a19fdbea 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/Process.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Process.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http; @@ -28,7 +29,7 @@ * 进度(上传或下载) * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Process { diff --git a/bus-http/src/main/java/org/aoju/bus/http/Protocol.java b/bus-http/src/main/java/org/aoju/bus/http/Protocol.java index a60d9f6fdb..ed6b8bd9fe 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/Protocol.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Protocol.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http; @@ -33,7 +34,7 @@ * Httpd使用协议这个词来标识HTTP消息是如何构造的 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum Protocol { diff --git a/bus-http/src/main/java/org/aoju/bus/http/RealCall.java b/bus-http/src/main/java/org/aoju/bus/http/RealCall.java index 298a4eabcd..ba4330fe5a 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/RealCall.java +++ b/bus-http/src/main/java/org/aoju/bus/http/RealCall.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http; @@ -53,7 +54,7 @@ * 实际调用准备执行的请求 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class RealCall implements NewCall { diff --git a/bus-http/src/main/java/org/aoju/bus/http/Request.java b/bus-http/src/main/java/org/aoju/bus/http/Request.java index c1e7b77ae9..aef3671ea2 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/Request.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Request.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http; @@ -42,7 +43,7 @@ * 一个HTTP请求。如果该类的{@link #body}为空或自身为不可变,则该类的实例是不可变的. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Request { diff --git a/bus-http/src/main/java/org/aoju/bus/http/Response.java b/bus-http/src/main/java/org/aoju/bus/http/Response.java index 2992cb69cf..a6a80a7b1e 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/Response.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Response.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http; @@ -45,7 +46,7 @@ * 响应体是一次性的值,可能只使用一次,然后关闭。所有其他属性都是不可变的. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Response implements Closeable { diff --git a/bus-http/src/main/java/org/aoju/bus/http/Results.java b/bus-http/src/main/java/org/aoju/bus/http/Results.java index f7cb6f98f6..a86632db3d 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/Results.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Results.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http; @@ -37,7 +38,7 @@ * 执行结果 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Results { diff --git a/bus-http/src/main/java/org/aoju/bus/http/Route.java b/bus-http/src/main/java/org/aoju/bus/http/Route.java index fdc0b17c19..9f140bcf5d 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/Route.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Route.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http; @@ -33,7 +34,7 @@ * 每个路由都是这些选项的特定选择 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Route { diff --git a/bus-http/src/main/java/org/aoju/bus/http/Settings.java b/bus-http/src/main/java/org/aoju/bus/http/Settings.java index ee48f42a12..8fde4fc956 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/Settings.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Settings.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http; @@ -34,7 +35,7 @@ * 设置的作用域是{@link Http2Connection connection} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Settings { diff --git a/bus-http/src/main/java/org/aoju/bus/http/Toable.java b/bus-http/src/main/java/org/aoju/bus/http/Toable.java index 46e145f9d8..ed64f07615 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/Toable.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Toable.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Toable { diff --git a/bus-http/src/main/java/org/aoju/bus/http/UnoUrl.java b/bus-http/src/main/java/org/aoju/bus/http/UnoUrl.java index d0d2af38da..5f63d8b4d6 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/UnoUrl.java +++ b/bus-http/src/main/java/org/aoju/bus/http/UnoUrl.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http; @@ -43,7 +44,7 @@ * 或者{@link #parse parse()}如果输入是无效的URL,则返回null。您甚至可以明确每个组件是否已经编码 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class UnoUrl { diff --git a/bus-http/src/main/java/org/aoju/bus/http/Wapper.java b/bus-http/src/main/java/org/aoju/bus/http/Wapper.java index 309c82a129..dfec1975bf 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/Wapper.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Wapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http; @@ -32,7 +33,7 @@ * 可以是 xml、yml、protobuf 等任何一种格式的数据 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Wapper { diff --git a/bus-http/src/main/java/org/aoju/bus/http/accord/ConnectInterceptor.java b/bus-http/src/main/java/org/aoju/bus/http/accord/ConnectInterceptor.java index 9786d7ca03..0cb09de613 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/accord/ConnectInterceptor.java +++ b/bus-http/src/main/java/org/aoju/bus/http/accord/ConnectInterceptor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.accord; @@ -38,7 +39,7 @@ * 打开到目标服务器的连接并继续到下一个拦截器. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class ConnectInterceptor implements Interceptor { diff --git a/bus-http/src/main/java/org/aoju/bus/http/accord/Connection.java b/bus-http/src/main/java/org/aoju/bus/http/accord/Connection.java index 513488ac05..2d9b2610ef 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/accord/Connection.java +++ b/bus-http/src/main/java/org/aoju/bus/http/accord/Connection.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.accord; @@ -54,7 +55,7 @@ *

* * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Connection { diff --git a/bus-http/src/main/java/org/aoju/bus/http/accord/ConnectionPool.java b/bus-http/src/main/java/org/aoju/bus/http/accord/ConnectionPool.java index de73b5b9d0..7a9f916146 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/accord/ConnectionPool.java +++ b/bus-http/src/main/java/org/aoju/bus/http/accord/ConnectionPool.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.accord; @@ -44,7 +45,7 @@ * 该类实现了哪些连接保持开放以供将来使用的策略 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class ConnectionPool { diff --git a/bus-http/src/main/java/org/aoju/bus/http/accord/ConnectionSelector.java b/bus-http/src/main/java/org/aoju/bus/http/accord/ConnectionSelector.java index 196eeb708a..6ccd3b85c2 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/accord/ConnectionSelector.java +++ b/bus-http/src/main/java/org/aoju/bus/http/accord/ConnectionSelector.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.accord; @@ -40,7 +41,7 @@ * 可能会使用不同的协议重试连接。实例是有状态的,应该创建并用于单个连接尝试 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class ConnectionSelector { diff --git a/bus-http/src/main/java/org/aoju/bus/http/accord/ConnectionSuite.java b/bus-http/src/main/java/org/aoju/bus/http/accord/ConnectionSuite.java index 092775ce4c..a6b31695ec 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/accord/ConnectionSuite.java +++ b/bus-http/src/main/java/org/aoju/bus/http/accord/ConnectionSuite.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.accord; @@ -40,7 +41,7 @@ * 将所有特性选择延迟到底层SSL套接字 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class ConnectionSuite { diff --git a/bus-http/src/main/java/org/aoju/bus/http/accord/ProcessStream.java b/bus-http/src/main/java/org/aoju/bus/http/accord/ProcessStream.java index c78b670aa5..f5b62b6220 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/accord/ProcessStream.java +++ b/bus-http/src/main/java/org/aoju/bus/http/accord/ProcessStream.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.accord; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ProcessStream extends InputStream { diff --git a/bus-http/src/main/java/org/aoju/bus/http/accord/RealConnection.java b/bus-http/src/main/java/org/aoju/bus/http/accord/RealConnection.java index 8ecb1b5539..755f3c902c 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/accord/RealConnection.java +++ b/bus-http/src/main/java/org/aoju/bus/http/accord/RealConnection.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.accord; @@ -61,7 +62,7 @@ * 连接提供 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class RealConnection extends Http2Connection.Listener implements Connection { diff --git a/bus-http/src/main/java/org/aoju/bus/http/accord/RouteDatabase.java b/bus-http/src/main/java/org/aoju/bus/http/accord/RouteDatabase.java index 10889bada5..93aa0baaa0 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/accord/RouteDatabase.java +++ b/bus-http/src/main/java/org/aoju/bus/http/accord/RouteDatabase.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.accord; @@ -35,7 +36,7 @@ * 则会记住该故障并首选备用路由 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class RouteDatabase { diff --git a/bus-http/src/main/java/org/aoju/bus/http/accord/RouteException.java b/bus-http/src/main/java/org/aoju/bus/http/accord/RouteException.java index b440553f7a..c66d44b49e 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/accord/RouteException.java +++ b/bus-http/src/main/java/org/aoju/bus/http/accord/RouteException.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.accord; @@ -34,7 +35,7 @@ * 可能已经用替代协议进行了多次尝试,但没有一次成功 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class RouteException extends HttpUncheckException { diff --git a/bus-http/src/main/java/org/aoju/bus/http/accord/RouteSelector.java b/bus-http/src/main/java/org/aoju/bus/http/accord/RouteSelector.java index 1ec76d3f47..9c21dee3a3 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/accord/RouteSelector.java +++ b/bus-http/src/main/java/org/aoju/bus/http/accord/RouteSelector.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.accord; @@ -40,7 +41,7 @@ * 服务器、IP地址和TLS模式。连接也可以循环使用 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class RouteSelector { diff --git a/bus-http/src/main/java/org/aoju/bus/http/accord/StreamAllocation.java b/bus-http/src/main/java/org/aoju/bus/http/accord/StreamAllocation.java index 0b61a7bf13..6af534452a 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/accord/StreamAllocation.java +++ b/bus-http/src/main/java/org/aoju/bus/http/accord/StreamAllocation.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.accord; @@ -46,7 +47,7 @@ * 仍然在进行中,那么取消可能会中断整个连接 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class StreamAllocation { diff --git a/bus-http/src/main/java/org/aoju/bus/http/accord/platform/AndroidPlatform.java b/bus-http/src/main/java/org/aoju/bus/http/accord/platform/AndroidPlatform.java index 117be117ff..71f0863981 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/accord/platform/AndroidPlatform.java +++ b/bus-http/src/main/java/org/aoju/bus/http/accord/platform/AndroidPlatform.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.accord.platform; @@ -53,7 +54,7 @@ * 安卓2.3或更高. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AndroidPlatform extends Platform { diff --git a/bus-http/src/main/java/org/aoju/bus/http/accord/platform/Jdk9Platform.java b/bus-http/src/main/java/org/aoju/bus/http/accord/platform/Jdk9Platform.java index 57321339e8..cf7bf452fc 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/accord/platform/Jdk9Platform.java +++ b/bus-http/src/main/java/org/aoju/bus/http/accord/platform/Jdk9Platform.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.accord.platform; @@ -40,7 +41,7 @@ * OpenJDK 9+. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Jdk9Platform extends Platform { diff --git a/bus-http/src/main/java/org/aoju/bus/http/accord/platform/JdkWithJettyBootPlatform.java b/bus-http/src/main/java/org/aoju/bus/http/accord/platform/JdkWithJettyBootPlatform.java index 43680c1aa1..0b1adcecc3 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/accord/platform/JdkWithJettyBootPlatform.java +++ b/bus-http/src/main/java/org/aoju/bus/http/accord/platform/JdkWithJettyBootPlatform.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.accord.platform; @@ -40,7 +41,7 @@ * OpenJDK 7 or OpenJDK 8 with {@code org.mortbay.jetty.alpn/alpn-boot} 在引导类路径中. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JdkWithJettyBootPlatform extends Platform { diff --git a/bus-http/src/main/java/org/aoju/bus/http/accord/platform/OptionalMethod.java b/bus-http/src/main/java/org/aoju/bus/http/accord/platform/OptionalMethod.java index d02a507479..2bf1738eae 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/accord/platform/OptionalMethod.java +++ b/bus-http/src/main/java/org/aoju/bus/http/accord/platform/OptionalMethod.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.accord.platform; @@ -33,7 +34,7 @@ * * @param 方法所在的对象类型,通常是接口或基类 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class OptionalMethod { diff --git a/bus-http/src/main/java/org/aoju/bus/http/accord/platform/Platform.java b/bus-http/src/main/java/org/aoju/bus/http/accord/platform/Platform.java index 3afb7751be..417b9e40dd 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/accord/platform/Platform.java +++ b/bus-http/src/main/java/org/aoju/bus/http/accord/platform/Platform.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.accord.platform; @@ -60,7 +61,7 @@ * 支持Android 6.0+ {@code NetworkSecurityPolicy} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Platform { diff --git a/bus-http/src/main/java/org/aoju/bus/http/bodys/AbstractBody.java b/bus-http/src/main/java/org/aoju/bus/http/bodys/AbstractBody.java index 366830ab4e..1dbfcb7390 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/bodys/AbstractBody.java +++ b/bus-http/src/main/java/org/aoju/bus/http/bodys/AbstractBody.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.bodys; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractBody implements Toable { diff --git a/bus-http/src/main/java/org/aoju/bus/http/bodys/BufferedBody.java b/bus-http/src/main/java/org/aoju/bus/http/bodys/BufferedBody.java index 99ff407f93..855edd4dba 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/bodys/BufferedBody.java +++ b/bus-http/src/main/java/org/aoju/bus/http/bodys/BufferedBody.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.bodys; @@ -35,7 +36,7 @@ * 只有完成之后,字节才会被复制到网络中 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class BufferedBody extends OutputStreamBody { diff --git a/bus-http/src/main/java/org/aoju/bus/http/bodys/FormBody.java b/bus-http/src/main/java/org/aoju/bus/http/bodys/FormBody.java index fbe677b725..2663abaf9a 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/bodys/FormBody.java +++ b/bus-http/src/main/java/org/aoju/bus/http/bodys/FormBody.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.bodys; @@ -38,7 +39,7 @@ * Form请求体内容 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class FormBody extends RequestBody { diff --git a/bus-http/src/main/java/org/aoju/bus/http/bodys/MultipartBody.java b/bus-http/src/main/java/org/aoju/bus/http/bodys/MultipartBody.java index 2367bcd6b8..334bd3ed80 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/bodys/MultipartBody.java +++ b/bus-http/src/main/java/org/aoju/bus/http/bodys/MultipartBody.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.bodys; @@ -42,7 +43,7 @@ * 用于复合对象 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class MultipartBody extends RequestBody { diff --git a/bus-http/src/main/java/org/aoju/bus/http/bodys/OutputStreamBody.java b/bus-http/src/main/java/org/aoju/bus/http/bodys/OutputStreamBody.java index 4e6477840e..110d81a35c 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/bodys/OutputStreamBody.java +++ b/bus-http/src/main/java/org/aoju/bus/http/bodys/OutputStreamBody.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.bodys; @@ -41,7 +42,7 @@ * 正文的字节才会被知道 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class OutputStreamBody extends RequestBody { diff --git a/bus-http/src/main/java/org/aoju/bus/http/bodys/ProcessRequestBody.java b/bus-http/src/main/java/org/aoju/bus/http/bodys/ProcessRequestBody.java index abb21e7f68..0e5546a282 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/bodys/ProcessRequestBody.java +++ b/bus-http/src/main/java/org/aoju/bus/http/bodys/ProcessRequestBody.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.bodys; @@ -37,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ProcessRequestBody extends RequestBody { diff --git a/bus-http/src/main/java/org/aoju/bus/http/bodys/RealResponseBody.java b/bus-http/src/main/java/org/aoju/bus/http/bodys/RealResponseBody.java index 2e521f7c79..f7a372b82a 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/bodys/RealResponseBody.java +++ b/bus-http/src/main/java/org/aoju/bus/http/bodys/RealResponseBody.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.bodys; @@ -31,7 +32,7 @@ * 响应体只能使用一次 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class RealResponseBody extends ResponseBody { diff --git a/bus-http/src/main/java/org/aoju/bus/http/bodys/RequestBody.java b/bus-http/src/main/java/org/aoju/bus/http/bodys/RequestBody.java index d66651fe05..95d2d2016e 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/bodys/RequestBody.java +++ b/bus-http/src/main/java/org/aoju/bus/http/bodys/RequestBody.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.bodys; @@ -39,7 +40,7 @@ * 内容对象 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class RequestBody { diff --git a/bus-http/src/main/java/org/aoju/bus/http/bodys/ResponseBody.java b/bus-http/src/main/java/org/aoju/bus/http/bodys/ResponseBody.java index a4412b7bca..460a6e2958 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/bodys/ResponseBody.java +++ b/bus-http/src/main/java/org/aoju/bus/http/bodys/ResponseBody.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.bodys; @@ -60,7 +61,7 @@ * 或{@link #charStream()}来处理响应 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class ResponseBody implements Closeable { diff --git a/bus-http/src/main/java/org/aoju/bus/http/bodys/ResultBody.java b/bus-http/src/main/java/org/aoju/bus/http/bodys/ResultBody.java index 444521fdf6..1c3e27f6e2 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/bodys/ResultBody.java +++ b/bus-http/src/main/java/org/aoju/bus/http/bodys/ResultBody.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.bodys; @@ -46,7 +47,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ResultBody extends AbstractBody implements Body { diff --git a/bus-http/src/main/java/org/aoju/bus/http/bodys/StreamedBody.java b/bus-http/src/main/java/org/aoju/bus/http/bodys/StreamedBody.java index b50b16c342..5789782a0c 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/bodys/StreamedBody.java +++ b/bus-http/src/main/java/org/aoju/bus/http/bodys/StreamedBody.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.bodys; @@ -36,7 +37,7 @@ * 因为数据不是缓冲的,所以只能传输一次 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class StreamedBody extends OutputStreamBody implements UnrepeatableBody { diff --git a/bus-http/src/main/java/org/aoju/bus/http/bodys/UnrepeatableBody.java b/bus-http/src/main/java/org/aoju/bus/http/bodys/UnrepeatableBody.java index 20f8cd412e..5f0c79f2ed 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/bodys/UnrepeatableBody.java +++ b/bus-http/src/main/java/org/aoju/bus/http/bodys/UnrepeatableBody.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.bodys; @@ -28,7 +29,7 @@ * 不可重复的请求体 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface UnrepeatableBody { diff --git a/bus-http/src/main/java/org/aoju/bus/http/cache/Cache.java b/bus-http/src/main/java/org/aoju/bus/http/cache/Cache.java index 6bb5aaceea..7c9cb646af 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/cache/Cache.java +++ b/bus-http/src/main/java/org/aoju/bus/http/cache/Cache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.cache; @@ -55,7 +56,7 @@ * 缓存HTTP和HTTPS对文件系统的响应,以便可以重用它们,从而节省时间和带宽. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Cache implements Closeable, Flushable { diff --git a/bus-http/src/main/java/org/aoju/bus/http/cache/CacheAdapter.java b/bus-http/src/main/java/org/aoju/bus/http/cache/CacheAdapter.java index bed2dd895f..a9899ce75a 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/cache/CacheAdapter.java +++ b/bus-http/src/main/java/org/aoju/bus/http/cache/CacheAdapter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.cache; @@ -42,7 +43,7 @@ * 适配 {@link ResponseCache} 到 {@link InternalCache}. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class CacheAdapter implements InternalCache { diff --git a/bus-http/src/main/java/org/aoju/bus/http/cache/CacheContainer.java b/bus-http/src/main/java/org/aoju/bus/http/cache/CacheContainer.java index 78e13001a1..315c6145e9 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/cache/CacheContainer.java +++ b/bus-http/src/main/java/org/aoju/bus/http/cache/CacheContainer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.cache; @@ -28,7 +29,7 @@ * 允许Httpd检测(@link java.net.ResponseCache)的接口(@link Cache) * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface CacheContainer { diff --git a/bus-http/src/main/java/org/aoju/bus/http/cache/CacheControl.java b/bus-http/src/main/java/org/aoju/bus/http/cache/CacheControl.java index 3947d54f7b..2ae5cbf026 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/cache/CacheControl.java +++ b/bus-http/src/main/java/org/aoju/bus/http/cache/CacheControl.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.cache; @@ -37,7 +38,7 @@ * 这些指令设置了哪些响应可以存储,以及哪些请求可以由存储的响应来满足的策略 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class CacheControl { diff --git a/bus-http/src/main/java/org/aoju/bus/http/cache/CacheInterceptor.java b/bus-http/src/main/java/org/aoju/bus/http/cache/CacheInterceptor.java index a14170ecb4..40bb28d358 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/cache/CacheInterceptor.java +++ b/bus-http/src/main/java/org/aoju/bus/http/cache/CacheInterceptor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.cache; @@ -46,7 +47,7 @@ * 服务来自缓存的请求并将响应写入缓存。 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class CacheInterceptor implements Interceptor { diff --git a/bus-http/src/main/java/org/aoju/bus/http/cache/CacheRequest.java b/bus-http/src/main/java/org/aoju/bus/http/cache/CacheRequest.java index 6971f533ec..d3901a6ab9 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/cache/CacheRequest.java +++ b/bus-http/src/main/java/org/aoju/bus/http/cache/CacheRequest.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.cache; @@ -32,7 +33,7 @@ * 缓存请求信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface CacheRequest { diff --git a/bus-http/src/main/java/org/aoju/bus/http/cache/CacheStrategy.java b/bus-http/src/main/java/org/aoju/bus/http/cache/CacheStrategy.java index 5fb62e0cb4..8cf31aea1d 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/cache/CacheStrategy.java +++ b/bus-http/src/main/java/org/aoju/bus/http/cache/CacheStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.cache; @@ -41,7 +42,7 @@ * 或向缓存的响应添加警告(如果缓存的数据可能过时) * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class CacheStrategy { diff --git a/bus-http/src/main/java/org/aoju/bus/http/cache/DiskLruCache.java b/bus-http/src/main/java/org/aoju/bus/http/cache/DiskLruCache.java index b3cfc15dd8..abaf4521ab 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/cache/DiskLruCache.java +++ b/bus-http/src/main/java/org/aoju/bus/http/cache/DiskLruCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.cache; @@ -47,7 +48,7 @@ * 每个值必须在{@code 0}和{@code Integer之间。MAX_VALUE}字节的长度 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class DiskLruCache implements Closeable, Flushable { diff --git a/bus-http/src/main/java/org/aoju/bus/http/cache/InternalCache.java b/bus-http/src/main/java/org/aoju/bus/http/cache/InternalCache.java index 64b01722f2..5b1e8f8002 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/cache/InternalCache.java +++ b/bus-http/src/main/java/org/aoju/bus/http/cache/InternalCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.cache; @@ -34,7 +35,7 @@ * 应用程序不应该实现这个:而是使用{@link Cache} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface InternalCache { diff --git a/bus-http/src/main/java/org/aoju/bus/http/cache/NetApiConvert.java b/bus-http/src/main/java/org/aoju/bus/http/cache/NetApiConvert.java index d9a0ed098f..bb15adf8e9 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/cache/NetApiConvert.java +++ b/bus-http/src/main/java/org/aoju/bus/http/cache/NetApiConvert.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.cache; @@ -64,7 +65,7 @@ * 在Java和Httpd表示之间进行转换的方法 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class NetApiConvert { diff --git a/bus-http/src/main/java/org/aoju/bus/http/cache/ResponseCache.java b/bus-http/src/main/java/org/aoju/bus/http/cache/ResponseCache.java index fe93e4f45a..b502e424ce 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/cache/ResponseCache.java +++ b/bus-http/src/main/java/org/aoju/bus/http/cache/ResponseCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.cache; @@ -40,7 +41,7 @@ * 统计信息的{@link java.net.ResponseCache} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ResponseCache extends java.net.ResponseCache { diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/AbsCallback.java b/bus-http/src/main/java/org/aoju/bus/http/magic/AbsCallback.java index 9ea3fbee90..a674cab8b5 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/AbsCallback.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/AbsCallback.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.magic; @@ -30,7 +31,7 @@ * 回调处理 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbsCallback { diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/FileCallback.java b/bus-http/src/main/java/org/aoju/bus/http/magic/FileCallback.java index d6742cc63c..9d718c217d 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/FileCallback.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/FileCallback.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.magic; @@ -34,7 +35,7 @@ * 文件-异步回调 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class FileCallback extends AbsCallback { diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/FileInterceptor.java b/bus-http/src/main/java/org/aoju/bus/http/magic/FileInterceptor.java index c6775f9510..86cb65c8a2 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/FileInterceptor.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/FileInterceptor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.magic; @@ -40,7 +41,7 @@ * 请求参数-文件处理 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class FileInterceptor implements Interceptor, ProgressListener { diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/GetBuilder.java b/bus-http/src/main/java/org/aoju/bus/http/magic/GetBuilder.java index 9dc40bd413..4439e24fd7 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/GetBuilder.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/GetBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.magic; @@ -33,7 +34,7 @@ * GET参数构造器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class GetBuilder extends RequestBuilder { diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/GetRequest.java b/bus-http/src/main/java/org/aoju/bus/http/magic/GetRequest.java index 014f46a2c7..b6a669cf03 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/GetRequest.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/GetRequest.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.magic; @@ -33,7 +34,7 @@ * GET请求处理 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class GetRequest extends HttpRequest { diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/HttpBuilder.java b/bus-http/src/main/java/org/aoju/bus/http/magic/HttpBuilder.java index a911f7a331..b7f10c1b1e 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/HttpBuilder.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/HttpBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.magic; @@ -52,7 +53,7 @@ * 请求参数构造器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HttpBuilder { diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/HttpProxy.java b/bus-http/src/main/java/org/aoju/bus/http/magic/HttpProxy.java index 3b6e25ad82..56bf07be7d 100755 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/HttpProxy.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/HttpProxy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.magic; @@ -33,7 +34,7 @@ * HTTP代理配置 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HttpProxy { diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/HttpRequest.java b/bus-http/src/main/java/org/aoju/bus/http/magic/HttpRequest.java index fd59b27c3e..e1b3889c71 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/HttpRequest.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/HttpRequest.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.magic; @@ -43,7 +44,7 @@ * HTTP请求处理 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class HttpRequest { diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/HttpResponse.java b/bus-http/src/main/java/org/aoju/bus/http/magic/HttpResponse.java index 2d922f1c30..d04f7d2a88 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/HttpResponse.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/HttpResponse.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.magic; @@ -39,7 +40,7 @@ * HTTP响应处理 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HttpResponse { diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/HttpxStat.java b/bus-http/src/main/java/org/aoju/bus/http/magic/HttpxStat.java index dd6c66eaa3..823213a8be 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/HttpxStat.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/HttpxStat.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.magic; @@ -36,7 +37,7 @@ * HTTP状态 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HttpxStat { diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/PostBuilder.java b/bus-http/src/main/java/org/aoju/bus/http/magic/PostBuilder.java index 0dad4040ab..b12926fba0 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/PostBuilder.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/PostBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.magic; @@ -38,7 +39,7 @@ * POST参数构造器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PostBuilder extends RequestBuilder { diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/PostRequest.java b/bus-http/src/main/java/org/aoju/bus/http/magic/PostRequest.java index b7e1832ef8..e70767020b 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/PostRequest.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/PostRequest.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.magic; @@ -48,7 +49,7 @@ * POST请求处理 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PostRequest extends HttpRequest { diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/ProgressListener.java b/bus-http/src/main/java/org/aoju/bus/http/magic/ProgressListener.java index 165f8e7014..134cd7a097 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/ProgressListener.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/ProgressListener.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.magic; @@ -28,7 +29,7 @@ * 进度监听 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface ProgressListener { diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/PutBuilder.java b/bus-http/src/main/java/org/aoju/bus/http/magic/PutBuilder.java index 90da71f78f..52a53f0b66 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/PutBuilder.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/PutBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.magic; @@ -37,7 +38,7 @@ * PUT参数构造器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PutBuilder extends RequestBuilder { diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/PutRequest.java b/bus-http/src/main/java/org/aoju/bus/http/magic/PutRequest.java index e3247ec2c7..e9538ff721 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/PutRequest.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/PutRequest.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.magic; @@ -46,7 +47,7 @@ * PUT请求处理 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PutRequest extends HttpRequest { diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/RealResult.java b/bus-http/src/main/java/org/aoju/bus/http/magic/RealResult.java index 2c605af135..9240ca652f 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/RealResult.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/RealResult.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.magic; @@ -37,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RealResult implements Results { diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/RequestBuilder.java b/bus-http/src/main/java/org/aoju/bus/http/magic/RequestBuilder.java index 42ec6d9261..45768cf8d9 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/RequestBuilder.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/RequestBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.magic; @@ -34,7 +35,7 @@ * 请求参数构造器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/RequestCall.java b/bus-http/src/main/java/org/aoju/bus/http/magic/RequestCall.java index 716b8aca47..d2ae2abfeb 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/RequestCall.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/RequestCall.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.magic; @@ -34,7 +35,7 @@ * 请求调用者 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RequestCall { diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/StringCallback.java b/bus-http/src/main/java/org/aoju/bus/http/magic/StringCallback.java index f5e7aac2d1..afc7353410 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/StringCallback.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/StringCallback.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.magic; @@ -32,7 +33,7 @@ * 回调处理 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class StringCallback extends AbsCallback { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/Array.java b/bus-http/src/main/java/org/aoju/bus/http/metric/Array.java index 11ab930f8a..7ea736fdca 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/Array.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/Array.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric; @@ -30,7 +31,7 @@ * 可以是 xml、yml、protobuf 等任何一种格式的数据 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Array { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/BootstrapDns.java b/bus-http/src/main/java/org/aoju/bus/http/metric/BootstrapDns.java index db58d23c7b..94245e7a5b 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/BootstrapDns.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/BootstrapDns.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric; @@ -35,7 +36,7 @@ * 返回已知主机的硬编码结果 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class BootstrapDns implements DnsX { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/Cancelable.java b/bus-http/src/main/java/org/aoju/bus/http/metric/Cancelable.java index 9fa4b7261e..a5a8c7e644 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/Cancelable.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/Cancelable.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Cancelable { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/Config.java b/bus-http/src/main/java/org/aoju/bus/http/metric/Config.java index 192fa4fe4a..a512783753 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/Config.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/Config.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric; @@ -32,7 +33,7 @@ * 配置器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Config { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/ConvertProvider.java b/bus-http/src/main/java/org/aoju/bus/http/metric/ConvertProvider.java index d001bb8084..2e300281a9 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/ConvertProvider.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/ConvertProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric; @@ -32,7 +33,7 @@ * ConvertProvider 提供者 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface ConvertProvider { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/Convertor.java b/bus-http/src/main/java/org/aoju/bus/http/metric/Convertor.java index 04034cbf0e..56127d425e 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/Convertor.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/Convertor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric; @@ -36,7 +37,7 @@ * 消息转换器接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Convertor { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/CookieJar.java b/bus-http/src/main/java/org/aoju/bus/http/metric/CookieJar.java index 10cb00af5f..923a5e11be 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/CookieJar.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/CookieJar.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric; @@ -36,7 +37,7 @@ * 尽管这可能会干扰需要cookie的基于会话的身份验证方案 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface CookieJar { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/Dispatcher.java b/bus-http/src/main/java/org/aoju/bus/http/metric/Dispatcher.java index c0766d058f..2873a241af 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/Dispatcher.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/Dispatcher.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric; @@ -41,7 +42,7 @@ * 如果您提供自己的执行程序,它应该能够并发地运行{@linkplain #getMaxRequests 配置的最大调用数} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Dispatcher { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/DnsOverHttps.java b/bus-http/src/main/java/org/aoju/bus/http/metric/DnsOverHttps.java index eaa264e295..82e5dd1a36 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/DnsOverHttps.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/DnsOverHttps.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric; @@ -49,7 +50,7 @@ * DNS over HTTPS实施 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DnsOverHttps implements DnsX { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/DownListener.java b/bus-http/src/main/java/org/aoju/bus/http/metric/DownListener.java index 76c753f0df..68d3b4f7d5 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/DownListener.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/DownListener.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric; @@ -30,7 +31,7 @@ * 下载监听接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface DownListener { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/Download.java b/bus-http/src/main/java/org/aoju/bus/http/metric/Download.java index 3662064648..b1cc64802c 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/Download.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/Download.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric; @@ -35,7 +36,7 @@ * 文件下载 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Download { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/EventListener.java b/bus-http/src/main/java/org/aoju/bus/http/metric/EventListener.java index 54b5f483b8..bd5ceaeffc 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/EventListener.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/EventListener.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric; @@ -40,7 +41,7 @@ * 也不能重入客户机。任何对文件或网络的IO写入都应该异步进行 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class EventListener { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/Handshake.java b/bus-http/src/main/java/org/aoju/bus/http/metric/Handshake.java index 61080d8471..2d6b257171 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/Handshake.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/Handshake.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric; @@ -43,7 +44,7 @@ * 此值对象描述完成的握手。使用{@link ConnectionSuite}设置新的握手策略 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Handshake { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/Interceptor.java b/bus-http/src/main/java/org/aoju/bus/http/metric/Interceptor.java index ff67d9e290..4fe172cf5e 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/Interceptor.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/Interceptor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric; @@ -37,7 +38,7 @@ * 通常,拦截器在请求或响应上添加、删除或转换标头 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Interceptor { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/NamedRunnable.java b/bus-http/src/main/java/org/aoju/bus/http/metric/NamedRunnable.java index 0c88cef6d3..c25e701c9b 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/NamedRunnable.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/NamedRunnable.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric; @@ -30,7 +31,7 @@ * 可运行的实现,它总是设置它的线程名. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class NamedRunnable implements Runnable { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/Preprocessor.java b/bus-http/src/main/java/org/aoju/bus/http/metric/Preprocessor.java index 84f55f91c0..ee2250a16e 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/Preprocessor.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/Preprocessor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric; @@ -32,7 +33,7 @@ * 在HTTP请求任务正式开始之前执行 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Preprocessor { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/TaskExecutor.java b/bus-http/src/main/java/org/aoju/bus/http/metric/TaskExecutor.java index 1795b8af86..56fa56a25d 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/TaskExecutor.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/TaskExecutor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric; @@ -38,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class TaskExecutor { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/TaskListener.java b/bus-http/src/main/java/org/aoju/bus/http/metric/TaskListener.java index 527936fbf5..fde803534a 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/TaskListener.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/TaskListener.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric; @@ -30,7 +31,7 @@ * 任务监听接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface TaskListener { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/anget/Browser.java b/bus-http/src/main/java/org/aoju/bus/http/metric/anget/Browser.java index 6c4f4e57bc..9c9adbcc20 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/anget/Browser.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/anget/Browser.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric.anget; @@ -35,7 +36,7 @@ * 浏览器对象 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Browser extends UserAgent { @@ -75,7 +76,10 @@ public class Browser extends UserAgent { new Browser("Yammer Desktop", "AdobeAir", "([\\d\\w\\.\\-]+)\\/Yammer"), new Browser("Yammer Mobile", "Yammer[\\s]+([\\d\\w\\.\\-]+)", "Yammer[\\s]+([\\d\\w\\.\\-]+)"), new Browser("Apache HTTP Client", "Apache\\\\-HttpClient", "Apache\\-HttpClient\\/([\\d\\w\\.\\-]+)"), - new Browser("BlackBerry", "BlackBerry", "BlackBerry[\\d]+\\/([\\d\\w\\.\\-]+)") + new Browser("BlackBerry", "BlackBerry", "BlackBerry[\\d]+\\/([\\d\\w\\.\\-]+)"), + new Browser("wxwork", "wxwork", "wxwork\\/([\\d\\w\\.\\-]+)"), + new Browser("MicroMessenger", "MicroMessenger", "MicroMessenger\\/([\\d\\w\\.\\-]+)"), + new Browser("DingTalk", "DingTalk", "AliApp\\(DingTalk\\/([\\d\\w\\.\\-]+)\\)") ); private Pattern versionPattern; diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/anget/Divice.java b/bus-http/src/main/java/org/aoju/bus/http/metric/anget/Divice.java index 8702932c5b..01911dc059 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/anget/Divice.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/anget/Divice.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric.anget; @@ -34,7 +35,7 @@ * 设备信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Divice extends UserAgent { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/anget/Engine.java b/bus-http/src/main/java/org/aoju/bus/http/metric/anget/Engine.java index 4cb37c6742..87142779cc 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/anget/Engine.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/anget/Engine.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric.anget; @@ -33,7 +34,7 @@ * 浏览器解析引擎 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Engine extends UserAgent { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/anget/NOS.java b/bus-http/src/main/java/org/aoju/bus/http/metric/anget/NOS.java index 8ee2bd7a4d..18486f072a 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/anget/NOS.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/anget/NOS.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric.anget; @@ -33,7 +34,7 @@ * 网络操作系统 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NOS extends UserAgent { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/anget/UserAgent.java b/bus-http/src/main/java/org/aoju/bus/http/metric/anget/UserAgent.java index 9924a0741a..89b36e8162 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/anget/UserAgent.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/anget/UserAgent.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric.anget; @@ -33,7 +34,7 @@ * User-Agent信息对象 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class UserAgent { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/AsyncHttp.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/AsyncHttp.java index 32d6f41247..27e4c026ee 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/AsyncHttp.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/AsyncHttp.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric.http; @@ -38,7 +39,7 @@ * 异步 Http 请求任务 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AsyncHttp extends CoverHttp { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/BridgeInterceptor.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/BridgeInterceptor.java index ba6e8dc0d8..11ca16388e 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/BridgeInterceptor.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/BridgeInterceptor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric.http; @@ -44,7 +45,7 @@ * 然后它继续调用网络。最后,它从网络响应构建用户响应 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class BridgeInterceptor implements Interceptor { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/CallServerInterceptor.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/CallServerInterceptor.java index 5075b488f9..c97f94c0d3 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/CallServerInterceptor.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/CallServerInterceptor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric.http; @@ -46,7 +47,7 @@ * 它对服务器进行网络调用 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class CallServerInterceptor implements Interceptor { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/CoverHttp.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/CoverHttp.java index 3e9811b1b5..5f2ae66c27 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/CoverHttp.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/CoverHttp.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric.http; @@ -50,7 +51,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class CoverHttp> implements Cancelable { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/DelegatingConnection.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/DelegatingConnection.java index cc33d9e831..28be31f17c 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/DelegatingConnection.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/DelegatingConnection.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric.http; @@ -45,7 +46,7 @@ * 实现HTTPS连接的方法是,除了特定于HTTP的内容外,所有内容都委托给HTTP连接 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class DelegatingConnection extends HttpsURLConnection { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/ErrorCode.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/ErrorCode.java index f82e0e24d1..107b83936e 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/ErrorCode.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/ErrorCode.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric.http; @@ -28,7 +29,7 @@ * 错误码信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum ErrorCode { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Hpack.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Hpack.java index 748e2eb474..e22e476f17 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Hpack.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Hpack.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric.http; @@ -45,7 +46,7 @@ * 动态条目被添加到数组中,从最后一个位置开始向前移动。当数组填满时,它被加倍. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ final class Hpack { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http1Codec.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http1Codec.java index 3284b420d2..e12fa1f115 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http1Codec.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http1Codec.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric.http; @@ -47,7 +48,7 @@ * 并可以跳过读取和关闭该源 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Http1Codec implements HttpCodec { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2.java index a571ccd65c..89af809051 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric.http; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Http2 { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Codec.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Codec.java index bcbbeb78ec..07fae22b47 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Codec.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Codec.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric.http; @@ -45,7 +46,7 @@ * 使用HTTP/2帧对请求和响应进行编码. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Http2Codec implements HttpCodec { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Connection.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Connection.java index a313076453..e5beb2943e 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Connection.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Connection.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric.http; @@ -52,7 +53,7 @@ * 到远程对等点的套接字连接。连接主机可以发送和接收数据流. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Http2Connection implements Closeable { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Reader.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Reader.java index 645af52bf5..e1a065c44e 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Reader.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Reader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric.http; @@ -40,7 +41,7 @@ * 因此,我们希望所有帧的最大长度为{@link Http2#INITIAL_MAX_FRAME_SIZE}。 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Http2Reader implements Closeable { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Stream.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Stream.java index a20288c444..ab9f127cfd 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Stream.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Stream.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric.http; @@ -41,7 +42,7 @@ * 逻辑双向流. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Http2Stream { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Writer.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Writer.java index 709f7696ae..50cb7f9bd7 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Writer.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Writer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric.http; @@ -39,7 +40,7 @@ * 编写HTTP/2传输帧. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ final class Http2Writer implements Closeable { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpCodec.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpCodec.java index 8a3c024c0e..e1093edf0b 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpCodec.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpCodec.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric.http; @@ -35,7 +36,7 @@ * Encode HTTP请求和decode HTTP响应 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface HttpCodec { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpHeaders.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpHeaders.java index 0ad3d64e24..63ef252d62 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpHeaders.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpHeaders.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric.http; @@ -41,7 +42,7 @@ * Header实用工具 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class HttpHeaders { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpMethod.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpMethod.java index a316d9e95d..9adbdfa643 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpMethod.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpMethod.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric.http; @@ -30,7 +31,7 @@ * Http请求方法 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class HttpMethod { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpURLConnection.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpURLConnection.java index e7529f1df3..0915cfabc8 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpURLConnection.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpURLConnection.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric.http; @@ -48,7 +49,7 @@ * 此实现使用{@linkplain NewCall}发送请求和接收响应 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class HttpURLConnection extends java.net.HttpURLConnection implements Callback { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpsURLConnection.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpsURLConnection.java index ea4147665b..ba4e3078d1 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpsURLConnection.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpsURLConnection.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric.http; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class HttpsURLConnection extends DelegatingConnection { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Huffman.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Huffman.java index bb8b9698e5..33ef3bb832 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Huffman.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Huffman.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ /* * Copyright 2013 Twitter, Inc. @@ -55,7 +56,7 @@ * * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Huffman { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/NetCookieJar.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/NetCookieJar.java index 7442abee50..d0951e5d54 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/NetCookieJar.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/NetCookieJar.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric.http; @@ -44,7 +45,7 @@ * 委托cookie 给{@link java.net.CookieHandler} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class NetCookieJar implements CookieJar { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/PushObserver.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/PushObserver.java index ee339def04..e298ace401 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/PushObserver.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/PushObserver.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric.http; @@ -37,7 +38,7 @@ * 注意,这并不保证将来的帧不会到达流ID * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface PushObserver { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/RealInterceptorChain.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/RealInterceptorChain.java index 1563069343..87e2defd32 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/RealInterceptorChain.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/RealInterceptorChain.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric.http; @@ -43,7 +44,7 @@ * 所有应用程序拦截器、Httpd核心、所有网络拦截器,最后是网络调用者. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class RealInterceptorChain implements Interceptor.Chain { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/RequestLine.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/RequestLine.java index 6e830a87c3..25bfed30a5 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/RequestLine.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/RequestLine.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric.http; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class RequestLine { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/RetryAndFollowUp.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/RetryAndFollowUp.java index ce7fc9a471..7e0b8a3b99 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/RetryAndFollowUp.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/RetryAndFollowUp.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric.http; @@ -54,7 +55,7 @@ * 如果调用被取消,它可能会抛出{@link IOException} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class RetryAndFollowUp implements Interceptor { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/StatusLine.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/StatusLine.java index 53e2f2cf11..32817bb67f 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/StatusLine.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/StatusLine.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric.http; @@ -36,7 +37,7 @@ * HTTP响应“HTTP/ 1.1200 OK”这样的在线状态. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class StatusLine { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/StreamException.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/StreamException.java index bf717c4fba..b8a3e61901 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/StreamException.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/StreamException.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric.http; @@ -30,7 +31,7 @@ * 当取消HTTP/2流而不损坏承载它的套接字时抛出 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class StreamException extends RevisedException { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/SyncHttp.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/SyncHttp.java index 6b5d8fa444..2b3e5e08aa 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/SyncHttp.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/SyncHttp.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric.http; @@ -40,7 +41,7 @@ * 同步 Http 请求任务 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SyncHttp extends CoverHttp { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/proxy/NullProxySelector.java b/bus-http/src/main/java/org/aoju/bus/http/metric/proxy/NullProxySelector.java index 4195559882..b8922f1e15 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/proxy/NullProxySelector.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/proxy/NullProxySelector.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric.proxy; @@ -36,7 +37,7 @@ * 代理选择器,总是返回{@link Proxy#NO_PROXY} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NullProxySelector extends ProxySelector { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/suffix/SuffixDatabase.java b/bus-http/src/main/java/org/aoju/bus/http/metric/suffix/SuffixDatabase.java index 7de4261169..6a41ed07c9 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/suffix/SuffixDatabase.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/suffix/SuffixDatabase.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.metric.suffix; @@ -44,7 +45,7 @@ * publicsuffix.org. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class SuffixDatabase { diff --git a/bus-http/src/main/java/org/aoju/bus/http/secure/Authenticator.java b/bus-http/src/main/java/org/aoju/bus/http/secure/Authenticator.java index 9705c87061..6c348bba94 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/secure/Authenticator.java +++ b/bus-http/src/main/java/org/aoju/bus/http/secure/Authenticator.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.secure; @@ -37,7 +38,7 @@ * 应用程序可以为源服务器或代理服务器配置Httpd的身份验证器,或者两者都配置. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Authenticator { diff --git a/bus-http/src/main/java/org/aoju/bus/http/secure/BasicCertificateChainCleaner.java b/bus-http/src/main/java/org/aoju/bus/http/secure/BasicCertificateChainCleaner.java index 860e56da7f..7c413ac9e6 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/secure/BasicCertificateChainCleaner.java +++ b/bus-http/src/main/java/org/aoju/bus/http/secure/BasicCertificateChainCleaner.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.secure; @@ -36,7 +37,7 @@ * 存在的其他机制,比如{@code AndroidCertificateChainCleaner} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class BasicCertificateChainCleaner extends CertificateChainCleaner { diff --git a/bus-http/src/main/java/org/aoju/bus/http/secure/BasicTrustRootIndex.java b/bus-http/src/main/java/org/aoju/bus/http/secure/BasicTrustRootIndex.java index 5227b23567..18c215f25c 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/secure/BasicTrustRootIndex.java +++ b/bus-http/src/main/java/org/aoju/bus/http/secure/BasicTrustRootIndex.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.secure; @@ -36,7 +37,7 @@ * 一个简单的索引,包含已加载到内存中的受信任根证书 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class BasicTrustRootIndex implements TrustRootIndex { diff --git a/bus-http/src/main/java/org/aoju/bus/http/secure/CertificateChainCleaner.java b/bus-http/src/main/java/org/aoju/bus/http/secure/CertificateChainCleaner.java index 5186434759..84eb8b1eab 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/secure/CertificateChainCleaner.java +++ b/bus-http/src/main/java/org/aoju/bus/http/secure/CertificateChainCleaner.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.secure; @@ -40,7 +41,7 @@ * 并提取受信任的CA证书,以便进行证书固定 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class CertificateChainCleaner { diff --git a/bus-http/src/main/java/org/aoju/bus/http/secure/CertificatePinner.java b/bus-http/src/main/java/org/aoju/bus/http/secure/CertificatePinner.java index c833301f72..6f7c6bf403 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/secure/CertificatePinner.java +++ b/bus-http/src/main/java/org/aoju/bus/http/secure/CertificatePinner.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.secure; @@ -45,7 +46,7 @@ * 则{@link CertificatePinner}不能用于pin自签名证书 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class CertificatePinner { diff --git a/bus-http/src/main/java/org/aoju/bus/http/secure/Challenge.java b/bus-http/src/main/java/org/aoju/bus/http/secure/Challenge.java index 1b756deefb..ce1668dfbf 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/secure/Challenge.java +++ b/bus-http/src/main/java/org/aoju/bus/http/secure/Challenge.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.secure; @@ -36,7 +37,7 @@ * RFC 7235兼容的认证 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Challenge { diff --git a/bus-http/src/main/java/org/aoju/bus/http/secure/CipherSuite.java b/bus-http/src/main/java/org/aoju/bus/http/secure/CipherSuite.java index 431f3d7bc0..8b30f5a6b5 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/secure/CipherSuite.java +++ b/bus-http/src/main/java/org/aoju/bus/http/secure/CipherSuite.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.secure; @@ -33,7 +34,7 @@ * 或Java(通过JDK 9)上不可用的密码套件 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class CipherSuite { diff --git a/bus-http/src/main/java/org/aoju/bus/http/secure/Credentials.java b/bus-http/src/main/java/org/aoju/bus/http/secure/Credentials.java index ddd0e32e56..56a69279c2 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/secure/Credentials.java +++ b/bus-http/src/main/java/org/aoju/bus/http/secure/Credentials.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.secure; @@ -32,7 +33,7 @@ * HTTP授权工厂 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Credentials { diff --git a/bus-http/src/main/java/org/aoju/bus/http/secure/DistinguishedNameParser.java b/bus-http/src/main/java/org/aoju/bus/http/secure/DistinguishedNameParser.java index e0e45e26b2..984a59cb80 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/secure/DistinguishedNameParser.java +++ b/bus-http/src/main/java/org/aoju/bus/http/secure/DistinguishedNameParser.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.secure; @@ -34,7 +35,7 @@ * 它不支持十六进制字符串样式的值. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class DistinguishedNameParser { diff --git a/bus-http/src/main/java/org/aoju/bus/http/secure/HostnameVerifier.java b/bus-http/src/main/java/org/aoju/bus/http/secure/HostnameVerifier.java index ccde90b57e..56166f9ed1 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/secure/HostnameVerifier.java +++ b/bus-http/src/main/java/org/aoju/bus/http/secure/HostnameVerifier.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.secure; @@ -38,7 +39,7 @@ * 一个与RFC 2818一致的HostnameVerifier * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class HostnameVerifier implements javax.net.ssl.HostnameVerifier { diff --git a/bus-http/src/main/java/org/aoju/bus/http/secure/NetAuthenticator.java b/bus-http/src/main/java/org/aoju/bus/http/secure/NetAuthenticator.java index ee70ae406e..66bf05ac8a 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/secure/NetAuthenticator.java +++ b/bus-http/src/main/java/org/aoju/bus/http/secure/NetAuthenticator.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.secure; @@ -38,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class NetAuthenticator implements Authenticator { diff --git a/bus-http/src/main/java/org/aoju/bus/http/secure/SSLSocketFactory.java b/bus-http/src/main/java/org/aoju/bus/http/secure/SSLSocketFactory.java index 06bb5d1807..5fd4552445 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/secure/SSLSocketFactory.java +++ b/bus-http/src/main/java/org/aoju/bus/http/secure/SSLSocketFactory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.secure; @@ -34,7 +35,7 @@ * Https SSL证书 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SSLSocketFactory { diff --git a/bus-http/src/main/java/org/aoju/bus/http/secure/TlsVersion.java b/bus-http/src/main/java/org/aoju/bus/http/secure/TlsVersion.java index afaa36b98f..3b39b9c7ab 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/secure/TlsVersion.java +++ b/bus-http/src/main/java/org/aoju/bus/http/secure/TlsVersion.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.secure; @@ -33,7 +34,7 @@ * 查看{@link javax.net.ssl.SSLSocket # setEnabledProtocols} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum TlsVersion { diff --git a/bus-http/src/main/java/org/aoju/bus/http/secure/TrustRootIndex.java b/bus-http/src/main/java/org/aoju/bus/http/secure/TrustRootIndex.java index 9680c9ea2d..f5387b7b28 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/secure/TrustRootIndex.java +++ b/bus-http/src/main/java/org/aoju/bus/http/secure/TrustRootIndex.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.secure; @@ -30,7 +31,7 @@ * 签名证书索引 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface TrustRootIndex { diff --git a/bus-http/src/main/java/org/aoju/bus/http/secure/X509TrustManager.java b/bus-http/src/main/java/org/aoju/bus/http/secure/X509TrustManager.java index 6444a46487..e461ce7516 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/secure/X509TrustManager.java +++ b/bus-http/src/main/java/org/aoju/bus/http/secure/X509TrustManager.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.secure; @@ -37,7 +38,7 @@ * 证书管理 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class X509TrustManager implements javax.net.ssl.X509TrustManager { diff --git a/bus-http/src/main/java/org/aoju/bus/http/socket/RealWebSocket.java b/bus-http/src/main/java/org/aoju/bus/http/socket/RealWebSocket.java index c24ecccbef..170d5f6a5a 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/socket/RealWebSocket.java +++ b/bus-http/src/main/java/org/aoju/bus/http/socket/RealWebSocket.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.socket; @@ -50,7 +51,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class RealWebSocket implements WebSocket, WebSocketReader.FrameCallback { diff --git a/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocket.java b/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocket.java index f59014b175..57f85bf669 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocket.java +++ b/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocket.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.socket; @@ -33,7 +34,7 @@ * 通常是{@link Httpd} 在正常操作时,每个web套接字将通过一系列状态进行处理 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface WebSocket { diff --git a/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketCover.java b/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketCover.java index 55a9bac90a..a52200d8fa 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketCover.java +++ b/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketCover.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.socket; @@ -41,7 +42,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class WebSocketCover extends CoverHttp { diff --git a/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketListener.java b/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketListener.java index d767c75c17..3234c98529 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketListener.java +++ b/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketListener.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.socket; @@ -31,7 +32,7 @@ * web socket 监听器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class WebSocketListener { diff --git a/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketMessage.java b/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketMessage.java index 4e5dfe8c4b..5f37a5aed9 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketMessage.java +++ b/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketMessage.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.socket; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class WebSocketMessage extends AbstractBody implements WebSocketCover.Sockets.Message { diff --git a/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketProtocol.java b/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketProtocol.java index 71e7180d51..375a2026a9 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketProtocol.java +++ b/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketProtocol.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.socket; @@ -31,7 +32,7 @@ * web socket协议信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class WebSocketProtocol { diff --git a/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketReader.java b/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketReader.java index 7545e4df84..f03c2a4d4e 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketReader.java +++ b/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketReader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.socket; @@ -38,7 +39,7 @@ * 这个类不是线程安全的 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ final class WebSocketReader { diff --git a/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketWriter.java b/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketWriter.java index 468ab168c3..325db66882 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketWriter.java +++ b/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketWriter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.http.socket; @@ -34,7 +35,7 @@ * 这个类不是线程安全的 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ final class WebSocketWriter { diff --git a/bus-http/src/main/resources/META-INF/suffixes/suffixes.gz b/bus-http/src/main/resources/META-INF/suffixes/suffixes.gz index 08458a61e0..4f1596b9d3 100644 Binary files a/bus-http/src/main/resources/META-INF/suffixes/suffixes.gz and b/bus-http/src/main/resources/META-INF/suffixes/suffixes.gz differ diff --git a/bus-image/pom.xml b/bus-image/pom.xml index 810cd30ed9..d1b88f4d7c 100755 --- a/bus-image/pom.xml +++ b/bus-image/pom.xml @@ -6,18 +6,43 @@ org.aoju bus-image - 6.1.1 + 6.1.2 jar ${project.artifactId} Bus Image https://github.com/aoju/bus + + + The MIT License (MIT) + https://opensource.org/licenses/MIT + + + + + scm:git@github.com:aoju/bus.git + scm:git@github.com:aoju/bus.git + git@github.com:aoju/bus.git + + + + + Kimi Liu + https://github.com/aoju/bus.git + + + + + Github Issue + https://github.com/aoju/bus/issues + + UTF-8 UTF-8 1.8 - 1.18.12 + 1.18.16 @@ -41,31 +66,6 @@ - - - The MIT License (MIT) - https://opensource.org/licenses/MIT - - - - - scm:git@github.com:aoju/bus.git - scm:git@github.com:aoju/bus.git - git@github.com:aoju/bus.git - - - - - Kimi Liu - https://github.com/aoju/bus.git - - - - - Github Issue - https://github.com/aoju/bus/issues - - diff --git a/bus-image/src/main/java/org/aoju/bus/image/Args.java b/bus-image/src/main/java/org/aoju/bus/image/Args.java index 09a54a17b1..bbe592a434 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/Args.java +++ b/bus-image/src/main/java/org/aoju/bus/image/Args.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image; @@ -41,7 +42,7 @@ * 请求参数信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-image/src/main/java/org/aoju/bus/image/Builder.java b/bus-image/src/main/java/org/aoju/bus/image/Builder.java index 027160bba6..60be1b9317 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/Builder.java +++ b/bus-image/src/main/java/org/aoju/bus/image/Builder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image; @@ -52,7 +53,7 @@ * 方法参数等构建器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Builder { diff --git a/bus-image/src/main/java/org/aoju/bus/image/Centre.java b/bus-image/src/main/java/org/aoju/bus/image/Centre.java index f5282e32e1..cd19daeaa7 100644 --- a/bus-image/src/main/java/org/aoju/bus/image/Centre.java +++ b/bus-image/src/main/java/org/aoju/bus/image/Centre.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image; @@ -49,7 +50,7 @@ * 2. 设备服务进程 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @lombok.Builder diff --git a/bus-image/src/main/java/org/aoju/bus/image/Device.java b/bus-image/src/main/java/org/aoju/bus/image/Device.java index c0d44aba6e..7c3eaa26f4 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/Device.java +++ b/bus-image/src/main/java/org/aoju/bus/image/Device.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image; @@ -52,7 +53,7 @@ * 设备信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Device implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/Dimse.java b/bus-image/src/main/java/org/aoju/bus/image/Dimse.java index f9c23e85ee..e2c0867beb 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/Dimse.java +++ b/bus-image/src/main/java/org/aoju/bus/image/Dimse.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image; @@ -32,7 +33,7 @@ * 复合DIMSE服务 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum Dimse { diff --git a/bus-image/src/main/java/org/aoju/bus/image/Editors.java b/bus-image/src/main/java/org/aoju/bus/image/Editors.java index b41e4778ac..e60b4a8768 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/Editors.java +++ b/bus-image/src/main/java/org/aoju/bus/image/Editors.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @FunctionalInterface diff --git a/bus-image/src/main/java/org/aoju/bus/image/Efforts.java b/bus-image/src/main/java/org/aoju/bus/image/Efforts.java index 889a352a2d..b793658c38 100644 --- a/bus-image/src/main/java/org/aoju/bus/image/Efforts.java +++ b/bus-image/src/main/java/org/aoju/bus/image/Efforts.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image; @@ -33,7 +34,7 @@ * 即: 后续业务处理支持 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Efforts { diff --git a/bus-image/src/main/java/org/aoju/bus/image/Format.java b/bus-image/src/main/java/org/aoju/bus/image/Format.java index 5e4be05a7f..1cef4a2f00 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/Format.java +++ b/bus-image/src/main/java/org/aoju/bus/image/Format.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image; @@ -45,7 +46,7 @@ * 日期格式化等工具 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Format extends java.text.Format { diff --git a/bus-image/src/main/java/org/aoju/bus/image/Node.java b/bus-image/src/main/java/org/aoju/bus/image/Node.java index 3cf03b0854..a215836d79 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/Node.java +++ b/bus-image/src/main/java/org/aoju/bus/image/Node.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image; @@ -38,7 +39,7 @@ * 服务器信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-image/src/main/java/org/aoju/bus/image/Option.java b/bus-image/src/main/java/org/aoju/bus/image/Option.java index 6f38358f28..a24e7edf91 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/Option.java +++ b/bus-image/src/main/java/org/aoju/bus/image/Option.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image; @@ -34,7 +35,7 @@ * 服务请求选项 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-image/src/main/java/org/aoju/bus/image/Status.java b/bus-image/src/main/java/org/aoju/bus/image/Status.java index 75859ce62e..229b31de87 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/Status.java +++ b/bus-image/src/main/java/org/aoju/bus/image/Status.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image; @@ -37,7 +38,7 @@ * 相关处理状态 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-image/src/main/java/org/aoju/bus/image/Tag.java b/bus-image/src/main/java/org/aoju/bus/image/Tag.java index d6bc232785..46c3e6a073 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/Tag.java +++ b/bus-image/src/main/java/org/aoju/bus/image/Tag.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image; @@ -31,7 +32,7 @@ * 文件信息标识 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Tag { diff --git a/bus-image/src/main/java/org/aoju/bus/image/UID.java b/bus-image/src/main/java/org/aoju/bus/image/UID.java index 298320e2e4..474c6b2141 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/UID.java +++ b/bus-image/src/main/java/org/aoju/bus/image/UID.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image; @@ -45,7 +46,7 @@ * UID信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class UID { @@ -1765,11 +1766,11 @@ public class UID { /** * Private ERAD Practice Builder Report Text Storage */ - public static final String PrivateERADPracticeBuilderReportTextStorage = "1.2.826.1.1.3680043.293.1.0.1"; + public static final String PrivateERADPracticeBuilderReportTextStorage = "1.2.826.1.2.3680043.293.1.0.1"; /** * Private ERAD Practice Builder Report Dictation Storage */ - public static final String PrivateERADPracticeBuilderReportDictationStorage = "1.2.826.1.1.3680043.293.1.0.2"; + public static final String PrivateERADPracticeBuilderReportDictationStorage = "1.2.826.1.2.3680043.293.1.0.2"; /** * Private Philips HP Live 3D 01 Storage */ @@ -1825,7 +1826,7 @@ public class UID { /** * Private Siemens CSA Non Image Storage */ - public static final String PrivateSiemensCSANonImageStorage = "1.3.12.2.1107.6.1.1"; + public static final String PrivateSiemensCSANonImageStorage = "1.3.12.2.1107.6.1.2"; /** * Private Siemens CT MR Volume Storage */ @@ -1889,11 +1890,11 @@ public class UID { /** * Private Philips MR Cardio Storage (Retired) */ - public static final String PrivatePhilipsMRCardioStorageRetired = "1.3.46.670589.6.1.1"; + public static final String PrivatePhilipsMRCardioStorageRetired = "1.3.46.670589.6.1.2"; /** * Private Philips MR Cardio Storage */ - public static final String PrivatePhilipsMRCardioStorage = "1.3.46.670589.6.1.1.1"; + public static final String PrivatePhilipsMRCardioStorage = "1.3.46.670589.6.1.2.1"; /** * Private Philips CT Synthetic Image Storage */ diff --git a/bus-image/src/main/java/org/aoju/bus/image/builtin/AcquisitionModality.java b/bus-image/src/main/java/org/aoju/bus/image/builtin/AcquisitionModality.java index f52a16f10c..5ed7019d59 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/builtin/AcquisitionModality.java +++ b/bus-image/src/main/java/org/aoju/bus/image/builtin/AcquisitionModality.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.builtin; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AcquisitionModality { diff --git a/bus-image/src/main/java/org/aoju/bus/image/builtin/AnatomicRegion.java b/bus-image/src/main/java/org/aoju/bus/image/builtin/AnatomicRegion.java index e3fbd5c67a..1f7925483f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/builtin/AnatomicRegion.java +++ b/bus-image/src/main/java/org/aoju/bus/image/builtin/AnatomicRegion.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.builtin; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AnatomicRegion { diff --git a/bus-image/src/main/java/org/aoju/bus/image/builtin/ArchiveElementDictionary.java b/bus-image/src/main/java/org/aoju/bus/image/builtin/ArchiveElementDictionary.java index 1213a3d29d..01b8556458 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/builtin/ArchiveElementDictionary.java +++ b/bus-image/src/main/java/org/aoju/bus/image/builtin/ArchiveElementDictionary.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.builtin; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ArchiveElementDictionary extends ElementDictionary { diff --git a/bus-image/src/main/java/org/aoju/bus/image/builtin/ArchiveKey.java b/bus-image/src/main/java/org/aoju/bus/image/builtin/ArchiveKey.java index 7e229ac2e7..616714f873 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/builtin/ArchiveKey.java +++ b/bus-image/src/main/java/org/aoju/bus/image/builtin/ArchiveKey.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.builtin; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ArchiveKey { diff --git a/bus-image/src/main/java/org/aoju/bus/image/builtin/ArchiveTag.java b/bus-image/src/main/java/org/aoju/bus/image/builtin/ArchiveTag.java index e8addc7c1f..da0dce36b1 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/builtin/ArchiveTag.java +++ b/bus-image/src/main/java/org/aoju/bus/image/builtin/ArchiveTag.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.builtin; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ArchiveTag { diff --git a/bus-image/src/main/java/org/aoju/bus/image/builtin/DeIdentificationCoercion.java b/bus-image/src/main/java/org/aoju/bus/image/builtin/DeIdentificationCoercion.java index 07c18906dc..94d012499f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/builtin/DeIdentificationCoercion.java +++ b/bus-image/src/main/java/org/aoju/bus/image/builtin/DeIdentificationCoercion.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.builtin; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DeIdentificationCoercion implements AttributesCoercion { diff --git a/bus-image/src/main/java/org/aoju/bus/image/builtin/DeIdentificationMethod.java b/bus-image/src/main/java/org/aoju/bus/image/builtin/DeIdentificationMethod.java index fcf3c83d74..9ead8e1634 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/builtin/DeIdentificationMethod.java +++ b/bus-image/src/main/java/org/aoju/bus/image/builtin/DeIdentificationMethod.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.builtin; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DeIdentificationMethod { diff --git a/bus-image/src/main/java/org/aoju/bus/image/builtin/DeIdentifier.java b/bus-image/src/main/java/org/aoju/bus/image/builtin/DeIdentifier.java index 60f992dc06..abf9835d14 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/builtin/DeIdentifier.java +++ b/bus-image/src/main/java/org/aoju/bus/image/builtin/DeIdentifier.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.builtin; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DeIdentifier { diff --git a/bus-image/src/main/java/org/aoju/bus/image/builtin/FuzzyStr.java b/bus-image/src/main/java/org/aoju/bus/image/builtin/FuzzyStr.java index aca939a1f8..be1dddbc3a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/builtin/FuzzyStr.java +++ b/bus-image/src/main/java/org/aoju/bus/image/builtin/FuzzyStr.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.builtin; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface FuzzyStr { diff --git a/bus-image/src/main/java/org/aoju/bus/image/builtin/HashUIDMapper.java b/bus-image/src/main/java/org/aoju/bus/image/builtin/HashUIDMapper.java index 0fc2091e17..6e2622b96a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/builtin/HashUIDMapper.java +++ b/bus-image/src/main/java/org/aoju/bus/image/builtin/HashUIDMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.builtin; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HashUIDMapper implements UIDMapper { diff --git a/bus-image/src/main/java/org/aoju/bus/image/builtin/KPhonetik.java b/bus-image/src/main/java/org/aoju/bus/image/builtin/KPhonetik.java index b51acc9dba..ca095182a3 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/builtin/KPhonetik.java +++ b/bus-image/src/main/java/org/aoju/bus/image/builtin/KPhonetik.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.builtin; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class KPhonetik implements FuzzyStr { diff --git a/bus-image/src/main/java/org/aoju/bus/image/builtin/Metaphone.java b/bus-image/src/main/java/org/aoju/bus/image/builtin/Metaphone.java index 7c46d24daf..226ac6a7f8 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/builtin/Metaphone.java +++ b/bus-image/src/main/java/org/aoju/bus/image/builtin/Metaphone.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.builtin; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Metaphone implements FuzzyStr { diff --git a/bus-image/src/main/java/org/aoju/bus/image/builtin/Multiframe.java b/bus-image/src/main/java/org/aoju/bus/image/builtin/Multiframe.java index 09b28c9703..33fe58d4c7 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/builtin/Multiframe.java +++ b/bus-image/src/main/java/org/aoju/bus/image/builtin/Multiframe.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.builtin; @@ -37,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Multiframe { diff --git a/bus-image/src/main/java/org/aoju/bus/image/builtin/Phonem.java b/bus-image/src/main/java/org/aoju/bus/image/builtin/Phonem.java index fecf45c4d0..897bfbe104 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/builtin/Phonem.java +++ b/bus-image/src/main/java/org/aoju/bus/image/builtin/Phonem.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.builtin; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Phonem implements FuzzyStr { diff --git a/bus-image/src/main/java/org/aoju/bus/image/builtin/Soundex.java b/bus-image/src/main/java/org/aoju/bus/image/builtin/Soundex.java index 52da9fd5b9..54eb1200e6 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/builtin/Soundex.java +++ b/bus-image/src/main/java/org/aoju/bus/image/builtin/Soundex.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.builtin; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Soundex implements FuzzyStr { diff --git a/bus-image/src/main/java/org/aoju/bus/image/builtin/UIDMapper.java b/bus-image/src/main/java/org/aoju/bus/image/builtin/UIDMapper.java index c5b0677c3e..bbb42310cb 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/builtin/UIDMapper.java +++ b/bus-image/src/main/java/org/aoju/bus/image/builtin/UIDMapper.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.builtin; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface UIDMapper { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/ApplicationCache.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/ApplicationCache.java index 3d69510df9..f19e5960a2 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/ApplicationCache.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/ApplicationCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface ApplicationCache { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/AttributeCoercion.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/AttributeCoercion.java index f9eb158f04..2fa43f650f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/AttributeCoercion.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/AttributeCoercion.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AttributeCoercion implements Serializable, Comparable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/Availability.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/Availability.java index 99b808a653..5bf6f5aea6 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/Availability.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/Availability.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum Availability { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/BinaryPrefix.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/BinaryPrefix.java index 0d4947c226..9e8f4f5f9e 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/BinaryPrefix.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/BinaryPrefix.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum BinaryPrefix { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/Capacity.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/Capacity.java index 9f4393f868..14efdef3f4 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/Capacity.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/Capacity.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Capacity implements Cloneable, java.io.Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/Configuration.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/Configuration.java index 5c9c6da22b..2d69b9ab85 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/Configuration.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/Configuration.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Configuration extends Closeable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/ConfigurationCache.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/ConfigurationCache.java index 99d33bd8f0..5e8d401e45 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/ConfigurationCache.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/ConfigurationCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class ConfigurationCache { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/ConfigurationChange.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/ConfigurationChange.java index 8c8e616191..9479fe68f0 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/ConfigurationChange.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/ConfigurationChange.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ConfigurationChange { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/DeleterThreshold.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/DeleterThreshold.java index 4fb6fd1f8a..496b78d49a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/DeleterThreshold.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/DeleterThreshold.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DeleterThreshold extends StorageThreshold diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/DeviceCache.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/DeviceCache.java index 38911ab65e..e5e8dad9df 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/DeviceCache.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/DeviceCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DeviceCache extends ConfigurationCache diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/DirReader.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/DirReader.java index 5eca0dbde3..6d501fae34 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/DirReader.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/DirReader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy; @@ -40,7 +41,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DirReader implements Closeable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/DirWriter.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/DirWriter.java index dc3a9112d8..ca53b364ef 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/DirWriter.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/DirWriter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy; @@ -45,7 +46,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DirWriter extends DirReader { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/IDeviceCache.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/IDeviceCache.java index 3745382584..1451a3287c 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/IDeviceCache.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/IDeviceCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface IDeviceCache { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/Property.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/Property.java index c57d07b61a..4cf0077d90 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/Property.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/Property.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy; @@ -39,7 +40,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Property implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/RetentionPeriod.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/RetentionPeriod.java index 0824883b86..90252c98a0 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/RetentionPeriod.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/RetentionPeriod.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RetentionPeriod implements Comparable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/ScheduleExpression.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/ScheduleExpression.java index 34a7078968..fc468f4cdf 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/ScheduleExpression.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/ScheduleExpression.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ScheduleExpression { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/StorageThreshold.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/StorageThreshold.java index 345b419c50..667ffdf7af 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/StorageThreshold.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/StorageThreshold.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class StorageThreshold { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/WebApplicationCache.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/WebApplicationCache.java index 74d9979420..ca8312375e 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/WebApplicationCache.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/WebApplicationCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class WebApplicationCache extends ConfigurationCache diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Attributes.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Attributes.java index c54fd9ac95..99f1eabb44 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Attributes.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Attributes.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.data; @@ -44,7 +45,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Attributes implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/AttributesCoercion.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/AttributesCoercion.java index af1405a195..3312bd94cf 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/AttributesCoercion.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/AttributesCoercion.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.data; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface AttributesCoercion { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/AttributesSelector.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/AttributesSelector.java index 9277f080d2..09071925a4 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/AttributesSelector.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/AttributesSelector.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.data; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AttributesSelector implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/BinaryValueType.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/BinaryValueType.java index 0da9429b34..452311487f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/BinaryValueType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/BinaryValueType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.data; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum BinaryValueType implements ValueType { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/BulkData.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/BulkData.java index dc454c6461..f1d5e06a57 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/BulkData.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/BulkData.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.data; @@ -38,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BulkData implements Value { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Code.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Code.java index 630223ccc9..f19e0447fd 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Code.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Code.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.data; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Code implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/DatePrecision.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/DatePrecision.java index 7a4f127b6e..7c696c4799 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/DatePrecision.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/DatePrecision.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.data; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DatePrecision { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/DateRange.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/DateRange.java index d4bc5086cf..64489a7711 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/DateRange.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/DateRange.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.data; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DateRange implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ElementDictionary.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ElementDictionary.java index c452a32607..d2f5464248 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ElementDictionary.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ElementDictionary.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.data; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class ElementDictionary { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Fragments.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Fragments.java index bd5b076aa8..9d517cd344 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Fragments.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Fragments.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.data; @@ -36,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Fragments extends ArrayList implements Value { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/IOD.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/IOD.java index 2591ab7f74..a928b910bf 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/IOD.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/IOD.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.data; @@ -43,7 +44,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class IOD extends ArrayList { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/IODCache.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/IODCache.java index df1cb75ccf..def813381c 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/IODCache.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/IODCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.data; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class IODCache { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Implementation.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Implementation.java index ee4abbd111..7e04b9eea1 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Implementation.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Implementation.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.data; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Implementation { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Issuer.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Issuer.java index 30c57597cb..a506878c3f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Issuer.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Issuer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.data; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Issuer implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ItemPointer.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ItemPointer.java index 4ba24ea4b3..8ca8d3ada8 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ItemPointer.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ItemPointer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.data; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ItemPointer implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Keyword.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Keyword.java index 77bce01408..b8c7c33649 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Keyword.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Keyword.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.data; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Keyword { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/MergeAttributesCoercion.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/MergeAttributesCoercion.java index 5491448704..5806d0bc01 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/MergeAttributesCoercion.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/MergeAttributesCoercion.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.data; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MergeAttributesCoercion implements AttributesCoercion { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/NullifyAttributesCoercion.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/NullifyAttributesCoercion.java index 7d307f6e28..56935bbb48 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/NullifyAttributesCoercion.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/NullifyAttributesCoercion.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.data; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NullifyAttributesCoercion implements AttributesCoercion { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/PersonName.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/PersonName.java index 0c57133d15..0c3eca503b 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/PersonName.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/PersonName.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.data; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PersonName { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/RemapUIDAttributesCoercion.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/RemapUIDAttributesCoercion.java index 83f8a744c4..9d873520e2 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/RemapUIDAttributesCoercion.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/RemapUIDAttributesCoercion.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.data; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RemapUIDAttributesCoercion implements AttributesCoercion { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Sequence.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Sequence.java index 12b19eda1f..bde3434610 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Sequence.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Sequence.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.data; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Sequence extends ArrayList implements Value { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/SequenceValueType.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/SequenceValueType.java index 48243483a7..7190eac9f3 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/SequenceValueType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/SequenceValueType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.data; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum SequenceValueType implements ValueType { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/SpecificCharacterSet.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/SpecificCharacterSet.java index eb4e5b61b1..5e85d4dfb4 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/SpecificCharacterSet.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/SpecificCharacterSet.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.data; @@ -37,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SpecificCharacterSet { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/StandardDictionary.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/StandardDictionary.java index c7ece3fa88..5ff8cfc7ee 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/StandardDictionary.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/StandardDictionary.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.data; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class StandardDictionary extends ElementDictionary { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/StringValueType.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/StringValueType.java index 3938891dc8..f095763b3a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/StringValueType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/StringValueType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.data; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum StringValueType implements ValueType { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/TemporalType.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/TemporalType.java index 8e9ef5ae23..4924621964 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/TemporalType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/TemporalType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.data; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum TemporalType { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/VR.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/VR.java index 03b773563b..b6f53448b2 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/VR.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/VR.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.data; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum VR { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ValidationResult.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ValidationResult.java index 435033b947..e308a9d3cc 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ValidationResult.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ValidationResult.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.data; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ValidationResult { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Value.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Value.java index 673c44d0ed..3ca1e8f2c8 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Value.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Value.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.data; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Value { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ValueSelector.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ValueSelector.java index edc3b7c278..0ffb20401d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ValueSelector.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ValueSelector.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.data; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ValueSelector implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ValueType.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ValueType.java index 359a2ec267..7a48117bf4 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ValueType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ValueType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.data; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface ValueType { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/BasicBulkDataDescriptor.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/BasicBulkDataDescriptor.java index 35a68905db..ca72f75270 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/BasicBulkDataDescriptor.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/BasicBulkDataDescriptor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.io; @@ -36,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BasicBulkDataDescriptor implements BulkDataDescriptor { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/BulkDataCreator.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/BulkDataCreator.java index d45ecf03a4..31d4c9c3b4 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/BulkDataCreator.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/BulkDataCreator.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.io; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface BulkDataCreator { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/BulkDataDescriptor.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/BulkDataDescriptor.java index acb119d818..ec82bdc717 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/BulkDataDescriptor.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/BulkDataDescriptor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.io; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface BulkDataDescriptor { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ContentHandlerAdapter.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ContentHandlerAdapter.java index 35315f51b5..192588d4a8 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ContentHandlerAdapter.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ContentHandlerAdapter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.io; @@ -36,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ContentHandlerAdapter extends DefaultHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ImageEncodingOptions.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ImageEncodingOptions.java index f64e50e066..0d3790b59f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ImageEncodingOptions.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ImageEncodingOptions.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.io; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ImageEncodingOptions { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ImageInputHandler.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ImageInputHandler.java index 928303066a..0d66426e7d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ImageInputHandler.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ImageInputHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.io; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface ImageInputHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ImageInputStream.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ImageInputStream.java index 8452b6d466..e4b779a38c 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ImageInputStream.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ImageInputStream.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.io; @@ -46,7 +47,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ImageInputStream extends FilterInputStream diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ImageOutputStream.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ImageOutputStream.java index 6356709f45..cf9020c87c 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ImageOutputStream.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ImageOutputStream.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.io; @@ -36,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ImageOutputStream extends FilterOutputStream { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/RAFInputStreamAdapter.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/RAFInputStreamAdapter.java index 369987ba10..67972b9330 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/RAFInputStreamAdapter.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/RAFInputStreamAdapter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.io; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RAFInputStreamAdapter extends InputStream { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/RAFOutputStreamAdapter.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/RAFOutputStreamAdapter.java index a356955df5..14f9eac1fe 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/RAFOutputStreamAdapter.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/RAFOutputStreamAdapter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.io; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RAFOutputStreamAdapter extends OutputStream { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/SAXReader.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/SAXReader.java index 69a020dbbc..6c34c13d35 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/SAXReader.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/SAXReader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.io; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SAXReader { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/SAXTransformer.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/SAXTransformer.java index 6518a6712f..1c2876df0b 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/SAXTransformer.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/SAXTransformer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.io; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class SAXTransformer { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/SAXWriter.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/SAXWriter.java index 945461ac7b..14e4496ebf 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/SAXWriter.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/SAXWriter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.io; @@ -40,7 +41,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SAXWriter implements ImageInputHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/TemplatesCache.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/TemplatesCache.java index 17a0abf835..ae870b66ec 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/TemplatesCache.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/TemplatesCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.io; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TemplatesCache { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/XSLTAttributesCoercion.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/XSLTAttributesCoercion.java index 0aa23c173e..0d8af7625d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/XSLTAttributesCoercion.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/XSLTAttributesCoercion.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.io; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class XSLTAttributesCoercion implements AttributesCoercion { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/AbstractStowrs.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/AbstractStowrs.java index 46fc8d1c11..d9b6559e78 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/AbstractStowrs.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/AbstractStowrs.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.media; @@ -48,7 +49,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AbstractStowrs implements AutoCloseable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/HeaderFieldValues.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/HeaderFieldValues.java index 0121b13bd5..fe5a34d59c 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/HeaderFieldValues.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/HeaderFieldValues.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.media; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HeaderFieldValues { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/InvokeImageDisplay.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/InvokeImageDisplay.java index d648cc1136..fe0b52ec54 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/InvokeImageDisplay.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/InvokeImageDisplay.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.media; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class InvokeImageDisplay { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/MultipartInputStream.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/MultipartInputStream.java index 5a4e501175..a9a70808f1 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/MultipartInputStream.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/MultipartInputStream.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.media; @@ -38,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MultipartInputStream extends FilterInputStream { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/MultipartParser.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/MultipartParser.java index 8373972ef8..3421b17ebf 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/MultipartParser.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/MultipartParser.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.media; @@ -38,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MultipartParser { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/MultipartReader.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/MultipartReader.java index d0964bce19..2421fe1570 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/MultipartReader.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/MultipartReader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.media; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MultipartReader { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/RecordFactory.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/RecordFactory.java index df3e57f034..0e6c988582 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/RecordFactory.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/RecordFactory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.media; @@ -43,7 +44,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RecordFactory { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/RecordType.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/RecordType.java index 77554535ab..e3a8ce5074 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/RecordType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/RecordType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.media; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum RecordType { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/StowrsMultiFiles.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/StowrsMultiFiles.java index 4487cd072d..69fcb20e88 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/StowrsMultiFiles.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/StowrsMultiFiles.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.media; @@ -46,7 +47,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class StowrsMultiFiles extends AbstractStowrs { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/StowrsSingleFile.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/StowrsSingleFile.java index 4fd506727b..6f68b816bf 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/StowrsSingleFile.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/StowrsSingleFile.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.media; @@ -39,7 +40,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class StowrsSingleFile extends AbstractStowrs implements UploadSingleFile { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/UploadSingleFile.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/UploadSingleFile.java index a9cf9c568b..75e1cedc7c 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/UploadSingleFile.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/UploadSingleFile.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.galaxy.media; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface UploadSingleFile extends AutoCloseable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/AdvancedHandler.java b/bus-image/src/main/java/org/aoju/bus/image/metric/AdvancedHandler.java index b27ea2038b..201dbe9fda 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/AdvancedHandler.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/AdvancedHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum AdvancedHandler implements TCPHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/ApplicationEntity.java b/bus-image/src/main/java/org/aoju/bus/image/metric/ApplicationEntity.java index 8204952109..889ef757db 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/ApplicationEntity.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/ApplicationEntity.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; @@ -45,7 +46,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ApplicationEntity implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/Association.java b/bus-image/src/main/java/org/aoju/bus/image/metric/Association.java index 8ed7a4df7b..d567af7f2c 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/Association.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/Association.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; @@ -46,7 +47,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Association { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/AssociationHandler.java b/bus-image/src/main/java/org/aoju/bus/image/metric/AssociationHandler.java index c6c08e97a8..7c28fb582d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/AssociationHandler.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/AssociationHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AssociationHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/AssociationListener.java b/bus-image/src/main/java/org/aoju/bus/image/metric/AssociationListener.java index 90934661d0..5212b8bb96 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/AssociationListener.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/AssociationListener.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface AssociationListener { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/AssociationMonitor.java b/bus-image/src/main/java/org/aoju/bus/image/metric/AssociationMonitor.java index 51a87c0313..9a3c013b2f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/AssociationMonitor.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/AssociationMonitor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface AssociationMonitor { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/AttributeContext.java b/bus-image/src/main/java/org/aoju/bus/image/metric/AttributeContext.java index b0034ae302..3951b658c4 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/AttributeContext.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/AttributeContext.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/CancelListener.java b/bus-image/src/main/java/org/aoju/bus/image/metric/CancelListener.java index 415a9cb555..f03f938e66 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/CancelListener.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/CancelListener.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface CancelListener { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/CancelRQHandler.java b/bus-image/src/main/java/org/aoju/bus/image/metric/CancelRQHandler.java index f1abdf3b3a..decf9ee416 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/CancelRQHandler.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/CancelRQHandler.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface CancelRQHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/Commands.java b/bus-image/src/main/java/org/aoju/bus/image/metric/Commands.java index 63a7f00e30..b95e380a19 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/Commands.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/Commands.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Commands { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/Compatible.java b/bus-image/src/main/java/org/aoju/bus/image/metric/Compatible.java index 3053835b0c..3625a69627 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/Compatible.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/Compatible.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Compatible { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/Connection.java b/bus-image/src/main/java/org/aoju/bus/image/metric/Connection.java index 7a5bcba8f7..d892f361d1 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/Connection.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/Connection.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; @@ -51,7 +52,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Connection implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/DataWriter.java b/bus-image/src/main/java/org/aoju/bus/image/metric/DataWriter.java index 84ff62c952..2dfda18175 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/DataWriter.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/DataWriter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface DataWriter { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/DataWriterAdapter.java b/bus-image/src/main/java/org/aoju/bus/image/metric/DataWriterAdapter.java index 2ec06d24bc..4017dde20d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/DataWriterAdapter.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/DataWriterAdapter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DataWriterAdapter implements DataWriter { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/DefaultEditors.java b/bus-image/src/main/java/org/aoju/bus/image/metric/DefaultEditors.java index 7a9af82113..1228827e50 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/DefaultEditors.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/DefaultEditors.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DefaultEditors implements Editors { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/DimseRQHandler.java b/bus-image/src/main/java/org/aoju/bus/image/metric/DimseRQHandler.java index a7721c0266..bfe9fc8b6a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/DimseRQHandler.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/DimseRQHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface DimseRQHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/DimseRSP.java b/bus-image/src/main/java/org/aoju/bus/image/metric/DimseRSP.java index e2239588d9..b58ab8a278 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/DimseRSP.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/DimseRSP.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface DimseRSP { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/DimseRSPHandler.java b/bus-image/src/main/java/org/aoju/bus/image/metric/DimseRSPHandler.java index f6cc7eec32..3314be9c70 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/DimseRSPHandler.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/DimseRSPHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DimseRSPHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/FutureDimseRSP.java b/bus-image/src/main/java/org/aoju/bus/image/metric/FutureDimseRSP.java index e11e2353eb..779fc71319 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/FutureDimseRSP.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/FutureDimseRSP.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FutureDimseRSP extends DimseRSPHandler implements DimseRSP { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/IdentityNegotiator.java b/bus-image/src/main/java/org/aoju/bus/image/metric/IdentityNegotiator.java index 993c37cc9b..50ebc175a6 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/IdentityNegotiator.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/IdentityNegotiator.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface IdentityNegotiator { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/ImageException.java b/bus-image/src/main/java/org/aoju/bus/image/metric/ImageException.java index e2af986d1b..abb9ee48f9 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/ImageException.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/ImageException.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; @@ -36,7 +37,7 @@ * 自定义异常: 影像异常 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ImageException extends RelevantException { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/InputStreamWriter.java b/bus-image/src/main/java/org/aoju/bus/image/metric/InputStreamWriter.java index e10d796992..343df49164 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/InputStreamWriter.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/InputStreamWriter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class InputStreamWriter implements DataWriter { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/KeycloakClient.java b/bus-image/src/main/java/org/aoju/bus/image/metric/KeycloakClient.java index 69fba294f7..b2c806633c 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/KeycloakClient.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/KeycloakClient.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ * @since April 2019 */ diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/Monitoring.java b/bus-image/src/main/java/org/aoju/bus/image/metric/Monitoring.java index 8515b9cc9f..2d6c2e2714 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/Monitoring.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/Monitoring.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Monitoring { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/PDVInputStream.java b/bus-image/src/main/java/org/aoju/bus/image/metric/PDVInputStream.java index 9bc33975af..6fbb8b5b61 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/PDVInputStream.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/PDVInputStream.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class PDVInputStream extends InputStream { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/PDVOutputStream.java b/bus-image/src/main/java/org/aoju/bus/image/metric/PDVOutputStream.java index 0215971fcc..e6e782e1cc 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/PDVOutputStream.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/PDVOutputStream.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class PDVOutputStream extends OutputStream { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/Progress.java b/bus-image/src/main/java/org/aoju/bus/image/metric/Progress.java index b5d3fa9880..d5c5d83ad1 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/Progress.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/Progress.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Progress implements CancelListener { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/ProgressListener.java b/bus-image/src/main/java/org/aoju/bus/image/metric/ProgressListener.java index 9eab8d1bfa..fbcdddab72 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/ProgressListener.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/ProgressListener.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface ProgressListener { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/Readable.java b/bus-image/src/main/java/org/aoju/bus/image/metric/Readable.java index d62330e58c..a83f704511 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/Readable.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/Readable.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Readable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/SSLManagerFactory.java b/bus-image/src/main/java/org/aoju/bus/image/metric/SSLManagerFactory.java index 8f12152bae..6ff353bac0 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/SSLManagerFactory.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/SSLManagerFactory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; @@ -42,7 +43,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class SSLManagerFactory { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/SocketListener.java b/bus-image/src/main/java/org/aoju/bus/image/metric/SocketListener.java index 2a5d4fd209..a949fb1eee 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/SocketListener.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/SocketListener.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface SocketListener extends Closeable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/StorageOptions.java b/bus-image/src/main/java/org/aoju/bus/image/metric/StorageOptions.java index ebed8b2bd7..035ca59969 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/StorageOptions.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/StorageOptions.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class StorageOptions implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/TagCamel.java b/bus-image/src/main/java/org/aoju/bus/image/metric/TagCamel.java index f87c6a85bb..c0160ed9f0 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/TagCamel.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/TagCamel.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; @@ -52,7 +53,7 @@ * 这些标记的作用是提供公共标记(DICOM和non DICOM)的高级可访问性 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TagCamel implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/TagValue.java b/bus-image/src/main/java/org/aoju/bus/image/metric/TagValue.java index 9009c64c00..db1ab9662e 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/TagValue.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/TagValue.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; @@ -38,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class TagValue { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/TagView.java b/bus-image/src/main/java/org/aoju/bus/image/metric/TagView.java index 4b4e6e5f84..ea3c7b6850 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/TagView.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/TagView.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TagView { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/Tagable.java b/bus-image/src/main/java/org/aoju/bus/image/metric/Tagable.java index 5b433b180f..90c54bd69a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/Tagable.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/Tagable.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Tagable extends Readable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/Thumbnail.java b/bus-image/src/main/java/org/aoju/bus/image/metric/Thumbnail.java index dd809cb047..a93a0a3d03 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/Thumbnail.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/Thumbnail.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Thumbnail { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/Timeout.java b/bus-image/src/main/java/org/aoju/bus/image/metric/Timeout.java index 4cfc7c6983..209b3c941c 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/Timeout.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/Timeout.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Timeout implements Runnable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/TransferCapability.java b/bus-image/src/main/java/org/aoju/bus/image/metric/TransferCapability.java index 27c0acf0c0..1f00e7a61c 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/TransferCapability.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/TransferCapability.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; @@ -37,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TransferCapability implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/WebApplication.java b/bus-image/src/main/java/org/aoju/bus/image/metric/WebApplication.java index c25f302a50..3ef9d6d541 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/WebApplication.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/WebApplication.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class WebApplication { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/AEExtension.java b/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/AEExtension.java index 05b92eb9b9..2ebb933fb3 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/AEExtension.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/AEExtension.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.acquire; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AEExtension implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/DeviceExtension.java b/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/DeviceExtension.java index 3bf64c7300..d181ab53e9 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/DeviceExtension.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/DeviceExtension.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.acquire; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DeviceExtension implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/HL7ApplicationExtension.java b/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/HL7ApplicationExtension.java index d37203fef3..21835abc5b 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/HL7ApplicationExtension.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/HL7ApplicationExtension.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.acquire; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HL7ApplicationExtension implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/HL7DeviceExtension.java b/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/HL7DeviceExtension.java index 5f99a30058..244dd19686 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/HL7DeviceExtension.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/HL7DeviceExtension.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.acquire; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HL7DeviceExtension extends DeviceExtension { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/ImageReaderExtension.java b/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/ImageReaderExtension.java index fd361a2157..0a2ecf11b8 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/ImageReaderExtension.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/ImageReaderExtension.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.acquire; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ImageReaderExtension extends DeviceExtension { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/ImageWriterExtension.java b/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/ImageWriterExtension.java index a74e924bd8..984a93c49d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/ImageWriterExtension.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/ImageWriterExtension.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.acquire; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ImageWriterExtension extends DeviceExtension { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/DefaultHL7Listener.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/DefaultHL7Listener.java index 6ed7a5712e..678e05bb2c 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/DefaultHL7Listener.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/DefaultHL7Listener.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.hl7; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DefaultHL7Listener implements HL7MessageListener { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/DefaultHL7Service.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/DefaultHL7Service.java index 72c151a115..a36467de4e 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/DefaultHL7Service.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/DefaultHL7Service.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.hl7; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DefaultHL7Service extends DefaultHL7Listener diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/Delimiter.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/Delimiter.java index fb0fc91fe1..bf6ad4a111 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/Delimiter.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/Delimiter.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.hl7; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum Delimiter { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/ERRSegment.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/ERRSegment.java index ad149556ce..bf277854fc 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/ERRSegment.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/ERRSegment.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.hl7; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ERRSegment extends HL7Segment { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Application.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Application.java index 8605e20d77..a7d4a3b1e0 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Application.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Application.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.hl7; @@ -41,7 +42,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HL7Application implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ApplicationCache.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ApplicationCache.java index 3ba32c58eb..97bc5a5605 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ApplicationCache.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ApplicationCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.hl7; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HL7ApplicationCache extends ConfigurationCache diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ApplicationInfo.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ApplicationInfo.java index 29f34c34bc..131f807b35 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ApplicationInfo.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ApplicationInfo.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.hl7; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HL7ApplicationInfo implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Charset.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Charset.java index eaddf6b5e3..53ad1316bc 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Charset.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Charset.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.hl7; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class HL7Charset { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Configuration.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Configuration.java index 9379242ac8..7454b9e50c 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Configuration.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Configuration.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.hl7; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface HL7Configuration { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Connection.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Connection.java index ae6fae4e81..1e24ef5330 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Connection.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Connection.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.hl7; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HL7Connection implements Closeable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ConnectionMonitor.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ConnectionMonitor.java index c8fca6a428..eec9b1929d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ConnectionMonitor.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ConnectionMonitor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.hl7; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface HL7ConnectionMonitor { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ContentHandler.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ContentHandler.java index 2ea188aa5a..db65d21864 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ContentHandler.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ContentHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.hl7; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HL7ContentHandler extends DefaultHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Exception.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Exception.java index 91736c125a..2b89a3c817 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Exception.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Exception.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.hl7; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HL7Exception extends Exception { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Handler.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Handler.java index 524ec4ef1e..772eac4e7b 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Handler.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Handler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.hl7; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum HL7Handler implements TCPHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Message.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Message.java index efad0e0ff5..0d5b4e931c 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Message.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Message.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.hl7; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HL7Message extends ArrayList { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7MessageListener.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7MessageListener.java index 576e654cdc..00ae824174 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7MessageListener.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7MessageListener.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.hl7; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface HL7MessageListener { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Parser.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Parser.java index 4ef8d1599e..997f9f5a2f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Parser.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Parser.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.hl7; @@ -37,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HL7Parser { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Segment.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Segment.java index 7f56d308a0..66500a6ced 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Segment.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Segment.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.hl7; @@ -39,7 +40,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HL7Segment implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Service.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Service.java index ee147e982f..43b58238a8 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Service.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Service.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.hl7; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface HL7Service extends HL7MessageListener { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ServiceRegistry.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ServiceRegistry.java index fc8c5f3408..aa9f0877bd 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ServiceRegistry.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ServiceRegistry.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.hl7; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HL7ServiceRegistry extends DefaultHL7Listener { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/IHL7ApplicationCache.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/IHL7ApplicationCache.java index b60a8f9f7b..d95eacefaa 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/IHL7ApplicationCache.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/IHL7ApplicationCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.hl7; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface IHL7ApplicationCache { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/MLLPConnection.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/MLLPConnection.java index 23fdcc5644..0339cf59bf 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/MLLPConnection.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/MLLPConnection.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.hl7; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MLLPConnection implements Closeable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/MLLPInputStream.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/MLLPInputStream.java index c77e29aba3..736b8c0c3e 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/MLLPInputStream.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/MLLPInputStream.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.hl7; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MLLPInputStream extends BufferedInputStream { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/MLLPOutputStream.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/MLLPOutputStream.java index de5749327a..0c6259c611 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/MLLPOutputStream.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/MLLPOutputStream.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.hl7; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MLLPOutputStream extends FilterOutputStream { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/UnparsedHL7Message.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/UnparsedHL7Message.java index 537a3d802f..aac9789f88 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/UnparsedHL7Message.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/UnparsedHL7Message.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.hl7; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class UnparsedHL7Message implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/net/TCPHandler.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/net/TCPHandler.java index 738aad068b..76bf4b3958 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/net/TCPHandler.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/net/TCPHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.net; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface TCPHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/net/TCPListener.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/net/TCPListener.java index 6cceb6e7c5..6bd2d05d9a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/net/TCPListener.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/net/TCPListener.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.net; @@ -42,7 +43,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TCPListener implements SocketListener { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/net/UDPHandler.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/net/UDPHandler.java index 364a0a1cd7..d9cedf54c4 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/net/UDPHandler.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/net/UDPHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.net; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface UDPHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/net/UDPListener.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/net/UDPListener.java index f657476277..538f647e21 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/net/UDPListener.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/net/UDPListener.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.net; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class UDPListener implements SocketListener { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAbort.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAbort.java index 69c3dca09f..e9734903aa 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAbort.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAbort.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.pdu; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AAbort extends IOException { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAssociateAC.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAssociateAC.java index f2b0cfd9d9..5015d12263 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAssociateAC.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAssociateAC.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.pdu; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AAssociateAC extends AAssociateRQAC { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAssociateRJ.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAssociateRJ.java index 7b0ae92544..05858cdafd 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAssociateRJ.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAssociateRJ.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.pdu; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AAssociateRJ extends IOException { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAssociateRQ.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAssociateRQ.java index 76c8c42cc6..8d79118d92 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAssociateRQ.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAssociateRQ.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.pdu; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AAssociateRQ extends AAssociateRQAC { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAssociateRQAC.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAssociateRQAC.java index ea1b3e89e0..f0aaec2f25 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAssociateRQAC.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAssociateRQAC.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.pdu; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AAssociateRQAC { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/CommonExtended.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/CommonExtended.java index e3c68cc677..2198160481 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/CommonExtended.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/CommonExtended.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.pdu; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CommonExtended { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/ExtendedNegotiate.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/ExtendedNegotiate.java index 55194f6d0e..2eb15f94a6 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/ExtendedNegotiate.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/ExtendedNegotiate.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.pdu; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ExtendedNegotiate { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/IdentityAC.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/IdentityAC.java index 2a64025024..be4fe3e67a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/IdentityAC.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/IdentityAC.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.pdu; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class IdentityAC { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/IdentityRQ.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/IdentityRQ.java index 1ef2c6bd46..d46c294fcb 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/IdentityRQ.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/IdentityRQ.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.pdu; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class IdentityRQ { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/PDUDecoder.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/PDUDecoder.java index 7c3b88c4ce..2c374994b5 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/PDUDecoder.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/PDUDecoder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.pdu; @@ -49,7 +50,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PDUDecoder extends PDVInputStream { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/PDUEncoder.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/PDUEncoder.java index c20d0ce071..ae3ed9b2a8 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/PDUEncoder.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/PDUEncoder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.pdu; @@ -40,7 +41,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PDUEncoder extends PDVOutputStream { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/Presentation.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/Presentation.java index 5451956fad..cc51c2a461 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/Presentation.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/Presentation.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.pdu; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Presentation { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/RoleSelection.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/RoleSelection.java index eb06de3d45..031eb414a3 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/RoleSelection.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/RoleSelection.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.pdu; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RoleSelection { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AcceptObjectsRequest.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AcceptObjectsRequest.java index 2b7165c148..c7a620f032 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AcceptObjectsRequest.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AcceptObjectsRequest.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ActionType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ActionType.java index 9f952431dc..cb4f129cf6 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ActionType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ActionType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AdhocQueryQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AdhocQueryQueryType.java index f1a3d21823..e5d83d63b0 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AdhocQueryQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AdhocQueryQueryType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AdhocQueryRequest.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AdhocQueryRequest.java index 6b47ac9a8b..c463cf6852 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AdhocQueryRequest.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AdhocQueryRequest.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AdhocQueryResponse.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AdhocQueryResponse.java index 2488015f71..a3430f015c 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AdhocQueryResponse.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AdhocQueryResponse.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AdhocQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AdhocQueryType.java index ba8727ef96..8f777a4831 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AdhocQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AdhocQueryType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ApproveObjectsRequest.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ApproveObjectsRequest.java index b3872ccfb9..a5a3b18ac7 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ApproveObjectsRequest.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ApproveObjectsRequest.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AssociationBuilder.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AssociationBuilder.java index b0842f6d38..cd0d1034a3 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AssociationBuilder.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AssociationBuilder.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AssociationBuilder { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AssociationQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AssociationQueryType.java index 7ffd88c3cb..9005bf3ad1 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AssociationQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AssociationQueryType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AssociationType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AssociationType.java index 30b10655ef..da1a9646b9 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AssociationType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AssociationType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AuditableEventQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AuditableEventQueryType.java index 616040ef41..2bc103d88f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AuditableEventQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AuditableEventQueryType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AuditableEventType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AuditableEventType.java index 351940dad5..79f0b8aaba 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AuditableEventType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AuditableEventType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/BooleanFilterType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/BooleanFilterType.java index 8cf14832a0..e952db0e24 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/BooleanFilterType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/BooleanFilterType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/BranchType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/BranchType.java index 043bfd9368..ff5905b19e 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/BranchType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/BranchType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationBuilder.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationBuilder.java index e46a37230b..85a770c7c2 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationBuilder.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ClassificationBuilder { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationNodeQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationNodeQueryType.java index 825bc5a18f..fca37b0841 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationNodeQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationNodeQueryType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationNodeType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationNodeType.java index f9fa6a9b93..7984f82afd 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationNodeType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationNodeType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationQueryType.java index 80fcb4de21..39802d54a6 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationQueryType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationSchemeQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationSchemeQueryType.java index 6d73b1085e..ca6ada0594 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationSchemeQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationSchemeQueryType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationSchemeType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationSchemeType.java index 85dc4f1d61..d924917799 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationSchemeType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationSchemeType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationType.java index 7b53d2c977..92723b5950 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/CompoundFilterType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/CompoundFilterType.java index 1e6ab211ee..90b46e695a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/CompoundFilterType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/CompoundFilterType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/DateTimeFilterType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/DateTimeFilterType.java index 2eec6b98c8..d086b62614 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/DateTimeFilterType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/DateTimeFilterType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/DeprecateObjectsRequest.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/DeprecateObjectsRequest.java index 15e30d2f93..cd6c954b36 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/DeprecateObjectsRequest.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/DeprecateObjectsRequest.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/DocumentRepositoryPortType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/DocumentRepositoryPortType.java index e7b49482e3..18631b1389 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/DocumentRepositoryPortType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/DocumentRepositoryPortType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @WebService(targetNamespace = "urn:ihe:iti:xds-b:2007", name = "DocumentRepository_PortType") diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/DocumentRepositoryService.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/DocumentRepositoryService.java index f9ff6a8e33..d4ab4e21bd 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/DocumentRepositoryService.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/DocumentRepositoryService.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @WebServiceClient(name = "DocumentRepository_Service", wsdlLocation = "/wsdl/XDS.b_DocumentRepository.wsdl", targetNamespace = "urn:ihe:iti:xds-b:2007") diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/EmailAddressType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/EmailAddressType.java index 7b591231cd..c9ce0ce7d9 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/EmailAddressType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/EmailAddressType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/EnsureMustUnderstandHandler.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/EnsureMustUnderstandHandler.java index 7cff5c9fc4..4ccea03b3e 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/EnsureMustUnderstandHandler.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/EnsureMustUnderstandHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class EnsureMustUnderstandHandler implements SOAPHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalIdentifierBuilder.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalIdentifierBuilder.java index ffeb8dc864..18e0eda654 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalIdentifierBuilder.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalIdentifierBuilder.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ExternalIdentifierBuilder { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalIdentifierQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalIdentifierQueryType.java index fb948764ee..05809cc420 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalIdentifierQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalIdentifierQueryType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalIdentifierType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalIdentifierType.java index a3ceea2818..42d85a5a58 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalIdentifierType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalIdentifierType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalLinkQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalLinkQueryType.java index 7d965c106d..72289d6427 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalLinkQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalLinkQueryType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalLinkType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalLinkType.java index 335a912365..aabc71d26a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalLinkType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalLinkType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExtrinsicObjectQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExtrinsicObjectQueryType.java index d7d3521c85..3e59e775ee 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExtrinsicObjectQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExtrinsicObjectQueryType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExtrinsicObjectType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExtrinsicObjectType.java index 0ca1bd6e11..7fb94b5df5 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExtrinsicObjectType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExtrinsicObjectType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FederationQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FederationQueryType.java index a5ed93339b..773752b64f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FederationQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FederationQueryType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FederationType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FederationType.java index be146f151c..2f31d360a0 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FederationType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FederationType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FilterQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FilterQueryType.java index f212d16ddb..0d9c1b1977 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FilterQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FilterQueryType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FilterType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FilterType.java index cee277d992..31f723503d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FilterType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FilterType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FloatFilterType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FloatFilterType.java index 61fc2a88bf..f37d629b03 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FloatFilterType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FloatFilterType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/IdentifiableType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/IdentifiableType.java index d06661b2ad..084fc0c537 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/IdentifiableType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/IdentifiableType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ImagingDocumentSource.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ImagingDocumentSource.java index b60fe80d3b..cfc1ca0602 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ImagingDocumentSource.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ImagingDocumentSource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @WebServiceClient(name = "ImagingDocumentSource", wsdlLocation = "/wsdl/XDS-I.b_ImagingDocumentSource.wsdl", targetNamespace = "urn:ihe:rad:xdsi-b:2009") diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ImagingDocumentSourcePortType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ImagingDocumentSourcePortType.java index fb6199a205..c1daa13e9e 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ImagingDocumentSourcePortType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ImagingDocumentSourcePortType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @WebService(targetNamespace = "urn:ihe:rad:xdsi-b:2009", name = "ImagingDocumentSource_PortType") diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/IntegerFilterType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/IntegerFilterType.java index cf12e931e2..81aed8f2f1 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/IntegerFilterType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/IntegerFilterType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/InternationalStringBranchType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/InternationalStringBranchType.java index 54ad3c0da0..4bccc2d2b9 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/InternationalStringBranchType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/InternationalStringBranchType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/InternationalStringBuilder.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/InternationalStringBuilder.java index 3648a27730..a1b39fe838 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/InternationalStringBuilder.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/InternationalStringBuilder.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class InternationalStringBuilder { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/InternationalStringType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/InternationalStringType.java index 14f825bcc1..21fbf7100e 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/InternationalStringType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/InternationalStringType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/LocalizedStringType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/LocalizedStringType.java index 0baf3b3aa6..fe6a22149a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/LocalizedStringType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/LocalizedStringType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/NotificationQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/NotificationQueryType.java index 29367e7b7b..6d405011fe 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/NotificationQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/NotificationQueryType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/NotificationType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/NotificationType.java index 5407483db3..ec3e514b97 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/NotificationType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/NotificationType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/NotifyActionType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/NotifyActionType.java index 634442e4c1..69db9f3177 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/NotifyActionType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/NotifyActionType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ObjectFactory.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ObjectFactory.java index 0f4f498bb4..caed7b43b6 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ObjectFactory.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ObjectFactory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlRegistry diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ObjectRefListType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ObjectRefListType.java index e00878ccec..2373c8919a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ObjectRefListType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ObjectRefListType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ObjectRefType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ObjectRefType.java index 3b458122b2..7fd98cd716 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ObjectRefType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ObjectRefType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/OrganizationQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/OrganizationQueryType.java index e880961a16..96dd8d3f61 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/OrganizationQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/OrganizationQueryType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/OrganizationType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/OrganizationType.java index 4ac091b6ba..e47e5d5501 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/OrganizationType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/OrganizationType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/PersonNameType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/PersonNameType.java index 09cfb2331a..408d434ca0 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/PersonNameType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/PersonNameType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/PersonQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/PersonQueryType.java index 947b7e229f..8ef2b77515 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/PersonQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/PersonQueryType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/PersonType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/PersonType.java index 5bc0640edf..9ffdb283cc 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/PersonType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/PersonType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/PostalAddressType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/PostalAddressType.java index 58db02b3a3..b0754cfb5a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/PostalAddressType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/PostalAddressType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ProvideAndRegisterDocumentSetRequestType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ProvideAndRegisterDocumentSetRequestType.java index c81e6b5f09..c79e909f2b 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ProvideAndRegisterDocumentSetRequestType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ProvideAndRegisterDocumentSetRequestType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/QueryExpressionBranchType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/QueryExpressionBranchType.java index 1a398404a0..bdd8f60471 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/QueryExpressionBranchType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/QueryExpressionBranchType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/QueryExpressionType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/QueryExpressionType.java index a8669b7dd1..6e03de6646 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/QueryExpressionType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/QueryExpressionType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryError.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryError.java index 76971a4888..c033f2eff6 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryError.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryError.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryErrorList.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryErrorList.java index c3cae8b707..c001ec4318 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryErrorList.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryErrorList.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryObjectListType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryObjectListType.java index 63689503c8..accc9e1eaa 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryObjectListType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryObjectListType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryObjectQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryObjectQueryType.java index 03df4ae741..f44b9b1fbf 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryObjectQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryObjectQueryType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryObjectType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryObjectType.java index 1a7c0bc1fe..59a3da362f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryObjectType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryObjectType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryPackageQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryPackageQueryType.java index 7ba9a9c490..562f1614ca 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryPackageQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryPackageQueryType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryPackageType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryPackageType.java index 2d0a13adec..c4e9eec5e5 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryPackageType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryPackageType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryQueryType.java index f2470e66f1..0b75b954a6 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryQueryType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryRequestType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryRequestType.java index 6861fd5b37..24efd23696 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryRequestType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryRequestType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryResponseType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryResponseType.java index 9c7cb7130d..d4eddc0b51 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryResponseType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryResponseType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryType.java index c7f4fe9796..3c0201ae53 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RelocateObjectsRequest.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RelocateObjectsRequest.java index 7ba1d4e14b..2166d02952 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RelocateObjectsRequest.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RelocateObjectsRequest.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RemoveObjectsRequest.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RemoveObjectsRequest.java index 81bbfd010e..73972783c2 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RemoveObjectsRequest.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RemoveObjectsRequest.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ResponseOptionType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ResponseOptionType.java index fd49ed6837..b85a6b8376 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ResponseOptionType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ResponseOptionType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveDocumentSetRequestType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveDocumentSetRequestType.java index e3fa699078..5a46cdd9c7 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveDocumentSetRequestType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveDocumentSetRequestType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveDocumentSetResponseType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveDocumentSetResponseType.java index 9e2b7689b7..3fde876b3d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveDocumentSetResponseType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveDocumentSetResponseType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveImagingDocumentSetRequestType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveImagingDocumentSetRequestType.java index 2e8c664cd5..5d923c4c89 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveImagingDocumentSetRequestType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveImagingDocumentSetRequestType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveRenderedImagingDocumentSetRequestType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveRenderedImagingDocumentSetRequestType.java index b1fb1a2f87..234c10a344 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveRenderedImagingDocumentSetRequestType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveRenderedImagingDocumentSetRequestType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveRenderedImagingDocumentSetResponseType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveRenderedImagingDocumentSetResponseType.java index fe094ae238..be95c54a1e 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveRenderedImagingDocumentSetResponseType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveRenderedImagingDocumentSetResponseType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ServiceBindingQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ServiceBindingQueryType.java index 403dc0fef3..ebdbf7efc8 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ServiceBindingQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ServiceBindingQueryType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ServiceBindingType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ServiceBindingType.java index 46490fe4a7..b5013cbc8c 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ServiceBindingType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ServiceBindingType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ServiceQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ServiceQueryType.java index e37c2adfdf..ca26d08397 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ServiceQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ServiceQueryType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ServiceType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ServiceType.java index 8ec97608e9..c464861b2d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ServiceType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ServiceType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SimpleFilterType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SimpleFilterType.java index 25b708258b..0d6f48c8ad 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SimpleFilterType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SimpleFilterType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SlotBranchType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SlotBranchType.java index 3b1ee6d94d..b8afc9a12d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SlotBranchType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SlotBranchType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SlotBuilder.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SlotBuilder.java index 7835cba17d..9bb909fd24 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SlotBuilder.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SlotBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SlotBuilder { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SlotListType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SlotListType.java index b84eaa94d4..c3582f7af2 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SlotListType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SlotListType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SlotType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SlotType.java index 2cc08c30d8..460753ace5 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SlotType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SlotType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SpecificationLinkQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SpecificationLinkQueryType.java index 56ac2cf393..2a8d9f644a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SpecificationLinkQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SpecificationLinkQueryType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SpecificationLinkType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SpecificationLinkType.java index 830f9ce656..6ffe68ff4c 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SpecificationLinkType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SpecificationLinkType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/StringFilterType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/StringFilterType.java index 31ac7c471c..c48a3c49f1 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/StringFilterType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/StringFilterType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SubmitObjectsRequest.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SubmitObjectsRequest.java index 88e2da37a6..75924f9d59 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SubmitObjectsRequest.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SubmitObjectsRequest.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SubscriptionQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SubscriptionQueryType.java index 7a886586d4..525dacfe0f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SubscriptionQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SubscriptionQueryType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SubscriptionType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SubscriptionType.java index 186e334c89..561d81d239 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SubscriptionType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SubscriptionType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/TelephoneNumberListType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/TelephoneNumberListType.java index 54198cfa6a..409e5b64a4 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/TelephoneNumberListType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/TelephoneNumberListType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/TelephoneNumberType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/TelephoneNumberType.java index 3bf1aeb6d3..3ad7bc0f7f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/TelephoneNumberType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/TelephoneNumberType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/UndeprecateObjectsRequest.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/UndeprecateObjectsRequest.java index ab2640cda4..0f8933ca60 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/UndeprecateObjectsRequest.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/UndeprecateObjectsRequest.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/UpdateObjectsRequest.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/UpdateObjectsRequest.java index 5dbc97a17f..f8e933fdb1 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/UpdateObjectsRequest.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/UpdateObjectsRequest.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/UserQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/UserQueryType.java index 388aee33f0..dba338c648 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/UserQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/UserQueryType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/UserType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/UserType.java index 8732362306..b00eee6497 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/UserType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/UserType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ValueListType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ValueListType.java index d23eaa88d9..67040a22c6 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ValueListType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ValueListType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/VersionInfoType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/VersionInfoType.java index 900a3ae3f5..bcde42898e 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/VersionInfoType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/VersionInfoType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/WSSESecurityUnderstandPretender.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/WSSESecurityUnderstandPretender.java index 61a65406e0..ce884ea6c5 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/WSSESecurityUnderstandPretender.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/WSSESecurityUnderstandPretender.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class WSSESecurityUnderstandPretender implements SOAPHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/XDSConstants.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/XDSConstants.java index e15a501faf..eea71879f8 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/XDSConstants.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/XDSConstants.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.internal.xdsi; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface XDSConstants { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/service/AbstractService.java b/bus-image/src/main/java/org/aoju/bus/image/metric/service/AbstractService.java index 42f81dae23..70550339ab 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/service/AbstractService.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/service/AbstractService.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.service; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractService implements ImageService { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCEchoSCP.java b/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCEchoSCP.java index fd10341524..f76a729f82 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCEchoSCP.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCEchoSCP.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.service; @@ -37,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BasicCEchoSCP extends AbstractService { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCFindSCP.java b/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCFindSCP.java index 9f23bfb827..0f880728ff 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCFindSCP.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCFindSCP.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.service; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BasicCFindSCP extends AbstractService { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCGetSCP.java b/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCGetSCP.java index 010634caaa..679032b178 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCGetSCP.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCGetSCP.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.service; @@ -36,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BasicCGetSCP extends AbstractService { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCMoveSCP.java b/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCMoveSCP.java index f4cb380945..cb14229835 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCMoveSCP.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCMoveSCP.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.service; @@ -36,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BasicCMoveSCP extends AbstractService { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCStoreSCP.java b/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCStoreSCP.java index 852e694648..e7ba7b2e06 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCStoreSCP.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCStoreSCP.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.service; @@ -38,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BasicCStoreSCP extends AbstractService { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicMPPSSCP.java b/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicMPPSSCP.java index d8dc791ca6..df907644c3 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicMPPSSCP.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicMPPSSCP.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.service; @@ -37,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BasicMPPSSCP extends AbstractService { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicQuery.java b/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicQuery.java index 49cfc43afb..c95cf998d7 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicQuery.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicQuery.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.service; @@ -38,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BasicQuery implements Query { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicRetrieve.java b/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicRetrieve.java index 6afb4b76d2..6f79990e17 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicRetrieve.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicRetrieve.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.service; @@ -44,7 +45,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BasicRetrieve implements Retrieve { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/service/ImageService.java b/bus-image/src/main/java/org/aoju/bus/image/metric/service/ImageService.java index 1e2e054cbd..22defc420d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/service/ImageService.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/service/ImageService.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.service; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface ImageService extends DimseRQHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/service/Instance.java b/bus-image/src/main/java/org/aoju/bus/image/metric/service/Instance.java index 3c2d0c4c6e..f490686bee 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/service/Instance.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/service/Instance.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.service; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Instance implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/service/Level.java b/bus-image/src/main/java/org/aoju/bus/image/metric/service/Level.java index aefd5dc5d6..0651e0834d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/service/Level.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/service/Level.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.service; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum Level { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/service/Query.java b/bus-image/src/main/java/org/aoju/bus/image/metric/service/Query.java index efa4ed65a1..15586619e5 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/service/Query.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/service/Query.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.service; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Query extends Runnable, CancelRQHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/service/Retrieve.java b/bus-image/src/main/java/org/aoju/bus/image/metric/service/Retrieve.java index bf14684843..444aa673be 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/service/Retrieve.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/service/Retrieve.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.service; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Retrieve extends Runnable, CancelRQHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/service/ServiceHandler.java b/bus-image/src/main/java/org/aoju/bus/image/metric/service/ServiceHandler.java index 695df61dfe..b5a07798d1 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/service/ServiceHandler.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/service/ServiceHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.metric.service; @@ -43,7 +44,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ServiceHandler implements DimseRQHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/BufferedImages.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/BufferedImages.java index a4a148e4d2..1939a8285f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/BufferedImages.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/BufferedImages.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BufferedImages { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/ByteLookupTable.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/ByteLookupTable.java index 442e78a3c7..4eebd97e54 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/ByteLookupTable.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/ByteLookupTable.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ByteLookupTable extends LookupTable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/ColorModelFactory.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/ColorModelFactory.java index 4112c303a6..3421445411 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/ColorModelFactory.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/ColorModelFactory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble; @@ -36,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ColorModelFactory { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/ColorSubsampling.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/ColorSubsampling.java index 2519692004..31d67b0a3c 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/ColorSubsampling.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/ColorSubsampling.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum ColorSubsampling { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/DicomMetaData.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/DicomMetaData.java index 3d0ffda50c..c42dd572e9 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/DicomMetaData.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/DicomMetaData.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DicomMetaData extends IIOMetadata { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/LookupTable.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/LookupTable.java index 5d71e2a609..585a1367d8 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/LookupTable.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/LookupTable.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class LookupTable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/LookupTableFactory.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/LookupTableFactory.java index 7c9b365c2e..066f5a1a68 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/LookupTableFactory.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/LookupTableFactory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class LookupTableFactory { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/Overlays.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/Overlays.java index 31637b5aa0..fc423dee19 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/Overlays.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/Overlays.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Overlays { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/PaletteColorModel.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/PaletteColorModel.java index 44d204a926..7d50e87b8f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/PaletteColorModel.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/PaletteColorModel.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PaletteColorModel extends ColorModel { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/Photometric.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/Photometric.java index f44de8253e..5974e9582e 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/Photometric.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/Photometric.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum Photometric { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/PixelAspectRatio.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/PixelAspectRatio.java index a1fe2568de..cc0b21d108 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/PixelAspectRatio.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/PixelAspectRatio.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PixelAspectRatio { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/SampledColorModel.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/SampledColorModel.java index cfe5b111e0..11308bb274 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/SampledColorModel.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/SampledColorModel.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SampledColorModel extends ColorModel { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/SampledSampleModel.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/SampledSampleModel.java index fe4bf042a1..80b17e7453 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/SampledSampleModel.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/SampledSampleModel.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SampledSampleModel extends SampleModel { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/ShortLookupTable.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/ShortLookupTable.java index e306f1e1b2..a9576142ed 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/ShortLookupTable.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/ShortLookupTable.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ShortLookupTable extends LookupTable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/StoredValue.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/StoredValue.java index 843dfedebe..e73363aad5 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/StoredValue.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/StoredValue.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class StoredValue { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/YBR.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/YBR.java index 2a41036b21..900d33dc24 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/YBR.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/YBR.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum YBR { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/YBRColorSpace.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/YBRColorSpace.java index 749c09a117..5c482838b5 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/YBRColorSpace.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/YBRColorSpace.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class YBRColorSpace extends ColorSpace { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/BytesWithImageDescriptor.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/BytesWithImageDescriptor.java index 36064e2b20..1de0a3f7b7 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/BytesWithImageDescriptor.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/BytesWithImageDescriptor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.codec; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface BytesWithImageDescriptor { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/CompressionRule.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/CompressionRule.java index 87372ed205..f59f6c2d8a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/CompressionRule.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/CompressionRule.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.codec; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CompressionRule implements Comparable, Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/CompressionRules.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/CompressionRules.java index a9695cb5fc..21d4a6a4c2 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/CompressionRules.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/CompressionRules.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.codec; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CompressionRules implements Iterable, Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/Compressor.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/Compressor.java index 82177df23f..9be2917308 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/Compressor.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/Compressor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.codec; @@ -48,7 +49,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Compressor extends Decompressor implements Closeable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/Decompressor.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/Decompressor.java index 5c5ff2e43a..92a961c453 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/Decompressor.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/Decompressor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.codec; @@ -48,7 +49,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Decompressor { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/ExtMemoryOutputStream.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/ExtMemoryOutputStream.java index f93151e528..ff00806973 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/ExtMemoryOutputStream.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/ExtMemoryOutputStream.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.codec; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ final class ExtMemoryOutputStream extends MemoryCacheImageOutputStream diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/FormatNameFilterIterator.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/FormatNameFilterIterator.java index 0804adfb6c..a6a2c747ad 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/FormatNameFilterIterator.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/FormatNameFilterIterator.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.codec; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ * @since Jul 2015 */ diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/ImageDescriptor.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/ImageDescriptor.java index 39ec1a1801..749fafff4c 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/ImageDescriptor.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/ImageDescriptor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.codec; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class ImageDescriptor { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/ImageReaderFactory.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/ImageReaderFactory.java index 7334a5b937..c9c1415fdf 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/ImageReaderFactory.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/ImageReaderFactory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.codec; @@ -43,7 +44,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ImageReaderFactory implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/ImageWriterFactory.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/ImageWriterFactory.java index c1594d79c1..de8b3bf0d7 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/ImageWriterFactory.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/ImageWriterFactory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.codec; @@ -42,7 +43,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ImageWriterFactory implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/Transcoder.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/Transcoder.java index dc3034600a..63fdf52608 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/Transcoder.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/Transcoder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.codec; @@ -50,7 +51,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Transcoder implements Closeable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/TransferSyntaxType.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/TransferSyntaxType.java index 517338505a..5a00c309f3 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/TransferSyntaxType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/TransferSyntaxType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.codec; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum TransferSyntaxType { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/JPEG.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/JPEG.java index d96767df03..e5248a7620 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/JPEG.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/JPEG.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.codec.jpeg; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JPEG { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/JPEGHeader.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/JPEGHeader.java index 260b8b68d5..94cf3f3723 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/JPEGHeader.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/JPEGHeader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.codec.jpeg; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JPEGHeader { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/JPEGLSCodingParam.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/JPEGLSCodingParam.java index 75a7231fed..bbc42116e6 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/JPEGLSCodingParam.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/JPEGLSCodingParam.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.codec.jpeg; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JPEGLSCodingParam { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/PatchJPEGLS.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/PatchJPEGLS.java index 89a9a8592b..ea6ae52944 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/PatchJPEGLS.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/PatchJPEGLS.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.codec.jpeg; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum PatchJPEGLS { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/PatchJPEGLSImageInputStream.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/PatchJPEGLSImageInputStream.java index fd7afe5dcd..d5bcf1a9a6 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/PatchJPEGLSImageInputStream.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/PatchJPEGLSImageInputStream.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.codec.jpeg; @@ -39,7 +40,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PatchJPEGLSImageInputStream extends ImageInputStreamImpl diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/PatchJPEGLSImageOutputStream.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/PatchJPEGLSImageOutputStream.java index 5c5fbe7888..b7112267f9 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/PatchJPEGLSImageOutputStream.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/PatchJPEGLSImageOutputStream.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.codec.jpeg; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PatchJPEGLSImageOutputStream extends ImageOutputStreamImpl { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/SOFSegment.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/SOFSegment.java index 9cfeaee396..58db5fc51f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/SOFSegment.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/SOFSegment.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.codec.jpeg; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SOFSegment { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/SOSSegment.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/SOSSegment.java index 3a735f4e8c..36b35bdc44 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/SOSSegment.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/SOSSegment.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.codec.jpeg; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SOSSegment { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/mpeg/MPEGHeader.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/mpeg/MPEGHeader.java index d2db6c2e84..7320573962 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/mpeg/MPEGHeader.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/mpeg/MPEGHeader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.codec.mpeg; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MPEGHeader { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ExtendInputImageStream.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ExtendInputImageStream.java index f82002559f..65b360e6fd 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ExtendInputImageStream.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ExtendInputImageStream.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.opencv; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ExtendInputImageStream { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/FileRawImage.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/FileRawImage.java index ee09cf9ea0..678228425c 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/FileRawImage.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/FileRawImage.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.opencv; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FileRawImage { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/FileStreamSegment.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/FileStreamSegment.java index f563b5dd02..97b6556654 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/FileStreamSegment.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/FileStreamSegment.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.opencv; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FileStreamSegment extends StreamSegment { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageCV.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageCV.java index 2efb24e96b..18de8f40c9 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageCV.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageCV.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.opencv; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ImageCV extends Mat implements PlanarImage { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageConversion.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageConversion.java index 4055770a22..b66196edae 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageConversion.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageConversion.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.opencv; @@ -39,7 +40,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ImageConversion { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageParameters.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageParameters.java index 0862cda812..c647415012 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageParameters.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageParameters.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.opencv; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageProcessor.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageProcessor.java index c0cab66210..d95b5a5f7d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageProcessor.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageProcessor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.opencv; @@ -44,7 +45,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ImageProcessor { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageSize.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageSize.java index 0075c693d2..8c54927be1 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageSize.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageSize.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.opencv; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface ImageSize { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/J2kImageWriteParam.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/J2kImageWriteParam.java index 8398e7e272..c32805591e 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/J2kImageWriteParam.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/J2kImageWriteParam.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.opencv; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class J2kImageWriteParam extends ImageWriteParam { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/JPEGImageWriteParam.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/JPEGImageWriteParam.java index 482e640c0a..faedecc23d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/JPEGImageWriteParam.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/JPEGImageWriteParam.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.opencv; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JPEGImageWriteParam extends ImageWriteParam { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/JPEGLSImageWriteParam.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/JPEGLSImageWriteParam.java index 4c516a8ca4..eefabb1b41 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/JPEGLSImageWriteParam.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/JPEGLSImageWriteParam.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.opencv; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JPEGLSImageWriteParam extends ImageWriteParam { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/LookupTableCV.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/LookupTableCV.java index be62278cbc..3787b8dfff 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/LookupTableCV.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/LookupTableCV.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.opencv; @@ -31,69 +32,77 @@ import java.awt.image.DataBufferByte; import java.awt.image.DataBufferShort; import java.awt.image.DataBufferUShort; +import java.util.Arrays; import java.util.Objects; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class LookupTableCV { private final int[] offsets; private final DataBuffer data; + private final boolean forceReadingUnsigned; public LookupTableCV(byte[] data) { - this.offsets = new int[1]; - this.initOffsets(0); - this.data = new DataBufferByte(Objects.requireNonNull(data), data.length); + this(data, 0); } public LookupTableCV(byte[] data, int offset) { + this(data, offset, false); + } + + public LookupTableCV(byte[] data, int offset, boolean forceReadingUnsigned) { this.offsets = new int[1]; - this.initOffsets(offset); + Arrays.fill(offsets, offset); this.data = new DataBufferByte(Objects.requireNonNull(data), data.length); + this.forceReadingUnsigned = forceReadingUnsigned; } public LookupTableCV(byte[][] data) { - this.offsets = new int[data.length]; - this.initOffsets(0); - this.data = new DataBufferByte(Objects.requireNonNull(data), data[0].length); + this(data, new int[data.length]); } public LookupTableCV(byte[][] data, int offset) { - this.offsets = new int[data.length]; - this.initOffsets(offset); - this.data = new DataBufferByte(Objects.requireNonNull(data), data[0].length); + this(data, new int[data.length]); + Arrays.fill(offsets, offset); } public LookupTableCV(byte[][] data, int[] offsets) { - this.offsets = new int[data.length]; - this.initOffsets(offsets); + this(data, offsets, false); + } + + public LookupTableCV(byte[][] data, int[] offsets, boolean forceReadingUnsigned) { + this.offsets = Arrays.copyOf(offsets, data.length); this.data = new DataBufferByte(Objects.requireNonNull(data), data[0].length); + this.forceReadingUnsigned = forceReadingUnsigned; } public LookupTableCV(short[] data, int offset, boolean isUShort) { + this(data, offset, isUShort, false); + } + + public LookupTableCV(short[] data, int offset, boolean isUShort, boolean forceReadingUnsigned) { this.offsets = new int[1]; - this.initOffsets(offset); + Arrays.fill(offsets, offset); if (isUShort) { this.data = new DataBufferUShort(Objects.requireNonNull(data), data.length); } else { this.data = new DataBufferShort(Objects.requireNonNull(data), data.length); } + this.forceReadingUnsigned = forceReadingUnsigned; } - private void initOffsets(int offset) { - - for (int i = 0; i < offsets.length; i++) { - offsets[i] = offset; - } - } - - private void initOffsets(int[] offset) { - for (int i = 0; i < offsets.length; i++) { - offsets[i] = offset[i]; + private static int index(int pixel, int offset, int length) { + int val = pixel - offset; + if (val < 0) { + val = 0; + } else if (val > length) { + val = length; } + return val; } public DataBuffer getData() { @@ -136,10 +145,6 @@ public int getOffset() { return offsets[0]; } - public int getOffset(int band) { - return offsets[band]; - } - public int getNumBands() { return data.getNumBanks(); } @@ -156,7 +161,12 @@ public int lookup(int band, int value) { return data.getElem(band, value - offsets[band]); } + public int getOffset(int band) { + return offsets[band]; + } + public ImageCV lookup(Mat src) { + // Validate source. Objects.requireNonNull(src); int width = src.width(); @@ -174,7 +184,8 @@ public ImageCV lookup(Mat src) { sSrcData = new short[width * height * channels]; src.get(0, 0, sSrcData); } else { - throw new IllegalArgumentException("Not suported dataType for LUT transformation:" + src.toString()); + throw new IllegalArgumentException( + "Not suported dataType for LUT transformation:" + src.toString()); } int lkbBands = getNumBands(); @@ -187,23 +198,26 @@ public ImageCV lookup(Mat src) { short[][] sTblData = getShortData(); if (lkbBands < channels) { - byte[] b = bTblData[0]; - bTblData = new byte[channels][]; - for (int i = 0; i < bTblData.length; i++) { - bTblData[i] = b; + if (sTblData == null) { + byte[] b = bTblData[0]; + bTblData = new byte[channels][]; + Arrays.fill(bTblData, b); + } else { + short[] b = sTblData[0]; + sTblData = new short[channels][]; + Arrays.fill(sTblData, b); } int t = tblOffsets[0]; tblOffsets = new int[channels]; - for (int i = 0; i < tblOffsets.length; i++) { - tblOffsets[i] = t; - } + Arrays.fill(tblOffsets, t); lkbBands = channels; } if (lkpDataType == DataBuffer.TYPE_BYTE) { boolean scrByte = srcDataType == DataBuffer.TYPE_BYTE; - byte[] bDstData = scrByte && channels >= lkbBands ? bSrcData : new byte[width * height * lkbBands]; + byte[] bDstData = + scrByte && channels >= lkbBands ? bSrcData : new byte[width * height * lkbBands]; if (scrByte && bSrcData != null) { lookup(bSrcData, bDstData, tblOffsets, bTblData); } else if (srcDataType == DataBuffer.TYPE_USHORT && sSrcData != null && bDstData != null) { @@ -211,7 +225,8 @@ public ImageCV lookup(Mat src) { } else if (srcDataType == DataBuffer.TYPE_SHORT && sSrcData != null && bDstData != null) { lookup(sSrcData, bDstData, tblOffsets, bTblData); } else { - throw new IllegalArgumentException("Not supported LUT conversion from source dataType " + srcDataType); + throw new IllegalArgumentException( + "Not supported LUT conversion from source dataType " + srcDataType); } ImageCV dst = new ImageCV(height, width, CvType.CV_8UC(lkbBands)); @@ -220,7 +235,8 @@ public ImageCV lookup(Mat src) { } else if (lkpDataType == DataBuffer.TYPE_USHORT || lkpDataType == DataBuffer.TYPE_SHORT) { boolean scrByte = srcDataType == DataBuffer.TYPE_BYTE; - short[] sDstData = !scrByte && channels >= lkbBands ? sSrcData : new short[width * height * lkbBands]; + short[] sDstData = + !scrByte && channels >= lkbBands ? sSrcData : new short[width * height * lkbBands]; if (scrByte) { lookup(bSrcData, sDstData, tblOffsets, sTblData); } else if (srcDataType == DataBuffer.TYPE_USHORT) { @@ -228,11 +244,17 @@ public ImageCV lookup(Mat src) { } else if (srcDataType == DataBuffer.TYPE_SHORT) { lookup(sSrcData, sDstData, tblOffsets, sTblData); } else { - throw new IllegalArgumentException("Not supported LUT conversion from source dataType " + srcDataType); + throw new IllegalArgumentException( + "Not supported LUT conversion from source dataType " + srcDataType); } - ImageCV dst = new ImageCV(height, width, - lkpDataType == DataBuffer.TYPE_USHORT ? CvType.CV_16UC(channels) : CvType.CV_16SC(channels)); + ImageCV dst = + new ImageCV( + height, + width, + lkpDataType == DataBuffer.TYPE_USHORT + ? CvType.CV_16UC(channels) + : CvType.CV_16SC(channels)); dst.put(0, 0, sDstData); return dst; } @@ -248,16 +270,17 @@ private void lookup(byte[] srcData, byte[] dstData, int[] tblOffsets, byte[][] t for (int i = 0; i < srcData.length; i++) { int val = (srcData[i] & 0xFF); for (int b = 0; b < bOffset; b++) { - dstData[i * bOffset + b] = tblData[b][val - tblOffsets[b]]; + dstData[i * bOffset + b] = tblData[b][index(val, tblOffsets[b], tblData[b].length - 1)]; } } } else { for (int b = 0; b < bOffset; b++) { byte[] t = tblData[b]; int tblOffset = tblOffsets[b]; + int maxLength = t.length - 1; for (int i = b; i < srcData.length; i += bOffset) { - dstData[i] = t[(srcData[i] & 0xFF) - tblOffset]; + dstData[i] = t[index((srcData[i] & 0xFF), tblOffset, maxLength)]; } } } @@ -271,16 +294,17 @@ private void lookupU(short[] srcData, byte[] dstData, int[] tblOffsets, byte[][] for (int i = 0; i < srcData.length; i++) { int val = (srcData[i] & 0xFFFF); for (int b = 0; b < bOffset; b++) { - dstData[i * bOffset + b] = tblData[b][val - tblOffsets[b]]; + dstData[i * bOffset + b] = tblData[b][index(val, tblOffsets[b], tblData[b].length - 1)]; } } } else { for (int b = 0; b < bOffset; b++) { byte[] t = tblData[b]; int tblOffset = tblOffsets[b]; + int maxLength = t.length - 1; for (int i = b; i < srcData.length; i += bOffset) { - dstData[i] = t[(srcData[i] & 0xFFFF) - tblOffset]; + dstData[i] = t[index((srcData[i] & 0xFFFF), tblOffset, maxLength)]; } } } @@ -289,21 +313,23 @@ private void lookupU(short[] srcData, byte[] dstData, int[] tblOffsets, byte[][] // short to byte private void lookup(short[] srcData, byte[] dstData, int[] tblOffsets, byte[][] tblData) { int bOffset = tblData.length; + int mask = forceReadingUnsigned ? 0xFFFF : 0xFFFFFFFF; if (srcData.length < dstData.length) { for (int i = 0; i < srcData.length; i++) { - int val = srcData[i]; + int val = srcData[i] & mask; for (int b = 0; b < bOffset; b++) { - dstData[i * bOffset + b] = tblData[b][val - tblOffsets[b]]; + dstData[i * bOffset + b] = tblData[b][index(val, tblOffsets[b], tblData[b].length - 1)]; } } } else { for (int b = 0; b < bOffset; b++) { byte[] t = tblData[b]; int tblOffset = tblOffsets[b]; + int maxLength = t.length - 1; for (int i = b; i < srcData.length; i += bOffset) { - dstData[i] = t[(srcData[i]) - tblOffset]; + dstData[i] = t[index((srcData[i] & mask), tblOffset, maxLength)]; } } } @@ -317,16 +343,17 @@ private void lookup(byte[] srcData, short[] dstData, int[] tblOffsets, short[][] for (int i = 0; i < srcData.length; i++) { int val = (srcData[i] & 0xFF); for (int b = 0; b < bOffset; b++) { - dstData[i * bOffset + b] = tblData[b][val - tblOffsets[b]]; + dstData[i * bOffset + b] = tblData[b][index(val, tblOffsets[b], tblData[b].length - 1)]; } } } else { for (int b = 0; b < bOffset; b++) { short[] t = tblData[b]; int tblOffset = tblOffsets[b]; + int maxLength = t.length - 1; for (int i = b; i < srcData.length; i += bOffset) { - dstData[i] = t[(srcData[i] & 0xFF) - tblOffset]; + dstData[i] = t[index((srcData[i] & 0xFF), tblOffset, maxLength)]; } } } @@ -339,16 +366,17 @@ private void lookupU(short[] srcData, short[] dstData, int[] tblOffsets, short[] for (int i = 0; i < srcData.length; i++) { int val = (srcData[i] & 0xFFFF); for (int b = 0; b < bOffset; b++) { - dstData[i * bOffset + b] = tblData[b][val - tblOffsets[b]]; + dstData[i * bOffset + b] = tblData[b][index(val, tblOffsets[b], tblData[b].length - 1)]; } } } else { for (int b = 0; b < bOffset; b++) { short[] t = tblData[b]; int tblOffset = tblOffsets[b]; + int maxLength = t.length - 1; for (int i = b; i < srcData.length; i += bOffset) { - srcData[i] = t[(srcData[i] & 0xFFFF) - tblOffset]; + dstData[i] = t[index((srcData[i] & 0xFFFF), tblOffset, maxLength)]; } } } @@ -357,21 +385,23 @@ private void lookupU(short[] srcData, short[] dstData, int[] tblOffsets, short[] // short to short or ushort private void lookup(short[] srcData, short[] dstData, int[] tblOffsets, short[][] tblData) { int bOffset = tblData.length; + int mask = forceReadingUnsigned ? 0xFFFF : 0xFFFFFFFF; if (srcData.length < dstData.length) { for (int i = 0; i < srcData.length; i++) { - int val = srcData[i]; + int val = (srcData[i] & mask); for (int b = 0; b < bOffset; b++) { - dstData[i * bOffset + b] = tblData[b][val - tblOffsets[b]]; + dstData[i * bOffset + b] = tblData[b][index(val, tblOffsets[b], tblData[b].length - 1)]; } } } else { for (int b = 0; b < bOffset; b++) { short[] t = tblData[b]; int tblOffset = tblOffsets[b]; + int maxLength = t.length - 1; for (int i = b; i < srcData.length; i += bOffset) { - srcData[i] = t[(srcData[i]) - tblOffset]; + dstData[i] = t[index((srcData[i] & mask), tblOffset, maxLength)]; } } } diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/MemoryStreamSegment.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/MemoryStreamSegment.java index cfe6ca7435..bca1bc927d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/MemoryStreamSegment.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/MemoryStreamSegment.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.opencv; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MemoryStreamSegment extends StreamSegment { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeImageReader.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeImageReader.java index 66e7745cdc..4109e3520f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeImageReader.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeImageReader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.opencv; @@ -51,7 +52,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NativeImageReader extends ImageReader implements Closeable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJ2kImageReaderSpi.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJ2kImageReaderSpi.java index ff15d58fa6..9da7973e00 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJ2kImageReaderSpi.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJ2kImageReaderSpi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.opencv; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NativeJ2kImageReaderSpi extends ImageReaderSpi { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJ2kImageWriter.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJ2kImageWriter.java index 45ea1dcd01..03e3d77531 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJ2kImageWriter.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJ2kImageWriter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.opencv; @@ -42,7 +43,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NativeJ2kImageWriter extends ImageWriter { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJ2kImageWriterSpi.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJ2kImageWriterSpi.java index 01d38d96a0..97eb954216 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJ2kImageWriterSpi.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJ2kImageWriterSpi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.opencv; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NativeJ2kImageWriterSpi extends ImageWriterSpi { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJLSImageReaderSpi.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJLSImageReaderSpi.java index b001a5c5f1..54bf0ace5d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJLSImageReaderSpi.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJLSImageReaderSpi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.opencv; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NativeJLSImageReaderSpi extends ImageReaderSpi { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJLSImageWriter.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJLSImageWriter.java index 55ea6fca90..6d34a2fdd3 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJLSImageWriter.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJLSImageWriter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.opencv; @@ -43,7 +44,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NativeJLSImageWriter extends ImageWriter { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJLSImageWriterSpi.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJLSImageWriterSpi.java index e13c1f4369..dd069ed9d1 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJLSImageWriterSpi.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJLSImageWriterSpi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.opencv; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NativeJLSImageWriterSpi extends ImageWriterSpi { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJPEGImageReaderSpi.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJPEGImageReaderSpi.java index 977c393816..b0223dd565 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJPEGImageReaderSpi.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJPEGImageReaderSpi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.opencv; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NativeJPEGImageReaderSpi extends ImageReaderSpi { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJPEGImageWriter.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJPEGImageWriter.java index 4f6f0b85b8..334ec0d52b 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJPEGImageWriter.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJPEGImageWriter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.opencv; @@ -43,7 +44,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NativeJPEGImageWriter extends ImageWriter { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJPEGImageWriterSpi.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJPEGImageWriterSpi.java index 227ceba6af..a21b5d70f1 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJPEGImageWriterSpi.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJPEGImageWriterSpi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.opencv; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NativeJPEGImageWriterSpi extends ImageWriterSpi { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/PlanarImage.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/PlanarImage.java index 7d61638848..09181f3a12 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/PlanarImage.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/PlanarImage.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.opencv; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface PlanarImage extends ImageSize, AutoCloseable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/SOFSegment.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/SOFSegment.java index 1024cb5153..f9953ac34f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/SOFSegment.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/SOFSegment.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.opencv; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SOFSegment { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/StreamSegment.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/StreamSegment.java index 48b6f670d5..c78efd3e73 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/StreamSegment.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/StreamSegment.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.opencv; @@ -45,7 +46,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class StreamSegment { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/TiledAlgorithm.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/TiledAlgorithm.java old mode 100755 new mode 100644 index fb157b91d6..94873e192b --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/TiledAlgorithm.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/TiledAlgorithm.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.opencv; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TiledAlgorithm { @@ -60,8 +61,11 @@ void process(Mat sourceImage, Mat resultImage) { for (int rowTile = 0; rowTile < rows; rowTile++) { for (int colTile = 0; colTile < cols; colTile++) { - Rect srcTile = new Rect(colTile * mTileSize - mPadding, rowTile * mTileSize - mPadding, - mTileSize + 2 * mPadding, mTileSize + 2 * mPadding); + Rect srcTile = new Rect( + colTile * mTileSize - mPadding, + rowTile * mTileSize - mPadding, + mTileSize + 2 * mPadding, + mTileSize + 2 * mPadding); Rect dstTile = new Rect(colTile * mTileSize, rowTile * mTileSize, mTileSize, mTileSize); copySourceTile(sourceImage, tileInput, srcTile); @@ -69,7 +73,6 @@ void process(Mat sourceImage, Mat resultImage) { copyTileToResultImage(tileOutput, resultImage, dstTile); } } - } private void copyTileToResultImage(Mat tileOutput, Mat resultImage, Rect dstTile) { @@ -129,7 +132,8 @@ private void copySourceTile(Mat sourceImage, Mat tileInput, Rect tile) { tile.height -= broffset.y; } - // If any of the tile sides exceed source image boundary we must use copyMakeBorder to make proper paddings + // If any of the tile sides exceed source image boundary we must use copyMakeBorder to make + // proper paddings // for this side if (tloffset.x > 0 || tloffset.y > 0 || broffset.x > 0 || broffset.y > 0) { Rect paddedTile = new Rect(tile.tl(), tile.br()); @@ -138,13 +142,18 @@ private void copySourceTile(Mat sourceImage, Mat tileInput, Rect tile) { assert (paddedTile.br().x < sourceImage.cols()); assert (paddedTile.br().y < sourceImage.rows()); - Core.copyMakeBorder(sourceImage.submat(paddedTile), tileInput, (int) tloffset.y, (int) broffset.y, - (int) tloffset.x, (int) broffset.x, mBorderType); + Core.copyMakeBorder( + sourceImage.submat(paddedTile), + tileInput, + (int) tloffset.y, + (int) broffset.y, + (int) tloffset.x, + (int) broffset.x, + mBorderType); } else { // Entire tile (with paddings lies inside image and it's safe to just take a region: sourceImage.submat(tile).copyTo(tileInput); } - } } \ No newline at end of file diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/TiledProcessor.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/TiledProcessor.java new file mode 100644 index 0000000000..bf2ca8c28c --- /dev/null +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/TiledProcessor.java @@ -0,0 +1,161 @@ +/********************************************************************************* + * * + * The MIT License (MIT) * + * * + * Copyright (c) 2015-2020 aoju.org and other contributors. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy * + * of this software and associated documentation files (the "Software"), to deal * + * in the Software without restriction, including without limitation the rights * + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * + * THE SOFTWARE. * + * * + ********************************************************************************/ +package org.aoju.bus.image.nimble.opencv; + +import org.opencv.core.*; +import org.opencv.imgproc.Imgproc; + +/** + * @author Kimi Liu + * @version 6.1.2 + * @since JDK 1.8+ + */ +public class TiledProcessor { + + public Mat blur(Mat input, int numberOfTimes) { + Mat sourceImage; + Mat destImage = input.clone(); + for (int i = 0; i < numberOfTimes; i++) { + sourceImage = destImage.clone(); + // Imgproc.blur(sourceImage, destImage, new Size(3.0, 3.0)); + process(sourceImage, destImage, 256); + } + return destImage; + } + + public void process(Mat sourceImage, Mat resultImage, int tileSize) { + + if (sourceImage.rows() != resultImage.rows() || sourceImage.cols() != resultImage.cols()) { + throw new IllegalStateException(""); + } + + final int rowTiles = + (sourceImage.rows() / tileSize) + (sourceImage.rows() % tileSize != 0 ? 1 : 0); + final int colTiles = + (sourceImage.cols() / tileSize) + (sourceImage.cols() % tileSize != 0 ? 1 : 0); + + Mat tileInput = new Mat(tileSize, tileSize, sourceImage.type()); + Mat tileOutput = new Mat(tileSize, tileSize, sourceImage.type()); + + int boderType = Core.BORDER_DEFAULT; + int mPadding = 3; + + for (int rowTile = 0; rowTile < rowTiles; rowTile++) { + for (int colTile = 0; colTile < colTiles; colTile++) { + Rect srcTile = + new Rect( + colTile * tileSize - mPadding, + rowTile * tileSize - mPadding, + tileSize + 2 * mPadding, + tileSize + 2 * mPadding); + Rect dstTile = new Rect(colTile * tileSize, rowTile * tileSize, tileSize, tileSize); + copyTileFromSource(sourceImage, tileInput, srcTile, boderType); + processTileImpl(tileInput, tileOutput); + copyTileToResultImage( + tileOutput, resultImage, new Rect(mPadding, mPadding, tileSize, tileSize), dstTile); + } + } + } + + private void copyTileToResultImage(Mat tileOutput, Mat resultImage, Rect srcTile, Rect dstTile) { + Point br = dstTile.br(); + + if (br.x >= resultImage.cols()) { + dstTile.width -= br.x - resultImage.cols(); + srcTile.width -= br.x - resultImage.cols(); + } + + if (br.y >= resultImage.rows()) { + dstTile.height -= br.y - resultImage.rows(); + srcTile.height -= br.y - resultImage.rows(); + } + + Mat tileView = tileOutput.submat(srcTile); + Mat dstView = resultImage.submat(dstTile); + + assert (tileView.rows() == dstView.rows()); + assert (tileView.cols() == dstView.cols()); + + tileView.copyTo(dstView); + } + + private void processTileImpl(Mat tileInput, Mat tileOutput) { + Imgproc.blur(tileInput, tileOutput, new Size(7.0, 7.0)); + } + + private void copyTileFromSource(Mat sourceImage, Mat tileInput, Rect tile, int mBorderType) { + Point tl = tile.tl(); + Point br = tile.br(); + + Point tloffset = new Point(); + Point broffset = new Point(); + + // Take care of border cases + if (tile.x < 0) { + tloffset.x = -tile.x; + tile.x = 0; + } + + if (tile.y < 0) { + tloffset.y = -tile.y; + tile.y = 0; + } + + if (br.x >= sourceImage.cols()) { + broffset.x = br.x - sourceImage.cols() + 1; + tile.width -= broffset.x; + } + + if (br.y >= sourceImage.rows()) { + broffset.y = br.y - sourceImage.rows() + 1; + tile.height -= broffset.y; + } + + // If any of the tile sides exceed source image boundary we must use copyMakeBorder to make + // proper paddings + // for this side + if (tloffset.x > 0 || tloffset.y > 0 || broffset.x > 0 || broffset.y > 0) { + Rect paddedTile = new Rect(tile.tl(), tile.br()); + assert (paddedTile.x >= 0); + assert (paddedTile.y >= 0); + assert (paddedTile.br().x < sourceImage.cols()); + assert (paddedTile.br().y < sourceImage.rows()); + + Core.copyMakeBorder( + sourceImage.submat(paddedTile), + tileInput, + (int) tloffset.y, + (int) broffset.y, + (int) tloffset.x, + (int) broffset.x, + mBorderType); + } else { + // Entire tile (with paddings lies inside image and it's safe to just take a region: + sourceImage.submat(tile).copyTo(tileInput); + } + } + +} diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/reader/NativeDCMImageReader.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/reader/NativeDCMImageReader.java index 8af17b639d..fa091e5449 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/reader/NativeDCMImageReader.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/reader/NativeDCMImageReader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.reader; @@ -60,7 +61,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NativeDCMImageReader extends ImageReader implements Closeable { @@ -855,7 +856,7 @@ public double getPixelValue(int frameIndex, int row, int column) throws IOExcept /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public static class NativeDCMImageReadParam extends ImageReadParam { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/reader/NativeDCMImageReaderSpi.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/reader/NativeDCMImageReaderSpi.java index 3708524804..e3a449fb87 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/reader/NativeDCMImageReaderSpi.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/reader/NativeDCMImageReaderSpi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.reader; @@ -36,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NativeDCMImageReaderSpi extends ImageReaderSpi { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/reader/NativeRLEImageReader.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/reader/NativeRLEImageReader.java index 5c478edde1..17d00fa18f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/reader/NativeRLEImageReader.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/reader/NativeRLEImageReader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.reader; @@ -40,7 +41,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NativeRLEImageReader extends javax.imageio.ImageReader { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/reader/NativeRLEImageReaderSpi.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/reader/NativeRLEImageReaderSpi.java index c95fb4b0f9..16bc0ff176 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/reader/NativeRLEImageReaderSpi.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/reader/NativeRLEImageReaderSpi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.reader; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NativeRLEImageReaderSpi extends javax.imageio.spi.ImageReaderSpi { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/stream/ImageInputStreamAdapter.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/stream/ImageInputStreamAdapter.java index 7037f4929c..546b0dccbd 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/stream/ImageInputStreamAdapter.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/stream/ImageInputStreamAdapter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.stream; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ImageInputStreamAdapter extends InputStream { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/stream/ImagePixelInputStream.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/stream/ImagePixelInputStream.java index 3c0127a593..33f6c87265 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/stream/ImagePixelInputStream.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/stream/ImagePixelInputStream.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.stream; @@ -36,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ImagePixelInputStream extends MemoryCacheImageInputStream diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/stream/OutputStreamAdapter.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/stream/OutputStreamAdapter.java index 1afaee26c0..98e143876d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/stream/OutputStreamAdapter.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/stream/OutputStreamAdapter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.stream; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class OutputStreamAdapter extends ImageOutputStreamImpl { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/stream/SegmentedImageStream.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/stream/SegmentedImageStream.java index 78eb6f3188..ffcb45287e 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/stream/SegmentedImageStream.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/stream/SegmentedImageStream.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.nimble.stream; @@ -41,7 +42,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SegmentedImageStream extends ImageInputStreamImpl { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/CFind.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/CFind.java index 99c90e2e16..90ebf40f68 100644 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/CFind.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/CFind.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.plugin; @@ -36,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CFind { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/CGet.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/CGet.java index f57102ac9e..31acfcda32 100644 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/CGet.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/CGet.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.plugin; @@ -39,7 +40,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CGet { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/CMove.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/CMove.java index 46ff218cd0..00f5407ddf 100644 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/CMove.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/CMove.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.plugin; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CMove { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/CStore.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/CStore.java index d2cef2cea0..1fe086c2cb 100644 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/CStore.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/CStore.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.plugin; @@ -38,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CStore { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/Dcm2Dcm.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/Dcm2Dcm.java index 05d17a95db..2cce4dcbee 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/Dcm2Dcm.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/Dcm2Dcm.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.plugin; @@ -56,7 +57,7 @@ * DCM解压缩/转换 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Dcm2Dcm { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/Dcm2Jpg.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/Dcm2Jpg.java index c4bd8f2116..75e7882aad 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/Dcm2Jpg.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/Dcm2Jpg.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.plugin; @@ -47,7 +48,7 @@ * DCM-JPG转换 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Dcm2Jpg { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/Dcm2Str.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/Dcm2Str.java index 8802e0a577..1c41221332 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/Dcm2Str.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/Dcm2Str.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.plugin; @@ -40,7 +41,7 @@ * DCM-JPG转换 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Dcm2Str extends SimpleFileVisitor { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/Dcm2Xml.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/Dcm2Xml.java index 18c4e3c4c0..a5116890b3 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/Dcm2Xml.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/Dcm2Xml.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.plugin; @@ -47,7 +48,7 @@ * DCM-XML转换 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Dcm2Xml { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/DcmDir.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/DcmDir.java index d4734893ef..ae6760569a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/DcmDir.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/DcmDir.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.plugin; @@ -50,7 +51,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DcmDir { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/DcmDump.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/DcmDump.java index 4f523b9668..eece943fa6 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/DcmDump.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/DcmDump.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.plugin; @@ -36,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DcmDump implements ImageInputHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/Echo.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/Echo.java index 6986958b7d..c64900dad8 100644 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/Echo.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/Echo.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.plugin; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Echo { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/Emf2sf.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/Emf2sf.java index f4392cd697..33271e7f92 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/Emf2sf.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/Emf2sf.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.plugin; @@ -38,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Emf2sf { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/FindSCU.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/FindSCU.java index bf161d46ab..6af690d076 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/FindSCU.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/FindSCU.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.plugin; @@ -60,7 +61,7 @@ * findscu只支持使用C-FIND消息的查询功能 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FindSCU extends Device implements AutoCloseable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/FixLO2UN.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/FixLO2UN.java index 973d76329d..0872f12598 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/FixLO2UN.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/FixLO2UN.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.plugin; @@ -37,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FixLO2UN extends SimpleFileVisitor { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/GetSCU.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/GetSCU.java index 7cb290f7b3..ce0d352cb5 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/GetSCU.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/GetSCU.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.plugin; @@ -48,7 +49,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class GetSCU implements AutoCloseable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/HL72Xml.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/HL72Xml.java index 8f825203a7..ae0d639d93 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/HL72Xml.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/HL72Xml.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.plugin; @@ -43,7 +44,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HL72Xml { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/HL7Pix.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/HL7Pix.java index 00c1708874..e562c1f1a6 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/HL7Pix.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/HL7Pix.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.plugin; @@ -38,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HL7Pix extends Device { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/HL7Rcv.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/HL7Rcv.java index 22915531f0..bc89ab537d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/HL7Rcv.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/HL7Rcv.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.plugin; @@ -45,7 +46,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HL7Rcv { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/HL7Snd.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/HL7Snd.java index 57b5788d33..d323cdcfe0 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/HL7Snd.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/HL7Snd.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.plugin; @@ -41,7 +42,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HL7Snd extends Device { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/IanSCP.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/IanSCP.java index 60c0924ecd..67e6b8bfe8 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/IanSCP.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/IanSCP.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.plugin; @@ -42,7 +43,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class IanSCP extends Device { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/IanSCU.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/IanSCU.java index a5069a20ad..1d24186d8d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/IanSCU.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/IanSCU.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.plugin; @@ -45,7 +46,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class IanSCU { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/Jpg2Dcm.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/Jpg2Dcm.java index e7afbd7a2d..1c43933fc5 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/Jpg2Dcm.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/Jpg2Dcm.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.plugin; @@ -44,7 +45,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Jpg2Dcm { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/MkKOS.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/MkKOS.java index 6ff21a84a4..218f5d88e7 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/MkKOS.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/MkKOS.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.plugin; @@ -42,7 +43,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MkKOS { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/Modality.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/Modality.java index 2bc57246b8..a17f012b3a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/Modality.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/Modality.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.plugin; @@ -40,7 +41,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Modality { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/MoveSCU.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/MoveSCU.java index e22890150d..6aae9bc4b4 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/MoveSCU.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/MoveSCU.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.plugin; @@ -44,7 +45,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MoveSCU extends Device implements AutoCloseable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/MppsSCP.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/MppsSCP.java index 505e32f8b4..dcc997d880 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/MppsSCP.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/MppsSCP.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.plugin; @@ -49,7 +50,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MppsSCP { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/MppsSCU.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/MppsSCU.java index 7c8167e761..511c78447b 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/MppsSCU.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/MppsSCU.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.plugin; @@ -48,7 +49,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MppsSCU { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/Pdf2Dcm.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/Pdf2Dcm.java index a045cdd5f3..0da227e050 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/Pdf2Dcm.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/Pdf2Dcm.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.plugin; @@ -38,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/StgSCU.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/StgSCU.java index a7a4f882d1..00b249baf9 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/StgSCU.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/StgSCU.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.plugin; @@ -51,7 +52,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class StgSCU { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/StoreSCP.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/StoreSCP.java index 367c6aa508..54f3e4d645 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/StoreSCP.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/StoreSCP.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.plugin; @@ -48,7 +49,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class StoreSCP extends BasicCStoreSCP { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/StoreSCU.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/StoreSCU.java index affb1ed09a..d7b6d287db 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/StoreSCU.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/StoreSCU.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.plugin; @@ -55,7 +56,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class StoreSCU implements AutoCloseable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/Xml2Dcm.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/Xml2Dcm.java index 07fd53c975..f9abffc143 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/Xml2Dcm.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/Xml2Dcm.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.plugin; @@ -40,7 +41,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Xml2Dcm { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/Xml2HL7.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/Xml2HL7.java index dccea7c5f7..10eedf0d36 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/Xml2HL7.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/Xml2HL7.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.image.plugin; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Xml2HL7 { diff --git a/bus-limiter/pom.xml b/bus-limiter/pom.xml index 6358d4c9fc..1e1f4a2134 100755 --- a/bus-limiter/pom.xml +++ b/bus-limiter/pom.xml @@ -6,21 +6,46 @@ org.aoju bus-limiter - 6.1.1 + 6.1.2 jar ${project.artifactId} Bus Limiter https://github.com/aoju/bus + + + The MIT License (MIT) + https://opensource.org/licenses/MIT + + + + + scm:git@github.com:aoju/bus.git + scm:git@github.com:aoju/bus.git + git@github.com:aoju/bus.git + + + + + Kimi Liu + https://github.com/aoju/bus.git + + + + + Github Issue + https://github.com/aoju/bus/issues + + UTF-8 UTF-8 1.8 - 2.3.0.RELEASE + 2.4.0 4.3.0 3.11.2 - 29.0-jre + 30.0-jre @@ -95,31 +120,6 @@ - - - The MIT License (MIT) - https://opensource.org/licenses/MIT - - - - - scm:git@github.com:aoju/bus.git - scm:git@github.com:aoju/bus.git - git@github.com:aoju/bus.git - - - - - Kimi Liu - https://github.com/aoju/bus.git - - - - - Github Issue - https://github.com/aoju/bus/issues - - diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/Handler.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/Handler.java index 38e8d6cb1f..0296d8c620 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/Handler.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/Handler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter; @@ -34,7 +35,7 @@ * limiter 降级策略应该由limiter本身实现,这里只是一个简单的替代方案 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Handler { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/Injector.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/Injector.java index 00c4bc0ea9..8e82754b8e 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/Injector.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/Injector.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Injector { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/Limiter.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/Limiter.java index 267943c8d6..7e88884e7b 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/Limiter.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/Limiter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter; @@ -31,7 +32,7 @@ * 限制器件的定义 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Limiter { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/Parser.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/Parser.java index 524526db9b..bf17afe543 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/Parser.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/Parser.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Parser { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/Resolver.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/Resolver.java index 210e2c6c02..047a9e2eb7 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/Resolver.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/Resolver.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Resolver { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/LimiterParameter.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/LimiterParameter.java index fd05b7ba3f..7d0401c890 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/LimiterParameter.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/LimiterParameter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.annotation; @@ -33,7 +34,7 @@ * 限流参数 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Target(ElementType.FIELD) diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/Lock.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/Lock.java index 9f3bdebfb7..4cb55b8fd0 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/Lock.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/Lock.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.annotation; @@ -32,7 +33,7 @@ * 锁 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Target({ElementType.METHOD, ElementType.TYPE}) diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/Locks.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/Locks.java index 89ebefe2fc..2771672313 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/Locks.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/Locks.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.annotation; @@ -33,7 +34,7 @@ * 锁 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Target({ElementType.METHOD, ElementType.TYPE}) diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/Peak.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/Peak.java index d39f0e92a3..6b2dd3e9aa 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/Peak.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/Peak.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.annotation; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Target({ElementType.METHOD, ElementType.TYPE}) diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/RateLimiter.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/RateLimiter.java index bc04168f3d..af9fea7d6a 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/RateLimiter.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/RateLimiter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.annotation; @@ -32,7 +33,7 @@ * 限流 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Target({ElementType.METHOD, ElementType.TYPE}) diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/execute/LimitContextsValueWrapper.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/execute/LimitContextsValueWrapper.java index ccb059a56c..a70565df68 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/execute/LimitContextsValueWrapper.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/execute/LimitContextsValueWrapper.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.execute; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class LimitContextsValueWrapper { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/execute/LimiterExecutionContext.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/execute/LimiterExecutionContext.java index 9cd0b7e822..b5eb85c614 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/execute/LimiterExecutionContext.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/execute/LimiterExecutionContext.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.execute; @@ -45,7 +46,7 @@ * limiter 上下文信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class LimiterExecutionContext { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/expression/LimiterExpressionRootObject.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/expression/LimiterExpressionRootObject.java index 884b483a59..a4e86b19ea 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/expression/LimiterExpressionRootObject.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/expression/LimiterExpressionRootObject.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.expression; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class LimiterExpressionRootObject { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/expression/LimiterOperationExpressionEvaluator.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/expression/LimiterOperationExpressionEvaluator.java index e89754bf8e..e46962dfef 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/expression/LimiterOperationExpressionEvaluator.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/expression/LimiterOperationExpressionEvaluator.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.expression; @@ -43,7 +44,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class LimiterOperationExpressionEvaluator { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/intercept/BeanFactoryLimitedResourceSourceAdvisor.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/intercept/BeanFactoryLimitedResourceSourceAdvisor.java index 9724834f8f..090fd4a4a2 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/intercept/BeanFactoryLimitedResourceSourceAdvisor.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/intercept/BeanFactoryLimitedResourceSourceAdvisor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.intercept; @@ -32,7 +33,7 @@ * 实际的切面 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BeanFactoryLimitedResourceSourceAdvisor extends AbstractBeanFactoryPointcutAdvisor { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/intercept/LimitedResourceSourcePointcut.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/intercept/LimitedResourceSourcePointcut.java index e0f5db814a..5d71858391 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/intercept/LimitedResourceSourcePointcut.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/intercept/LimitedResourceSourcePointcut.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.intercept; @@ -36,7 +37,7 @@ * 切点抽象定义 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ abstract class LimitedResourceSourcePointcut extends StaticMethodMatcherPointcut implements Serializable { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/intercept/LimiterAspectSupport.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/intercept/LimiterAspectSupport.java index 220d8e6119..52c320fc76 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/intercept/LimiterAspectSupport.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/intercept/LimiterAspectSupport.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.intercept; @@ -48,7 +49,7 @@ * 使用beanfactory的一些基础设施 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class LimiterAspectSupport implements BeanFactoryAware, InitializingBean, SmartInitializingSingleton { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/intercept/LimiterInterceptor.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/intercept/LimiterInterceptor.java index 7ee7ded52b..f25737dc90 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/intercept/LimiterInterceptor.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/intercept/LimiterInterceptor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.intercept; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class LimiterInterceptor extends LimiterAspectSupport implements MethodInterceptor, Serializable { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/metadata/AbstractLimitedResourceMetadata.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/metadata/AbstractLimitedResourceMetadata.java index 101ed69183..d8543ac284 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/metadata/AbstractLimitedResourceMetadata.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/metadata/AbstractLimitedResourceMetadata.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.metadata; @@ -41,7 +42,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractLimitedResourceMetadata implements LimitedResourceMetadata, Observer { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/metadata/LimitedResourceKey.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/metadata/LimitedResourceKey.java index 7134ad33fa..9ae4f39ca5 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/metadata/LimitedResourceKey.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/metadata/LimitedResourceKey.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.metadata; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class LimitedResourceKey implements Comparable { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/metadata/LimitedResourceMetadata.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/metadata/LimitedResourceMetadata.java index d9cace7665..d62c132bd9 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/metadata/LimitedResourceMetadata.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/metadata/LimitedResourceMetadata.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.metadata; @@ -36,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface LimitedResourceMetadata { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/metadata/LimitedResourceMetadataCache.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/metadata/LimitedResourceMetadataCache.java index c0c9fd73b0..ed8a36c1e0 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/metadata/LimitedResourceMetadataCache.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/metadata/LimitedResourceMetadataCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.metadata; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class LimitedResourceMetadataCache { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/AbstractLimitedResource.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/AbstractLimitedResource.java index 022a3a71a5..7707ca6870 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/AbstractLimitedResource.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/AbstractLimitedResource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.resource; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractLimitedResource extends Observable implements LimitedResource { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/DefaultLimitedResourceSource.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/DefaultLimitedResourceSource.java index 261117ef97..0ddb832708 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/DefaultLimitedResourceSource.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/DefaultLimitedResourceSource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.resource; @@ -40,7 +41,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DefaultLimitedResourceSource implements LimitedResourceSource { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/LimitedResource.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/LimitedResource.java index a2553c3a2c..b193242177 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/LimitedResource.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/LimitedResource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.resource; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface LimitedResource { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/LimitedResourceScanner.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/LimitedResourceScanner.java index c78a5fa022..58b1695be3 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/LimitedResourceScanner.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/LimitedResourceScanner.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.resource; @@ -46,7 +47,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class LimitedResourceScanner implements LimitedResourceSource { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/LimitedResourceSource.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/LimitedResourceSource.java index ce74beaecf..759e28b847 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/LimitedResourceSource.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/LimitedResourceSource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.resource; @@ -31,7 +32,7 @@ * 获取限流规则 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface LimitedResourceSource { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/Lock.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/Lock.java index 75c1765e2f..ea727f6336 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/Lock.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/Lock.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.support.lock; @@ -32,7 +33,7 @@ * Lock * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class Lock implements Limiter { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/LockAnnotationParser.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/LockAnnotationParser.java index bfa2c51e90..d832eff59e 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/LockAnnotationParser.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/LockAnnotationParser.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.support.lock; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class LockAnnotationParser extends AbstractParser { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/LockResource.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/LockResource.java index aafa9b5c43..70534593c1 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/LockResource.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/LockResource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.support.lock; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class LockResource extends AbstractLimitedResource { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/LockResourceMetadata.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/LockResourceMetadata.java index 286441f888..68164a0ff7 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/LockResourceMetadata.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/LockResourceMetadata.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.support.lock; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class LockResourceMetadata extends AbstractLimitedResourceMetadata { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/jdk/JdkLock.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/jdk/JdkLock.java index 6e63b50aa3..2739acbe4c 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/jdk/JdkLock.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/jdk/JdkLock.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.support.lock.jdk; @@ -34,7 +35,7 @@ * 基于ConcurrentHashMap和ReentrantLock实现的一个简单的锁组件 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JdkLock extends org.aoju.bus.limiter.support.lock.Lock { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/redis/RedisLock.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/redis/RedisLock.java index d5a4a5c7ac..0876a3f379 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/redis/RedisLock.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/redis/RedisLock.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.support.lock.redis; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RedisLock extends Lock { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/zookeeper/ZookeeperLock.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/zookeeper/ZookeeperLock.java index 60031e782c..b4c822e589 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/zookeeper/ZookeeperLock.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/zookeeper/ZookeeperLock.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.support.lock.zookeeper; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ZookeeperLock extends Lock { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/PeakLimiter.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/PeakLimiter.java index 4d790c7c5a..8153a66fe3 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/PeakLimiter.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/PeakLimiter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.support.peak; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class PeakLimiter implements Limiter { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/PeakLimiterAnnotationParser.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/PeakLimiterAnnotationParser.java index 6247afe413..61d912df71 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/PeakLimiterAnnotationParser.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/PeakLimiterAnnotationParser.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.support.peak; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PeakLimiterAnnotationParser extends AbstractParser { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/PeakLimiterResource.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/PeakLimiterResource.java index 0b26f25cf1..7a183adf5a 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/PeakLimiterResource.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/PeakLimiterResource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.support.peak; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PeakLimiterResource extends AbstractLimitedResource { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/PeakLimiterResourceMetadata.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/PeakLimiterResourceMetadata.java index 140ba3d4da..71a3bfef0b 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/PeakLimiterResourceMetadata.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/PeakLimiterResourceMetadata.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.support.peak; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PeakLimiterResourceMetadata extends AbstractLimitedResourceMetadata { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/jdk/JdkPeakLimiter.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/jdk/JdkPeakLimiter.java index a1c85a390f..587c391485 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/jdk/JdkPeakLimiter.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/jdk/JdkPeakLimiter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.support.peak.jdk; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JdkPeakLimiter extends PeakLimiter { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/redis/RedisPeakLimiter.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/redis/RedisPeakLimiter.java index db40ff9bf1..138857aa00 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/redis/RedisPeakLimiter.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/redis/RedisPeakLimiter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.support.peak.redis; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RedisPeakLimiter extends PeakLimiter { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/AbstractParser.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/AbstractParser.java index dba48993db..026391c4b7 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/AbstractParser.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/AbstractParser.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.support.rate; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractParser, V extends Annotation> implements Parser { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/RateLimiter.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/RateLimiter.java index b1a7c8cce2..9e03287707 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/RateLimiter.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/RateLimiter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.support.rate; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class RateLimiter implements Limiter { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/RateLimiterAnnotationParser.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/RateLimiterAnnotationParser.java index d62493f503..d2986661fe 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/RateLimiterAnnotationParser.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/RateLimiterAnnotationParser.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.support.rate; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RateLimiterAnnotationParser extends AbstractParser { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/RateLimiterResource.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/RateLimiterResource.java index 732a56c4f9..7a1fb3a2ca 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/RateLimiterResource.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/RateLimiterResource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.support.rate; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RateLimiterResource extends AbstractLimitedResource { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/RateLimiterResourceMetadata.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/RateLimiterResourceMetadata.java index 1e050dd9ee..ef213a5275 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/RateLimiterResourceMetadata.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/RateLimiterResourceMetadata.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.support.rate; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RateLimiterResourceMetadata extends AbstractLimitedResourceMetadata { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/jdk/JdkRateLimiter.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/jdk/JdkRateLimiter.java index d9ef9656a1..e6c1b13552 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/jdk/JdkRateLimiter.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/jdk/JdkRateLimiter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.support.rate.jdk; @@ -36,7 +37,7 @@ * 一个RateLimiter组件 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JdkRateLimiter extends RateLimiter { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/jdk/RateLimiterObject.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/jdk/RateLimiterObject.java index 0f5bcc1863..115f0c9d6e 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/jdk/RateLimiterObject.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/jdk/RateLimiterObject.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.support.rate.jdk; @@ -28,7 +29,7 @@ * 基于令牌桶实现的速率限制器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RateLimiterObject { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/redis/RedisRatelimiter.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/redis/RedisRatelimiter.java index 0182e75d77..5010a83973 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/redis/RedisRatelimiter.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/redis/RedisRatelimiter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.support.rate.redis; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RedisRatelimiter extends RateLimiter { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/redis/RedisRatelimiterObject.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/redis/RedisRatelimiterObject.java index 7e8884a5d1..10bc20ca4a 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/redis/RedisRatelimiterObject.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/redis/RedisRatelimiterObject.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.limiter.support.rate.redis; @@ -38,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RedisRatelimiterObject extends RedissonObject { diff --git a/bus-logger/pom.xml b/bus-logger/pom.xml index 1a5e9c6c68..1299dabbe9 100644 --- a/bus-logger/pom.xml +++ b/bus-logger/pom.xml @@ -6,13 +6,38 @@ org.aoju bus-logger - 6.1.1 + 6.1.2 jar ${project.artifactId} Bus Logger https://github.com/aoju/bus + + + The MIT License (MIT) + https://opensource.org/licenses/MIT + + + + + scm:git@github.com:aoju/bus.git + scm:git@github.com:aoju/bus.git + git@github.com:aoju/bus.git + + + + + Kimi Liu + https://github.com/aoju/bus.git + + + + + Github Issue + https://github.com/aoju/bus/issues + + UTF-8 UTF-8 @@ -20,7 +45,7 @@ 1.7.30 1.2.3 1.2.17 - 2.13.2 + 2.14.0 1.2 2.1.2 3.4.1.Final @@ -82,31 +107,6 @@ - - - The MIT License (MIT) - https://opensource.org/licenses/MIT - - - - - scm:git@github.com:aoju/bus.git - scm:git@github.com:aoju/bus.git - git@github.com:aoju/bus.git - - - - - Kimi Liu - https://github.com/aoju/bus.git - - - - - Github Issue - https://github.com/aoju/bus/issues - - diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/AbstractAware.java b/bus-logger/src/main/java/org/aoju/bus/logger/AbstractAware.java index 42f0cad33d..fb5039715e 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/AbstractAware.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/AbstractAware.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.logger; @@ -35,7 +36,7 @@ * 实现了一些通用的接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8++ */ public abstract class AbstractAware implements Log, Serializable { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/GlobalFactory.java b/bus-logger/src/main/java/org/aoju/bus/logger/GlobalFactory.java index cd2de57852..8b8eec0848 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/GlobalFactory.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/GlobalFactory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.logger; @@ -36,7 +37,7 @@ * 用于减少日志工厂创建,减少日志库探测 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class GlobalFactory { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/Log.java b/bus-logger/src/main/java/org/aoju/bus/logger/Log.java index 53321af7ab..230e65c1fe 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/Log.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/Log.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.logger; @@ -30,7 +31,7 @@ * 日志统一接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Log extends TraceLog, DebugLog, InfoLog, WarnLog, ErrorLog { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/LogFactory.java b/bus-logger/src/main/java/org/aoju/bus/logger/LogFactory.java index 7873045315..e4c6f003c1 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/LogFactory.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/LogFactory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.logger; @@ -39,7 +40,7 @@ * 日志工厂类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class LogFactory { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/Logger.java b/bus-logger/src/main/java/org/aoju/bus/logger/Logger.java index 52dda78dbd..3b0f6d324a 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/Logger.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/Logger.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.logger; @@ -32,7 +33,7 @@ * 静态日志类,用于在不引入日志对象的情况下打印日志 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Logger { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/commons/ApacheCommonsLog.java b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/commons/ApacheCommonsLog.java index 684c2f176f..fddd77d85c 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/commons/ApacheCommonsLog.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/commons/ApacheCommonsLog.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.logger.dialect.commons; @@ -35,7 +36,7 @@ * Apache Commons Logging * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ApacheCommonsLog extends AbstractAware { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/commons/ApacheCommonsLog4JLog.java b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/commons/ApacheCommonsLog4JLog.java index 8b66d3b580..70a7b2b517 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/commons/ApacheCommonsLog4JLog.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/commons/ApacheCommonsLog4JLog.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.logger.dialect.commons; @@ -32,7 +33,7 @@ * Apache Commons Logging for Log4j * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ApacheCommonsLog4JLog extends Log4jLog { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/commons/ApacheCommonsLogFactory.java b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/commons/ApacheCommonsLogFactory.java index 80fde88527..9fa00971e3 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/commons/ApacheCommonsLogFactory.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/commons/ApacheCommonsLogFactory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.logger.dialect.commons; @@ -31,7 +32,7 @@ * Apache Commons Logging * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ApacheCommonsLogFactory extends LogFactory { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/console/ConsoleLog.java b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/console/ConsoleLog.java index a676a19259..0230ad2dc7 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/console/ConsoleLog.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/console/ConsoleLog.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.logger.dialect.console; @@ -37,7 +38,7 @@ * 利用System.out.println()打印日志 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ConsoleLog extends AbstractAware { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/console/ConsoleLogFactory.java b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/console/ConsoleLogFactory.java index 19ae4eea53..db2f003f15 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/console/ConsoleLogFactory.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/console/ConsoleLogFactory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.logger.dialect.console; @@ -31,7 +32,7 @@ * 利用System.out.println()打印日志 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ConsoleLogFactory extends LogFactory { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/jboss/JbossLog.java b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/jboss/JbossLog.java index 58cf229c7c..8f0646694e 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/jboss/JbossLog.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/jboss/JbossLog.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.logger.dialect.jboss; @@ -34,7 +35,7 @@ * Jboss-Logging log. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JbossLog extends AbstractAware { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/jboss/JbossLogFactory.java b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/jboss/JbossLogFactory.java index 950c705e39..90fd4287d9 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/jboss/JbossLogFactory.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/jboss/JbossLogFactory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.logger.dialect.jboss; @@ -31,7 +32,7 @@ * Jboss-Logging * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JbossLogFactory extends LogFactory { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/jdk/JdkLog.java b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/jdk/JdkLog.java index f5ab2535fd..d1e5fdff8b 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/jdk/JdkLog.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/jdk/JdkLog.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.logger.dialect.jdk; @@ -36,7 +37,7 @@ * java.util.logging log. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JdkLog extends AbstractAware { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/jdk/JdkLogFactory.java b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/jdk/JdkLogFactory.java index 887f7d5421..fb52947d4b 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/jdk/JdkLogFactory.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/jdk/JdkLogFactory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.logger.dialect.jdk; @@ -38,7 +39,7 @@ * java.util.logging * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JdkLogFactory extends LogFactory { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/log4j/Log4jLog.java b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/log4j/Log4jLog.java index 1488904fe4..800e8166e8 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/log4j/Log4jLog.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/log4j/Log4jLog.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.logger.dialect.log4j; @@ -34,7 +35,7 @@ * Apache Log4J log. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Log4jLog extends AbstractAware { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/log4j/Log4jLogFactory.java b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/log4j/Log4jLogFactory.java index bcdae71530..b3b03a6a66 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/log4j/Log4jLogFactory.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/log4j/Log4jLogFactory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.logger.dialect.log4j; @@ -31,7 +32,7 @@ * Apache Log4J * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Log4jLogFactory extends LogFactory { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/log4j2/Log4j2Log.java b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/log4j2/Log4j2Log.java index 395fbdbabc..02bb59614f 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/log4j2/Log4j2Log.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/log4j2/Log4j2Log.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.logger.dialect.log4j2; @@ -35,7 +36,7 @@ * Apache Log4J 2 log. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Log4j2Log extends AbstractAware { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/log4j2/Log4j2LogFactory.java b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/log4j2/Log4j2LogFactory.java index b2834cf199..dab66d531f 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/log4j2/Log4j2LogFactory.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/log4j2/Log4j2LogFactory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.logger.dialect.log4j2; @@ -31,7 +32,7 @@ * Apache Log4J 2 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Log4j2LogFactory extends LogFactory { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/slf4j/Slf4jLog.java b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/slf4j/Slf4jLog.java index bb95ad75f3..b744405539 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/slf4j/Slf4jLog.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/slf4j/Slf4jLog.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.logger.dialect.slf4j; @@ -37,7 +38,7 @@ * 无缝支持 LogBack * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Slf4jLog extends AbstractAware { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/slf4j/Slf4jLogFactory.java b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/slf4j/Slf4jLogFactory.java index 3bb4b162b0..bcf7214293 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/slf4j/Slf4jLogFactory.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/slf4j/Slf4jLogFactory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.logger.dialect.slf4j; @@ -39,7 +40,7 @@ * 无缝支持LogBack * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Slf4jLogFactory extends LogFactory { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/tinylog/TinyLog.java b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/tinylog/TinyLog.java index 9aed569428..cd9f29ca5f 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/tinylog/TinyLog.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/tinylog/TinyLog.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.logger.dialect.tinylog; @@ -39,7 +40,7 @@ * tinylog2 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TinyLog extends AbstractAware { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/tinylog/TinyLogFactory.java b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/tinylog/TinyLogFactory.java index c59637eda8..a0a704960f 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/tinylog/TinyLogFactory.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/tinylog/TinyLogFactory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.logger.dialect.tinylog; @@ -31,7 +32,7 @@ * TinyLog2 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TinyLogFactory extends LogFactory { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/level/DebugLog.java b/bus-logger/src/main/java/org/aoju/bus/logger/level/DebugLog.java index c4630a478d..3bda6be58e 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/level/DebugLog.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/level/DebugLog.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.logger.level; @@ -28,7 +29,7 @@ * DEBUG级别日志接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface DebugLog { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/level/ErrorLog.java b/bus-logger/src/main/java/org/aoju/bus/logger/level/ErrorLog.java index 3355ba72da..c13bc95bee 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/level/ErrorLog.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/level/ErrorLog.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.logger.level; @@ -28,7 +29,7 @@ * ERROR级别日志接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface ErrorLog { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/level/InfoLog.java b/bus-logger/src/main/java/org/aoju/bus/logger/level/InfoLog.java index 924db3a97b..6fa362bac3 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/level/InfoLog.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/level/InfoLog.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.logger.level; @@ -28,7 +29,7 @@ * INFO级别日志接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface InfoLog { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/level/Level.java b/bus-logger/src/main/java/org/aoju/bus/logger/level/Level.java index 45abdca64b..c570348397 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/level/Level.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/level/Level.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.logger.level; @@ -28,7 +29,7 @@ * 日志等级 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum Level { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/level/TraceLog.java b/bus-logger/src/main/java/org/aoju/bus/logger/level/TraceLog.java index 65236b4d2a..f7e25fcccb 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/level/TraceLog.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/level/TraceLog.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.logger.level; @@ -28,7 +29,7 @@ * TRACE级别日志接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface TraceLog { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/level/WarnLog.java b/bus-logger/src/main/java/org/aoju/bus/logger/level/WarnLog.java index d4162afe6d..98c7195ab1 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/level/WarnLog.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/level/WarnLog.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.logger.level; @@ -28,7 +29,7 @@ * WARN级别日志接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface WarnLog { diff --git a/bus-mapper/pom.xml b/bus-mapper/pom.xml index 9b18448267..8c76e8550c 100755 --- a/bus-mapper/pom.xml +++ b/bus-mapper/pom.xml @@ -6,20 +6,45 @@ org.aoju bus-mapper - 6.1.1 + 6.1.2 jar ${project.artifactId} Bus Mapper https://github.com/aoju/bus + + + The MIT License (MIT) + https://opensource.org/licenses/MIT + + + + + scm:git@github.com:aoju/bus.git + scm:git@github.com:aoju/bus.git + git@github.com:aoju/bus.git + + + + + Kimi Liu + https://github.com/aoju/bus.git + + + + + Github Issue + https://github.com/aoju/bus/issues + + UTF-8 UTF-8 1.8 - 1.18.12 - 3.5.5 - 2.0.5 + 1.18.16 + 3.5.6 + 2.0.6 2.2 @@ -55,31 +80,6 @@ - - - The MIT License (MIT) - https://opensource.org/licenses/MIT - - - - - scm:git@github.com:aoju/bus.git - scm:git@github.com:aoju/bus.git - git@github.com:aoju/bus.git - - - - - Kimi Liu - https://github.com/aoju/bus.git - - - - - Github Issue - https://github.com/aoju/bus/issues - - diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/annotation/ColumnType.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/annotation/ColumnType.java index 6fc65c958d..51b93f9f6c 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/annotation/ColumnType.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/annotation/ColumnType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.annotation; @@ -38,7 +39,7 @@ * 针对列的复杂属性配置 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Target({ElementType.FIELD}) diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/annotation/NameStyle.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/annotation/NameStyle.java index ea5b92f0fa..2f6b7bb798 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/annotation/NameStyle.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/annotation/NameStyle.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.annotation; @@ -35,7 +36,7 @@ * 名字转换样式,注解的优先级高于全局配置 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Target({ElementType.TYPE}) diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/annotation/Version.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/annotation/Version.java index 346259b3e6..78a3cad2fd 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/annotation/Version.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/annotation/Version.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.annotation; @@ -36,7 +37,7 @@ * 版本信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Target({ElementType.FIELD}) diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/Builder.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/Builder.java index 69274b7b37..7a2cb31a13 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/Builder.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/Builder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.builder; diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/EntityBuilder.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/EntityBuilder.java index 5fb119e6d1..a9d170c912 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/EntityBuilder.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/EntityBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.builder; @@ -50,7 +51,7 @@ * 实体类工具类 - 处理实体和数据库表以及字段 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class EntityBuilder { @@ -191,7 +192,7 @@ public static synchronized void initEntityNameMap(Class entityClass, Config c } for (EntityField field : fields) { //如果启用了简单类型,就做简单类型校验,如果不是简单类型,直接跳过 - //6.1.1 如果启用了枚举作为简单类型,就不会自动忽略枚举类型 + //6.1.2 如果启用了枚举作为简单类型,就不会自动忽略枚举类型 if (config.isUseSimpleType() && !(SimpleType.isSimpleType(field.getJavaType()) || diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/FieldSourceBuilder.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/FieldSourceBuilder.java index ac09232ba8..c2e9899b5c 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/FieldSourceBuilder.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/FieldSourceBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.builder; @@ -41,7 +42,7 @@ * 类字段工具类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FieldSourceBuilder { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/MapperBuilder.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/MapperBuilder.java index 20e0bd4553..e0838effd1 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/MapperBuilder.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/MapperBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.builder; @@ -46,7 +47,7 @@ * 处理主要逻辑,最关键的一个类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MapperBuilder { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/MapperTemplate.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/MapperTemplate.java index dda3eca3cc..deac023f02 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/MapperTemplate.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/MapperTemplate.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.builder; @@ -54,7 +55,7 @@ * 通用Mapper模板类,扩展通用Mapper时需要继承该类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class MapperTemplate { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/OGNL.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/OGNL.java index 8ac73a8f3e..4d4db1bdcf 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/OGNL.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/OGNL.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.builder; @@ -35,7 +36,7 @@ * OGNL静态方法 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class OGNL { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/SqlSourceBuilder.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/SqlSourceBuilder.java index 5555eaf46a..9963025fce 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/SqlSourceBuilder.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/SqlSourceBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.builder; @@ -38,7 +39,7 @@ * 拼常用SQL的工具类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SqlSourceBuilder { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/BasicMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/BasicMapper.java index 8d5356875e..d554a7fe51 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/BasicMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/BasicMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common; @@ -33,7 +34,7 @@ * 通用Mapper接口,其他接口继承该接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface BasicMapper extends diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/ConditionMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/ConditionMapper.java index 6c9f1bf931..23d47fee9a 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/ConditionMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/ConditionMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common; @@ -31,7 +32,7 @@ * 通用Mapper接口,Condition查询 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface ConditionMapper extends diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/IdsMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/IdsMapper.java index 50876217dd..c8ec34fbe4 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/IdsMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/IdsMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common; @@ -31,7 +32,7 @@ * 通用Mapper接口,根据ids操作 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface IdsMapper extends SelectByIdsMapper, DeleteByIdsMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/Mapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/Mapper.java index bd16dbc2a0..be486dc108 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/Mapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/Mapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common; @@ -28,7 +29,7 @@ * 通用Mapper接口,其他接口继承该接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Mapper extends diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/Marker.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/Marker.java index ec0471af99..0cca7f33d8 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/Marker.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/Marker.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common; @@ -28,7 +29,7 @@ * 标记接口,继承该接口的接口,在MapperScannerConfigurer#setMarkerInterface时,会自动注册到通用Mapper * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Marker { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/RowBoundsMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/RowBoundsMapper.java index a19789bc17..09ae2606ab 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/RowBoundsMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/RowBoundsMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common; @@ -31,7 +32,7 @@ * 配合分页插件可以实现物理分页 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface RowBoundsMapper extends diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/BasicDeleteMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/BasicDeleteMapper.java index a2baca65d2..f22884a03e 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/BasicDeleteMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/BasicDeleteMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common.basic; @@ -31,7 +32,7 @@ * 通用Mapper接口,基础删除 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface BasicDeleteMapper extends diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/BasicInsertMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/BasicInsertMapper.java index 8d9f0d33b9..fbdd025b2a 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/BasicInsertMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/BasicInsertMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common.basic; @@ -32,7 +33,7 @@ * 通用Mapper接口,基础查询 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface BasicInsertMapper extends diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/BasicSelectMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/BasicSelectMapper.java index 8341a5a3f6..6b4399e061 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/BasicSelectMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/BasicSelectMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common.basic; @@ -30,7 +31,7 @@ * 通用Mapper接口,基础查询 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface BasicSelectMapper extends diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/BasicUpdateMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/BasicUpdateMapper.java index 451caefdf8..15b2360c47 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/BasicUpdateMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/BasicUpdateMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common.basic; @@ -31,7 +32,7 @@ * 通用Mapper接口,基础查询 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface BasicUpdateMapper extends diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/delete/DeleteByPrimaryKeyMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/delete/DeleteByPrimaryKeyMapper.java index f47a4232e5..6d5287058b 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/delete/DeleteByPrimaryKeyMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/delete/DeleteByPrimaryKeyMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common.basic.delete; @@ -31,7 +32,7 @@ * 通用Mapper接口,删除 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface DeleteByPrimaryKeyMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/delete/DeleteMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/delete/DeleteMapper.java index dc8dadb059..0032dfa237 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/delete/DeleteMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/delete/DeleteMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common.basic.delete; @@ -31,7 +32,7 @@ * 通用Mapper接口,删除 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface DeleteMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/insert/InsertListMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/insert/InsertListMapper.java index 3d538dcf4b..863d1fd98d 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/insert/InsertListMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/insert/InsertListMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common.basic.insert; @@ -34,7 +35,7 @@ * 通用Mapper接口,特殊方法,批量插入,支持批量插入的数据库都可以使用,例如mysql,h2等 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface InsertListMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/insert/InsertMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/insert/InsertMapper.java index 2734b40da7..953f86fc1a 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/insert/InsertMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/insert/InsertMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common.basic.insert; @@ -31,7 +32,7 @@ * 通用Mapper接口,插入 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface InsertMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/insert/InsertSelectiveMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/insert/InsertSelectiveMapper.java index eb59be323d..97e0f0c801 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/insert/InsertSelectiveMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/insert/InsertSelectiveMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common.basic.insert; @@ -31,7 +32,7 @@ * 通用Mapper接口,插入 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface InsertSelectiveMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/ExistsWithPrimaryKeyMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/ExistsWithPrimaryKeyMapper.java index 52e59f0d83..6e97e8019c 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/ExistsWithPrimaryKeyMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/ExistsWithPrimaryKeyMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common.basic.select; @@ -31,7 +32,7 @@ * 通用Mapper接口,查询 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface ExistsWithPrimaryKeyMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectAllMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectAllMapper.java index 4fdf126cf2..e75e0d5e06 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectAllMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectAllMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common.basic.select; @@ -33,7 +34,7 @@ * 通用Mapper接口,查询全部 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface SelectAllMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectByPrimaryKeyMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectByPrimaryKeyMapper.java index 0b6bd396cb..c2707b97bb 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectByPrimaryKeyMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectByPrimaryKeyMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common.basic.select; @@ -31,7 +32,7 @@ * 通用Mapper接口,其他接口继承该接口即可 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface SelectByPrimaryKeyMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectCountMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectCountMapper.java index 8d0d29c970..3a0e6d61da 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectCountMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectCountMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common.basic.select; @@ -31,7 +32,7 @@ * 通用Mapper接口,查询 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface SelectCountMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectMapper.java index d09c4f3808..a80392a9a3 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common.basic.select; @@ -33,7 +34,7 @@ * 通用Mapper接口,查询 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface SelectMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectOneMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectOneMapper.java index 330359e3b1..a3a1916a14 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectOneMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectOneMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common.basic.select; @@ -31,7 +32,7 @@ * 通用Mapper接口,查询 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface SelectOneMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/update/UpdateByPrimaryKeyMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/update/UpdateByPrimaryKeyMapper.java index 18c53b42bf..9bfccd77ca 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/update/UpdateByPrimaryKeyMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/update/UpdateByPrimaryKeyMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common.basic.update; @@ -32,7 +33,7 @@ * 通用Mapper接口,更新 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface UpdateByPrimaryKeyMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/update/UpdateByPrimaryKeySelectiveMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/update/UpdateByPrimaryKeySelectiveMapper.java index 2bb144b4b1..d59bd939f3 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/update/UpdateByPrimaryKeySelectiveMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/update/UpdateByPrimaryKeySelectiveMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common.basic.update; @@ -32,7 +33,7 @@ * 通用Mapper接口,更新 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface UpdateByPrimaryKeySelectiveMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/DeleteByConditionMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/DeleteByConditionMapper.java index 097b59cf31..24b5e92a13 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/DeleteByConditionMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/DeleteByConditionMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common.condition; @@ -31,7 +32,7 @@ * 通用Mapper接口,Condition查询 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface DeleteByConditionMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/SelectByConditionMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/SelectByConditionMapper.java index 3d69544b2c..f7ff8ee9c8 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/SelectByConditionMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/SelectByConditionMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common.condition; @@ -33,7 +34,7 @@ * 通用Mapper接口,Condition查询 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface SelectByConditionMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/SelectCountByConditionMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/SelectCountByConditionMapper.java index 0eeecbb1c6..8ee7a81472 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/SelectCountByConditionMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/SelectCountByConditionMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common.condition; @@ -31,7 +32,7 @@ * 通用Mapper接口,Condition查询 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface SelectCountByConditionMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/UpdateByConditionMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/UpdateByConditionMapper.java index 09ea153bd6..79981b0c39 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/UpdateByConditionMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/UpdateByConditionMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common.condition; @@ -33,7 +34,7 @@ * 通用Mapper接口,Condition查询 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface UpdateByConditionMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/UpdateByConditionSelectiveMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/UpdateByConditionSelectiveMapper.java index 7b5d7a8445..dead9af08a 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/UpdateByConditionSelectiveMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/UpdateByConditionSelectiveMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common.condition; @@ -33,7 +34,7 @@ * 通用Mapper接口,Condition查询 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface UpdateByConditionSelectiveMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/dialect/SqlServerMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/dialect/SqlServerMapper.java index d7545a54a5..07d153cac8 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/dialect/SqlServerMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/dialect/SqlServerMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common.dialect; @@ -32,7 +33,7 @@ * 通用Mapper接口,SqlServerMapper独有的通用方法 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface SqlServerMapper extends diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/dialect/sqlserver/InsertMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/dialect/sqlserver/InsertMapper.java index 6f27354905..ee2621883f 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/dialect/sqlserver/InsertMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/dialect/sqlserver/InsertMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common.dialect.sqlserver; @@ -32,7 +33,7 @@ * 通用Mapper接口,插入 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface InsertMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/dialect/sqlserver/InsertSelectiveMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/dialect/sqlserver/InsertSelectiveMapper.java index 165247ff7d..c574b9e1ce 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/dialect/sqlserver/InsertSelectiveMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/dialect/sqlserver/InsertSelectiveMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common.dialect.sqlserver; @@ -32,7 +33,7 @@ * 通用Mapper接口,插入 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface InsertSelectiveMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/ids/DeleteByIdsMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/ids/DeleteByIdsMapper.java index 5fad382a93..92dc00f022 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/ids/DeleteByIdsMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/ids/DeleteByIdsMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common.ids; @@ -31,7 +32,7 @@ * 通用Mapper接口,根据ids删除 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface DeleteByIdsMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/ids/SelectByIdsMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/ids/SelectByIdsMapper.java index 70c2be2ece..a5c7872a1c 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/ids/SelectByIdsMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/ids/SelectByIdsMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common.ids; @@ -33,7 +34,7 @@ * 通用Mapper接口,根据ids查询 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface SelectByIdsMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/rowbounds/SelectByConditionRowBoundsMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/rowbounds/SelectByConditionRowBoundsMapper.java index 3d09a3c51c..6e32988f8e 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/rowbounds/SelectByConditionRowBoundsMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/rowbounds/SelectByConditionRowBoundsMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common.rowbounds; @@ -34,7 +35,7 @@ * 通用Mapper接口,Condition查询 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface SelectByConditionRowBoundsMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/rowbounds/SelectRowBoundsMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/rowbounds/SelectRowBoundsMapper.java index f7b7eaf4d1..84bdb091b7 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/rowbounds/SelectRowBoundsMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/rowbounds/SelectRowBoundsMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.common.rowbounds; @@ -34,7 +35,7 @@ * 通用Mapper接口,查询 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface SelectRowBoundsMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Assert.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Assert.java index 38be02e631..3c99ed1c22 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Assert.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Assert.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.criteria; @@ -33,7 +34,7 @@ * 规则处理 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Assert { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Criteria.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Criteria.java index af30004be1..834dc77aba 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Criteria.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Criteria.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.criteria; @@ -37,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Criteria { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Criterion.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Criterion.java index a96655fa48..a66c9348cb 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Criterion.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Criterion.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.criteria; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Criterion { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Identity.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Identity.java index b30a41b53b..ad420050e4 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Identity.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Identity.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.criteria; @@ -28,7 +29,7 @@ * 主键处理 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum Identity { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/OrderBy.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/OrderBy.java index 383d746419..f370c30e4c 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/OrderBy.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/OrderBy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.criteria; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class OrderBy { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/SimpleType.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/SimpleType.java index 9bfa104777..dd34935005 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/SimpleType.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/SimpleType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.criteria; @@ -37,7 +38,7 @@ * 参考 org.apache.ibatis.type.SimpleTypeRegistry * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SimpleType { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/SqlsCriteria.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/SqlsCriteria.java index 4e07954b06..22c90a4e79 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/SqlsCriteria.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/SqlsCriteria.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.criteria; @@ -28,7 +29,7 @@ * 条件处理 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface SqlsCriteria { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Style.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Style.java index cbfe2a1f24..a58e4726b1 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Style.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Style.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.criteria; @@ -28,7 +29,7 @@ * 字段转换方式 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum Style { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Words.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Words.java index 5482fdfaa9..43a649e700 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Words.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Words.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.criteria; @@ -31,7 +32,7 @@ * 关键字处理 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Words { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/Condition.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/Condition.java index e0763e710b..e299a61e8b 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/Condition.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/Condition.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.entity; @@ -37,7 +38,7 @@ * 通用查询对象 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Condition implements EntityTableName { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/Config.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/Config.java index a876d94693..9c80c1e780 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/Config.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/Config.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.entity; @@ -39,7 +40,7 @@ * 通用Mapper属性配置 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Config { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/EntityColumn.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/EntityColumn.java index cbf9dcdda4..65b512aa0b 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/EntityColumn.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/EntityColumn.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.entity; @@ -33,7 +34,7 @@ * 数据库表对应的列 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class EntityColumn { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/EntityField.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/EntityField.java index b8f057ca4e..eb92c2b146 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/EntityField.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/EntityField.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.entity; @@ -33,7 +34,7 @@ * 封装字段和方法,统一调用某些方法 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class EntityField { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/EntityTable.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/EntityTable.java index 4b13b58378..49904533f2 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/EntityTable.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/EntityTable.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.entity; @@ -44,7 +45,7 @@ * 数据库表 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class EntityTable { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/EntityTableName.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/EntityTableName.java index 55d118daf1..f7e0f4eefa 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/EntityTableName.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/EntityTableName.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.entity; @@ -28,7 +29,7 @@ * 实现动态表名时,实体类需要实现该接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface EntityTableName { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/executor/SelectKey.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/executor/SelectKey.java index 8c27ebf8cb..4ca6f19a04 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/executor/SelectKey.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/executor/SelectKey.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.executor; @@ -48,7 +49,7 @@ * 主键处理 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SelectKey implements KeyGenerator { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/handlers/AbstractSqlHandler.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/handlers/AbstractSqlHandler.java index 979a67dcc6..e919d6e9e5 100644 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/handlers/AbstractSqlHandler.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/handlers/AbstractSqlHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.handlers; @@ -37,7 +38,7 @@ * SQL 解析处理器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractSqlHandler { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/BaseDeleteProvider.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/BaseDeleteProvider.java index 9ea4f90d66..4d1965dd45 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/BaseDeleteProvider.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/BaseDeleteProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.provider; @@ -33,7 +34,7 @@ * BaseDeleteMapper实现类,基础方法实现类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BaseDeleteProvider extends MapperTemplate { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/BaseInsertProvider.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/BaseInsertProvider.java index 4e7872a050..b97d3e3a08 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/BaseInsertProvider.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/BaseInsertProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.provider; @@ -41,7 +42,7 @@ * BaseInsertProvider实现类,基础方法实现类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BaseInsertProvider extends MapperTemplate { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/BaseSelectProvider.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/BaseSelectProvider.java index 65495c48a2..d4bbce6ce6 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/BaseSelectProvider.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/BaseSelectProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.provider; @@ -33,7 +34,7 @@ * BaseSelectProvider实现类,基础方法实现类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BaseSelectProvider extends MapperTemplate { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/BaseUpdateProvider.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/BaseUpdateProvider.java index dfab114494..482d3f95e7 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/BaseUpdateProvider.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/BaseUpdateProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.provider; @@ -33,7 +34,7 @@ * BaseUpdateProvider实现类,基础方法实现类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BaseUpdateProvider extends MapperTemplate { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/ConditionProvider.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/ConditionProvider.java index 8106e4ef05..e7322c4202 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/ConditionProvider.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/ConditionProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.provider; @@ -33,7 +34,7 @@ * ConditionProvider实现类,基础方法实现类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ConditionProvider extends MapperTemplate { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/EmptyProvider.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/EmptyProvider.java index 3862811c02..a661d451fd 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/EmptyProvider.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/EmptyProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.provider; @@ -32,7 +33,7 @@ * 如BaseSelectMapper,接口纯继承,不包含任何方法 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class EmptyProvider extends MapperTemplate { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/IdsProvider.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/IdsProvider.java index 2c9f7aafac..60640f58ac 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/IdsProvider.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/IdsProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.provider; @@ -39,7 +40,7 @@ * ids 如 "1,2,3" * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class IdsProvider extends MapperTemplate { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/InsertListProvider.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/InsertListProvider.java index e4a8781572..f733497b7c 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/InsertListProvider.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/InsertListProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.provider; @@ -39,7 +40,7 @@ * ids 如 "1,2,3" * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class InsertListProvider extends MapperTemplate { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/SqlServerProvider.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/SqlServerProvider.java index 11dc25d4dd..e380f173a2 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/SqlServerProvider.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/SqlServerProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.provider; @@ -33,7 +34,7 @@ * SqlServerProvider实现类,特殊方法实现类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SqlServerProvider extends MapperTemplate { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/reflection/Reflector.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/reflection/Reflector.java index 2589ec0107..9dc9e25918 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/reflection/Reflector.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/reflection/Reflector.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.reflection; @@ -32,7 +33,7 @@ * 反射工具 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Reflector { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/version/DefaultVersion.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/version/DefaultVersion.java index 603c4981b2..eadce1372a 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/version/DefaultVersion.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/version/DefaultVersion.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.version; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DefaultVersion implements NextVersion { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/version/NextVersion.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/version/NextVersion.java index 6343e39469..7d4d6e9604 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/version/NextVersion.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/version/NextVersion.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.version; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface NextVersion { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/version/VersionException.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/version/VersionException.java index d1e2964bfe..1cf9ee2933 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/version/VersionException.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/version/VersionException.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.mapper.version; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class VersionException extends RuntimeException { diff --git a/bus-notify/README.md b/bus-notify/README.md index 8e192afb3f..a61038f234 100755 --- a/bus-notify/README.md +++ b/bus-notify/README.md @@ -12,7 +12,7 @@ org.aoju bus-notify - 6.1.1 + 6.1.2 ``` diff --git a/bus-notify/pom.xml b/bus-notify/pom.xml index e642ca5f31..50b91f2900 100755 --- a/bus-notify/pom.xml +++ b/bus-notify/pom.xml @@ -6,19 +6,44 @@ org.aoju bus-notify - 6.1.1 + 6.1.2 jar ${project.artifactId} Bus Notify https://github.com/aoju/bus + + + The MIT License (MIT) + https://opensource.org/licenses/MIT + + + + + scm:git@github.com:aoju/bus.git + scm:git@github.com:aoju/bus.git + git@github.com:aoju/bus.git + + + + + Kimi Liu + https://github.com/aoju/bus.git + + + + + Github Issue + https://github.com/aoju/bus/issues + + UTF-8 UTF-8 1.8 - 1.18.12 - 1.2.73 + 1.18.16 + 1.2.75 1.6.2 @@ -53,31 +78,6 @@ - - - The MIT License (MIT) - https://opensource.org/licenses/MIT - - - - - scm:git@github.com:aoju/bus.git - scm:git@github.com:aoju/bus.git - git@github.com:aoju/bus.git - - - - - Kimi Liu - https://github.com/aoju/bus.git - - - - - Github Issue - https://github.com/aoju/bus/issues - - diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/Builder.java b/bus-notify/src/main/java/org/aoju/bus/notify/Builder.java index a56649ff56..1f5a3e9b11 100755 --- a/bus-notify/src/main/java/org/aoju/bus/notify/Builder.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/Builder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.notify; @@ -34,7 +35,7 @@ * 构造信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Setter diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/Context.java b/bus-notify/src/main/java/org/aoju/bus/notify/Context.java index 4f1a3a701d..6169a4a0af 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/Context.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/Context.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.notify; @@ -31,7 +32,7 @@ * 配置信息 * * @author Justubborn - * @version 6.1.1 + * @version 6.1.2 * @since JDK1.8+ */ @Data diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/Provider.java b/bus-notify/src/main/java/org/aoju/bus/notify/Provider.java index bf9f68eb2a..85b384e1cb 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/Provider.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/Provider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.notify; @@ -35,7 +36,7 @@ * 通知器,用于发送通知,如: 短信,邮件,语音,微信等s * * @author Justubborn - * @version 6.1.1 + * @version 6.1.2 * @since JDK1.8+ */ public interface Provider { diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/Registry.java b/bus-notify/src/main/java/org/aoju/bus/notify/Registry.java index 2d5b811e9d..6da54c225c 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/Registry.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/Registry.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.notify; @@ -28,7 +29,7 @@ * 通知注册器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum Registry { diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/magic/Message.java b/bus-notify/src/main/java/org/aoju/bus/notify/magic/Message.java index ec71c2bee3..0230aa9ef8 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/magic/Message.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/magic/Message.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.notify.magic; @@ -31,7 +32,7 @@ * 返回消息 * * @author Justubborn - * @version 6.1.1 + * @version 6.1.2 * @since JDK1.8+ */ @Data diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/magic/Property.java b/bus-notify/src/main/java/org/aoju/bus/notify/magic/Property.java index 455978fc65..90092cfecf 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/magic/Property.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/magic/Property.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.notify.magic; @@ -32,7 +33,7 @@ * 消息模版 * * @author Justubborn - * @version 6.1.1 + * @version 6.1.2 * @since JDK1.8+ */ @Getter diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/metric/NotifyCache.java b/bus-notify/src/main/java/org/aoju/bus/notify/metric/NotifyCache.java index 6b3489b100..0f5f5bbb30 100755 --- a/bus-notify/src/main/java/org/aoju/bus/notify/metric/NotifyCache.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/metric/NotifyCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.notify.metric; @@ -32,7 +33,7 @@ * 默认缓存实现 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum NotifyCache implements ExtendCache { diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/AbstractProvider.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/AbstractProvider.java index 950407d72d..9d25c04b07 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/AbstractProvider.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/AbstractProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.notify.provider; @@ -36,7 +37,7 @@ * 抽象类 * * @author Justubborn - * @version 6.1.1 + * @version 6.1.2 * @since JDK1.8+ */ @AllArgsConstructor diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunDmProperty.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunDmProperty.java index 5a3c99299f..c09c8e7e0e 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunDmProperty.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunDmProperty.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.notify.provider.aliyun; @@ -33,7 +34,7 @@ * 阿里云邮件模版 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Getter diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunDmProvider.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunDmProvider.java index 1981df6747..7bf80a6db8 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunDmProvider.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunDmProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.notify.provider.aliyun; @@ -40,7 +41,7 @@ * 阿里云邮件 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AliyunDmProvider extends AliyunProvider { diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunProvider.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunProvider.java index abbaf31c6e..4688248604 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunProvider.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.notify.provider.aliyun; @@ -52,7 +53,7 @@ * 阿里云抽象类提供者 * * @author Justubborn - * @version 6.1.1 + * @version 6.1.2 * @since JDK1.8+ */ public class AliyunProvider extends AbstractProvider { diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunSmsProperty.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunSmsProperty.java index 399e678d7e..ccf09830b0 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunSmsProperty.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunSmsProperty.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.notify.provider.aliyun; @@ -33,7 +34,7 @@ * 阿里云短信模版 * * @author Justubborn - * @version 6.1.1 + * @version 6.1.2 * @since JDK1.8+ */ @Getter diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunSmsProvider.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunSmsProvider.java index dfc62e3d14..5e98633b85 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunSmsProvider.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunSmsProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.notify.provider.aliyun; @@ -37,7 +38,7 @@ * 阿里云短信 * * @author Justubborn - * @version 6.1.1 + * @version 6.1.2 * @since JDK1.8+ */ public class AliyunSmsProvider extends AliyunProvider { diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunVmsProperty.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunVmsProperty.java index 0f7205dabe..8205fa148b 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunVmsProperty.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunVmsProperty.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.notify.provider.aliyun; @@ -33,7 +34,7 @@ * 阿里云语音通知模版 * * @author Justubborn - * @version 6.1.1 + * @version 6.1.2 * @since JDK1.8+ */ @Getter diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunVmsProvider.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunVmsProvider.java index 632c9f6fe8..faa5c1d2a9 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunVmsProvider.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunVmsProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.notify.provider.aliyun; @@ -37,7 +38,7 @@ * 阿里云语音通知 * * @author Justubborn - * @version 6.1.1 + * @version 6.1.2 * @since JDK1.8+ */ public class AliyunVmsProvider extends AliyunProvider { diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/baidu/BaiduSmsProperty.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/baidu/BaiduSmsProperty.java index 0f25fb47d4..a469c57a07 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/baidu/BaiduSmsProperty.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/baidu/BaiduSmsProperty.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.notify.provider.baidu; @@ -33,7 +34,7 @@ * 七牛云短信 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK1.8+ */ @Getter diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/baidu/BaiduSmsProvider.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/baidu/BaiduSmsProvider.java index d1a7d51b21..8ec30a0eae 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/baidu/BaiduSmsProvider.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/baidu/BaiduSmsProvider.java @@ -8,7 +8,7 @@ * 七牛云短信 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK1.8+ */ public class BaiduSmsProvider extends NeteaseProvider { diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/dingtalk/DingTalkProperty.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/dingtalk/DingTalkProperty.java index 110f8ab75e..9e8624a42c 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/dingtalk/DingTalkProperty.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/dingtalk/DingTalkProperty.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.notify.provider.dingtalk; @@ -33,7 +34,7 @@ * 钉钉通知模版 * * @author Justubborn - * @version 6.1.1 + * @version 6.1.2 * @since JDK1.8+ */ @Getter diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/dingtalk/DingTalkProvider.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/dingtalk/DingTalkProvider.java index 1d8fed9425..45e5cbd3b7 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/dingtalk/DingTalkProvider.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/dingtalk/DingTalkProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.notify.provider.dingtalk; @@ -44,7 +45,7 @@ * 钉钉通知 * * @author Justubborn - * @version 6.1.1 + * @version 6.1.2 * @since JDK1.8+ */ @Setter diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/generic/NativeDmProperty.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/generic/NativeDmProperty.java index 615545e4cb..4dcbcf9a20 100755 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/generic/NativeDmProperty.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/generic/NativeDmProperty.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.notify.provider.generic; @@ -37,7 +38,7 @@ * 邮件消息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Getter diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/generic/NativeDmProvider.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/generic/NativeDmProvider.java index 5b8a348fb5..84ed795413 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/generic/NativeDmProvider.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/generic/NativeDmProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.notify.provider.generic; @@ -51,7 +52,7 @@ * 邮件消息 * * @author Justubborn - * @version 6.1.1 + * @version 6.1.2 * @since JDK1.8+ */ public class NativeDmProvider extends AbstractProvider { diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/huawei/HuaweiSmsProperty.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/huawei/HuaweiSmsProperty.java index 46a539e51f..8bc51a7ab1 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/huawei/HuaweiSmsProperty.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/huawei/HuaweiSmsProperty.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.notify.provider.huawei; @@ -33,7 +34,7 @@ * 七牛云短信 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK1.8+ */ @Getter diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/huawei/HuaweiSmsProvider.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/huawei/HuaweiSmsProvider.java index 10f7d5be47..07aff3f326 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/huawei/HuaweiSmsProvider.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/huawei/HuaweiSmsProvider.java @@ -8,7 +8,7 @@ * 七牛云短信 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK1.8+ */ public class HuaweiSmsProvider extends NeteaseProvider { diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/jdcloud/JdcloudSmsProperty.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/jdcloud/JdcloudSmsProperty.java index a8bbf0c1ad..15a2d9d98e 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/jdcloud/JdcloudSmsProperty.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/jdcloud/JdcloudSmsProperty.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.notify.provider.jdcloud; @@ -33,7 +34,7 @@ * 七牛云短信 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK1.8+ */ @Getter diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/jdcloud/JdcloudSmsProvider.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/jdcloud/JdcloudSmsProvider.java index 8e280c615f..b54b9f3396 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/jdcloud/JdcloudSmsProvider.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/jdcloud/JdcloudSmsProvider.java @@ -8,7 +8,7 @@ * 七牛云短信 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK1.8+ */ public class JdcloudSmsProvider extends NeteaseProvider { diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/netease/NeteaseProvider.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/netease/NeteaseProvider.java index 503d820ff0..4dee6698e5 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/netease/NeteaseProvider.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/netease/NeteaseProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.notify.provider.netease; @@ -43,7 +44,7 @@ * 网易云抽象类 * * @author Justubborn - * @version 6.1.1 + * @version 6.1.2 * @since JDK1.8+ */ public abstract class NeteaseProvider extends AbstractProvider { diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/netease/NeteaseSmsProperty.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/netease/NeteaseSmsProperty.java index 7fdfe0474e..761a6712f2 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/netease/NeteaseSmsProperty.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/netease/NeteaseSmsProperty.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.notify.provider.netease; @@ -33,7 +34,7 @@ * 网易云短信模版 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK1.8+ */ @Getter diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/netease/NeteaseSmsProvider.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/netease/NeteaseSmsProvider.java index 6c86e0ef60..1e97d9e4ec 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/netease/NeteaseSmsProvider.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/netease/NeteaseSmsProvider.java @@ -11,7 +11,7 @@ * 网易云短信消息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK1.8+ */ public class NeteaseSmsProvider extends NeteaseProvider { diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/qiniu/QiniuSmsProperty.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/qiniu/QiniuSmsProperty.java index 31733875cb..f4a121f46f 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/qiniu/QiniuSmsProperty.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/qiniu/QiniuSmsProperty.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.notify.provider.qiniu; @@ -33,7 +34,7 @@ * 七牛云短信 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK1.8+ */ @Getter diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/qiniu/QiniuSmsProvider.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/qiniu/QiniuSmsProvider.java index 6ca655577f..8093d0befb 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/qiniu/QiniuSmsProvider.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/qiniu/QiniuSmsProvider.java @@ -8,7 +8,7 @@ * 七牛云短信 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK1.8+ */ public class QiniuSmsProvider extends NeteaseProvider { diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/tencent/QCloudSmsProperty.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/tencent/QCloudSmsProperty.java index debb5974b6..a242d90437 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/tencent/QCloudSmsProperty.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/tencent/QCloudSmsProperty.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.notify.provider.tencent; @@ -33,7 +34,7 @@ * 腾讯云短信 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK1.8+ */ @Getter diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/tencent/QCloudSmsProvider.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/tencent/QCloudSmsProvider.java index 042ad638ad..0f4044fd07 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/tencent/QCloudSmsProvider.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/tencent/QCloudSmsProvider.java @@ -8,7 +8,7 @@ * 腾讯云短信 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK1.8+ */ public class QCloudSmsProvider extends NeteaseProvider { diff --git a/bus-oauth/README.md b/bus-oauth/README.md index 4d2785e4db..dc8d3b50fc 100755 --- a/bus-oauth/README.md +++ b/bus-oauth/README.md @@ -14,7 +14,7 @@ org.aoju bus-oauth - 6.1.1 + 6.1.2 ``` - 调用api diff --git a/bus-oauth/pom.xml b/bus-oauth/pom.xml index 8da418368a..cc1bf92b25 100755 --- a/bus-oauth/pom.xml +++ b/bus-oauth/pom.xml @@ -6,20 +6,45 @@ org.aoju bus-oauth - 6.1.1 + 6.1.2 jar ${project.artifactId} Bus OAuth https://github.com/aoju/bus + + + The MIT License (MIT) + https://opensource.org/licenses/MIT + + + + + scm:git@github.com:aoju/bus.git + scm:git@github.com:aoju/bus.git + git@github.com:aoju/bus.git + + + + + Kimi Liu + https://github.com/aoju/bus.git + + + + + Github Issue + https://github.com/aoju/bus/issues + + UTF-8 UTF-8 1.8 3.7.4.ALL - 1.18.12 - 1.2.73 + 1.18.16 + 1.2.75 @@ -53,31 +78,6 @@ - - - The MIT License (MIT) - https://opensource.org/licenses/MIT - - - - - scm:git@github.com:aoju/bus.git - scm:git@github.com:aoju/bus.git - git@github.com:aoju/bus.git - - - - - Kimi Liu - https://github.com/aoju/bus.git - - - - - Github Issue - https://github.com/aoju/bus/issues - - diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/Builder.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/Builder.java index 46571400ee..da8b4b2b7b 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/Builder.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/Builder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth; @@ -41,7 +42,7 @@ * 构造URL * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Setter diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/Complex.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/Complex.java index d9b6c44869..78ce650c82 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/Complex.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/Complex.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth; @@ -41,7 +42,7 @@ * ③、如果扩展了对应枚举类时,在{@link Provider#login(Callback)}中可以通过{@code xx.toString()}获取对应的source * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Complex { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/Context.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/Context.java index d9bb4f428b..99a78156d1 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/Context.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/Context.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth; @@ -36,7 +37,7 @@ * 上下文配置类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/Provider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/Provider.java index e5084127c0..f85982a1d3 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/Provider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/Provider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth; @@ -37,7 +38,7 @@ * {@link Provider#refresh(AccToken)} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Provider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/Registry.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/Registry.java index 1788513f0c..d4987eb294 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/Registry.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/Registry.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth; @@ -30,7 +31,7 @@ * 内置的各api需要的url, 用枚举类分平台类型管理 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum Registry implements Complex { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/magic/AccToken.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/magic/AccToken.java index 3ce1261f5b..85ca0e3676 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/magic/AccToken.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/magic/AccToken.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.magic; @@ -30,7 +31,7 @@ * 授权所需的token * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8++ */ @Getter diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/magic/Callback.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/magic/Callback.java index d45df76bc6..3a9db25f50 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/magic/Callback.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/magic/Callback.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.magic; @@ -31,7 +32,7 @@ * 授权回调时的参数类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Getter diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/magic/Message.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/magic/Message.java index 876952d1e4..f5a1a15366 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/magic/Message.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/magic/Message.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.magic; @@ -33,7 +34,7 @@ * 统一授权响应类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/magic/Property.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/magic/Property.java index be5d04042d..ec1deadff7 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/magic/Property.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/magic/Property.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.magic; @@ -32,7 +33,7 @@ * 授权成功后的用户信息,根据授权平台的不同,获取的数据完整性也不同 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Getter diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/metric/OauthCache.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/metric/OauthCache.java index e9819d9fc9..2f67e3bc70 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/metric/OauthCache.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/metric/OauthCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.metric; @@ -32,7 +33,7 @@ * 默认缓存实现 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum OauthCache implements ExtendCache { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/metric/OauthScope.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/metric/OauthScope.java index ffbda283fe..c4338190e3 100644 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/metric/OauthScope.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/metric/OauthScope.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.metric; @@ -35,7 +36,7 @@ * 各个平台 scope 类的统一接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class OauthScope { @@ -44,7 +45,7 @@ public class OauthScope { * 百度 授权范围 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Getter @@ -70,7 +71,7 @@ public enum Baidu implements Scope { * Coding 授权范围 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Getter @@ -97,7 +98,7 @@ public enum Coding implements Scope { * Facebook 授权范围 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Getter @@ -132,7 +133,7 @@ public enum Facebook implements Scope { * Gitee 授权范围 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Getter @@ -164,7 +165,7 @@ public enum Gitee implements Scope { * Github 授权范围 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Getter @@ -214,7 +215,7 @@ public enum Github implements Scope { * Gitlab 授权范围 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Getter @@ -246,7 +247,7 @@ public enum Gitlab implements Scope { * Google 授权范围 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Getter @@ -706,7 +707,7 @@ public static List getDriveScopes() { * 华为 授权范围 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Getter @@ -745,7 +746,7 @@ public enum Huawei implements Scope { * 京东 授权范围 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Getter @@ -767,7 +768,7 @@ public enum Jd implements Scope { * 酷家乐 授权范围 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Getter @@ -791,7 +792,7 @@ public enum Kujiale implements Scope { * 领英 授权范围 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Getter @@ -830,7 +831,7 @@ public enum Linkedin implements Scope { * 微软 授权范围 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Getter @@ -892,7 +893,7 @@ public enum Microsoft implements Scope { * 小米 授权范围 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Getter @@ -916,7 +917,7 @@ public enum Mi implements Scope { * Pinterest 授权范围 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Getter @@ -941,7 +942,7 @@ public enum Pinterest implements Scope { * QQ 授权范围 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Getter @@ -972,7 +973,7 @@ public enum Qq implements Scope { * 人人 授权范围 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Getter @@ -1022,7 +1023,7 @@ public enum Renren implements Scope { * Stackoverflow 授权范围 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Getter @@ -1047,7 +1048,7 @@ public enum StackOverflow implements Scope { * 微信公众平台 授权范围 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Getter @@ -1070,7 +1071,7 @@ public enum WechatMp implements Scope { * 微博 授权范围 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Getter @@ -1100,7 +1101,7 @@ public enum Weibo implements Scope { * 各个平台 scope 类的统一接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Scope { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/AbstractProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/AbstractProvider.java index 02bafacd82..9d6094d788 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/AbstractProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/AbstractProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.provider; @@ -57,7 +58,7 @@ * 默认的request处理类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractProvider implements Provider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/AlipayProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/AlipayProvider.java index 157937575d..d982141dbe 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/AlipayProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/AlipayProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.provider; @@ -49,7 +50,7 @@ * 支付宝登录 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AlipayProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/AliyunProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/AliyunProvider.java index 63bab6d298..ca4859e68d 100644 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/AliyunProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/AliyunProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.provider; @@ -37,7 +38,7 @@ * 阿里云登录 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AliyunProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/BaiduProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/BaiduProvider.java index a44d6a5c0d..0aed081c11 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/BaiduProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/BaiduProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.provider; @@ -44,7 +45,7 @@ * 百度账号登录 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BaiduProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/CodingProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/CodingProvider.java index c717c5c8fb..33d6aef0d0 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/CodingProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/CodingProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.provider; @@ -41,7 +42,7 @@ * Cooding登录 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CodingProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/DingTalkProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/DingTalkProvider.java index 79f1052f5d..edf22550cb 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/DingTalkProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/DingTalkProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.provider; @@ -47,7 +48,7 @@ * 钉钉登录 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DingTalkProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/DouyinProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/DouyinProvider.java index ecc61a30d9..6e75223e14 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/DouyinProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/DouyinProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.provider; @@ -41,7 +42,7 @@ * 抖音登录 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DouyinProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/ElemeProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/ElemeProvider.java index c90390bf28..80efc2456f 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/ElemeProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/ElemeProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.provider; @@ -54,7 +55,7 @@ * 注:集成的是正式环境,非沙箱环境 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ElemeProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/FacebookProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/FacebookProvider.java index 8a94c0cbee..307a84b0b8 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/FacebookProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/FacebookProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.provider; @@ -40,7 +41,7 @@ * Facebook登录 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FacebookProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/GiteeProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/GiteeProvider.java index be00b1bb9f..f1404c822f 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/GiteeProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/GiteeProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.provider; @@ -41,7 +42,7 @@ * Gitee登录 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class GiteeProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/GithubProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/GithubProvider.java index abebb916ec..004e3357b9 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/GithubProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/GithubProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.provider; @@ -47,7 +48,7 @@ * Github登录 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class GithubProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/GitlabProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/GitlabProvider.java index 5db1fb2413..bfa654e551 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/GitlabProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/GitlabProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.provider; @@ -40,7 +41,7 @@ * Gitlab登录 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class GitlabProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/GoogleProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/GoogleProvider.java index 898c775223..f7ca272c81 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/GoogleProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/GoogleProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.provider; @@ -45,7 +46,7 @@ * Google登录 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class GoogleProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/HuaweiProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/HuaweiProvider.java index cae98a13c9..4c390a47f1 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/HuaweiProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/HuaweiProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.provider; @@ -45,7 +46,7 @@ * 华为授权登录 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HuaweiProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/JdProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/JdProvider.java index 9d00989b97..ab008f189e 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/JdProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/JdProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.provider; @@ -53,7 +54,7 @@ * 京东账号登录 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JdProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/KujialeProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/KujialeProvider.java index d65a9718b9..1a700532d7 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/KujialeProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/KujialeProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.provider; @@ -42,7 +43,7 @@ * 酷家乐授权登录 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class KujialeProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/LinkedinProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/LinkedinProvider.java index 4644fb15c7..b5e26a8623 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/LinkedinProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/LinkedinProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.provider; @@ -47,7 +48,7 @@ * 领英登录 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class LinkedinProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/MeituanProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/MeituanProvider.java index 0b65780036..21e11c98ff 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/MeituanProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/MeituanProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.provider; @@ -44,7 +45,7 @@ * 美团登录 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MeituanProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/MiProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/MiProvider.java index dbd95ef158..de3927c628 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/MiProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/MiProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.provider; @@ -46,7 +47,7 @@ * 小米登录 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MiProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/MicrosoftProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/MicrosoftProvider.java index 2143561022..701ab12f22 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/MicrosoftProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/MicrosoftProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.provider; @@ -48,7 +49,7 @@ * 微软登录 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MicrosoftProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/OschinaProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/OschinaProvider.java index 8c236cda84..2bbfdfe954 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/OschinaProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/OschinaProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.provider; @@ -39,7 +40,7 @@ * oschina登录 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class OschinaProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/PinterestProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/PinterestProvider.java index 251193bb93..89f97fb4f5 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/PinterestProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/PinterestProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.provider; @@ -44,7 +45,7 @@ * Pinterest登录 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PinterestProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/QqProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/QqProvider.java index 8d02419703..2ccccd9f6d 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/QqProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/QqProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.provider; @@ -48,7 +49,7 @@ * qq登录 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class QqProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/RenrenProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/RenrenProvider.java index 449f984edb..92cce1f020 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/RenrenProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/RenrenProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.provider; @@ -46,7 +47,7 @@ * 人人登录 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RenrenProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/StackOverflowProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/StackOverflowProvider.java index 7e34d60079..0a818b2aa7 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/StackOverflowProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/StackOverflowProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.provider; @@ -46,7 +47,7 @@ * Stack Overflow登录 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class StackOverflowProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/TaobaoProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/TaobaoProvider.java index 907eaec0c7..ad8753f2d2 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/TaobaoProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/TaobaoProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.provider; @@ -40,7 +41,7 @@ * 淘宝登录 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TaobaoProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/TeambitionProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/TeambitionProvider.java index fddc17b087..d655231207 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/TeambitionProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/TeambitionProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.provider; @@ -44,7 +45,7 @@ * Teambition授权登录 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TeambitionProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/TencentProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/TencentProvider.java index c482009d00..4fe0309f3f 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/TencentProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/TencentProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.provider; @@ -39,7 +40,7 @@ * 腾讯云登录 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TencentProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/ToutiaoProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/ToutiaoProvider.java index f79a3a93e4..de61f2b37a 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/ToutiaoProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/ToutiaoProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.provider; @@ -42,7 +43,7 @@ * 今日头条登录 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ToutiaoProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/TwitterProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/TwitterProvider.java index 06af7764a5..693922fd7a 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/TwitterProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/TwitterProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.provider; @@ -51,7 +52,7 @@ * 今日头条登录 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TwitterProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/WeChatEEProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/WeChatEEProvider.java index f94c674929..03a68ec9ce 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/WeChatEEProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/WeChatEEProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.provider; @@ -41,7 +42,7 @@ * 企业微信登录 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class WeChatEEProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/WeChatMpProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/WeChatMpProvider.java index fa971c2937..f0556a84ed 100644 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/WeChatMpProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/WeChatMpProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.provider; @@ -44,7 +45,7 @@ * 微信公众平台登录 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class WeChatMpProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/WeChatOPProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/WeChatOPProvider.java index 1f309afc37..d71457ce85 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/WeChatOPProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/WeChatOPProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.provider; @@ -42,7 +43,7 @@ * 微信登录 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class WeChatOPProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/WeiboProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/WeiboProvider.java index 00d2db53bd..78957b4e8d 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/WeiboProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/WeiboProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.oauth.provider; @@ -48,7 +49,7 @@ * 微博登录 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class WeiboProvider extends AbstractProvider { diff --git a/bus-office/pom.xml b/bus-office/pom.xml index c060f26dd7..9c263b533f 100755 --- a/bus-office/pom.xml +++ b/bus-office/pom.xml @@ -6,13 +6,38 @@ org.aoju bus-office - 6.1.1 + 6.1.2 jar ${project.artifactId} Bus Office https://github.com/aoju/bus + + + The MIT License (MIT) + https://opensource.org/licenses/MIT + + + + + scm:git@github.com:aoju/bus.git + scm:git@github.com:aoju/bus.git + git@github.com:aoju/bus.git + + + + + Kimi Liu + https://github.com/aoju/bus.git + + + + + Github Issue + https://github.com/aoju/bus/issues + + UTF-8 UTF-8 @@ -82,31 +107,6 @@ - - - The MIT License (MIT) - https://opensource.org/licenses/MIT - - - - - scm:git@github.com:aoju/bus.git - scm:git@github.com:aoju/bus.git - git@github.com:aoju/bus.git - - - - - Kimi Liu - https://github.com/aoju/bus.git - - - - - Github Issue - https://github.com/aoju/bus/issues - - diff --git a/bus-office/src/main/java/org/aoju/bus/office/Builder.java b/bus-office/src/main/java/org/aoju/bus/office/Builder.java index 217137923d..4d81bc7db8 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/Builder.java +++ b/bus-office/src/main/java/org/aoju/bus/office/Builder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office; @@ -46,7 +47,7 @@ * 为office提供辅助功能. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Builder { diff --git a/bus-office/src/main/java/org/aoju/bus/office/Context.java b/bus-office/src/main/java/org/aoju/bus/office/Context.java index 57937a1bad..989dbc9e75 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/Context.java +++ b/bus-office/src/main/java/org/aoju/bus/office/Context.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office; @@ -28,7 +29,7 @@ * 所有office上下文接口的基本接口. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Context { diff --git a/bus-office/src/main/java/org/aoju/bus/office/Expense.java b/bus-office/src/main/java/org/aoju/bus/office/Expense.java index 7dfa185ad3..9b5e1fae39 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/Expense.java +++ b/bus-office/src/main/java/org/aoju/bus/office/Expense.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office; @@ -34,7 +35,7 @@ * 重定向输出和错误流的进程的包装器类. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Expense { diff --git a/bus-office/src/main/java/org/aoju/bus/office/Protocol.java b/bus-office/src/main/java/org/aoju/bus/office/Protocol.java index 4605aead7c..aaf6601304 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/Protocol.java +++ b/bus-office/src/main/java/org/aoju/bus/office/Protocol.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office; @@ -28,7 +29,7 @@ * 表示可用于与正在运行的office实例通信的协议. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum Protocol { diff --git a/bus-office/src/main/java/org/aoju/bus/office/Provider.java b/bus-office/src/main/java/org/aoju/bus/office/Provider.java index 03ac6b9048..f6ad4f14e2 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/Provider.java +++ b/bus-office/src/main/java/org/aoju/bus/office/Provider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office; @@ -36,7 +37,7 @@ * 负责使用office管理器执行文档的转换. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Provider { diff --git a/bus-office/src/main/java/org/aoju/bus/office/Registry.java b/bus-office/src/main/java/org/aoju/bus/office/Registry.java index cb6fa93b88..4cd91c9eda 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/Registry.java +++ b/bus-office/src/main/java/org/aoju/bus/office/Registry.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office; @@ -34,7 +35,7 @@ * 支持类型 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Registry { diff --git a/bus-office/src/main/java/org/aoju/bus/office/bridge/LocalOfficeBridgeFactory.java b/bus-office/src/main/java/org/aoju/bus/office/bridge/LocalOfficeBridgeFactory.java index cf7b4a901f..7431146d64 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/bridge/LocalOfficeBridgeFactory.java +++ b/bus-office/src/main/java/org/aoju/bus/office/bridge/LocalOfficeBridgeFactory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.bridge; @@ -55,7 +56,7 @@ * 负责使用给定的UnoUrl管理到office进程的连接. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class LocalOfficeBridgeFactory implements LocalOfficeContextAware, XEventListener { diff --git a/bus-office/src/main/java/org/aoju/bus/office/bridge/LocalOfficeContextAware.java b/bus-office/src/main/java/org/aoju/bus/office/bridge/LocalOfficeContextAware.java index 4eeadda345..ca26a25e96 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/bridge/LocalOfficeContextAware.java +++ b/bus-office/src/main/java/org/aoju/bus/office/bridge/LocalOfficeContextAware.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.bridge; @@ -33,7 +34,7 @@ * 表示用于本地转换的office上下文 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface LocalOfficeContextAware extends Context { diff --git a/bus-office/src/main/java/org/aoju/bus/office/bridge/LocalOfficePoolManager.java b/bus-office/src/main/java/org/aoju/bus/office/bridge/LocalOfficePoolManager.java index 92255d71dc..11b17f184e 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/bridge/LocalOfficePoolManager.java +++ b/bus-office/src/main/java/org/aoju/bus/office/bridge/LocalOfficePoolManager.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.bridge; @@ -41,7 +42,7 @@ * 默认的{@link OfficeManager}实现,它使用一个office进程池来执行转换任务. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class LocalOfficePoolManager extends AbstractOfficePoolManager { diff --git a/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeBridgeFactory.java b/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeBridgeFactory.java index b5923ae052..02a8f52f15 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeBridgeFactory.java +++ b/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeBridgeFactory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.bridge; @@ -30,7 +31,7 @@ * 保存与LibreOffice在线服务器通信的请求配置. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class OnlineOfficeBridgeFactory implements OnlineOfficeContextAware { diff --git a/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeContextAware.java b/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeContextAware.java index 53f77fdf69..adc3622b58 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeContextAware.java +++ b/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeContextAware.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.bridge; @@ -31,7 +32,7 @@ * 表示用于在线转换的office环境. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface OnlineOfficeContextAware extends Context { diff --git a/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeEntryBuilder.java b/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeEntryBuilder.java index 41f3612209..39bd149c5d 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeEntryBuilder.java +++ b/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeEntryBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.bridge; @@ -31,7 +32,7 @@ * 当不需要office实例来执行转换时,该类保存{@link OnlineOfficeEntryManager}的配置. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class OnlineOfficeEntryBuilder implements OfficeManagerEntryBuilder { diff --git a/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeEntryManager.java b/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeEntryManager.java index 644639aff6..731e53fd0e 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeEntryManager.java +++ b/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeEntryManager.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.bridge; @@ -46,7 +47,7 @@ * 它将向LibreOffice在线服务器发送转换请求,并等待任务完成或达到配置的任务执行超时. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class OnlineOfficeEntryManager extends AbstractOfficeEntryManager { diff --git a/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficePoolBuilder.java b/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficePoolBuilder.java index f4a404dbcc..89be867dea 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficePoolBuilder.java +++ b/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficePoolBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.bridge; @@ -35,7 +36,7 @@ * 该类提供{@link AbstractOfficePoolManager}的配置. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class OnlineOfficePoolBuilder extends OnlineOfficeEntryBuilder diff --git a/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficePoolManager.java b/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficePoolManager.java index 9c9c087853..f7a67b8ebf 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficePoolManager.java +++ b/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficePoolManager.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.bridge; @@ -36,7 +37,7 @@ * {@link OfficeManager}池实现,不依赖于office安装来处理转换 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class OnlineOfficePoolManager extends AbstractOfficePoolManager { diff --git a/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractJob.java b/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractJob.java index 06e55454a6..bc9c05c8f5 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractJob.java +++ b/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractJob.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.builtin; @@ -34,7 +35,7 @@ * 所有转换作业实现的基类. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractJob implements OptionalTarget { diff --git a/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractLocalOffice.java b/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractLocalOffice.java index 7d8b5d82bd..1d3701cd9b 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractLocalOffice.java +++ b/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractLocalOffice.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.builtin; @@ -47,7 +48,7 @@ * 所有本地office任务实现的基类. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractLocalOffice extends AbstractOffice { diff --git a/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractNorm.java b/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractNorm.java index 14ed126581..152268e94a 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractNorm.java +++ b/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractNorm.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.builtin; @@ -41,7 +42,7 @@ * 使用尚未应用于转换器的源格式的所有转换作业实现的基类. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractNorm implements OptionalSource { diff --git a/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractOffice.java b/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractOffice.java index 8af04080e8..421cf1c1c9 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractOffice.java +++ b/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractOffice.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.builtin; @@ -30,7 +31,7 @@ * 所有office任务实现的基类. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractOffice implements MadeInOffice { diff --git a/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractOnlineOffice.java b/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractOnlineOffice.java index 63c04d0273..c09f7db1f8 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractOnlineOffice.java +++ b/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractOnlineOffice.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.builtin; @@ -30,7 +31,7 @@ * 所有在线office任务实现的基类. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractOnlineOffice extends AbstractOffice { diff --git a/bus-office/src/main/java/org/aoju/bus/office/builtin/ConvertJob.java b/bus-office/src/main/java/org/aoju/bus/office/builtin/ConvertJob.java index 4cd1d70c76..a37fc89210 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/builtin/ConvertJob.java +++ b/bus-office/src/main/java/org/aoju/bus/office/builtin/ConvertJob.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.builtin; @@ -30,7 +31,7 @@ * 尚未应用到转换器的完整指定转换. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface ConvertJob { diff --git a/bus-office/src/main/java/org/aoju/bus/office/builtin/JobWithSource.java b/bus-office/src/main/java/org/aoju/bus/office/builtin/JobWithSource.java index 94c048bcda..73e3a64bfa 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/builtin/JobWithSource.java +++ b/bus-office/src/main/java/org/aoju/bus/office/builtin/JobWithSource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.builtin; @@ -31,7 +32,7 @@ * 具有指定转换源的转换作业. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface JobWithSource { diff --git a/bus-office/src/main/java/org/aoju/bus/office/builtin/LocalMadeInOffice.java b/bus-office/src/main/java/org/aoju/bus/office/builtin/LocalMadeInOffice.java index f93168fa23..dd340c716d 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/builtin/LocalMadeInOffice.java +++ b/bus-office/src/main/java/org/aoju/bus/office/builtin/LocalMadeInOffice.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.builtin; @@ -48,7 +49,7 @@ * 表示本地转换任务的默认行为. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class LocalMadeInOffice extends AbstractLocalOffice { diff --git a/bus-office/src/main/java/org/aoju/bus/office/builtin/MadeInOffice.java b/bus-office/src/main/java/org/aoju/bus/office/builtin/MadeInOffice.java index 16db459567..d82ab969ad 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/builtin/MadeInOffice.java +++ b/bus-office/src/main/java/org/aoju/bus/office/builtin/MadeInOffice.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.builtin; @@ -32,7 +33,7 @@ * 表示由{@link OfficeManager}执行的任务. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface MadeInOffice { diff --git a/bus-office/src/main/java/org/aoju/bus/office/builtin/OnlineMadeInOffice.java b/bus-office/src/main/java/org/aoju/bus/office/builtin/OnlineMadeInOffice.java index f83e3acdff..0e4f3f15f7 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/builtin/OnlineMadeInOffice.java +++ b/bus-office/src/main/java/org/aoju/bus/office/builtin/OnlineMadeInOffice.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.builtin; @@ -46,7 +47,7 @@ * 表示在线转换任务的默认行为. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class OnlineMadeInOffice extends AbstractOnlineOffice { diff --git a/bus-office/src/main/java/org/aoju/bus/office/builtin/OptionalSource.java b/bus-office/src/main/java/org/aoju/bus/office/builtin/OptionalSource.java index 4d72a3fecd..329f0aa2be 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/builtin/OptionalSource.java +++ b/bus-office/src/main/java/org/aoju/bus/office/builtin/OptionalSource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.builtin; @@ -30,7 +31,7 @@ * 具有尚未应用于转换器的可选源格式的转换作业. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface OptionalSource extends JobWithSource { diff --git a/bus-office/src/main/java/org/aoju/bus/office/builtin/OptionalTarget.java b/bus-office/src/main/java/org/aoju/bus/office/builtin/OptionalTarget.java index 625639baa1..2e2beea77a 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/builtin/OptionalTarget.java +++ b/bus-office/src/main/java/org/aoju/bus/office/builtin/OptionalTarget.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.builtin; @@ -28,7 +29,7 @@ * 具有尚未应用到转换器的可选目标格式的转换作业. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface OptionalTarget extends RequiredTarget, ConvertJob { diff --git a/bus-office/src/main/java/org/aoju/bus/office/builtin/RequiredTarget.java b/bus-office/src/main/java/org/aoju/bus/office/builtin/RequiredTarget.java index f2b00994eb..75fa02c18e 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/builtin/RequiredTarget.java +++ b/bus-office/src/main/java/org/aoju/bus/office/builtin/RequiredTarget.java @@ -19,8 +19,8 @@ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.builtin; @@ -30,7 +30,7 @@ * 具有所需目标格式但尚未应用到转换器的转换作业. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface RequiredTarget { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/Calc.java b/bus-office/src/main/java/org/aoju/bus/office/magic/Calc.java index a9a7c48a7e..04262d4982 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/Calc.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/Calc.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.magic; @@ -32,7 +33,7 @@ * 使Office Calc文档(电子表格)更容易使用的实用函数集合. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Calc { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/Draw.java b/bus-office/src/main/java/org/aoju/bus/office/magic/Draw.java index 9f93f6959b..64c1a28dd4 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/Draw.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/Draw.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.magic; @@ -31,7 +32,7 @@ * 使office draw文档(Drawing)更容易使用的实用函数集合 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Draw { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/Info.java b/bus-office/src/main/java/org/aoju/bus/office/magic/Info.java index 78f362336e..963a244839 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/Info.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/Info.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.magic; @@ -46,7 +47,7 @@ * 实用程序函数,使office信息更容易获取. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Info { @@ -85,7 +86,7 @@ public static String getOfficeName(final XComponentContext context) { } /** - * 获取给定上下文的office产品版本(长版本号),例如e.g 6.1.1.3 + * 获取给定上下文的office产品版本(长版本号),例如e.g 6.1.2.3 * * @param context 上下文. * @return office产品版本,如果无法检索,则为{@code null}. diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/Lo.java b/bus-office/src/main/java/org/aoju/bus/office/magic/Lo.java index 7c3317f2b6..350732b470 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/Lo.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/Lo.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.magic; @@ -37,7 +38,7 @@ * 实用程序函数,使Office更易于使用. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Lo { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/Props.java b/bus-office/src/main/java/org/aoju/bus/office/magic/Props.java index 2761cfe516..d9732356b7 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/Props.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/Props.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.magic; @@ -36,7 +37,7 @@ * 实用程序函数,使office属性更易于使用. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Props { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/UnoUrl.java b/bus-office/src/main/java/org/aoju/bus/office/magic/UnoUrl.java index dc8d7529f4..2faa75670f 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/UnoUrl.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/UnoUrl.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.magic; @@ -33,7 +34,7 @@ * 这意味着设置java.library.path启动Java时路径 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class UnoUrl { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/Write.java b/bus-office/src/main/java/org/aoju/bus/office/magic/Write.java index fd6f5d43bc..395e2d80d1 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/Write.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/Write.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.magic; @@ -32,7 +33,7 @@ * 实用程序函数,使office文本文档(Writer)更容易使用. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Write { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/family/DefaultFormatRegistry.java b/bus-office/src/main/java/org/aoju/bus/office/magic/family/DefaultFormatRegistry.java index e323145de4..285a859b11 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/family/DefaultFormatRegistry.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/family/DefaultFormatRegistry.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.magic.family; @@ -31,7 +32,7 @@ * 应该足以满足我们的大部分需求. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class DefaultFormatRegistry { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/family/DocumentFormat.java b/bus-office/src/main/java/org/aoju/bus/office/magic/family/DocumentFormat.java index 4d65f5398f..311c6188a8 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/family/DocumentFormat.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/family/DocumentFormat.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.magic.family; @@ -35,7 +36,7 @@ * 包含处理特定文档格式所需的信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DocumentFormat { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/family/FamilyType.java b/bus-office/src/main/java/org/aoju/bus/office/magic/family/FamilyType.java index 3afc5c196e..d91b9cc535 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/family/FamilyType.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/family/FamilyType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.magic.family; @@ -28,7 +29,7 @@ * 表示office支持的文档类型. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum FamilyType { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/family/FormatProperties.java b/bus-office/src/main/java/org/aoju/bus/office/magic/family/FormatProperties.java index 1b8eb75223..0428458328 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/family/FormatProperties.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/family/FormatProperties.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.magic.family; @@ -31,7 +32,7 @@ * 包含将在为特定的{@link DocumentFormat}加载(打开)和存储(保存)文档时应用的属性. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FormatProperties { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/family/FormatRegistry.java b/bus-office/src/main/java/org/aoju/bus/office/magic/family/FormatRegistry.java index 2d8a447538..8f24a45c1a 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/family/FormatRegistry.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/family/FormatRegistry.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.magic.family; @@ -30,7 +31,7 @@ * 实现此接口的类应该保留office支持的文档格式集合. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface FormatRegistry { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/family/JsonFormatRegistry.java b/bus-office/src/main/java/org/aoju/bus/office/magic/family/JsonFormatRegistry.java index 626e48cb06..3ed4224f59 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/family/JsonFormatRegistry.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/family/JsonFormatRegistry.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.magic.family; @@ -39,7 +40,7 @@ * 包含office支持的{@code DocumentFormat}集合,该集合已从JSON源加载. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JsonFormatRegistry extends SimpleFormatRegistry { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/family/RegistryInstanceHolder.java b/bus-office/src/main/java/org/aoju/bus/office/magic/family/RegistryInstanceHolder.java index 72f9f579f0..1093ff8968 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/family/RegistryInstanceHolder.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/family/RegistryInstanceHolder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.magic.family; @@ -30,7 +31,7 @@ * 保存默认的{@link FormatRegistry}实例. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class RegistryInstanceHolder { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/family/SimpleFormatRegistry.java b/bus-office/src/main/java/org/aoju/bus/office/magic/family/SimpleFormatRegistry.java index 28537784da..ec86c127a9 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/family/SimpleFormatRegistry.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/family/SimpleFormatRegistry.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.magic.family; @@ -33,7 +34,7 @@ * SimpleDocumentFormatRegistry包含office支持的文档格式集合. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SimpleFormatRegistry implements FormatRegistry { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/AbstractFilter.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/AbstractFilter.java index ef358206c8..1361c53195 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/AbstractFilter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/AbstractFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.magic.filter; @@ -39,7 +40,7 @@ * 过滤器链的基类. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractFilter implements FilterChain { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/DefaultFilter.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/DefaultFilter.java index 638086fe96..0dfc5b4145 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/DefaultFilter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/DefaultFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.magic.filter; @@ -32,7 +33,7 @@ * FilterChain的默认实现. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DefaultFilter extends AbstractFilter { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/Filter.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/Filter.java index 9bc249afe0..18ddcab024 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/Filter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/Filter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.magic.filter; @@ -31,7 +32,7 @@ * 表示转换文档的步骤. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Filter { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/FilterChain.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/FilterChain.java index 1e3de1a3cc..fb618c2d30 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/FilterChain.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/FilterChain.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.magic.filter; @@ -34,7 +35,7 @@ * 或者如果调用过滤器是链中的最后一个过滤器,则结束调用链。 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface FilterChain { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/NoopFilter.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/NoopFilter.java index d2468a43ab..779dd2d78f 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/NoopFilter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/NoopFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.magic.filter; @@ -32,7 +33,7 @@ * 这个过滤器除了调用链中的下一个过滤器外什么也不做. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NoopFilter implements Filter { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/PageCounterFilter.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/PageCounterFilter.java index 65b4c1e303..0fdeb068fb 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/PageCounterFilter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/PageCounterFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.magic.filter; @@ -35,7 +36,7 @@ * 此筛选器用于计算文档的页数. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PageCounterFilter implements Filter { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/RefreshFilter.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/RefreshFilter.java index 2e2a4a3b31..d019a866c5 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/RefreshFilter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/RefreshFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.magic.filter; @@ -34,7 +35,7 @@ * 此筛选器用于刷新文档. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RefreshFilter implements Filter { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/UnmodifiableFilter.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/UnmodifiableFilter.java index b9b09d880d..469006b483 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/UnmodifiableFilter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/UnmodifiableFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.magic.filter; @@ -28,7 +29,7 @@ * FilterChain的不可修改的实现. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class UnmodifiableFilter extends AbstractFilter { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/draw/PageSelectorFilter.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/draw/PageSelectorFilter.java index 385a4273a6..9fad5084ef 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/draw/PageSelectorFilter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/draw/PageSelectorFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.magic.filter.draw; @@ -39,7 +40,7 @@ * 此筛选器用于从文档中选择特定页面,以便仅转换所选页面 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PageSelectorFilter implements Filter { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/AbstractTextContentInserterFilter.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/AbstractTextContentInserterFilter.java index d747fce712..afbf942a71 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/AbstractTextContentInserterFilter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/AbstractTextContentInserterFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.magic.filter.text; @@ -38,7 +39,7 @@ * 用于将文本内容插入文档的所有筛选器的基类. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractTextContentInserterFilter implements Filter { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/DocumentInserterFilter.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/DocumentInserterFilter.java index c669b09fc3..552cd748bc 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/DocumentInserterFilter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/DocumentInserterFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.magic.filter.text; @@ -42,7 +43,7 @@ * 此筛选器用于在转换的文档末尾插入文档. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DocumentInserterFilter implements Filter { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/GraphicInserterFilter.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/GraphicInserterFilter.java index 6119685076..2bafad5d5e 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/GraphicInserterFilter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/GraphicInserterFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.magic.filter.text; @@ -59,7 +60,7 @@ * 此筛选器用于将图形插入到文档中. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class GraphicInserterFilter extends AbstractTextContentInserterFilter { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/LinkedImagesEmbedderFilter.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/LinkedImagesEmbedderFilter.java index 1f40599bbf..3e8cae507e 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/LinkedImagesEmbedderFilter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/LinkedImagesEmbedderFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.magic.filter.text; @@ -49,7 +50,7 @@ * 此筛选器用于将图形插入到文档中. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class LinkedImagesEmbedderFilter implements Filter { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/PageMarginsFilter.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/PageMarginsFilter.java index 0a1b7fc795..b4d7abfc32 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/PageMarginsFilter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/PageMarginsFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.magic.filter.text; @@ -43,7 +44,7 @@ * 此筛选器用于设置要转换的文档的页边距. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PageMarginsFilter implements Filter { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/PageSelectorFilter.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/PageSelectorFilter.java index 7157a6f607..b82c6cf52b 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/PageSelectorFilter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/PageSelectorFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.magic.filter.text; @@ -40,7 +41,7 @@ * 此筛选器用于从文档中选择特定页面,以便仅转换所选页面. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PageSelectorFilter implements Filter { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/TableOfContentUpdaterFilter.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/TableOfContentUpdaterFilter.java index 88c479ba66..2ee37cc9fa 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/TableOfContentUpdaterFilter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/TableOfContentUpdaterFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.magic.filter.text; @@ -40,7 +41,7 @@ * 此筛选器更新文档中的所有索引. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TableOfContentUpdaterFilter implements Filter { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/TextInserterFilter.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/TextInserterFilter.java index b98646712a..9596bdc720 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/TextInserterFilter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/TextInserterFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.magic.filter.text; @@ -45,7 +46,7 @@ * 筛选器用于将文本插入文档. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TextInserterFilter extends AbstractTextContentInserterFilter { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/TextReplacerFilter.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/TextReplacerFilter.java index f7548ec8ec..4e8ba3a5d3 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/TextReplacerFilter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/TextReplacerFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.magic.filter.text; @@ -40,7 +41,7 @@ * 此筛选器用于替换文档中的文本. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TextReplacerFilter implements Filter { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/AbstractOfficeEntryManager.java b/bus-office/src/main/java/org/aoju/bus/office/metric/AbstractOfficeEntryManager.java index 06275f4ce1..f0dab6bd3c 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/AbstractOfficeEntryManager.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/AbstractOfficeEntryManager.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.metric; @@ -37,7 +38,7 @@ * 这个抽象类从未将可用性设置为true 只有当管理器停止时,可用性才设置为false. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractOfficeEntryManager implements OfficeManager { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/AbstractOfficeManager.java b/bus-office/src/main/java/org/aoju/bus/office/metric/AbstractOfficeManager.java index 480e4b759a..94a068bd4e 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/AbstractOfficeManager.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/AbstractOfficeManager.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.metric; @@ -38,7 +39,7 @@ * 所有{@link OfficeManager}的基类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractOfficeManager implements OfficeManager, TemporaryFileMaker { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/AbstractOfficePoolManager.java b/bus-office/src/main/java/org/aoju/bus/office/metric/AbstractOfficePoolManager.java index 2e86c3b6b8..9e8b60a4ff 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/AbstractOfficePoolManager.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/AbstractOfficePoolManager.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.metric; @@ -40,7 +41,7 @@ * 当调用{@link #execute(MadeInOffice)}函数时,池将使用第一个{@link OfficeProcessEntryManager}来执行给定的任务 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractOfficePoolManager extends AbstractOfficeManager { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/AbstractRetryable.java b/bus-office/src/main/java/org/aoju/bus/office/metric/AbstractRetryable.java index 4abed69b0c..5974408cf1 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/AbstractRetryable.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/AbstractRetryable.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.metric; @@ -30,7 +31,7 @@ * 该对象将尝试执行任务,直到任务成功或达到特定超时为止. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractRetryable { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/ConnectRetryable.java b/bus-office/src/main/java/org/aoju/bus/office/metric/ConnectRetryable.java index ce9e88626d..9851e1acb2 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/ConnectRetryable.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/ConnectRetryable.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.metric; @@ -33,7 +34,7 @@ * 执行到office进程的连接. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ConnectRetryable extends AbstractRetryable { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/ExitCodeRetryable.java b/bus-office/src/main/java/org/aoju/bus/office/metric/ExitCodeRetryable.java index 49f7788fae..64ae6e54e2 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/ExitCodeRetryable.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/ExitCodeRetryable.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.metric; @@ -31,7 +32,7 @@ * 获取office进程的退出码值. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ExitCodeRetryable extends AbstractRetryable { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/ExternalOfficeBuilder.java b/bus-office/src/main/java/org/aoju/bus/office/metric/ExternalOfficeBuilder.java index a55b471a6d..81fedeac06 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/ExternalOfficeBuilder.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/ExternalOfficeBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.metric; @@ -32,7 +33,7 @@ * 这个类包含{@link ExternalOfficeManager}的配置. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ExternalOfficeBuilder implements OfficeManagerBuilder { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/ExternalOfficeManager.java b/bus-office/src/main/java/org/aoju/bus/office/metric/ExternalOfficeManager.java index c1325de004..c562a3854c 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/ExternalOfficeManager.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/ExternalOfficeManager.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.metric; @@ -39,7 +40,7 @@ * 但是,如果外部进程是手动重新启动的,那么它将自动重新连接到外部进程 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class ExternalOfficeManager extends AbstractOfficeManager { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/InstalledOfficeHolder.java b/bus-office/src/main/java/org/aoju/bus/office/metric/InstalledOfficeHolder.java index cba023570b..a5341b7b70 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/InstalledOfficeHolder.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/InstalledOfficeHolder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.metric; @@ -32,7 +33,7 @@ * 创建的{@link Provider}将使用该实例. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class InstalledOfficeHolder { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeConnectEvent.java b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeConnectEvent.java index b0de3fc47e..dd9471c63a 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeConnectEvent.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeConnectEvent.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.metric; @@ -32,7 +33,7 @@ * office连接打开或关闭时引发的事件. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class OfficeConnectEvent extends EventObject { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeConnectEventListener.java b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeConnectEventListener.java index c4c6f054d7..cb5dcaf199 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeConnectEventListener.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeConnectEventListener.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.metric; @@ -30,7 +31,7 @@ * office连接事件侦听器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface OfficeConnectEventListener extends EventListener { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeManager.java b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeManager.java index 982f881141..ff80ca447d 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeManager.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeManager.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.metric; @@ -32,7 +33,7 @@ * 并且在不再需要它时必须停止它。停止后就无法重新启动office管理器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface OfficeManager { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeManagerBuilder.java b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeManagerBuilder.java index aa21443906..3bd64e1edd 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeManagerBuilder.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeManagerBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.metric; @@ -30,7 +31,7 @@ * 这个类提供了{@link AbstractOfficeManager}的配置. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface OfficeManagerBuilder { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeManagerEntryBuilder.java b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeManagerEntryBuilder.java index 9868b350c5..ed6ad1aed7 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeManagerEntryBuilder.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeManagerEntryBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.metric; @@ -28,7 +29,7 @@ * 这个接口提供了{@link OfficeProcessEntryManager}的配置 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface OfficeManagerEntryBuilder { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeManagerPoolBuilder.java b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeManagerPoolBuilder.java index 2a417c112d..b4ca7e008d 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeManagerPoolBuilder.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeManagerPoolBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.metric; @@ -28,7 +29,7 @@ * 这个类提供了{@link AbstractOfficePoolManager}的配置 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface OfficeManagerPoolBuilder extends OfficeManagerBuilder { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeOption.java b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeOption.java index 76e43a6b4d..81e0ad0773 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeOption.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeOption.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.metric; @@ -33,7 +34,7 @@ * 包含有关正在使用的office的基本信息. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class OfficeOption { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcess.java b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcess.java index f457b97f5d..cba6918aa5 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcess.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcess.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.metric; @@ -48,7 +49,7 @@ * 表示正在执行的office程序的实例. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class OfficeProcess { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessBuilder.java b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessBuilder.java index 335ee73717..0c974bace5 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessBuilder.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.metric; @@ -34,7 +35,7 @@ * 这个类包含{@link OfficeProcess}的配置. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class OfficeProcessBuilder { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessEntryManager.java b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessEntryManager.java index 2c13773f51..547eb083bc 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessEntryManager.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessEntryManager.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.metric; @@ -48,7 +49,7 @@ * OfficeProcessManagerPoolEntry还负责在达到每个进程的最大任务数时重新启动office进程. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class OfficeProcessEntryManager extends AbstractOfficeEntryManager { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessManager.java b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessManager.java index 47fa147448..5a57205a3a 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessManager.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessManager.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.metric; @@ -38,7 +39,7 @@ * OfficeProcessManager负责管理一个office流程以及到这个office流程的连接(桥接). * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class OfficeProcessManager { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessManagerBuilder.java b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessManagerBuilder.java index fbec969265..17631ffe09 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessManagerBuilder.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessManagerBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.metric; @@ -33,7 +34,7 @@ * 这个类包含{@link OfficeProcessManager}的配置. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class OfficeProcessManagerBuilder extends OfficeProcessBuilder { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessManagerEntryBuilder.java b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessManagerEntryBuilder.java index c031f88652..9a9731de6e 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessManagerEntryBuilder.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessManagerEntryBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.metric; @@ -33,7 +34,7 @@ * 当需要office实例来执行转换时,该类保存{@link OfficeProcessEntryManager}的配置 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class OfficeProcessManagerEntryBuilder extends OfficeProcessManagerBuilder diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessManagerPoolBuilder.java b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessManagerPoolBuilder.java index 67ea0bef16..a269ede5ab 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessManagerPoolBuilder.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessManagerPoolBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.metric; @@ -33,7 +34,7 @@ * 当需要某个office实例执行转换时,该类提供{@link AbstractOfficePoolManager}的配置 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class OfficeProcessManagerPoolBuilder extends OfficeProcessManagerEntryBuilder diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/RequestBuilder.java b/bus-office/src/main/java/org/aoju/bus/office/metric/RequestBuilder.java index b0f0912404..1c47ff6368 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/RequestBuilder.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/RequestBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.metric; @@ -28,7 +29,7 @@ * LibreOffice联机通信的请求配置. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RequestBuilder { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/SuspendableThread.java b/bus-office/src/main/java/org/aoju/bus/office/metric/SuspendableThread.java index ed9471bd37..cacb042aea 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/SuspendableThread.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/SuspendableThread.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.metric; @@ -35,7 +36,7 @@ * 可以挂起的线程池执行程序,池中只允许有一个线程 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SuspendableThread extends ThreadPoolExecutor { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/TemporaryFileMaker.java b/bus-office/src/main/java/org/aoju/bus/office/metric/TemporaryFileMaker.java index 54444c8781..f82a6c00ac 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/TemporaryFileMaker.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/TemporaryFileMaker.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.metric; @@ -30,7 +31,7 @@ * 提供创建临时文件的服务. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface TemporaryFileMaker { diff --git a/bus-office/src/main/java/org/aoju/bus/office/process/AbstractProcessManager.java b/bus-office/src/main/java/org/aoju/bus/office/process/AbstractProcessManager.java index 9fbbd0065f..8e065fb348 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/process/AbstractProcessManager.java +++ b/bus-office/src/main/java/org/aoju/bus/office/process/AbstractProcessManager.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.process; @@ -40,7 +41,7 @@ * 包含的所有流程管理器实现的基类. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractProcessManager implements ProcessManager { diff --git a/bus-office/src/main/java/org/aoju/bus/office/process/FreeBSDProcessManager.java b/bus-office/src/main/java/org/aoju/bus/office/process/FreeBSDProcessManager.java index 5aa44a5596..506ff0ecaa 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/process/FreeBSDProcessManager.java +++ b/bus-office/src/main/java/org/aoju/bus/office/process/FreeBSDProcessManager.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.process; @@ -28,7 +29,7 @@ * 用于FreeBSD的{@link ProcessManager}实现 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FreeBSDProcessManager extends UnixProcessManager { diff --git a/bus-office/src/main/java/org/aoju/bus/office/process/LinesPumpStreamHandler.java b/bus-office/src/main/java/org/aoju/bus/office/process/LinesPumpStreamHandler.java index fc0f1ef7a6..4e53ec2603 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/process/LinesPumpStreamHandler.java +++ b/bus-office/src/main/java/org/aoju/bus/office/process/LinesPumpStreamHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.process; @@ -30,7 +31,7 @@ * 将子进程的标准输出和错误复制到行列表中. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class LinesPumpStreamHandler extends PumpStreamHandler { diff --git a/bus-office/src/main/java/org/aoju/bus/office/process/LinesStreamPumper.java b/bus-office/src/main/java/org/aoju/bus/office/process/LinesStreamPumper.java index af8974c68a..c6f5533bb9 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/process/LinesStreamPumper.java +++ b/bus-office/src/main/java/org/aoju/bus/office/process/LinesStreamPumper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.process; @@ -32,7 +33,7 @@ * 从输入流中读取所有行. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class LinesStreamPumper extends StreamPumper { diff --git a/bus-office/src/main/java/org/aoju/bus/office/process/MacProcessManager.java b/bus-office/src/main/java/org/aoju/bus/office/process/MacProcessManager.java index d2f8daf260..76c525d491 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/process/MacProcessManager.java +++ b/bus-office/src/main/java/org/aoju/bus/office/process/MacProcessManager.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.process; @@ -28,7 +29,7 @@ * 用于MAC的{@link ProcessManager}实现 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MacProcessManager extends UnixProcessManager { diff --git a/bus-office/src/main/java/org/aoju/bus/office/process/ProcessManager.java b/bus-office/src/main/java/org/aoju/bus/office/process/ProcessManager.java index 6007c59db1..840c3f8198 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/process/ProcessManager.java +++ b/bus-office/src/main/java/org/aoju/bus/office/process/ProcessManager.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.process; @@ -30,7 +31,7 @@ * 提供管理正在运行的流程所需的服务. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface ProcessManager { diff --git a/bus-office/src/main/java/org/aoju/bus/office/process/ProcessQuery.java b/bus-office/src/main/java/org/aoju/bus/office/process/ProcessQuery.java index 720218f36c..868d842044 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/process/ProcessQuery.java +++ b/bus-office/src/main/java/org/aoju/bus/office/process/ProcessQuery.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.process; @@ -28,7 +29,7 @@ * 包含用于查询正在运行的进程所需的信息. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ProcessQuery { diff --git a/bus-office/src/main/java/org/aoju/bus/office/process/PumpStreamHandler.java b/bus-office/src/main/java/org/aoju/bus/office/process/PumpStreamHandler.java index f625e022ba..5b7617c34f 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/process/PumpStreamHandler.java +++ b/bus-office/src/main/java/org/aoju/bus/office/process/PumpStreamHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.process; @@ -28,7 +29,7 @@ * 将子过程的标准输出和错误复制到给定的pumpers. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PumpStreamHandler { diff --git a/bus-office/src/main/java/org/aoju/bus/office/process/PureJavaProcessManager.java b/bus-office/src/main/java/org/aoju/bus/office/process/PureJavaProcessManager.java index a521f6a0b5..9452bbd54b 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/process/PureJavaProcessManager.java +++ b/bus-office/src/main/java/org/aoju/bus/office/process/PureJavaProcessManager.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.process; @@ -30,7 +31,7 @@ * PureJava 系统流程管理器实现类. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PureJavaProcessManager implements ProcessManager { diff --git a/bus-office/src/main/java/org/aoju/bus/office/process/StreamPumper.java b/bus-office/src/main/java/org/aoju/bus/office/process/StreamPumper.java index 24a8d45ede..d13531250e 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/process/StreamPumper.java +++ b/bus-office/src/main/java/org/aoju/bus/office/process/StreamPumper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.process; @@ -36,7 +37,7 @@ * 从输入流中读取所有行. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class StreamPumper extends Thread { diff --git a/bus-office/src/main/java/org/aoju/bus/office/process/UnixProcessManager.java b/bus-office/src/main/java/org/aoju/bus/office/process/UnixProcessManager.java index bb35c9ef8e..f50c83040a 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/process/UnixProcessManager.java +++ b/bus-office/src/main/java/org/aoju/bus/office/process/UnixProcessManager.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.process; @@ -37,7 +38,7 @@ * 这也适用于Solaris,这将影响{@link #find(ProcessQuery)} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class UnixProcessManager extends AbstractProcessManager { diff --git a/bus-office/src/main/java/org/aoju/bus/office/process/WindowsProcessManager.java b/bus-office/src/main/java/org/aoju/bus/office/process/WindowsProcessManager.java index 5fb3a749d8..31a06a42b7 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/process/WindowsProcessManager.java +++ b/bus-office/src/main/java/org/aoju/bus/office/process/WindowsProcessManager.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.process; @@ -32,7 +33,7 @@ * 需要wmic.exe和taskkill.exe,至少在Windows XP、Windows Vista和Windows 7上可用(家庭版除外) * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class WindowsProcessManager extends AbstractProcessManager { diff --git a/bus-office/src/main/java/org/aoju/bus/office/provider/AbstractDocumentProvider.java b/bus-office/src/main/java/org/aoju/bus/office/provider/AbstractDocumentProvider.java index a23a5f72c5..9d6e8d62ba 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/provider/AbstractDocumentProvider.java +++ b/bus-office/src/main/java/org/aoju/bus/office/provider/AbstractDocumentProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.provider; @@ -33,7 +34,7 @@ * 所有文档规范实现的基类. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractDocumentProvider implements DocumentProvider { diff --git a/bus-office/src/main/java/org/aoju/bus/office/provider/AbstractProvider.java b/bus-office/src/main/java/org/aoju/bus/office/provider/AbstractProvider.java index 30d6a77731..9f9c9322f4 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/provider/AbstractProvider.java +++ b/bus-office/src/main/java/org/aoju/bus/office/provider/AbstractProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.provider; @@ -43,7 +44,7 @@ * 所有文档转换器实现的基类. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractProvider implements Provider { diff --git a/bus-office/src/main/java/org/aoju/bus/office/provider/AbstractSourceProvider.java b/bus-office/src/main/java/org/aoju/bus/office/provider/AbstractSourceProvider.java index bde1d47da6..3b301ac873 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/provider/AbstractSourceProvider.java +++ b/bus-office/src/main/java/org/aoju/bus/office/provider/AbstractSourceProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.provider; @@ -30,7 +31,7 @@ * 所有源文档规范实现的基类. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractSourceProvider extends AbstractDocumentProvider diff --git a/bus-office/src/main/java/org/aoju/bus/office/provider/AbstractTargetProvider.java b/bus-office/src/main/java/org/aoju/bus/office/provider/AbstractTargetProvider.java index a4f889bf59..eba516871a 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/provider/AbstractTargetProvider.java +++ b/bus-office/src/main/java/org/aoju/bus/office/provider/AbstractTargetProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.provider; @@ -30,7 +31,7 @@ * 所有目标文档规范实现的基类. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractTargetProvider extends AbstractDocumentProvider diff --git a/bus-office/src/main/java/org/aoju/bus/office/provider/DocumentProvider.java b/bus-office/src/main/java/org/aoju/bus/office/provider/DocumentProvider.java index bc8d91043d..67312dd69f 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/provider/DocumentProvider.java +++ b/bus-office/src/main/java/org/aoju/bus/office/provider/DocumentProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.provider; @@ -32,7 +33,7 @@ * 为文档提供转换过程所需的物理文件和格式的接口. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface DocumentProvider { diff --git a/bus-office/src/main/java/org/aoju/bus/office/provider/LocalOfficeProvider.java b/bus-office/src/main/java/org/aoju/bus/office/provider/LocalOfficeProvider.java index 1da503f284..c7c3d8bb75 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/provider/LocalOfficeProvider.java +++ b/bus-office/src/main/java/org/aoju/bus/office/provider/LocalOfficeProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.provider; @@ -45,7 +46,7 @@ * 必须启动所提供的office管理器才能被此转换器使用. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class LocalOfficeProvider extends AbstractProvider { diff --git a/bus-office/src/main/java/org/aoju/bus/office/provider/OnlineOfficeProvider.java b/bus-office/src/main/java/org/aoju/bus/office/provider/OnlineOfficeProvider.java index 75fd4ee586..643a8e2c0a 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/provider/OnlineOfficeProvider.java +++ b/bus-office/src/main/java/org/aoju/bus/office/provider/OnlineOfficeProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.provider; @@ -37,7 +38,7 @@ * 按预期工作,它必须与在线office管理器一起使用. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class OnlineOfficeProvider extends AbstractProvider { diff --git a/bus-office/src/main/java/org/aoju/bus/office/provider/SourceDocumentProvider.java b/bus-office/src/main/java/org/aoju/bus/office/provider/SourceDocumentProvider.java index f4b7d0416f..794a29be12 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/provider/SourceDocumentProvider.java +++ b/bus-office/src/main/java/org/aoju/bus/office/provider/SourceDocumentProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.provider; @@ -30,7 +31,7 @@ * 当转换过程不再需要源文件时,提供应用行为的接口. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface SourceDocumentProvider extends DocumentProvider { diff --git a/bus-office/src/main/java/org/aoju/bus/office/provider/SourceFromFileProvider.java b/bus-office/src/main/java/org/aoju/bus/office/provider/SourceFromFileProvider.java index a53c8002bf..21195dac8c 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/provider/SourceFromFileProvider.java +++ b/bus-office/src/main/java/org/aoju/bus/office/provider/SourceFromFileProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.provider; @@ -30,7 +31,7 @@ * 当转换过程不再需要源文件时,提供应用行为的接口. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SourceFromFileProvider extends AbstractSourceProvider diff --git a/bus-office/src/main/java/org/aoju/bus/office/provider/SourceFromInputStreamProvider.java b/bus-office/src/main/java/org/aoju/bus/office/provider/SourceFromInputStreamProvider.java index 59b727d064..99e04b030e 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/provider/SourceFromInputStreamProvider.java +++ b/bus-office/src/main/java/org/aoju/bus/office/provider/SourceFromInputStreamProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.provider; @@ -39,7 +40,7 @@ * 当转换过程不再需要源文件时,提供应用行为的接口. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SourceFromInputStreamProvider extends AbstractSourceProvider diff --git a/bus-office/src/main/java/org/aoju/bus/office/provider/TargetDocumentProvider.java b/bus-office/src/main/java/org/aoju/bus/office/provider/TargetDocumentProvider.java index 389bb4bbbd..3cd2ddf78b 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/provider/TargetDocumentProvider.java +++ b/bus-office/src/main/java/org/aoju/bus/office/provider/TargetDocumentProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.provider; @@ -30,7 +31,7 @@ * 当转换过程不再需要目标文件时,提供应用行为的接口. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface TargetDocumentProvider extends DocumentProvider { diff --git a/bus-office/src/main/java/org/aoju/bus/office/provider/TargetFromFileProvider.java b/bus-office/src/main/java/org/aoju/bus/office/provider/TargetFromFileProvider.java index 5f2027f8ff..545482c068 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/provider/TargetFromFileProvider.java +++ b/bus-office/src/main/java/org/aoju/bus/office/provider/TargetFromFileProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.provider; @@ -33,7 +34,7 @@ * 当转换过程不再需要目标文件时,提供应用行为的接口. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TargetFromFileProvider extends AbstractTargetProvider diff --git a/bus-office/src/main/java/org/aoju/bus/office/provider/TargetFromOutputStreamProvider.java b/bus-office/src/main/java/org/aoju/bus/office/provider/TargetFromOutputStreamProvider.java index 29f0ad218a..b0c514140c 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/provider/TargetFromOutputStreamProvider.java +++ b/bus-office/src/main/java/org/aoju/bus/office/provider/TargetFromOutputStreamProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.provider; @@ -38,7 +39,7 @@ * 当转换过程不再需要目标文件时,提供应用行为的接口. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TargetFromOutputStreamProvider extends AbstractTargetProvider diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/PoiChecker.java b/bus-office/src/main/java/org/aoju/bus/office/support/PoiChecker.java index b27e8ad471..adb7c62389 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/PoiChecker.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/PoiChecker.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support; @@ -31,7 +32,7 @@ * POI引入检查器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PoiChecker { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/BigExcelWriter.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/BigExcelWriter.java index 2912d3fcc0..4f54ae0f6b 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/BigExcelWriter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/BigExcelWriter.java @@ -21,11 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel; import org.aoju.bus.core.toolkit.FileKit; import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.xssf.streaming.SXSSFSheet; import org.apache.poi.xssf.streaming.SXSSFWorkbook; import java.io.File; @@ -35,7 +37,7 @@ * 大数据量Excel写出 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BigExcelWriter extends ExcelWriter { @@ -140,6 +142,24 @@ public BigExcelWriter(Sheet sheet) { super(sheet); } + @Override + public BigExcelWriter autoSizeColumn(int columnIndex) { + final SXSSFSheet sheet = (SXSSFSheet) this.sheet; + sheet.trackColumnForAutoSizing(columnIndex); + super.autoSizeColumn(columnIndex); + sheet.untrackColumnForAutoSizing(columnIndex); + return this; + } + + @Override + public BigExcelWriter autoSizeColumnAll() { + final SXSSFSheet sheet = (SXSSFSheet) this.sheet; + sheet.trackAllColumnsForAutoSizing(); + super.autoSizeColumnAll(); + sheet.untrackAllColumnsForAutoSizing(); + return this; + } + @Override public ExcelWriter flush(OutputStream out, boolean isCloseOut) { if (false == isFlushed) { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/CellKit.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/CellKit.java index ce108739be..78a3a27112 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/CellKit.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/CellKit.java @@ -21,15 +21,19 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel; import org.aoju.bus.core.lang.Normal; import org.aoju.bus.core.lang.Symbol; import org.aoju.bus.core.toolkit.DateKit; +import org.aoju.bus.core.toolkit.ObjectKit; +import org.aoju.bus.core.toolkit.StringKit; import org.aoju.bus.office.support.excel.cell.CellEditor; import org.aoju.bus.office.support.excel.cell.CellLocation; import org.aoju.bus.office.support.excel.cell.FormulaCellValue; +import org.aoju.bus.office.support.excel.cell.NullCell; import org.aoju.bus.office.support.excel.editors.TrimEditor; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; @@ -44,13 +48,12 @@ import java.time.temporal.TemporalAccessor; import java.util.Calendar; import java.util.Date; -import java.util.List; /** * Excel表格中单元格工具类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CellKit { @@ -87,10 +90,7 @@ public static Object getCellValue(Cell cell, boolean isTrimCellValue) { * @return 值, 类型可能为:Date、Double、Boolean、String */ public static Object getCellValue(Cell cell, CellEditor cellEditor) { - if (null == cell) { - return null; - } - return getCellValue(cell, cell.getCellType(), cellEditor); + return getCellValue(cell, null, cellEditor); } /** @@ -118,14 +118,18 @@ public static Object getCellValue(Cell cell, CellType cellType, CellEditor cellE if (null == cell) { return null; } + if (cell instanceof NullCell) { + return null == cellEditor ? null : cellEditor.edit(cell, null); + } if (null == cellType) { cellType = cell.getCellType(); } - if (CellType.BLANK == cellType) { - // 空白单元格可能为合并单元格 - cell = getMergedRegionCell(cell); - cellType = cell.getCellType(); + // 尝试获取合并单元格,如果是合并单元格,则重新获取单元格类型 + final Cell mergedCell = getMergedRegionCell(cell); + if (mergedCell != cell) { + cell = mergedCell; + cellType = cell.getCellTypeEnum(); } Object value; @@ -244,6 +248,47 @@ public static void setCellValue(Cell cell, Object value, CellStyle style) { } } + /** + * 为特定单元格添加批注 + * + * @param cell 单元格 + * @param text 批注内容 + * @param author 作者 + * @param anchor 批注的位置、大小等信息,null表示使用默认 + */ + public static void setComment(Cell cell, String text, String author, ClientAnchor anchor) { + final Sheet sheet = cell.getSheet(); + final Workbook wb = sheet.getWorkbook(); + final Drawing drawing = sheet.createDrawingPatriarch(); + final CreationHelper factory = wb.getCreationHelper(); + if (anchor == null) { + anchor = factory.createClientAnchor(); + anchor.setCol1(cell.getColumnIndex() + 1); + anchor.setCol2(cell.getColumnIndex() + 3); + anchor.setRow1(cell.getRowIndex()); + anchor.setRow2(cell.getRowIndex() + 2); + } + Comment comment = drawing.createCellComment(anchor); + comment.setString(factory.createRichTextString(text)); + comment.setAuthor(StringKit.nullToEmpty(author)); + cell.setCellComment(comment); + } + + /** + * 获取单元格,如果单元格不存在,返回{@link NullCell} + * + * @param row Excel表的行 + * @param cellIndex 列号 + * @return {@link Row} + */ + public static Cell getCell(Row row, int cellIndex) { + Cell cell = row.getCell(cellIndex); + if (null == cell) { + return new NullCell(row, cellIndex); + } + return cell; + } + /** * 获取已有行或创建新行 * @@ -353,7 +398,7 @@ public static Object getMergedRegionValue(Sheet sheet, String locationRef) { * @return 合并单元格的值 */ public static Object getMergedRegionValue(Sheet sheet, int x, int y) { - return getCellValue(getMergedRegionCell(sheet, x, y)); + return getCellValue(SheetUtil.getCell(sheet, x, y)); } /** @@ -364,7 +409,12 @@ public static Object getMergedRegionValue(Sheet sheet, int x, int y) { * @return 合并单元格 */ public static Cell getMergedRegionCell(Cell cell) { - return getMergedRegionCell(cell.getSheet(), cell.getColumnIndex(), cell.getRowIndex()); + if (null == cell) { + return null; + } + return ObjectKit.defaultIfNull( + getMergedCell(cell.getSheet(), cell.getColumnIndex(), cell.getRowIndex()), + cell); } /** @@ -377,26 +427,30 @@ public static Cell getMergedRegionCell(Cell cell) { * @return 合并单元格,如果非合并单元格,返回坐标对应的单元格 */ public static Cell getMergedRegionCell(Sheet sheet, int x, int y) { - final List addrs = sheet.getMergedRegions(); - - int firstColumn; - int lastColumn; - int firstRow; - int lastRow; - for (CellRangeAddress ca : addrs) { - firstColumn = ca.getFirstColumn(); - lastColumn = ca.getLastColumn(); - firstRow = ca.getFirstRow(); - lastRow = ca.getLastRow(); - - if (y >= firstRow && y <= lastRow) { - if (x >= firstColumn && x <= lastColumn) { - return SheetUtil.getCell(sheet, firstRow, firstColumn); - } + return ObjectKit.defaultIfNull( + getMergedCell(sheet, x, y), + SheetUtil.getCell(sheet, y, x)); + } + + /** + * 获取合并单元格,非合并单元格返回null + * 传入的x,y坐标(列行数)可以是合并单元格范围内的任意一个单元格 + * + * @param sheet {@link Sheet} + * @param x 列号,从0开始,可以是合并单元格范围中的任意一列 + * @param y 行号,从0开始,可以是合并单元格范围中的任意一行 + * @return 合并单元格,如果非合并单元格,返回null + */ + private static Cell getMergedCell(Sheet sheet, int x, int y) { + final int sheetMergeCount = sheet.getNumMergedRegions(); + CellRangeAddress ca; + for (int i = 0; i < sheetMergeCount; i++) { + ca = sheet.getMergedRegion(i); + if (ca.isInRange(y, x)) { + return SheetUtil.getCell(sheet, ca.getFirstRow(), ca.getFirstColumn()); } } - - return SheetUtil.getCell(sheet, y, x); + return null; } /** @@ -451,10 +505,11 @@ private static boolean isDateType(Cell cell, int formatIndex) { // m月d日 --------- 58 // HH:mm---------- 20 // h时mm分 -------- 32 - if (formatIndex == 14 || formatIndex == 31 || formatIndex == 57 || formatIndex == 58 || formatIndex == 20 || formatIndex == 32) { + if (formatIndex == 14 || formatIndex == 31 || + formatIndex == 57 || formatIndex == 58 || + formatIndex == 20 || formatIndex == 32) { return true; } - return DateUtil.isCellDateFormatted(cell); } diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelBase.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelBase.java index c40a9524a9..2271199c3e 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelBase.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelBase.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel; @@ -38,7 +39,7 @@ * * @param 子类类型,用于返回this * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ExcelBase> implements Closeable { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelFileKit.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelFileKit.java index 0b4067eef2..17897faf0c 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelFileKit.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelFileKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel; @@ -36,7 +37,7 @@ * Excel文件工具类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ExcelFileKit { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelKit.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelKit.java index 7413a534a2..0a6418fff2 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelKit.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelKit.java @@ -21,11 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel; import org.aoju.bus.core.lang.exception.InstrumentException; import org.aoju.bus.core.toolkit.FileKit; +import org.aoju.bus.core.toolkit.IoKit; import org.aoju.bus.core.toolkit.PatternKit; import org.aoju.bus.core.toolkit.StringKit; import org.aoju.bus.office.support.PoiChecker; @@ -41,7 +43,7 @@ * Excel工具类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ExcelKit { @@ -100,6 +102,7 @@ public static void readBySax(File file, String idOrRid, RowHandler rowHandler) { * @param rowHandler 行处理器 */ public static void readBySax(InputStream in, int rid, RowHandler rowHandler) { + in = IoKit.toMarkSupportStream(in); final ExcelSaxReader reader = ExcelSaxKit.createSaxReader(ExcelFileKit.isXlsx(in), rowHandler); reader.read(in, rid); } @@ -112,6 +115,7 @@ public static void readBySax(InputStream in, int rid, RowHandler rowHandler) { * @param rowHandler 行处理器 */ public static void readBySax(InputStream in, String idOrRid, RowHandler rowHandler) { + in = IoKit.toMarkSupportStream(in); final ExcelSaxReader reader = ExcelSaxKit.createSaxReader(ExcelFileKit.isXlsx(in), rowHandler); reader.read(in, idOrRid); } diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelPicKit.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelPicKit.java index cdc98ec2d7..93831a48e6 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelPicKit.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelPicKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel; @@ -42,7 +43,7 @@ * Excel图片工具类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ExcelPicKit { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelReader.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelReader.java index c360178a85..2b955bbee2 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelReader.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelReader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel; @@ -51,7 +52,7 @@ * 读取Excel工作簿 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ExcelReader extends ExcelBase { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelSaxKit.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelSaxKit.java index 24cc7202b6..5d45921148 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelSaxKit.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelSaxKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel; @@ -31,6 +32,8 @@ import org.aoju.bus.core.toolkit.DateKit; import org.aoju.bus.core.toolkit.StringKit; import org.aoju.bus.office.support.excel.sax.*; +import org.apache.poi.hssf.eventusermodel.FormatTrackingHSSFListener; +import org.apache.poi.hssf.record.NumberRecord; import org.apache.poi.ss.usermodel.DataFormatter; import org.apache.poi.util.XMLHelper; import org.apache.poi.xssf.model.SharedStringsTable; @@ -48,7 +51,7 @@ * Sax方式读取Excel相关工具类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ExcelSaxKit { @@ -214,6 +217,19 @@ public static ExcelSaxReader createSaxReader(boolean isXlsx, RowHandler rowHa : new Excel03SaxReader(rowHandler); } + /** + * 判断数字Record中是否为日期格式 + * + * @param numrec 单元格记录 + * @param formatListener {@link FormatTrackingHSSFListener} + * @return 是否为日期格式 + */ + public static boolean isDateFormat(NumberRecord numrec, FormatTrackingHSSFListener formatListener) { + final int formatIndex = formatListener.getFormatIndex(numrec); + final String formatString = formatListener.getFormatString(numrec); + return org.apache.poi.ss.usermodel.DateUtil.isADateFormat(formatIndex, formatString); + } + /** * 获取数字类型值 * @@ -228,8 +244,7 @@ private static Number getNumberValue(String value, String numFmtString) { double numValue = Double.parseDouble(value); // 普通数字 if (null != numFmtString && numFmtString.indexOf(Symbol.C_DOT) < 0) { - final long longPart = (long) numValue; - // 对于无小数部分的数字类型,转为Long + return (long) numValue; } return numValue; } diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelWriter.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelWriter.java index e3a1023dc3..c813231ca0 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelWriter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelWriter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel; @@ -51,7 +52,7 @@ * * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ExcelWriter extends ExcelBase { @@ -851,6 +852,20 @@ public ExcelWriter setStyle(CellStyle style, String locationRef) { return setStyle(style, cellLocation.getX(), cellLocation.getY()); } + /** + * 设置行样式 + * + * @param y Y坐标,从0计数,即行号 + * @param style 样式 + * @return this + * @see Row#setRowStyle(CellStyle) + * @since 5.4.5 + */ + public ExcelWriter setRowStyle(int y, CellStyle style) { + getOrCreateRow(y).setRowStyle(style); + return this; + } + /** * 创建字体 * diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/RowKit.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/RowKit.java index 4537e5d7e6..065d0c9162 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/RowKit.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/RowKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel; @@ -43,7 +44,7 @@ * Excel中的行{@link Row}封装工具类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RowKit { @@ -96,7 +97,7 @@ public static List readRow(Row row, int startCellNumInclude, int endCell Object cellValue; boolean isAllNull = true; for (int i = startCellNumInclude; i < size; i++) { - cellValue = CellKit.getCellValue(row.getCell(i), cellEditor); + cellValue = CellKit.getCellValue(CellKit.getCell(row, i), cellEditor); isAllNull &= StringKit.emptyIfStr(cellValue); cellValues.add(cellValue); } diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/StyleKit.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/StyleKit.java index 7e0cd5d26b..2683849dc5 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/StyleKit.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/StyleKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel; @@ -31,7 +32,7 @@ * Excel样式工具类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class StyleKit { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/StyleSet.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/StyleSet.java index ea21e6fdd6..f47dcb7156 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/StyleSet.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/StyleSet.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel; @@ -32,7 +33,7 @@ * 样式集合,此样式集合汇集了整个工作簿的样式,用于减少样式的创建和冗余 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class StyleSet implements Serializable { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/WorksKit.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/WorksKit.java index 05fef62dda..db34d1d9bf 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/WorksKit.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/WorksKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel; @@ -44,7 +45,7 @@ * Excel工作簿{@link Workbook}相关工具类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class WorksKit { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/CellEditor.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/CellEditor.java index 22b0b23bcf..9b716162e9 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/CellEditor.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/CellEditor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel.cell; @@ -30,7 +31,7 @@ * 单元格编辑器接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @FunctionalInterface diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/CellHandler.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/CellHandler.java index 59ff518c2f..5d24d426fe 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/CellHandler.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/CellHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel.cell; @@ -31,7 +32,7 @@ * 单元格处理器接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @FunctionalInterface diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/CellLocation.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/CellLocation.java index ef0de8a4f1..f3b3d7ae87 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/CellLocation.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/CellLocation.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel.cell; @@ -31,7 +32,7 @@ * 单元格位置 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CellLocation implements Serializable { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/CellValue.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/CellValue.java index c6e4d520d0..a2c823b473 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/CellValue.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/CellValue.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel.cell; @@ -28,7 +29,7 @@ * 抽象的单元格值接口,用于判断不同类型的单元格值 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface CellValue { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/FormulaCellValue.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/FormulaCellValue.java index 28f104d048..78212c66c7 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/FormulaCellValue.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/FormulaCellValue.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel.cell; @@ -28,7 +29,7 @@ * 公式类型的值 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FormulaCellValue implements CellValue { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/NullCell.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/NullCell.java new file mode 100644 index 0000000000..b9881cc89f --- /dev/null +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/NullCell.java @@ -0,0 +1,261 @@ +/********************************************************************************* + * * + * The MIT License (MIT) * + * * + * Copyright (c) 2015-2020 aoju.org and other contributors. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy * + * of this software and associated documentation files (the "Software"), to deal * + * in the Software without restriction, including without limitation the rights * + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * + * THE SOFTWARE. * + * * + ********************************************************************************/ +package org.aoju.bus.office.support.excel.cell; + +import org.apache.poi.ss.formula.FormulaParseException; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.util.CellAddress; +import org.apache.poi.ss.util.CellRangeAddress; + +import java.time.LocalDateTime; +import java.util.Calendar; +import java.util.Date; + +/** + * 当单元格不存在时使用此对象表示,得到的值为null + * 此对象只用于标注单元格所在位置信息 + * + * @author Kimi Liu + * @version 6.1.2 + * @since JDK 1.8+ + */ +public class NullCell implements Cell { + + private final Row row; + private final int columnIndex; + + /** + * 构造函数 + * + * @param row 行 + * @param columnIndex 列号,从0开始 + */ + public NullCell(Row row, int columnIndex) { + this.row = row; + this.columnIndex = columnIndex; + } + + @Override + public int getColumnIndex() { + return this.columnIndex; + } + + @Override + public int getRowIndex() { + return getRow().getRowNum(); + } + + @Override + public Sheet getSheet() { + return getRow().getSheet(); + } + + @Override + public Row getRow() { + return this.row; + } + + @Override + public void setBlank() { + throw new UnsupportedOperationException("Can not set any thing to null cell!"); + } + + @Override + public CellType getCellType() { + return null; + } + + @Override + public void setCellType(CellType cellType) { + throw new UnsupportedOperationException("Can not set any thing to null cell!"); + } + + @Override + public CellType getCellTypeEnum() { + return null; + } + + @Override + public CellType getCachedFormulaResultType() { + return null; + } + + @Override + public CellType getCachedFormulaResultTypeEnum() { + return null; + } + + @Override + public void setCellValue(double value) { + throw new UnsupportedOperationException("Can not set any thing to null cell!"); + } + + @Override + public void setCellValue(Date value) { + throw new UnsupportedOperationException("Can not set any thing to null cell!"); + } + + @Override + public void setCellValue(LocalDateTime value) { + throw new UnsupportedOperationException("Can not set any thing to null cell!"); + } + + @Override + public void setCellValue(Calendar value) { + throw new UnsupportedOperationException("Can not set any thing to null cell!"); + } + + @Override + public void setCellValue(RichTextString value) { + throw new UnsupportedOperationException("Can not set any thing to null cell!"); + } + + @Override + public void setCellValue(String value) { + throw new UnsupportedOperationException("Can not set any thing to null cell!"); + } + + @Override + public void removeFormula() throws IllegalStateException { + throw new UnsupportedOperationException("Can not set any thing to null cell!"); + } + + @Override + public String getCellFormula() { + return null; + } + + @Override + public void setCellFormula(String formula) throws FormulaParseException, IllegalStateException { + throw new UnsupportedOperationException("Can not set any thing to null cell!"); + } + + @Override + public double getNumericCellValue() { + throw new UnsupportedOperationException("Cell value is null!"); + } + + @Override + public Date getDateCellValue() { + return null; + } + + @Override + public LocalDateTime getLocalDateTimeCellValue() { + return null; + } + + @Override + public RichTextString getRichStringCellValue() { + return null; + } + + @Override + public String getStringCellValue() { + return null; + } + + @Override + public void setCellValue(boolean value) { + throw new UnsupportedOperationException("Can not set any thing to null cell!"); + } + + @Override + public void setCellErrorValue(byte value) { + throw new UnsupportedOperationException("Can not set any thing to null cell!"); + } + + @Override + public boolean getBooleanCellValue() { + throw new UnsupportedOperationException("Cell value is null!"); + } + + @Override + public byte getErrorCellValue() { + throw new UnsupportedOperationException("Cell value is null!"); + } + + @Override + public CellStyle getCellStyle() { + return null; + } + + @Override + public void setCellStyle(CellStyle style) { + throw new UnsupportedOperationException("Can not set any thing to null cell!"); + } + + @Override + public void setAsActiveCell() { + throw new UnsupportedOperationException("Can not set any thing to null cell!"); + } + + @Override + public CellAddress getAddress() { + return null; + } + + @Override + public Comment getCellComment() { + return null; + } + + @Override + public void setCellComment(Comment comment) { + throw new UnsupportedOperationException("Can not set any thing to null cell!"); + } + + @Override + public void removeCellComment() { + throw new UnsupportedOperationException("Can not set any thing to null cell!"); + } + + @Override + public Hyperlink getHyperlink() { + return null; + } + + @Override + public void setHyperlink(Hyperlink link) { + throw new UnsupportedOperationException("Can not set any thing to null cell!"); + } + + @Override + public void removeHyperlink() { + throw new UnsupportedOperationException("Can not set any thing to null cell!"); + } + + @Override + public CellRangeAddress getArrayFormulaRange() { + return null; + } + + @Override + public boolean isPartOfArrayFormulaGroup() { + throw new UnsupportedOperationException("Cell value is null!"); + } + +} diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/editors/NumericToIntEditor.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/editors/NumericToIntEditor.java index c1be421e41..87d208be60 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/editors/NumericToIntEditor.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/editors/NumericToIntEditor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel.editors; @@ -31,7 +32,7 @@ * POI中NUMRIC类型的值默认返回的是Double类型,此编辑器用于转换其为int型 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NumericToIntEditor implements CellEditor { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/editors/TrimEditor.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/editors/TrimEditor.java index 37be57d366..e6ad1b5b94 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/editors/TrimEditor.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/editors/TrimEditor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel.editors; @@ -32,7 +33,7 @@ * 去除String类型的单元格值两边的空格 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TrimEditor implements CellEditor { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/AbstractSheetReader.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/AbstractSheetReader.java index acbe429722..4d1e599d78 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/AbstractSheetReader.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/AbstractSheetReader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel.reader; @@ -41,7 +42,7 @@ * * @param 读取类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractSheetReader implements SheetReader { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/BeanSheetReader.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/BeanSheetReader.java index 9e3fed13c5..ec7c3f4b0e 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/BeanSheetReader.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/BeanSheetReader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel.reader; @@ -36,7 +37,7 @@ * 读取{@link Sheet}为bean的List列表形式 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BeanSheetReader implements SheetReader> { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/ListSheetReader.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/ListSheetReader.java index 08a14ea434..ba1d5af97f 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/ListSheetReader.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/ListSheetReader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel.reader; @@ -35,7 +36,7 @@ * 读取{@link Sheet}为List列表形式 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ListSheetReader extends AbstractSheetReader>> { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/MapSheetReader.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/MapSheetReader.java index f009d67063..7578a6b791 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/MapSheetReader.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/MapSheetReader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel.reader; @@ -37,7 +38,7 @@ * 读取{@link Sheet}为Map的List列表形式 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MapSheetReader extends AbstractSheetReader>> { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/SheetReader.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/SheetReader.java index bcb8e66097..3e75ba79b6 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/SheetReader.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/SheetReader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel.reader; @@ -31,7 +32,7 @@ * * @param 读取的数据类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @FunctionalInterface diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/AbstractRowHandler.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/AbstractRowHandler.java index fb9765b65c..c2d738447b 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/AbstractRowHandler.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/AbstractRowHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel.sax; @@ -35,7 +36,7 @@ * * @param 转换后的数据类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractRowHandler implements RowHandler { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/BeanRowHandler.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/BeanRowHandler.java index 068118bc35..14f7fb6160 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/BeanRowHandler.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/BeanRowHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel.sax; @@ -37,7 +38,7 @@ * 将一行数据转换为Map,key为指定行,value为当前行对应位置的值 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class BeanRowHandler extends AbstractRowHandler { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/CellDataType.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/CellDataType.java index a735e67d7b..aee0050751 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/CellDataType.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/CellDataType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel.sax; @@ -30,7 +31,7 @@ * 单元格数据类型枚举 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum CellDataType { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/Excel03SaxReader.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/Excel03SaxReader.java index ac298b856f..0f93afcd6e 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/Excel03SaxReader.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/Excel03SaxReader.java @@ -21,11 +21,11 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel.sax; import org.aoju.bus.core.lang.Normal; -import org.aoju.bus.core.lang.Symbol; import org.aoju.bus.core.lang.exception.InstrumentException; import org.aoju.bus.core.toolkit.IoKit; import org.aoju.bus.core.toolkit.ObjectKit; @@ -50,7 +50,7 @@ * Excel2003格式的事件-用户模型方式读取器,统一将此归类为Sax读取 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Excel03SaxReader implements HSSFListener, ExcelSaxReader { @@ -308,12 +308,8 @@ private void processCellValue(Record record) { break; case NumberRecord.sid: // 数字类型 final NumberRecord numrec = (NumberRecord) record; - final String formatString = formatListener.getFormatString(numrec); - if (StringKit.contains(formatString, Symbol.DOT)) { - //浮点数 - value = numrec.getValue(); - } else if (StringKit.containsAny(formatString, Symbol.SLASH, Symbol.COLON, "年", "月", "日", "时", "分", "秒")) { - //日期 + if (ExcelSaxKit.isDateFormat(numrec, formatListener)) { + // 可能为日期格式 value = ExcelSaxKit.getDateValue(numrec.getValue()); } else { final double doubleValue = numrec.getValue(); diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/Excel07SaxReader.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/Excel07SaxReader.java index ed181e796e..d44500b879 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/Excel07SaxReader.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/Excel07SaxReader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel.sax; @@ -55,7 +56,7 @@ * Excel2007格式说明见:http://www.cnblogs.com/wangmingshun/p/6654143.html * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Excel07SaxReader extends DefaultHandler implements ExcelSaxReader { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/ExcelSaxReader.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/ExcelSaxReader.java index 3a714c0db1..cae7d99140 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/ExcelSaxReader.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/ExcelSaxReader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel.sax; @@ -35,7 +36,7 @@ * * @param 子对象类型,用于标记返回值this * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface ExcelSaxReader { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/MapRowHandler.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/MapRowHandler.java index c2ecf74bda..d5c007d2df 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/MapRowHandler.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/MapRowHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel.sax; @@ -36,7 +37,7 @@ * 将一行数据转换为Map,key为指定行,value为当前行对应位置的值 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class MapRowHandler extends AbstractRowHandler> { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/RowHandler.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/RowHandler.java index 123ecc6de5..c882d3c093 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/RowHandler.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/RowHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel.sax; @@ -32,7 +33,7 @@ * Sax方式读取Excel行处理器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @FunctionalInterface diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/SheetSaxReader.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/SheetSaxReader.java index 17cce1500f..cc000c14aa 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/SheetSaxReader.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/SheetSaxReader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel.sax; @@ -42,7 +43,7 @@ * 在Sax方式读取Excel时,读取sheet标签中sheetId和rid的对应关系 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SheetSaxReader extends DefaultHandler { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/style/Align.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/style/Align.java index 86faaaa384..714f05dec9 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/style/Align.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/style/Align.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.excel.style; @@ -28,7 +29,7 @@ * 对齐方式枚举 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum Align { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/word/PicType.java b/bus-office/src/main/java/org/aoju/bus/office/support/word/PicType.java index dd86012d41..def7a98c98 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/support/word/PicType.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/word/PicType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.word; @@ -30,7 +31,7 @@ * Word中的图片类型 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum PicType { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/word/TableKit.java b/bus-office/src/main/java/org/aoju/bus/office/support/word/TableKit.java index aeba0bed21..f755e93def 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/word/TableKit.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/word/TableKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.word; @@ -42,7 +43,7 @@ * Word中表格相关工具 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TableKit { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/word/Word07Writer.java b/bus-office/src/main/java/org/aoju/bus/office/support/word/Word07Writer.java index fcc1d26b1f..0bb27a06ca 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/word/Word07Writer.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/word/Word07Writer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.word; @@ -43,7 +44,7 @@ * Word生成器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Word07Writer implements Closeable { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/word/WordKit.java b/bus-office/src/main/java/org/aoju/bus/office/support/word/WordKit.java index 3e76c6f1eb..74ae57421a 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/word/WordKit.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/word/WordKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.office.support.word; @@ -37,7 +38,7 @@ * Word工具类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class WordKit { diff --git a/bus-opencv/pom.xml b/bus-opencv/pom.xml index f92b8beadc..50e9893590 100755 --- a/bus-opencv/pom.xml +++ b/bus-opencv/pom.xml @@ -6,19 +6,13 @@ org.aoju bus-opencv - 6.1.1 + 6.1.2 jar ${project.artifactId} Bus OpenCV https://github.com/aoju/bus - - UTF-8 - UTF-8 - 1.8 - - The MIT License (MIT) @@ -44,6 +38,12 @@ https://github.com/aoju/bus/issues + + UTF-8 + UTF-8 + 1.8 + + diff --git a/bus-opencv/src/main/java/org/opencv/core/Algorithm.java b/bus-opencv/src/main/java/org/opencv/core/Algorithm.java index e293a4915b..d690e33875 100644 --- a/bus-opencv/src/main/java/org/opencv/core/Algorithm.java +++ b/bus-opencv/src/main/java/org/opencv/core/Algorithm.java @@ -26,14 +26,14 @@ protected Algorithm(long addr) { nativeObj = addr; } + // C++: String cv::Algorithm::getDefaultName() + private static native String getDefaultName_0(long nativeObj); + // internal usage only public static Algorithm __fromPtr__(long addr) { return new Algorithm(addr); } - // C++: String cv::Algorithm::getDefaultName() - private static native String getDefaultName_0(long nativeObj); - // // C++: String cv::Algorithm::getDefaultName() // @@ -79,10 +79,6 @@ public static Algorithm __fromPtr__(long addr) { // Unknown type 'Ptr_FileStorage' (I), skipping the function - public long getNativeObjAddr() { - return nativeObj; - } - /** * Returns the algorithm string identifier. * This string is used as top level xml/yml node tag when the object is saved to a file or string. @@ -124,4 +120,8 @@ protected void finalize() throws Throwable { delete(nativeObj); } + public long getNativeObjAddr() { + return nativeObj; + } + } diff --git a/bus-opencv/src/main/java/org/opencv/core/Core.java b/bus-opencv/src/main/java/org/opencv/core/Core.java index 1ff0aa9de3..f7c0f35bff 100644 --- a/bus-opencv/src/main/java/org/opencv/core/Core.java +++ b/bus-opencv/src/main/java/org/opencv/core/Core.java @@ -10,6 +10,18 @@ // C++: class Core public class Core { + // C++: enum + public static final int + SVD_MODIFY_A = 1, + SVD_NO_UV = 2, + SVD_FULL_UV = 4, + FILLED = -1, + REDUCE_SUM = 0, + REDUCE_AVG = 1, + REDUCE_MAX = 2, + REDUCE_MIN = 3, + RNG_UNIFORM = 0, + RNG_NORMAL = 1; public static final String VERSION = getVersion(); public static final String NATIVE_LIBRARY_NAME = getNativeLibraryName(); public static final int VERSION_MAJOR = getVersionMajorJ(); @@ -68,18 +80,6 @@ public class Core { DFT_COMPLEX_INPUT = 64, DCT_INVERSE = DFT_INVERSE, DCT_ROWS = DFT_ROWS; - // C++: enum - public static final int - SVD_MODIFY_A = 1, - SVD_NO_UV = 2, - SVD_FULL_UV = 4, - FILLED = -1, - REDUCE_SUM = 0, - REDUCE_AVG = 1, - REDUCE_MAX = 2, - REDUCE_MIN = 3, - RNG_UNIFORM = 0, - RNG_NORMAL = 1; // C++: enum CovarFlags public static final int COVAR_SCRAMBLED = 0, @@ -201,7 +201,7 @@ public class Core { // these constants are wrapped inside functions to prevent inlining private static String getVersion() { - return "4.3.0"; + return "4.5.0"; } private static String getNativeLibraryName() { @@ -213,7 +213,7 @@ private static int getVersionMajorJ() { } private static int getVersionMinorJ() { - return 3; + return 5; } private static int getVersionRevisionJ() { @@ -1797,23 +1797,6 @@ public static void SVDecomp(Mat src, Mat w, Mat u, Mat vt, int flags) { // C++: void cv::absdiff(Mat src1, Mat src2, Mat& dst) // - /** - * wrap SVD::compute - * - * @param src automatically generated - * @param w automatically generated - * @param u automatically generated - * @param vt automatically generated - */ - public static void SVDecomp(Mat src, Mat w, Mat u, Mat vt) { - SVDecomp_1(src.nativeObj, w.nativeObj, u.nativeObj, vt.nativeObj); - } - - - // - // C++: void cv::absdiff(Mat src1, Scalar src2, Mat& dst) - // - /** * Calculates the per-element absolute difference between two arrays or between an array and a scalar. *

@@ -1844,6 +1827,23 @@ public static void absdiff(Mat src1, Mat src2, Mat dst) { } + // + // C++: void cv::absdiff(Mat src1, Scalar src2, Mat& dst) + // + + /** + * wrap SVD::compute + * + * @param src automatically generated + * @param w automatically generated + * @param u automatically generated + * @param vt automatically generated + */ + public static void SVDecomp(Mat src, Mat w, Mat u, Mat vt) { + SVDecomp_1(src.nativeObj, w.nativeObj, u.nativeObj, vt.nativeObj); + } + + // // C++: void cv::add(Mat src1, Mat src2, Mat& dst, Mat mask = Mat(), int dtype = -1) // @@ -2496,34 +2496,6 @@ public static void cartToPolar(Mat x, Mat y, Mat magnitude, Mat angle, boolean a // C++: void cv::compare(Mat src1, Mat src2, Mat& dst, int cmpop) // - /** - * Calculates the magnitude and angle of 2D vectors. - *

- * The function cv::cartToPolar calculates either the magnitude, angle, or both - * for every 2D vector (x(I),y(I)): - * \(\begin{array}{l} \texttt{magnitude} (I)= \sqrt{\texttt{x}(I)^2+\texttt{y}(I)^2} , \\ \texttt{angle} (I)= \texttt{atan2} ( \texttt{y} (I), \texttt{x} (I))[ \cdot180 / \pi ] \end{array}\) - *

- * The angles are calculated with accuracy about 0.3 degrees. For the point - * (0,0), the angle is set to 0. - * - * @param x array of x-coordinates; this must be a single-precision or - * double-precision floating-point array. - * @param y array of y-coordinates, that must have the same size and same type as x. - * @param magnitude output array of magnitudes of the same size and type as x. - * @param angle output array of angles that has the same size and type as - * x; the angles are measured in radians (from 0 to 2\*Pi) or in degrees (0 to 360 degrees). - * in radians (which is by default), or in degrees. - * SEE: Sobel, Scharr - */ - public static void cartToPolar(Mat x, Mat y, Mat magnitude, Mat angle) { - cartToPolar_1(x.nativeObj, y.nativeObj, magnitude.nativeObj, angle.nativeObj); - } - - - // - // C++: void cv::compare(Mat src1, Scalar src2, Mat& dst, int cmpop) - // - /** * Performs the per-element comparison of two arrays or an array and scalar value. *

@@ -2557,6 +2529,34 @@ public static void compare(Mat src1, Mat src2, Mat dst, int cmpop) { } + // + // C++: void cv::compare(Mat src1, Scalar src2, Mat& dst, int cmpop) + // + + /** + * Calculates the magnitude and angle of 2D vectors. + *

+ * The function cv::cartToPolar calculates either the magnitude, angle, or both + * for every 2D vector (x(I),y(I)): + * \(\begin{array}{l} \texttt{magnitude} (I)= \sqrt{\texttt{x}(I)^2+\texttt{y}(I)^2} , \\ \texttt{angle} (I)= \texttt{atan2} ( \texttt{y} (I), \texttt{x} (I))[ \cdot180 / \pi ] \end{array}\) + *

+ * The angles are calculated with accuracy about 0.3 degrees. For the point + * (0,0), the angle is set to 0. + * + * @param x array of x-coordinates; this must be a single-precision or + * double-precision floating-point array. + * @param y array of y-coordinates, that must have the same size and same type as x. + * @param magnitude output array of magnitudes of the same size and type as x. + * @param angle output array of angles that has the same size and type as + * x; the angles are measured in radians (from 0 to 2\*Pi) or in degrees (0 to 360 degrees). + * in radians (which is by default), or in degrees. + * SEE: Sobel, Scharr + */ + public static void cartToPolar(Mat x, Mat y, Mat magnitude, Mat angle) { + cartToPolar_1(x.nativeObj, y.nativeObj, magnitude.nativeObj, angle.nativeObj); + } + + // // C++: void cv::completeSymm(Mat& m, bool lowerToUpper = false) // @@ -2774,12 +2774,11 @@ public static void convertScaleAbs(Mat src, Mat dst) { * to extrapolate. For example, top=1, bottom=1, left=1, right=1 mean that 1 pixel-wide border needs * to be built. * @param borderType Border type. See borderInterpolate for details. - * @param value Border value if borderType==BORDER_CONSTANT . *

* SEE: borderInterpolate */ - public static void copyMakeBorder(Mat src, Mat dst, int top, int bottom, int left, int right, int borderType, Scalar value) { - copyMakeBorder_0(src.nativeObj, dst.nativeObj, top, bottom, left, right, borderType, value.val[0], value.val[1], value.val[2], value.val[3]); + public static void copyMakeBorder(Mat src, Mat dst, int top, int bottom, int left, int right, int borderType) { + copyMakeBorder_1(src.nativeObj, dst.nativeObj, top, bottom, left, right, borderType); } @@ -2827,11 +2826,12 @@ public static void copyMakeBorder(Mat src, Mat dst, int top, int bottom, int lef * to extrapolate. For example, top=1, bottom=1, left=1, right=1 mean that 1 pixel-wide border needs * to be built. * @param borderType Border type. See borderInterpolate for details. + * @param value Border value if borderType==BORDER_CONSTANT . *

* SEE: borderInterpolate */ - public static void copyMakeBorder(Mat src, Mat dst, int top, int bottom, int left, int right, int borderType) { - copyMakeBorder_1(src.nativeObj, dst.nativeObj, top, bottom, left, right, borderType); + public static void copyMakeBorder(Mat src, Mat dst, int top, int bottom, int left, int right, int borderType, Scalar value) { + copyMakeBorder_0(src.nativeObj, dst.nativeObj, top, bottom, left, right, borderType, value.val[0], value.val[1], value.val[2], value.val[3]); } @@ -3577,15 +3577,14 @@ public static void divide(Mat src1, Mat src2, Mat dst, double scale, int dtype) * Note: Saturation is not applied when the output array has the depth CV_32S. You may even get * result of an incorrect sign in the case of overflow. * - * @param src1 first input array. - * @param src2 second input array of the same size and type as src1. - * @param scale scalar factor. - * @param dst output array of the same size and type as src2. - * case of an array-by-array division, you can only pass -1 when src1.depth()==src2.depth(). - * SEE: multiply, add, subtract + * @param src1 first input array. + * @param src2 second input array of the same size and type as src1. + * @param dst output array of the same size and type as src2. + * case of an array-by-array division, you can only pass -1 when src1.depth()==src2.depth(). + * SEE: multiply, add, subtract */ - public static void divide(Mat src1, Mat src2, Mat dst, double scale) { - divide_1(src1.nativeObj, src2.nativeObj, dst.nativeObj, scale); + public static void divide(Mat src1, Mat src2, Mat dst) { + divide_2(src1.nativeObj, src2.nativeObj, dst.nativeObj); } @@ -3612,14 +3611,15 @@ public static void divide(Mat src1, Mat src2, Mat dst, double scale) { * Note: Saturation is not applied when the output array has the depth CV_32S. You may even get * result of an incorrect sign in the case of overflow. * - * @param src1 first input array. - * @param src2 second input array of the same size and type as src1. - * @param dst output array of the same size and type as src2. - * case of an array-by-array division, you can only pass -1 when src1.depth()==src2.depth(). - * SEE: multiply, add, subtract + * @param src1 first input array. + * @param src2 second input array of the same size and type as src1. + * @param scale scalar factor. + * @param dst output array of the same size and type as src2. + * case of an array-by-array division, you can only pass -1 when src1.depth()==src2.depth(). + * SEE: multiply, add, subtract */ - public static void divide(Mat src1, Mat src2, Mat dst) { - divide_2(src1.nativeObj, src2.nativeObj, dst.nativeObj); + public static void divide(Mat src1, Mat src2, Mat dst, double scale) { + divide_1(src1.nativeObj, src2.nativeObj, dst.nativeObj, scale); } public static void divide(Mat src1, Scalar src2, Mat dst, double scale, int dtype) { @@ -3681,6 +3681,23 @@ public static void eigenNonSymmetric(Mat src, Mat eigenvalues, Mat eigenvectors) // C++: void cv::extractChannel(Mat src, Mat& dst, int coi) // + /** + * Extracts a single channel from src (coi is 0-based index) + * + * @param src input array + * @param dst output array + * @param coi index of channel to extract + * SEE: mixChannels, split + */ + public static void extractChannel(Mat src, Mat dst, int coi) { + extractChannel_0(src.nativeObj, dst.nativeObj, coi); + } + + + // + // C++: void cv::findNonZero(Mat src, Mat& idx) + // + /** * Calculates the exponent of every array element. *

@@ -3702,23 +3719,6 @@ public static void exp(Mat src, Mat dst) { } - // - // C++: void cv::findNonZero(Mat src, Mat& idx) - // - - /** - * Extracts a single channel from src (coi is 0-based index) - * - * @param src input array - * @param dst output array - * @param coi index of channel to extract - * SEE: mixChannels, split - */ - public static void extractChannel(Mat src, Mat dst, int coi) { - extractChannel_0(src.nativeObj, dst.nativeObj, coi); - } - - // // C++: void cv::flip(Mat src, Mat& dst, int flipCode) // @@ -3825,11 +3825,10 @@ public static void flip(Mat src, Mat dst, int flipCode) { * @param beta weight of src3. * @param dst output matrix; it has the proper size and the same type as * input matrices. - * @param flags operation flags (cv::GemmFlags) * SEE: mulTransposed , transform */ - public static void gemm(Mat src1, Mat src2, double alpha, Mat src3, double beta, Mat dst, int flags) { - gemm_0(src1.nativeObj, src2.nativeObj, alpha, src3.nativeObj, beta, dst.nativeObj, flags); + public static void gemm(Mat src1, Mat src2, double alpha, Mat src3, double beta, Mat dst) { + gemm_1(src1.nativeObj, src2.nativeObj, alpha, src3.nativeObj, beta, dst.nativeObj); } @@ -3864,10 +3863,11 @@ public static void gemm(Mat src1, Mat src2, double alpha, Mat src3, double beta, * @param beta weight of src3. * @param dst output matrix; it has the proper size and the same type as * input matrices. + * @param flags operation flags (cv::GemmFlags) * SEE: mulTransposed , transform */ - public static void gemm(Mat src1, Mat src2, double alpha, Mat src3, double beta, Mat dst) { - gemm_1(src1.nativeObj, src2.nativeObj, alpha, src3.nativeObj, beta, dst.nativeObj); + public static void gemm(Mat src1, Mat src2, double alpha, Mat src3, double beta, Mat dst, int flags) { + gemm_0(src1.nativeObj, src2.nativeObj, alpha, src3.nativeObj, beta, dst.nativeObj, flags); } @@ -4068,28 +4068,6 @@ public static void log(Mat src, Mat dst) { // C++: void cv::max(Mat src1, Mat src2, Mat& dst) // - /** - * Calculates the magnitude of 2D vectors. - *

- * The function cv::magnitude calculates the magnitude of 2D vectors formed - * from the corresponding elements of x and y arrays: - * \(\texttt{dst} (I) = \sqrt{\texttt{x}(I)^2 + \texttt{y}(I)^2}\) - * - * @param x floating-point array of x-coordinates of the vectors. - * @param y floating-point array of y-coordinates of the vectors; it must - * have the same size as x. - * @param magnitude output array of the same size and type as x. - * SEE: cartToPolar, polarToCart, phase, sqrt - */ - public static void magnitude(Mat x, Mat y, Mat magnitude) { - magnitude_0(x.nativeObj, y.nativeObj, magnitude.nativeObj); - } - - - // - // C++: void cv::max(Mat src1, Scalar src2, Mat& dst) - // - /** * Calculates per-element maximum of two arrays or an array and a scalar. *

@@ -4108,6 +4086,28 @@ public static void max(Mat src1, Mat src2, Mat dst) { } + // + // C++: void cv::max(Mat src1, Scalar src2, Mat& dst) + // + + /** + * Calculates the magnitude of 2D vectors. + *

+ * The function cv::magnitude calculates the magnitude of 2D vectors formed + * from the corresponding elements of x and y arrays: + * \(\texttt{dst} (I) = \sqrt{\texttt{x}(I)^2 + \texttt{y}(I)^2}\) + * + * @param x floating-point array of x-coordinates of the vectors. + * @param y floating-point array of y-coordinates of the vectors; it must + * have the same size as x. + * @param magnitude output array of the same size and type as x. + * SEE: cartToPolar, polarToCart, phase, sqrt + */ + public static void magnitude(Mat x, Mat y, Mat magnitude) { + magnitude_0(x.nativeObj, y.nativeObj, magnitude.nativeObj); + } + + // // C++: void cv::meanStdDev(Mat src, vector_double& mean, vector_double& stddev, Mat mask = Mat()) // @@ -4149,6 +4149,22 @@ public static void meanStdDev(Mat src, MatOfDouble mean, MatOfDouble stddev, Mat // C++: void cv::merge(vector_Mat mv, Mat& dst) // + /** + * @param mv input vector of matrices to be merged; all the matrices in mv must have the same + * size and the same depth. + * @param dst output array of the same size and the same depth as mv[0]; The number of channels will + * be the total number of channels in the matrix array. + */ + public static void merge(List mv, Mat dst) { + Mat mv_mat = Converters.vector_Mat_to_Mat(mv); + merge_0(mv_mat.nativeObj, dst.nativeObj); + } + + + // + // C++: void cv::min(Mat src1, Mat src2, Mat& dst) + // + /** * Calculates a mean and standard deviation of array elements. *

@@ -4178,23 +4194,16 @@ public static void meanStdDev(Mat src, MatOfDouble mean, MatOfDouble stddev) { // - // C++: void cv::min(Mat src1, Mat src2, Mat& dst) + // C++: void cv::min(Mat src1, Scalar src2, Mat& dst) // - /** - * @param mv input vector of matrices to be merged; all the matrices in mv must have the same - * size and the same depth. - * @param dst output array of the same size and the same depth as mv[0]; The number of channels will - * be the total number of channels in the matrix array. - */ - public static void merge(List mv, Mat dst) { - Mat mv_mat = Converters.vector_Mat_to_Mat(mv); - merge_0(mv_mat.nativeObj, dst.nativeObj); + public static void min(Mat src1, Scalar src2, Mat dst) { + min_1(src1.nativeObj, src2.val[0], src2.val[1], src2.val[2], src2.val[3], dst.nativeObj); } // - // C++: void cv::min(Mat src1, Scalar src2, Mat& dst) + // C++: void cv::mixChannels(vector_Mat src, vector_Mat dst, vector_int fromTo) // /** @@ -4215,15 +4224,6 @@ public static void min(Mat src1, Mat src2, Mat dst) { } - // - // C++: void cv::mixChannels(vector_Mat src, vector_Mat dst, vector_int fromTo) - // - - public static void min(Mat src1, Scalar src2, Mat dst) { - min_1(src1.nativeObj, src2.val[0], src2.val[1], src2.val[2], src2.val[3], dst.nativeObj); - } - - // // C++: void cv::mulSpectrums(Mat a, Mat b, Mat& c, int flags, bool conjB = false) // @@ -4826,16 +4826,15 @@ public static void normalize(Mat src, Mat dst, double alpha, double beta) { * normalize(positiveData, normalizedData_minmax, 1.0, 0.0, NORM_MINMAX); * * - * @param src input array. - * @param dst output array of the same size as src . - * @param alpha norm value to normalize to or the lower range boundary in case of the range - * normalization. - * normalization. - * number of channels as src and the depth =CV_MAT_DEPTH(dtype). - * SEE: norm, Mat::convertTo, SparseMat::convertTo + * @param src input array. + * @param dst output array of the same size as src . + * normalization. + * normalization. + * number of channels as src and the depth =CV_MAT_DEPTH(dtype). + * SEE: norm, Mat::convertTo, SparseMat::convertTo */ - public static void normalize(Mat src, Mat dst, double alpha) { - normalize_4(src.nativeObj, dst.nativeObj, alpha); + public static void normalize(Mat src, Mat dst) { + normalize_5(src.nativeObj, dst.nativeObj); } @@ -4890,22 +4889,23 @@ public static void normalize(Mat src, Mat dst, double alpha) { * normalize(positiveData, normalizedData_minmax, 1.0, 0.0, NORM_MINMAX); * * - * @param src input array. - * @param dst output array of the same size as src . - * normalization. - * normalization. - * number of channels as src and the depth =CV_MAT_DEPTH(dtype). - * SEE: norm, Mat::convertTo, SparseMat::convertTo + * @param src input array. + * @param dst output array of the same size as src . + * @param alpha norm value to normalize to or the lower range boundary in case of the range + * normalization. + * normalization. + * number of channels as src and the depth =CV_MAT_DEPTH(dtype). + * SEE: norm, Mat::convertTo, SparseMat::convertTo */ - public static void normalize(Mat src, Mat dst) { - normalize_5(src.nativeObj, dst.nativeObj); + public static void normalize(Mat src, Mat dst, double alpha) { + normalize_4(src.nativeObj, dst.nativeObj, alpha); } /** - * converts NaN's to the given number + * converts NaNs to the given number * - * @param a automatically generated - * @param val automatically generated + * @param a input/output matrix (CV_32F type). + * @param val value to convert the NaNs */ public static void patchNaNs(Mat a, double val) { patchNaNs_0(a.nativeObj, val); @@ -4916,20 +4916,6 @@ public static void patchNaNs(Mat a, double val) { // C++: void cv::perspectiveTransform(Mat src, Mat& dst, Mat m) // - /** - * converts NaN's to the given number - * - * @param a automatically generated - */ - public static void patchNaNs(Mat a) { - patchNaNs_1(a.nativeObj); - } - - - // - // C++: void cv::phase(Mat x, Mat y, Mat& angle, bool angleInDegrees = false) - // - /** * Performs the perspective matrix transformation of vectors. *

@@ -4961,6 +4947,20 @@ public static void perspectiveTransform(Mat src, Mat dst, Mat m) { perspectiveTransform_0(src.nativeObj, dst.nativeObj, m.nativeObj); } + + // + // C++: void cv::phase(Mat x, Mat y, Mat& angle, bool angleInDegrees = false) + // + + /** + * converts NaNs to the given number + * + * @param a input/output matrix (CV_32F type). + */ + public static void patchNaNs(Mat a) { + patchNaNs_1(a.nativeObj); + } + /** * Calculates the rotation angle of 2D vectors. *

@@ -4988,27 +4988,6 @@ public static void phase(Mat x, Mat y, Mat angle, boolean angleInDegrees) { // C++: void cv::polarToCart(Mat magnitude, Mat angle, Mat& x, Mat& y, bool angleInDegrees = false) // - /** - * Calculates the rotation angle of 2D vectors. - *

- * The function cv::phase calculates the rotation angle of each 2D vector that - * is formed from the corresponding elements of x and y : - * \(\texttt{angle} (I) = \texttt{atan2} ( \texttt{y} (I), \texttt{x} (I))\) - *

- * The angle estimation accuracy is about 0.3 degrees. When x(I)=y(I)=0 , - * the corresponding angle(I) is set to 0. - * - * @param x input floating-point array of x-coordinates of 2D vectors. - * @param y input array of y-coordinates of 2D vectors; it must have the - * same size and the same type as x. - * @param angle output array of vector angles; it has the same size and - * same type as x . - * degrees, otherwise, they are measured in radians. - */ - public static void phase(Mat x, Mat y, Mat angle) { - phase_1(x.nativeObj, y.nativeObj, angle.nativeObj); - } - /** * Calculates x and y coordinates of 2D vectors from their magnitude and angle. *

@@ -5035,6 +5014,27 @@ public static void polarToCart(Mat magnitude, Mat angle, Mat x, Mat y, boolean a polarToCart_0(magnitude.nativeObj, angle.nativeObj, x.nativeObj, y.nativeObj, angleInDegrees); } + /** + * Calculates the rotation angle of 2D vectors. + *

+ * The function cv::phase calculates the rotation angle of each 2D vector that + * is formed from the corresponding elements of x and y : + * \(\texttt{angle} (I) = \texttt{atan2} ( \texttt{y} (I), \texttt{x} (I))\) + *

+ * The angle estimation accuracy is about 0.3 degrees. When x(I)=y(I)=0 , + * the corresponding angle(I) is set to 0. + * + * @param x input floating-point array of x-coordinates of 2D vectors. + * @param y input array of y-coordinates of 2D vectors; it must have the + * same size and the same type as x. + * @param angle output array of vector angles; it has the same size and + * same type as x . + * degrees, otherwise, they are measured in radians. + */ + public static void phase(Mat x, Mat y, Mat angle) { + phase_1(x.nativeObj, y.nativeObj, angle.nativeObj); + } + // // C++: void cv::pow(Mat src, double power, Mat& dst) @@ -5141,20 +5141,19 @@ public static void randShuffle(Mat dst) { // /** - * Fills the array with normally distributed random numbers. + * Generates a single uniformly-distributed random number or an array of random numbers. *

- * The function cv::randn fills the matrix dst with normally distributed random numbers with the specified - * mean vector and the standard deviation matrix. The generated random numbers are clipped to fit the - * value range of the output array data type. + * Non-template variant of the function fills the matrix dst with uniformly-distributed + * random numbers from the specified range: + * \(\texttt{low} _c \leq \texttt{dst} (I)_c < \texttt{high} _c\) * - * @param dst output array of random numbers; the array must be pre-allocated and have 1 to 4 channels. - * @param mean mean value (expectation) of the generated random numbers. - * @param stddev standard deviation of the generated random numbers; it can be either a vector (in - * which case a diagonal standard deviation matrix is assumed) or a square matrix. - * SEE: RNG, randu + * @param dst output array of random numbers; the array must be pre-allocated. + * @param low inclusive lower boundary of the generated random numbers. + * @param high exclusive upper boundary of the generated random numbers. + * SEE: RNG, randn, theRNG */ - public static void randn(Mat dst, double mean, double stddev) { - randn_0(dst.nativeObj, mean, stddev); + public static void randu(Mat dst, double low, double high) { + randu_0(dst.nativeObj, low, high); } @@ -5163,19 +5162,20 @@ public static void randn(Mat dst, double mean, double stddev) { // /** - * Generates a single uniformly-distributed random number or an array of random numbers. + * Fills the array with normally distributed random numbers. *

- * Non-template variant of the function fills the matrix dst with uniformly-distributed - * random numbers from the specified range: - * \(\texttt{low} _c \leq \texttt{dst} (I)_c < \texttt{high} _c\) + * The function cv::randn fills the matrix dst with normally distributed random numbers with the specified + * mean vector and the standard deviation matrix. The generated random numbers are clipped to fit the + * value range of the output array data type. * - * @param dst output array of random numbers; the array must be pre-allocated. - * @param low inclusive lower boundary of the generated random numbers. - * @param high exclusive upper boundary of the generated random numbers. - * SEE: RNG, randn, theRNG + * @param dst output array of random numbers; the array must be pre-allocated and have 1 to 4 channels. + * @param mean mean value (expectation) of the generated random numbers. + * @param stddev standard deviation of the generated random numbers; it can be either a vector (in + * which case a diagonal standard deviation matrix is assumed) or a square matrix. + * SEE: RNG, randu */ - public static void randu(Mat dst, double low, double high) { - randu_0(dst.nativeObj, low, high); + public static void randn(Mat dst, double mean, double stddev) { + randn_0(dst.nativeObj, mean, stddev); } /** @@ -5245,30 +5245,6 @@ public static void reduce(Mat src, Mat dst, int dim, int rtype) { // C++: void cv::rotate(Mat src, Mat& dst, int rotateCode) // - /** - * Fills the output array with repeated copies of the input array. - *

- * The function cv::repeat duplicates the input array one or more times along each of the two axes: - * \(\texttt{dst} _{ij}= \texttt{src} _{i\mod src.rows, \; j\mod src.cols }\) - * The second variant of the function is more convenient to use with REF: MatrixExpressions. - * - * @param src input array to replicate. - * @param ny Flag to specify how many times the {@code src} is repeated along the - * vertical axis. - * @param nx Flag to specify how many times the {@code src} is repeated along the - * horizontal axis. - * @param dst output array of the same type as {@code src}. - * SEE: cv::reduce - */ - public static void repeat(Mat src, int ny, int nx, Mat dst) { - repeat_0(src.nativeObj, ny, nx, dst.nativeObj); - } - - - // - // C++: void cv::scaleAdd(Mat src1, double alpha, Mat src2, Mat& dst) - // - /** * Rotates a 2D array in multiples of 90 degrees. * The function cv::rotate rotates the array in one of three different ways: @@ -5288,7 +5264,7 @@ public static void rotate(Mat src, Mat dst, int rotateCode) { // - // C++: void cv::setErrorVerbosity(bool verbose) + // C++: void cv::scaleAdd(Mat src1, double alpha, Mat src2, Mat& dst) // /** @@ -5316,6 +5292,30 @@ public static void scaleAdd(Mat src1, double alpha, Mat src2, Mat dst) { } + // + // C++: void cv::setErrorVerbosity(bool verbose) + // + + /** + * Fills the output array with repeated copies of the input array. + *

+ * The function cv::repeat duplicates the input array one or more times along each of the two axes: + * \(\texttt{dst} _{ij}= \texttt{src} _{i\mod src.rows, \; j\mod src.cols }\) + * The second variant of the function is more convenient to use with REF: MatrixExpressions. + * + * @param src input array to replicate. + * @param ny Flag to specify how many times the {@code src} is repeated along the + * vertical axis. + * @param nx Flag to specify how many times the {@code src} is repeated along the + * horizontal axis. + * @param dst output array of the same type as {@code src}. + * SEE: cv::reduce + */ + public static void repeat(Mat src, int ny, int nx, Mat dst) { + repeat_0(src.nativeObj, ny, nx, dst.nativeObj); + } + + // // C++: void cv::setIdentity(Mat& mtx, Scalar s = Scalar(1)) // @@ -5795,7 +5795,7 @@ public static MinMaxLocResult minMaxLoc(Mat src, Mat mask) { if (mask != null) { maskNativeObj = mask.nativeObj; } - double resarr[] = n_minMaxLocManual(src.nativeObj, maskNativeObj); + double[] resarr = n_minMaxLocManual(src.nativeObj, maskNativeObj); res.minVal = resarr[0]; res.maxVal = resarr[1]; res.minLoc.x = resarr[2]; @@ -6290,6 +6290,8 @@ public static MinMaxLocResult minMaxLoc(Mat src) { private static native void setIdentity_1(long mtx_nativeObj); + private static native double[] n_minMaxLocManual(long src_nativeObj, long mask_nativeObj); + // C++: void cv::setRNGSeed(int seed) private static native void setRNGSeed_0(int seed); @@ -6340,8 +6342,6 @@ public static MinMaxLocResult minMaxLoc(Mat src) { // C++: void cv::samples::addSamplesDataSearchSubDirectory(String subdir) private static native void addSamplesDataSearchSubDirectory_0(String subdir); - private static native double[] n_minMaxLocManual(long src_nativeObj, long mask_nativeObj); - // manual port public static class MinMaxLocResult { public double minVal; diff --git a/bus-opencv/src/main/java/org/opencv/core/TickMeter.java b/bus-opencv/src/main/java/org/opencv/core/TickMeter.java index c2facfb9a4..6039b5bd38 100644 --- a/bus-opencv/src/main/java/org/opencv/core/TickMeter.java +++ b/bus-opencv/src/main/java/org/opencv/core/TickMeter.java @@ -11,26 +11,11 @@ *

* The class computes passing time by counting the number of ticks per second. That is, the following code computes the * execution time in seconds: - * - * TickMeter tm; - * tm.start(); - * // do something ... - * tm.stop(); - * std::cout << tm.getTimeSec(); - * + * SNIPPET: snippets/core_various.cpp TickMeter_total *

* It is also possible to compute the average time over multiple runs: - * - * TickMeter tm; - * for (int i = 0; i < 100; i++) - * { - * tm.start(); - * // do something ... - * tm.stop(); - * } - * double average_time = tm.getTimeSec() / tm.getCounter(); - * std::cout << "Average time in second per iteration is: " << average_time << std::endl; - * + * SNIPPET: snippets/core_various.cpp TickMeter_average + *

* SEE: getTickCount, getTickFrequency */ public class TickMeter { @@ -58,6 +43,30 @@ public static TickMeter __fromPtr__(long addr) { private static native long TickMeter_0(); + // + // C++: double cv::TickMeter::getAvgTimeMilli() + // + + // C++: double cv::TickMeter::getAvgTimeMilli() + private static native double getAvgTimeMilli_0(long nativeObj); + + + // + // C++: double cv::TickMeter::getAvgTimeSec() + // + + // C++: double cv::TickMeter::getAvgTimeSec() + private static native double getAvgTimeSec_0(long nativeObj); + + + // + // C++: double cv::TickMeter::getFPS() + // + + // C++: double cv::TickMeter::getFPS() + private static native double getFPS_0(long nativeObj); + + // // C++: double cv::TickMeter::getTimeMicro() // @@ -124,72 +133,34 @@ public static TickMeter __fromPtr__(long addr) { // native support for java finalize() private static native void delete(long nativeObj); - public long getNativeObjAddr() { - return nativeObj; - } - - /** - * returns passed time in microseconds. - * - * @return automatically generated - */ public double getTimeMicro() { return getTimeMicro_0(nativeObj); } - /** - * returns passed time in milliseconds. - * - * @return automatically generated - */ public double getTimeMilli() { return getTimeMilli_0(nativeObj); } - /** - * returns passed time in seconds. - * - * @return automatically generated - */ public double getTimeSec() { return getTimeSec_0(nativeObj); } - /** - * returns internal counter value. - * - * @return automatically generated - */ public long getCounter() { return getCounter_0(nativeObj); } - /** - * returns counted ticks. - * - * @return automatically generated - */ public long getTimeTicks() { return getTimeTicks_0(nativeObj); } - /** - * resets internal values. - */ public void reset() { reset_0(nativeObj); } - /** - * starts counting ticks. - */ public void start() { start_0(nativeObj); } - /** - * stops counting ticks. - */ public void stop() { stop_0(nativeObj); } @@ -199,4 +170,20 @@ protected void finalize() throws Throwable { delete(nativeObj); } + public long getNativeObjAddr() { + return nativeObj; + } + + public double getAvgTimeMilli() { + return getAvgTimeMilli_0(nativeObj); + } + + public double getAvgTimeSec() { + return getAvgTimeSec_0(nativeObj); + } + + public double getFPS() { + return getFPS_0(nativeObj); + } + } diff --git a/bus-opencv/src/main/java/org/opencv/imgcodecs/Imgcodecs.java b/bus-opencv/src/main/java/org/opencv/imgcodecs/Imgcodecs.java index e5bb536fd2..2de9bcd2a9 100644 --- a/bus-opencv/src/main/java/org/opencv/imgcodecs/Imgcodecs.java +++ b/bus-opencv/src/main/java/org/opencv/imgcodecs/Imgcodecs.java @@ -140,13 +140,14 @@ public class Imgcodecs { DICOM_PARAM_COMPONENTS = 5, DICOM_PARAM_BITS_PER_SAMPLE = 6, DICOM_PARAM_INTERLEAVE_MODE = 7, - DICOM_PARAM_COLOR_MODEL = 8, - DICOM_PARAM_JPEG_MODE = 9, - DICOM_PARAM_JPEGLS_LOSSY_ERROR = 10, - DICOM_PARAM_J2K_COMPRESSION_FACTOR = 11, - DICOM_PARAM_JPEG_QUALITY = 12, - DICOM_PARAM_JPEG_PREDICTION = 13, - DICOM_PARAM_JPEG_PT_TRANSFORM = 14; + DICOM_PARAM_STREAM_VR = 8, + DICOM_PARAM_COLOR_MODEL = 9, + DICOM_PARAM_JPEG_MODE = 10, + DICOM_PARAM_JPEGLS_LOSSY_ERROR = 11, + DICOM_PARAM_J2K_COMPRESSION_FACTOR = 12, + DICOM_PARAM_JPEG_QUALITY = 13, + DICOM_PARAM_JPEG_PREDICTION = 14, + DICOM_PARAM_JPEG_PT_TRANSFORM = 15; // @@ -681,18 +682,21 @@ public static boolean imreadmulti(String filename, List mats) { * 8-bit (or 16-bit) 4-channel image BGRA, where the alpha channel goes last. Fully transparent pixels * should have alpha set to 0, fully opaque pixels should have alpha set to 255/65535 (see the code sample below). * + *

  • + * Multiple images (vector of Mat) can be saved in TIFF format (see the code sample below). + *
  • * *

    * If the format, depth or channel order is different, use * Mat::convertTo and cv::cvtColor to convert it before saving. Or, use the universal FileStorage I/O * functions to save the image to XML or YAML format. *

    - * The sample below shows how to create a BGRA image and save it to a PNG file. It also demonstrates how to set custom - * compression parameters: + * The sample below shows how to create a BGRA image, how to set custom compression parameters and save it to a PNG file. + * It also demonstrates how to save multiple images in a TIFF file: * INCLUDE: snippets/imgcodecs_imwrite.cpp * * @param filename Name of the file. - * @param img Image to be saved. + * @param img (Mat or vector of Mat) Image or Images to be saved. * @param params Format-specific parameters encoded as pairs (paramId_1, paramValue_1, paramId_2, paramValue_2, ... .) see cv::ImwriteFlags * @return automatically generated */ @@ -723,18 +727,21 @@ public static boolean imwrite(String filename, Mat img, MatOfInt params) { * 8-bit (or 16-bit) 4-channel image BGRA, where the alpha channel goes last. Fully transparent pixels * should have alpha set to 0, fully opaque pixels should have alpha set to 255/65535 (see the code sample below). * + *

  • + * Multiple images (vector of Mat) can be saved in TIFF format (see the code sample below). + *
  • * *

    * If the format, depth or channel order is different, use * Mat::convertTo and cv::cvtColor to convert it before saving. Or, use the universal FileStorage I/O * functions to save the image to XML or YAML format. *

    - * The sample below shows how to create a BGRA image and save it to a PNG file. It also demonstrates how to set custom - * compression parameters: + * The sample below shows how to create a BGRA image, how to set custom compression parameters and save it to a PNG file. + * It also demonstrates how to save multiple images in a TIFF file: * INCLUDE: snippets/imgcodecs_imwrite.cpp * * @param filename Name of the file. - * @param img Image to be saved. + * @param img (Mat or vector of Mat) Image or Images to be saved. * @return automatically generated */ public static boolean imwrite(String filename, Mat img) { diff --git a/bus-opencv/src/main/java/org/opencv/imgproc/Imgproc.java b/bus-opencv/src/main/java/org/opencv/imgproc/Imgproc.java index 163f2ea611..85805018c4 100644 --- a/bus-opencv/src/main/java/org/opencv/imgproc/Imgproc.java +++ b/bus-opencv/src/main/java/org/opencv/imgproc/Imgproc.java @@ -13,6 +13,32 @@ public class Imgproc { + // C++: enum ColormapTypes + public static final int + COLORMAP_AUTUMN = 0, + COLORMAP_BONE = 1, + COLORMAP_JET = 2, + COLORMAP_WINTER = 3, + COLORMAP_RAINBOW = 4, + COLORMAP_OCEAN = 5, + COLORMAP_SUMMER = 6, + COLORMAP_SPRING = 7, + COLORMAP_COOL = 8, + COLORMAP_HSV = 9, + COLORMAP_PINK = 10, + COLORMAP_HOT = 11, + COLORMAP_PARULA = 12, + COLORMAP_MAGMA = 13, + COLORMAP_INFERNO = 14, + COLORMAP_PLASMA = 15, + COLORMAP_VIRIDIS = 16, + COLORMAP_CIVIDIS = 17, + COLORMAP_TWILIGHT = 18, + COLORMAP_TWILIGHT_SHIFTED = 19, + COLORMAP_TURBO = 20, + COLORMAP_DEEPGREEN = 21; + + // C++: enum HersheyFonts public static final int FONT_HERSHEY_SIMPLEX = 0, @@ -24,12 +50,16 @@ public class Imgproc { FONT_HERSHEY_SCRIPT_SIMPLEX = 6, FONT_HERSHEY_SCRIPT_COMPLEX = 7, FONT_ITALIC = 16; + + // C++: enum InterpolationMasks public static final int INTER_BITS = 5, INTER_BITS2 = INTER_BITS * 2, INTER_TAB_SIZE = 1 << INTER_BITS, INTER_TAB_SIZE2 = INTER_TAB_SIZE * INTER_TAB_SIZE; + + // C++: enum MorphTypes public static final int MORPH_ERODE = 0, @@ -40,10 +70,14 @@ public class Imgproc { MORPH_TOPHAT = 5, MORPH_BLACKHAT = 6, MORPH_HITMISS = 7; + + // C++: enum FloodFillFlags public static final int FLOODFILL_FIXED_RANGE = 1 << 16, FLOODFILL_MASK_ONLY = 1 << 17; + + // C++: enum HoughModes public static final int HOUGH_STANDARD = 0, @@ -51,11 +85,15 @@ public class Imgproc { HOUGH_MULTI_SCALE = 2, HOUGH_GRADIENT = 3, HOUGH_GRADIENT_ALT = 4; + + // C++: enum ConnectedComponentsAlgorithmsTypes public static final int CCL_WU = 0, CCL_DEFAULT = -1, CCL_GRANA = 1; + + // C++: enum RetrievalModes public static final int RETR_EXTERNAL = 0, @@ -63,35 +101,28 @@ public class Imgproc { RETR_CCOMP = 2, RETR_TREE = 3, RETR_FLOODFILL = 4; + + // C++: enum GrabCutClasses public static final int GC_BGD = 0, GC_FGD = 1, GC_PR_BGD = 2, GC_PR_FGD = 3; - // C++: enum ColormapTypes + // C++: enum InterpolationFlags public static final int - COLORMAP_AUTUMN = 0, - COLORMAP_BONE = 1, - COLORMAP_JET = 2, - COLORMAP_WINTER = 3, - COLORMAP_RAINBOW = 4, - COLORMAP_OCEAN = 5, - COLORMAP_SUMMER = 6, - COLORMAP_SPRING = 7, - COLORMAP_COOL = 8, - COLORMAP_HSV = 9, - COLORMAP_PINK = 10, - COLORMAP_HOT = 11, - COLORMAP_PARULA = 12, - COLORMAP_MAGMA = 13, - COLORMAP_INFERNO = 14, - COLORMAP_PLASMA = 15, - COLORMAP_VIRIDIS = 16, - COLORMAP_CIVIDIS = 17, - COLORMAP_TWILIGHT = 18, - COLORMAP_TWILIGHT_SHIFTED = 19, - COLORMAP_TURBO = 20; + INTER_NEAREST = 0, + INTER_LINEAR = 1, + INTER_CUBIC = 2, + INTER_AREA = 3, + INTER_LANCZOS4 = 4, + INTER_LINEAR_EXACT = 5, + INTER_NEAREST_EXACT = 6, + INTER_MAX = 7, + WARP_FILL_OUTLIERS = 8, + WARP_INVERSE_MAP = 16; + + // C++: enum HistCompMethods public static final int HISTCMP_CORREL = 0, @@ -101,37 +132,14 @@ public class Imgproc { HISTCMP_HELLINGER = HISTCMP_BHATTACHARYYA, HISTCMP_CHISQR_ALT = 4, HISTCMP_KL_DIV = 5; + + // C++: enum LineTypes public static final int FILLED = -1, LINE_4 = 4, LINE_8 = 8, LINE_AA = 16; - // C++: enum InterpolationFlags - public static final int - INTER_NEAREST = 0, - INTER_LINEAR = 1, - INTER_CUBIC = 2, - INTER_AREA = 3, - INTER_LANCZOS4 = 4, - INTER_LINEAR_EXACT = 5, - INTER_MAX = 7, - WARP_FILL_OUTLIERS = 8, - WARP_INVERSE_MAP = 16; - // C++: enum SpecialFilter - public static final int - FILTER_SCHARR = -1; - // C++: enum ContourApproximationModes - public static final int - CHAIN_APPROX_NONE = 1, - CHAIN_APPROX_SIMPLE = 2, - CHAIN_APPROX_TC89_L1 = 3, - CHAIN_APPROX_TC89_KCOS = 4; - // C++: enum RectanglesIntersectTypes - public static final int - INTERSECT_NONE = 0, - INTERSECT_PARTIAL = 1, - INTERSECT_FULL = 2; // C++: enum public static final int CV_GAUSSIAN_5x5 = 7, @@ -174,15 +182,41 @@ public class Imgproc { CV_HOUGH_PROBABILISTIC = 1, CV_HOUGH_MULTI_SCALE = 2, CV_HOUGH_GRADIENT = 3; + + + // C++: enum SpecialFilter + public static final int + FILTER_SCHARR = -1; + + + // C++: enum ContourApproximationModes + public static final int + CHAIN_APPROX_NONE = 1, + CHAIN_APPROX_SIMPLE = 2, + CHAIN_APPROX_TC89_L1 = 3, + CHAIN_APPROX_TC89_KCOS = 4; + + + // C++: enum RectanglesIntersectTypes + public static final int + INTERSECT_NONE = 0, + INTERSECT_PARTIAL = 1, + INTERSECT_FULL = 2; + + // C++: enum ShapeMatchModes public static final int CONTOURS_MATCH_I1 = 1, CONTOURS_MATCH_I2 = 2, CONTOURS_MATCH_I3 = 3; + + // C++: enum WarpPolarMode public static final int WARP_POLAR_LINEAR = 0, WARP_POLAR_LOG = 256; + + // C++: enum ColorConversionCodes public static final int COLOR_BGR2BGRA = 0, @@ -391,11 +425,15 @@ public class Imgproc { COLOR_BayerRG2RGBA = COLOR_BayerBG2BGRA, COLOR_BayerGR2RGBA = COLOR_BayerGB2BGRA, COLOR_COLORCVT_MAX = 143; + + // C++: enum LineSegmentDetectorModes public static final int LSD_REFINE_NONE = 0, LSD_REFINE_STD = 1, LSD_REFINE_ADV = 2; + + // C++: enum ThresholdTypes public static final int THRESH_BINARY = 0, @@ -863,7 +901,7 @@ public static Moments moments(Mat array) { public static Point phaseCorrelate(Mat src1, Mat src2, Mat window, double[] response) { double[] response_out = new double[1]; Point retVal = new Point(phaseCorrelate_0(src1.nativeObj, src2.nativeObj, window.nativeObj, response_out)); - if (response != null) response[0] = (double) response_out[0]; + if (response != null) response[0] = response_out[0]; return retVal; } @@ -1856,7 +1894,7 @@ public static float EMD(Mat signature1, Mat signature2, int distType) { * represents the background label. ltype specifies the output label image type, an important * consideration based on the total number of labels or alternatively the total number of pixels in * the source image. ccltype specifies the connected components labeling algorithm to use, currently - * Grana (BBDT) and Wu's (SAUF) algorithms are supported, see the #ConnectedComponentsAlgorithmsTypes + * Grana (BBDT) and Wu's (SAUF) CITE: Wu2009 algorithms are supported, see the #ConnectedComponentsAlgorithmsTypes * for details. Note that SAUF algorithm forces a row major ordering of labels while BBDT does not. * This function uses parallel version of both Grana and Wu's algorithms if at least one allowed * parallel framework is enabled and if the rows of the image are at least twice the number returned by #getNumberOfCPUs. @@ -1919,16 +1957,16 @@ public static int connectedComponents(Mat image, Mat labels) { * represents the background label. ltype specifies the output label image type, an important * consideration based on the total number of labels or alternatively the total number of pixels in * the source image. ccltype specifies the connected components labeling algorithm to use, currently - * Grana's (BBDT) and Wu's (SAUF) algorithms are supported, see the #ConnectedComponentsAlgorithmsTypes + * Grana's (BBDT) and Wu's (SAUF) CITE: Wu2009 algorithms are supported, see the #ConnectedComponentsAlgorithmsTypes * for details. Note that SAUF algorithm forces a row major ordering of labels while BBDT does not. * This function uses parallel version of both Grana and Wu's algorithms (statistics included) if at least one allowed * parallel framework is enabled and if the rows of the image are at least twice the number returned by #getNumberOfCPUs. * * @param image the 8-bit single-channel image to be labeled * @param labels destination labeled image - * @param stats statistics output for each label, including the background label, see below for - * available statistics. Statistics are accessed via stats(label, COLUMN) where COLUMN is one of - * #ConnectedComponentsTypes. The data type is CV_32S. + * @param stats statistics output for each label, including the background label. + * Statistics are accessed via stats(label, COLUMN) where COLUMN is one of + * #ConnectedComponentsTypes, selecting the statistic. The data type is CV_32S. * @param centroids centroid output for each label, including the background label. Centroids are * accessed via centroids(label, 0) for x and centroids(label, 1) for y. The data type CV_64F. * @param connectivity 8 or 4 for 8-way or 4-way connectivity respectively @@ -1948,9 +1986,9 @@ public static int connectedComponentsWithStatsWithAlgorithm(Mat image, Mat label /** * @param image the 8-bit single-channel image to be labeled * @param labels destination labeled image - * @param stats statistics output for each label, including the background label, see below for - * available statistics. Statistics are accessed via stats(label, COLUMN) where COLUMN is one of - * #ConnectedComponentsTypes. The data type is CV_32S. + * @param stats statistics output for each label, including the background label. + * Statistics are accessed via stats(label, COLUMN) where COLUMN is one of + * #ConnectedComponentsTypes, selecting the statistic. The data type is CV_32S. * @param centroids centroid output for each label, including the background label. Centroids are * accessed via centroids(label, 0) for x and centroids(label, 1) for y. The data type CV_64F. * @param connectivity 8 or 4 for 8-way or 4-way connectivity respectively @@ -1964,9 +2002,9 @@ public static int connectedComponentsWithStats(Mat image, Mat labels, Mat stats, /** * @param image the 8-bit single-channel image to be labeled * @param labels destination labeled image - * @param stats statistics output for each label, including the background label, see below for - * available statistics. Statistics are accessed via stats(label, COLUMN) where COLUMN is one of - * #ConnectedComponentsTypes. The data type is CV_32S. + * @param stats statistics output for each label, including the background label. + * Statistics are accessed via stats(label, COLUMN) where COLUMN is one of + * #ConnectedComponentsTypes, selecting the statistic. The data type is CV_32S. * @param centroids centroid output for each label, including the background label. Centroids are * accessed via centroids(label, 0) for x and centroids(label, 1) for y. The data type CV_64F. * @param connectivity 8 or 4 for 8-way or 4-way connectivity respectively @@ -1979,9 +2017,9 @@ public static int connectedComponentsWithStats(Mat image, Mat labels, Mat stats, /** * @param image the 8-bit single-channel image to be labeled * @param labels destination labeled image - * @param stats statistics output for each label, including the background label, see below for - * available statistics. Statistics are accessed via stats(label, COLUMN) where COLUMN is one of - * #ConnectedComponentsTypes. The data type is CV_32S. + * @param stats statistics output for each label, including the background label. + * Statistics are accessed via stats(label, COLUMN) where COLUMN is one of + * #ConnectedComponentsTypes, selecting the statistic. The data type is CV_32S. * @param centroids centroid output for each label, including the background label. Centroids are * accessed via centroids(label, 0) for x and centroids(label, 1) for y. The data type CV_64F. * @return automatically generated @@ -4176,7 +4214,7 @@ public static void bilateralFilter(Mat src, Mat dst, int d, double sigmaColor, d *

    * \(\texttt{K} = \frac{1}{\texttt{ksize.width*ksize.height}} \begin{bmatrix} 1 & 1 & 1 & \cdots & 1 & 1 \\ 1 & 1 & 1 & \cdots & 1 & 1 \\ \hdotsfor{6} \\ 1 & 1 & 1 & \cdots & 1 & 1 \\ \end{bmatrix}\) *

    - * The call {@code blur(src, dst, ksize, anchor, borderType)} is equivalent to `boxFilter(src, dst, src.type(), + * The call {@code blur(src, dst, ksize, anchor, borderType)} is equivalent to `boxFilter(src, dst, src.type(), ksize, * anchor, true, borderType)`. * * @param src input image; it can have any number of channels, which are processed independently, but @@ -4199,7 +4237,7 @@ public static void blur(Mat src, Mat dst, Size ksize, Point anchor, int borderTy *

    * \(\texttt{K} = \frac{1}{\texttt{ksize.width*ksize.height}} \begin{bmatrix} 1 & 1 & 1 & \cdots & 1 & 1 \\ 1 & 1 & 1 & \cdots & 1 & 1 \\ \hdotsfor{6} \\ 1 & 1 & 1 & \cdots & 1 & 1 \\ \end{bmatrix}\) *

    - * The call {@code blur(src, dst, ksize, anchor, borderType)} is equivalent to `boxFilter(src, dst, src.type(), + * The call {@code blur(src, dst, ksize, anchor, borderType)} is equivalent to `boxFilter(src, dst, src.type(), ksize, * anchor, true, borderType)`. * * @param src input image; it can have any number of channels, which are processed independently, but @@ -4221,7 +4259,7 @@ public static void blur(Mat src, Mat dst, Size ksize, Point anchor) { *

    * \(\texttt{K} = \frac{1}{\texttt{ksize.width*ksize.height}} \begin{bmatrix} 1 & 1 & 1 & \cdots & 1 & 1 \\ 1 & 1 & 1 & \cdots & 1 & 1 \\ \hdotsfor{6} \\ 1 & 1 & 1 & \cdots & 1 & 1 \\ \end{bmatrix}\) *

    - * The call {@code blur(src, dst, ksize, anchor, borderType)} is equivalent to `boxFilter(src, dst, src.type(), + * The call {@code blur(src, dst, ksize, anchor, borderType)} is equivalent to `boxFilter(src, dst, src.type(), ksize, * anchor, true, borderType)`. * * @param src input image; it can have any number of channels, which are processed independently, but @@ -4249,7 +4287,7 @@ public static void blur(Mat src, Mat dst, Size ksize) { *

    * where *

    - * \(\alpha = \fork{\frac{1}{\texttt{ksize.width*ksize.height}}}{when \texttt{normalize=true}}{1}{otherwise}\) + * \(\alpha = \begin{cases} \frac{1}{\texttt{ksize.width*ksize.height}} & \texttt{when } \texttt{normalize=true} \\1 & \texttt{otherwise}\end{cases}\) *

    * Unnormalized box filter is useful for computing various integral characteristics over each pixel * neighborhood, such as covariance matrices of image derivatives (used in dense optical flow @@ -4278,7 +4316,7 @@ public static void boxFilter(Mat src, Mat dst, int ddepth, Size ksize, Point anc *

    * where *

    - * \(\alpha = \fork{\frac{1}{\texttt{ksize.width*ksize.height}}}{when \texttt{normalize=true}}{1}{otherwise}\) + * \(\alpha = \begin{cases} \frac{1}{\texttt{ksize.width*ksize.height}} & \texttt{when } \texttt{normalize=true} \\1 & \texttt{otherwise}\end{cases}\) *

    * Unnormalized box filter is useful for computing various integral characteristics over each pixel * neighborhood, such as covariance matrices of image derivatives (used in dense optical flow @@ -4306,7 +4344,7 @@ public static void boxFilter(Mat src, Mat dst, int ddepth, Size ksize, Point anc *

    * where *

    - * \(\alpha = \fork{\frac{1}{\texttt{ksize.width*ksize.height}}}{when \texttt{normalize=true}}{1}{otherwise}\) + * \(\alpha = \begin{cases} \frac{1}{\texttt{ksize.width*ksize.height}} & \texttt{when } \texttt{normalize=true} \\1 & \texttt{otherwise}\end{cases}\) *

    * Unnormalized box filter is useful for computing various integral characteristics over each pixel * neighborhood, such as covariance matrices of image derivatives (used in dense optical flow @@ -4333,7 +4371,7 @@ public static void boxFilter(Mat src, Mat dst, int ddepth, Size ksize, Point anc *

    * where *

    - * \(\alpha = \fork{\frac{1}{\texttt{ksize.width*ksize.height}}}{when \texttt{normalize=true}}{1}{otherwise}\) + * \(\alpha = \begin{cases} \frac{1}{\texttt{ksize.width*ksize.height}} & \texttt{when } \texttt{normalize=true} \\1 & \texttt{otherwise}\end{cases}\) *

    * Unnormalized box filter is useful for computing various integral characteristics over each pixel * neighborhood, such as covariance matrices of image derivatives (used in dense optical flow @@ -4869,8 +4907,8 @@ public static void cornerMinEigenVal(Mat src, Mat dst, int blockSize) { /** * Refines the corner locations. *

    - * The function iterates to find the sub-pixel accurate location of corners or radial saddle points, as - * shown on the figure below. + * The function iterates to find the sub-pixel accurate location of corners or radial saddle + * points as described in CITE: forstner1987fast, and as shown on the figure below. *

    * ![image](pics/cornersubpix.png) *

    @@ -5109,6 +5147,9 @@ public static void cvtColorTwoPlane(Mat src1, Mat src2, Mat dst, int code) { * @param code Color space conversion code (see the description below). * @param dstCn number of channels in the destination image; if the parameter is 0, the number of the * channels is derived automatically from src and code. + *

    + * The function can do the following transformations: + * *

      *
    • * Demosaicing using bilinear interpolation @@ -5156,6 +5197,9 @@ public static void demosaicing(Mat src, Mat dst, int code, int dstCn) { * @param dst output image of the same size and depth as src. * @param code Color space conversion code (see the description below). * channels is derived automatically from src and code. + *

      + * The function can do the following transformations: + * *

        *
      • * Demosaicing using bilinear interpolation @@ -6288,7 +6332,7 @@ public static void fillPoly(Mat img, List pts, Scalar color) { *

        * The function does actually compute correlation, not the convolution: *

        - * \(\texttt{dst} (x,y) = \sum _{ \stackrel{0\leq x' < \texttt{kernel.cols},}{0\leq y' < \texttt{kernel.rows}} } \texttt{kernel} (x',y')* \texttt{src} (x+x'- \texttt{anchor.x} ,y+y'- \texttt{anchor.y} )\) + * \(\texttt{dst} (x,y) = \sum _{ \substack{0\leq x' < \texttt{kernel.cols}\\{0\leq y' < \texttt{kernel.rows}}}} \texttt{kernel} (x',y')* \texttt{src} (x+x'- \texttt{anchor.x} ,y+y'- \texttt{anchor.y} )\) *

        * That is, the kernel is not mirrored around the anchor point. If you need a real convolution, flip * the kernel using #flip and set the new anchor to `(kernel.cols - anchor.x - 1, kernel.rows - @@ -6323,7 +6367,7 @@ public static void filter2D(Mat src, Mat dst, int ddepth, Mat kernel, Point anch *

        * The function does actually compute correlation, not the convolution: *

        - * \(\texttt{dst} (x,y) = \sum _{ \stackrel{0\leq x' < \texttt{kernel.cols},}{0\leq y' < \texttt{kernel.rows}} } \texttt{kernel} (x',y')* \texttt{src} (x+x'- \texttt{anchor.x} ,y+y'- \texttt{anchor.y} )\) + * \(\texttt{dst} (x,y) = \sum _{ \substack{0\leq x' < \texttt{kernel.cols}\\{0\leq y' < \texttt{kernel.rows}}}} \texttt{kernel} (x',y')* \texttt{src} (x+x'- \texttt{anchor.x} ,y+y'- \texttt{anchor.y} )\) *

        * That is, the kernel is not mirrored around the anchor point. If you need a real convolution, flip * the kernel using #flip and set the new anchor to `(kernel.cols - anchor.x - 1, kernel.rows - @@ -6357,7 +6401,7 @@ public static void filter2D(Mat src, Mat dst, int ddepth, Mat kernel, Point anch *

        * The function does actually compute correlation, not the convolution: *

        - * \(\texttt{dst} (x,y) = \sum _{ \stackrel{0\leq x' < \texttt{kernel.cols},}{0\leq y' < \texttt{kernel.rows}} } \texttt{kernel} (x',y')* \texttt{src} (x+x'- \texttt{anchor.x} ,y+y'- \texttt{anchor.y} )\) + * \(\texttt{dst} (x,y) = \sum _{ \substack{0\leq x' < \texttt{kernel.cols}\\{0\leq y' < \texttt{kernel.rows}}}} \texttt{kernel} (x',y')* \texttt{src} (x+x'- \texttt{anchor.x} ,y+y'- \texttt{anchor.y} )\) *

        * That is, the kernel is not mirrored around the anchor point. If you need a real convolution, flip * the kernel using #flip and set the new anchor to `(kernel.cols - anchor.x - 1, kernel.rows - @@ -6390,7 +6434,7 @@ public static void filter2D(Mat src, Mat dst, int ddepth, Mat kernel, Point anch *

        * The function does actually compute correlation, not the convolution: *

        - * \(\texttt{dst} (x,y) = \sum _{ \stackrel{0\leq x' < \texttt{kernel.cols},}{0\leq y' < \texttt{kernel.rows}} } \texttt{kernel} (x',y')* \texttt{src} (x+x'- \texttt{anchor.x} ,y+y'- \texttt{anchor.y} )\) + * \(\texttt{dst} (x,y) = \sum _{ \substack{0\leq x' < \texttt{kernel.cols}\\{0\leq y' < \texttt{kernel.rows}}}} \texttt{kernel} (x',y')* \texttt{src} (x+x'- \texttt{anchor.x} ,y+y'- \texttt{anchor.y} )\) *

        * That is, the kernel is not mirrored around the anchor point. If you need a real convolution, flip * the kernel using #flip and set the new anchor to `(kernel.cols - anchor.x - 1, kernel.rows - @@ -7401,9 +7445,10 @@ public static void logPolar(Mat src, Mat dst, Point center, double M, int flags) * Compares a template against overlapped image regions. *

        * The function slides through image , compares the overlapped patches of size \(w \times h\) against - * templ using the specified method and stores the comparison results in result . Here are the formulae - * for the available comparison methods ( \(I\) denotes image, \(T\) template, \(R\) result ). The summation - * is done over template and/or the image patch: \(x' = 0...w-1, y' = 0...h-1\) + * templ using the specified method and stores the comparison results in result . #TemplateMatchModes + * describes the formulae for the available comparison methods ( \(I\) denotes image, \(T\) + * template, \(R\) result, \(M\) the optional mask ). The summation is done over template and/or + * the image patch: \(x' = 0...w-1, y' = 0...h-1\) *

        * After the function finishes the comparison, the best matches can be found as global minimums (when * #TM_SQDIFF was used) or maximums (when #TM_CCORR or #TM_CCOEFF was used) using the @@ -7418,8 +7463,12 @@ public static void logPolar(Mat src, Mat dst, Point center, double M, int flags) * @param result Map of comparison results. It must be single-channel 32-bit floating-point. If image * is \(W \times H\) and templ is \(w \times h\) , then result is \((W-w+1) \times (H-h+1)\) . * @param method Parameter specifying the comparison method, see #TemplateMatchModes - * @param mask Mask of searched template. It must have the same datatype and size with templ. It is - * not set by default. Currently, only the #TM_SQDIFF and #TM_CCORR_NORMED methods are supported. + * @param mask Optional mask. It must have the same size as templ. It must either have the same number + * of channels as template or only one channel, which is then used for all template and + * image channels. If the data type is #CV_8U, the mask is interpreted as a binary mask, + * meaning only elements where mask is nonzero are used and are kept unchanged independent + * of the actual mask value (weight equals 1). For data tpye #CV_32F, the mask values are + * used as weights. The exact formulas are documented in #TemplateMatchModes. */ public static void matchTemplate(Mat image, Mat templ, Mat result, int method, Mat mask) { matchTemplate_0(image.nativeObj, templ.nativeObj, result.nativeObj, method, mask.nativeObj); @@ -7429,9 +7478,10 @@ public static void matchTemplate(Mat image, Mat templ, Mat result, int method, M * Compares a template against overlapped image regions. *

        * The function slides through image , compares the overlapped patches of size \(w \times h\) against - * templ using the specified method and stores the comparison results in result . Here are the formulae - * for the available comparison methods ( \(I\) denotes image, \(T\) template, \(R\) result ). The summation - * is done over template and/or the image patch: \(x' = 0...w-1, y' = 0...h-1\) + * templ using the specified method and stores the comparison results in result . #TemplateMatchModes + * describes the formulae for the available comparison methods ( \(I\) denotes image, \(T\) + * template, \(R\) result, \(M\) the optional mask ). The summation is done over template and/or + * the image patch: \(x' = 0...w-1, y' = 0...h-1\) *

        * After the function finishes the comparison, the best matches can be found as global minimums (when * #TM_SQDIFF was used) or maximums (when #TM_CCORR or #TM_CCOEFF was used) using the @@ -7446,7 +7496,11 @@ public static void matchTemplate(Mat image, Mat templ, Mat result, int method, M * @param result Map of comparison results. It must be single-channel 32-bit floating-point. If image * is \(W \times H\) and templ is \(w \times h\) , then result is \((W-w+1) \times (H-h+1)\) . * @param method Parameter specifying the comparison method, see #TemplateMatchModes - * not set by default. Currently, only the #TM_SQDIFF and #TM_CCORR_NORMED methods are supported. + * of channels as template or only one channel, which is then used for all template and + * image channels. If the data type is #CV_8U, the mask is interpreted as a binary mask, + * meaning only elements where mask is nonzero are used and are kept unchanged independent + * of the actual mask value (weight equals 1). For data tpye #CV_32F, the mask values are + * used as weights. The exact formulas are documented in #TemplateMatchModes. */ public static void matchTemplate(Mat image, Mat templ, Mat result, int method) { matchTemplate_1(image.nativeObj, templ.nativeObj, result.nativeObj, method); diff --git a/bus-opencv/src/main/java/org/opencv/imgproc/LineSegmentDetector.java b/bus-opencv/src/main/java/org/opencv/imgproc/LineSegmentDetector.java index 9f9d706497..5ebec7bb2b 100644 --- a/bus-opencv/src/main/java/org/opencv/imgproc/LineSegmentDetector.java +++ b/bus-opencv/src/main/java/org/opencv/imgproc/LineSegmentDetector.java @@ -75,19 +75,6 @@ public int compareSegments(Size size, Mat lines1, Mat lines2, Mat _image) { return compareSegments_0(nativeObj, size.width, size.height, lines1.nativeObj, lines2.nativeObj, _image.nativeObj); } - /** - * Draws two groups of lines in blue and red, counting the non overlapping (mismatching) pixels. - * - * @param size The size of the image, where lines1 and lines2 were found. - * @param lines1 The first group of lines that needs to be drawn. It is visualized in blue color. - * @param lines2 The second group of lines. They visualized in red color. - * in order for lines1 and lines2 to be drawn in the above mentioned colors. - * @return automatically generated - */ - public int compareSegments(Size size, Mat lines1, Mat lines2) { - return compareSegments_1(nativeObj, size.width, size.height, lines1.nativeObj, lines2.nativeObj); - } - /** * Finds lines in the input image. *

        @@ -121,6 +108,19 @@ public void detect(Mat _image, Mat _lines, Mat width, Mat prec, Mat nfa) { detect_0(nativeObj, _image.nativeObj, _lines.nativeObj, width.nativeObj, prec.nativeObj, nfa.nativeObj); } + /** + * Draws two groups of lines in blue and red, counting the non overlapping (mismatching) pixels. + * + * @param size The size of the image, where lines1 and lines2 were found. + * @param lines1 The first group of lines that needs to be drawn. It is visualized in blue color. + * @param lines2 The second group of lines. They visualized in red color. + * in order for lines1 and lines2 to be drawn in the above mentioned colors. + * @return automatically generated + */ + public int compareSegments(Size size, Mat lines1, Mat lines2) { + return compareSegments_1(nativeObj, size.width, size.height, lines1.nativeObj, lines2.nativeObj); + } + /** * Finds lines in the input image. *

        diff --git a/bus-opencv/src/main/java/org/opencv/imgproc/Subdiv2D.java b/bus-opencv/src/main/java/org/opencv/imgproc/Subdiv2D.java index 9af0d6950c..2833d6f8ce 100644 --- a/bus-opencv/src/main/java/org/opencv/imgproc/Subdiv2D.java +++ b/bus-opencv/src/main/java/org/opencv/imgproc/Subdiv2D.java @@ -212,24 +212,6 @@ public static Subdiv2D __fromPtr__(long addr) { // native support for java finalize() private static native void delete(long nativeObj); - public long getNativeObjAddr() { - return nativeObj; - } - - /** - * Returns vertex location from vertex ID. - * - * @param vertex vertex ID. - * @param firstEdge Optional. The first edge ID which is connected to the vertex. - * @return vertex (x,y) - */ - public Point getVertex(int vertex, int[] firstEdge) { - double[] firstEdge_out = new double[1]; - Point retVal = new Point(getVertex_0(nativeObj, vertex, firstEdge_out)); - if (firstEdge != null) firstEdge[0] = (int) firstEdge_out[0]; - return retVal; - } - /** * Returns vertex location from vertex ID. * @@ -257,16 +239,6 @@ public int edgeDst(int edge, Point dstpt) { return retVal; } - /** - * Returns the edge destination. - * - * @param edge Subdivision edge ID. - * @return vertex ID. - */ - public int edgeDst(int edge) { - return edgeDst_1(nativeObj, edge); - } - /** * Returns the edge origin. * @@ -284,38 +256,6 @@ public int edgeOrg(int edge, Point orgpt) { return retVal; } - /** - * Returns the edge origin. - * - * @param edge Subdivision edge ID. - * @return vertex ID. - */ - public int edgeOrg(int edge) { - return edgeOrg_1(nativeObj, edge); - } - - /** - * Finds the subdivision vertex closest to the given point. - * - * @param pt Input point. - * @param nearestPt Output subdivision vertex point. - *

        - * The function is another function that locates the input point within the subdivision. It finds the - * subdivision vertex that is the closest to the input point. It is not necessarily one of vertices - * of the facet containing the input point, though the facet (located using locate() ) is used as a - * starting point. - * @return vertex ID. - */ - public int findNearest(Point pt, Point nearestPt) { - double[] nearestPt_out = new double[2]; - int retVal = findNearest_0(nativeObj, pt.x, pt.y, nearestPt_out); - if (nearestPt != null) { - nearestPt.x = nearestPt_out[0]; - nearestPt.y = nearestPt_out[1]; - } - return retVal; - } - /** * Finds the subdivision vertex closest to the given point. * @@ -387,47 +327,6 @@ public int insert(Point pt) { return insert_0(nativeObj, pt.x, pt.y); } - /** - * Returns the location of a point within a Delaunay triangulation. - * - * @param pt Point to locate. - * @param edge Output edge that the point belongs to or is located to the right of it. - * @param vertex Optional output vertex the input point coincides with. - *

        - * The function locates the input point within the subdivision and gives one of the triangle edges - * or vertices. - * @return an integer which specify one of the following five cases for point location: - *

          - *
        • - * The point falls into some facet. The function returns #PTLOC_INSIDE and edge will contain one of - * edges of the facet. - *
        • - *
        • - * The point falls onto the edge. The function returns #PTLOC_ON_EDGE and edge will contain this edge. - *
        • - *
        • - * The point coincides with one of the subdivision vertices. The function returns #PTLOC_VERTEX and - * vertex will contain a pointer to the vertex. - *
        • - *
        • - * The point is outside the subdivision reference rectangle. The function returns #PTLOC_OUTSIDE_RECT - * and no pointers are filled. - *
        • - *
        • - * One of input arguments is invalid. A runtime error is raised or, if silent or "parent" error - * processing mode is selected, #PTLOC_ERROR is returned. - *
        • - *
        - */ - public int locate(Point pt, int[] edge, int[] vertex) { - double[] edge_out = new double[1]; - double[] vertex_out = new double[1]; - int retVal = locate_0(nativeObj, pt.x, pt.y, edge_out, vertex_out); - if (edge != null) edge[0] = (int) edge_out[0]; - if (vertex != null) vertex[0] = (int) vertex_out[0]; - return retVal; - } - /** * Returns next edge around the edge origin. * @@ -551,4 +450,105 @@ protected void finalize() throws Throwable { delete(nativeObj); } + public long getNativeObjAddr() { + return nativeObj; + } + + /** + * Returns vertex location from vertex ID. + * + * @param vertex vertex ID. + * @param firstEdge Optional. The first edge ID which is connected to the vertex. + * @return vertex (x,y) + */ + public Point getVertex(int vertex, int[] firstEdge) { + double[] firstEdge_out = new double[1]; + Point retVal = new Point(getVertex_0(nativeObj, vertex, firstEdge_out)); + if (firstEdge != null) firstEdge[0] = (int) firstEdge_out[0]; + return retVal; + } + + /** + * Returns the edge destination. + * + * @param edge Subdivision edge ID. + * @return vertex ID. + */ + public int edgeDst(int edge) { + return edgeDst_1(nativeObj, edge); + } + + /** + * Returns the edge origin. + * + * @param edge Subdivision edge ID. + * @return vertex ID. + */ + public int edgeOrg(int edge) { + return edgeOrg_1(nativeObj, edge); + } + + /** + * Finds the subdivision vertex closest to the given point. + * + * @param pt Input point. + * @param nearestPt Output subdivision vertex point. + *

        + * The function is another function that locates the input point within the subdivision. It finds the + * subdivision vertex that is the closest to the input point. It is not necessarily one of vertices + * of the facet containing the input point, though the facet (located using locate() ) is used as a + * starting point. + * @return vertex ID. + */ + public int findNearest(Point pt, Point nearestPt) { + double[] nearestPt_out = new double[2]; + int retVal = findNearest_0(nativeObj, pt.x, pt.y, nearestPt_out); + if (nearestPt != null) { + nearestPt.x = nearestPt_out[0]; + nearestPt.y = nearestPt_out[1]; + } + return retVal; + } + + /** + * Returns the location of a point within a Delaunay triangulation. + * + * @param pt Point to locate. + * @param edge Output edge that the point belongs to or is located to the right of it. + * @param vertex Optional output vertex the input point coincides with. + *

        + * The function locates the input point within the subdivision and gives one of the triangle edges + * or vertices. + * @return an integer which specify one of the following five cases for point location: + *

          + *
        • + * The point falls into some facet. The function returns #PTLOC_INSIDE and edge will contain one of + * edges of the facet. + *
        • + *
        • + * The point falls onto the edge. The function returns #PTLOC_ON_EDGE and edge will contain this edge. + *
        • + *
        • + * The point coincides with one of the subdivision vertices. The function returns #PTLOC_VERTEX and + * vertex will contain a pointer to the vertex. + *
        • + *
        • + * The point is outside the subdivision reference rectangle. The function returns #PTLOC_OUTSIDE_RECT + * and no pointers are filled. + *
        • + *
        • + * One of input arguments is invalid. A runtime error is raised or, if silent or "parent" error + * processing mode is selected, #PTLOC_ERROR is returned. + *
        • + *
        + */ + public int locate(Point pt, int[] edge, int[] vertex) { + double[] edge_out = new double[1]; + double[] vertex_out = new double[1]; + int retVal = locate_0(nativeObj, pt.x, pt.y, edge_out, vertex_out); + if (edge != null) edge[0] = (int) edge_out[0]; + if (vertex != null) vertex[0] = (int) vertex_out[0]; + return retVal; + } + } diff --git a/bus-opencv/src/main/java/org/opencv/utils/Converters.java b/bus-opencv/src/main/java/org/opencv/utils/Converters.java index 1d147d8888..51796a7012 100644 --- a/bus-opencv/src/main/java/org/opencv/utils/Converters.java +++ b/bus-opencv/src/main/java/org/opencv/utils/Converters.java @@ -504,8 +504,7 @@ public static Mat vector_vector_Point_to_Mat(List pts, List mat Mat res; int lCount = (pts != null) ? pts.size() : 0; if (lCount > 0) { - for (MatOfPoint vpt : pts) - mats.add(vpt); + mats.addAll(pts); res = vector_Mat_to_Mat(mats); } else { res = new Mat(); @@ -553,8 +552,7 @@ public static Mat vector_vector_Point2f_to_Mat(List pts, List Mat res; int lCount = (pts != null) ? pts.size() : 0; if (lCount > 0) { - for (MatOfPoint2f vpt : pts) - mats.add(vpt); + mats.addAll(pts); res = vector_Mat_to_Mat(mats); } else { res = new Mat(); @@ -585,8 +583,7 @@ public static Mat vector_vector_Point3f_to_Mat(List pts, List Mat res; int lCount = (pts != null) ? pts.size() : 0; if (lCount > 0) { - for (MatOfPoint3f vpt : pts) - mats.add(vpt); + mats.addAll(pts); res = vector_Mat_to_Mat(mats); } else { res = new Mat(); @@ -599,8 +596,7 @@ public static Mat vector_vector_KeyPoint_to_Mat(List kps, List 0) { - for (MatOfKeyPoint vkp : kps) - mats.add(vkp); + mats.addAll(kps); res = vector_Mat_to_Mat(mats); } else { res = new Mat(); @@ -699,8 +695,7 @@ public static Mat vector_vector_DMatch_to_Mat(List lvdm, List Mat res; int lCount = (lvdm != null) ? lvdm.size() : 0; if (lCount > 0) { - for (MatOfDMatch vdm : lvdm) - mats.add(vdm); + mats.addAll(lvdm); res = vector_Mat_to_Mat(mats); } else { res = new Mat(); @@ -731,8 +726,7 @@ public static Mat vector_vector_char_to_Mat(List lvb, List mats) Mat res; int lCount = (lvb != null) ? lvb.size() : 0; if (lCount > 0) { - for (MatOfByte vb : lvb) - mats.add(vb); + mats.addAll(lvb); res = vector_Mat_to_Mat(mats); } else { res = new Mat(); diff --git a/bus-opencv/src/main/resources/lib/linux-x86-64/libopencv_java.so b/bus-opencv/src/main/resources/lib/linux-x86-64/libopencv_java.so index bb27b6f638..c12c1724b0 100644 Binary files a/bus-opencv/src/main/resources/lib/linux-x86-64/libopencv_java.so and b/bus-opencv/src/main/resources/lib/linux-x86-64/libopencv_java.so differ diff --git a/bus-opencv/src/main/resources/lib/linux-x86/libopencv_java.so b/bus-opencv/src/main/resources/lib/linux-x86/libopencv_java.so index 408d026e36..8dfed8e2f6 100644 Binary files a/bus-opencv/src/main/resources/lib/linux-x86/libopencv_java.so and b/bus-opencv/src/main/resources/lib/linux-x86/libopencv_java.so differ diff --git a/bus-opencv/src/main/resources/lib/macosx-x86-64/libopencv_java.jnilib b/bus-opencv/src/main/resources/lib/macosx-x86-64/libopencv_java.jnilib index ddffa7f731..8e2b8dc553 100644 Binary files a/bus-opencv/src/main/resources/lib/macosx-x86-64/libopencv_java.jnilib and b/bus-opencv/src/main/resources/lib/macosx-x86-64/libopencv_java.jnilib differ diff --git a/bus-opencv/src/main/resources/lib/win32-x86-64/opencv_java.dll b/bus-opencv/src/main/resources/lib/win32-x86-64/opencv_java.dll index 1b23393d54..d0caa11786 100644 Binary files a/bus-opencv/src/main/resources/lib/win32-x86-64/opencv_java.dll and b/bus-opencv/src/main/resources/lib/win32-x86-64/opencv_java.dll differ diff --git a/bus-opencv/src/main/resources/lib/win32-x86/opencv_java.dll b/bus-opencv/src/main/resources/lib/win32-x86/opencv_java.dll index 555b81b841..4c6a4a06df 100644 Binary files a/bus-opencv/src/main/resources/lib/win32-x86/opencv_java.dll and b/bus-opencv/src/main/resources/lib/win32-x86/opencv_java.dll differ diff --git a/bus-pager/pom.xml b/bus-pager/pom.xml index 5ca67817df..54df17c2ed 100755 --- a/bus-pager/pom.xml +++ b/bus-pager/pom.xml @@ -6,19 +6,44 @@ org.aoju bus-pager - 6.1.1 + 6.1.2 jar ${project.artifactId} Bus Pager https://github.com/aoju/bus + + + The MIT License (MIT) + https://opensource.org/licenses/MIT + + + + + scm:git@github.com:aoju/bus.git + scm:git@github.com:aoju/bus.git + git@github.com:aoju/bus.git + + + + + Kimi Liu + https://github.com/aoju/bus.git + + + + + Github Issue + https://github.com/aoju/bus/issues + + UTF-8 UTF-8 1.8 - 3.5.5 - 29.0-jre + 3.5.6 + 30.0-jre 3.1 @@ -48,31 +73,6 @@ - - - The MIT License (MIT) - https://opensource.org/licenses/MIT - - - - - scm:git@github.com:aoju/bus.git - scm:git@github.com:aoju/bus.git - git@github.com:aoju/bus.git - - - - - Kimi Liu - https://github.com/aoju/bus.git - - - - - Github Issue - https://github.com/aoju/bus/issues - - diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/IPage.java b/bus-pager/src/main/java/org/aoju/bus/pager/IPage.java index f5b4569d3e..8fe15dc7b3 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/IPage.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/IPage.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager; @@ -28,7 +29,7 @@ * 分页接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface IPage { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/ISelect.java b/bus-pager/src/main/java/org/aoju/bus/pager/ISelect.java index 79f8a8f3ae..c92e51143a 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/ISelect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/ISelect.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager; @@ -28,7 +29,7 @@ * 分页查询接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface ISelect { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/Page.java b/bus-pager/src/main/java/org/aoju/bus/pager/Page.java index 3dcf0205b6..c861a6cf42 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/Page.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/Page.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager; @@ -32,7 +33,7 @@ * Mybatis - 分页对象 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Page extends ArrayList implements Closeable { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/PageContext.java b/bus-pager/src/main/java/org/aoju/bus/pager/PageContext.java index c4cd12f436..3be86d2c09 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/PageContext.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/PageContext.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager; @@ -44,7 +45,7 @@ * Mybatis - 通用分页拦截器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PageContext extends PageMethod implements Dialect { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/PageException.java b/bus-pager/src/main/java/org/aoju/bus/pager/PageException.java index 440cabd3ef..90c145a56e 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/PageException.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/PageException.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager; @@ -28,7 +29,7 @@ * 分页插件异常 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PageException extends RuntimeException { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/PageRowBounds.java b/bus-pager/src/main/java/org/aoju/bus/pager/PageRowBounds.java index 77b47c6337..934c4372c7 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/PageRowBounds.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/PageRowBounds.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager; @@ -30,7 +31,7 @@ * 分页结果信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PageRowBounds extends RowBounds { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/PageSerializable.java b/bus-pager/src/main/java/org/aoju/bus/pager/PageSerializable.java index 70919a9d6b..14175f248d 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/PageSerializable.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/PageSerializable.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager; @@ -31,7 +32,7 @@ * 分页信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PageSerializable implements Serializable { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/Pages.java b/bus-pager/src/main/java/org/aoju/bus/pager/Pages.java index 6c397375d4..5980937eff 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/Pages.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/Pages.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager; @@ -35,7 +36,7 @@ * 新增分页的多项属性 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Pages extends PageSerializable { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/cache/Cache.java b/bus-pager/src/main/java/org/aoju/bus/pager/cache/Cache.java index 254252aafe..3dea7970b7 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/cache/Cache.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/cache/Cache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.cache; @@ -28,7 +29,7 @@ * Simple cache interface * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Cache { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/cache/CacheFactory.java b/bus-pager/src/main/java/org/aoju/bus/pager/cache/CacheFactory.java index 9f80eafdd7..5e14766ee1 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/cache/CacheFactory.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/cache/CacheFactory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.cache; @@ -34,7 +35,7 @@ * CacheFactory * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class CacheFactory { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/cache/GuavaCache.java b/bus-pager/src/main/java/org/aoju/bus/pager/cache/GuavaCache.java index b48ce3d5e7..e358895c03 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/cache/GuavaCache.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/cache/GuavaCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.cache; @@ -34,7 +35,7 @@ * Simple Guava Cache * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class GuavaCache implements Cache { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/cache/SimpleCache.java b/bus-pager/src/main/java/org/aoju/bus/pager/cache/SimpleCache.java index c7035b20bd..95d8e27050 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/cache/SimpleCache.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/cache/SimpleCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.cache; @@ -35,7 +36,7 @@ * Simple MyBatis Cache * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SimpleCache implements Cache { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/AbstractDialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/AbstractDialect.java index b4a6ccae30..cd959f9331 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/AbstractDialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/AbstractDialect.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.dialect; @@ -34,7 +35,7 @@ * 基于 CountSqlParser 的智能 Count 查询 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractDialect implements Dialect { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/AbstractHelperDialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/AbstractHelperDialect.java index 0cca078bd1..18cc4b3f2d 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/AbstractHelperDialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/AbstractHelperDialect.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.dialect; @@ -42,7 +43,7 @@ * 针对 PageContext 的实现 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractHelperDialect extends AbstractDialect { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/AbstractRowBoundsDialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/AbstractRowBoundsDialect.java index b36e9e5bad..6907f054ee 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/AbstractRowBoundsDialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/AbstractRowBoundsDialect.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.dialect; @@ -37,7 +38,7 @@ * 基于 RowBounds 的分页 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractRowBoundsDialect extends AbstractDialect { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/Dialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/Dialect.java index 2d1a0d9fb4..06685de4f4 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/Dialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/Dialect.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.dialect; @@ -36,7 +37,7 @@ * 数据库方言,针对不同数据库进行实现 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Dialect { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/ReplaceSql.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/ReplaceSql.java index 3dd7f0473d..56eb0ead0f 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/ReplaceSql.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/ReplaceSql.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.dialect; @@ -28,7 +29,7 @@ * 替换和还原 SQL * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface ReplaceSql { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/Db2Dialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/Db2Dialect.java index 17e4936529..c349077db6 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/Db2Dialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/Db2Dialect.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.dialect.general; @@ -36,7 +37,7 @@ * 数据库方言 db2 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Db2Dialect extends AbstractHelperDialect { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/HsqldbDialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/HsqldbDialect.java index 6a1a10d9a7..b0e8b45efc 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/HsqldbDialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/HsqldbDialect.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.dialect.general; @@ -40,7 +41,7 @@ * 数据库方言 hsqldb * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HsqldbDialect extends AbstractHelperDialect { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/InformixDialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/InformixDialect.java index 283821fca8..93281b65cb 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/InformixDialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/InformixDialect.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.dialect.general; @@ -40,7 +41,7 @@ * 数据库方言 informix * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class InformixDialect extends AbstractHelperDialect { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/MySqlDialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/MySqlDialect.java index 00f4e2b3b1..2b2419428b 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/MySqlDialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/MySqlDialect.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.dialect.general; @@ -40,7 +41,7 @@ * 数据库方言 mysql * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MySqlDialect extends AbstractHelperDialect { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/OracleDialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/OracleDialect.java index 48c05e575e..14217007c7 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/OracleDialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/OracleDialect.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.dialect.general; @@ -36,7 +37,7 @@ * 数据库方言 oracle * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class OracleDialect extends AbstractHelperDialect { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/SqlServer2012Dialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/SqlServer2012Dialect.java index 0571ce603a..47d3b27276 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/SqlServer2012Dialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/SqlServer2012Dialect.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.dialect.general; @@ -35,7 +36,7 @@ * 数据库方言 sqlserver2012 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SqlServer2012Dialect extends SqlServerDialect { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/SqlServerDialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/SqlServerDialect.java index c6dec492bb..033c1eb720 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/SqlServerDialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/SqlServerDialect.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.dialect.general; @@ -47,7 +48,7 @@ * 数据库方言 sqlserver * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SqlServerDialect extends AbstractHelperDialect { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/replace/RegexWithNolockReplaceSql.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/replace/RegexWithNolockReplaceSql.java index 0d35e4c6c0..74905536f2 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/replace/RegexWithNolockReplaceSql.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/replace/RegexWithNolockReplaceSql.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.dialect.replace; @@ -30,7 +31,7 @@ * 正则处理 with(nolock),转换为一个 table_PAGEWITHNOLOCK * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RegexWithNolockReplaceSql implements ReplaceSql { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/replace/SimpleWithNolockReplaceSql.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/replace/SimpleWithNolockReplaceSql.java index 99e0f74b08..119788a22f 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/replace/SimpleWithNolockReplaceSql.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/replace/SimpleWithNolockReplaceSql.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.dialect.replace; @@ -30,7 +31,7 @@ * 简单处理 with(nolock) * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SimpleWithNolockReplaceSql implements ReplaceSql { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/Db2RowBoundsDialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/Db2RowBoundsDialect.java index 84cda6d511..b7f355596f 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/Db2RowBoundsDialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/Db2RowBoundsDialect.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.dialect.rowbounds; @@ -32,7 +33,7 @@ * db2 基于 RowBounds 的分页 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Db2RowBoundsDialect extends AbstractRowBoundsDialect { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/HsqldbRowBoundsDialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/HsqldbRowBoundsDialect.java index 27e551f2fe..322e622504 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/HsqldbRowBoundsDialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/HsqldbRowBoundsDialect.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.dialect.rowbounds; @@ -32,7 +33,7 @@ * hsqldb 基于 RowBounds 的分页 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HsqldbRowBoundsDialect extends AbstractRowBoundsDialect { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/InformixRowBoundsDialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/InformixRowBoundsDialect.java index 0f296f7631..233ef6b178 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/InformixRowBoundsDialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/InformixRowBoundsDialect.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.dialect.rowbounds; @@ -32,7 +33,7 @@ * informix 基于 RowBounds 的分页 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class InformixRowBoundsDialect extends AbstractRowBoundsDialect { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/MySqlRowBoundsDialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/MySqlRowBoundsDialect.java index 4c7d04011a..702ad30351 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/MySqlRowBoundsDialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/MySqlRowBoundsDialect.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.dialect.rowbounds; @@ -33,7 +34,7 @@ * mysql 基于 RowBounds 的分页 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MySqlRowBoundsDialect extends AbstractRowBoundsDialect { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/OracleRowBoundsDialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/OracleRowBoundsDialect.java index b9734399e6..120bb5484f 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/OracleRowBoundsDialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/OracleRowBoundsDialect.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.dialect.rowbounds; @@ -32,7 +33,7 @@ * oracle 基于 RowBounds 的分页 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class OracleRowBoundsDialect extends AbstractRowBoundsDialect { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/SqlServer2012RowBoundsDialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/SqlServer2012RowBoundsDialect.java index e1f5a5a436..802b8adeb4 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/SqlServer2012RowBoundsDialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/SqlServer2012RowBoundsDialect.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.dialect.rowbounds; @@ -31,7 +32,7 @@ * sqlserver2012 基于 RowBounds 的分页 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SqlServer2012RowBoundsDialect extends SqlServerRowBoundsDialect { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/SqlServerRowBoundsDialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/SqlServerRowBoundsDialect.java index 29cb678f05..7e0e85b524 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/SqlServerRowBoundsDialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/SqlServerRowBoundsDialect.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.dialect.rowbounds; @@ -41,7 +42,7 @@ * sqlserver 基于 RowBounds 的分页 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SqlServerRowBoundsDialect extends AbstractRowBoundsDialect { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/parser/CountSqlParser.java b/bus-pager/src/main/java/org/aoju/bus/pager/parser/CountSqlParser.java index 7b543a0fb2..d37a6da851 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/parser/CountSqlParser.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/parser/CountSqlParser.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.parser; @@ -40,7 +41,7 @@ * sql解析类,提供更智能的count查询sql * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CountSqlParser { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/parser/OrderByParser.java b/bus-pager/src/main/java/org/aoju/bus/pager/parser/OrderByParser.java index 056927da3f..2b5ad0bcba 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/parser/OrderByParser.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/parser/OrderByParser.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.parser; @@ -36,7 +37,7 @@ * 处理 Order by * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class OrderByParser { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/parser/SqlServerParser.java b/bus-pager/src/main/java/org/aoju/bus/pager/parser/SqlServerParser.java index f639c23563..361ab17ecf 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/parser/SqlServerParser.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/parser/SqlServerParser.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.parser; @@ -51,7 +52,7 @@ * 该类设计为一个独立的工具类,依赖jsqlparser,可以独立使用 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SqlServerParser { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/plugin/CountExecutor.java b/bus-pager/src/main/java/org/aoju/bus/pager/plugin/CountExecutor.java index 6f1a3a5284..8496eb320c 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/plugin/CountExecutor.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/plugin/CountExecutor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.plugin; @@ -43,7 +44,7 @@ * count 查询 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class CountExecutor { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/plugin/CountMappedStatement.java b/bus-pager/src/main/java/org/aoju/bus/pager/plugin/CountMappedStatement.java index 175bb3e76b..f39021d5bd 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/plugin/CountMappedStatement.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/plugin/CountMappedStatement.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.plugin; @@ -36,7 +37,7 @@ * 创建新的MappedStatement,主要是Count返回值int * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CountMappedStatement { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/plugin/PageFromObject.java b/bus-pager/src/main/java/org/aoju/bus/pager/plugin/PageFromObject.java index 6778797594..a20b1ff879 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/plugin/PageFromObject.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/plugin/PageFromObject.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.plugin; @@ -38,7 +39,7 @@ * 分页参数对象工具类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class PageFromObject { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/plugin/PageInterceptor.java b/bus-pager/src/main/java/org/aoju/bus/pager/plugin/PageInterceptor.java index 51e9891f79..ef4cf1e85d 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/plugin/PageInterceptor.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/plugin/PageInterceptor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.plugin; @@ -45,7 +46,7 @@ * Mybatis - 通用分页拦截器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Intercepts( diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/plugin/QueryInterceptor.java b/bus-pager/src/main/java/org/aoju/bus/pager/plugin/QueryInterceptor.java index 4b145193c6..f9b196567e 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/plugin/QueryInterceptor.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/plugin/QueryInterceptor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.plugin; @@ -38,7 +39,7 @@ * QueryInterceptor 规范 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Intercepts( diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/proxy/PageAutoDialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/proxy/PageAutoDialect.java index 8f5563b05f..b4b942c019 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/proxy/PageAutoDialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/proxy/PageAutoDialect.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.proxy; @@ -45,7 +46,7 @@ * 基础方言信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PageAutoDialect { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/proxy/PageMethod.java b/bus-pager/src/main/java/org/aoju/bus/pager/proxy/PageMethod.java index 8d68c72461..2b81aa1124 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/proxy/PageMethod.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/proxy/PageMethod.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.proxy; @@ -34,7 +35,7 @@ * 基础分页方法 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class PageMethod { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/proxy/PageParams.java b/bus-pager/src/main/java/org/aoju/bus/pager/proxy/PageParams.java index 2711f226ca..29fcaa9faa 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/proxy/PageParams.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/proxy/PageParams.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.proxy; @@ -38,7 +39,7 @@ * Page 参数信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PageParams { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/reflect/MetaObject.java b/bus-pager/src/main/java/org/aoju/bus/pager/reflect/MetaObject.java index 0a75b6f16c..67bc041152 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/reflect/MetaObject.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/reflect/MetaObject.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.reflect; @@ -32,7 +33,7 @@ * 反射工具 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MetaObject { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/reflect/MetaObjectWithCache.java b/bus-pager/src/main/java/org/aoju/bus/pager/reflect/MetaObjectWithCache.java index 857f6ea6d2..775243ce08 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/reflect/MetaObjectWithCache.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/reflect/MetaObjectWithCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.pager.reflect; @@ -37,7 +38,7 @@ * 反射带缓存,提高反射性能 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MetaObjectWithCache { diff --git a/bus-proxy/pom.xml b/bus-proxy/pom.xml index 3e8772fe81..ffbdba6a2a 100755 --- a/bus-proxy/pom.xml +++ b/bus-proxy/pom.xml @@ -6,13 +6,38 @@ org.aoju bus-proxy - 6.1.1 + 6.1.2 jar ${project.artifactId} Bus Proxy https://github.com/aoju/bus + + + The MIT License (MIT) + https://opensource.org/licenses/MIT + + + + + scm:git@github.com:aoju/bus.git + scm:git@github.com:aoju/bus.git + git@github.com:aoju/bus.git + + + + + Kimi Liu + https://github.com/aoju/bus.git + + + + + Github Issue + https://github.com/aoju/bus/issues + + UTF-8 UTF-8 @@ -20,7 +45,7 @@ 3.27.0-GA 4.0.63 3.3.0 - 1.9.5 + 1.9.6 @@ -55,31 +80,6 @@ - - - The MIT License (MIT) - https://opensource.org/licenses/MIT - - - - - scm:git@github.com:aoju/bus.git - scm:git@github.com:aoju/bus.git - git@github.com:aoju/bus.git - - - - - Kimi Liu - https://github.com/aoju/bus.git - - - - - Github Issue - https://github.com/aoju/bus/issues - - diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/Builder.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/Builder.java index 90b9ffd94d..6c41a9f5a7 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/Builder.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/Builder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy; @@ -40,7 +41,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Builder { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/Factory.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/Factory.java index 68f96bd61d..e66a40648c 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/Factory.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/Factory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy; @@ -37,7 +38,7 @@ * {@link CglibFactory}或 {@link JavassistFactory}代替 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Factory { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/Interceptor.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/Interceptor.java index e574ccc3ab..c498d08ebc 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/Interceptor.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/Interceptor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy; @@ -28,7 +29,7 @@ * "拦截"方法调用 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Interceptor { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/Invocation.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/Invocation.java index a94fc0f98d..1311ba2073 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/Invocation.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/Invocation.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy; @@ -30,7 +31,7 @@ * 调用者方法 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Invocation { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/Invoker.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/Invoker.java index 909a2ba3a1..8508c30b30 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/Invoker.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/Invoker.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy; @@ -30,7 +31,7 @@ * 调用程序负责处理方法调用 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Invoker { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/Provider.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/Provider.java index 850f48d84c..e2dab7710f 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/Provider.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/Provider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy; @@ -28,7 +29,7 @@ * 为委托代理提供对象 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Provider { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/aspects/Aspectj.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/aspects/Aspectj.java index bc4181352d..d107cb6826 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/aspects/Aspectj.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/aspects/Aspectj.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.aspects; @@ -30,7 +31,7 @@ * 切面接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Aspectj { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/aspects/AspectjSimple.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/aspects/AspectjSimple.java index 2bfe75e1dd..6f0c8efc99 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/aspects/AspectjSimple.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/aspects/AspectjSimple.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.aspects; @@ -32,7 +33,7 @@ * 可以继承此类实现自己需要的方法即可 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AspectjSimple implements Aspectj, Serializable { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/aspects/AspectjTimes.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/aspects/AspectjTimes.java index 431e1b2ea3..5855594aeb 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/aspects/AspectjTimes.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/aspects/AspectjTimes.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.aspects; @@ -33,7 +34,7 @@ * 通过日志打印方法的执行时间的切面 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AspectjTimes extends AspectjSimple { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/AbstractFactory.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/AbstractFactory.java index 54d34da590..9b4037cb6f 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/AbstractFactory.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/AbstractFactory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.factory; @@ -44,7 +45,7 @@ * 超类为{@link Factory},它支持子类化而不仅仅是实现接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractFactory extends Factory { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/AbstractProxyClass.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/AbstractProxyClass.java index 2e3551a24e..18c38bf2a9 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/AbstractProxyClass.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/AbstractProxyClass.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.factory; @@ -32,7 +33,7 @@ * 用于{@link ProxyClass}实现 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractProxyClass implements ProxyClass { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/MethodSignature.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/MethodSignature.java index e9a6a5b740..add2208d43 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/MethodSignature.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/MethodSignature.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.factory; @@ -32,7 +33,7 @@ * 用于捕获方法签名的类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MethodSignature { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/ProxyClass.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/ProxyClass.java index 928e028e77..108b9a8f55 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/ProxyClass.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/ProxyClass.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.factory; @@ -28,7 +29,7 @@ * 代理类生成器生成特定类型的代理(拦截器、调用程序等) * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface ProxyClass { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/ProxyClassCache.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/ProxyClassCache.java index 4cbcfc44ad..beed36116e 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/ProxyClassCache.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/ProxyClassCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.factory; @@ -36,7 +37,7 @@ * 代理类缓存确保每个{@link AbstractProxyClass}/{@link ClassLoader}/代理类数组组合只有一个类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ProxyClassCache { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/cglib/CglibFactory.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/cglib/CglibFactory.java index a6b76d31c1..e8fe5cd031 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/cglib/CglibFactory.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/cglib/CglibFactory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.factory.cglib; @@ -38,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CglibFactory extends AbstractFactory { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/javassist/JavassistFactory.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/javassist/JavassistFactory.java index fb5d2006d8..9aa1206f94 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/javassist/JavassistFactory.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/javassist/JavassistFactory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.factory.javassist; @@ -44,7 +45,7 @@ * Javassist 3.0或更高版本 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JavassistFactory extends AbstractFactory { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/javassist/JavassistInvocation.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/javassist/JavassistInvocation.java index 57240d086b..4cb52b469e 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/javassist/JavassistInvocation.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/javassist/JavassistInvocation.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.factory.javassist; @@ -44,7 +45,7 @@ * 动态创建子类来处理特定的接口方法(它们是硬连接的) * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class JavassistInvocation implements Invocation { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/javassist/JavassistKit.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/javassist/JavassistKit.java index df9549f84c..28d7fc7b07 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/javassist/JavassistKit.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/javassist/JavassistKit.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.factory.javassist; @@ -36,7 +37,7 @@ * 处理Javassist的实用方法 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ class JavassistKit { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/CglibInterceptor.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/CglibInterceptor.java index 7a60877ea1..ca814c0454 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/CglibInterceptor.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/CglibInterceptor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.intercept; @@ -35,7 +36,7 @@ * Cglib实现的动态代理切面 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CglibInterceptor implements MethodInterceptor { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/FilteredInterceptor.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/FilteredInterceptor.java index d858d17038..ee0c0af3c8 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/FilteredInterceptor.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/FilteredInterceptor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.intercept; @@ -32,7 +33,7 @@ * 只在方法被提供的MethodFilter接受的情况下调用它 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FilteredInterceptor implements Interceptor { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/InterceptorChain.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/InterceptorChain.java index 18bade35eb..31935d8426 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/InterceptorChain.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/InterceptorChain.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.intercept; @@ -34,7 +35,7 @@ * {@link Interceptor interceptors}的代理 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class InterceptorChain { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/JavassistInterceptor.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/JavassistInterceptor.java index 0bec524467..48009dc53b 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/JavassistInterceptor.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/JavassistInterceptor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.intercept; @@ -37,7 +38,7 @@ * JDK实现的动态代理切面 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JavassistInterceptor implements InvocationHandler, Serializable { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/LoggingInterceptor.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/LoggingInterceptor.java index 3a3976152e..0e478a5a14 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/LoggingInterceptor.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/LoggingInterceptor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.intercept; @@ -35,7 +36,7 @@ * 注意:这个类的实现是从HiveMind的日志拦截器中借来的 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class LoggingInterceptor implements Interceptor { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/MethodAdapter.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/MethodAdapter.java index a4d4c28df5..b7409fd313 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/MethodAdapter.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/MethodAdapter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.intercept; @@ -37,7 +38,7 @@ * 接口适应于Proxy的{@link Interceptor}接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MethodAdapter implements Interceptor { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/MethodFilter.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/MethodFilter.java index 111c1052a5..ae98f1868f 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/MethodFilter.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/MethodFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.intercept; @@ -30,7 +31,7 @@ * 一个MethodFilter决定一个方法是否被接受 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface MethodFilter { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/SerializingInterceptor.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/SerializingInterceptor.java index 69435906f5..14939bdbb3 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/SerializingInterceptor.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/SerializingInterceptor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.intercept; @@ -34,7 +35,7 @@ * 这在测试远程服务以确保所有参数/返回类型实际上都是可序列化/反序列化的时候非常有用 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SerializingInterceptor implements Interceptor { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/filter/PatternFilter.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/filter/PatternFilter.java index b2da63b739..cf448c438b 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/filter/PatternFilter.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/filter/PatternFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.intercept.filter; @@ -32,7 +33,7 @@ * 如果方法的名称与提供的正则表达式(JDK regex)模式字符串匹配,则方法筛选器实现返回true * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PatternFilter implements MethodFilter { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/filter/ReturnTypeFilter.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/filter/ReturnTypeFilter.java index 96f3abb0a1..7dd32dd7bb 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/filter/ReturnTypeFilter.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/filter/ReturnTypeFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.intercept.filter; @@ -36,7 +37,7 @@ * 基于返回类型的筛选器方法 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ReturnTypeFilter implements MethodFilter { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/filter/SimpleFilter.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/filter/SimpleFilter.java index 54c4b78e0d..7e7fd10be5 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/filter/SimpleFilter.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/filter/SimpleFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.intercept.filter; @@ -35,7 +36,7 @@ * 一个简单的方法筛选器实现,如果方法的名称在一组可接受的名称中,则该实现仅返回true * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SimpleFilter implements MethodFilter { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/DuckInvoker.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/DuckInvoker.java index b6c09f966a..2e57d85324 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/DuckInvoker.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/DuckInvoker.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.invoker; @@ -35,7 +36,7 @@ * 该类有助于将现有类调整为它没有实现的接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DuckInvoker implements Invoker { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/HandlerInvoker.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/HandlerInvoker.java index 1dfd124299..c9df452157 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/HandlerInvoker.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/HandlerInvoker.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.invoker; @@ -33,7 +34,7 @@ * 适配器类,将JDK的{@link InvocationHandler}接口调整为Commons Proxy的{@link Invoker}接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HandlerInvoker implements Invoker { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/InvocationInvoker.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/InvocationInvoker.java index 0017c0a06e..c9423bb9a0 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/InvocationInvoker.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/InvocationInvoker.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.invoker; @@ -35,7 +36,7 @@ * 切面实现类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class InvocationInvoker implements ProxyChain { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/JoinPointInvoker.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/JoinPointInvoker.java index 6e30cf89a7..d997ee4bfb 100644 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/JoinPointInvoker.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/JoinPointInvoker.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.invoker; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JoinPointInvoker implements ProxyChain { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/NullInvoker.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/NullInvoker.java index d91f179072..e053ace70d 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/NullInvoker.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/NullInvoker.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.invoker; @@ -35,7 +36,7 @@ * 这个类对于需要“空对象”设计模式的场景非常有用 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NullInvoker implements Invoker { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/ProxyChain.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/ProxyChain.java index 4c5ea95452..2229def9de 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/ProxyChain.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/ProxyChain.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.invoker; @@ -30,7 +31,7 @@ * 拦截层 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface ProxyChain extends Invocation { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/AlwaysProvider.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/AlwaysProvider.java index d2c64e249e..89912e8536 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/AlwaysProvider.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/AlwaysProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.provider; @@ -30,7 +31,7 @@ * 总是返回相同的对象 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AlwaysProvider implements Provider { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/BeanProvider.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/BeanProvider.java index 0a7ffb7522..7607e0132f 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/BeanProvider.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/BeanProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.provider; @@ -31,7 +32,7 @@ * 使用Class.newInstance()来实例化一个对象 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BeanProvider implements Provider { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/BurlapProvider.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/BurlapProvider.java index 3ca39371b4..16c1ac8064 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/BurlapProvider.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/BurlapProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.provider; @@ -34,7 +35,7 @@ * burlap 服务提供 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BurlapProvider implements Provider { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/CloningProvider.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/CloningProvider.java index e99a824453..d236ad3c08 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/CloningProvider.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/CloningProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.provider; @@ -35,7 +36,7 @@ * 仅对给定的{@link Cloneable}对象调用clone()(反射性地) * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CloningProvider implements Provider { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/DecoratorProvider.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/DecoratorProvider.java index 81703f0bdb..154f475ced 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/DecoratorProvider.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/DecoratorProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.provider; @@ -33,7 +34,7 @@ * 例如,通过{@link SingletonProvider 高速缓存它} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DecoratorProvider implements Provider { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/HessianProvider.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/HessianProvider.java index 7261270a95..2741d87f8c 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/HessianProvider.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/HessianProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.provider; @@ -34,7 +35,7 @@ * Hessian 服务提供 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HessianProvider implements Provider { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/NullProvider.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/NullProvider.java index f6c83fa58d..41d9c33cde 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/NullProvider.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/NullProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.provider; @@ -28,7 +29,7 @@ * 总是返回null * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NullProvider extends AlwaysProvider { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/RmiProvider.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/RmiProvider.java index d46668beaa..d844fc000f 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/RmiProvider.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/RmiProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.provider; @@ -39,7 +40,7 @@ * 通过在RMI注册表中查找来提供对象 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RmiProvider implements Provider { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/SessionBeanProvider.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/SessionBeanProvider.java index 38544f0d91..1a35f86bfb 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/SessionBeanProvider.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/SessionBeanProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.provider; @@ -41,7 +42,7 @@ * 这对本地和远程会话bean都有效 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SessionBeanProvider implements Provider { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/SingletonProvider.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/SingletonProvider.java index cfc21b2d13..74e51fd953 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/SingletonProvider.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/SingletonProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.proxy.provider; @@ -31,7 +32,7 @@ * 在所有后续调用时返回包装提供程序返回的值 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SingletonProvider extends DecoratorProvider { diff --git a/bus-sensitive/pom.xml b/bus-sensitive/pom.xml index 643abafb96..4cf0846acb 100755 --- a/bus-sensitive/pom.xml +++ b/bus-sensitive/pom.xml @@ -6,19 +6,44 @@ org.aoju bus-sensitive - 6.1.1 + 6.1.2 jar ${project.artifactId} Bus Sensitive https://github.com/aoju/bus + + + The MIT License (MIT) + https://opensource.org/licenses/MIT + + + + + scm:git@github.com:aoju/bus.git + scm:git@github.com:aoju/bus.git + git@github.com:aoju/bus.git + + + + + Kimi Liu + https://github.com/aoju/bus.git + + + + + Github Issue + https://github.com/aoju/bus/issues + + UTF-8 UTF-8 1.8 - 1.18.12 - 1.2.73 + 1.18.16 + 1.2.75 @@ -46,31 +71,6 @@ - - - The MIT License (MIT) - https://opensource.org/licenses/MIT - - - - - scm:git@github.com:aoju/bus.git - scm:git@github.com:aoju/bus.git - git@github.com:aoju/bus.git - - - - - Kimi Liu - https://github.com/aoju/bus.git - - - - - Github Issue - https://github.com/aoju/bus/issues - - diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Builder.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Builder.java index 3423af1c93..5e9110b3af 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Builder.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Builder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.sensitive; @@ -41,7 +42,7 @@ * 2.主要供单独的字符串处理使用 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Builder { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Condition.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Condition.java index 312218c48b..b28c7e7d60 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Condition.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Condition.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.sensitive; @@ -30,7 +31,7 @@ * 返回真条件 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Condition implements ConditionProvider { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Context.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Context.java index 505c959fc0..5ffbaaa5a4 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Context.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Context.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.sensitive; @@ -36,7 +37,7 @@ * 脱敏的执行上下文 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Filter.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Filter.java index 988e752fd4..29789da512 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Filter.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Filter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.sensitive; @@ -48,7 +49,7 @@ * 因为 FastJSON 本身的转换问题,如果对象中存储的是集合对象列表,会导致显示不是信息本身 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Filter implements com.alibaba.fastjson.serializer.ContextValueFilter { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Provider.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Provider.java index e355f0c00d..ddbe539e0e 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Provider.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Provider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.sensitive; @@ -47,7 +48,7 @@ * * @param 参数类型 * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Provider { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Registry.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Registry.java index 8bb960d414..01a01d3690 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Registry.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Registry.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.sensitive; @@ -40,7 +41,7 @@ * 注解和实现之间映射 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Registry { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/StopChar.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/StopChar.java index a085157bd9..899cc23257 100644 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/StopChar.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/StopChar.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.sensitive; @@ -32,7 +33,7 @@ * 过滤词及一些简单处理 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class StopChar { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/WordTree.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/WordTree.java index 649c8098fe..3e0d75dea8 100644 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/WordTree.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/WordTree.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.sensitive; @@ -38,7 +39,7 @@ * 单词树使用树状结构表示一组单词 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class WordTree extends HashMap { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Condition.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Condition.java index 6e0807f901..e20c810963 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Condition.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Condition.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.sensitive.annotation; @@ -32,7 +33,7 @@ * 用于自定义策略生效条件的注解 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Entry.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Entry.java index 6ee4b75246..a643e15cb5 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Entry.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Entry.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.sensitive.annotation; @@ -33,7 +34,7 @@ * 3. 如果是普通字段/MAP,则不做处理 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/NShield.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/NShield.java index 5f744d2430..bb6eedf14a 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/NShield.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/NShield.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.sensitive.annotation; @@ -32,7 +33,7 @@ * 对json内的key_value进行脱敏/过滤 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Privacy.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Privacy.java index ff91f50185..3a442e7d6a 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Privacy.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Privacy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.sensitive.annotation; @@ -32,7 +33,7 @@ * 隐私数据加解密 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER}) diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Sensitive.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Sensitive.java index 386e1e4802..b499bf057d 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Sensitive.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Sensitive.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.sensitive.annotation; @@ -38,7 +39,7 @@ * ResponseBodyAdvice 脱敏加密 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Shield.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Shield.java index b35c61b92f..e783af0170 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Shield.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Shield.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.sensitive.annotation; @@ -44,7 +45,7 @@ * 在 Strategy 注解中,可以指定策略 默认是全部,如果指定,则只针对其中的某个策略生效 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Strategy.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Strategy.java index 7ff71cf808..464e49d49a 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Strategy.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Strategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.sensitive.annotation; @@ -35,7 +36,7 @@ * 2.如果有多个策略, 则优先执行一次满足条件的策略 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/provider/AbstractProvider.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/provider/AbstractProvider.java index 5cf0d9be3c..d0052a516c 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/provider/AbstractProvider.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/provider/AbstractProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.sensitive.provider; @@ -31,7 +32,7 @@ * 脱敏策略 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractProvider implements StrategyProvider { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/provider/ConditionProvider.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/provider/ConditionProvider.java index e8a3add323..dc008924de 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/provider/ConditionProvider.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/provider/ConditionProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.sensitive.provider; @@ -30,7 +31,7 @@ * 执行上下文接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface ConditionProvider { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/provider/StrategyProvider.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/provider/StrategyProvider.java index 46075e7aac..75dfa53e15 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/provider/StrategyProvider.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/provider/StrategyProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.sensitive.provider; @@ -30,7 +31,7 @@ * 脱敏策略 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface StrategyProvider { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/AddressStrategy.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/AddressStrategy.java index f0180758e1..2cb1764b35 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/AddressStrategy.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/AddressStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.sensitive.strategy; @@ -38,7 +39,7 @@ * 例子:北京市海淀区**** * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AddressStrategy extends AbstractProvider { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/BandCardStrategy.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/BandCardStrategy.java index 9dd44afda2..7ae34428c9 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/BandCardStrategy.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/BandCardStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.sensitive.strategy; @@ -36,7 +37,7 @@ * 6227 0383 3938 3938 393 脱敏结果: 6227 **** **** ***8 393 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BandCardStrategy extends AbstractProvider { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/BuiltInStrategy.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/BuiltInStrategy.java index c349c7849a..6bd686be9c 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/BuiltInStrategy.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/BuiltInStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.sensitive.strategy; @@ -36,7 +37,7 @@ * 明明是数组,实现却只能是一个 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BuiltInStrategy extends AbstractProvider { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/CitizenIdStrategy.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/CitizenIdStrategy.java index 28b67295bc..cdf5fa9fd6 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/CitizenIdStrategy.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/CitizenIdStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.sensitive.strategy; @@ -39,7 +40,7 @@ * 只保留前6位和后2位,其他用*代替 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CitizenIdStrategy extends AbstractProvider { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/CnapsStrategy.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/CnapsStrategy.java index b85818fe77..677385bbb2 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/CnapsStrategy.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/CnapsStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.sensitive.strategy; @@ -35,7 +36,7 @@ * 前四位明文,后面脱敏 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CnapsStrategy extends AbstractProvider { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/DafaultStrategy.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/DafaultStrategy.java index 04da28c5ff..e464a49879 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/DafaultStrategy.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/DafaultStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.sensitive.strategy; @@ -35,7 +36,7 @@ * 默认脱敏处理类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DafaultStrategy extends AbstractProvider { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/EmailStrategy.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/EmailStrategy.java index 8e973685d9..1395e3e3c8 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/EmailStrategy.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/EmailStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.sensitive.strategy; @@ -38,7 +39,7 @@ * 保留前三位,中间隐藏4位 其他正常显示 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class EmailStrategy extends AbstractProvider { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/MobileStrategy.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/MobileStrategy.java index daffb6a511..3367ecd151 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/MobileStrategy.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/MobileStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.sensitive.strategy; @@ -35,7 +36,7 @@ * 18233583070 脱敏后: 182****3030 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MobileStrategy extends AbstractProvider { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/NameStrategy.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/NameStrategy.java index 8d3d0b5e46..57505fcde9 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/NameStrategy.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/NameStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.sensitive.strategy; @@ -41,7 +42,7 @@ * 2. 三个及其以上 只保留第一个和最后一个 其他用星号代替 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NameStrategy extends AbstractProvider { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/NoneStrategy.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/NoneStrategy.java index 74e5f97154..a646c51ca8 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/NoneStrategy.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/NoneStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.sensitive.strategy; @@ -32,7 +33,7 @@ * 不脱敏 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NoneStrategy extends AbstractProvider { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/PasswordStrategy.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/PasswordStrategy.java index 43815cff3b..a9de605632 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/PasswordStrategy.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/PasswordStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.sensitive.strategy; @@ -33,7 +34,7 @@ * 直接返回 null * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PasswordStrategy extends AbstractProvider { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/PayStrategy.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/PayStrategy.java index 135d7dcea0..2d681a1afd 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/PayStrategy.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/PayStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.sensitive.strategy; @@ -36,7 +37,7 @@ * 签约协议号脱敏格式为前6位后6位保留明文,中间脱敏 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PayStrategy extends AbstractProvider { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/PhoneStrategy.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/PhoneStrategy.java index 6df15d72b5..89268a05b9 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/PhoneStrategy.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/PhoneStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.sensitive.strategy; @@ -36,7 +37,7 @@ * 脱敏规则:180****1120 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PhoneStrategy extends AbstractProvider { diff --git a/bus-setting/pom.xml b/bus-setting/pom.xml index 4a054fb2ba..506e8d2703 100755 --- a/bus-setting/pom.xml +++ b/bus-setting/pom.xml @@ -6,27 +6,13 @@ org.aoju bus-setting - 6.1.1 + 6.1.2 jar ${project.artifactId} Bus Setting https://github.com/aoju/bus - - UTF-8 - UTF-8 - 1.8 - - - - - ${project.groupId} - bus-logger - ${project.version} - - - The MIT License (MIT) @@ -52,6 +38,20 @@ https://github.com/aoju/bus/issues + + UTF-8 + UTF-8 + 1.8 + + + + + ${project.groupId} + bus-logger + ${project.version} + + + diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/Builder.java b/bus-setting/src/main/java/org/aoju/bus/setting/Builder.java index 155b7ee0d1..72cb48df6c 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/Builder.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/Builder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.setting; @@ -37,7 +38,7 @@ * 非线程安全 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Builder { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/Factory.java b/bus-setting/src/main/java/org/aoju/bus/setting/Factory.java index 14d555a244..d58dd1aab6 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/Factory.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/Factory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.setting; @@ -37,7 +38,7 @@ * {@link IniProperty} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Factory { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/Format.java b/bus-setting/src/main/java/org/aoju/bus/setting/Format.java index a9ca3b1d5f..f1bfc1ad9e 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/Format.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/Format.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.setting; @@ -32,7 +33,7 @@ * ini formatter. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Format extends Closeable { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/Readers.java b/bus-setting/src/main/java/org/aoju/bus/setting/Readers.java index 9ce65c5d12..2e37ec49e2 100755 --- a/bus-setting/src/main/java/org/aoju/bus/setting/Readers.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/Readers.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.setting; @@ -48,7 +49,7 @@ * Setting文件加载器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Readers { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/dialect/Props.java b/bus-setting/src/main/java/org/aoju/bus/setting/dialect/Props.java index 49cb9f958d..064d9269cc 100755 --- a/bus-setting/src/main/java/org/aoju/bus/setting/dialect/Props.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/dialect/Props.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.setting.dialect; @@ -58,7 +59,7 @@ * Properties文件读取封装类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Props extends Properties implements BasicType, OptBasicType { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/format/AbstractFormatter.java b/bus-setting/src/main/java/org/aoju/bus/setting/format/AbstractFormatter.java index 6611f729e3..70101d772c 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/format/AbstractFormatter.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/format/AbstractFormatter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.setting.format; @@ -31,7 +32,7 @@ * 除了CommentElementFormatter之外,所有元素格式化程序都还需要注释元素格式化程序 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractFormatter implements ElementFormatter { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/format/CommentFormatter.java b/bus-setting/src/main/java/org/aoju/bus/setting/format/CommentFormatter.java index d4f30dd156..d5bbc667be 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/format/CommentFormatter.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/format/CommentFormatter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.setting.format; @@ -32,7 +33,7 @@ * 将字符串值格式设置为{@link IniComment} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CommentFormatter extends AbstractFormatter { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/format/DefaultFormatter.java b/bus-setting/src/main/java/org/aoju/bus/setting/format/DefaultFormatter.java index abd5d9a7fb..c287cc1bd9 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/format/DefaultFormatter.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/format/DefaultFormatter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.setting.format; @@ -41,7 +42,7 @@ * {@link IniProperty } * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DefaultFormatter implements Format { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/format/ElementFormatter.java b/bus-setting/src/main/java/org/aoju/bus/setting/format/ElementFormatter.java index 5f4cc7e23d..d0412bfee2 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/format/ElementFormatter.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/format/ElementFormatter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.setting.format; @@ -30,7 +31,7 @@ * 将字符串值格式设置为{@link IniElement} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface ElementFormatter { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/format/PropertyFormatter.java b/bus-setting/src/main/java/org/aoju/bus/setting/format/PropertyFormatter.java index 1786a7ff61..2ed6d99c12 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/format/PropertyFormatter.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/format/PropertyFormatter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.setting.format; @@ -32,7 +33,7 @@ * 将字符串值格式设置为{@link IniProperty} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PropertyFormatter extends AbstractFormatter { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/format/SectionFormatter.java b/bus-setting/src/main/java/org/aoju/bus/setting/format/SectionFormatter.java index 2838816b12..279c11308b 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/format/SectionFormatter.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/format/SectionFormatter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.setting.format; @@ -34,7 +35,7 @@ * 将字符串值格式设置为{@link IniSection} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SectionFormatter extends AbstractFormatter { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/magic/AbstractElement.java b/bus-setting/src/main/java/org/aoju/bus/setting/magic/AbstractElement.java index 63aee37a0e..5372bc2951 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/magic/AbstractElement.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/magic/AbstractElement.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.setting.magic; @@ -30,7 +31,7 @@ * an abstract class for {@link IniElement}. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractElement implements IniElement { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/magic/AbstractSetting.java b/bus-setting/src/main/java/org/aoju/bus/setting/magic/AbstractSetting.java index 22e33c9a70..99f9d5de59 100755 --- a/bus-setting/src/main/java/org/aoju/bus/setting/magic/AbstractSetting.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/magic/AbstractSetting.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.setting.magic; @@ -41,7 +42,7 @@ * Setting抽象类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractSetting implements OptNullString, Serializable { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniComment.java b/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniComment.java index e816480aa1..e1b887391d 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniComment.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniComment.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.setting.magic; @@ -28,7 +29,7 @@ * Ini file's comment. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface IniComment extends IniElement { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniCommentImpl.java b/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniCommentImpl.java index 0073488a5a..96f5826df0 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniCommentImpl.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniCommentImpl.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.setting.magic; @@ -30,7 +31,7 @@ * Ini file's comment. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class IniCommentImpl extends AbstractElement implements IniComment { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniElement.java b/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniElement.java index 80fb34e1c7..9237ab5177 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniElement.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniElement.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.setting.magic; @@ -32,7 +33,7 @@ * they all can be like {@link String} . * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface IniElement extends CharSequence, java.io.Serializable { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniProperty.java b/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniProperty.java index f45f369d13..f2e432bdb8 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniProperty.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniProperty.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.setting.magic; @@ -30,7 +31,7 @@ * Ini file's parameters, like {@code property1=value1 } * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface IniProperty extends Map.Entry, IniElement { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniPropertyImpl.java b/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniPropertyImpl.java index 5e76353ae3..a302867da4 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniPropertyImpl.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniPropertyImpl.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.setting.magic; @@ -32,7 +33,7 @@ * Ini file's parameters, like {@code property1=value1 } * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class IniPropertyImpl extends AbstractElement implements IniProperty { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniSection.java b/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniSection.java index 81e244ad93..f6cde00011 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniSection.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniSection.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.setting.magic; @@ -33,7 +34,7 @@ * Ini file's Section * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface IniSection extends ProxyList, IniElement { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniSectionImpl.java b/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniSectionImpl.java index 9cb27341a7..f1b8a8d88a 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniSectionImpl.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniSectionImpl.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.setting.magic; @@ -36,7 +37,7 @@ * Ini file's Section * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class IniSectionImpl extends AbstractElement implements IniSection { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniSetting.java b/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniSetting.java index 9603f6a66d..61a810bc8d 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniSetting.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniSetting.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.setting.magic; @@ -41,7 +42,7 @@ * 如果您想创建Ini,则可以{@link Builder} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class IniSetting extends ArrayList { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/magic/PopSetting.java b/bus-setting/src/main/java/org/aoju/bus/setting/magic/PopSetting.java index d53dcdcf42..cb76b40c8b 100755 --- a/bus-setting/src/main/java/org/aoju/bus/setting/magic/PopSetting.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/magic/PopSetting.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.setting.magic; @@ -60,7 +61,7 @@ * * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PopSetting extends AbstractSetting implements Map { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/metric/GlobalProfile.java b/bus-setting/src/main/java/org/aoju/bus/setting/metric/GlobalProfile.java index a9713863bb..611379c3ed 100755 --- a/bus-setting/src/main/java/org/aoju/bus/setting/metric/GlobalProfile.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/metric/GlobalProfile.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.setting.metric; @@ -31,7 +32,7 @@ * 全局的Profile配置中心 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class GlobalProfile { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/metric/GroupMap.java b/bus-setting/src/main/java/org/aoju/bus/setting/metric/GroupMap.java index a6441bebd1..470d1507d1 100755 --- a/bus-setting/src/main/java/org/aoju/bus/setting/metric/GroupMap.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/metric/GroupMap.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.setting.metric; @@ -34,7 +35,7 @@ * 基于分组的Map * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class GroupMap extends LinkedHashMap> { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/metric/GroupSet.java b/bus-setting/src/main/java/org/aoju/bus/setting/metric/GroupSet.java index 298a3ff3b7..f4992ee1a5 100755 --- a/bus-setting/src/main/java/org/aoju/bus/setting/metric/GroupSet.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/metric/GroupSet.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.setting.metric; @@ -43,7 +44,7 @@ * 分组配置文件如下: * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class GroupSet extends HashMap> { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/metric/Profile.java b/bus-setting/src/main/java/org/aoju/bus/setting/metric/Profile.java index 3044da215d..b23a1f5e15 100755 --- a/bus-setting/src/main/java/org/aoju/bus/setting/metric/Profile.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/metric/Profile.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.setting.metric; @@ -46,7 +47,7 @@ * * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Profile implements Serializable { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/metric/ProxyList.java b/bus-setting/src/main/java/org/aoju/bus/setting/metric/ProxyList.java index 7dbf5e9a2a..4f3ea72392 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/metric/ProxyList.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/metric/ProxyList.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.setting.metric; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface ProxyList extends List { diff --git a/bus-shade/README.md b/bus-shade/README.md index b2e7a4b97f..70ada82ba3 100755 --- a/bus-shade/README.md +++ b/bus-shade/README.md @@ -14,7 +14,7 @@ org.aoju bus-shade - 6.1.1 + 6.1.2 ``` diff --git a/bus-shade/pom.xml b/bus-shade/pom.xml index 8e29b2bf6e..b360058d87 100755 --- a/bus-shade/pom.xml +++ b/bus-shade/pom.xml @@ -6,21 +6,46 @@ org.aoju bus-shade - 6.1.1 + 6.1.2 jar ${project.artifactId} Bus Shade https://github.com/aoju/bus + + + The MIT License (MIT) + https://opensource.org/licenses/MIT + + + + + scm:git@github.com:aoju/bus.git + scm:git@github.com:aoju/bus.git + git@github.com:aoju/bus.git + + + + + Kimi Liu + https://github.com/aoju/bus.git + + + + + Github Issue + https://github.com/aoju/bus/issues + + UTF-8 UTF-8 1.8 2.3.30 - 1.18.12 - 1.1.24 - 8.0.21 + 1.18.16 + 1.2.3 + 8.0.22 @@ -55,31 +80,6 @@ - - - The MIT License (MIT) - https://opensource.org/licenses/MIT - - - - - scm:git@github.com:aoju/bus.git - scm:git@github.com:aoju/bus.git - git@github.com:aoju/bus.git - - - - - Kimi Liu - https://github.com/aoju/bus.git - - - - - Github Issue - https://github.com/aoju/bus/issues - - diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/Builder.java b/bus-shade/src/main/java/org/aoju/bus/shade/Builder.java index bbd3b400cc..7061a5ab44 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/Builder.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/Builder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade; @@ -41,7 +42,7 @@ * 默认常量 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Builder { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/Config.java b/bus-shade/src/main/java/org/aoju/bus/shade/Config.java index da44dccc4a..ae00e3fe8e 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/Config.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/Config.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade; @@ -38,7 +39,7 @@ * 配置入口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/beans/ColumnType.java b/bus-shade/src/main/java/org/aoju/bus/shade/beans/ColumnType.java index 726c19d6e4..e4443fec6c 100755 --- a/bus-shade/src/main/java/org/aoju/bus/shade/beans/ColumnType.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/beans/ColumnType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.beans; @@ -28,7 +29,7 @@ * 获取实体类字段属性类信息接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface ColumnType { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/beans/DateType.java b/bus-shade/src/main/java/org/aoju/bus/shade/beans/DateType.java index 3c456af4c8..2030526e19 100755 --- a/bus-shade/src/main/java/org/aoju/bus/shade/beans/DateType.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/beans/DateType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.beans; @@ -28,7 +29,7 @@ * 数据库时间类型 到 实体类时间类型 对应策略 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum DateType { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/beans/MySQLColumnType.java b/bus-shade/src/main/java/org/aoju/bus/shade/beans/MySQLColumnType.java index efcd2c23cb..2048c014a5 100755 --- a/bus-shade/src/main/java/org/aoju/bus/shade/beans/MySQLColumnType.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/beans/MySQLColumnType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.beans; @@ -28,7 +29,7 @@ * 表字段类型 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum MySQLColumnType implements ColumnType { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/beans/MySQLTypeConvert.java b/bus-shade/src/main/java/org/aoju/bus/shade/beans/MySQLTypeConvert.java index 0485324f73..d6e31e6c36 100755 --- a/bus-shade/src/main/java/org/aoju/bus/shade/beans/MySQLTypeConvert.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/beans/MySQLTypeConvert.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.beans; @@ -30,7 +31,7 @@ * MYSQL 数据库字段类型转换 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MySQLTypeConvert implements TypeConvert { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/beans/NamingRules.java b/bus-shade/src/main/java/org/aoju/bus/shade/beans/NamingRules.java index 9aed2faab1..6748207e80 100755 --- a/bus-shade/src/main/java/org/aoju/bus/shade/beans/NamingRules.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/beans/NamingRules.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.beans; @@ -30,7 +31,7 @@ * 获奖java中需要的驼峰命名 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NamingRules { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/beans/PropertyInfo.java b/bus-shade/src/main/java/org/aoju/bus/shade/beans/PropertyInfo.java index 5950b63139..3206d7c115 100755 --- a/bus-shade/src/main/java/org/aoju/bus/shade/beans/PropertyInfo.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/beans/PropertyInfo.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.beans; @@ -32,7 +33,7 @@ * 获取到数据库的信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/beans/TableEntity.java b/bus-shade/src/main/java/org/aoju/bus/shade/beans/TableEntity.java index 3e8e5a3216..0090a53a2a 100755 --- a/bus-shade/src/main/java/org/aoju/bus/shade/beans/TableEntity.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/beans/TableEntity.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.beans; @@ -36,7 +37,7 @@ * 自动生成需要的基本信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/beans/TypeConvert.java b/bus-shade/src/main/java/org/aoju/bus/shade/beans/TypeConvert.java index a10beca94f..18b3030e16 100755 --- a/bus-shade/src/main/java/org/aoju/bus/shade/beans/TypeConvert.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/beans/TypeConvert.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.beans; @@ -28,7 +29,7 @@ * 该类的功能描述 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface TypeConvert { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/AbstractDatabaseQuery.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/AbstractDatabaseQuery.java index 1aaf2de1a9..735d1c4075 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/AbstractDatabaseQuery.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/AbstractDatabaseQuery.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect; @@ -43,7 +44,7 @@ * 抽象查询 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractDatabaseQuery implements DatabaseQuery { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/DatabaseQuery.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/DatabaseQuery.java index 2832ac3982..a9fdf41196 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/DatabaseQuery.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/DatabaseQuery.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect; @@ -37,7 +38,7 @@ * 查询数据库信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface DatabaseQuery { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/DatabaseQueryFactory.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/DatabaseQueryFactory.java index 4df7d08293..e9bb3c5e1b 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/DatabaseQueryFactory.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/DatabaseQueryFactory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect; @@ -37,7 +38,7 @@ * 数据库查询工厂 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/DatabaseType.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/DatabaseType.java index 55015b9693..6dcdb316a7 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/DatabaseType.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/DatabaseType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect; @@ -40,7 +41,7 @@ * 数据库类型 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum DatabaseType implements Serializable { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/OtherDataBaseQuery.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/OtherDataBaseQuery.java index 3c02735ce9..bd8bb55a25 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/OtherDataBaseQuery.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/OtherDataBaseQuery.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect; @@ -39,7 +40,7 @@ * 其他数据库 暂未支持系列 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class OtherDataBaseQuery extends AbstractDatabaseQuery { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbColumn.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbColumn.java index fe834545ae..ae7771d809 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbColumn.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbColumn.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect.cachedb; @@ -32,7 +33,7 @@ * 表字段信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbDataBaseQuery.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbDataBaseQuery.java index eeb4b0211b..9c981a45bc 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbDataBaseQuery.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbDataBaseQuery.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect.cachedb; @@ -47,7 +48,7 @@ * CacheDB 数据库查询 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CacheDbDataBaseQuery extends AbstractDatabaseQuery { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbDatabase.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbDatabase.java index bb0aaea211..3729156b4e 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbDatabase.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbDatabase.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect.cachedb; @@ -31,7 +32,7 @@ * 数据库信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbPrimaryKey.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbPrimaryKey.java index bd4c4b59cf..7d93b621ec 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbPrimaryKey.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbPrimaryKey.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect.cachedb; @@ -32,7 +33,7 @@ * 表主键 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbTable.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbTable.java index c5b2226c73..2d25ce1fb5 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbTable.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbTable.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect.cachedb; @@ -32,7 +33,7 @@ * 表信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/db2/Db2DataBaseQuery.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/db2/Db2DataBaseQuery.java index 5026b5ab16..4f6a26a013 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/db2/Db2DataBaseQuery.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/db2/Db2DataBaseQuery.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect.db2; @@ -41,7 +42,7 @@ * db2 数据库查询 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Db2DataBaseQuery extends AbstractDatabaseQuery { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/h2/H2DataBaseQuery.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/h2/H2DataBaseQuery.java index efc1addd06..26939e9294 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/h2/H2DataBaseQuery.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/h2/H2DataBaseQuery.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect.h2; @@ -41,7 +42,7 @@ * H2 数据库查询 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class H2DataBaseQuery extends AbstractDatabaseQuery { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariaDbDataBaseQuery.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariaDbDataBaseQuery.java index c773ece8a8..8f5a923cab 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariaDbDataBaseQuery.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariaDbDataBaseQuery.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect.mariadb; @@ -45,7 +46,7 @@ * mariadb 数据库查询 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MariaDbDataBaseQuery extends AbstractDatabaseQuery { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariadbColumn.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariadbColumn.java index 355dd89b4a..48d3ef388e 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariadbColumn.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariadbColumn.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect.mariadb; @@ -32,7 +33,7 @@ * 表字段信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariadbDatabase.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariadbDatabase.java index 04e015c443..65e0cb7c15 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariadbDatabase.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariadbDatabase.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect.mariadb; @@ -32,7 +33,7 @@ * 数据库信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariadbPrimaryKey.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariadbPrimaryKey.java index d7693607ef..4ed949ca50 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariadbPrimaryKey.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariadbPrimaryKey.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect.mariadb; @@ -32,7 +33,7 @@ * 表主键 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariadbTable.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariadbTable.java index f8f6cd9378..d7733e7299 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariadbTable.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariadbTable.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect.mariadb; @@ -32,7 +33,7 @@ * 表信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlColumn.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlColumn.java index ae7c78efb0..56244f6586 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlColumn.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlColumn.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect.mysql; @@ -32,7 +33,7 @@ * 表字段信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlDataBaseQuery.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlDataBaseQuery.java index 5087d5c837..e9459b8b04 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlDataBaseQuery.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlDataBaseQuery.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect.mysql; @@ -48,7 +49,7 @@ * 元数据查询,查询的数据库表为INFORMATION_SCHEMA * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MySqlDataBaseQuery extends AbstractDatabaseQuery { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlDatabase.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlDatabase.java index fa7aef3b98..f05bdcab85 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlDatabase.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlDatabase.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect.mysql; @@ -31,7 +32,7 @@ * 数据库信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlPrimaryKey.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlPrimaryKey.java index 6ce1d6c6c7..76790dd6eb 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlPrimaryKey.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlPrimaryKey.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect.mysql; @@ -32,7 +33,7 @@ * 表主键 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlTable.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlTable.java index 9aba0d8683..e1bfc8fb44 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlTable.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlTable.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect.mysql; @@ -32,7 +33,7 @@ * 表信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OracleColumn.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OracleColumn.java index 6dbd9f17b2..ce7ef79cf3 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OracleColumn.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OracleColumn.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect.oracle; @@ -32,7 +33,7 @@ * Oracle table column * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OracleDataBaseQuery.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OracleDataBaseQuery.java index bbee0a5a28..d791cea35e 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OracleDataBaseQuery.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OracleDataBaseQuery.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect.oracle; @@ -52,7 +53,7 @@ * 所以,只能够通过自定义SQL来了 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class OracleDataBaseQuery extends AbstractDatabaseQuery { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OracleDatabase.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OracleDatabase.java index 7b1a6b0f0b..3665aede0f 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OracleDatabase.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OracleDatabase.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect.oracle; @@ -32,7 +33,7 @@ * 数据库信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OraclePrimaryKey.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OraclePrimaryKey.java index 107ce5183a..486b74989a 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OraclePrimaryKey.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OraclePrimaryKey.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect.oracle; @@ -32,7 +33,7 @@ * Oracle table primary * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OracleTable.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OracleTable.java index ba61bdfa06..7268dfab3e 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OracleTable.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OracleTable.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect.oracle; @@ -32,7 +33,7 @@ * Oracle table * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlColumn.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlColumn.java index 0e10111533..bdbc489066 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlColumn.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlColumn.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect.postgresql; @@ -32,7 +33,7 @@ * 表字段信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlDataBaseQuery.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlDataBaseQuery.java index 79718b8052..e10fb914ce 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlDataBaseQuery.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlDataBaseQuery.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect.postgresql; @@ -45,7 +46,7 @@ * PostgreSql 查询 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PostgreSqlDataBaseQuery extends AbstractDatabaseQuery { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlDatabase.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlDatabase.java index 951ad5a283..0e79bfa1cf 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlDatabase.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlDatabase.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect.postgresql; @@ -31,7 +32,7 @@ * 数据库信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlPrimaryKey.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlPrimaryKey.java index 5233856885..db7d4c9e84 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlPrimaryKey.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlPrimaryKey.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect.postgresql; @@ -32,7 +33,7 @@ * 表主键 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlTable.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlTable.java index 8cdc2c9aee..83e444b24f 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlTable.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlTable.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect.postgresql; @@ -32,7 +33,7 @@ * 表信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerColumn.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerColumn.java index 9fa3be07b2..23d16f7a66 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerColumn.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerColumn.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect.sqlserver; @@ -32,7 +33,7 @@ * sqlserver table column * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerDataBaseQuery.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerDataBaseQuery.java index 10925792dc..5bb65e7ac0 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerDataBaseQuery.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerDataBaseQuery.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect.sqlserver; @@ -48,7 +49,7 @@ * 通过文档发现,查询列和查询表的 REMARKS 字段SQL Server 不会为此列返回值。所以对于SQL server 自己写SQL语句了,差缺补全 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SqlServerDataBaseQuery extends AbstractDatabaseQuery { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerDatabase.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerDatabase.java index fcf713a02c..8a090f89aa 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerDatabase.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerDatabase.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect.sqlserver; @@ -32,7 +33,7 @@ * 数据库信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerPrimaryKey.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerPrimaryKey.java index 54abef8869..3468229279 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerPrimaryKey.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerPrimaryKey.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect.sqlserver; @@ -32,7 +33,7 @@ * sqlserver table primary * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerTable.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerTable.java index d51a4ea1a4..50346bf79f 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerTable.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerTable.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.dialect.sqlserver; @@ -32,7 +33,7 @@ * sqlserver table * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/AbstractEngine.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/AbstractEngine.java index d9195ad184..f17db49a4e 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/AbstractEngine.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/AbstractEngine.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.engine; @@ -37,7 +38,7 @@ * 模板引擎抽象类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/EngineConfig.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/EngineConfig.java index 4c44b5cb36..e03a5c579b 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/EngineConfig.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/EngineConfig.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.engine; @@ -33,7 +34,7 @@ * 文件生成配置 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/EngineFactory.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/EngineFactory.java index 392d38337c..e2738a1eae 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/EngineFactory.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/EngineFactory.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.engine; @@ -36,7 +37,7 @@ * 生成构造工厂 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/EngineFileType.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/EngineFileType.java index ba6b14b3cc..a97d9b671c 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/EngineFileType.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/EngineFileType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.engine; @@ -33,7 +34,7 @@ * 文件类型 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/FreemarkerEngine.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/FreemarkerEngine.java index d22dfae8d9..4317c371a9 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/FreemarkerEngine.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/FreemarkerEngine.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.engine; @@ -45,7 +46,7 @@ * freemarker * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FreemarkerEngine extends AbstractEngine { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/TemplateEngine.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/TemplateEngine.java index eec44b9955..8c648f0f39 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/TemplateEngine.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/TemplateEngine.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.engine; @@ -33,7 +34,7 @@ * 文件产生接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface TemplateEngine extends Serializable { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/TemplateType.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/TemplateType.java index 68a8eb4852..7b46034ead 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/TemplateType.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/TemplateType.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.engine; @@ -33,7 +34,7 @@ * 模板类型 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum TemplateType implements Serializable { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/execute/AbstractExecute.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/execute/AbstractExecute.java index 02ff4ebbaa..617cd4d60a 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/execute/AbstractExecute.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/execute/AbstractExecute.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.execute; @@ -34,7 +35,7 @@ * 抽象执行 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractExecute implements Execute { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/execute/Execute.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/execute/Execute.java index fea8e24e48..4facb17ef1 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/execute/Execute.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/execute/Execute.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.execute; @@ -28,7 +29,7 @@ * 执行文档生成 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Execute { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/execute/ProduceExecute.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/execute/ProduceExecute.java index 45e37d1604..0cecdcfba8 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/execute/ProduceExecute.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/execute/ProduceExecute.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.execute; @@ -36,7 +37,7 @@ * 文档生成 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ProduceExecute extends AbstractExecute { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/mapping/FieldMethod.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/mapping/FieldMethod.java index 51b7d35a58..8fd80a1b68 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/mapping/FieldMethod.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/mapping/FieldMethod.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.mapping; @@ -31,7 +32,7 @@ * FieldMethod * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FieldMethod { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/mapping/Mapping.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/mapping/Mapping.java index 30056cbd7f..2f63d2c76e 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/mapping/Mapping.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/mapping/Mapping.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.mapping; @@ -41,7 +42,7 @@ * 映射器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Mapping { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/mapping/MappingField.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/mapping/MappingField.java index 206594d492..5c193ca813 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/mapping/MappingField.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/mapping/MappingField.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.mapping; @@ -35,7 +36,7 @@ * 数据结构属性注解 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Retention(RetentionPolicy.RUNTIME) diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/mapping/MappingListField.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/mapping/MappingListField.java index 676d0108d8..be42c8562d 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/mapping/MappingListField.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/mapping/MappingListField.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.mapping; @@ -35,7 +36,7 @@ * 数据结构列表属性注解 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Retention(RetentionPolicy.RUNTIME) diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/Column.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/Column.java index 7233a95598..d9b9016d4e 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/Column.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/Column.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.metadata; @@ -28,7 +29,7 @@ * 表列接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Column { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/ColumnLength.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/ColumnLength.java index 49f20fc941..f5e7d23b6a 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/ColumnLength.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/ColumnLength.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.metadata; @@ -30,7 +31,7 @@ * 列长度 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface ColumnLength extends Serializable { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/ColumnSchema.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/ColumnSchema.java index 2de71c21b9..9145d4a4ec 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/ColumnSchema.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/ColumnSchema.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.metadata; @@ -30,7 +31,7 @@ * 表列领域对象 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/DataSchema.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/DataSchema.java index b1eefd541a..b8d97ebeae 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/DataSchema.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/DataSchema.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.metadata; @@ -31,7 +32,7 @@ * DataModel * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/Database.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/Database.java index 67c55c9417..ed6ceae215 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/Database.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/Database.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.metadata; @@ -28,7 +29,7 @@ * 数据库接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Database { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/DatabaseSchema.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/DatabaseSchema.java index 299121b66f..e692ddd0f7 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/DatabaseSchema.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/DatabaseSchema.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.metadata; @@ -33,7 +34,7 @@ * 数据库信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/PrimaryKey.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/PrimaryKey.java index a4f25108b8..f4e73725e9 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/PrimaryKey.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/PrimaryKey.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.metadata; @@ -30,7 +31,7 @@ * 主键 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface PrimaryKey extends Serializable { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/Table.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/Table.java index 695c314af3..bfe5fc800b 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/Table.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/Table.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.metadata; @@ -28,7 +29,7 @@ * 表接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Table { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/TableSchema.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/TableSchema.java index 60cdd4d16f..a400f7b695 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/TableSchema.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/TableSchema.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.metadata; @@ -33,7 +34,7 @@ * 表信息领域对象 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/process/AbstractProcess.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/process/AbstractProcess.java index 0929095fd4..c13dd061d9 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/process/AbstractProcess.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/process/AbstractProcess.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.process; @@ -42,7 +43,7 @@ * AbstractBuilder * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractProcess implements Process { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/process/DataModelProcess.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/process/DataModelProcess.java index 82452a2f93..b35a47810f 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/process/DataModelProcess.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/process/DataModelProcess.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.process; @@ -41,7 +42,7 @@ * 数据模型处理 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DataModelProcess extends AbstractProcess { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/process/Process.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/process/Process.java index f137e6d8be..17b01942cb 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/process/Process.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/process/Process.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.process; @@ -32,7 +33,7 @@ * 构建 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Process extends Serializable { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/process/ProcessConfig.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/process/ProcessConfig.java index 69b79c0a94..649a0c195b 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/process/ProcessConfig.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/process/ProcessConfig.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.shade.screw.process; @@ -34,7 +35,7 @@ * 数据处理 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-socket/pom.xml b/bus-socket/pom.xml index 81022ea41d..81adb42f4e 100755 --- a/bus-socket/pom.xml +++ b/bus-socket/pom.xml @@ -6,20 +6,45 @@ org.aoju bus-socket - 6.1.1 + 6.1.2 jar ${project.artifactId} Bus Socket https://github.com/aoju/bus + + + The MIT License (MIT) + https://opensource.org/licenses/MIT + + + + + scm:git@github.com:aoju/bus.git + scm:git@github.com:aoju/bus.git + git@github.com:aoju/bus.git + + + + + Kimi Liu + https://github.com/aoju/bus.git + + + + + Github Issue + https://github.com/aoju/bus/issues + + UTF-8 UTF-8 1.8 - 2.3.0.RELEASE - 1.18.12 - 1.2.73 + 2.4.0 + 1.18.16 + 1.2.75 4.1.51.Final @@ -55,31 +80,6 @@ - - - The MIT License (MIT) - https://opensource.org/licenses/MIT - - - - - scm:git@github.com:aoju/bus.git - scm:git@github.com:aoju/bus.git - git@github.com:aoju/bus.git - - - - - Kimi Liu - https://github.com/aoju/bus.git - - - - - Github Issue - https://github.com/aoju/bus/issues - - diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/netty/CancelCommand.java b/bus-socket/src/main/java/org/aoju/bus/socket/netty/CancelCommand.java index ec0c89c624..097e3884f1 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/netty/CancelCommand.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/netty/CancelCommand.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.netty; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CancelCommand implements Runnable { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/netty/ChannelCommand.java b/bus-socket/src/main/java/org/aoju/bus/socket/netty/ChannelCommand.java index dea9f55501..859b264cce 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/netty/ChannelCommand.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/netty/ChannelCommand.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.netty; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ChannelCommand implements Runnable { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/netty/ChannelExecutor.java b/bus-socket/src/main/java/org/aoju/bus/socket/netty/ChannelExecutor.java index 15a76ab0ca..b1559acf4c 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/netty/ChannelExecutor.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/netty/ChannelExecutor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.netty; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ChannelExecutor { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/netty/ChannelInitializer.java b/bus-socket/src/main/java/org/aoju/bus/socket/netty/ChannelInitializer.java index f46de0d29e..37649ae601 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/netty/ChannelInitializer.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/netty/ChannelInitializer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.netty; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ChannelInitializer extends io.netty.channel.ChannelInitializer { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/netty/ClientGroup.java b/bus-socket/src/main/java/org/aoju/bus/socket/netty/ClientGroup.java index 1159dbc972..da160a5e23 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/netty/ClientGroup.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/netty/ClientGroup.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.netty; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ClientGroup extends ConcurrentHashMap { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/netty/ClientMap.java b/bus-socket/src/main/java/org/aoju/bus/socket/netty/ClientMap.java index f8ce3cb188..d470e579ff 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/netty/ClientMap.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/netty/ClientMap.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.netty; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ClientMap extends ConcurrentHashMap { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/netty/ClientService.java b/bus-socket/src/main/java/org/aoju/bus/socket/netty/ClientService.java index 792be3359c..8d35ea98ee 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/netty/ClientService.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/netty/ClientService.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.netty; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ClientService { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/netty/CommandExecutor.java b/bus-socket/src/main/java/org/aoju/bus/socket/netty/CommandExecutor.java index 81d3839697..a6b67facb1 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/netty/CommandExecutor.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/netty/CommandExecutor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.netty; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CommandExecutor { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/netty/CustomizeEventHandler.java b/bus-socket/src/main/java/org/aoju/bus/socket/netty/CustomizeEventHandler.java index 12a0d28644..2815648b79 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/netty/CustomizeEventHandler.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/netty/CustomizeEventHandler.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.netty; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface CustomizeEventHandler { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/netty/EventHandler.java b/bus-socket/src/main/java/org/aoju/bus/socket/netty/EventHandler.java index 57137ddf2d..2cbd61707a 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/netty/EventHandler.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/netty/EventHandler.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.netty; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface EventHandler { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/netty/HeartbeatCommand.java b/bus-socket/src/main/java/org/aoju/bus/socket/netty/HeartbeatCommand.java index 1fff2cd2b0..b1d2e71f3a 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/netty/HeartbeatCommand.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/netty/HeartbeatCommand.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.netty; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HeartbeatCommand implements Runnable { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/netty/MessageCommand.java b/bus-socket/src/main/java/org/aoju/bus/socket/netty/MessageCommand.java index 7345ce4945..feaf784d88 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/netty/MessageCommand.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/netty/MessageCommand.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.netty; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MessageCommand implements Runnable { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/netty/MessagePublisher.java b/bus-socket/src/main/java/org/aoju/bus/socket/netty/MessagePublisher.java index d0efc20cc2..8dfb24b7f2 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/netty/MessagePublisher.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/netty/MessagePublisher.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.netty; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MessagePublisher { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/netty/NettyConsts.java b/bus-socket/src/main/java/org/aoju/bus/socket/netty/NettyConsts.java index 09ec073ad5..ef91a3b263 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/netty/NettyConsts.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/netty/NettyConsts.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.netty; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NettyConsts { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/netty/PublishCommand.java b/bus-socket/src/main/java/org/aoju/bus/socket/netty/PublishCommand.java index ae02cb9fd2..a0608e0bff 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/netty/PublishCommand.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/netty/PublishCommand.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.netty; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PublishCommand implements Runnable { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/netty/RemoveCommand.java b/bus-socket/src/main/java/org/aoju/bus/socket/netty/RemoveCommand.java index c62020befe..e6c8c20008 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/netty/RemoveCommand.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/netty/RemoveCommand.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.netty; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RemoveCommand implements Runnable { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/netty/RequestDecoder.java b/bus-socket/src/main/java/org/aoju/bus/socket/netty/RequestDecoder.java index 2f2d21d38a..6df5adee42 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/netty/RequestDecoder.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/netty/RequestDecoder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.netty; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RequestDecoder { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/netty/RequestHandler.java b/bus-socket/src/main/java/org/aoju/bus/socket/netty/RequestHandler.java index 1c3976de5f..13be2a5c31 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/netty/RequestHandler.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/netty/RequestHandler.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.netty; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RequestHandler { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/netty/SocketClient.java b/bus-socket/src/main/java/org/aoju/bus/socket/netty/SocketClient.java index f8401a0ac8..8bef0f9894 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/netty/SocketClient.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/netty/SocketClient.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.netty; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SocketClient { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/netty/SocketHandler.java b/bus-socket/src/main/java/org/aoju/bus/socket/netty/SocketHandler.java index cd30e654f7..50a64eac12 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/netty/SocketHandler.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/netty/SocketHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.netty; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Sharable diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/netty/SocketMessage.java b/bus-socket/src/main/java/org/aoju/bus/socket/netty/SocketMessage.java index 8cd036c851..f3dcdf6c3e 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/netty/SocketMessage.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/netty/SocketMessage.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.netty; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/netty/SocketRequest.java b/bus-socket/src/main/java/org/aoju/bus/socket/netty/SocketRequest.java index 12e7190a49..76e1992945 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/netty/SocketRequest.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/netty/SocketRequest.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.netty; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/netty/SocketServer.java b/bus-socket/src/main/java/org/aoju/bus/socket/netty/SocketServer.java index d6b8d89656..b12d0223da 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/netty/SocketServer.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/netty/SocketServer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.netty; @@ -36,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SocketServer implements Runnable { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/netty/SocketService.java b/bus-socket/src/main/java/org/aoju/bus/socket/netty/SocketService.java index ffabfed6ba..63a3b0d401 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/netty/SocketService.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/netty/SocketService.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.netty; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SocketService { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/netty/SubscribeCommand.java b/bus-socket/src/main/java/org/aoju/bus/socket/netty/SubscribeCommand.java index 2eeee26442..32ee1f2414 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/netty/SubscribeCommand.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/netty/SubscribeCommand.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.netty; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SubscribeCommand implements Runnable { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/netty/annotation/WebSocket.java b/bus-socket/src/main/java/org/aoju/bus/socket/netty/annotation/WebSocket.java index edec093872..ced9fab36e 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/netty/annotation/WebSocket.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/netty/annotation/WebSocket.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.netty.annotation; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Target(ElementType.TYPE) diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/AioQuickClient.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/AioQuickClient.java index b935ee4753..e571cfa55c 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/AioQuickClient.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/AioQuickClient.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin; @@ -39,7 +40,7 @@ * AIO实现的客户端服务 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AioQuickClient { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/AioQuickServer.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/AioQuickServer.java index 5d103d6b4b..868402e6b6 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/AioQuickServer.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/AioQuickServer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin; @@ -47,7 +48,7 @@ * AIO服务端 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AioQuickServer { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/AioSSLQuickClient.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/AioSSLQuickClient.java index 74ed3d171c..3296506e13 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/AioSSLQuickClient.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/AioSSLQuickClient.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin; @@ -37,7 +38,7 @@ * AIO实现的客户端服务 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class AioSSLQuickClient extends AioQuickClient { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/AioSSLQuickServer.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/AioSSLQuickServer.java index 33eca0dfe9..704f5cc943 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/AioSSLQuickServer.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/AioSSLQuickServer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin; @@ -34,7 +35,7 @@ * AIO服务端 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AioSSLQuickServer extends AioQuickServer { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/AioSession.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/AioSession.java index 964ce57397..49ffc87fbc 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/AioSession.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/AioSession.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AioSession { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/Function.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/Function.java index b9ecb580fa..6d2753ee71 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/Function.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/Function.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ interface Function { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/Message.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/Message.java index 4e3fd1d1d6..19c465bab9 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/Message.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/Message.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin; @@ -28,7 +29,7 @@ * 消息处理器,通过实现该接口,对完成解码的消息进行业务处理 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Message { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/NetMonitor.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/NetMonitor.java index a1b9873468..215fdaad0c 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/NetMonitor.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/NetMonitor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin; @@ -45,7 +46,7 @@ *

        * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface NetMonitor { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/Protocol.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/Protocol.java index f5d8862416..7066b7267e 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/Protocol.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/Protocol.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin; @@ -34,7 +35,7 @@ * 请勿在其实现类的成员变量中存储特定链路的数据 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Protocol { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/QuickTimer.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/QuickTimer.java index a9edf26fb0..d2e34fc81b 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/QuickTimer.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/QuickTimer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin; @@ -31,7 +32,7 @@ * 服务器定时任务 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class QuickTimer extends TimerTask { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/SSLAioSession.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/SSLAioSession.java index e5d3111e3d..57ef956ad9 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/SSLAioSession.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/SSLAioSession.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin; @@ -38,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ class SSLAioSession extends TcpAioSession { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/ServerConfig.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/ServerConfig.java index 310427e454..2a93b1442a 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/ServerConfig.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/ServerConfig.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin; @@ -32,7 +33,7 @@ * Quickly服务端/客户端配置信息 T:解码后生成的对象类型 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ final class ServerConfig { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/StateMachine.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/StateMachine.java index 9747f958ec..bd5c985889 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/StateMachine.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/StateMachine.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin; @@ -32,7 +33,7 @@ * 当前枚举的各状态机事件在发生后都会及时触发{@link Message#stateEvent(AioSession, StateMachine, Throwable)}方法 因此用户在实现的{@linkplain Message}接口中可对自己关心的状态机事件进行处理 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum StateMachine { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/TcpAioSession.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/TcpAioSession.java index c7eb793b00..fc1b5fb350 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/TcpAioSession.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/TcpAioSession.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin; @@ -61,7 +62,7 @@ *

        * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ class TcpAioSession extends AioSession { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/TcpReadEvent.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/TcpReadEvent.java index 677061c8ad..9a260c876a 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/TcpReadEvent.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/TcpReadEvent.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ final class TcpReadEvent { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/TcpReadHandler.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/TcpReadHandler.java index 03503d83a9..160bb61bef 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/TcpReadHandler.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/TcpReadHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin; @@ -35,7 +36,7 @@ * 读写事件回调处理类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ class TcpReadHandler implements CompletionHandler> { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/TcpWriteHandler.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/TcpWriteHandler.java index 5c4af93e41..8456f97d19 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/TcpWriteHandler.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/TcpWriteHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin; @@ -32,7 +33,7 @@ * 读写事件回调处理类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ class TcpWriteHandler implements CompletionHandler> { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/UdpAioSession.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/UdpAioSession.java index 06862ead34..0ab74105a8 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/UdpAioSession.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/UdpAioSession.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ final class UdpAioSession extends AioSession { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/UdpBootstrap.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/UdpBootstrap.java index 14aa8b266b..7df4e68f44 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/UdpBootstrap.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/UdpBootstrap.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin; @@ -43,7 +44,7 @@ * UDP服务启动类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class UdpBootstrap implements Runnable { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/UdpChannel.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/UdpChannel.java index 4a1d183900..8a9dcc4cd1 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/UdpChannel.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/UdpChannel.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin; @@ -44,7 +45,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class UdpChannel { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/UdpReadEvent.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/UdpReadEvent.java index ab5bfb6950..1dc77b12bc 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/UdpReadEvent.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/UdpReadEvent.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ final class UdpReadEvent { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/UdpWriteEvent.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/UdpWriteEvent.java index 1c4c715d74..c6b6bb048d 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/UdpWriteEvent.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/UdpWriteEvent.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ final class UdpWriteEvent { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/WriteBuffer.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/WriteBuffer.java index b6b4161535..822df3490c 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/WriteBuffer.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/WriteBuffer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin; @@ -37,7 +38,7 @@ * 包装当前会话分配到的虚拟Buffer,提供流式操作方式 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class WriteBuffer extends OutputStream { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/AbstractMessage.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/AbstractMessage.java index 542cc5fb9c..722308cfc4 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/AbstractMessage.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/AbstractMessage.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin.plugins; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractMessage implements Message, NetMonitor { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/AbstractPlugin.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/AbstractPlugin.java index d944c4925f..d61efb44b8 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/AbstractPlugin.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/AbstractPlugin.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin.plugins; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractPlugin implements Plugin { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/BlackListPlugin.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/BlackListPlugin.java index 923b691c35..618a636317 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/BlackListPlugin.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/BlackListPlugin.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin.plugins; @@ -36,7 +37,7 @@ * 黑名单插件,会拒绝与黑名单中的IP建立连接 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class BlackListPlugin extends AbstractPlugin { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/DelimiterFrame.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/DelimiterFrame.java index 80a05a9ae9..abdc3b1cbc 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/DelimiterFrame.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/DelimiterFrame.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin.plugins; @@ -32,7 +33,7 @@ * 指定结束标识的解码器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DelimiterFrame implements SmartDecoder { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/FixedLengthFrame.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/FixedLengthFrame.java index 7fb60a9a1a..233c791cfa 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/FixedLengthFrame.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/FixedLengthFrame.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin.plugins; @@ -30,7 +31,7 @@ * 指定长度的解码器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FixedLengthFrame implements SmartDecoder { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/GroupMessage.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/GroupMessage.java index 4b74020d7c..2c5a789bc2 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/GroupMessage.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/GroupMessage.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin.plugins; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ abstract class GroupMessage implements Message { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/HeartPlugin.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/HeartPlugin.java index 2ff87fa7af..2d57ec4e9e 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/HeartPlugin.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/HeartPlugin.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin.plugins; @@ -38,7 +39,7 @@ * 心跳插件 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class HeartPlugin extends AbstractPlugin { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/MonitorPlugin.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/MonitorPlugin.java index a2347b7a46..59dad263f0 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/MonitorPlugin.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/MonitorPlugin.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin.plugins; @@ -39,7 +40,7 @@ * 服务器运行状态监控插件 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class MonitorPlugin extends TimerTask implements Plugin { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/PageBufferPlugin.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/PageBufferPlugin.java index 6ba61c173a..ac0bfc1beb 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/PageBufferPlugin.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/PageBufferPlugin.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin.plugins; @@ -40,7 +41,7 @@ * 内存页监测插件 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PageBufferPlugin extends AbstractPlugin { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/Plugin.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/Plugin.java index f35253f548..9b29ccb86b 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/Plugin.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/Plugin.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin.plugins; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Plugin extends NetMonitor { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/ReconnectPlugin.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/ReconnectPlugin.java index 4ec73fbe72..d3649d5be8 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/ReconnectPlugin.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/ReconnectPlugin.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin.plugins; @@ -34,7 +35,7 @@ * 断链重连插件 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ class ReconnectPlugin extends AbstractPlugin { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/SmartDecoder.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/SmartDecoder.java index 2724625c31..7b2d18dcf8 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/SmartDecoder.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/SmartDecoder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin.plugins; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface SmartDecoder { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/ssl/Callback.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/ssl/Callback.java index f515e965d0..965ba0fdbd 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/ssl/Callback.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/ssl/Callback.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin.plugins.ssl; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Callback { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/ssl/ClientAuth.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/ssl/ClientAuth.java index 8f84b21773..ddc45999e9 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/ssl/ClientAuth.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/ssl/ClientAuth.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin.plugins.ssl; @@ -28,7 +29,7 @@ * 配置引擎请求客户端验证 此选项只对服务器模式的引擎有用 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum ClientAuth { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/ssl/Completion.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/ssl/Completion.java index 729c0d797a..6b259755eb 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/ssl/Completion.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/ssl/Completion.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin.plugins.ssl; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ class Completion implements CompletionHandler { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/ssl/Handshake.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/ssl/Handshake.java index 3707f3a500..e272fd5abe 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/ssl/Handshake.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/ssl/Handshake.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin.plugins.ssl; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Handshake { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/ssl/SSLConfig.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/ssl/SSLConfig.java index 390923585f..47d8644df4 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/ssl/SSLConfig.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/ssl/SSLConfig.java @@ -21,12 +21,13 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin.plugins.ssl; /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SSLConfig { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/ssl/SSLService.java b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/ssl/SSLService.java index 0f5b8cb478..cd123c44d0 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/ssl/SSLService.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/origin/plugins/ssl/SSLService.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.origin.plugins.ssl; @@ -40,7 +41,7 @@ * TLS/SSL服务 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SSLService { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/spring/config/AbstractMessageBrokerConfigurer.java b/bus-socket/src/main/java/org/aoju/bus/socket/spring/config/AbstractMessageBrokerConfigurer.java index 8aafa95a28..f16346c056 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/spring/config/AbstractMessageBrokerConfigurer.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/spring/config/AbstractMessageBrokerConfigurer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.spring.config; @@ -30,7 +31,7 @@ * 增加消息拦截器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractMessageBrokerConfigurer { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/spring/extension/MessageConfiguration.java b/bus-socket/src/main/java/org/aoju/bus/socket/spring/extension/MessageConfiguration.java index f87693e60a..ce7f6fb76b 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/spring/extension/MessageConfiguration.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/spring/extension/MessageConfiguration.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.spring.extension; @@ -37,7 +38,7 @@ * 代替默认的{@link WebMvcStompEndpointRegistry} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MessageConfiguration extends DelegatingWebSocketMessageBrokerConfiguration { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/spring/extension/StompEndpointRegistry.java b/bus-socket/src/main/java/org/aoju/bus/socket/spring/extension/StompEndpointRegistry.java index 5f3fbe7bee..ae707299cd 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/spring/extension/StompEndpointRegistry.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/spring/extension/StompEndpointRegistry.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.spring.extension; @@ -54,7 +55,7 @@ * 代替{@link WebMvcStompEndpointRegistry} * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class StompEndpointRegistry extends WebMvcStompEndpointRegistry { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/spring/extension/StompSubProtocolHandler.java b/bus-socket/src/main/java/org/aoju/bus/socket/spring/extension/StompSubProtocolHandler.java index 54ca31f5c4..c345fd9b18 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/spring/extension/StompSubProtocolHandler.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/spring/extension/StompSubProtocolHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.spring.extension; @@ -49,7 +50,7 @@ * 增加了对拦截器的支持 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class StompSubProtocolHandler extends org.springframework.web.socket.messaging.StompSubProtocolHandler { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/spring/intercept/FromClientExecutionChain.java b/bus-socket/src/main/java/org/aoju/bus/socket/spring/intercept/FromClientExecutionChain.java index 9eb6d2b595..bb37d887cd 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/spring/intercept/FromClientExecutionChain.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/spring/intercept/FromClientExecutionChain.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.spring.intercept; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FromClientExecutionChain { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/spring/intercept/FromClientInterceptor.java b/bus-socket/src/main/java/org/aoju/bus/socket/spring/intercept/FromClientInterceptor.java index 0c7c4dcf15..97fbf660ba 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/spring/intercept/FromClientInterceptor.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/spring/intercept/FromClientInterceptor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.spring.intercept; @@ -34,7 +35,7 @@ * 拦截客户端发来的消息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface FromClientInterceptor { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/spring/intercept/ToClientExecutionChain.java b/bus-socket/src/main/java/org/aoju/bus/socket/spring/intercept/ToClientExecutionChain.java index dc85f955e7..a3c223cb40 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/spring/intercept/ToClientExecutionChain.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/spring/intercept/ToClientExecutionChain.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.spring.intercept; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ToClientExecutionChain { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/spring/intercept/ToClientInterceptor.java b/bus-socket/src/main/java/org/aoju/bus/socket/spring/intercept/ToClientInterceptor.java index 1068c1e07c..f8effd3ebf 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/spring/intercept/ToClientInterceptor.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/spring/intercept/ToClientInterceptor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.spring.intercept; @@ -33,7 +34,7 @@ * 拦截发送给客户端的消息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface ToClientInterceptor { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/spring/support/MessageFrom.java b/bus-socket/src/main/java/org/aoju/bus/socket/spring/support/MessageFrom.java index 2bae801b16..da652f2dcc 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/spring/support/MessageFrom.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/spring/support/MessageFrom.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.spring.support; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/spring/support/MessageMatcher.java b/bus-socket/src/main/java/org/aoju/bus/socket/spring/support/MessageMatcher.java index c27733b005..417b425224 100755 --- a/bus-socket/src/main/java/org/aoju/bus/socket/spring/support/MessageMatcher.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/spring/support/MessageMatcher.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.socket.spring.support; @@ -40,7 +41,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MessageMatcher { diff --git a/bus-starter/README.md b/bus-starter/README.md index 6061a8ef96..d6ee349dbb 100755 --- a/bus-starter/README.md +++ b/bus-starter/README.md @@ -76,16 +76,16 @@ public class TestController { //以下三个请求路径都是/c, //通过header里的客户端类型(如果是从url参数取,修改TerminalVersionExpression即可)以及版本号路由到不同方法 @GetMapping("/c") - @ClientVersion(expression = {"1>6.1.1"}) - public String cvcheck1(){return "6.1.1以上版本的1类型";} + @ClientVersion(expression = {"1>6.1.2"}) + public String cvcheck1(){return "6.1.2以上版本的1类型";} @GetMapping("/c") - @ClientVersion({@TerminalVersion(terminals = 2,op= VersionOperator.GT,version = "6.1.1")}) - public String cvcheck2(){return "6.1.1以上版本的2类型";} + @ClientVersion({@TerminalVersion(terminals = 2,op= VersionOperator.GT,version = "6.1.2")}) + public String cvcheck2(){return "6.1.2以上版本的2类型";} @GetMapping("/c") - @ClientVersion({@TerminalVersion(terminals = 2,op= VersionOperator.LTE,version = "6.1.1")}) - public String cvcheck3(){return "6.1.1以下版本的2类型";} + @ClientVersion({@TerminalVersion(terminals = 2,op= VersionOperator.LTE,version = "6.1.2")}) + public String cvcheck3(){return "6.1.2以下版本的2类型";} public String c(){ return "aaaa"; diff --git a/bus-starter/pom.xml b/bus-starter/pom.xml index 17a92dd99a..078142785a 100755 --- a/bus-starter/pom.xml +++ b/bus-starter/pom.xml @@ -6,30 +6,55 @@ org.aoju bus-starter - 6.1.1 + 6.1.2 jar ${project.artifactId} Bus Starter https://github.com/aoju/bus + + + The MIT License (MIT) + https://opensource.org/licenses/MIT + + + + + scm:git@github.com:aoju/bus.git + scm:git@github.com:aoju/bus.git + git@github.com:aoju/bus.git + + + + + Kimi Liu + https://github.com/aoju/bus.git + + + + + Github Issue + https://github.com/aoju/bus/issues + + UTF-8 UTF-8 1.8 - 2.3.0.RELEASE - 1.18.12 - 1.2.73 - 1.9.5 + 2.4.0 + 1.18.16 + 1.2.75 + 1.9.6 2.2 - 29.0-jre + 30.0-jre 4.2.3 - 3.5.5 - 2.0.5 + 3.5.6 + 2.0.6 2.0.1.Final 3.1 - 8.0.21 - 1.1.24 + 8.0.22 + 1.2.3 2.7.8 4.0.1 @@ -240,8 +265,8 @@ true - spring org.springframework + spring-context @@ -257,6 +282,12 @@ ${spring.boot.version} true + + org.springframework.boot + spring-boot-starter-webflux + ${spring.boot.version} + true + org.springframework.boot spring-boot-starter-websocket @@ -265,31 +296,6 @@ - - - The MIT License (MIT) - https://opensource.org/licenses/MIT - - - - - scm:git@github.com:aoju/bus.git - scm:git@github.com:aoju/bus.git - git@github.com:aoju/bus.git - - - - - Kimi Liu - https://github.com/aoju/bus.git - - - - - Github Issue - https://github.com/aoju/bus/issues - - diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/BusXBuilder.java b/bus-starter/src/main/java/org/aoju/bus/starter/BusXBuilder.java index 087c365264..d1c3bb52f4 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/BusXBuilder.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/BusXBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter; @@ -28,7 +29,7 @@ * 全局常量配置 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BusXBuilder { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/BusXExtend.java b/bus-starter/src/main/java/org/aoju/bus/starter/BusXExtend.java index dda9cb105c..537499852b 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/BusXExtend.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/BusXExtend.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter; @@ -28,7 +29,7 @@ * 全局扩展配置 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BusXExtend { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/BusXHolder.java b/bus-starter/src/main/java/org/aoju/bus/starter/BusXHolder.java index f85681e928..48804e24d1 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/BusXHolder.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/BusXHolder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter; @@ -32,7 +33,7 @@ * 扫描包配置项及其他属性等 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ComponentScan("org.aoju.**") diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/Configurable.java b/bus-starter/src/main/java/org/aoju/bus/starter/Configurable.java index c713e17097..cc8a9098df 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/Configurable.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/Configurable.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter; @@ -40,7 +41,7 @@ * 将作为一个名为PropertiesPropertySource的属性源添加 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Order(Ordered.LOWEST_PRECEDENCE - 100) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/GenieBuilder.java b/bus-starter/src/main/java/org/aoju/bus/starter/GenieBuilder.java index d3162f4a6d..2e8dd6e8e6 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/GenieBuilder.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/GenieBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter; @@ -44,7 +45,7 @@ * 启动监听器,初始化相关配置 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class GenieBuilder implements diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/PlaceBinder.java b/bus-starter/src/main/java/org/aoju/bus/starter/PlaceBinder.java index 269858d0ef..05bff1b627 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/PlaceBinder.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/PlaceBinder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter; @@ -28,7 +29,7 @@ * 返回值信息处理. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface PlaceBinder { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/PlaceHandler.java b/bus-starter/src/main/java/org/aoju/bus/starter/PlaceHandler.java index 2c0120c8b3..cfd691bb24 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/PlaceHandler.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/PlaceHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter; @@ -35,7 +36,7 @@ * 拦截响应的代理 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PlaceHandler implements InvocationHandler { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/SpringAware.java b/bus-starter/src/main/java/org/aoju/bus/starter/SpringAware.java index e481b8ecb3..8e9489a872 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/SpringAware.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/SpringAware.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter; @@ -45,7 +46,7 @@ * * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Component diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/SpringBuilder.java b/bus-starter/src/main/java/org/aoju/bus/starter/SpringBuilder.java index 9400a70da0..f4b71f1fef 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/SpringBuilder.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/SpringBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter; @@ -56,7 +57,7 @@ * 设置相关系统参数信息. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Component diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/SpringHolder.java b/bus-starter/src/main/java/org/aoju/bus/starter/SpringHolder.java index 3b89cc0de5..8c33fb9fcd 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/SpringHolder.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/SpringHolder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter; @@ -28,7 +29,7 @@ * 上下文等信息持有者 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SpringHolder { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableCache.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableCache.java index 4cc6feb3eb..776949a333 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableCache.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.annotation; @@ -33,7 +34,7 @@ * 启用缓存 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableCors.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableCors.java index a5fb75a56e..2b4e6962ee 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableCors.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableCors.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.annotation; @@ -33,7 +34,7 @@ * 开启跨域支持 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableDruid.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableDruid.java index a146d7cb96..8d9985884f 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableDruid.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableDruid.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.annotation; @@ -33,7 +34,7 @@ * Druid 支持 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableDruids.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableDruids.java index 187e571668..aaff16f71e 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableDruids.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableDruids.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.annotation; @@ -34,7 +35,7 @@ * Druid 监控 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableDubbo.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableDubbo.java index adb000eb2a..6bf700d899 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableDubbo.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableDubbo.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.annotation; @@ -36,7 +37,7 @@ * Dubbo 支持 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableGoalie.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableGoalie.java index c1f7a7c073..949d3e0ad9 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableGoalie.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableGoalie.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.annotation; @@ -33,7 +34,7 @@ * 启用路由匹配 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableI18n.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableI18n.java index 7ba6830caf..7a37be2a70 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableI18n.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableI18n.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.annotation; @@ -34,7 +35,7 @@ * 开启国际化支持 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableImage.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableImage.java index 2c371b8d56..75e65bc6b3 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableImage.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableImage.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.annotation; @@ -33,7 +34,7 @@ * 启用图像解析 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableLimiter.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableLimiter.java index 8f2370812c..8f7314361a 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableLimiter.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableLimiter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.annotation; @@ -35,7 +36,7 @@ * 限流降级 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableMapper.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableMapper.java index 7d423bd4bd..816f8b59ea 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableMapper.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableMapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.annotation; @@ -35,7 +36,7 @@ * 开启 Mybatis/Mapper * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableNotify.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableNotify.java index 4f3ce89aa7..a1d1eada8a 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableNotify.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableNotify.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.annotation; @@ -33,7 +34,7 @@ * 启用消息通知 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableOAuth2.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableOAuth2.java index ea91315611..f305d1405f 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableOAuth2.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableOAuth2.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.annotation; @@ -33,7 +34,7 @@ * 启用第三方授权 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableOffice.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableOffice.java index babe15e27d..eaf5706fbc 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableOffice.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableOffice.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.annotation; @@ -33,7 +34,7 @@ * 启用在线预览 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableSensitive.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableSensitive.java index 6a104d1b32..159e0aa622 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableSensitive.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableSensitive.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.annotation; @@ -33,7 +34,7 @@ * 开启内容脱敏 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableSocket.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableSocket.java index 8e6ed56312..4577c42f8e 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableSocket.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableSocket.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.annotation; @@ -35,7 +36,7 @@ * 开启WebSocket * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableStorage.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableStorage.java index 185d07b935..4ad9c96d68 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableStorage.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableStorage.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.annotation; @@ -33,7 +34,7 @@ * 启用OSS存储 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableTracer.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableTracer.java index 1d065c17e4..4935f754f6 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableTracer.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableTracer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.annotation; @@ -33,7 +34,7 @@ * 开启跨域支持 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableValidate.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableValidate.java index c071a8c5b6..79959adf1e 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableValidate.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableValidate.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.annotation; @@ -33,7 +34,7 @@ * 启用数据校验 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableWrapper.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableWrapper.java index 38d283ed10..96ab755d63 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableWrapper.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableWrapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.annotation; @@ -33,7 +34,7 @@ * 开启 Request/Response 多次读取 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/banner/AbstractBanner.java b/bus-starter/src/main/java/org/aoju/bus/starter/banner/AbstractBanner.java index 8da3d3f4ff..95248b7b4d 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/banner/AbstractBanner.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/banner/AbstractBanner.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.banner; @@ -34,7 +35,7 @@ * 旗标生成器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractBanner { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/banner/BusBanner.java b/bus-starter/src/main/java/org/aoju/bus/starter/banner/BusBanner.java index cbdaf391d5..af35927a55 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/banner/BusBanner.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/banner/BusBanner.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.banner; @@ -38,7 +39,7 @@ * 旗标生成器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BusBanner implements Banner { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/banner/Description.java b/bus-starter/src/main/java/org/aoju/bus/starter/banner/Description.java index 02b904eaae..6de58eda43 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/banner/Description.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/banner/Description.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.banner; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/banner/ImageBanner.java b/bus-starter/src/main/java/org/aoju/bus/starter/banner/ImageBanner.java index 4f82802772..372e8490fe 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/banner/ImageBanner.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/banner/ImageBanner.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.banner; @@ -42,7 +43,7 @@ * ASCII艺术产生的图像文件 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ImageBanner { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/banner/VersionBanner.java b/bus-starter/src/main/java/org/aoju/bus/starter/banner/VersionBanner.java index bf488bc927..6365894a4d 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/banner/VersionBanner.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/banner/VersionBanner.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.banner; @@ -28,7 +29,7 @@ * 版本旗标生成 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class VersionBanner extends AbstractBanner { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/cache/AspectjCacheProxy.java b/bus-starter/src/main/java/org/aoju/bus/starter/cache/AspectjCacheProxy.java index 98bf1b9812..b469a1ba6d 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/cache/AspectjCacheProxy.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/cache/AspectjCacheProxy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.cache; @@ -44,7 +45,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Aspect diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/cache/CacheConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/cache/CacheConfiguration.java index 88b1ba2cc2..4b8572090b 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/cache/CacheConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/cache/CacheConfiguration.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.cache; @@ -37,7 +38,7 @@ * 缓存配置 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @EnableConfigurationProperties(value = {CacheProperties.class}) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/cache/CacheProperties.java b/bus-starter/src/main/java/org/aoju/bus/starter/cache/CacheProperties.java index b2bc10f14d..359b3ab472 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/cache/CacheProperties.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/cache/CacheProperties.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.cache; @@ -36,7 +37,7 @@ * 缓存相关配置 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/cache/CacheXProxy.java b/bus-starter/src/main/java/org/aoju/bus/starter/cache/CacheXProxy.java index 1b5c52ed94..0f8ded6ef3 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/cache/CacheXProxy.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/cache/CacheXProxy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.cache; @@ -42,7 +43,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CacheXProxy implements FactoryBean { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/cors/CorsConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/cors/CorsConfiguration.java index f37b8b3398..13999f6742 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/cors/CorsConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/cors/CorsConfiguration.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.cors; @@ -39,7 +40,7 @@ * Cors 跨域支持 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @EnableConfigurationProperties(value = {CorsProperties.class}) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/cors/CorsProperties.java b/bus-starter/src/main/java/org/aoju/bus/starter/cors/CorsProperties.java index 6454e9f881..d100a6d1e6 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/cors/CorsProperties.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/cors/CorsProperties.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.cors; @@ -33,7 +34,7 @@ * Core 跨域相关配置 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/druid/AspectjDruidProxy.java b/bus-starter/src/main/java/org/aoju/bus/starter/druid/AspectjDruidProxy.java index 3e9bb3b633..4c924e1a41 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/druid/AspectjDruidProxy.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/druid/AspectjDruidProxy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.druid; @@ -39,7 +40,7 @@ * AOP切面切点 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Order(-1) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/druid/DataSource.java b/bus-starter/src/main/java/org/aoju/bus/starter/druid/DataSource.java index e463555a7e..d7fe31d47c 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/druid/DataSource.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/druid/DataSource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.druid; @@ -30,7 +31,7 @@ * 多数据源支持 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Target({ElementType.METHOD, ElementType.TYPE, ElementType.PARAMETER}) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/druid/DataSourceHolder.java b/bus-starter/src/main/java/org/aoju/bus/starter/druid/DataSourceHolder.java index 1f2c55c3f6..c9bd5f081c 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/druid/DataSourceHolder.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/druid/DataSourceHolder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.druid; @@ -43,7 +44,7 @@ * 数据源信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DataSourceHolder { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/druid/DruidConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/druid/DruidConfiguration.java index aaba96dff4..ea0496f534 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/druid/DruidConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/druid/DruidConfiguration.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.druid; @@ -59,7 +60,7 @@ * 数据源配置 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ConditionalOnClass(DruidDataSource.class) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/druid/DruidMonitorConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/druid/DruidMonitorConfiguration.java index 49a007d982..ff2676d337 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/druid/DruidMonitorConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/druid/DruidMonitorConfiguration.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.druid; @@ -42,7 +43,7 @@ * Druid 监控配置 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ConditionalOnClass(DruidDataSource.class) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/druid/DruidMonitorProperties.java b/bus-starter/src/main/java/org/aoju/bus/starter/druid/DruidMonitorProperties.java index 9d6335144c..87117e7cae 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/druid/DruidMonitorProperties.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/druid/DruidMonitorProperties.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.druid; @@ -32,7 +33,7 @@ * Druid 监控配置项 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/druid/DruidProperties.java b/bus-starter/src/main/java/org/aoju/bus/starter/druid/DruidProperties.java index 540f4396ce..a679738e3f 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/druid/DruidProperties.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/druid/DruidProperties.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.druid; @@ -34,7 +35,7 @@ * Druid 配置项 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/druid/DynamicDataSource.java b/bus-starter/src/main/java/org/aoju/bus/starter/druid/DynamicDataSource.java index b7f2cabfe9..4cde83b8d9 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/druid/DynamicDataSource.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/druid/DynamicDataSource.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.druid; @@ -38,7 +39,7 @@ * 多数据源支持 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DynamicDataSource extends AbstractRoutingDataSource { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/dubbo/DubboConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/dubbo/DubboConfiguration.java index 5486cae669..beae44cdf7 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/dubbo/DubboConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/dubbo/DubboConfiguration.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.dubbo; @@ -30,7 +31,7 @@ * Dubbo自动配置 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @EnableConfigurationProperties(value = {DubboProperties.class}) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/dubbo/DubboProperties.java b/bus-starter/src/main/java/org/aoju/bus/starter/dubbo/DubboProperties.java index fc5458fe14..432c334f64 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/dubbo/DubboProperties.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/dubbo/DubboProperties.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.dubbo; @@ -34,7 +35,7 @@ * Dubbo配置项 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/goalie/GoalieConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/goalie/GoalieConfiguration.java index 25847ba4ae..c024b420ab 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/goalie/GoalieConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/goalie/GoalieConfiguration.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.goalie; @@ -34,7 +35,7 @@ * 路由自动配置 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8++ */ @ConditionalOnWebApplication diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/goalie/GoalieProperties.java b/bus-starter/src/main/java/org/aoju/bus/starter/goalie/GoalieProperties.java index 6c2c89b55f..d0b80936eb 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/goalie/GoalieProperties.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/goalie/GoalieProperties.java @@ -21,22 +21,53 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.goalie; import lombok.Data; import org.aoju.bus.starter.BusXExtend; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.context.properties.EnableConfigurationProperties; /** * 路由配置 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data +@EnableConfigurationProperties(GoalieProperties.Server.class) @ConfigurationProperties(BusXExtend.GOALIE) public class GoalieProperties { + private Server server; + + @EnableConfigurationProperties({Server.Encrypt.class, Server.Decrypt.class}) + @ConfigurationProperties(prefix = BusXExtend.GOALIE + ".server") + @Data + public static class Server { + private String path; + private int port; + private Encrypt encrypt; + private Decrypt decrypt; + + @Data + @ConfigurationProperties(prefix = BusXExtend.GOALIE + ".server.encrypt") + public static class Encrypt { + private boolean enabled; + private String key; + private String type; + } + + @Data + @ConfigurationProperties(prefix = BusXExtend.GOALIE + ".server.decrypt") + public static class Decrypt { + private boolean enabled; + private String key; + private String type; + } + } + } diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/goalie/ReactorConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/goalie/ReactorConfiguration.java new file mode 100644 index 0000000000..895c79c96c --- /dev/null +++ b/bus-starter/src/main/java/org/aoju/bus/starter/goalie/ReactorConfiguration.java @@ -0,0 +1,105 @@ +/********************************************************************************* + * * + * The MIT License (MIT) * + * * + * Copyright (c) 2015-2020 aoju.org and other contributors. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy * + * of this software and associated documentation files (the "Software"), to deal * + * in the Software without restriction, including without limitation the rights * + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * + * THE SOFTWARE. * + * * + ********************************************************************************/ +package org.aoju.bus.starter.goalie; + +import org.aoju.bus.core.toolkit.CollKit; +import org.aoju.bus.goalie.reactor.AssetRegistry; +import org.aoju.bus.goalie.reactor.Athlete; +import org.aoju.bus.goalie.reactor.GlobalExceptionHandler; +import org.aoju.bus.goalie.reactor.RouterHandler; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.core.annotation.AnnotationAwareOrderComparator; +import org.springframework.http.MediaType; +import org.springframework.http.server.reactive.HttpHandler; +import org.springframework.http.server.reactive.ReactorHttpHandlerAdapter; +import org.springframework.web.reactive.function.server.*; +import org.springframework.web.server.WebExceptionHandler; +import org.springframework.web.server.WebFilter; +import reactor.netty.http.server.HttpServer; + +import java.util.List; + +/** + * @author Justubborn + * @since 2020/10/27 + */ +@ConditionalOnWebApplication +@EnableConfigurationProperties(value = {GoalieProperties.class}) +public class ReactorConfiguration { + + @Autowired + GoalieProperties goalieProperties; + + @Autowired(required = false) + List assetRegistries; + + @Autowired(required = false) + List webExceptionHandlers; + + @Autowired(required = false) + List webFilters; + + @Bean + WebExceptionHandler webExceptionHandler() { + return new GlobalExceptionHandler(); + } + + @Bean(initMethod = "init", destroyMethod = "destroy") + Athlete athlete() { + + RouterHandler routerHandler = new RouterHandler(); + + RouterFunction routerFunction = RouterFunctions + .route(RequestPredicates.path(goalieProperties.getServer().getPath()) + .and(RequestPredicates.accept(MediaType.APPLICATION_FORM_URLENCODED)), routerHandler::handle); + + HandlerStrategies.Builder builder = HandlerStrategies.builder(); + + if (CollKit.isNotEmpty(webExceptionHandlers)) { + AnnotationAwareOrderComparator.sort(webExceptionHandlers); + webExceptionHandlers.forEach(builder::exceptionHandler); + } + + if (CollKit.isNotEmpty(webFilters)) { + AnnotationAwareOrderComparator.sort(webFilters); + webFilters.forEach(builder::webFilter); + } + + HandlerStrategies handlerStrategies = builder.build(); + + + HttpHandler handler = RouterFunctions.toHttpHandler(routerFunction, handlerStrategies); + ReactorHttpHandlerAdapter adapter = new ReactorHttpHandlerAdapter(handler); + HttpServer server = HttpServer.create() + .port(goalieProperties.getServer().getPort()).handle(adapter); + + return new Athlete(server, assetRegistries); + } + +} diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/AuthFilter.java b/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/AuthFilter.java new file mode 100644 index 0000000000..1a6ab2ccfd --- /dev/null +++ b/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/AuthFilter.java @@ -0,0 +1,84 @@ +/********************************************************************************* + * * + * The MIT License (MIT) * + * * + * Copyright (c) 2015-2020 aoju.org and other contributors. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy * + * of this software and associated documentation files (the "Software"), to deal * + * in the Software without restriction, including without limitation the rights * + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * + * THE SOFTWARE. * + * * + ********************************************************************************/ +package org.aoju.bus.starter.goalie.filter; + +import org.aoju.bus.base.consts.ErrorCode; +import org.aoju.bus.base.entity.OAuth2; +import org.aoju.bus.core.lang.exception.BusinessException; +import org.aoju.bus.core.toolkit.BeanKit; +import org.aoju.bus.goalie.reactor.Asset; +import org.aoju.bus.goalie.reactor.Constant; +import org.aoju.bus.goalie.reactor.ExchangeContext; +import org.aoju.bus.goalie.reactor.login.AuthProvider; +import org.aoju.bus.goalie.reactor.login.LoginResponse; +import org.aoju.bus.starter.goalie.ReactorConfiguration; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; +import org.springframework.web.server.ServerWebExchange; +import org.springframework.web.server.WebFilter; +import org.springframework.web.server.WebFilterChain; +import reactor.core.publisher.Mono; + +import java.util.Map; + +/** + * 权限认证 + * + * @author Justubborn + * @since 2020/11/6 + */ +@Component +@ConditionalOnBean(ReactorConfiguration.class) +@Order(FilterOrders.AUTH) +public class AuthFilter implements WebFilter { + + @Autowired + AuthProvider provider; + + @Override + public Mono filter(ServerWebExchange exchange, WebFilterChain chain) { + ExchangeContext context = ExchangeContext.get(exchange); + Asset asset = context.getAsset(); + Map requestMap = context.getRequestMap(); + if (asset.isToken()) { + String token = exchange.getRequest().getHeaders().getFirst(Constant.X_ACCESS_TOKEN); + LoginResponse response = provider.authorize(token); + if (response.isOk()) { + OAuth2 auth2 = response.getOAuth2(); + Map map = BeanKit.beanToMap(auth2, false, true); + map.forEach((k, v) -> requestMap.put(k, v.toString())); + } else { + throw new BusinessException(ErrorCode.EM_FAILURE, response.getMessage().errmsg); + } + + + } + return chain.filter(exchange); + } + +} diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/DecryptFilter.java b/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/DecryptFilter.java new file mode 100644 index 0000000000..474ad6b5ff --- /dev/null +++ b/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/DecryptFilter.java @@ -0,0 +1,75 @@ +/********************************************************************************* + * * + * The MIT License (MIT) * + * * + * Copyright (c) 2015-2020 aoju.org and other contributors. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy * + * of this software and associated documentation files (the "Software"), to deal * + * in the Software without restriction, including without limitation the rights * + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * + * THE SOFTWARE. * + * * + ********************************************************************************/ +package org.aoju.bus.starter.goalie.filter; + +import org.aoju.bus.core.lang.Charset; +import org.aoju.bus.goalie.reactor.ExchangeContext; +import org.aoju.bus.starter.goalie.GoalieProperties; +import org.aoju.bus.starter.goalie.ReactorConfiguration; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; +import org.springframework.web.server.ServerWebExchange; +import org.springframework.web.server.WebFilter; +import org.springframework.web.server.WebFilterChain; +import reactor.core.publisher.Mono; + +import java.util.Map; + +/** + * 解密 + * + * @author Justubborn + * @since 2020/11/7 + */ +@Component +@ConditionalOnBean(ReactorConfiguration.class) +@Order(FilterOrders.DECRYPT) +public class DecryptFilter implements WebFilter { + @Autowired + GoalieProperties.Server.Decrypt decrypt; + + @Override + public Mono filter(ServerWebExchange exchange, WebFilterChain chain) { + ServerWebExchange.Builder builder = exchange.mutate(); + if (decrypt.isEnabled()) { + doDecrypt(ExchangeContext.get(exchange).getRequestMap()); + } + + return chain.filter(builder.build()); + } + + /** + * 解密 + * + * @param map 参数 + */ + private void doDecrypt(Map map) { + map.forEach((k, v) -> map.put(k, org.aoju.bus.crypto.Builder.decrypt(decrypt.getType(), decrypt.getKey(), v, Charset.UTF_8))); + } + +} diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/EncryptFilter.java b/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/EncryptFilter.java new file mode 100644 index 0000000000..26871c2d14 --- /dev/null +++ b/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/EncryptFilter.java @@ -0,0 +1,98 @@ +/********************************************************************************* + * * + * The MIT License (MIT) * + * * + * Copyright (c) 2015-2020 aoju.org and other contributors. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy * + * of this software and associated documentation files (the "Software"), to deal * + * in the Software without restriction, including without limitation the rights * + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * + * THE SOFTWARE. * + * * + ********************************************************************************/ +package org.aoju.bus.starter.goalie.filter; + +import com.alibaba.fastjson.JSON; +import org.aoju.bus.base.entity.Message; +import org.aoju.bus.core.lang.Charset; +import org.aoju.bus.core.toolkit.ObjectKit; +import org.aoju.bus.goalie.reactor.ExchangeContext; +import org.aoju.bus.starter.goalie.GoalieProperties; +import org.aoju.bus.starter.goalie.ReactorConfiguration; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; +import org.springframework.core.annotation.Order; +import org.springframework.core.io.buffer.DataBuffer; +import org.springframework.http.server.reactive.ServerHttpResponse; +import org.springframework.stereotype.Component; +import org.springframework.web.server.ServerWebExchange; +import org.springframework.web.server.WebFilter; +import org.springframework.web.server.WebFilterChain; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + +/** + * 加密拦截 + * + * @author Justubborn + * @since 2020/10/29 + */ +@Component +@ConditionalOnBean(ReactorConfiguration.class) +@Order(FilterOrders.ENCRYPT) +public class EncryptFilter implements WebFilter { + + @Autowired + GoalieProperties.Server.Encrypt encrypt; + + @Override + public Mono filter(ServerWebExchange exchange, WebFilterChain chain) { + + + Mono mono = chain.filter(exchange); + if (encrypt.isEnabled()) { + return mono.then(Mono.defer(() -> { + boolean isSign = ExchangeContext.get(exchange).getAsset().isSign(); + Flux body = ExchangeContext.get(exchange).getBody(); + return Mono.from(body).flatMap(dataBuffer -> { + if (isSign && dataBuffer instanceof Message) { + Message message = (Message) dataBuffer; + doEncrypt(message); + ServerHttpResponse response = exchange.getResponse(); + + return response + .writeWith(Mono.just(response.bufferFactory().wrap(JSON.toJSONString(message).getBytes()))); + } + return mono; + }); + + })); + } + return mono; + } + + /** + * 加密 + * + * @param message 消息 + */ + private void doEncrypt(Message message) { + if (ObjectKit.isNotNull(message.getData())) { + message.setData(org.aoju.bus.crypto.Builder.encrypt(encrypt.getType(), encrypt.getKey(), JSON.toJSONString(message.getData()), Charset.UTF_8)); + } + } + +} diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/FilterOrders.java b/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/FilterOrders.java new file mode 100644 index 0000000000..9335abf251 --- /dev/null +++ b/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/FilterOrders.java @@ -0,0 +1,46 @@ +/********************************************************************************* + * * + * The MIT License (MIT) * + * * + * Copyright (c) 2015-2020 aoju.org and other contributors. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy * + * of this software and associated documentation files (the "Software"), to deal * + * in the Software without restriction, including without limitation the rights * + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * + * THE SOFTWARE. * + * * + ********************************************************************************/ +package org.aoju.bus.starter.goalie.filter; + +import org.springframework.core.Ordered; + +/** + * @author Justubborn + * @since 2020/11/7 + */ +public interface FilterOrders { + + // 前置 + int FIRST = Ordered.HIGHEST_PRECEDENCE; + int DECRYPT = FIRST + 1; + int PARAMETER_CHECK = DECRYPT + 1; + int PERMISSION = PARAMETER_CHECK + 1; + int AUTH = PERMISSION + 1; + + // 后置 + int ENCRYPT = Ordered.LOWEST_PRECEDENCE - 1; + +} diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/FirstFilter.java b/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/FirstFilter.java new file mode 100644 index 0000000000..cafc784e79 --- /dev/null +++ b/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/FirstFilter.java @@ -0,0 +1,69 @@ +/********************************************************************************* + * * + * The MIT License (MIT) * + * * + * Copyright (c) 2015-2020 aoju.org and other contributors. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy * + * of this software and associated documentation files (the "Software"), to deal * + * in the Software without restriction, including without limitation the rights * + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * + * THE SOFTWARE. * + * * + ********************************************************************************/ +package org.aoju.bus.starter.goalie.filter; + +import org.aoju.bus.goalie.reactor.ExchangeContext; +import org.aoju.bus.starter.goalie.ReactorConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; +import org.springframework.core.annotation.Order; +import org.springframework.http.HttpMethod; +import org.springframework.http.server.reactive.ServerHttpRequest; +import org.springframework.stereotype.Component; +import org.springframework.util.MultiValueMap; +import org.springframework.web.server.ServerWebExchange; +import org.springframework.web.server.WebFilter; +import org.springframework.web.server.WebFilterChain; +import reactor.core.publisher.Mono; + +import java.util.Objects; + +/** + * 参数过滤 + * + * @author Justubborn + * @since 2020/10/29 + */ +@Component +@ConditionalOnBean(ReactorConfiguration.class) +@Order(FilterOrders.FIRST) +public class FirstFilter implements WebFilter { + + @Override + public Mono filter(ServerWebExchange exchange, WebFilterChain chain) { + ServerHttpRequest request = exchange.getRequest(); + if (Objects.equals(request.getMethod(), HttpMethod.GET)) { + MultiValueMap params = request.getQueryParams(); + ExchangeContext.get(exchange).setRequestMap(params.toSingleValueMap()); + return chain.filter(exchange); + } else { + return exchange.getFormData().flatMap(params -> { + ExchangeContext.get(exchange).setRequestMap(params.toSingleValueMap()); + return chain.filter(exchange); + }); + } + } + +} diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/ParameterCheckFilter.java b/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/ParameterCheckFilter.java new file mode 100644 index 0000000000..e3af4b578c --- /dev/null +++ b/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/ParameterCheckFilter.java @@ -0,0 +1,70 @@ +/********************************************************************************* + * * + * The MIT License (MIT) * + * * + * Copyright (c) 2015-2020 aoju.org and other contributors. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy * + * of this software and associated documentation files (the "Software"), to deal * + * in the Software without restriction, including without limitation the rights * + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * + * THE SOFTWARE. * + * * + ********************************************************************************/ +package org.aoju.bus.starter.goalie.filter; + +import org.aoju.bus.base.consts.ErrorCode; +import org.aoju.bus.core.lang.exception.BusinessException; +import org.aoju.bus.core.toolkit.StringKit; +import org.aoju.bus.goalie.reactor.Constant; +import org.aoju.bus.goalie.reactor.ExchangeContext; +import org.aoju.bus.starter.goalie.ReactorConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; +import org.springframework.web.server.ServerWebExchange; +import org.springframework.web.server.WebFilter; +import org.springframework.web.server.WebFilterChain; +import reactor.core.publisher.Mono; + +import java.util.Map; + +/** + * 参数检查 + * + * @author Justubborn + * @since 2020/11/6 + */ +@Component +@ConditionalOnBean(ReactorConfiguration.class) +@Order(FilterOrders.PARAMETER_CHECK) +public class ParameterCheckFilter implements WebFilter { + + @Override + public Mono filter(ServerWebExchange exchange, WebFilterChain chain) { + + ExchangeContext context = ExchangeContext.get(exchange); + Map params = context.getRequestMap(); + + if (StringKit.isBlank(params.get(Constant.METHOD))) { + throw new BusinessException(ErrorCode.EM_100108); + } + if (StringKit.isBlank(params.get(Constant.VERSION))) { + throw new BusinessException(ErrorCode.EM_100107); + } + return chain.filter(exchange); + } + +} diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/PermissionFilter.java b/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/PermissionFilter.java new file mode 100644 index 0000000000..bae4fb328b --- /dev/null +++ b/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/PermissionFilter.java @@ -0,0 +1,91 @@ +/********************************************************************************* + * * + * The MIT License (MIT) * + * * + * Copyright (c) 2015-2020 aoju.org and other contributors. * + * * + * Permission is hereby granted, free of charge, to any person obtaining a copy * + * of this software and associated documentation files (the "Software"), to deal * + * in the Software without restriction, including without limitation the rights * + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included in * + * all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * + * THE SOFTWARE. * + * * + ********************************************************************************/ +package org.aoju.bus.starter.goalie.filter; + +import org.aoju.bus.base.consts.ErrorCode; +import org.aoju.bus.core.lang.exception.BusinessException; +import org.aoju.bus.goalie.reactor.Asset; +import org.aoju.bus.goalie.reactor.Athlete; +import org.aoju.bus.goalie.reactor.Constant; +import org.aoju.bus.goalie.reactor.ExchangeContext; +import org.aoju.bus.starter.goalie.ReactorConfiguration; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; +import org.springframework.web.server.ServerWebExchange; +import org.springframework.web.server.WebFilter; +import org.springframework.web.server.WebFilterChain; +import reactor.core.publisher.Mono; + +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * 鉴权 + * + * @author Justubborn + * @since 2020/11/7 + */ +@Component +@ConditionalOnBean(ReactorConfiguration.class) +@Order(FilterOrders.PERMISSION) +public class PermissionFilter implements WebFilter { + + @Autowired + Athlete athlete; + + @Override + public Mono filter(ServerWebExchange exchange, WebFilterChain chain) { + ExchangeContext context = ExchangeContext.get(exchange); + + Map params = context.getRequestMap(); + + String method = params.get(Constant.METHOD); + String version = params.get(Constant.VERSION); + + Set assets = athlete.getAssets(); + + List assetsList = assets.parallelStream() + .filter(asset -> Objects.equals(method, asset.getMethod())).collect(Collectors.toList()); + + if (assetsList.size() < 1) { + return Mono.error(new BusinessException(ErrorCode.EM_100103)); + } + + Asset asset = assetsList.parallelStream() + .filter(c -> Objects.equals(version, c.getVersion())).findFirst() + .orElseThrow(() -> new BusinessException(ErrorCode.EM_100102)); + + context.setAsset(asset); + + return chain.filter(exchange); + } + +} diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/i18n/I18nConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/i18n/I18nConfiguration.java index c96e3c9e45..377e6f5fc1 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/i18n/I18nConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/i18n/I18nConfiguration.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.i18n; @@ -38,7 +39,7 @@ * 国际化配置 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @EnableConfigurationProperties(value = {I18nProperties.class}) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/i18n/I18nProperties.java b/bus-starter/src/main/java/org/aoju/bus/starter/i18n/I18nProperties.java index d6ec3bd864..7c1f489567 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/i18n/I18nProperties.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/i18n/I18nProperties.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.i18n; @@ -32,7 +33,7 @@ * 国际化资源配置属性 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/i18n/LocaleMessage.java b/bus-starter/src/main/java/org/aoju/bus/starter/i18n/LocaleMessage.java index 82a9d492b5..52f57726bf 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/i18n/LocaleMessage.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/i18n/LocaleMessage.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.i18n; @@ -34,7 +35,7 @@ * key = value * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Component diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/image/ImageConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/image/ImageConfiguration.java index f70a4be455..ad29eea21b 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/image/ImageConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/image/ImageConfiguration.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.image; @@ -38,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @EnableConfigurationProperties(value = {ImageProperties.class}) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/image/ImageProperties.java b/bus-starter/src/main/java/org/aoju/bus/starter/image/ImageProperties.java index 2cf4d19022..69b48dcb75 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/image/ImageProperties.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/image/ImageProperties.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.image; @@ -32,7 +33,7 @@ * 影像解析配置 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/limiter/AbstractLimiterAware.java b/bus-starter/src/main/java/org/aoju/bus/starter/limiter/AbstractLimiterAware.java index 3b6c4a1dd9..99ad066e8e 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/limiter/AbstractLimiterAware.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/limiter/AbstractLimiterAware.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.limiter; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractLimiterAware implements ImportAware { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/limiter/LimiterAwareHandler.java b/bus-starter/src/main/java/org/aoju/bus/starter/limiter/LimiterAwareHandler.java index 7401c1b7f0..7cdfcf3229 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/limiter/LimiterAwareHandler.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/limiter/LimiterAwareHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.limiter; @@ -48,7 +49,7 @@ * 限流配置 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Role(BeanDefinition.ROLE_INFRASTRUCTURE) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/limiter/LimiterConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/limiter/LimiterConfiguration.java index 5f022898f1..e8c681c290 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/limiter/LimiterConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/limiter/LimiterConfiguration.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.limiter; @@ -36,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class LimiterConfiguration extends AdviceModeImportSelector { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/AbstractSqlParserHandler.java b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/AbstractSqlParserHandler.java index 7c0f366d7e..b40d006798 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/AbstractSqlParserHandler.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/AbstractSqlParserHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.mapper; @@ -46,7 +47,7 @@ * 抽象 SQL 解析类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractSqlParserHandler extends AbstractSqlHandler { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/ExplainSQLHandler.java b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/ExplainSQLHandler.java index 7e8df95f2d..384f35bc38 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/ExplainSQLHandler.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/ExplainSQLHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.mapper; @@ -28,6 +29,7 @@ import net.sf.jsqlparser.parser.CCJSqlParserUtil; import net.sf.jsqlparser.statement.Statement; import net.sf.jsqlparser.statement.Statements; +import org.aoju.bus.core.lang.Symbol; import org.aoju.bus.core.lang.exception.InstrumentException; import org.apache.ibatis.executor.Executor; import org.apache.ibatis.executor.statement.CallableStatementHandler; @@ -44,7 +46,7 @@ * 防止全表更新与删除 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Intercepts({@Signature(type = Executor.class, method = "update", args = {MappedStatement.class, Object.class})}) @@ -65,7 +67,7 @@ public Object intercept(Invocation invocation) throws Throwable { boolean sqlChangedFlag = false; MetaObject metaObject = SystemMetaObject.forObject(realTarget(SystemMetaObject.forObject(handler).getOriginalObject())); - String sql = (String) metaObject.getValue(DELEGATE_BOUNDSQL_SQL); + String sql = ((String) metaObject.getValue(DELEGATE_BOUNDSQL_SQL)).replaceAll("[\\s]+", Symbol.SPACE); if (this.allowProcess(metaObject)) { try { StringBuilder sqlStringBuilder = new StringBuilder(); diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/IllegalSQLHandler.java b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/IllegalSQLHandler.java index 98ba39c6ef..eda8dd1a7b 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/IllegalSQLHandler.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/IllegalSQLHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.mapper; @@ -82,7 +83,7 @@ *

        7.where条件使用了 使用子查询

        * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Intercepts({@Signature(type = StatementHandler.class, method = "prepare", args = {Connection.class, Integer.class})}) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MapperClassScanner.java b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MapperClassScanner.java index f4794c753d..569a021061 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MapperClassScanner.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MapperClassScanner.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.mapper; @@ -38,7 +39,7 @@ * mapper 注册扫描 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MapperClassScanner extends MapperScannerConfigurer { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MapperConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MapperConfiguration.java index d2ef5ba6e1..57939a209f 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MapperConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MapperConfiguration.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.mapper; @@ -35,7 +36,7 @@ * mapper 扫描配置类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @AutoConfigureAfter(MybatisConfiguration.class) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MapperFactoryBean.java b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MapperFactoryBean.java index 66d33afee7..53f3835289 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MapperFactoryBean.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MapperFactoryBean.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.mapper; @@ -36,7 +37,7 @@ * 增加mapperBuilder * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MapperFactoryBean extends SqlSessionDaoSupport diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MybatisConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MybatisConfiguration.java index cc7b901f97..6d33f5d41f 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MybatisConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MybatisConfiguration.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.mapper; @@ -44,7 +45,7 @@ * mybatis 配置 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @EnableConfigurationProperties(value = {MybatisProperties.class}) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MybatisPluginBuilder.java b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MybatisPluginBuilder.java index fcdbeeffa7..fa28300ef0 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MybatisPluginBuilder.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MybatisPluginBuilder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.mapper; @@ -40,7 +41,7 @@ * mybatis 插件启用 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MybatisPluginBuilder { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MybatisProperties.java b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MybatisProperties.java index ef92506ef1..d1bcd41145 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MybatisProperties.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MybatisProperties.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.mapper; @@ -32,7 +33,7 @@ * mybatis配置项 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/NatureSQLHandler.java b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/NatureSQLHandler.java index 83ddfdb45b..cc0dba1410 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/NatureSQLHandler.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/NatureSQLHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.mapper; @@ -52,7 +53,7 @@ * 数据库操作性能拦截器,记录耗时 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Intercepts(value = { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/RecordTimeHandler.java b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/RecordTimeHandler.java index f9c875975c..5385176e42 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/RecordTimeHandler.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/RecordTimeHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.mapper; @@ -58,7 +59,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Intercepts({ diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/notify/NotifyConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/notify/NotifyConfiguration.java index bcd8c7b29c..c8f577b76f 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/notify/NotifyConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/notify/NotifyConfiguration.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.notify; @@ -31,7 +32,7 @@ * 消息通知配置 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @EnableConfigurationProperties(value = {NotifyProperties.class}) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/notify/NotifyProperties.java b/bus-starter/src/main/java/org/aoju/bus/starter/notify/NotifyProperties.java index 09854da159..600d792557 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/notify/NotifyProperties.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/notify/NotifyProperties.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.notify; @@ -38,7 +39,7 @@ * 2. 通过set形式设置(动态/DB等) * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/notify/NotifyProviderService.java b/bus-starter/src/main/java/org/aoju/bus/starter/notify/NotifyProviderService.java index 50c24b90aa..b63514bd04 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/notify/NotifyProviderService.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/notify/NotifyProviderService.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.notify; @@ -42,7 +43,7 @@ * 通知提供服务 * * @author Justubborn - * @version 6.1.1 + * @version 6.1.2 * @since JDK1.8+ */ public class NotifyProviderService { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/oauth/AuthConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/oauth/AuthConfiguration.java index 4332eb4c70..d6edb005fa 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/oauth/AuthConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/oauth/AuthConfiguration.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.oauth; @@ -36,7 +37,7 @@ * 授权配置 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @EnableConfigurationProperties(value = {AuthProperties.class}) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/oauth/AuthProperties.java b/bus-starter/src/main/java/org/aoju/bus/starter/oauth/AuthProperties.java index 919009f6be..aceee69a6e 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/oauth/AuthProperties.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/oauth/AuthProperties.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.oauth; @@ -40,7 +41,7 @@ * 2. 通过set形式设置(动态/DB等) * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/oauth/AuthProviderService.java b/bus-starter/src/main/java/org/aoju/bus/starter/oauth/AuthProviderService.java index cac3125d5f..d5a0a4c6ea 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/oauth/AuthProviderService.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/oauth/AuthProviderService.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.oauth; @@ -41,7 +42,7 @@ * 授权服务提供 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AuthProviderService { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/office/OfficeConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/office/OfficeConfiguration.java index b07985d220..1b411e84ec 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/office/OfficeConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/office/OfficeConfiguration.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.office; @@ -46,7 +47,7 @@ * 文档在线预览配置 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ConditionalOnClass({LocalOfficeProvider.class, OnlineOfficeProvider.class}) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/office/OfficeProperties.java b/bus-starter/src/main/java/org/aoju/bus/starter/office/OfficeProperties.java index 1396f84665..129a0481b3 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/office/OfficeProperties.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/office/OfficeProperties.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.office; @@ -37,7 +38,7 @@ * 文档预览配置类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/office/OfficeProviderService.java b/bus-starter/src/main/java/org/aoju/bus/starter/office/OfficeProviderService.java index ae7c567479..a7dc460e0b 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/office/OfficeProviderService.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/office/OfficeProviderService.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.office; @@ -37,7 +38,7 @@ * 文档在线预览服务提供 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Component diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/RequestBodyAdvice.java b/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/RequestBodyAdvice.java index 1ff6016383..170957d92d 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/RequestBodyAdvice.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/RequestBodyAdvice.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.sensitive; @@ -49,7 +50,7 @@ * 对加了@P的方法的数据进行解密密操作 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RequestBodyAdvice extends BaseAdvice diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/ResponseBodyAdvice.java b/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/ResponseBodyAdvice.java index 50580d5b65..458a454d67 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/ResponseBodyAdvice.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/ResponseBodyAdvice.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.sensitive; @@ -56,7 +57,7 @@ * 对加了@Encrypt的方法的数据进行加密操作 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ResponseBodyAdvice extends BaseAdvice diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/SensitiveConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/SensitiveConfiguration.java index 5992e3bb1a..630905a69a 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/SensitiveConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/SensitiveConfiguration.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.sensitive; @@ -31,7 +32,7 @@ * 脱敏配置 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @EnableConfigurationProperties(value = {SensitiveProperties.class}) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/SensitiveProperties.java b/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/SensitiveProperties.java index 438b9be768..9e15c7a146 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/SensitiveProperties.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/SensitiveProperties.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.sensitive; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/SensitiveResultSetHandler.java b/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/SensitiveResultSetHandler.java index 125e2b85ee..228f01c0f3 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/SensitiveResultSetHandler.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/SensitiveResultSetHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.sensitive; diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/SensitiveStatementHandler.java b/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/SensitiveStatementHandler.java index cb1670e0a3..2e7bf4c35e 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/SensitiveStatementHandler.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/SensitiveStatementHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.sensitive; diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/socket/ClassPathSocketScanner.java b/bus-starter/src/main/java/org/aoju/bus/starter/socket/ClassPathSocketScanner.java index 68b2c8b168..f0edb87830 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/socket/ClassPathSocketScanner.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/socket/ClassPathSocketScanner.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.socket; @@ -36,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ClassPathSocketScanner extends ClassPathBeanDefinitionScanner { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/socket/SocketConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/socket/SocketConfiguration.java index 2f46463586..ff07619f39 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/socket/SocketConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/socket/SocketConfiguration.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.socket; @@ -33,7 +34,7 @@ * Socket配置 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @EnableConfigurationProperties(SocketProperties.class) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/socket/SocketHandlerBeanPostProcessor.java b/bus-starter/src/main/java/org/aoju/bus/starter/socket/SocketHandlerBeanPostProcessor.java index 092f6c4d80..dc8a403fd1 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/socket/SocketHandlerBeanPostProcessor.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/socket/SocketHandlerBeanPostProcessor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.socket; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Component diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/socket/SocketProperties.java b/bus-starter/src/main/java/org/aoju/bus/starter/socket/SocketProperties.java index 094dd892a7..7dc9687617 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/socket/SocketProperties.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/socket/SocketProperties.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.socket; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/socket/SocketScannerRegistrar.java b/bus-starter/src/main/java/org/aoju/bus/starter/socket/SocketScannerRegistrar.java index 5944bb04fa..b48e86e039 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/socket/SocketScannerRegistrar.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/socket/SocketScannerRegistrar.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.socket; @@ -38,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SocketScannerRegistrar implements ImportBeanDefinitionRegistrar, ResourceLoaderAware { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/socket/WebSocketServerStarter.java b/bus-starter/src/main/java/org/aoju/bus/starter/socket/WebSocketServerStarter.java index 22d292b05f..4cc45d7ef9 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/socket/WebSocketServerStarter.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/socket/WebSocketServerStarter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.socket; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class WebSocketServerStarter { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/storage/StorageConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/storage/StorageConfiguration.java index 99b8d6aed0..fc18016ad1 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/storage/StorageConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/storage/StorageConfiguration.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.storage; @@ -36,7 +37,7 @@ * 授权配置 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @EnableConfigurationProperties(value = {StorageProperties.class}) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/storage/StorageProperties.java b/bus-starter/src/main/java/org/aoju/bus/starter/storage/StorageProperties.java index 88e2e27125..ed8e7f2c94 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/storage/StorageProperties.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/storage/StorageProperties.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.storage; @@ -40,7 +41,7 @@ * 2. 通过set形式设置(动态/DB等) * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/storage/StorageProviderService.java b/bus-starter/src/main/java/org/aoju/bus/starter/storage/StorageProviderService.java index 5ff1f656d6..8f4af2bb35 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/storage/StorageProviderService.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/storage/StorageProviderService.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.storage; @@ -41,7 +42,7 @@ * 存储服务提供 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class StorageProviderService { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/tracer/MethodExecuteCostHandler.java b/bus-starter/src/main/java/org/aoju/bus/starter/tracer/MethodExecuteCostHandler.java index c0c34603b5..cf9d23c213 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/tracer/MethodExecuteCostHandler.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/tracer/MethodExecuteCostHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.tracer; @@ -31,7 +32,7 @@ * 方法执行耗时统计 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Component diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/tracer/TracerConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/tracer/TracerConfiguration.java index 9a5dec7be6..60ab8a390b 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/tracer/TracerConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/tracer/TracerConfiguration.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.tracer; @@ -54,7 +55,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ConditionalOnWebApplication diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/tracer/TracerProperties.java b/bus-starter/src/main/java/org/aoju/bus/starter/tracer/TracerProperties.java index 58f8ee84ce..7219a6088e 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/tracer/TracerProperties.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/tracer/TracerProperties.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.tracer; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TracerProperties { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/validate/AspectjValidateProxy.java b/bus-starter/src/main/java/org/aoju/bus/starter/validate/AspectjValidateProxy.java index d238c112e1..d054ddcef8 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/validate/AspectjValidateProxy.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/validate/AspectjValidateProxy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.validate; @@ -35,7 +36,7 @@ * AOP切面切点 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Order(99) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/validate/AutoValidateAdvice.java b/bus-starter/src/main/java/org/aoju/bus/starter/validate/AutoValidateAdvice.java index e7c80cd2f2..9ed94753d8 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/validate/AutoValidateAdvice.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/validate/AutoValidateAdvice.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.validate; @@ -37,7 +38,7 @@ * 自动进行参数处理实现类 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AutoValidateAdvice { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/validate/ValidateConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/validate/ValidateConfiguration.java index f0911af570..4d7791f3d9 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/validate/ValidateConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/validate/ValidateConfiguration.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.validate; @@ -30,7 +31,7 @@ * 数据校验配置 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Import(value = AspectjValidateProxy.class) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/CacheRequestWrapper.java b/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/CacheRequestWrapper.java index 8cdb12d4ba..734da82a61 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/CacheRequestWrapper.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/CacheRequestWrapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.wrapper; @@ -43,7 +44,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CacheRequestWrapper extends HttpServletRequestWrapper { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/CacheResponseWrapper.java b/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/CacheResponseWrapper.java index d1c6c3f0e0..5b73ac4b42 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/CacheResponseWrapper.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/CacheResponseWrapper.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.wrapper; @@ -36,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CacheResponseWrapper extends HttpServletResponseWrapper { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/GenieWrapperHandler.java b/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/GenieWrapperHandler.java index 1deb0f5a61..26163d3890 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/GenieWrapperHandler.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/GenieWrapperHandler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.wrapper; @@ -44,7 +45,7 @@ * 对于某些处理程序组,添加常见的预处理行为不需要修改每个处理程序实现 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Component diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/WrapperConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/WrapperConfiguration.java index d2d0d2bdb5..d385f10765 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/WrapperConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/WrapperConfiguration.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.wrapper; @@ -45,7 +46,7 @@ * Xss/重复读取等配置 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @EnableConfigurationProperties({WrapperProperties.class}) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/WrapperProperties.java b/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/WrapperProperties.java index 46387283bd..c233522b66 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/WrapperProperties.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/WrapperProperties.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.starter.wrapper; @@ -38,7 +39,7 @@ * 配置信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-storage/pom.xml b/bus-storage/pom.xml index 66df5badb4..f21843b435 100755 --- a/bus-storage/pom.xml +++ b/bus-storage/pom.xml @@ -6,18 +6,43 @@ org.aoju bus-storage - 6.1.1 + 6.1.2 jar ${project.artifactId} Bus Storage https://github.com/aoju/bus + + + The MIT License (MIT) + https://opensource.org/licenses/MIT + + + + + scm:git@github.com:aoju/bus.git + scm:git@github.com:aoju/bus.git + git@github.com:aoju/bus.git + + + + + Kimi Liu + https://github.com/aoju/bus.git + + + + + Github Issue + https://github.com/aoju/bus/issues + + UTF-8 UTF-8 1.8 - 1.18.12 + 1.18.16 3.4.2 0.10.48 3.0.2 @@ -122,31 +147,6 @@ - - - The MIT License (MIT) - https://opensource.org/licenses/MIT - - - - - scm:git@github.com:aoju/bus.git - scm:git@github.com:aoju/bus.git - git@github.com:aoju/bus.git - - - - - Kimi Liu - https://github.com/aoju/bus.git - - - - - Github Issue - https://github.com/aoju/bus/issues - - diff --git a/bus-storage/src/main/java/org/aoju/bus/storage/Builder.java b/bus-storage/src/main/java/org/aoju/bus/storage/Builder.java index 9016bf2bc6..3d9cbc48e3 100755 --- a/bus-storage/src/main/java/org/aoju/bus/storage/Builder.java +++ b/bus-storage/src/main/java/org/aoju/bus/storage/Builder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.storage; @@ -33,7 +34,7 @@ * 框架内预定义的存储信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Builder { diff --git a/bus-storage/src/main/java/org/aoju/bus/storage/Context.java b/bus-storage/src/main/java/org/aoju/bus/storage/Context.java index 02c7caabe8..1f4cc9fa07 100755 --- a/bus-storage/src/main/java/org/aoju/bus/storage/Context.java +++ b/bus-storage/src/main/java/org/aoju/bus/storage/Context.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.storage; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-storage/src/main/java/org/aoju/bus/storage/Provider.java b/bus-storage/src/main/java/org/aoju/bus/storage/Provider.java index ceb3d52681..8b6ae2da3a 100755 --- a/bus-storage/src/main/java/org/aoju/bus/storage/Provider.java +++ b/bus-storage/src/main/java/org/aoju/bus/storage/Provider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.storage; @@ -34,7 +35,7 @@ * 文件存储提供者 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Provider { diff --git a/bus-storage/src/main/java/org/aoju/bus/storage/Registry.java b/bus-storage/src/main/java/org/aoju/bus/storage/Registry.java index 42917895bf..b3bd413fc4 100755 --- a/bus-storage/src/main/java/org/aoju/bus/storage/Registry.java +++ b/bus-storage/src/main/java/org/aoju/bus/storage/Registry.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.storage; @@ -28,7 +29,7 @@ * 平台类型 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum Registry { diff --git a/bus-storage/src/main/java/org/aoju/bus/storage/magic/Attachs.java b/bus-storage/src/main/java/org/aoju/bus/storage/magic/Attachs.java index 19abcd4dc2..40b269ecda 100755 --- a/bus-storage/src/main/java/org/aoju/bus/storage/magic/Attachs.java +++ b/bus-storage/src/main/java/org/aoju/bus/storage/magic/Attachs.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.storage.magic; @@ -35,7 +36,7 @@ * 附件信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-storage/src/main/java/org/aoju/bus/storage/magic/Message.java b/bus-storage/src/main/java/org/aoju/bus/storage/magic/Message.java index a8e06badd6..11a7cd12b1 100755 --- a/bus-storage/src/main/java/org/aoju/bus/storage/magic/Message.java +++ b/bus-storage/src/main/java/org/aoju/bus/storage/magic/Message.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.storage.magic; @@ -31,7 +32,7 @@ * 响应结果 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Getter diff --git a/bus-storage/src/main/java/org/aoju/bus/storage/metric/StorageCache.java b/bus-storage/src/main/java/org/aoju/bus/storage/metric/StorageCache.java index 0280402d4a..077e9a9e12 100755 --- a/bus-storage/src/main/java/org/aoju/bus/storage/metric/StorageCache.java +++ b/bus-storage/src/main/java/org/aoju/bus/storage/metric/StorageCache.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.storage.metric; @@ -32,7 +33,7 @@ * 默认缓存实现 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public enum StorageCache implements ExtendCache { diff --git a/bus-storage/src/main/java/org/aoju/bus/storage/provider/AbstractProvider.java b/bus-storage/src/main/java/org/aoju/bus/storage/provider/AbstractProvider.java index 28ee909db2..df8b7fbbe9 100755 --- a/bus-storage/src/main/java/org/aoju/bus/storage/provider/AbstractProvider.java +++ b/bus-storage/src/main/java/org/aoju/bus/storage/provider/AbstractProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.storage.provider; @@ -42,7 +43,7 @@ * 预定义存储实现 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractProvider implements Provider { diff --git a/bus-storage/src/main/java/org/aoju/bus/storage/provider/AliYunOssProvider.java b/bus-storage/src/main/java/org/aoju/bus/storage/provider/AliYunOssProvider.java index cdd7c1353f..6c97e28211 100755 --- a/bus-storage/src/main/java/org/aoju/bus/storage/provider/AliYunOssProvider.java +++ b/bus-storage/src/main/java/org/aoju/bus/storage/provider/AliYunOssProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.storage.provider; @@ -47,7 +48,7 @@ * 存储服务-阿里云 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class AliYunOssProvider extends AbstractProvider { diff --git a/bus-storage/src/main/java/org/aoju/bus/storage/provider/BaiduYunBosProvider.java b/bus-storage/src/main/java/org/aoju/bus/storage/provider/BaiduYunBosProvider.java index 2ec4a8441a..26d8315a31 100755 --- a/bus-storage/src/main/java/org/aoju/bus/storage/provider/BaiduYunBosProvider.java +++ b/bus-storage/src/main/java/org/aoju/bus/storage/provider/BaiduYunBosProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.storage.provider; @@ -48,7 +49,7 @@ * 存储服务-百度云 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BaiduYunBosProvider extends AbstractProvider { diff --git a/bus-storage/src/main/java/org/aoju/bus/storage/provider/HuaweiObsProvider.java b/bus-storage/src/main/java/org/aoju/bus/storage/provider/HuaweiObsProvider.java index 00944c1d79..27eea75035 100755 --- a/bus-storage/src/main/java/org/aoju/bus/storage/provider/HuaweiObsProvider.java +++ b/bus-storage/src/main/java/org/aoju/bus/storage/provider/HuaweiObsProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.storage.provider; @@ -46,7 +47,7 @@ * 存储服务-华为云 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HuaweiObsProvider extends AbstractProvider { diff --git a/bus-storage/src/main/java/org/aoju/bus/storage/provider/JdYunOssProvider.java b/bus-storage/src/main/java/org/aoju/bus/storage/provider/JdYunOssProvider.java index e4b64c7180..0c2639194f 100755 --- a/bus-storage/src/main/java/org/aoju/bus/storage/provider/JdYunOssProvider.java +++ b/bus-storage/src/main/java/org/aoju/bus/storage/provider/JdYunOssProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.storage.provider; @@ -53,7 +54,7 @@ * 存储服务-京东云 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class JdYunOssProvider extends AbstractProvider { diff --git a/bus-storage/src/main/java/org/aoju/bus/storage/provider/LocalFileProvider.java b/bus-storage/src/main/java/org/aoju/bus/storage/provider/LocalFileProvider.java index fba1838513..2c8ce218c2 100755 --- a/bus-storage/src/main/java/org/aoju/bus/storage/provider/LocalFileProvider.java +++ b/bus-storage/src/main/java/org/aoju/bus/storage/provider/LocalFileProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.storage.provider; @@ -43,7 +44,7 @@ * 本地文件上传 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class LocalFileProvider extends AbstractProvider { diff --git a/bus-storage/src/main/java/org/aoju/bus/storage/provider/MinioOssProvider.java b/bus-storage/src/main/java/org/aoju/bus/storage/provider/MinioOssProvider.java index b2560d2aa5..43e7dc4c0c 100755 --- a/bus-storage/src/main/java/org/aoju/bus/storage/provider/MinioOssProvider.java +++ b/bus-storage/src/main/java/org/aoju/bus/storage/provider/MinioOssProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.storage.provider; @@ -54,7 +55,7 @@ * 存储服务-MinIO * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MinioOssProvider extends AbstractProvider { diff --git a/bus-storage/src/main/java/org/aoju/bus/storage/provider/QiniuYunOssProvider.java b/bus-storage/src/main/java/org/aoju/bus/storage/provider/QiniuYunOssProvider.java index 8fd3f71a7d..450ea21a5c 100755 --- a/bus-storage/src/main/java/org/aoju/bus/storage/provider/QiniuYunOssProvider.java +++ b/bus-storage/src/main/java/org/aoju/bus/storage/provider/QiniuYunOssProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.storage.provider; @@ -52,7 +53,7 @@ * 存储服务-七牛 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class QiniuYunOssProvider extends AbstractProvider { diff --git a/bus-storage/src/main/java/org/aoju/bus/storage/provider/TencentCosProvider.java b/bus-storage/src/main/java/org/aoju/bus/storage/provider/TencentCosProvider.java index 57ef285207..5c0319dd89 100755 --- a/bus-storage/src/main/java/org/aoju/bus/storage/provider/TencentCosProvider.java +++ b/bus-storage/src/main/java/org/aoju/bus/storage/provider/TencentCosProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.storage.provider; @@ -50,7 +51,7 @@ * 存储服务-腾讯云 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TencentCosProvider extends AbstractProvider { diff --git a/bus-storage/src/main/java/org/aoju/bus/storage/provider/UpaiYunOssProvider.java b/bus-storage/src/main/java/org/aoju/bus/storage/provider/UpaiYunOssProvider.java index dfd86446e0..54dd089d07 100755 --- a/bus-storage/src/main/java/org/aoju/bus/storage/provider/UpaiYunOssProvider.java +++ b/bus-storage/src/main/java/org/aoju/bus/storage/provider/UpaiYunOssProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.storage.provider; @@ -46,7 +47,7 @@ * 存储服务-又拍云 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class UpaiYunOssProvider extends AbstractProvider { diff --git a/bus-tracer/pom.xml b/bus-tracer/pom.xml index b84d3e2ab7..15dbbdedcf 100755 --- a/bus-tracer/pom.xml +++ b/bus-tracer/pom.xml @@ -6,19 +6,44 @@ org.aoju bus-tracer - 6.1.1 + 6.1.2 jar ${project.artifactId} Bus Tracer https://github.com/aoju/bus + + + The MIT License (MIT) + https://opensource.org/licenses/MIT + + + + + scm:git@github.com:aoju/bus.git + scm:git@github.com:aoju/bus.git + git@github.com:aoju/bus.git + + + + + Kimi Liu + https://github.com/aoju/bus.git + + + + + Github Issue + https://github.com/aoju/bus/issues + + UTF-8 UTF-8 1.8 - 2.3.0.RELEASE - 1.18.12 + 2.4.0 + 1.18.16 2.7.8 4.0.1 2.7.18 @@ -124,31 +149,6 @@ - - - The MIT License (MIT) - https://opensource.org/licenses/MIT - - - - - scm:git@github.com:aoju/bus.git - scm:git@github.com:aoju/bus.git - git@github.com:aoju/bus.git - - - - - Kimi Liu - https://github.com/aoju/bus.git - - - - - Github Issue - https://github.com/aoju/bus/issues - - diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/Backend.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/Backend.java index d425803958..122c0c19e4 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/Backend.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/Backend.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer; @@ -32,7 +33,7 @@ * 后端应该是线程安全的(读写被委托给线程本地状态). * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface Backend { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/Builder.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/Builder.java index 93ff7e2f8b..9ceaf0eda7 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/Builder.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/Builder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer; @@ -38,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class Builder { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/Provider.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/Provider.java index a6e7ce9bde..afe3894ee2 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/Provider.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/Provider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Provider extends AbstractSet { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/Resolver.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/Resolver.java index 7a271d8ae1..9699907896 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/Resolver.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/Resolver.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Resolver { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/Tracer.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/Tracer.java index e1ddea634a..5f9eb9038b 100644 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/Tracer.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/Tracer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Tracer { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/AbstractBackend.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/AbstractBackend.java index 9d80f98a10..95e44c5c33 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/AbstractBackend.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/AbstractBackend.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.backend; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public abstract class AbstractBackend implements Backend { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/Slf4JAbstractBackend.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/Slf4JAbstractBackend.java index 8a0760659b..a208fb9d42 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/Slf4JAbstractBackend.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/Slf4JAbstractBackend.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.backend; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ class Slf4JAbstractBackend extends AbstractBackend { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/Slf4jTraceBackendProvider.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/Slf4jTraceBackendProvider.java index 458e10cacd..f2d6158599 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/Slf4jTraceBackendProvider.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/Slf4jTraceBackendProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.backend; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Slf4jTraceBackendProvider implements TraceBackendProvider { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/ThreadLocalHashSet.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/ThreadLocalHashSet.java index 8ebfb3f0c1..f91b3486cb 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/ThreadLocalHashSet.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/ThreadLocalHashSet.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.backend; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class ThreadLocalHashSet extends InheritableThreadLocal> { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/TraceBackendProvider.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/TraceBackendProvider.java index 10a24927ab..f54dc4cb8a 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/TraceBackendProvider.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/TraceBackendProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.backend; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface TraceBackendProvider { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/TraceCxfFeature.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/TraceCxfFeature.java index 8746341420..3ff7d0f01c 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/TraceCxfFeature.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/TraceCxfFeature.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.binding.apache.cxf; @@ -37,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TraceCxfFeature extends AbstractFeature { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/AbstractTraceInInterceptor.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/AbstractTraceInInterceptor.java index 10c676bd3d..70294a2cc4 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/AbstractTraceInInterceptor.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/AbstractTraceInInterceptor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.binding.apache.cxf.interceptor; @@ -42,7 +43,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ abstract class AbstractTraceInInterceptor extends AbstractPhaseInterceptor { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/AbstractTraceOutInterceptor.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/AbstractTraceOutInterceptor.java index 48d1f4f706..4b8184b7d1 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/AbstractTraceOutInterceptor.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/AbstractTraceOutInterceptor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.binding.apache.cxf.interceptor; @@ -45,7 +46,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ abstract class AbstractTraceOutInterceptor extends AbstractPhaseInterceptor { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/TraceRequestInInterceptor.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/TraceRequestInInterceptor.java index 331106f0b1..d2de1f2fbc 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/TraceRequestInInterceptor.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/TraceRequestInInterceptor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.binding.apache.cxf.interceptor; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TraceRequestInInterceptor extends AbstractTraceInInterceptor { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/TraceRequestOutInterceptor.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/TraceRequestOutInterceptor.java index 6880849509..7e83be09a2 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/TraceRequestOutInterceptor.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/TraceRequestOutInterceptor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.binding.apache.cxf.interceptor; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TraceRequestOutInterceptor extends AbstractTraceOutInterceptor { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/TraceResponseInInterceptor.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/TraceResponseInInterceptor.java index b8faf0eccc..d5328bacac 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/TraceResponseInInterceptor.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/TraceResponseInInterceptor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.binding.apache.cxf.interceptor; @@ -33,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TraceResponseInInterceptor extends AbstractTraceInInterceptor { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/TraceResponseOutInterceptor.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/TraceResponseOutInterceptor.java index 9310cc895b..546ffa36b0 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/TraceResponseOutInterceptor.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/TraceResponseOutInterceptor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.binding.apache.cxf.interceptor; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TraceResponseOutInterceptor extends AbstractTraceOutInterceptor { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/httpclient/TraceHttpRequestInterceptor.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/httpclient/TraceHttpRequestInterceptor.java index 9ddac0082a..7acd5f5d46 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/httpclient/TraceHttpRequestInterceptor.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/httpclient/TraceHttpRequestInterceptor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.binding.apache.httpclient; @@ -37,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TraceHttpRequestInterceptor implements HttpRequestInterceptor { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/httpclient/TraceHttpResponseInterceptor.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/httpclient/TraceHttpResponseInterceptor.java index 641ab87a32..dcf6a89e3c 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/httpclient/TraceHttpResponseInterceptor.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/httpclient/TraceHttpResponseInterceptor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.binding.apache.httpclient; @@ -39,7 +40,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TraceHttpResponseInterceptor implements HttpResponseInterceptor { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/httpclient5/TraceHttpRequestInterceptor.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/httpclient5/TraceHttpRequestInterceptor.java index 6d8046a573..0b1ebfe719 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/httpclient5/TraceHttpRequestInterceptor.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/httpclient5/TraceHttpRequestInterceptor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.binding.apache.httpclient5; @@ -38,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TraceHttpRequestInterceptor implements HttpRequestInterceptor { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/httpclient5/TraceHttpResponseInterceptor.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/httpclient5/TraceHttpResponseInterceptor.java index 11ee43c4a6..6de0532759 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/httpclient5/TraceHttpResponseInterceptor.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/httpclient5/TraceHttpResponseInterceptor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.binding.apache.httpclient5; @@ -41,7 +42,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TraceHttpResponseInterceptor implements HttpResponseInterceptor { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/dubbo/ConsumerTraceFilter.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/dubbo/ConsumerTraceFilter.java index d6801a7c01..72bec68733 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/dubbo/ConsumerTraceFilter.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/dubbo/ConsumerTraceFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.binding.dubbo; diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/dubbo/ProviderTraceFilter.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/dubbo/ProviderTraceFilter.java index f0b9409848..22536a12c0 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/dubbo/ProviderTraceFilter.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/dubbo/ProviderTraceFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.binding.dubbo; diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceMessageListener.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceMessageListener.java index 2d7c4577e4..d25d875b1a 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceMessageListener.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceMessageListener.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.binding.jms; @@ -40,7 +41,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class TraceMessageListener { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceMessageProducer.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceMessageProducer.java index c3b8400a46..de76b9489f 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceMessageProducer.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceMessageProducer.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.binding.jms; @@ -38,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TraceMessageProducer implements MessageProducer { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceMessageWriter.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceMessageWriter.java index 65c69f4483..f090443c3f 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceMessageWriter.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceMessageWriter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.binding.jms; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class TraceMessageWriter { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceQueueSender.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceQueueSender.java index 0126ae7931..e36f2fe9ca 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceQueueSender.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceQueueSender.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.binding.jms; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class TraceQueueSender implements QueueSender { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceTopicPublisher.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceTopicPublisher.java index 65d24b0e01..0af2d3c531 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceTopicPublisher.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceTopicPublisher.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.binding.jms; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class TraceTopicPublisher implements TopicPublisher { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/quartz/TraceContextInjector.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/quartz/TraceContextInjector.java index 87c1c99bf0..0dda9a48d9 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/quartz/TraceContextInjector.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/quartz/TraceContextInjector.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.binding.quartz; @@ -34,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TraceContextInjector { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/quartz/TraceJobListener.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/quartz/TraceJobListener.java index a09c964a2c..c276ae52cf 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/quartz/TraceJobListener.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/quartz/TraceJobListener.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.binding.quartz; @@ -36,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TraceJobListener extends JobListenerSupport { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/servlet/TraceFilter.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/servlet/TraceFilter.java index 1554b09359..031a9e83bc 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/servlet/TraceFilter.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/servlet/TraceFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.binding.servlet; @@ -39,7 +40,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @WebFilter(filterName = "TraceFilter", urlPatterns = "/*", dispatcherTypes = DispatcherType.REQUEST) diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/servlet/TraceServletRequestListener.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/servlet/TraceServletRequestListener.java index 89b8bea4cf..b4441d8246 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/servlet/TraceServletRequestListener.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/servlet/TraceServletRequestListener.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.binding.servlet; @@ -42,7 +43,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @WebListener("TraceServletRequestListener to read incoming TPICs into Builder backend") diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/servlet/TraceSessionListener.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/servlet/TraceSessionListener.java index 2e64e7a194..e6ccdaacba 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/servlet/TraceSessionListener.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/servlet/TraceSessionListener.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.binding.servlet; @@ -38,7 +39,7 @@ * It should at least work for the following containers: * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @WebListener("TraceSessionListener to create sessionIds on session creation and remove it instead from the Builder backend on session termination.") diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/spring/amqp/TraceMessagePropertiesConverter.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/spring/amqp/TraceMessagePropertiesConverter.java index 79b28d60ff..7c9f888cf0 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/spring/amqp/TraceMessagePropertiesConverter.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/spring/amqp/TraceMessagePropertiesConverter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.binding.spring.amqp; @@ -38,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TraceMessagePropertiesConverter extends DefaultMessagePropertiesConverter { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/spring/http/TraceClientHttpRequestInterceptor.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/spring/http/TraceClientHttpRequestInterceptor.java index ad7b3707cf..5c00e4e827 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/spring/http/TraceClientHttpRequestInterceptor.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/spring/http/TraceClientHttpRequestInterceptor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.binding.spring.http; @@ -40,7 +41,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class TraceClientHttpRequestInterceptor implements ClientHttpRequestInterceptor { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/spring/web/TraceInterceptor.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/spring/web/TraceInterceptor.java index 21b977512b..b09a491671 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/spring/web/TraceInterceptor.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/spring/web/TraceInterceptor.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.binding.spring.web; @@ -42,7 +43,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Component diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/spring/web/TraceResponseBodyAdvice.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/spring/web/TraceResponseBodyAdvice.java index 2cea9444fc..13b8bf4ad5 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/spring/web/TraceResponseBodyAdvice.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/spring/web/TraceResponseBodyAdvice.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.binding.spring.web; @@ -41,7 +42,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @ControllerAdvice diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/config/PropertiesBasedTraceFilter.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/config/PropertiesBasedTraceFilter.java index 41d1130d06..053bdf7191 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/config/PropertiesBasedTraceFilter.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/config/PropertiesBasedTraceFilter.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.config; @@ -40,7 +41,7 @@ * The default property chain may be obtained by the {@link #loadPropertyChain()} method. * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class PropertiesBasedTraceFilter implements TraceFilterConfig { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/config/PropertyChain.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/config/PropertyChain.java index 12a7bae456..1cd5b15d1a 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/config/PropertyChain.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/config/PropertyChain.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.config; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PropertyChain { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/config/TraceFilterConfig.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/config/TraceFilterConfig.java index efb683523f..a1d20ec7c7 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/config/TraceFilterConfig.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/config/TraceFilterConfig.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.config; @@ -28,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public interface TraceFilterConfig { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/config/TracePropertiesFileLoader.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/config/TracePropertiesFileLoader.java index faf6d1e77e..586f24138d 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/config/TracePropertiesFileLoader.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/config/TracePropertiesFileLoader.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.config; @@ -32,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class TracePropertiesFileLoader { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/ClazzEntity.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/ClazzEntity.java index 7d55581370..019350656a 100644 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/ClazzEntity.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/ClazzEntity.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.monitor; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/ExecCmd.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/ExecCmd.java index f51a743de7..cfaa19e498 100644 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/ExecCmd.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/ExecCmd.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.monitor; @@ -42,7 +43,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ExecCmd { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/GcEntity.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/GcEntity.java index 2d58c08b4b..fec43eb8ee 100644 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/GcEntity.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/GcEntity.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.monitor; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/StackEntity.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/StackEntity.java index bb548da2e5..85d99458df 100644 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/StackEntity.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/StackEntity.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.monitor; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/ThreadEntity.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/ThreadEntity.java index 8fee85e0be..df03a10f8a 100644 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/ThreadEntity.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/ThreadEntity.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.monitor; @@ -30,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/thread/ThreadLocalBackend.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/thread/ThreadLocalBackend.java index dbacf7c45c..68e8d6f4b7 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/thread/ThreadLocalBackend.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/thread/ThreadLocalBackend.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.thread; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ class ThreadLocalBackend extends AbstractBackend { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/thread/ThreadLocalMap.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/thread/ThreadLocalMap.java index 555730df4a..e680be8cf2 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/thread/ThreadLocalMap.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/thread/ThreadLocalMap.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.thread; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ class ThreadLocalMap extends InheritableThreadLocal> { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/thread/ThreadLocalTraceBackendProvider.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/thread/ThreadLocalTraceBackendProvider.java index dfcf5c1335..60fc980d5a 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/thread/ThreadLocalTraceBackendProvider.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/thread/ThreadLocalTraceBackendProvider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.thread; @@ -29,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ThreadLocalTraceBackendProvider implements TraceBackendProvider { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/transport/HttpHeaderTransport.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/transport/HttpHeaderTransport.java index ec04c4b02d..b60a85415f 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/transport/HttpHeaderTransport.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/transport/HttpHeaderTransport.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.transport; @@ -35,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class HttpHeaderTransport { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/transport/SoapHeaderTransport.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/transport/SoapHeaderTransport.java index 516c321f70..da4d27bca3 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/transport/SoapHeaderTransport.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/transport/SoapHeaderTransport.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.transport; @@ -39,7 +40,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class SoapHeaderTransport { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/transport/jaxb/TpicMap.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/transport/jaxb/TpicMap.java index 5ff415dc27..e2a18a6674 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/transport/jaxb/TpicMap.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/transport/jaxb/TpicMap.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.tracer.transport.jaxb; @@ -31,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @XmlRootElement(name = Builder.TPIC_HEADER) diff --git a/bus-validate/pom.xml b/bus-validate/pom.xml index 20088d6acf..cc4ce5b340 100755 --- a/bus-validate/pom.xml +++ b/bus-validate/pom.xml @@ -6,34 +6,13 @@ org.aoju bus-validate - 6.1.1 + 6.1.2 jar ${project.artifactId} Bus Validate https://github.com/aoju/bus - - UTF-8 - UTF-8 - 1.8 - 1.18.12 - - - - - ${project.groupId} - bus-logger - ${project.version} - - - org.projectlombok - lombok - ${lombok.version} - true - - - The MIT License (MIT) @@ -59,6 +38,27 @@ https://github.com/aoju/bus/issues + + UTF-8 + UTF-8 + 1.8 + 1.18.16 + + + + + ${project.groupId} + bus-logger + ${project.version} + + + org.projectlombok + lombok + ${lombok.version} + true + + + diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/Builder.java b/bus-validate/src/main/java/org/aoju/bus/validate/Builder.java index 10619ea082..37581ded5f 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/Builder.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/Builder.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate; @@ -33,7 +34,7 @@ * 当前框架内预定义的校验器名称 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Builder extends Validator { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/Collector.java b/bus-validate/src/main/java/org/aoju/bus/validate/Collector.java index 659ad5f599..0712ddd430 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/Collector.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/Collector.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate; @@ -34,7 +35,7 @@ * 校验结果收集器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/Context.java b/bus-validate/src/main/java/org/aoju/bus/validate/Context.java index 9720984db9..d21b920196 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/Context.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/Context.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate; @@ -38,7 +39,7 @@ * 当前校验的上下文信息 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/Provider.java b/bus-validate/src/main/java/org/aoju/bus/validate/Provider.java index e7642d6acf..7f1dada3d4 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/Provider.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/Provider.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate; @@ -43,7 +44,7 @@ * 服务提供者 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Provider { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/Registry.java b/bus-validate/src/main/java/org/aoju/bus/validate/Registry.java index 018e26073d..f4d22e2f38 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/Registry.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/Registry.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate; @@ -35,7 +36,7 @@ * 校验器注册中心 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Registry { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/Validated.java b/bus-validate/src/main/java/org/aoju/bus/validate/Validated.java index 86288ea836..48c31c5d66 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/Validated.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/Validated.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate; @@ -48,7 +49,7 @@ *

        * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Array.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Array.java index 890079432d..6f5a08d562 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Array.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Array.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.annotation; @@ -35,7 +36,7 @@ *

        * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Blank.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Blank.java index a700cf649b..59c037b808 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Blank.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Blank.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.annotation; @@ -33,7 +34,7 @@ * 字符串为空或为null * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Chinese.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Chinese.java index f087a4989a..40ffb58e1f 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Chinese.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Chinese.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.annotation; @@ -33,7 +34,7 @@ * 判断是否为中文 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/CitizenId.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/CitizenId.java index 8cc60056cb..81bfed3a08 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/CitizenId.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/CitizenId.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.annotation; @@ -33,7 +34,7 @@ * 判断是否为身份证号码 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Compare.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Compare.java index 7533712fcf..fc2df60cd1 100644 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Compare.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Compare.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.annotation; @@ -32,7 +33,7 @@ * 参数值比较验证注解 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Target({ElementType.FIELD, ElementType.PARAMETER}) diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Complex.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Complex.java index f3a4e656b3..26cf44dec8 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Complex.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Complex.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.annotation; @@ -37,7 +38,7 @@ *

        * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Date.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Date.java index 7348a9036e..52c19c5a90 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Date.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Date.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.annotation; @@ -34,7 +35,7 @@ * 判断是否为日期 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Each.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Each.java index f77173595e..2d22d430f7 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Each.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Each.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.annotation; @@ -41,7 +42,7 @@ *

        * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Email.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Email.java index 9c35a44423..0baf94f00e 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Email.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Email.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.annotation; @@ -33,7 +34,7 @@ * 判断是否为邮箱 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/English.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/English.java index 3539d893b0..1d21e79ab9 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/English.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/English.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.annotation; @@ -33,7 +34,7 @@ * 判断是否为英文 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Equals.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Equals.java index 476ebf6a1e..82e4bab366 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Equals.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Equals.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.annotation; @@ -36,7 +37,7 @@ *

        * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/False.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/False.java index ed58bc5779..2461f21b3e 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/False.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/False.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.annotation; @@ -33,7 +34,7 @@ * boolean校验, 当校验值为false时通过校验 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Filler.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Filler.java index 8782684e7b..c83a7d41f2 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Filler.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Filler.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.annotation; @@ -34,7 +35,7 @@ * 在校验注解内部提供的方法上标记该注解,表示可以在校验注解的errmsg中使用该字符串插值 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Group.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Group.java index f892b1cfe5..65cbbe4de8 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Group.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Group.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.annotation; @@ -30,7 +31,7 @@ * 校验组注解,标记当前位置被激活的校验组 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/IPAddress.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/IPAddress.java index 52a4c926fe..385e9dc1ba 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/IPAddress.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/IPAddress.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.annotation; @@ -33,7 +34,7 @@ * 判断是否为IP地址 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/In.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/In.java index 011c9731cc..b457c1b2af 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/In.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/In.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.annotation; @@ -38,7 +39,7 @@ *

        * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/InEnum.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/InEnum.java index 149003dda7..7417a8725d 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/InEnum.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/InEnum.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.annotation; @@ -37,7 +38,7 @@ *

        * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Inside.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Inside.java index 1af6d09d9b..9cb4466405 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Inside.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Inside.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.annotation; @@ -33,7 +34,7 @@ *

        * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/IntRange.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/IntRange.java index 7d14e761ea..b39eb31795 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/IntRange.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/IntRange.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.annotation; @@ -37,7 +38,7 @@ *

        * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Length.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Length.java index e8d6d29f4c..a5073e7589 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Length.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Length.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.annotation; @@ -37,7 +38,7 @@ *

        * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Mobile.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Mobile.java index b5a1845ad2..5737f8cece 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Mobile.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Mobile.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.annotation; @@ -33,7 +34,7 @@ * 判断是否为手机号码 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Multi.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Multi.java index 1c2c382197..4e71891792 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Multi.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Multi.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.annotation; @@ -34,7 +35,7 @@ * 多重校验器, 可以配置多个校验器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/NotBlank.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/NotBlank.java index 4d1abff577..7d9d507a7a 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/NotBlank.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/NotBlank.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.annotation; @@ -33,7 +34,7 @@ * 字符串不为空,不为null校验 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/NotIn.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/NotIn.java index 5917074e4f..e07597abd1 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/NotIn.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/NotIn.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.annotation; @@ -37,7 +38,7 @@ *

        * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/NotNull.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/NotNull.java index 524aec600f..9fff33cc5a 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/NotNull.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/NotNull.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.annotation; @@ -33,7 +34,7 @@ * 对象不能为null * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Null.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Null.java index 44b0d7b9f6..f7003ceaec 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Null.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Null.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.annotation; @@ -33,7 +34,7 @@ * 校验对象只能为null * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Phone.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Phone.java index 92fffff87d..917a4ffd55 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Phone.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Phone.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.annotation; @@ -33,7 +34,7 @@ * 判断是否为固定电话 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Reflect.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Reflect.java index 28d908f070..0884b552ca 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Reflect.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Reflect.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.annotation; @@ -37,7 +38,7 @@ *

        * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Regex.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Regex.java index 71da49f6d7..379a4512ef 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Regex.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Regex.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.annotation; @@ -37,7 +38,7 @@ *

        * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/True.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/True.java index d8fe95026d..7879212d7b 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/True.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/True.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.annotation; @@ -33,7 +34,7 @@ * boolean校验, 当校验值为true时通过校验 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Valid.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Valid.java index 8117f363b8..3a7bea341e 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Valid.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Valid.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.annotation; @@ -30,7 +31,7 @@ * 标记注解,标明要被拦截的类或方法或者参数 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/ValidEx.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/ValidEx.java index 9c8c6ecf6d..e046f56b21 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/ValidEx.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/ValidEx.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.annotation; @@ -42,7 +43,7 @@ *

        * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/AlwaysStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/AlwaysStrategy.java index 139f26d19a..6ff6217733 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/AlwaysStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/AlwaysStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.strategy; @@ -31,7 +32,7 @@ * 这个校验器的结果永远为true * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public final class AlwaysStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/BlankStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/BlankStrategy.java index 356a44c8bc..675eeec82c 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/BlankStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/BlankStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.strategy; @@ -34,7 +35,7 @@ * BLANK 校验 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class BlankStrategy implements Validator, Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/ChineseStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/ChineseStrategy.java index 872f3e8811..e35e5e47cb 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/ChineseStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/ChineseStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.strategy; @@ -34,7 +35,7 @@ * 中文校验 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ChineseStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/CitizenIdStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/CitizenIdStrategy.java index 6620fbe7a7..08e073f600 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/CitizenIdStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/CitizenIdStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.strategy; @@ -34,7 +35,7 @@ * 身份证号码校验 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CitizenIdStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/CompareStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/CompareStrategy.java index 57b5b35ec1..71da0de627 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/CompareStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/CompareStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.strategy; @@ -38,7 +39,7 @@ * 数据长度校验 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class CompareStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/DateStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/DateStrategy.java index 93f5090bd3..3a851a5ee2 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/DateStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/DateStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.strategy; @@ -36,7 +37,7 @@ * 日期校验 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class DateStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/EachStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/EachStrategy.java index c00d71ce12..c0c9f5e0cd 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/EachStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/EachStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.strategy; @@ -41,7 +42,7 @@ * 容器元素内部校验 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class EachStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/EmailStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/EmailStrategy.java index 74aa543094..2910acfa7f 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/EmailStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/EmailStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.strategy; @@ -34,7 +35,7 @@ * 邮箱校验 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class EmailStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/EnglishStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/EnglishStrategy.java index 5126880492..19ae2e8183 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/EnglishStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/EnglishStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.strategy; @@ -34,7 +35,7 @@ * 英文校验 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class EnglishStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/EqualsStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/EqualsStrategy.java index 3d2b676470..aaf59f0974 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/EqualsStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/EqualsStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.strategy; @@ -35,7 +36,7 @@ * EQUALS 校验 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class EqualsStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/FalseStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/FalseStrategy.java index 3c8534cbb1..7b76d228b5 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/FalseStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/FalseStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.strategy; @@ -33,7 +34,7 @@ * FALSE 校验 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class FalseStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/IPAddressStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/IPAddressStrategy.java index 998d7c39fb..6e0fc49680 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/IPAddressStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/IPAddressStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.strategy; @@ -34,7 +35,7 @@ * IP地址校验 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class IPAddressStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/InEnumStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/InEnumStrategy.java index cef87cebb3..d1633fc505 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/InEnumStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/InEnumStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.strategy; @@ -38,7 +39,7 @@ * int enum 校验 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class InEnumStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/InStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/InStrategy.java index 467dbec88e..9d126191c8 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/InStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/InStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.strategy; @@ -34,7 +35,7 @@ * IN 校验 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class InStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/IntRangeStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/IntRangeStrategy.java index 6f020ca1d2..30240a01fb 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/IntRangeStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/IntRangeStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.strategy; @@ -39,7 +40,7 @@ * INT RANGE 校验 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class IntRangeStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/LengthStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/LengthStrategy.java index a04abd676c..c8e024661c 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/LengthStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/LengthStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.strategy; @@ -36,7 +37,7 @@ * 数据长度校验 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class LengthStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/MobileStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/MobileStrategy.java index 8f5c211e70..e977f147d3 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/MobileStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/MobileStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.strategy; @@ -34,7 +35,7 @@ * 移动电话校验 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MobileStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/MultiStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/MultiStrategy.java index 7719ef86e8..a31933ee87 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/MultiStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/MultiStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.strategy; @@ -37,7 +38,7 @@ * 多规则匹配校验 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class MultiStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/NotBlankStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/NotBlankStrategy.java index 80f6eb5281..78f85b3609 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/NotBlankStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/NotBlankStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.strategy; @@ -34,7 +35,7 @@ * NOT blank 校验 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NotBlankStrategy implements Validator, Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/NotInStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/NotInStrategy.java index 8e961c995b..df8804260e 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/NotInStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/NotInStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.strategy; @@ -34,7 +35,7 @@ * NOT IN 校验 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NotInStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/NotNullStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/NotNullStrategy.java index 4bdafc65b4..0b88874a08 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/NotNullStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/NotNullStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.strategy; @@ -33,7 +34,7 @@ * NOT NUll 校验 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NotNullStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/NullStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/NullStrategy.java index c1e9ed73c0..1adf109ac7 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/NullStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/NullStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.strategy; @@ -34,7 +35,7 @@ * NULL校验 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class NullStrategy implements Validator, Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/PhoneStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/PhoneStrategy.java index 4b4def8c50..b8cde153b1 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/PhoneStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/PhoneStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.strategy; @@ -34,7 +35,7 @@ * 移动电话校验 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class PhoneStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/ReflectStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/ReflectStrategy.java index cd9f2b0ea4..b3e9313942 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/ReflectStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/ReflectStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.strategy; @@ -40,7 +41,7 @@ * 反射信息校验 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class ReflectStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/RegexStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/RegexStrategy.java index eb53513712..672fe7a496 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/RegexStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/RegexStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.strategy; @@ -35,7 +36,7 @@ * 正则匹配校验 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class RegexStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/TrueStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/TrueStrategy.java index 0e8e079ea8..cb43bd523e 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/TrueStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/TrueStrategy.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.strategy; @@ -33,7 +34,7 @@ * Boolean true 校验 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class TrueStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/validators/Checker.java b/bus-validate/src/main/java/org/aoju/bus/validate/validators/Checker.java index eb1e16d7e4..92b60cee8c 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/validators/Checker.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/validators/Checker.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.validators; @@ -45,7 +46,7 @@ * 校验检查器 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ public class Checker { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/validators/Matcher.java b/bus-validate/src/main/java/org/aoju/bus/validate/validators/Matcher.java index 09d830fccf..980ad714bf 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/validators/Matcher.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/validators/Matcher.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.validators; @@ -30,7 +31,7 @@ * 校验器接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @FunctionalInterface diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/validators/Property.java b/bus-validate/src/main/java/org/aoju/bus/validate/validators/Property.java index 51190eb59f..0157357286 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/validators/Property.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/validators/Property.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.validators; @@ -40,7 +41,7 @@ * 校验注解所包含的通用属性 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @Data diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/validators/Validator.java b/bus-validate/src/main/java/org/aoju/bus/validate/validators/Validator.java index e2ec7da9f2..7b3ab09146 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/validators/Validator.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/validators/Validator.java @@ -21,6 +21,7 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * * THE SOFTWARE. * + * * ********************************************************************************/ package org.aoju.bus.validate.validators; @@ -30,7 +31,7 @@ * 校验器接口 * * @author Kimi Liu - * @version 6.1.1 + * @version 6.1.2 * @since JDK 1.8+ */ @FunctionalInterface