From 7a096caef5bafc8ceac4da42c935993289047631 Mon Sep 17 00:00:00 2001 From: cal101 Date: Sun, 6 Jun 2021 14:00:57 +0000 Subject: [PATCH] [cleanup] erefactor/EclipseJdt - Remove trailing whitespace - All lines EclipseJdt cleanup 'RemoveAllTrailingWhitespace' applied by erefactor. For EclipseJdt see https://www.eclipse.org/eclipse/news/4.19/jdt.php For erefactor see https://github.com/cal101/erefactor --- .../java/cn/hutool/core/lang/caller/Caller.java | 12 ++++++------ .../cn/hutool/core/lang/caller/CallerUtil.java | 16 ++++++++-------- .../core/lang/caller/SecurityManagerCaller.java | 4 ++-- .../core/lang/caller/StackTraceCaller.java | 2 +- .../cn/hutool/core/lang/caller/package-info.java | 2 +- .../hutool/core/lang/copier/SrcToDestCopier.java | 14 +++++++------- .../cn/hutool/core/lang/copier/package-info.java | 2 +- .../cn/hutool/core/lang/func/package-info.java | 2 +- .../hutool/core/lang/generator/package-info.java | 2 +- .../cn/hutool/core/lang/hash/MurmurHash.java | 12 ++++++------ .../cn/hutool/core/lang/hash/package-info.java | 2 +- .../cn/hutool/core/lang/loader/AtomicLoader.java | 6 +++--- .../cn/hutool/core/lang/loader/LazyLoader.java | 4 ++-- .../java/cn/hutool/core/lang/loader/Loader.java | 4 ++-- .../cn/hutool/core/lang/loader/package-info.java | 2 +- .../cn/hutool/core/lang/mutable/Mutable.java | 2 +- .../cn/hutool/core/lang/mutable/MutableBool.java | 8 ++++---- .../cn/hutool/core/lang/mutable/MutableByte.java | 12 ++++++------ .../hutool/core/lang/mutable/MutableDouble.java | 12 ++++++------ .../hutool/core/lang/mutable/MutableFloat.java | 12 ++++++------ 20 files changed, 66 insertions(+), 66 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/caller/Caller.java b/hutool-core/src/main/java/cn/hutool/core/lang/caller/Caller.java index 49598f588..c372e2c89 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/caller/Caller.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/caller/Caller.java @@ -3,35 +3,35 @@ package cn.hutool.core.lang.caller; /** * 调用者接口
* 可以通过此接口的实现类方法获取调用者、多级调用者以及判断是否被调用 - * + * * @author Looly * */ public interface Caller { /** * 获得调用者 - * + * * @return 调用者 */ Class getCaller(); /** * 获得调用者的调用者 - * + * * @return 调用者的调用者 */ Class getCallerCaller(); /** * 获得调用者，指定第几级调用者 调用者层级关系： - * + * * 
 	 * 0 {@link CallerUtil}
 	 * 1 调用{@link CallerUtil}中方法的类
 	 * 2 调用者的调用者
 	 * ...
 	 *
- * + * * @param depth 层级。0表示{@link CallerUtil}本身，1表示调用{@link CallerUtil}的类，2表示调用者的调用者，依次类推 * @return 第几级调用者 */ @@ -39,7 +39,7 @@ public interface Caller { /** * 是否被指定类调用 - * + * * @param clazz 调用者类 * @return 是否被调用 */ diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/caller/CallerUtil.java b/hutool-core/src/main/java/cn/hutool/core/lang/caller/CallerUtil.java index c80c95cff..cca4fbe4d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/caller/CallerUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/caller/CallerUtil.java @@ -2,7 +2,7 @@ package cn.hutool.core.lang.caller; /** * 调用者。可以通过此类的方法获取调用者、多级调用者以及判断是否被调用 - * + * * @author Looly * @since 4.1.6 */ @@ -14,7 +14,7 @@ public class CallerUtil { /** * 获得调用者 - * + * * @return 调用者 */ public static Class getCaller() { @@ -23,7 +23,7 @@ public class CallerUtil { /** * 获得调用者的调用者 - * + * * @return 调用者的调用者 */ public static Class getCallerCaller() { @@ -33,14 +33,14 @@ public class CallerUtil { /** * 获得调用者，指定第几级调用者
* 调用者层级关系： - * + * * 
 	 * 0 {@link CallerUtil}
 	 * 1 调用{@link CallerUtil}中方法的类
 	 * 2 调用者的调用者
 	 * ...
 	 *
- * + * * @param depth 层级。0表示{@link CallerUtil}本身，1表示调用{@link CallerUtil}的类，2表示调用者的调用者，依次类推 * @return 第几级调用者 */ @@ -50,7 +50,7 @@ public class CallerUtil { /** * 是否被指定类调用 - * + * * @param clazz 调用者类 * @return 是否被调用 */ @@ -77,7 +77,7 @@ public class CallerUtil { /** * 尝试创建{@link Caller}实现 - * + * * @return {@link Caller}实现 */ private static Caller tryCreateCaller() { @@ -90,7 +90,7 @@ public class CallerUtil { } catch (Throwable e) { //ignore } - + caller = new StackTraceCaller(); return caller; } diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/caller/SecurityManagerCaller.java b/hutool-core/src/main/java/cn/hutool/core/lang/caller/SecurityManagerCaller.java index 5f31c14d0..720247580 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/caller/SecurityManagerCaller.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/caller/SecurityManagerCaller.java @@ -6,12 +6,12 @@ import cn.hutool.core.util.ArrayUtil; /** * {@link SecurityManager} 方式获取调用者 - * + * * @author Looly */ public class SecurityManagerCaller extends SecurityManager implements Caller, Serializable { private static final long serialVersionUID = 1L; - + private static final int OFFSET = 1; @Override diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/caller/StackTraceCaller.java b/hutool-core/src/main/java/cn/hutool/core/lang/caller/StackTraceCaller.java index ebad26c87..45a5f843e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/caller/StackTraceCaller.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/caller/StackTraceCaller.java @@ -6,7 +6,7 @@ import cn.hutool.core.exceptions.UtilException; /** * 通过StackTrace方式获取调用者。此方式效率最低，不推荐使用 - * + * * @author Looly */ public class StackTraceCaller implements Caller, Serializable { diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/caller/package-info.java b/hutool-core/src/main/java/cn/hutool/core/lang/caller/package-info.java index 309254685..5380baf72 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/caller/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/caller/package-info.java @@ -1,6 +1,6 @@ /** * 调用者接口及实现。可以通过此类的方法获取调用者、多级调用者以及判断是否被调用 - * + * * @author looly * */ diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/copier/SrcToDestCopier.java b/hutool-core/src/main/java/cn/hutool/core/lang/copier/SrcToDestCopier.java index e9e6b075a..8efd688f8 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/copier/SrcToDestCopier.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/copier/SrcToDestCopier.java @@ -7,7 +7,7 @@ import cn.hutool.core.lang.Filter; /** * 复制器抽象类
* 抽象复制器抽象了一个对象复制到另一个对象，通过实现{@link #copy()}方法实现复制逻辑。
- * + * * @author Looly * * @param 拷贝的对象 @@ -16,14 +16,14 @@ import cn.hutool.core.lang.Filter; */ public abstract class SrcToDestCopier> implements Copier, Serializable{ private static final long serialVersionUID = 1L; - + /** 源 */ protected T src; /** 目标 */ protected T dest; /** 拷贝过滤器，可以过滤掉不需要拷贝的源 */ protected Filter copyFilter; - + //-------------------------------------------------------------------------------------------------------- Getters and Setters start /** * 获取源 @@ -34,7 +34,7 @@ public abstract class SrcToDestCopier> implem } /** * 设置源 - * + * * @param src 源 * @return this */ @@ -46,7 +46,7 @@ public abstract class SrcToDestCopier> implem /** * 获得目标 - * + * * @return 目标 */ public T getDest() { @@ -54,7 +54,7 @@ public abstract class SrcToDestCopier> implem } /** * 设置目标 - * + * * @param dest 目标 * @return this */ @@ -73,7 +73,7 @@ public abstract class SrcToDestCopier> implem } /** * 设置过滤器 - * + * * @param copyFilter 过滤器 * @return this */ diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/copier/package-info.java b/hutool-core/src/main/java/cn/hutool/core/lang/copier/package-info.java index c6c253f58..75f0babd3 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/copier/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/copier/package-info.java @@ -1,6 +1,6 @@ /** * 拷贝抽象实现，通过抽象拷贝，可以实现文件、流、Buffer之间的拷贝实现 - * + * * @author looly * */ diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/func/package-info.java b/hutool-core/src/main/java/cn/hutool/core/lang/func/package-info.java index 7df54ee01..84fc234e6 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/func/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/func/package-info.java @@ -3,7 +3,7 @@ * 接口灵感来自于ActFramework
* 一个函数接口代表一个一个函数，用于包装一个函数为对象
* 在JDK8之前，Java的函数并不能作为参数传递，也不能作为返回值存在，此接口用于将一个函数包装成为一个对象，从而传递对象 - * + * * @author looly * */ diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/generator/package-info.java b/hutool-core/src/main/java/cn/hutool/core/lang/generator/package-info.java index c04739ffe..76ab4d9d0 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/generator/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/generator/package-info.java @@ -1,6 +1,6 @@ /** * 提供生成器接口及相关封装 - * + * * @author looly * */ diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/hash/MurmurHash.java b/hutool-core/src/main/java/cn/hutool/core/lang/hash/MurmurHash.java index 1540b7508..b3dd26961 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/hash/MurmurHash.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/hash/MurmurHash.java @@ -9,12 +9,12 @@ import java.nio.charset.Charset; /** * Murmur3 32bit、64bit、128bit 哈希算法实现
* 此算法来自于：https://github.com/xlturing/Simhash4J/blob/master/src/main/java/bee/simhash/main/Murmur3.java - * + * *

* 32-bit Java port of https://code.google.com/p/smhasher/source/browse/trunk/MurmurHash3.cpp#94
* 128-bit Java port of https://code.google.com/p/smhasher/source/browse/trunk/MurmurHash3.cpp#255 *

- * + * * @author looly,Simhash4J * @since 4.3.3 */ @@ -41,7 +41,7 @@ public class MurmurHash implements Serializable{ private static final int DEFAULT_SEED = 0; private static final Charset DEFAULT_CHARSET = CharsetUtil.CHARSET_UTF_8; - + /** * Murmur3 32-bit Hash值计算 * @@ -118,7 +118,7 @@ public class MurmurHash implements Serializable{ return hash; } - + /** * Murmur3 64-bit Hash值计算 * @@ -132,7 +132,7 @@ public class MurmurHash implements Serializable{ /** * Murmur3 64-bit 算法
* This is essentially MSB 8 bytes of Murmur3 128-bit variant. - * + * * * @param data 数据 * @return Hash值 @@ -204,7 +204,7 @@ public class MurmurHash implements Serializable{ return hash; } - + /** * Murmur3 128-bit Hash值计算 * diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/hash/package-info.java b/hutool-core/src/main/java/cn/hutool/core/lang/hash/package-info.java index 6dacc1ce3..08ec2a52e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/hash/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/hash/package-info.java @@ -1,6 +1,6 @@ /** * 提供Hash算法的封装 - * + * * @author looly * */ diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/loader/AtomicLoader.java b/hutool-core/src/main/java/cn/hutool/core/lang/loader/AtomicLoader.java index dfb588753..dfba71d3c 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/loader/AtomicLoader.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/loader/AtomicLoader.java @@ -10,9 +10,9 @@ import java.util.concurrent.atomic.AtomicReference; * 1. 检查引用中是否有加载好的对象，有则返回 * 2. 如果没有则初始化一个对象，并再次比较引用中是否有其它线程加载好的对象，无则加入，有则返回已有的 * - * + * * 当对象未被创建，对象的初始化操作在多线程情况下可能会被调用多次（多次创建对象），但是总是返回同一对象 - * + * * @author looly * * @param 被加载对象类型 @@ -44,7 +44,7 @@ public abstract class AtomicLoader implements Loader, Serializable { /** * 初始化被加载的对象
* 如果对象从未被加载过，调用此方法初始化加载对象，此方法只被调用一次 - * + * * @return 被加载的对象 */ protected abstract T init(); diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/loader/LazyLoader.java b/hutool-core/src/main/java/cn/hutool/core/lang/loader/LazyLoader.java index e58826d3e..5f9faa950 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/loader/LazyLoader.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/loader/LazyLoader.java @@ -7,7 +7,7 @@ import java.io.Serializable; * 在load方法被调用前，对象未被加载，直到被调用后才开始加载
* 此加载器常用于对象比较庞大而不一定被使用的情况，用于减少启动时资源占用问题
* 此加载器使用双重检查（Double-Check）方式检查对象是否被加载，避免多线程下重复加载或加载丢失问题 - * + * * @author looly * * @param 被加载对象类型 @@ -38,7 +38,7 @@ public abstract class LazyLoader implements Loader, Serializable { /** * 初始化被加载的对象
* 如果对象从未被加载过，调用此方法初始化加载对象，此方法只被调用一次 - * + * * @return 被加载的对象 */ protected abstract T init(); diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/loader/Loader.java b/hutool-core/src/main/java/cn/hutool/core/lang/loader/Loader.java index 8f3aa85bb..245126182 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/loader/Loader.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/loader/Loader.java @@ -3,7 +3,7 @@ package cn.hutool.core.lang.loader; /** * 对象加载抽象接口
* 通过实现此接口自定义实现对象的加载方式，例如懒加载机制、多线程加载等 - * + * * @author looly * * @param 对象类型 @@ -14,7 +14,7 @@ public interface Loader { /** * 获取一个准备好的对象
* 通过准备逻辑准备好被加载的对象，然后返回。在准备完毕之前此方法应该被阻塞 - * + * * @return 加载完毕的对象 */ T get(); diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/loader/package-info.java b/hutool-core/src/main/java/cn/hutool/core/lang/loader/package-info.java index f54ff4db1..70a00685d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/loader/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/loader/package-info.java @@ -1,6 +1,6 @@ /** * 加载器的抽象接口和实现，包括懒加载的实现等 - * + * * @author looly * */ diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/Mutable.java b/hutool-core/src/main/java/cn/hutool/core/lang/mutable/Mutable.java index 013577b94..e14914014 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/Mutable.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/mutable/Mutable.java @@ -2,7 +2,7 @@ package cn.hutool.core.lang.mutable; /** * 提供可变值类型接口 - * + * * @param 值得类型 * @since 3.0.1 */ diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableBool.java b/hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableBool.java index 2a83edd8c..ffd2b67c5 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableBool.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableBool.java @@ -4,13 +4,13 @@ import java.io.Serializable; /** * 可变 boolean 类型 - * + * * @see Boolean * @since 3.0.1 */ public class MutableBool implements Comparable, Mutable, Serializable { private static final long serialVersionUID = 1L; - + private boolean value; /** @@ -62,7 +62,7 @@ public class MutableBool implements Comparable, Mutable, S *
  • 类型为 {@link MutableBool}
    • *
  • 值相等
    • * - * + * * @param obj 比对的对象 * @return 相同返回true，否则 false */ @@ -82,7 +82,7 @@ public class MutableBool implements Comparable, Mutable, S // ----------------------------------------------------------------------- /** * 比较 - * + * * @param other 其它 {@link MutableBool} 对象 * @return x==y返回0，x<y返回-1，x>y返回1 */ diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableByte.java b/hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableByte.java index da55305c3..0d0755bf8 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableByte.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableByte.java @@ -4,13 +4,13 @@ import cn.hutool.core.util.NumberUtil; /** * 可变 byte 类型 - * + * * @see Byte * @since 3.0.1 */ public class MutableByte extends Number implements Comparable, Mutable { private static final long serialVersionUID = 1L; - + private byte value; /** @@ -105,7 +105,7 @@ public class MutableByte extends Number implements Comparable, Muta /** * 减去值 - * + * * @param operand 被减的值 * @return this */ @@ -116,7 +116,7 @@ public class MutableByte extends Number implements Comparable, Muta /** * 减去值 - * + * * @param operand 被减的值，非空 * @return this * @throws NullPointerException if the object is null @@ -160,7 +160,7 @@ public class MutableByte extends Number implements Comparable, Muta *
  • 类型为 {@link MutableByte}
    • *
  • 值相等
    • * - * + * * @param obj 比对的对象 * @return 相同返回true，否则 false */ @@ -180,7 +180,7 @@ public class MutableByte extends Number implements Comparable, Muta // ----------------------------------------------------------------------- /** * 比较 - * + * * @param other 其它 {@link MutableByte} 对象 * @return x==y返回0，x<y返回-1，x>y返回1 */ diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableDouble.java b/hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableDouble.java index 78a290683..31a72d8bd 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableDouble.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableDouble.java @@ -4,13 +4,13 @@ import cn.hutool.core.util.NumberUtil; /** * 可变 double 类型 - * + * * @see Double * @since 3.0.1 */ public class MutableDouble extends Number implements Comparable, Mutable { private static final long serialVersionUID = 1L; - + private double value; /** @@ -104,7 +104,7 @@ public class MutableDouble extends Number implements Comparable, /** * 减去值 - * + * * @param operand 被减的值 * @return this */ @@ -115,7 +115,7 @@ public class MutableDouble extends Number implements Comparable, /** * 减去值 - * + * * @param operand 被减的值，非空 * @return this */ @@ -153,7 +153,7 @@ public class MutableDouble extends Number implements Comparable, *
  • 类型为 {@link MutableDouble}
    • *
  • 值相等
    • * - * + * * @param obj 比对的对象 * @return 相同返回true，否则 false */ @@ -174,7 +174,7 @@ public class MutableDouble extends Number implements Comparable, // ----------------------------------------------------------------------- /** * 比较 - * + * * @param other 其它 {@link MutableDouble} 对象 * @return x==y返回0，x<y返回-1，x>y返回1 */ diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableFloat.java b/hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableFloat.java index 6df13dd54..55763acb1 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableFloat.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/mutable/MutableFloat.java @@ -4,13 +4,13 @@ import cn.hutool.core.util.NumberUtil; /** * 可变 float 类型 - * + * * @see Float * @since 3.0.1 */ public class MutableFloat extends Number implements Comparable, Mutable { private static final long serialVersionUID = 1L; - + private float value; /** @@ -105,7 +105,7 @@ public class MutableFloat extends Number implements Comparable, Mu /** * 减去值 - * + * * @param operand 被减的值 * @return this */ @@ -116,7 +116,7 @@ public class MutableFloat extends Number implements Comparable, Mu /** * 减去值 - * + * * @param operand 被减的值，非空 * @return this * @throws NullPointerException if the object is null @@ -155,7 +155,7 @@ public class MutableFloat extends Number implements Comparable, Mu *
  • 类型为 {@link MutableFloat}
    • *
  • 值相等
    • * - * + * * @param obj 比对的对象 * @return 相同返回true，否则 false */ @@ -175,7 +175,7 @@ public class MutableFloat extends Number implements Comparable, Mu // ----------------------------------------------------------------------- /** * 比较 - * + * * @param other 其它 {@link MutableFloat} 对象 * @return x==y返回0，x<y返回-1，x>y返回1 */