From 5eedb7544b3330a5e71041a854d712c2af062a31 Mon Sep 17 00:00:00 2001 From: cal101 Date: Mon, 15 Mar 2021 00:03:34 +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.18/jdt.php For erefactor see https://github.com/cal101/erefactor --- .../core/convert/impl/CharacterConverter.java | 2 +- .../convert/impl/CollectionConverter.java | 10 +++--- .../core/convert/impl/CurrencyConverter.java | 2 +- .../core/convert/impl/DurationConverter.java | 4 +-- .../convert/impl/GenericEnumConverter.java | 6 ++-- .../core/convert/impl/LocaleConverter.java | 4 +-- .../core/convert/impl/MapConverter.java | 8 ++--- .../core/convert/impl/OptionalConverter.java | 4 +-- .../core/convert/impl/PathConverter.java | 6 ++-- .../core/convert/impl/PeriodConverter.java | 4 +-- .../core/convert/impl/ReferenceConverter.java | 12 +++---- .../impl/StackTraceElementConverter.java | 2 +- .../core/convert/impl/URIConverter.java | 2 +- .../core/convert/impl/URLConverter.java | 2 +- .../core/convert/impl/UUIDConverter.java | 2 +- .../core/convert/impl/package-info.java | 2 +- .../cn/hutool/core/convert/package-info.java | 2 +- .../java/cn/hutool/core/date/DateBetween.java | 20 +++++------ .../cn/hutool/core/date/DateException.java | 8 ++--- .../java/cn/hutool/core/date/DateField.java | 34 +++++++++---------- 20 files changed, 68 insertions(+), 68 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/CharacterConverter.java b/hutool-core/src/main/java/cn/hutool/core/convert/impl/CharacterConverter.java index 6862a122c..85b8e0283 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/CharacterConverter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/impl/CharacterConverter.java @@ -6,7 +6,7 @@ import cn.hutool.core.util.StrUtil; /** * 字符转换器 - * + * * @author Looly * */ diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/CollectionConverter.java b/hutool-core/src/main/java/cn/hutool/core/convert/impl/CollectionConverter.java index f3098514e..3b78db2c3 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/CollectionConverter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/impl/CollectionConverter.java @@ -10,7 +10,7 @@ import java.util.Collection; /** * 各种集合类转换器 - * + * * @author Looly * @since 3.0.8 */ @@ -31,7 +31,7 @@ public class CollectionConverter implements Converter> { // ---------------------------------------------------------------------------------------------- Constractor start /** * 构造 - * + * * @param collectionType 集合类型 */ public CollectionConverter(Type collectionType) { @@ -40,7 +40,7 @@ public class CollectionConverter implements Converter> { /** * 构造 - * + * * @param collectionType 集合类型 */ public CollectionConverter(Class collectionType) { @@ -49,7 +49,7 @@ public class CollectionConverter implements Converter> { /** * 构造 - * + * * @param collectionType 集合类型 * @param elementType 集合元素类型 */ @@ -67,7 +67,7 @@ public class CollectionConverter implements Converter> { /** * 内部转换 - * + * * @param value 值 * @return 转换后的集合对象 */ diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/CurrencyConverter.java b/hutool-core/src/main/java/cn/hutool/core/convert/impl/CurrencyConverter.java index 73a19e0dc..ffab3fbe3 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/CurrencyConverter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/impl/CurrencyConverter.java @@ -6,7 +6,7 @@ import cn.hutool.core.convert.AbstractConverter; /** * 货币{@link Currency} 转换器 - * + * * @author Looly * @since 3.0.8 */ diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/DurationConverter.java b/hutool-core/src/main/java/cn/hutool/core/convert/impl/DurationConverter.java index 625886f8c..6f5753275 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/DurationConverter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/impl/DurationConverter.java @@ -6,9 +6,9 @@ import java.time.Duration; import java.time.temporal.TemporalAmount; /** - * + * * {@link Duration}对象转换器 - * + * * @author Looly * @since 5.0.0 */ diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/GenericEnumConverter.java b/hutool-core/src/main/java/cn/hutool/core/convert/impl/GenericEnumConverter.java index 5529b01a1..e5f6250f6 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/GenericEnumConverter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/impl/GenericEnumConverter.java @@ -4,7 +4,7 @@ import cn.hutool.core.convert.AbstractConverter; /** * 泛型枚举转换器 - * + * * @param 枚举类类型 * @author Looly * @since 4.0.2 @@ -15,10 +15,10 @@ public class GenericEnumConverter> extends AbstractConverter enumClass; - + /** * 构造 - * + * * @param enumClass 转换成的目标Enum类 */ public GenericEnumConverter(Class enumClass) { diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/LocaleConverter.java b/hutool-core/src/main/java/cn/hutool/core/convert/impl/LocaleConverter.java index bdc7f2850..8f46f8d9e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/LocaleConverter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/impl/LocaleConverter.java @@ -6,10 +6,10 @@ import cn.hutool.core.convert.AbstractConverter; import cn.hutool.core.util.StrUtil; /** - * + * * {@link Locale}对象转换器
* 只提供String转换支持 - * + * * @author Looly * @since 4.5.2 */ diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/MapConverter.java b/hutool-core/src/main/java/cn/hutool/core/convert/impl/MapConverter.java index 5110e96e7..f3dfcbd7e 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/MapConverter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/impl/MapConverter.java @@ -14,7 +14,7 @@ import java.util.Objects; /** * {@link Map} 转换器 - * + * * @author Looly * @since 3.0.8 */ @@ -30,7 +30,7 @@ public class MapConverter extends AbstractConverter> { /** * 构造，Map的key和value泛型类型自动获取 - * + * * @param mapType Map类型 */ public MapConverter(Type mapType) { @@ -39,7 +39,7 @@ public class MapConverter extends AbstractConverter> { /** * 构造 - * + * * @param mapType Map类型 * @param keyType 键类型 * @param valueType 值类型 @@ -77,7 +77,7 @@ public class MapConverter extends AbstractConverter> { /** * Map转Map - * + * * @param srcMap 源Map * @param targetMap 目标Map */ diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/OptionalConverter.java b/hutool-core/src/main/java/cn/hutool/core/convert/impl/OptionalConverter.java index cd13fce7e..2c270ad96 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/OptionalConverter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/impl/OptionalConverter.java @@ -5,9 +5,9 @@ import cn.hutool.core.convert.AbstractConverter; import java.util.Optional; /** - * + * * {@link Optional}对象转换器 - * + * * @author Looly * @since 5.0.0 */ diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/PathConverter.java b/hutool-core/src/main/java/cn/hutool/core/convert/impl/PathConverter.java index c11cee498..a6ab97b92 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/PathConverter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/impl/PathConverter.java @@ -22,15 +22,15 @@ public class PathConverter extends AbstractConverter{ if(value instanceof URI){ return Paths.get((URI)value); } - + if(value instanceof URL){ return Paths.get(((URL)value).toURI()); } - + if(value instanceof File){ return ((File)value).toPath(); } - + return Paths.get(convertToStr(value)); } catch (Exception e) { // Ignore Exception diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/PeriodConverter.java b/hutool-core/src/main/java/cn/hutool/core/convert/impl/PeriodConverter.java index 1cbc34411..3c77dc2a1 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/PeriodConverter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/impl/PeriodConverter.java @@ -6,9 +6,9 @@ import java.time.Period; import java.time.temporal.TemporalAmount; /** - * + * * {@link Period}对象转换器 - * + * * @author Looly * @since 5.0.0 */ diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/ReferenceConverter.java b/hutool-core/src/main/java/cn/hutool/core/convert/impl/ReferenceConverter.java index 41e7f7e30..f7e65727d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/ReferenceConverter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/impl/ReferenceConverter.java @@ -12,16 +12,16 @@ import java.lang.reflect.Type; /** * {@link Reference}转换器 - * + * * @author Looly * @since 3.0.8 */ @SuppressWarnings("rawtypes") public class ReferenceConverter extends AbstractConverter { private static final long serialVersionUID = 1L; - + private final Class targetType; - + /** * 构造 * @param targetType {@link Reference}实现类型 @@ -33,7 +33,7 @@ public class ReferenceConverter extends AbstractConverter { @SuppressWarnings("unchecked") @Override protected Reference convertInternal(Object value) { - + //尝试将值转换为Reference泛型的类型 Object targetValue = null; final Type paramType = TypeUtil.getTypeArgument(targetType); @@ -43,13 +43,13 @@ public class ReferenceConverter extends AbstractConverter { if(null == targetValue){ targetValue = value; } - + if(this.targetType == WeakReference.class){ return new WeakReference(targetValue); }else if(this.targetType == SoftReference.class){ return new SoftReference(targetValue); } - + throw new UnsupportedOperationException(StrUtil.format("Unsupport Reference type: {}", this.targetType.getName())); } diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/StackTraceElementConverter.java b/hutool-core/src/main/java/cn/hutool/core/convert/impl/StackTraceElementConverter.java index 9c9cfefba..79d32f48d 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/StackTraceElementConverter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/impl/StackTraceElementConverter.java @@ -9,7 +9,7 @@ import cn.hutool.core.util.ObjectUtil; /** * {@link StackTraceElement} 转换器
* 只支持Map方式转换 - * + * * @author Looly * @since 3.0.8 */ diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/URIConverter.java b/hutool-core/src/main/java/cn/hutool/core/convert/impl/URIConverter.java index 6136700e5..94827aa15 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/URIConverter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/impl/URIConverter.java @@ -20,7 +20,7 @@ public class URIConverter extends AbstractConverter{ if(value instanceof File){ return ((File)value).toURI(); } - + if(value instanceof URL){ return ((URL)value).toURI(); } diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/URLConverter.java b/hutool-core/src/main/java/cn/hutool/core/convert/impl/URLConverter.java index c3eee3388..df0a2b288 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/URLConverter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/impl/URLConverter.java @@ -20,7 +20,7 @@ public class URLConverter extends AbstractConverter{ if(value instanceof File){ return ((File)value).toURI().toURL(); } - + if(value instanceof URI){ return ((URI)value).toURL(); } diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/UUIDConverter.java b/hutool-core/src/main/java/cn/hutool/core/convert/impl/UUIDConverter.java index f183f4355..35a7d8bd8 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/UUIDConverter.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/impl/UUIDConverter.java @@ -6,7 +6,7 @@ import cn.hutool.core.convert.AbstractConverter; /** * UUID对象转换器转换器 - * + * * @author Looly * @since 4.0.10 * diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/impl/package-info.java b/hutool-core/src/main/java/cn/hutool/core/convert/impl/package-info.java index bbf7493b3..d04c3c24c 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/impl/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/impl/package-info.java @@ -1,6 +1,6 @@ /** * 各种类型转换的实现类，其都为Converter接口的实现，用于将未知的Object类型转换为指定类型 - * + * * @author looly * */ diff --git a/hutool-core/src/main/java/cn/hutool/core/convert/package-info.java b/hutool-core/src/main/java/cn/hutool/core/convert/package-info.java index a141fb641..da721a9d3 100644 --- a/hutool-core/src/main/java/cn/hutool/core/convert/package-info.java +++ b/hutool-core/src/main/java/cn/hutool/core/convert/package-info.java @@ -1,6 +1,6 @@ /** * 万能类型转换器以及各种类型转换的实现类，其中Convert为转换器入口，提供各种toXXX方法和convert方法 - * + * * @author looly * */ diff --git a/hutool-core/src/main/java/cn/hutool/core/date/DateBetween.java b/hutool-core/src/main/java/cn/hutool/core/date/DateBetween.java index 7903d9262..3be908942 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/DateBetween.java +++ b/hutool-core/src/main/java/cn/hutool/core/date/DateBetween.java @@ -8,7 +8,7 @@ import java.util.Date; /** * 日期间隔 - * + * * @author Looly * */ @@ -23,7 +23,7 @@ public class DateBetween implements Serializable{ /** * 创建
* 在前的日期做为起始时间，在后的做为结束时间，间隔只保留绝对值正数 - * + * * @param begin 起始时间 * @param end 结束时间 * @return DateBetween @@ -36,7 +36,7 @@ public class DateBetween implements Serializable{ /** * 创建
* 在前的日期做为起始时间，在后的做为结束时间，间隔只保留绝对值正数 - * + * * @param begin 起始时间 * @param end 结束时间 * @param isAbs 日期间隔是否只保留绝对值正数 @@ -50,7 +50,7 @@ public class DateBetween implements Serializable{ /** * 构造
* 在前的日期做为起始时间，在后的做为结束时间，间隔只保留绝对值正数 - * + * * @param begin 起始时间 * @param end 结束时间 */ @@ -61,7 +61,7 @@ public class DateBetween implements Serializable{ /** * 构造
* 在前的日期做为起始时间，在后的做为结束时间 - * + * * @param begin 起始时间 * @param end 结束时间 * @param isAbs 日期间隔是否只保留绝对值正数 @@ -70,7 +70,7 @@ public class DateBetween implements Serializable{ public DateBetween(Date begin, Date end, boolean isAbs) { Assert.notNull(begin, "Begin date is null !"); Assert.notNull(end, "End date is null !"); - + if (isAbs && begin.after(end)) { // 间隔只为正数的情况下，如果开始日期晚于结束日期，置换之 this.begin = end; @@ -84,7 +84,7 @@ public class DateBetween implements Serializable{ /** * 判断两个日期相差的时长
* 返回 给定单位的时长差 - * + * * @param unit 相差的单位：相差 天{@link DateUnit#DAY}、小时{@link DateUnit#HOUR} 等 * @return 时长差 */ @@ -96,7 +96,7 @@ public class DateBetween implements Serializable{ /** * 计算两个日期相差月数
* 在非重置情况下，如果起始日期的天大于结束日期的天，月数要少算1（不足1个月） - * + * * @param isReset 是否重置时间为起始时间（重置天时分秒） * @return 相差月数 * @since 3.0.8 @@ -123,7 +123,7 @@ public class DateBetween implements Serializable{ /** * 计算两个日期相差年数
* 在非重置情况下，如果起始日期的月大于结束日期的月，年数要少算1（不足1年） - * + * * @param isReset 是否重置时间为起始时间（重置月天时分秒） * @return 相差年数 * @since 3.0.8 @@ -155,7 +155,7 @@ public class DateBetween implements Serializable{ /** * 格式化输出时间差
- * + * * @param level 级别 * @return 字符串 */ diff --git a/hutool-core/src/main/java/cn/hutool/core/date/DateException.java b/hutool-core/src/main/java/cn/hutool/core/date/DateException.java index ff723d4c2..b22ec6fed 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/DateException.java +++ b/hutool-core/src/main/java/cn/hutool/core/date/DateException.java @@ -13,19 +13,19 @@ public class DateException extends RuntimeException{ public DateException(Throwable e) { super(ExceptionUtil.getMessage(e), e); } - + public DateException(String message) { super(message); } - + public DateException(String messageTemplate, Object... params) { super(StrUtil.format(messageTemplate, params)); } - + public DateException(String message, Throwable throwable) { super(message, throwable); } - + public DateException(Throwable throwable, String messageTemplate, Object... params) { super(StrUtil.format(messageTemplate, params), throwable); } diff --git a/hutool-core/src/main/java/cn/hutool/core/date/DateField.java b/hutool-core/src/main/java/cn/hutool/core/date/DateField.java index 09fffb8be..19025fe7b 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/DateField.java +++ b/hutool-core/src/main/java/cn/hutool/core/date/DateField.java @@ -5,7 +5,7 @@ import java.util.Calendar; /** * 日期各个部分的枚举
* 与Calendar相应值对应 - * + * * @author Looly * */ @@ -13,91 +13,91 @@ public enum DateField { /** * 世纪 - * + * * @see Calendar#ERA */ ERA(Calendar.ERA), /** * 年 - * + * * @see Calendar#YEAR */ YEAR(Calendar.YEAR), /** * 月 - * + * * @see Calendar#MONTH */ MONTH(Calendar.MONTH), /** * 一年中第几周 - * + * * @see Calendar#WEEK_OF_YEAR */ WEEK_OF_YEAR(Calendar.WEEK_OF_YEAR), /** * 一月中第几周 - * + * * @see Calendar#WEEK_OF_MONTH */ WEEK_OF_MONTH(Calendar.WEEK_OF_MONTH), /** * 一月中的第几天 - * + * * @see Calendar#DAY_OF_MONTH */ DAY_OF_MONTH(Calendar.DAY_OF_MONTH), /** * 一年中的第几天 - * + * * @see Calendar#DAY_OF_YEAR */ DAY_OF_YEAR(Calendar.DAY_OF_YEAR), /** * 周几，1表示周日，2表示周一 - * + * * @see Calendar#DAY_OF_WEEK */ DAY_OF_WEEK(Calendar.DAY_OF_WEEK), /** * 天所在的周是这个月的第几周 - * + * * @see Calendar#DAY_OF_WEEK_IN_MONTH */ DAY_OF_WEEK_IN_MONTH(Calendar.DAY_OF_WEEK_IN_MONTH), /** * 上午或者下午 - * + * * @see Calendar#AM_PM */ AM_PM(Calendar.AM_PM), /** * 小时，用于12小时制 - * + * * @see Calendar#HOUR */ HOUR(Calendar.HOUR), /** * 小时，用于24小时制 - * + * * @see Calendar#HOUR */ HOUR_OF_DAY(Calendar.HOUR_OF_DAY), /** * 分钟 - * + * * @see Calendar#MINUTE */ MINUTE(Calendar.MINUTE), /** * 秒 - * + * * @see Calendar#SECOND */ SECOND(Calendar.SECOND), /** * 毫秒 - * + * * @see Calendar#MILLISECOND */ MILLISECOND(Calendar.MILLISECOND); @@ -115,7 +115,7 @@ public enum DateField { /** * 将 {@link Calendar}相关值转换为DatePart枚举对象
- * + * * @param calendarPartIntValue Calendar中关于Week的int值 * @return {@link DateField} */