diff --git a/bin/update_version.sh b/bin/update_version.sh index e9b8cee5c..569bde9cc 100755 --- a/bin/update_version.sh +++ b/bin/update_version.sh @@ -18,7 +18,7 @@ # 2. 替换README.md和docs中的版本号 #------------------------------------------------ -if [ ! -n "$1" ]; then +if [ !-n "$1" ]; then echo "ERROR: 新版本不存在，请指定参数1" exit fi diff --git a/hutool-all/src/main/java/org/dromara/hutool/Hutool.java b/hutool-all/src/main/java/org/dromara/hutool/Hutool.java index 1f29520e5..fa8d3f957 100644 --- a/hutool-all/src/main/java/org/dromara/hutool/Hutool.java +++ b/hutool-all/src/main/java/org/dromara/hutool/Hutool.java @@ -61,7 +61,7 @@ public class Hutool { */ public static Set> getAllUtils() { return ClassUtil.scanPackage("org.dromara.hutool", - (clazz) -> (! clazz.isInterface()) && StrUtil.endWith(clazz.getSimpleName(), "Util")); + (clazz) -> (!clazz.isInterface()) && StrUtil.endWith(clazz.getSimpleName(), "Util")); } /** diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationProxy.java b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationProxy.java index 2ce7bf7ca..009694141 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationProxy.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationProxy.java @@ -62,7 +62,7 @@ public class AnnotationProxy implements Annotation, Invoca if(null != alias){ final String name = alias.value(); if(StrUtil.isNotBlank(name)){ - if(! attributes.containsKey(name)){ + if(!attributes.containsKey(name)){ throw new IllegalArgumentException(StrUtil.format("No method for alias: [{}]", name)); } return attributes.get(name); diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationUtil.java index 82f3ca4aa..ef82af11b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/AnnotationUtil.java @@ -253,9 +253,9 @@ public class AnnotationUtil { // 只读取无参方法 final String name = t.getName(); // 跳过自有的几个方法 - return (! "hashCode".equals(name)) // - && (! "toString".equals(name)) // - && (! "annotationType".equals(name)); + return (!"hashCode".equals(name)) // + && (!"toString".equals(name)) // + && (!"annotationType".equals(name)); } return false; }); diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/CombinationAnnotationElement.java b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/CombinationAnnotationElement.java index 12c89d521..84e0a9e87 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/annotation/CombinationAnnotationElement.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/annotation/CombinationAnnotationElement.java @@ -146,9 +146,9 @@ public class CombinationAnnotationElement implements AnnotatedElement, Serializa // 直接注解 for (final Annotation annotation : annotations) { annotationType = annotation.annotationType(); - if (! META_ANNOTATIONS.contains(annotationType) + if (!META_ANNOTATIONS.contains(annotationType) // issue#I5FQGW@Gitee：跳过元注解和已经处理过的注解，防止递归调用 - && ! declaredAnnotationMap.containsKey(annotationType)) { + && !declaredAnnotationMap.containsKey(annotationType)) { if(test(annotation)){ declaredAnnotationMap.put(annotationType, annotation); } @@ -167,9 +167,9 @@ public class CombinationAnnotationElement implements AnnotatedElement, Serializa Class annotationType; for (final Annotation annotation : annotations) { annotationType = annotation.annotationType(); - if (! META_ANNOTATIONS.contains(annotationType) + if (!META_ANNOTATIONS.contains(annotationType) // issue#I5FQGW@Gitee：跳过元注解和已经处理过的注解，防止递归调用 - && ! declaredAnnotationMap.containsKey(annotationType)) { + && !declaredAnnotationMap.containsKey(annotationType)) { if(test(annotation)){ annotationMap.put(annotationType, annotation); } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayUtil.java index 257e7cf4a..cd7b9890c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayUtil.java @@ -379,7 +379,7 @@ public class ArrayUtil extends PrimitiveArrayUtil { if (null == arrayObj) { throw new NullPointerException("Argument [arrayObj] is null !"); } - if (! arrayObj.getClass().isArray()) { + if (!arrayObj.getClass().isArray()) { throw new IllegalArgumentException("Argument [arrayObj] is not array !"); } if (null == type) { @@ -1015,7 +1015,7 @@ public class ArrayUtil extends PrimitiveArrayUtil { @SuppressWarnings("unchecked") public static boolean containsAll(final T[] array, final T... values) { for (final T value : values) { - if (! contains(array, value)) { + if (!contains(array, value)) { return false; } } @@ -1313,7 +1313,7 @@ public class ArrayUtil extends PrimitiveArrayUtil { if (null == array) { return null; } - if (! isArray(array)) { + if (!isArray(array)) { throw new IllegalArgumentException(StrUtil.format("[{}] is not a Array!", array.getClass())); } @@ -1593,7 +1593,7 @@ public class ArrayUtil extends PrimitiveArrayUtil { */ public static boolean isAllEmpty(final T[] args) { for (final T obj : args) { - if (! ObjUtil.isEmpty(obj)) { + if (!ObjUtil.isEmpty(obj)) { return false; } } @@ -1609,7 +1609,7 @@ public class ArrayUtil extends PrimitiveArrayUtil { * @since 4.5.18 */ public static boolean isAllNotEmpty(final Object... args) { - return ! hasEmpty(args); + return !hasEmpty(args); } /** @@ -1623,7 +1623,7 @@ public class ArrayUtil extends PrimitiveArrayUtil { */ @SuppressWarnings("unchecked") public static boolean isAllNotNull(final T... array) { - return ! hasNull(array); + return !hasNull(array); } /** @@ -1829,7 +1829,7 @@ public class ArrayUtil extends PrimitiveArrayUtil { } for (int i = 0; i < subArray.length; i++) { - if (! ObjUtil.equals(array[i + firstIndex], subArray[i])) { + if (!ObjUtil.equals(array[i + firstIndex], subArray[i])) { return indexOfSub(array, firstIndex + 1, subArray); } } @@ -1874,7 +1874,7 @@ public class ArrayUtil extends PrimitiveArrayUtil { } for (int i = 0; i < subArray.length; i++) { - if (! ObjUtil.equals(array[i + firstIndex], subArray[i])) { + if (!ObjUtil.equals(array[i + firstIndex], subArray[i])) { return lastIndexOfSub(array, firstIndex - 1, subArray); } } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayWrapper.java b/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayWrapper.java index de7d016d6..3e43521f7 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayWrapper.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/array/ArrayWrapper.java @@ -55,7 +55,7 @@ public class ArrayWrapper implements Wrapper { */ public ArrayWrapper(final A array) { Assert.notNull(array, "Array must be not null!"); - if (! ArrayUtil.isArray(array)) { + if (!ArrayUtil.isArray(array)) { throw new IllegalArgumentException("Object is not a array!"); } this.componentType = array.getClass().getComponentType(); @@ -301,7 +301,7 @@ public class ArrayWrapper implements Wrapper { */ @SuppressWarnings({"unchecked", "SuspiciousSystemArraycopy"}) public ArrayWrapper insert(int index, Object arrayToAppend) { - if (! ArrayUtil.isArray(arrayToAppend)) { + if (!ArrayUtil.isArray(arrayToAppend)) { // 用户传入单个元素则创建单元素数组 arrayToAppend = createSingleElementArray(arrayToAppend); } @@ -355,7 +355,7 @@ public class ArrayWrapper implements Wrapper { */ @SuppressWarnings({"unchecked", "SuspiciousSystemArraycopy"}) public ArrayWrapper replace(final int index, Object values) { - if (! ArrayUtil.isArray(values)) { + if (!ArrayUtil.isArray(values)) { // 用户传入单个元素则创建单元素数组 values = createSingleElementArray(values); } @@ -537,7 +537,7 @@ public class ArrayWrapper implements Wrapper { for (int i = 0; i < this.length; i++) { compare = comparator.compare(get(i), get(i + 1)); if ((isDESC && compare < 0) || - (! isDESC && compare > 0)) { + (!isDESC && compare > 0)) { // 反序，前一个小于后一个则返回错 // 正序，前一个大于后一个则返回错 return false; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanDesc.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanDesc.java index 2863ecca3..d03c27233 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanDesc.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanDesc.java @@ -156,7 +156,7 @@ public class BeanDesc implements Serializable { PropDesc prop; for (final Field field : FieldUtil.getFields(this.beanClass)) { // 排除静态属性和对象子类 - if (! ModifierUtil.isStatic(field) && ! FieldUtil.isOuterClassField(field)) { + if (!ModifierUtil.isStatic(field) && !FieldUtil.isOuterClassField(field)) { prop = createProp(field, gettersAndSetters); // 只有不存在时才放入，防止父类属性覆盖子类属性 this.propMap.putIfAbsent(prop.getFieldName(), prop); @@ -314,7 +314,7 @@ public class BeanDesc implements Serializable { } // 非标准Setter方法跳过 - if (! methodName.startsWith("set")) { + if (!methodName.startsWith("set")) { return false; } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanPath.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanPath.java index 200c1b55b..ac61c6de3 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanPath.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanPath.java @@ -143,7 +143,7 @@ public class BeanPath implements Serializable { subBean = getFieldValue(subBean, patternPart); if (null == subBean) { // 支持表达式的第一个对象为Bean本身（若用户定义表达式$开头，则不做此操作） - if (isFirst && ! this.isStartWith && BeanUtil.isMatchName(bean, patternPart, true)) { + if (isFirst && !this.isStartWith && BeanUtil.isMatchName(bean, patternPart, true)) { subBean = bean; isFirst = false; } else { @@ -186,7 +186,7 @@ public class BeanPath implements Serializable { subBean = getFieldValue(subBean, patternPart); if (null == subBean) { // 支持表达式的第一个对象为Bean本身（若用户定义表达式$开头，则不做此操作） - if (isFirst && ! this.isStartWith && BeanUtil.isMatchName(bean, patternPart, true)) { + if (isFirst && !this.isStartWith && BeanUtil.isMatchName(bean, patternPart, true)) { subBean = bean; isFirst = false; } else { @@ -268,15 +268,15 @@ public class BeanPath implements Serializable { if ('\'' == c) { // 结束 - isInWrap = (! isInWrap); + isInWrap = (!isInWrap); continue; } - if (! isInWrap && ArrayUtil.contains(EXP_CHARS, c)) { + if (!isInWrap && ArrayUtil.contains(EXP_CHARS, c)) { // 处理边界符号 if (CharUtil.BRACKET_END == c) { // 中括号（数字下标）结束 - if (! isNumStart) { + if (!isNumStart) { throw new IllegalArgumentException(StrUtil.format("Bad expression '{}':{}, we find ']' but no '[' !", expression, i)); } isNumStart = false; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanUtil.java index 84d038a62..062d89323 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/BeanUtil.java @@ -130,7 +130,7 @@ public class BeanUtil { if (method.getParameterCount() == 0) { final String name = method.getName(); if (name.startsWith("get") || name.startsWith("is")) { - if (! "getClass".equals(name)) { + if (!"getClass".equals(name)) { return true; } } @@ -150,7 +150,7 @@ public class BeanUtil { public static boolean hasPublicField(final Class clazz) { if (ClassUtil.isNormalClass(clazz)) { for (final Field field : clazz.getFields()) { - if (ModifierUtil.isPublic(field) && ! ModifierUtil.isStatic(field)) { + if (ModifierUtil.isPublic(field) && !ModifierUtil.isStatic(field)) { //非static的public字段 return true; } @@ -220,7 +220,7 @@ public class BeanUtil { } return ArrayUtil.filter(beanInfo.getPropertyDescriptors(), t -> { // 过滤掉getClass方法 - return ! "class".equals(t.getName()); + return !"class".equals(t.getName()); }); } @@ -821,7 +821,7 @@ public class BeanUtil { final String val = (String) FieldUtil.getFieldValue(bean, field); if (null != val) { final String trimVal = StrUtil.trim(val); - if (! val.equals(trimVal)) { + if (!val.equals(trimVal)) { // Field Value不为null，且首尾有空格才处理 FieldUtil.setFieldValue(bean, field, trimVal); } @@ -858,7 +858,7 @@ public class BeanUtil { if (ModifierUtil.isStatic(field)) { continue; } - if ((! ArrayUtil.contains(ignoreFieldNames, field.getName())) + if ((!ArrayUtil.contains(ignoreFieldNames, field.getName())) && null != FieldUtil.getFieldValue(bean, field)) { return false; } @@ -884,7 +884,7 @@ public class BeanUtil { if (ModifierUtil.isStatic(field)) { continue; } - if ((! ArrayUtil.contains(ignoreFieldNames, field.getName())) + if ((!ArrayUtil.contains(ignoreFieldNames, field.getName())) && null == FieldUtil.getFieldValue(bean, field)) { return true; } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/PropDesc.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/PropDesc.java index f0283867f..991407045 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/PropDesc.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/PropDesc.java @@ -141,7 +141,7 @@ public class PropDesc { */ public boolean isReadable(final boolean checkTransient) { // 检查是否有getter方法或是否为public修饰 - if (null == this.getter && ! ModifierUtil.isPublic(this.field)) { + if (null == this.getter && !ModifierUtil.isPublic(this.field)) { return false; } @@ -151,7 +151,7 @@ public class PropDesc { } // 检查@PropIgnore注解 - return ! isIgnoreGet(); + return !isIgnoreGet(); } /** @@ -189,7 +189,7 @@ public class PropDesc { try { result = getValue(bean); } catch (final Exception e) { - if (! ignoreError) { + if (!ignoreError) { throw new BeanException(e, "Get value of [{}] error!", getFieldName()); } } @@ -212,7 +212,7 @@ public class PropDesc { */ public boolean isWritable(final boolean checkTransient) { // 检查是否有getter方法或是否为public修饰 - if (null == this.setter && ! ModifierUtil.isPublic(this.field)) { + if (null == this.setter && !ModifierUtil.isPublic(this.field)) { return false; } @@ -222,7 +222,7 @@ public class PropDesc { } // 检查@PropIgnore注解 - return ! isIgnoreSet(); + return !isIgnoreSet(); } /** @@ -277,24 +277,24 @@ public class PropDesc { // issue#I4JQ1N@Gitee // 非覆盖模式下，如果目标值存在，则跳过 - if (! override && null != getValue(bean)) { + if (!override && null != getValue(bean)) { return this; } // 当类型不匹配的时候，执行默认转换 if (null != value) { final Class propClass = getFieldClass(); - if (! propClass.isInstance(value)) { + if (!propClass.isInstance(value)) { value = Convert.convertWithCheck(propClass, value, null, ignoreError); } } // 属性赋值 - if (null != value || ! ignoreNull) { + if (null != value || !ignoreNull) { try { this.setValue(bean, value); } catch (final Exception e) { - if (! ignoreError) { + if (!ignoreError) { throw new BeanException(e, "Set value of [{}] error!", getFieldName()); } // 忽略注入失败 @@ -382,11 +382,11 @@ public class PropDesc { boolean isTransient = ModifierUtil.hasModifier(this.field, ModifierUtil.ModifierType.TRANSIENT); // 检查Getter方法 - if (! isTransient && null != this.getter) { + if (!isTransient && null != this.getter) { isTransient = ModifierUtil.hasModifier(this.getter, ModifierUtil.ModifierType.TRANSIENT); // 检查注解 - if (! isTransient) { + if (!isTransient) { isTransient = AnnotationUtil.hasAnnotation(this.getter, Transient.class); } } @@ -404,11 +404,11 @@ public class PropDesc { boolean isTransient = ModifierUtil.hasModifier(this.field, ModifierUtil.ModifierType.TRANSIENT); // 检查Getter方法 - if (! isTransient && null != this.setter) { + if (!isTransient && null != this.setter) { isTransient = ModifierUtil.hasModifier(this.setter, ModifierUtil.ModifierType.TRANSIENT); // 检查注解 - if (! isTransient) { + if (!isTransient) { isTransient = AnnotationUtil.hasAnnotation(this.setter, Transient.class); } } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/BeanToBeanCopier.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/BeanToBeanCopier.java index a5fb939f8..b36acc7f2 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/BeanToBeanCopier.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/BeanToBeanCopier.java @@ -61,14 +61,14 @@ public class BeanToBeanCopier extends AbsCopier { final Map sourcePropDescMap = BeanUtil.getBeanDesc(source.getClass()).getPropMap(copyOptions.ignoreCase); sourcePropDescMap.forEach((sFieldName, sDesc) -> { - if (null == sFieldName || ! sDesc.isReadable(copyOptions.transientSupport)) { + if (null == sFieldName || !sDesc.isReadable(copyOptions.transientSupport)) { // 字段空或不可读，跳过 return; } // 检查源对象属性是否过滤属性 Object sValue = sDesc.getValue(this.source); - if (! copyOptions.testPropertyFilter(sDesc.getField(), sValue)) { + if (!copyOptions.testPropertyFilter(sDesc.getField(), sValue)) { return; } @@ -87,7 +87,7 @@ public class BeanToBeanCopier extends AbsCopier { // 检查目标字段可写性 // 目标字段检查放在键值对编辑之后，因为键可能被编辑修改 final PropDesc tDesc = targetPropDescMap.get(sFieldName); - if (null == tDesc || ! tDesc.isWritable(this.copyOptions.transientSupport)) { + if (null == tDesc || !tDesc.isWritable(this.copyOptions.transientSupport)) { // 字段不可写，跳过之 return; } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/BeanToMapCopier.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/BeanToMapCopier.java index b9e12081e..02e4e6f99 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/BeanToMapCopier.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/BeanToMapCopier.java @@ -60,14 +60,14 @@ public class BeanToMapCopier extends AbsCopier { final Map sourcePropDescMap = BeanUtil.getBeanDesc(actualEditable).getPropMap(copyOptions.ignoreCase); sourcePropDescMap.forEach((sFieldName, sDesc) -> { - if (null == sFieldName || ! sDesc.isReadable(copyOptions.transientSupport)) { + if (null == sFieldName || !sDesc.isReadable(copyOptions.transientSupport)) { // 字段空或不可读，跳过 return; } // 检查源对象属性是否过滤属性 Object sValue = sDesc.getValue(this.source); - if (! copyOptions.testPropertyFilter(sDesc.getField(), sValue)) { + if (!copyOptions.testPropertyFilter(sDesc.getField(), sValue)) { return; } @@ -91,7 +91,7 @@ public class BeanToMapCopier extends AbsCopier { } // 目标赋值 - if(null != sValue || ! copyOptions.ignoreNullValue){ + if(null != sValue || !copyOptions.ignoreNullValue){ target.put(sFieldName, sValue); } }); diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/CopyOptions.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/CopyOptions.java index 2de55173c..9072af8ed 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/CopyOptions.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/CopyOptions.java @@ -177,7 +177,7 @@ public class CopyOptions implements Serializable { * @return CopyOptions */ public CopyOptions setIgnoreProperties(final String... ignoreProperties) { - return setPropertiesFilter((field, o) -> ! ArrayUtil.contains(ignoreProperties, field.getName())); + return setPropertiesFilter((field, o) -> !ArrayUtil.contains(ignoreProperties, field.getName())); } /** @@ -192,7 +192,7 @@ public class CopyOptions implements Serializable { @SuppressWarnings("unchecked") public CopyOptions setIgnoreProperties(final SerFunction... funcs) { final Set ignoreProperties = ArrayUtil.mapToSet(funcs, LambdaUtil::getFieldName); - return setPropertiesFilter((field, o) -> ! ignoreProperties.contains(field.getName())); + return setPropertiesFilter((field, o) -> !ignoreProperties.contains(field.getName())); } /** diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/MapToBeanCopier.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/MapToBeanCopier.java index 8751f4f8e..ce1243f94 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/MapToBeanCopier.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/MapToBeanCopier.java @@ -89,14 +89,14 @@ public class MapToBeanCopier extends AbsCopier, T> { // 检查目标字段可写性 // 目标字段检查放在键值对编辑之后，因为键可能被编辑修改 final PropDesc tDesc = findPropDesc(targetPropDescMap, sFieldName); - if (null == tDesc || ! tDesc.isWritable(this.copyOptions.transientSupport)) { + if (null == tDesc || !tDesc.isWritable(this.copyOptions.transientSupport)) { // 字段不可写，跳过之 return; } Object newValue = entry.getValue(); // 检查目标是否过滤属性 - if (! copyOptions.testPropertyFilter(tDesc.getField(), newValue)) { + if (!copyOptions.testPropertyFilter(tDesc.getField(), newValue)) { return; } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/MapToMapCopier.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/MapToMapCopier.java index 7ed247d16..82a091b56 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/MapToMapCopier.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/MapToMapCopier.java @@ -69,7 +69,7 @@ public class MapToMapCopier extends AbsCopier { final Object targetValue = target.get(sKey); // 非覆盖模式下，如果目标值存在，则跳过 - if (! copyOptions.override && null != targetValue) { + if (!copyOptions.override && null != targetValue) { return; } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/ValueProviderToBeanCopier.java b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/ValueProviderToBeanCopier.java index afef88506..98dc33482 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/ValueProviderToBeanCopier.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/bean/copier/ValueProviderToBeanCopier.java @@ -64,7 +64,7 @@ public class ValueProviderToBeanCopier extends AbsCopier extends AbsCopier implements Iterable>, Serializabl */ public V get(final K key, final Predicate validPredicate, final SerSupplier supplier) { V v = get(key); - if ((null != validPredicate && null != v && ! validPredicate.test(v))) { + if ((null != validPredicate && null != v && !validPredicate.test(v))) { v = null; } if (null == v && null != supplier) { @@ -118,7 +118,7 @@ public class SimpleCache implements Iterable>, Serializabl try { // 双重检查，防止在竞争锁的过程中已经有其它线程写入 v = get(key); - if (null == v || (null != validPredicate && ! validPredicate.test(v))) { + if (null == v || (null != validPredicate && !validPredicate.test(v))) { v = supplier.get(); put(key, v); } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/CacheObjIterator.java b/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/CacheObjIterator.java index d143c5e50..6a887afa0 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/CacheObjIterator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/CacheObjIterator.java @@ -54,7 +54,7 @@ public class CacheObjIterator implements Iterator>, Seriali */ @Override public CacheObj next() { - if (! hasNext()) { + if (!hasNext()) { throw new NoSuchElementException(); } final CacheObj cachedObject = nextValue; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/ReentrantCache.java b/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/ReentrantCache.java index 360792efe..4886c4964 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/ReentrantCache.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/ReentrantCache.java @@ -53,7 +53,7 @@ public abstract class ReentrantCache extends AbstractCache { return false; } - if (! co.isExpired()) { + if (!co.isExpired()) { // 命中 return true; } @@ -80,7 +80,7 @@ public abstract class ReentrantCache extends AbstractCache { if (null == co) { missCount.increment(); return null; - } else if (! co.isExpired()) { + } else if (!co.isExpired()) { hitCount.increment(); return co.get(isUpdateLastAccess); } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/StampedCache.java b/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/StampedCache.java index ac6a6e6d6..16d76a0d0 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/StampedCache.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/cache/impl/StampedCache.java @@ -53,7 +53,7 @@ public abstract class StampedCache extends AbstractCache{ return false; } - if (! co.isExpired()) { + if (!co.isExpired()) { // 命中 return true; } @@ -71,7 +71,7 @@ public abstract class StampedCache extends AbstractCache{ // 尝试读取缓存，使用乐观读锁 long stamp = lock.tryOptimisticRead(); CacheObj co = getWithoutLock(key); - if(! lock.validate(stamp)){ + if(!lock.validate(stamp)){ // 有写线程修改了此对象，悲观读 stamp = lock.readLock(); try { @@ -85,7 +85,7 @@ public abstract class StampedCache extends AbstractCache{ if (null == co) { missCount.increment(); return null; - } else if (! co.isExpired()) { + } else if (!co.isExpired()) { hitCount.increment(); return co.get(isUpdateLastAccess); } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/classloader/ClassLoaderUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/classloader/ClassLoaderUtil.java index d9f7911fd..228a4d8b1 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/classloader/ClassLoaderUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/classloader/ClassLoaderUtil.java @@ -351,7 +351,7 @@ public class ClassLoaderUtil { int lastDotIndex = name.lastIndexOf(PACKAGE_SEPARATOR); Class clazz = null; while (lastDotIndex > 0) {// 类与内部类的分隔符不能在第一位，因此>0 - if (! Character.isUpperCase(name.charAt(lastDotIndex + 1))) { + if (!Character.isUpperCase(name.charAt(lastDotIndex + 1))) { // 类名必须大写，非大写的类名跳过 break; } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/classloader/JarClassLoader.java b/hutool-core/src/main/java/org/dromara/hutool/core/classloader/JarClassLoader.java index dc3e8bee7..f0142b9f0 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/classloader/JarClassLoader.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/classloader/JarClassLoader.java @@ -173,7 +173,7 @@ public class JarClassLoader extends URLClassLoader { * @since 4.4.2 */ private static boolean isJarFile(final File file) { - if (! FileUtil.isFile(file)) { + if (!FileUtil.isFile(file)) { return false; } return file.getPath().toLowerCase().endsWith(".jar"); diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/Caesar.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/Caesar.java index 404b0a918..b166833ce 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/Caesar.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/Caesar.java @@ -39,7 +39,7 @@ public class Caesar { char c; for (int i = 0; i < len; i++) { c = message.charAt(i); - if (! Character.isLetter(c)) { + if (!Character.isLetter(c)) { continue; } plain[i] = encodeChar(c, offset); @@ -61,7 +61,7 @@ public class Caesar { char c; for (int i = 0; i < len; i++) { c = cipherText.charAt(i); - if (! Character.isLetter(c)) { + if (!Character.isLetter(c)) { continue; } plain[i] = decodeChar(c, offset); diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/Hashids.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/Hashids.java index 6c99a35e0..811db3984 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/Hashids.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/Hashids.java @@ -362,7 +362,7 @@ public class Hashids implements Encoder, Decoder final char[] currentAlphabet = Arrays.copyOf(alphabet, alphabet.length); for (int i = startIdx + 1; i < endIdx; i++) { - if (! separatorsSet.contains(hash.charAt(i))) { + if (!separatorsSet.contains(hash.charAt(i))) { block.append(hash.charAt(i)); // continue if we have not reached the end, yet if (i < endIdx - 1) { diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/Morse.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/Morse.java index 911bf6ad7..2c6dd466f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/Morse.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/Morse.java @@ -163,7 +163,7 @@ public class Morse { final char dit = this.dit; final char dah = this.dah; final char split = this.split; - if (! StrUtil.containsOnly(morse, dit, dah, split)) { + if (!StrUtil.containsOnly(morse, dit, dah, split)) { throw new IllegalArgumentException("Incorrect morse."); } final List words = SplitUtil.split(morse, String.valueOf(split)); diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base58.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base58.java index 061a2b699..8bd464a09 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base58.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base58.java @@ -108,7 +108,7 @@ public class Base58 { final byte[] payload = Arrays.copyOfRange(data, withVersion ? 1 : 0, data.length - CHECKSUM_SIZE); final byte[] checksum = Arrays.copyOfRange(data, data.length - CHECKSUM_SIZE, data.length); final byte[] expectedChecksum = checksum(payload); - if (! Arrays.equals(checksum, expectedChecksum)) { + if (!Arrays.equals(checksum, expectedChecksum)) { throw new ValidateException("Base58 checksum is invalid"); } return payload; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base64.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base64.java index db0f67e9b..076c36d19 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base64.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/binary/Base64.java @@ -290,7 +290,7 @@ public class Base64 { } else if ('=' == base64Byte) { // 发现'=' 标记之 hasPadding = true; - } else if (! (Base64Decoder.INSTANCE.isBase64Code(base64Byte) || isWhiteSpace(base64Byte))) { + } else if (!(Base64Decoder.INSTANCE.isBase64Code(base64Byte) || isWhiteSpace(base64Byte))) { return false; } } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/ConsistentHash.java b/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/ConsistentHash.java index 25497c5a6..987def216 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/ConsistentHash.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/codec/hash/ConsistentHash.java @@ -111,7 +111,7 @@ public class ConsistentHash implements Serializable { return null; } int hash = hashFunc.hash32(key); - if (! circle.containsKey(hash)) { + if (!circle.containsKey(hash)) { final SortedMap tailMap = circle.tailMap(hash); //返回此映射的部分视图，其键大于等于 hash hash = tailMap.isEmpty() ? circle.firstKey() : tailMap.firstKey(); } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/CollUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/CollUtil.java index 8231def45..5b6f0bfd4 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/CollUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/CollUtil.java @@ -100,7 +100,7 @@ public class CollUtil { * @return 是否为空 */ public static boolean isEmpty(final Enumeration enumeration) { - return null == enumeration || ! enumeration.hasMoreElements(); + return null == enumeration || !enumeration.hasMoreElements(); } /** @@ -2033,7 +2033,7 @@ public class CollUtil { @Override public int hash32(final T t) { - if (null == t || ! BeanUtil.isBean(t.getClass())) { + if (null == t || !BeanUtil.isBean(t.getClass())) { // 非Bean放在同一子分组中 return 0; } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/ListUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/ListUtil.java index 476c7309e..2d3dc6c88 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/ListUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/ListUtil.java @@ -685,7 +685,7 @@ public class ListUtil { @SuppressWarnings("UnusedReturnValue") public static List addAllIfNotContains(final List list, final List otherList) { for (final T t : otherList) { - if (! list.contains(t)) { + if (!list.contains(t)) { list.add(t); } } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/ComputeIter.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/ComputeIter.java index e6da20960..aa5f3facb 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/ComputeIter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/ComputeIter.java @@ -65,7 +65,7 @@ public abstract class ComputeIter implements Iterator { @Override public T next() { - if (! hasNext()) { + if (!hasNext()) { throw new NoSuchElementException("No more lines"); } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/FilterIter.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/FilterIter.java index aa919c80a..028f8cd39 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/FilterIter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/FilterIter.java @@ -58,7 +58,7 @@ public class FilterIter implements Iterator { @Override public E next() { - if (! nextObjectSet && ! setNextObject()) { + if (!nextObjectSet && !setNextObject()) { throw new NoSuchElementException(); } nextObjectSet = false; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/IterChain.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/IterChain.java index cd797b90d..97e784e60 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/IterChain.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/IterChain.java @@ -89,7 +89,7 @@ public class IterChain implements Iterator, Chain, IterChain iterator) { - return null == iterator || ! iterator.hasNext(); + return null == iterator || !iterator.hasNext(); } /** @@ -737,12 +737,12 @@ public class IterUtil { while (iter1.hasNext() && iter2.hasNext()) { obj1 = iter1.next(); obj2 = iter2.next(); - if (! Objects.equals(obj1, obj2)) { + if (!Objects.equals(obj1, obj2)) { return false; } } // 当两个Iterable长度不一致时返回false - return ! (iter1.hasNext() || iter2.hasNext()); + return !(iter1.hasNext() || iter2.hasNext()); } /** diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/PartitionIter.java b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/PartitionIter.java index 466235847..b0ded7f66 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/PartitionIter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/collection/iter/PartitionIter.java @@ -66,7 +66,7 @@ public class PartitionIter implements IterableIter>, Serializable { public List next() { final List list = new ArrayList<>(this.partitionSize); for (int i = 0; i < this.partitionSize; i++) { - if (! iterator.hasNext()) { + if (!iterator.hasNext()) { break; } list.add(iterator.next()); diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipCopyVisitor.java b/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipCopyVisitor.java index 9f6644ad2..73f077db0 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipCopyVisitor.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipCopyVisitor.java @@ -64,7 +64,7 @@ public class ZipCopyVisitor extends SimpleFileVisitor { } catch (final DirectoryNotEmptyException ignore) { // 目录已经存在，则跳过 } catch (final FileAlreadyExistsException e) { - if (! Files.isDirectory(targetDir)) { + if (!Files.isDirectory(targetDir)) { throw e; } // 目录非空情况下，跳过创建目录 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipUtil.java index ebfba6778..6b7e17205 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipUtil.java @@ -976,7 +976,7 @@ public class ZipUtil { name = entry.getName(); if (StrUtil.isEmpty(dir) || name.startsWith(dir)) { final String nameSuffix = StrUtil.removePrefix(name, dir); - if (StrUtil.isNotEmpty(nameSuffix) && ! StrUtil.contains(nameSuffix, CharUtil.SLASH)) { + if (StrUtil.isNotEmpty(nameSuffix) && !StrUtil.contains(nameSuffix, CharUtil.SLASH)) { fileNames.add(nameSuffix); } } @@ -1002,7 +1002,7 @@ public class ZipUtil { if (null == srcFile) { continue; } - if (! srcFile.exists()) { + if (!srcFile.exists()) { throw new UtilException(StrUtil.format("File [{}] not exist!", srcFile.getAbsolutePath())); } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipWriter.java b/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipWriter.java index d9551dee4..e7a1d4047 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipWriter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/compress/ZipWriter.java @@ -149,7 +149,7 @@ public class ZipWriter implements Closeable { String srcRootDir; try { srcRootDir = file.getCanonicalPath(); - if ((! file.isDirectory()) || withSrcDir) { + if ((!file.isDirectory()) || withSrcDir) { // 若是文件，则将父目录完整路径都截取掉；若设置包含目录，则将上级目录全部截取掉，保留本目录名 srcRootDir = file.getCanonicalFile().getParentFile().getCanonicalPath(); } @@ -259,7 +259,7 @@ public class ZipWriter implements Closeable { */ @SuppressWarnings("resource") private void _add(final File file, final String srcRootDir, final FileFilter filter) throws IORuntimeException { - if (null == file || (null != filter && ! filter.accept(file))) { + if (null == file || (null != filter && !filter.accept(file))) { return; } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/BasicType.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/BasicType.java index 64e945524..014678546 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/BasicType.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/BasicType.java @@ -59,7 +59,7 @@ public enum BasicType { * @return 包装类 */ public static Class wrap(final Class clazz, boolean errorReturnNull) { - if (null == clazz || ! clazz.isPrimitive()) { + if (null == clazz || !clazz.isPrimitive()) { return clazz; } final Class result = WRAPPER_PRIMITIVE_MAP.getInverse().get(clazz); diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/NumberChineseFormatter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/NumberChineseFormatter.java index 36727ae68..1c958cf81 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/NumberChineseFormatter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/NumberChineseFormatter.java @@ -107,7 +107,7 @@ public class NumberChineseFormatter { yuan = yuan / 10; // 元 - if (! isMoneyMode || 0 != yuan) { + if (!isMoneyMode || 0 != yuan) { // 金额模式下，无需“零元” chineseStr.append(longToChinese(yuan, isUseTraditional)); if (isMoneyMode) { @@ -124,14 +124,14 @@ public class NumberChineseFormatter { } // 小数部分 - if (! isMoneyMode) { + if (!isMoneyMode) { chineseStr.append("点"); } // 角 if (0 == yuan && 0 == jiao) { // 元和角都为0时，只有非金额模式下补“零” - if (! isMoneyMode) { + if (!isMoneyMode) { chineseStr.append("零"); } } else { @@ -356,7 +356,7 @@ public class NumberChineseFormatter { for (int i = 0; temp > 0; i++) { final int digit = temp % 10; if (digit == 0) { // 取到的数字为 0 - if (! lastIsZero) { + if (!lastIsZero) { // 前一个数字不是 0，则在当前汉字串前加“零”字; chineseStr.insert(0, "零"); } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/NumberWordFormatter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/NumberWordFormatter.java index e691db221..4056ad4f4 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/NumberWordFormatter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/NumberWordFormatter.java @@ -74,7 +74,7 @@ public class NumberWordFormatter { } int index = -1; double res = value; - while (res > 10 && (! isTwo || index < 1)) { + while (res > 10 && (!isTwo || index < 1)) { if (res >= 1000) { res = res / 1000; index++; @@ -119,7 +119,7 @@ public class NumberWordFormatter { StringBuilder lm = new StringBuilder(); // 用来存放转换后的整数部分 for (int i = 0; i < lstrrev.length() / 3; i++) { a[i] = StrUtil.reverse(lstrrev.substring(3 * i, 3 * i + 3)); // 截取第一个三位 - if (! "000".equals(a[i])) { // 用来避免这种情况：1000000 = one million + if (!"000".equals(a[i])) { // 用来避免这种情况：1000000 = one million // thousand only if (i != 0) { lm.insert(0, transThree(a[i]) + " " + parseMore(i) + " "); // 加: diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/AtomicReferenceConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/AtomicReferenceConverter.java index 66d3e38b0..689ea5797 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/AtomicReferenceConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/AtomicReferenceConverter.java @@ -34,7 +34,7 @@ public class AtomicReferenceConverter extends AbstractConverter { //尝试将值转换为Reference泛型的类型 Object targetValue = null; final Type paramType = TypeUtil.getTypeArgument(AtomicReference.class); - if(! TypeUtil.isUnknown(paramType)){ + if(!TypeUtil.isUnknown(paramType)){ targetValue = CompositeConverter.getInstance().convert(paramType, value); } if(null == targetValue){ diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/EnumConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/EnumConverter.java index 991b75e53..afdbe1afa 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/EnumConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/EnumConverter.java @@ -44,7 +44,7 @@ public class EnumConverter extends AbstractConverter { @Override protected Object convertInternal(final Class targetClass, final Object value) { Enum enumValue = tryConvertEnum(value, targetClass); - if (null == enumValue && ! value instanceof String) { + if (null == enumValue && !(value instanceof String)) { // 最后尝试先将value转String，再valueOf转换 enumValue = Enum.valueOf((Class) targetClass, convertToStr(value)); } @@ -134,7 +134,7 @@ public class EnumConverter extends AbstractConverter { .filter(ModifierUtil::isStatic) .filter(m -> m.getReturnType() == enumClass) .filter(m -> m.getParameterCount() == 1) - .filter(m -> ! "valueOf".equals(m.getName())) + .filter(m -> !"valueOf".equals(m.getName())) .collect(Collectors.toMap(m -> m.getParameterTypes()[0], m -> m, (k1, k2) -> k1))); } } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/ReferenceConverter.java b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/ReferenceConverter.java index 7e802d6d2..68187a60c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/ReferenceConverter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/convert/impl/ReferenceConverter.java @@ -41,7 +41,7 @@ public class ReferenceConverter extends AbstractConverter { //尝试将值转换为Reference泛型的类型 Object targetValue = null; final Type paramType = TypeUtil.getTypeArgument(targetClass); - if(! TypeUtil.isUnknown(paramType)){ + if(!TypeUtil.isUnknown(paramType)){ targetValue = CompositeConverter.getInstance().convert(paramType, value); } if(null == targetValue){ diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/CalendarUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/CalendarUtil.java index 0d1c6843a..afe1a86af 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/CalendarUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/CalendarUtil.java @@ -777,7 +777,7 @@ public class CalendarUtil { final int dayOfMonthBirth = cal.get(Calendar.DAY_OF_MONTH); final boolean isLastDayOfMonthBirth = dayOfMonthBirth == cal.getActualMaximum(Calendar.DAY_OF_MONTH); // issue#I6E6ZG，法定生日当天不算年龄，从第二天开始计算 - if ((! isLastDayOfMonth || ! isLastDayOfMonthBirth) && dayOfMonth <= dayOfMonthBirth) { + if ((!isLastDayOfMonth || !isLastDayOfMonthBirth) && dayOfMonth <= dayOfMonthBirth) { // 如果生日在当月，但是未达到生日当天的日期，年龄减一 age--; } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/DateBetween.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/DateBetween.java index c808085e2..79e5ea19f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/DateBetween.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/DateBetween.java @@ -124,7 +124,7 @@ public class DateBetween implements Serializable { final int betweenMonthOfYear = endCal.get(Calendar.MONTH) - beginCal.get(Calendar.MONTH); final int result = betweenYear * 12 + betweenMonthOfYear; - if (! isReset) { + if (!isReset) { endCal.set(Calendar.YEAR, beginCal.get(Calendar.YEAR)); endCal.set(Calendar.MONTH, beginCal.get(Calendar.MONTH)); final long between = endCal.getTimeInMillis() - beginCal.getTimeInMillis(); @@ -148,7 +148,7 @@ public class DateBetween implements Serializable { final Calendar endCal = DateUtil.calendar(end); final int result = endCal.get(Calendar.YEAR) - beginCal.get(Calendar.YEAR); - if (! isReset) { + if (!isReset) { // 考虑闰年的2月情况 if (Calendar.FEBRUARY == beginCal.get(Calendar.MONTH) && Calendar.FEBRUARY == endCal.get(Calendar.MONTH)) { if (beginCal.get(Calendar.DAY_OF_MONTH) == beginCal.getActualMaximum(Calendar.DAY_OF_MONTH) diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/DateTime.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/DateTime.java index 1370df736..6653f1315 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/DateTime.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/DateTime.java @@ -431,7 +431,7 @@ public class DateTime extends Date { calendar.set(field, value); DateTime dt = this; - if (! mutable) { + if (!mutable) { dt = ObjUtil.clone(this); } return dt.setTimeInternal(calendar.getTimeInMillis()); diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/DateUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/DateUtil.java index d03ff5b62..b01796129 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/DateUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/DateUtil.java @@ -677,7 +677,7 @@ public class DateUtil extends CalendarUtil { return null; } - if (! isUppercase) { + if (!isUppercase) { return (withTime ? DatePattern.CHINESE_DATE_TIME_FORMAT : DatePattern.CHINESE_DATE_FORMAT).format(date); } @@ -1434,11 +1434,11 @@ public class DateUtil extends CalendarUtil { boolean isIn = rangeMin < thisMills && thisMills < rangeMax; // 若不满足，则再判断是否在时间范围的边界上 - if (! isIn && includeBegin) { + if (!isIn && includeBegin) { isIn = thisMills == rangeMin; } - if (! isIn && includeEnd) { + if (!isIn && includeEnd) { isIn = thisMills == rangeMax; } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/TemporalAccessorUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/TemporalAccessorUtil.java index 03789d2e6..d5927e294 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/TemporalAccessorUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/TemporalAccessorUtil.java @@ -226,11 +226,11 @@ public class TemporalAccessorUtil extends TemporalUtil{ boolean isIn = rangeMin < thisMills && thisMills < rangeMax; // 若不满足，则再判断是否在时间范围的边界上 - if (! isIn && includeBegin) { + if (!isIn && includeBegin) { isIn = thisMills == rangeMin; } - if (! isIn && includeEnd) { + if (!isIn && includeEnd) { isIn = thisMills == rangeMax; } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/ChineseDate.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/ChineseDate.java index 92db617c0..8ff07edbf 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/ChineseDate.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/ChineseDate.java @@ -116,7 +116,7 @@ public class ChineseDate { } this.isLeapMonth = leapMonth > 0 && (month == (leapMonth + 1)); - if (hasLeapMonth && ! this.isLeapMonth) { + if (hasLeapMonth && !this.isLeapMonth) { // 当前月份前有闰月，则月份显示要-1，除非当前月份就是润月 month--; } @@ -453,7 +453,7 @@ public class ChineseDate { boolean isAdd = false; for (int i = 1; i < chineseMonth; i++) { leap = LunarInfo.leapMonth(chineseYear); - if (! isAdd) {//处理闰月 + if (!isAdd) {//处理闰月 if (leap <= i && leap > 0) { offset += LunarInfo.leapDays(chineseYear); isAdd = true; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/FastDateParser.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/FastDateParser.java index 26cd32c01..f2626cd43 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/FastDateParser.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/FastDateParser.java @@ -265,7 +265,7 @@ public class FastDateParser extends SimpleDateBasic implements PositionDateParse while (lt.hasNext()) { final StrategyAndWidth strategyAndWidth = lt.next(); final int maxWidth = strategyAndWidth.getMaxWidth(lt); - if (! strategyAndWidth.strategy.parse(this, calendar, source, pos, maxWidth)) { + if (!strategyAndWidth.strategy.parse(this, calendar, source, pos, maxWidth)) { return false; } } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/ISO8601DateParser.java b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/ISO8601DateParser.java index 0a3c9c9f5..4d9341095 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/ISO8601DateParser.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/date/format/parser/ISO8601DateParser.java @@ -64,7 +64,7 @@ public class ISO8601DateParser extends DefaultDateBasic implements DateParser { if (StrUtil.isBlank(zoneOffset)) { throw new DateException("Invalid format: [{}]", source); } - if (! StrUtil.contains(zoneOffset, ':')) { + if (!StrUtil.contains(zoneOffset, ':')) { // +0800转换为+08:00 final String pre = StrUtil.subBefore(source, '+', true); source = pre + "+" + zoneOffset.substring(0, 2) + ":" + "00"; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/ExceptionUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/ExceptionUtil.java index 46a5649f9..31212f634 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/ExceptionUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/exceptions/ExceptionUtil.java @@ -404,7 +404,7 @@ public class ExceptionUtil { */ public static List getThrowableList(Throwable throwable) { final List list = new ArrayList<>(); - while (throwable != null && ! list.contains(throwable)) { + while (throwable != null && !list.contains(throwable)) { list.add(throwable); throwable = throwable.getCause(); } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/AppendableWriter.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/AppendableWriter.java index 44bc8b912..5a226acf7 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/AppendableWriter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/AppendableWriter.java @@ -112,7 +112,7 @@ public class AppendableWriter extends Writer implements Appendable { @Override public void close() throws IOException { - if (! closed) { + if (!closed) { flush(); if (appendable instanceof Closeable) { ((Closeable) appendable).close(); diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/IoUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/IoUtil.java index 234f1fc69..69486c7c6 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/IoUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/IoUtil.java @@ -717,7 +717,7 @@ public class IoUtil extends NioUtil { if (null == in) { return null; } - if (! in.markSupported()) { + if (!in.markSupported()) { return new BufferedInputStream(in); } return in; @@ -734,7 +734,7 @@ public class IoUtil extends NioUtil { if (null == reader) { return null; } - if (! reader.markSupported()) { + if (!reader.markSupported()) { return new BufferedReader(reader); } return reader; @@ -951,10 +951,10 @@ public class IoUtil extends NioUtil { * @since 4.0.6 */ public static boolean contentEquals(InputStream input1, InputStream input2) throws IORuntimeException { - if (! (input1 instanceof BufferedInputStream)) { + if (!(input1 instanceof BufferedInputStream)) { input1 = new BufferedInputStream(input1); } - if (! (input2 instanceof BufferedInputStream)) { + if (!(input2 instanceof BufferedInputStream)) { input2 = new BufferedInputStream(input2); } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/LineReader.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/LineReader.java index be290992b..4ae832d70 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/LineReader.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/LineReader.java @@ -79,7 +79,7 @@ public class LineReader extends ReaderWrapper implements Iterable { } if (CharUtil.BACKSLASH == c) { // 转义符转义，行尾需要使用'\'时，使用转义符转义，即`\\` - if (! precedingBackslash) { + if (!precedingBackslash) { // 转义符，添加标识，但是不加入字符 precedingBackslash = true; continue; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/SerializeUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/SerializeUtil.java index 98e362dd7..c57cb634e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/SerializeUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/SerializeUtil.java @@ -37,7 +37,7 @@ public class SerializeUtil { * @throws UtilException IO异常和ClassNotFoundException封装 */ public static T clone(final T obj) { - if (! (obj instanceof Serializable)) { + if (!(obj instanceof Serializable)) { return null; } return deserialize(serialize(obj)); @@ -52,7 +52,7 @@ public class SerializeUtil { * @return 序列化后的字节码 */ public static byte[] serialize(final T obj) { - if (! (obj instanceof Serializable)) { + if (!(obj instanceof Serializable)) { return null; } final FastByteArrayOutputStream byteOut = new FastByteArrayOutputStream(); diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileMagicNumber.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileMagicNumber.java index 83b507b90..d416fb14c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileMagicNumber.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileMagicNumber.java @@ -1507,7 +1507,7 @@ public enum FileMagicNumber { */ private static FileMagicNumber matchDocument(final byte[] bytes) { final FileMagicNumber fileMagicNumber = FileMagicNumber.matchOpenXmlMime(bytes, (byte) 0x1e); - if (! fileMagicNumber.equals(UNKNOWN)) { + if (!fileMagicNumber.equals(UNKNOWN)) { return fileMagicNumber; } final byte[] bytes1 = new byte[]{0x5B, 0x43, 0x6F, 0x6E, 0x74, 0x65, 0x6E, 0x74, 0x5F, 0x54, 0x79, 0x70, 0x65, 0x73, 0x5D, 0x2E, 0x78, 0x6D, 0x6C}; @@ -1516,7 +1516,7 @@ public enum FileMagicNumber { final boolean flag1 = FileMagicNumber.compareBytes(bytes, bytes1, (byte) 0x1e); final boolean flag2 = FileMagicNumber.compareBytes(bytes, bytes2, (byte) 0x1e); final boolean flag3 = FileMagicNumber.compareBytes(bytes, bytes3, (byte) 0x1e); - if (! (flag1 || flag2 || flag3)) { + if (!(flag1 || flag2 || flag3)) { return UNKNOWN; } int index = 0; @@ -1526,7 +1526,7 @@ public enum FileMagicNumber { continue; } final FileMagicNumber fn = FileMagicNumber.matchOpenXmlMime(bytes, index + 30); - if (! fn.equals(UNKNOWN)) { + if (!fn.equals(UNKNOWN)) { return fn; } } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileNameUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileNameUtil.java index f91eb8680..30631ea1d 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileNameUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileNameUtil.java @@ -307,7 +307,7 @@ public class FileNameUtil { * @since 3.3.1 */ public static boolean containsInvalid(final String fileName) { - return (! StrUtil.isBlank(fileName)) && ReUtil.contains(FILE_NAME_INVALID_PATTERN_WIN, fileName); + return (!StrUtil.isBlank(fileName)) && ReUtil.contains(FILE_NAME_INVALID_PATTERN_WIN, fileName); } /** @@ -388,7 +388,7 @@ public class FileNameUtil { // 去除类似于/C:这类路径开头的斜杠 prefix = prefix.substring(1); } - if (! prefix.contains(StrUtil.SLASH)) { + if (!prefix.contains(StrUtil.SLASH)) { pathToUse = pathToUse.substring(prefixIndex + 1); } else { // 如果前缀中包含/,说明非Windows风格path @@ -408,7 +408,7 @@ public class FileNameUtil { for (int i = pathList.size() - 1; i >= 0; i--) { element = pathList.get(i); // 只处理非.的目录，即只处理非当前目录 - if (! StrUtil.DOT.equals(element)) { + if (!StrUtil.DOT.equals(element)) { if (StrUtil.DOUBLE_DOT.equals(element)) { tops++; } else { diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileReader.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileReader.java index fa7af47d1..cce78d1ed 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileReader.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileReader.java @@ -256,10 +256,10 @@ public class FileReader extends FileWrapper { * @throws IORuntimeException IO异常 */ private void checkFile() throws IORuntimeException { - if (! file.exists()) { + if (!file.exists()) { throw new IORuntimeException("File not exist: " + file); } - if (! file.isFile()) { + if (!file.isFile()) { throw new IORuntimeException("Not a file:" + file); } } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileUtil.java index 51f6d81ed..c24356eb7 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileUtil.java @@ -106,7 +106,7 @@ public class FileUtil extends PathUtil { * @return 是否为空，当提供非目录时，返回false */ public static boolean isEmpty(final File file) { - if (null == file || ! file.exists()) { + if (null == file || !file.exists()) { return true; } @@ -448,7 +448,7 @@ public class FileUtil extends PathUtil { */ public static boolean exists(final String directory, final String regexp) { final File file = new File(directory); - if (! file.exists()) { + if (!file.exists()) { return false; } @@ -475,7 +475,7 @@ public class FileUtil extends PathUtil { * @return 最后修改时间 */ public static Date lastModifiedTime(final File file) { - if (! exists(file)) { + if (!exists(file)) { return null; } @@ -517,7 +517,7 @@ public class FileUtil extends PathUtil { * @since 5.7.21 */ public static long size(final File file, final boolean includeDirSize) { - if (null == file || ! file.exists() || isSymlink(file)) { + if (null == file || !file.exists() || isSymlink(file)) { return 0; } @@ -545,7 +545,7 @@ public class FileUtil extends PathUtil { * @since 5.7.22 */ public static int getTotalLines(final File file) { - if (! isFile(file)) { + if (!isFile(file)) { throw new IORuntimeException("Input must be a File"); } try (final LineNumberReader lineNumberReader = new LineNumberReader(new java.io.FileReader(file))) { @@ -569,7 +569,7 @@ public class FileUtil extends PathUtil { * @return 是否晚于给定时间 */ public static boolean newerThan(final File file, final File reference) { - if (null == reference || ! reference.exists()) { + if (null == reference || !reference.exists()) { return true;// 文件一定比一个不存在的文件新 } return newerThan(file, reference.lastModified()); @@ -583,7 +583,7 @@ public class FileUtil extends PathUtil { * @return 是否晚于给定时间 */ public static boolean newerThan(final File file, final long timeMillis) { - if (null == file || ! file.exists()) { + if (null == file || !file.exists()) { return false;// 不存在的文件一定比任何时间旧 } return file.lastModified() > timeMillis; @@ -617,7 +617,7 @@ public class FileUtil extends PathUtil { if (null == file) { return null; } - if (! file.exists()) { + if (!file.exists()) { mkParentDirs(file); try { //noinspection ResultOfMethodCallIgnored @@ -759,7 +759,7 @@ public class FileUtil extends PathUtil { if (dir == null) { return null; } - if (! dir.exists()) { + if (!dir.exists()) { mkdirsSafely(dir, 5, 1); } return dir; @@ -1212,10 +1212,10 @@ public class FileUtil extends PathUtil { public static boolean equals(final File file1, final File file2) throws IORuntimeException { Assert.notNull(file1); Assert.notNull(file2); - if (! file1.exists() || ! file2.exists()) { + if (!file1.exists() || !file2.exists()) { // 两个文件都不存在判断其路径是否相同， 对于一个存在一个不存在的情况，一定不相同 - return ! file1.exists()// - && ! file2.exists()// + return !file1.exists()// + && !file2.exists()// && pathEquals(file1, file2); } return equals(file1.toPath(), file2.toPath()); @@ -1238,7 +1238,7 @@ public class FileUtil extends PathUtil { return false; } - if (! file1Exists) { + if (!file1Exists) { // 两个文件都不存在，返回true return true; } @@ -1383,7 +1383,7 @@ public class FileUtil extends PathUtil { * @return 是否被改动 */ public static boolean isModified(final File file, final long lastModifyTime) { - if (null == file || ! file.exists()) { + if (null == file || !file.exists()) { return true; } return file.lastModified() != lastModifyTime; @@ -2654,7 +2654,7 @@ public class FileUtil extends PathUtil { parentCanonicalPath = parentFile.getAbsolutePath(); canonicalPath = file.getAbsolutePath(); } - if (! canonicalPath.startsWith(parentCanonicalPath)) { + if (!canonicalPath.startsWith(parentCanonicalPath)) { throw new IllegalArgumentException("New file is outside of the parent dir: " + file.getName()); } } @@ -2802,7 +2802,7 @@ public class FileUtil extends PathUtil { private static File buildFile(File outFile, String fileName) { // 替换Windows路径分隔符为Linux路径分隔符，便于统一处理 fileName = fileName.replace(CharUtil.BACKSLASH, CharUtil.SLASH); - if (! isWindows() + if (!isWindows() // 检查文件名中是否包含"/"，不考虑以"/"结尾的情况 && fileName.lastIndexOf(CharUtil.SLASH, fileName.length() - 2) > 0) { // 在Linux下多层目录创建存在问题，/会被当成文件名的一部分，此处做处理 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileWriter.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileWriter.java index 5219997a1..f87a785ca 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileWriter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/FileWriter.java @@ -401,7 +401,7 @@ public class FileWriter extends FileWrapper { */ private void checkFile() throws IORuntimeException { Assert.notNull(file, "File to write content is null !"); - if (this.file.exists() && ! file.isFile()) { + if (this.file.exists() && !file.isFile()) { throw new IORuntimeException("File [{}] is not a file !", this.file.getAbsoluteFile()); } } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathCopier.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathCopier.java index eb0a8794a..2cafb54ff 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathCopier.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathCopier.java @@ -65,7 +65,7 @@ public class PathCopier extends SrcToDestCopier { */ public PathCopier(final Path src, final Path target, final CopyOption[] options) { Assert.notNull(target, "Src path must be not null !"); - if (! PathUtil.exists(src, false)) { + if (!PathUtil.exists(src, false)) { throw new IllegalArgumentException("Src path is not exist!"); } this.src = src; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathMover.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathMover.java index 821172ce1..3fe2798af 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathMover.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathMover.java @@ -66,7 +66,7 @@ public class PathMover { */ public PathMover(final Path src, final Path target, final CopyOption[] options) { Assert.notNull(target, "Src path must be not null !"); - if(! PathUtil.exists(src, false)){ + if(!PathUtil.exists(src, false)){ throw new IllegalArgumentException("Src path is not exist!"); } this.src = src; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathUtil.java index b280d311a..c974ae443 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathUtil.java @@ -41,7 +41,7 @@ public class PathUtil { */ public static boolean isDirEmpty(final Path dirPath) { try (final DirectoryStream dirStream = Files.newDirectoryStream(dirPath)) { - return ! dirStream.iterator().hasNext(); + return !dirStream.iterator().hasNext(); } catch (final IOException e) { throw new IORuntimeException(e); } @@ -73,9 +73,9 @@ public class PathUtil { public static List loopFiles(final Path path, final int maxDepth, final FileFilter fileFilter) { final List fileList = new ArrayList<>(); - if (null == path || ! Files.exists(path)) { + if (null == path || !Files.exists(path)) { return fileList; - } else if (! isDirectory(path)) { + } else if (!isDirectory(path)) { final File file = path.toFile(); if (null == fileFilter || fileFilter.accept(file)) { fileList.add(file); @@ -223,7 +223,7 @@ public class PathUtil { * @since 3.1.0 */ public static boolean isExistsAndNotDirectory(final Path path, final boolean isFollowLinks) { - return exists(path, isFollowLinks) && ! isDirectory(path, isFollowLinks); + return exists(path, isFollowLinks) && !isDirectory(path, isFollowLinks); } /** @@ -576,7 +576,7 @@ public class PathUtil { * @since 5.5.7 */ public static Path mkdir(final Path dir) { - if (null != dir && ! exists(dir, false)) { + if (null != dir && !exists(dir, false)) { try { Files.createDirectories(dir); } catch (final IOException e) { diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/Tailer.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/Tailer.java index 4baa336d4..c8a3e3987 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/Tailer.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/Tailer.java @@ -137,7 +137,7 @@ public class Tailer implements Serializable { this.period, TimeUnit.MILLISECONDS// ); - if (! async) { + if (!async) { try { scheduledFuture.get(); } catch (final ExecutionException e) { @@ -206,7 +206,7 @@ public class Tailer implements Serializable { } // 输出缓存栈中的内容 - while (! stack.isEmpty()) { + while (!stack.isEmpty()) { this.lineHandler.accept(stack.pop()); } } @@ -225,10 +225,10 @@ public class Tailer implements Serializable { * @param file 文件 */ private static void checkFile(final File file) { - if (! file.exists()) { + if (!file.exists()) { throw new UtilException("File [{}] not exist !", file.getAbsolutePath()); } - if (! file.isFile()) { + if (!file.isFile()) { throw new UtilException("Path [{}] is not a file !", file.getAbsolutePath()); } } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/visitor/CopyVisitor.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/visitor/CopyVisitor.java index 8ba9d3f82..2700d20b7 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/visitor/CopyVisitor.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/visitor/CopyVisitor.java @@ -52,7 +52,7 @@ public class CopyVisitor extends SimpleFileVisitor { * @param copyOptions 拷贝选项，如跳过已存在等 */ public CopyVisitor(final Path source, final Path target, final CopyOption... copyOptions) { - if (PathUtil.exists(target, false) && ! PathUtil.isDirectory(target)) { + if (PathUtil.exists(target, false) && !PathUtil.isDirectory(target)) { throw new IllegalArgumentException("Target must be a directory"); } this.source = source; @@ -70,7 +70,7 @@ public class CopyVisitor extends SimpleFileVisitor { try { Files.copy(dir, targetDir, copyOptions); } catch (final FileAlreadyExistsException e) { - if (! Files.isDirectory(targetDir)) { + if (!Files.isDirectory(targetDir)) { // 目标文件存在抛出异常，目录忽略 throw e; } @@ -107,7 +107,7 @@ public class CopyVisitor extends SimpleFileVisitor { * 初始化目标文件或目录 */ private void initTargetDir() { - if (! this.isTargetCreated) { + if (!this.isTargetCreated) { PathUtil.mkdir(this.target); this.isTargetCreated = true; } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/visitor/MoveVisitor.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/visitor/MoveVisitor.java index 14ec9bf43..376f1a526 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/visitor/MoveVisitor.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/visitor/MoveVisitor.java @@ -45,7 +45,7 @@ public class MoveVisitor extends SimpleFileVisitor { * @param copyOptions 拷贝（移动）选项 */ public MoveVisitor(final Path source, final Path target, final CopyOption... copyOptions) { - if(PathUtil.exists(target, false) && ! PathUtil.isDirectory(target)){ + if(PathUtil.exists(target, false) && !PathUtil.isDirectory(target)){ throw new IllegalArgumentException("Target must be a directory"); } this.source = source; @@ -59,9 +59,9 @@ public class MoveVisitor extends SimpleFileVisitor { initTarget(); // 将当前目录相对于源路径转换为相对于目标路径 final Path targetDir = target.resolve(source.relativize(dir)); - if(! Files.exists(targetDir)){ + if(!Files.exists(targetDir)){ Files.createDirectories(targetDir); - } else if(! Files.isDirectory(targetDir)){ + } else if(!Files.isDirectory(targetDir)){ throw new FileAlreadyExistsException(targetDir.toString()); } return FileVisitResult.CONTINUE; @@ -79,7 +79,7 @@ public class MoveVisitor extends SimpleFileVisitor { * 初始化目标文件或目录 */ private void initTarget(){ - if(! this.isTargetCreated){ + if(!this.isTargetCreated){ PathUtil.mkdir(this.target); this.isTargetCreated = true; } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/BOMInputStream.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/BOMInputStream.java index 77646883d..24397b5d4 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/BOMInputStream.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/BOMInputStream.java @@ -88,7 +88,7 @@ public class BOMInputStream extends InputStream { * @return 编码 */ public String getCharset() { - if (! isInited) { + if (!isInited) { try { init(); } catch (final IOException ex) { diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/SyncInputStream.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/SyncInputStream.java index fc04a1bd3..c6302afaa 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/SyncInputStream.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/stream/SyncInputStream.java @@ -53,7 +53,7 @@ public class SyncInputStream extends FilterInputStream { super(in); this.length = length; this.isIgnoreEOFError = isIgnoreEOFError; - if (! isAsync) { + if (!isAsync) { sync(); } } @@ -93,7 +93,7 @@ public class SyncInputStream extends FilterInputStream { try { copyLength = IoUtil.copy(this.in, out, IoUtil.DEFAULT_BUFFER_SIZE, this.length, streamProgress); } catch (final IORuntimeException e) { - if (! (isIgnoreEOFError && isEOFException(e.getCause()))) { + if (!(isIgnoreEOFError && isEOFException(e.getCause()))) { throw e; } // 忽略读取流中的EOF错误 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchMonitor.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchMonitor.java index da543d926..10c0b7889 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchMonitor.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchMonitor.java @@ -302,13 +302,13 @@ public class WatchMonitor extends WatchServer { @Override public void init() throws WatchException { //获取目录或文件路径 - if (! PathUtil.exists(this.path, false)) { + if (!PathUtil.exists(this.path, false)) { // 不存在的路径 final Path lastPathEle = FileUtil.getLastPathEle(this.path); if (null != lastPathEle) { final String lastPathEleStr = lastPathEle.toString(); //带有点表示有扩展名，按照未创建的文件对待。Linux下.d的为目录，排除之 - if (StrUtil.contains(lastPathEleStr, CharUtil.DOT) && ! StrUtil.endWithIgnoreCase(lastPathEleStr, ".d")) { + if (StrUtil.contains(lastPathEleStr, CharUtil.DOT) && !StrUtil.endWithIgnoreCase(lastPathEleStr, ".d")) { this.filePath = this.path; this.path = this.filePath.getParent(); } @@ -364,7 +364,7 @@ public class WatchMonitor extends WatchServer { registerPath(); // log.debug("Start watching path: [{}]", this.path); - while (! isClosed) { + while (!isClosed) { doTakeAndWatch(watcher); } } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchServer.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchServer.java index 8493d3eb7..b6ba19821 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchServer.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/watch/WatchServer.java @@ -130,7 +130,7 @@ public class WatchServer extends Thread implements Closeable, Serializable { }); } } catch (final IOException e) { - if (! (e instanceof AccessDeniedException)) { + if (!(e instanceof AccessDeniedException)) { throw new WatchException(e); } @@ -159,7 +159,7 @@ public class WatchServer extends Thread implements Closeable, Serializable { for (final WatchEvent event : wk.pollEvents()) { // 如果监听文件，检查当前事件是否与所监听文件关联 - if (null != watchFilter && ! watchFilter.test(event)) { + if (null != watchFilter && !watchFilter.test(event)) { continue; } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/Assert.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/Assert.java index 374115245..cafb987a8 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/Assert.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/Assert.java @@ -45,7 +45,7 @@ public class Assert { * @throws X if expression is {@code false} */ public static void isTrue(final boolean expression, final Supplier supplier) throws X { - if (! expression) { + if (!expression) { throw supplier.get(); } } @@ -701,7 +701,7 @@ public class Assert { */ public static T isInstanceOf(final Class type, final T obj, final String errorMsgTemplate, final Object... params) throws IllegalArgumentException { notNull(type, "Type to check against must not be null"); - if (! type.isInstance(obj)) { + if (!type.isInstance(obj)) { throw new IllegalArgumentException(StrUtil.format(errorMsgTemplate, params)); } return obj; @@ -755,7 +755,7 @@ public class Assert { * @throws IllegalStateException 表达式为 {@code false} 抛出此异常 */ public static void state(final boolean expression, final Supplier errorMsgSupplier) throws IllegalStateException { - if (! expression) { + if (!expression) { throw new IllegalStateException(errorMsgSupplier.get()); } } @@ -772,7 +772,7 @@ public class Assert { * @throws IllegalStateException 表达式为 {@code false} 抛出此异常 */ public static void state(final boolean expression, final String errorMsgTemplate, final Object... params) throws IllegalStateException { - if (! expression) { + if (!expression) { throw new IllegalStateException(StrUtil.format(errorMsgTemplate, params)); } } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/Validator.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/Validator.java index c3e792253..34bc1b499 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/Validator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/Validator.java @@ -63,7 +63,7 @@ public class Validator { * @since 4.4.5 */ public static boolean isFalse(final boolean value) { - return ! value; + return !value; } /** @@ -235,7 +235,7 @@ public class Validator { * @throws ValidateException 验证异常 */ public static Object validateEqual(final Object t1, final Object t2, final String errorMsg) throws ValidateException { - if (! equal(t1, t2)) { + if (!equal(t1, t2)) { throw new ValidateException(errorMsg); } return t1; @@ -297,7 +297,7 @@ public class Validator { * @throws ValidateException 验证异常 */ public static T validateMatchRegex(final String regex, final T value, final String errorMsg) throws ValidateException { - if (! isMatchRegex(regex, value)) { + if (!isMatchRegex(regex, value)) { throw new ValidateException(errorMsg); } return value; @@ -345,7 +345,7 @@ public class Validator { * @throws ValidateException 验证异常 */ public static T validateGeneral(final T value, final String errorMsg) throws ValidateException { - if (! isGeneral(value)) { + if (!isGeneral(value)) { throw new ValidateException(errorMsg); } return value; @@ -382,7 +382,7 @@ public class Validator { * @throws ValidateException 验证异常 */ public static T validateGeneral(final T value, final int min, final int max, final String errorMsg) throws ValidateException { - if (! isGeneral(value, min, max)) { + if (!isGeneral(value, min, max)) { throw new ValidateException(errorMsg); } return value; @@ -435,7 +435,7 @@ public class Validator { * @since 3.3.0 */ public static T validateLetter(final T value, final String errorMsg) throws ValidateException { - if (! isLetter(value)) { + if (!isLetter(value)) { throw new ValidateException(errorMsg); } return value; @@ -463,7 +463,7 @@ public class Validator { * @since 3.3.0 */ public static T validateUpperCase(final T value, final String errorMsg) throws ValidateException { - if (! isUpperCase(value)) { + if (!isUpperCase(value)) { throw new ValidateException(errorMsg); } return value; @@ -491,7 +491,7 @@ public class Validator { * @since 3.3.0 */ public static T validateLowerCase(final T value, final String errorMsg) throws ValidateException { - if (! isLowerCase(value)) { + if (!isLowerCase(value)) { throw new ValidateException(errorMsg); } return value; @@ -527,7 +527,7 @@ public class Validator { * @throws ValidateException 验证异常 */ public static String validateNumber(final String value, final String errorMsg) throws ValidateException { - if (! isNumber(value)) { + if (!isNumber(value)) { throw new ValidateException(errorMsg); } return value; @@ -555,7 +555,7 @@ public class Validator { * @since 4.1.8 */ public static T validateWord(final T value, final String errorMsg) throws ValidateException { - if (! isWord(value)) { + if (!isWord(value)) { throw new ValidateException(errorMsg); } return value; @@ -581,7 +581,7 @@ public class Validator { * @throws ValidateException 验证异常 */ public static T validateMoney(final T value, final String errorMsg) throws ValidateException { - if (! isMoney(value)) { + if (!isMoney(value)) { throw new ValidateException(errorMsg); } return value; @@ -608,7 +608,7 @@ public class Validator { * @throws ValidateException 验证异常 */ public static T validateZipCode(final T value, final String errorMsg) throws ValidateException { - if (! isZipCode(value)) { + if (!isZipCode(value)) { throw new ValidateException(errorMsg); } return value; @@ -634,7 +634,7 @@ public class Validator { * @throws ValidateException 验证异常 */ public static T validateEmail(final T value, final String errorMsg) throws ValidateException { - if (! isEmail(value)) { + if (!isEmail(value)) { throw new ValidateException(errorMsg); } return value; @@ -660,7 +660,7 @@ public class Validator { * @throws ValidateException 验证异常 */ public static T validateMobile(final T value, final String errorMsg) throws ValidateException { - if (! isMobile(value)) { + if (!isMobile(value)) { throw new ValidateException(errorMsg); } return value; @@ -686,7 +686,7 @@ public class Validator { * @throws ValidateException 验证异常 */ public static T validateCitizenIdNumber(final T value, final String errorMsg) throws ValidateException { - if (! isCitizenId(value)) { + if (!isCitizenId(value)) { throw new ValidateException(errorMsg); } return value; @@ -762,7 +762,7 @@ public class Validator { * @throws ValidateException 验证异常 */ public static T validateBirthday(final T value, final String errorMsg) throws ValidateException { - if (! isBirthday(value)) { + if (!isBirthday(value)) { throw new ValidateException(errorMsg); } return value; @@ -788,7 +788,7 @@ public class Validator { * @throws ValidateException 验证异常 */ public static T validateIpv4(final T value, final String errorMsg) throws ValidateException { - if (! isIpv4(value)) { + if (!isIpv4(value)) { throw new ValidateException(errorMsg); } return value; @@ -814,7 +814,7 @@ public class Validator { * @throws ValidateException 验证异常 */ public static T validateIpv6(final T value, final String errorMsg) throws ValidateException { - if (! isIpv6(value)) { + if (!isIpv6(value)) { throw new ValidateException(errorMsg); } return value; @@ -842,7 +842,7 @@ public class Validator { * @since 4.1.3 */ public static T validateMac(final T value, final String errorMsg) throws ValidateException { - if (! isMac(value)) { + if (!isMac(value)) { throw new ValidateException(errorMsg); } return value; @@ -870,7 +870,7 @@ public class Validator { * @since 3.0.6 */ public static T validatePlateNumber(final T value, final String errorMsg) throws ValidateException { - if (! isPlateNumber(value)) { + if (!isPlateNumber(value)) { throw new ValidateException(errorMsg); } return value; @@ -904,7 +904,7 @@ public class Validator { * @throws ValidateException 验证异常 */ public static T validateUrl(final T value, final String errorMsg) throws ValidateException { - if (! isUrl(value)) { + if (!isUrl(value)) { throw new ValidateException(errorMsg); } return value; @@ -941,7 +941,7 @@ public class Validator { * @throws ValidateException 验证异常 */ public static T validateChinese(final T value, final String errorMsg) throws ValidateException { - if (! isChinese(value)) { + if (!isChinese(value)) { throw new ValidateException(errorMsg); } return value; @@ -967,7 +967,7 @@ public class Validator { * @throws ValidateException 验证异常 */ public static T validateGeneralWithChinese(final T value, final String errorMsg) throws ValidateException { - if (! isGeneralWithChinese(value)) { + if (!isGeneralWithChinese(value)) { throw new ValidateException(errorMsg); } return value; @@ -995,7 +995,7 @@ public class Validator { * @throws ValidateException 验证异常 */ public static T validateUUID(final T value, final String errorMsg) throws ValidateException { - if (! isUUID(value)) { + if (!isUUID(value)) { throw new ValidateException(errorMsg); } return value; @@ -1023,7 +1023,7 @@ public class Validator { * @since 4.3.3 */ public static T validateHex(final T value, final String errorMsg) throws ValidateException { - if (! isHex(value)) { + if (!isHex(value)) { throw new ValidateException(errorMsg); } return value; @@ -1057,7 +1057,7 @@ public class Validator { * @since 4.1.10 */ public static void validateBetween(final Number value, final Number min, final Number max, final String errorMsg) throws ValidateException { - if (! isBetween(value, min, max)) { + if (!isBetween(value, min, max)) { throw new ValidateException(errorMsg); } } @@ -1077,7 +1077,7 @@ public class Validator { Assert.notNull(start); Assert.notNull(end); - if (! DateUtil.isIn(value, start, end)) { + if (!DateUtil.isIn(value, start, end)) { throw new ValidateException(errorMsg); } } @@ -1124,7 +1124,7 @@ public class Validator { * @since 5.6.3 */ public static T validateCarVin(final T value, final String errorMsg) throws ValidateException { - if (! isCarVin(value)) { + if (!isCarVin(value)) { throw new ValidateException(errorMsg); } return value; @@ -1191,7 +1191,7 @@ public class Validator { * @since 5.6.3 */ public static T validateCarDrivingLicence(final T value, final String errorMsg) throws ValidateException { - if (! isCarDrivingLicence(value)) { + if (!isCarDrivingLicence(value)) { throw new ValidateException(errorMsg); } return value; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/CallerUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/CallerUtil.java index 237570fb5..0b43524d5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/CallerUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/caller/CallerUtil.java @@ -80,7 +80,7 @@ public class CallerUtil { public static String getCallerMethodName(final boolean isFullName){ final StackTraceElement stackTraceElement = Thread.currentThread().getStackTrace()[2]; final String methodName = stackTraceElement.getMethodName(); - if(! isFullName){ + if(!isFullName){ return methodName; } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/ObjectId.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/ObjectId.java index 1cdecd609..e6d899840 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/ObjectId.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/ObjectId.java @@ -135,7 +135,7 @@ public class ObjectId { * @return objectId */ public static String next(final boolean withHyphen) { - if (! withHyphen) { + if (!withHyphen) { return next(); } final char[] ids = new char[26]; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/UUID.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/UUID.java index 2f56c60d8..867e4f616 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/UUID.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/id/UUID.java @@ -359,22 +359,22 @@ public class UUID implements java.io.Serializable, Comparable { final StringBuilder builder = StrUtil.builder(isSimple ? 32 : 36); // time_low builder.append(digits(mostSigBits >> 32, 8)); - if (! isSimple) { + if (!isSimple) { builder.append('-'); } // time_mid builder.append(digits(mostSigBits >> 16, 4)); - if (! isSimple) { + if (!isSimple) { builder.append('-'); } // time_high_and_version builder.append(digits(mostSigBits, 4)); - if (! isSimple) { + if (!isSimple) { builder.append('-'); } // variant_and_sequence builder.append(digits(leastSigBits >> 48, 4)); - if (! isSimple) { + if (!isSimple) { builder.append('-'); } // node diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/loader/AtomicLoader.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/loader/AtomicLoader.java index 06511c375..ee93913b4 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/loader/AtomicLoader.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/loader/AtomicLoader.java @@ -44,7 +44,7 @@ public abstract class AtomicLoader implements Loader, Serializable { if (result == null) { result = init(); - if (! reference.compareAndSet(null, result)) { + if (!reference.compareAndSet(null, result)) { // 其它线程已经创建好此对象 result = reference.get(); } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableEntry.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableEntry.java index 7846b491a..cf6f14951 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableEntry.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/mutable/MutableEntry.java @@ -34,7 +34,7 @@ public class MutableEntry extends AbsEntry implements Mutable 键类型 * @param 值类型 - * @return + * @return {@code MutableEntry} */ public static MutableEntry of(final K key, final V value) { return new MutableEntry<>(key, value); diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/page/NavigatePageInfo.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/page/NavigatePageInfo.java index f2946d476..e08284d22 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/page/NavigatePageInfo.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/page/NavigatePageInfo.java @@ -70,7 +70,7 @@ public class NavigatePageInfo extends PageInfo { public String toString() { final StringBuilder str = new StringBuilder(); - if (! isFirstPage()) { + if (!isFirstPage()) { str.append("<< "); } if (navigatePageNumbers.length > 0) { @@ -79,7 +79,7 @@ public class NavigatePageInfo extends PageInfo { for (int i = 1; i < navigatePageNumbers.length; i++) { str.append(" ").append(wrapForDisplay(navigatePageNumbers[i])); } - if (! isLastPage()) { + if (!isLastPage()) { str.append(" >>"); } return str.toString(); diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/BoundedRange.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/BoundedRange.java index ca1591388..cb70f4c6c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/BoundedRange.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/BoundedRange.java @@ -311,7 +311,7 @@ public class BoundedRange> implements Predicate< // 上界小于下界时为空 return compareValue > 0 // 上下界的边界值相等，且不为退化区间是为空 - || ! (low.getType().isClose() && up.getType().isClose()); + || !(low.getType().isClose() && up.getType().isClose()); } /** diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/BoundedRangeOperation.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/BoundedRangeOperation.java index 6df639616..e1c66fb3f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/BoundedRangeOperation.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/BoundedRangeOperation.java @@ -172,7 +172,7 @@ public class BoundedRangeOperation { * @return 是否相交 */ public static > boolean isIntersected(final BoundedRange boundedRange, final BoundedRange other) { - return ! isDisjoint(boundedRange, other); + return !isDisjoint(boundedRange, other); } /** diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/Range.java b/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/Range.java index 0ca66dc9c..b6131760b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/Range.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/lang/range/Range.java @@ -129,7 +129,7 @@ public class Range implements Iterable, Iterator, Serializable { } if (null == this.next) { return false; - } else if (! includeEnd && this.next.equals(this.end)) { + } else if (!includeEnd && this.next.equals(this.end)) { return false; } } finally { @@ -142,7 +142,7 @@ public class Range implements Iterable, Iterator, Serializable { public T next() { lock.lock(); try { - if (! this.hasNext()) { + if (!this.hasNext()) { throw new NoSuchElementException("Has no next range!"); } return nextUncheck(); @@ -158,7 +158,7 @@ public class Range implements Iterable, Iterator, Serializable { final T current; if(0 == this.index){ current = start; - if(! this.includeStart){ + if(!this.includeStart){ // 获取下一组元素 index ++; return nextUncheck(); diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/LinkedForestMap.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/LinkedForestMap.java index 371df0404..f9979a173 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/LinkedForestMap.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/LinkedForestMap.java @@ -304,7 +304,7 @@ public class LinkedForestMap implements ForestMap { } // 3.子节点存在，但是未与其他节点构成父子关系 - if (! childNode.hasParent()) { + if (!childNode.hasParent()) { parentNode.addChild(childNode); } // 4.子节点存在，且已经与其他节点构成父子关系，但是允许子节点直接修改其父节点 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/MapProxy.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/MapProxy.java index 3b044f404..b55fcc2dd 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/MapProxy.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/MapProxy.java @@ -152,7 +152,7 @@ public class MapProxy implements Map, TypeGetter, Invoca } if (StrUtil.isNotBlank(fieldName)) { - if (! this.containsKey(fieldName)) { + if (!this.containsKey(fieldName)) { // 驼峰不存在转下划线尝试 fieldName = StrUtil.toUnderlineCase(fieldName); } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/MapUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/MapUtil.java index 50de8131b..3d9e52e26 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/MapUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/MapUtil.java @@ -606,7 +606,7 @@ public class MapUtil extends MapGetUtil { */ public static String join(final Map map, final String separator, final String keyValueSeparator, final boolean isIgnoreNull, final String... otherParams) { - return join(map, separator, keyValueSeparator, (entry) -> ! isIgnoreNull || entry.getKey() != null && entry.getValue() != null, otherParams); + return join(map, separator, keyValueSeparator, (entry) -> !isIgnoreNull || entry.getKey() != null && entry.getValue() != null, otherParams); } /** diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/TolerantMap.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/TolerantMap.java index 50e316531..73e0e9baa 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/TolerantMap.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/TolerantMap.java @@ -95,7 +95,7 @@ public class TolerantMap extends MapWrapper { if (o == null || getClass() != o.getClass()) { return false; } - if (! super.equals(o)) { + if (!super.equals(o)) { return false; } final TolerantMap that = (TolerantMap) o; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/concurrent/ConcurrentLinkedHashMap.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/concurrent/ConcurrentLinkedHashMap.java index 33f32410d..71df73fd4 100755 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/concurrent/ConcurrentLinkedHashMap.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/concurrent/ConcurrentLinkedHashMap.java @@ -1329,7 +1329,7 @@ public final class ConcurrentLinkedHashMap extends AbstractMap @SuppressWarnings("unchecked") @Override public boolean contains(final Object obj) { - if (! (obj instanceof Entry)) { + if (!(obj instanceof Entry)) { return false; } final Entry> entry = (Entry>) obj; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/AbsTable.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/AbsTable.java index 7d770c41b..cc56581b7 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/AbsTable.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/AbsTable.java @@ -168,7 +168,7 @@ public abstract class AbsTable implements Table { @Override public Cell next() { - if (! columnIterator.hasNext()) { + if (!columnIterator.hasNext()) { rowEntry = rowIterator.next(); columnIterator = rowEntry.getValue().entrySet().iterator(); } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/RowKeyTable.java b/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/RowKeyTable.java index aa8227f6e..ff6345dde 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/RowKeyTable.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/map/multi/RowKeyTable.java @@ -198,7 +198,7 @@ public class RowKeyTable extends AbsTable { while (true) { if (entryIterator.hasNext()) { final Map.Entry entry = entryIterator.next(); - if (! seen.containsKey(entry.getKey())) { + if (!seen.containsKey(entry.getKey())) { seen.put(entry.getKey(), entry.getValue()); return entry.getKey(); } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/math/Arrangement.java b/hutool-core/src/main/java/org/dromara/hutool/core/math/Arrangement.java index ce861596e..e334e377a 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/math/Arrangement.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/math/Arrangement.java @@ -123,7 +123,7 @@ public class Arrangement implements Serializable { */ private void select(final String[] datas, final String[] resultList, final int resultIndex, final List result) { if (resultIndex >= resultList.length) { // 全部选择完时，输出排列结果 - if (! result.contains(resultList)) { + if (!result.contains(resultList)) { result.add(Arrays.copyOf(resultList, resultList.length)); } return; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/math/Calculator.java b/hutool-core/src/main/java/org/dromara/hutool/core/math/Calculator.java index 272027e7f..797bf1a67 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/math/Calculator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/math/Calculator.java @@ -51,9 +51,9 @@ public class Calculator { final Stack resultStack = new Stack<>(); Collections.reverse(postfixStack);// 将后缀式栈反转 String firstValue, secondValue, currentOp;// 参与计算的第一个值，第二个值和算术运算符 - while (! postfixStack.isEmpty()) { + while (!postfixStack.isEmpty()) { currentOp = postfixStack.pop(); - if (! isOperator(currentOp.charAt(0))) {// 如果不是运算符则存入操作数栈中 + if (!isOperator(currentOp.charAt(0))) {// 如果不是运算符则存入操作数栈中 currentOp = currentOp.replace("~", "-"); resultStack.push(currentOp); } else {// 如果是运算符则从操作数栈中取两个值和该数值一起参与运算 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/math/Combination.java b/hutool-core/src/main/java/org/dromara/hutool/core/math/Combination.java index 365dc8ac2..030cd3713 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/math/Combination.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/math/Combination.java @@ -42,7 +42,7 @@ public class Combination implements Serializable { } /** - * 计算组合数，即C(n, m) = n!/((n-m)! * m!) + * 计算组合数，即C(n, m) = n!/((n-m)!* m!) * * @param n 总数 * @param m 选择的个数 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/math/MathUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/math/MathUtil.java index cef595290..bbcbe4c5c 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/math/MathUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/math/MathUtil.java @@ -80,7 +80,7 @@ public class MathUtil { //--------------------------------------------------------------------------------------------- Combination /** - * 计算组合数，即C(n, m) = n!/((n-m)! * m!) + * 计算组合数，即C(n, m) = n!/((n-m)!* m!) * * @param n 总数 * @param m 选择的个数 @@ -128,7 +128,7 @@ public class MathUtil { /** * 计算阶乘 *

- * n! = n * (n-1) * ... * 2 * 1 + * n!= n * (n-1) * ... * 2 * 1 *

* * @param n 阶乘起始 @@ -219,7 +219,7 @@ public class MathUtil { /** * 计算阶乘 *

- * n! = n * (n-1) * ... * 2 * 1 + * n!= n * (n-1) * ... * 2 * 1 *

* * @param n 阶乘起始 diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/math/NumberUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/math/NumberUtil.java index d2c6c9fe7..a2468f781 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/math/NumberUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/math/NumberUtil.java @@ -738,7 +738,7 @@ public class NumberUtil { // two E's return false; } - if (! foundDigit) { + if (!foundDigit) { return false; } hasExp = true; @@ -783,7 +783,7 @@ public class NumberUtil { } // allowSigns is true iff the val ends in 'E' // found digit it to make sure weird stuff like '.' and '1E-' doesn't pass - return ! allowSigns && foundDigit; + return !allowSigns && foundDigit; } /** @@ -802,7 +802,7 @@ public class NumberUtil { * @see Integer#decode(String) */ public static boolean isInteger(final String s) { - if (! isNumber(s)) { + if (!isNumber(s)) { return false; } try { @@ -830,7 +830,7 @@ public class NumberUtil { * @since 4.0.0 */ public static boolean isLong(final String s) { - if (! isNumber(s)) { + if (!isNumber(s)) { return false; } final char lastChar = s.charAt(s.length() - 1); @@ -1776,9 +1776,9 @@ public class NumberUtil { return false; } if (number instanceof Double) { - return (! ((Double) number).isInfinite()) && (! ((Double) number).isNaN()); + return (!((Double) number).isInfinite()) && (!((Double) number).isNaN()); } else if (number instanceof Float) { - return (! ((Float) number).isInfinite()) && (! ((Float) number).isNaN()); + return (!((Float) number).isInfinite()) && (!((Float) number).isNaN()); } return true; } @@ -1792,7 +1792,7 @@ public class NumberUtil { * @since 5.7.0 */ public static boolean isValid(final double number) { - return ! (Double.isNaN(number) || Double.isInfinite(number)); + return !(Double.isNaN(number) || Double.isInfinite(number)); } /** @@ -1804,7 +1804,7 @@ public class NumberUtil { * @since 5.7.0 */ public static boolean isValid(final float number) { - return ! (Float.isNaN(number) || Float.isInfinite(number)); + return !(Float.isNaN(number) || Float.isInfinite(number)); } /** @@ -1859,6 +1859,6 @@ public class NumberUtil { * @since 5.7.17 */ public static boolean isEven(final int num) { - return ! isOdd(num); + return !isOdd(num); } } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/Ipv4Util.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/Ipv4Util.java index 426c5dd29..f9e4e0580 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/Ipv4Util.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/Ipv4Util.java @@ -239,7 +239,7 @@ public class Ipv4Util implements Ipv4Pool { Assert.isTrue(maskBit > IPV4_MASK_BIT_VALID_MIN && maskBit <= IPV4_MASK_BIT_MAX, "Not support mask bit: {}", maskBit); //如果掩码位等于32，则可用地址为0 - if (maskBit == IPV4_MASK_BIT_MAX && ! isAll) { + if (maskBit == IPV4_MASK_BIT_MAX && !isAll) { return 0; } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/LocalPortGenerator.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/LocalPortGenerator.java index e1c94f162..5596cfb10 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/LocalPortGenerator.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/LocalPortGenerator.java @@ -47,7 +47,7 @@ public class LocalPortGenerator implements Serializable{ public int generate() { int validPort = alternativePort.get(); // 获取可用端口 - while (! NetUtil.isUsableLocalPort(validPort)) { + while (!NetUtil.isUsableLocalPort(validPort)) { validPort = alternativePort.incrementAndGet(); } return validPort; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/NetUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/NetUtil.java index 1fcf47d5a..89667545a 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/NetUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/NetUtil.java @@ -141,7 +141,7 @@ public class NetUtil { * @return 是否可用 */ public static boolean isUsableLocalPort(final int port) { - if (! isValidPort(port)) { + if (!isValidPort(port)) { // 给定的IP未在指定端口范围中 return false; } @@ -473,7 +473,7 @@ public class NetUtil { while (networkInterfaces.hasMoreElements()) { final NetworkInterface networkInterface = networkInterfaces.nextElement(); - if (networkInterfaceFilter != null && ! networkInterfaceFilter.test(networkInterface)) { + if (networkInterfaceFilter != null && !networkInterfaceFilter.test(networkInterface)) { continue; } final Enumeration inetAddresses = networkInterface.getInetAddresses(); @@ -525,7 +525,7 @@ public class NetUtil { public static InetAddress getLocalhost() { final LinkedHashSet localAddressList = localAddressList(address -> { // 非loopback地址，指127.*.*.*的地址 - return ! address.isLoopbackAddress() + return !address.isLoopbackAddress() // 需为IPV4地址 && address instanceof Inet4Address; }); @@ -533,7 +533,7 @@ public class NetUtil { if (CollUtil.isNotEmpty(localAddressList)) { InetAddress address2 = null; for (final InetAddress inetAddress : localAddressList) { - if (! inetAddress.isSiteLocalAddress()) { + if (!inetAddress.isSiteLocalAddress()) { // 非地区本地地址，指10.0.0.0 ~ 10.255.255.255、172.16.0.0 ~ 172.31.255.255、192.168.0.0 ~ 192.168.255.255 return inetAddress; } else if (null == address2) { @@ -761,7 +761,7 @@ public class NetUtil { if (ip != null && StrUtil.indexOf(ip, CharUtil.COMMA) > 0) { final List ips = SplitUtil.splitTrim(ip, StrUtil.COMMA); for (final String subIp : ips) { - if (! isUnknown(subIp)) { + if (!isUnknown(subIp)) { ip = subIp; break; } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/UploadFile.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/UploadFile.java index 0d79f586d..e16fdd208 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/UploadFile.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/multipart/UploadFile.java @@ -108,7 +108,7 @@ public class UploadFile { if(null == this.tempFile){ throw new NullPointerException("Temp file is null !"); } - if(! this.tempFile.exists()){ + if(!this.tempFile.exists()){ throw new NoSuchFileException("Temp file: [" + this.tempFile.getAbsolutePath() + "] not exist!"); } @@ -277,7 +277,7 @@ public class UploadFile { * @throws IOException IO异常 */ private void assertValid() throws IOException { - if (! isUploaded()) { + if (!isUploaded()) { throw new IOException(StrUtil.format("File [{}] upload fail", getFileName())); } } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlBuilder.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlBuilder.java index ca4522a6a..f2c41d133 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlBuilder.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlBuilder.java @@ -121,7 +121,7 @@ public final class UrlBuilder implements Builder { httpUrl = StrUtil.trimPrefix(httpUrl); // issue#I66CIR - if(! StrUtil.startWithAnyIgnoreCase(httpUrl, "http://", "https://")){ + if(!StrUtil.startWithAnyIgnoreCase(httpUrl, "http://", "https://")){ httpUrl = "http://" + httpUrl; } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlPath.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlPath.java index 18494b0f1..5bcb0fd69 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlPath.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlPath.java @@ -184,7 +184,7 @@ public class UrlPath { if (StrUtil.isEmpty(builder)) { // 空白追加是保证以/开头 builder.append(CharUtil.SLASH); - } else if (! StrUtil.endWith(builder, CharUtil.SLASH)) { + } else if (!StrUtil.endWith(builder, CharUtil.SLASH)) { // 尾部没有/则追加，否则不追加 builder.append(CharUtil.SLASH); } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlQueryUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlQueryUtil.java index 2d0e444c8..5f6c1d381 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlQueryUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlQueryUtil.java @@ -99,7 +99,7 @@ public class UrlQueryUtil { // 无参数，返回url return urlPart; } - } else if (! StrUtil.contains(urlWithParams, '=')) { + } else if (!StrUtil.contains(urlWithParams, '=')) { // 无参数的URL return urlWithParams; } else { diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ActualTypeMapperPool.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ActualTypeMapperPool.java index 3af559985..9481a3eb0 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ActualTypeMapperPool.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ActualTypeMapperPool.java @@ -116,7 +116,7 @@ public class ActualTypeMapperPool { for (int i = 0; i < typeParameters.length; i++) { value = typeArguments[i]; // 跳过泛型变量对应泛型变量的情况 - if(! value instanceof TypeVariable){ + if(!(value instanceof TypeVariable)){ typeMap.put(typeParameters[i], value); } } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassScanner.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassScanner.java index 07c84c83a..acd3e7e9f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassScanner.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassScanner.java @@ -374,7 +374,7 @@ public class ClassScanner implements Serializable { for (final JarEntry entry : new EnumerationIter<>(jar.entries())) { name = StrUtil.removePrefix(entry.getName(), StrUtil.SLASH); if (StrUtil.isEmpty(packagePath) || name.startsWith(this.packagePath)) { - if (name.endsWith(FileNameUtil.EXT_CLASS) && ! entry.isDirectory()) { + if (name.endsWith(FileNameUtil.EXT_CLASS) && !entry.isDirectory()) { final String className = name// .substring(0, name.length() - 6)// .replace(CharUtil.SLASH, CharUtil.DOT);// @@ -407,7 +407,7 @@ public class ClassScanner implements Serializable { } catch (final Exception e) { classesOfLoadError.add(className); } catch (final Throwable e){ - if(! this.ignoreLoadError) { + if(!this.ignoreLoadError) { throw new RuntimeException(e); }else{ classesOfLoadError.add(className); diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassUtil.java index 91484e180..0151d3f7f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ClassUtil.java @@ -361,7 +361,7 @@ public class ClassUtil { if (BasicType.unWrap(type1) != BasicType.unWrap(type2)) { return false; } - } else if (! type1.isAssignableFrom(type2)) { + } else if (!type1.isAssignableFrom(type2)) { return false; } } @@ -488,13 +488,13 @@ public class ClassUtil { */ public static boolean isNormalClass(final Class clazz) { return null != clazz - && ! clazz.isInterface() - && ! ModifierUtil.isAbstract(clazz) - && ! clazz.isEnum() - && ! clazz.isArray() - && ! clazz.isAnnotation() - && ! clazz.isSynthetic() - && ! clazz.isPrimitive(); + && !clazz.isInterface() + && !ModifierUtil.isAbstract(clazz) + && !clazz.isEnum() + && !clazz.isArray() + && !clazz.isAnnotation() + && !clazz.isSynthetic() + && !clazz.isPrimitive(); } /** diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/FieldUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/FieldUtil.java index 0f7c41e9f..537c02fc2 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/FieldUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/FieldUtil.java @@ -291,7 +291,7 @@ public class FieldUtil { // 值类型检查和转换 final Class fieldType = field.getType(); if (null != value) { - if (! fieldType.isAssignableFrom(value.getClass())) { + if (!fieldType.isAssignableFrom(value.getClass())) { //对于类型不同的字段，尝试转换，转换失败则使用原对象类型 final Object targetValue = Convert.convert(fieldType, value); if (null != targetValue) { diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/MethodUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/MethodUtil.java index 4727d83ed..0c6e31d25 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/MethodUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/MethodUtil.java @@ -105,7 +105,7 @@ public class MethodUtil { */ public static Method[] getPublicMethods(final Class clazz, final Method... excludeMethods) { final HashSet excludeMethodSet = SetUtil.of(excludeMethods); - return getPublicMethods(clazz, method -> ! excludeMethodSet.contains(method)); + return getPublicMethods(clazz, method -> !excludeMethodSet.contains(method)); } /** @@ -117,7 +117,7 @@ public class MethodUtil { */ public static Method[] getPublicMethods(final Class clazz, final String... excludeMethodNames) { final HashSet excludeMethodNameSet = SetUtil.of(excludeMethodNames); - return getPublicMethods(clazz, method -> ! excludeMethodNameSet.contains(method.getName())); + return getPublicMethods(clazz, method -> !excludeMethodNameSet.contains(method.getName())); } /** @@ -377,14 +377,14 @@ public class MethodUtil { final UniqueKeySet result = new UniqueKeySet<>(true, MethodUtil::getUniqueKey); Class searchType = beanClass; while (searchType != null) { - if (! withMethodFromObject && Object.class == searchType) { + if (!withMethodFromObject && Object.class == searchType) { break; } result.addAllIfAbsent(Arrays.asList(searchType.getDeclaredMethods())); result.addAllIfAbsent(getDefaultMethodsFromInterface(searchType)); - searchType = (withSupers && ! searchType.isInterface()) ? searchType.getSuperclass() : null; + searchType = (withSupers && !searchType.isInterface()) ? searchType.getSuperclass() : null; } return result.toArray(new Method[0]); @@ -399,7 +399,7 @@ public class MethodUtil { public static boolean isEqualsMethod(final Method method) { if (method == null || 1 != method.getParameterCount() || - ! "equals".equals(method.getName())) { + !"equals".equals(method.getName())) { return false; } return (method.getParameterTypes()[0] == Object.class); @@ -758,7 +758,7 @@ public class MethodUtil { final List result = new ArrayList<>(); for (final Class ifc : clazz.getInterfaces()) { for (final Method m : ifc.getMethods()) { - if (! ModifierUtil.isAbstract(m)) { + if (!ModifierUtil.isAbstract(m)) { result.add(m); } } @@ -791,7 +791,7 @@ public class MethodUtil { } else if (args[i] instanceof NullWrapperBean) { //如果是通过NullWrapperBean传递的null参数,直接赋值null actualArgs[i] = null; - } else if (! parameterTypes[i].isAssignableFrom(args[i].getClass())) { + } else if (!parameterTypes[i].isAssignableFrom(args[i].getClass())) { //对于类型不同的字段，尝试转换，转换失败则使用原对象类型 final Object targetValue = Convert.convertQuietly(parameterTypes[i], args[i], args[i]); if (null != targetValue) { diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ModifierUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ModifierUtil.java index e30f91095..669b2ea54 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ModifierUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ModifierUtil.java @@ -278,7 +278,7 @@ public class ModifierUtil { * @since 5.8.8 */ public static void removeFinalModify(final Field field) { - if (null == field || ! hasModifier(field, ModifierUtil.ModifierType.FINAL)) { + if (null == field || !hasModifier(field, ModifierUtil.ModifierType.FINAL)) { return; } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ReflectUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ReflectUtil.java index db484f46e..2809023ac 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ReflectUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/ReflectUtil.java @@ -50,7 +50,7 @@ public class ReflectUtil { * @since 4.6.8 */ public static T setAccessible(final T accessibleObject) throws SecurityException { - if (null != accessibleObject && ! accessibleObject.isAccessible()) { + if (null != accessibleObject && !accessibleObject.isAccessible()) { return AccessController.doPrivileged((PrivilegedAction) () -> { // 特权访问 accessibleObject.setAccessible(true); diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/regex/ReUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/regex/ReUtil.java index f6d15cf98..f2ac376f9 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/regex/ReUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/regex/ReUtil.java @@ -231,7 +231,7 @@ public class ReUtil { result.add(matcher.group(i)); } - if (! findAll) { + if (!findAll) { break; } } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/AntPathMatcher.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/AntPathMatcher.java index a472784bc..f2a70e7f4 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/AntPathMatcher.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/AntPathMatcher.java @@ -223,7 +223,7 @@ public class AntPathMatcher { } final String[] pattDirs = tokenizePattern(pattern); - if (fullMatch && this.caseSensitive && ! isPotentialMatch(path, pattDirs)) { + if (fullMatch && this.caseSensitive && !isPotentialMatch(path, pattDirs)) { return false; } @@ -251,14 +251,14 @@ public class AntPathMatcher { if (pattIdxStart > pattIdxEnd) { return (pattern.endsWith(this.pathSeparator) == path.endsWith(this.pathSeparator)); } - if (! fullMatch) { + if (!fullMatch) { return true; } if (pattIdxStart == pattIdxEnd && pattDirs[pattIdxStart].equals("*") && path.endsWith(this.pathSeparator)) { return true; } for (int i = pattIdxStart; i <= pattIdxEnd; i++) { - if (! pattDirs[i].equals("**")) { + if (!pattDirs[i].equals("**")) { return false; } } @@ -266,7 +266,7 @@ public class AntPathMatcher { } else if (pattIdxStart > pattIdxEnd) { // String not exhausted, but pattern is. Failure. return false; - } else if (! fullMatch && "**".equals(pattDirs[pattIdxStart])) { + } else if (!fullMatch && "**".equals(pattDirs[pattIdxStart])) { // Path start definitely matches due to "**" part in pattern. return true; } @@ -286,7 +286,7 @@ public class AntPathMatcher { if (pathIdxStart > pathIdxEnd) { // String is exhausted for (int i = pattIdxStart; i <= pattIdxEnd; i++) { - if (! pattDirs[i].equals("**")) { + if (!pattDirs[i].equals("**")) { return false; } } @@ -334,7 +334,7 @@ public class AntPathMatcher { } for (int i = pattIdxStart; i <= pattIdxEnd; i++) { - if (! pattDirs[i].equals("**")) { + if (!pattDirs[i].equals("**")) { return false; } } @@ -448,7 +448,7 @@ public class AntPathMatcher { * @return {@code true} if the string matches against the pattern, or {@code false} otherwise */ private boolean notMatchStrings(final String pattern, final String str, final Map uriTemplateVariables) { - return ! getStringMatcher(pattern).matchStrings(str, uriTemplateVariables); + return !getStringMatcher(pattern).matchStrings(str, uriTemplateVariables); } /** diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/CharSequenceUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/CharSequenceUtil.java index 55420bd41..65db3bad5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/CharSequenceUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/CharSequenceUtil.java @@ -621,7 +621,7 @@ public class CharSequenceUtil extends StrChecker { if (isNotEmpty(str)) { final int len = str.length(); for (int i = 0; i < len; i++) { - if (! ArrayUtil.contains(testChars, str.charAt(i))) { + if (!ArrayUtil.contains(testChars, str.charAt(i))) { return false; } } @@ -736,7 +736,7 @@ public class CharSequenceUtil extends StrChecker { return false; } for (final CharSequence testChar : testChars) { - if (! contains(str, testChar)) { + if (!contains(str, testChar)) { return false; } } @@ -1027,7 +1027,7 @@ public class CharSequenceUtil extends StrChecker { if (null == str || ArrayUtil.isEmpty(chars)) { return str(str); } - return filter(str, (c) -> ! ArrayUtil.contains(chars, c)); + return filter(str, (c) -> !ArrayUtil.contains(chars, c)); } /** @@ -1175,7 +1175,7 @@ public class CharSequenceUtil extends StrChecker { * @return 清理后的字符串 */ public static String cleanBlank(final CharSequence str) { - return filter(str, c -> ! CharUtil.isBlankChar(c)); + return filter(str, c -> !CharUtil.isBlankChar(c)); } // endregion @@ -1777,7 +1777,7 @@ public class CharSequenceUtil extends StrChecker { public static String[] subBetweenAll(final CharSequence str, final CharSequence prefix, final CharSequence suffix) { if (hasEmpty(str, prefix, suffix) || // 不包含起始字符串，则肯定没有子串 - ! contains(str, prefix)) { + !contains(str, prefix)) { return new String[0]; } @@ -2207,13 +2207,13 @@ public class CharSequenceUtil extends StrChecker { len += suffix.length(); } final StringBuilder sb = new StringBuilder(len); - if (isNotEmpty(prefix) && ! startWith(str, prefix)) { + if (isNotEmpty(prefix) && !startWith(str, prefix)) { sb.append(prefix); } if (isNotEmpty(str)) { sb.append(str); } - if (isNotEmpty(suffix) && ! endWith(str, suffix)) { + if (isNotEmpty(suffix) && !endWith(str, suffix)) { sb.append(suffix); } return sb.toString(); diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/StrChecker.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/StrChecker.java index 585934e5e..7215f702b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/StrChecker.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/StrChecker.java @@ -77,7 +77,7 @@ public class StrChecker { for (int i = 0; i < length; i++) { // 只要有一个非空字符即为非空字符串 - if (! CharUtil.isBlankChar(str.charAt(i))) { + if (!CharUtil.isBlankChar(str.charAt(i))) { return false; } } @@ -119,7 +119,7 @@ public class StrChecker { for (int i = 0; i < length; i++) { // 只要有一个非空字符即为非空字符串 - if (! CharUtil.isBlankChar(str.charAt(i))) { + if (!CharUtil.isBlankChar(str.charAt(i))) { return true; } } @@ -426,7 +426,7 @@ public class StrChecker { * @since 5.3.6 */ public static boolean isAllNotEmpty(final CharSequence... args) { - return ! hasEmpty(args); + return !hasEmpty(args); } /** @@ -437,7 +437,7 @@ public class StrChecker { * @since 5.3.6 */ public static boolean isAllNotBlank(final CharSequence... args) { - return ! hasBlank(args); + return !hasBlank(args); } /** @@ -506,7 +506,7 @@ public class StrChecker { return false; } for (int i = value.length(); --i >= 0; ) { - if (! matcher.test(value.charAt(i))) { + if (!matcher.test(value.charAt(i))) { return false; } } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/StrJoiner.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/StrJoiner.java index 278c36d7d..1f2950fea 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/StrJoiner.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/StrJoiner.java @@ -390,7 +390,7 @@ public class StrJoiner implements Appendable, Serializable { } String result = this.appendable.toString(); - if (! wrapElement && StrUtil.isNotEmpty(this.suffix)) { + if (!wrapElement && StrUtil.isNotEmpty(this.suffix)) { result += this.suffix; } return result; @@ -427,7 +427,7 @@ public class StrJoiner implements Appendable, Serializable { if (null == this.appendable) { this.appendable = new StringBuilder(); } - if (! wrapElement && StrUtil.isNotEmpty(this.prefix)) { + if (!wrapElement && StrUtil.isNotEmpty(this.prefix)) { this.appendable.append(this.prefix); } this.hasContent = true; @@ -448,7 +448,7 @@ public class StrJoiner implements Appendable, Serializable { } } else { final String initStr = appendable.toString(); - if (StrUtil.isNotEmpty(initStr) && ! StrUtil.endWith(initStr, delimiter)) { + if (StrUtil.isNotEmpty(initStr) && !StrUtil.endWith(initStr, delimiter)) { this.hasContent = true; } } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/StrRegionMatcher.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/StrRegionMatcher.java index 9252a60ec..d7ded4305 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/StrRegionMatcher.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/StrRegionMatcher.java @@ -86,7 +86,7 @@ public class StrRegionMatcher implements BiPredicate .regionMatches(ignoreCase, toffset, strToCheck.toString(), 0, strToCheckLength); if (matches) { - return (! ignoreEquals) || (! StrUtil.equals(str, strToCheck, ignoreCase)); + return (!ignoreEquals) || (!StrUtil.equals(str, strToCheck, ignoreCase)); } return false; } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/SensitiveUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/SensitiveUtil.java index 45cb173b0..71bfafc6b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/SensitiveUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/SensitiveUtil.java @@ -40,7 +40,7 @@ public final class SensitiveUtil { * @return 是否已经被初始化 */ public static boolean isInited() { - return ! sensitiveTree.isEmpty(); + return !sensitiveTree.isEmpty(); } /** diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/StopChar.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/StopChar.java index 8d8246c8c..f101ca26b 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/StopChar.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/StopChar.java @@ -58,6 +58,6 @@ public class StopChar { * @return 是否为合法字符（待处理字符） */ public static boolean isNotStopChar(final char ch) { - return ! isStopChar(ch); + return !isStopChar(ch); } } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/WordTree.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/WordTree.java index 0fb2af4be..d0358fafa 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/WordTree.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/dfa/WordTree.java @@ -92,7 +92,7 @@ public class WordTree extends HashMap { * @return this */ public WordTree addWords(Collection words) { - if (! (words instanceof Set)) { + if (!(words instanceof Set)) { words = new HashSet<>(words); } for (final String word : words) { @@ -281,7 +281,7 @@ public class WordTree extends HashMap { keyBuffer.setLength(0); for (int j = i; j < length; j++) { currentChar = text.charAt(j); - if (! charFilter.test(currentChar)) { + if (!charFilter.test(currentChar)) { if (wordBuffer.length() > 0) { //做为关键词中间的停顿词被当作关键词的一部分被返回 wordBuffer.append(currentChar); @@ -290,7 +290,7 @@ public class WordTree extends HashMap { i++; } continue; - } else if (! current.containsKey(currentChar)) { + } else if (!current.containsKey(currentChar)) { //非关键字符被整体略过，重新以下个字符开始检查 break; } @@ -303,12 +303,12 @@ public class WordTree extends HashMap { //超过匹配限制个数，直接返回 return foundWords; } - if (! isDensityMatch) { + if (!isDensityMatch) { //如果非密度匹配，跳过匹配到的词 i = j; break; } - if (! isGreedMatch) { + if (!isGreedMatch) { //如果懒惰匹配（非贪婪匹配）。当遇到第一个结尾标记就结束本轮匹配 break; } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/EscapeUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/EscapeUtil.java index 69064e1af..b8a6cfc58 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/EscapeUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/escape/EscapeUtil.java @@ -29,7 +29,7 @@ public class EscapeUtil { * 不转义的符号编码 */ private static final String NOT_ESCAPE_CHARS = "*@-_+./"; - private static final Predicate JS_ESCAPE_FILTER = c -> ! ( + private static final Predicate JS_ESCAPE_FILTER = c -> !( Character.isDigit(c) || Character.isLowerCase(c) || Character.isUpperCase(c) @@ -131,7 +131,7 @@ public class EscapeUtil { char c; for (int i = 0; i < content.length(); i++) { c = content.charAt(i); - if (! filter.test(c)) { + if (!filter.test(c)) { tmp.append(c); } else if (c < 256) { tmp.append("%"); diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/text/split/SplitIter.java b/hutool-core/src/main/java/org/dromara/hutool/core/text/split/SplitIter.java index d016378b2..1e089c9e5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/text/split/SplitIter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/text/split/SplitIter.java @@ -89,7 +89,7 @@ public class SplitIter extends ComputeIter implements Serializable { // 如果不再有分隔符，但是遗留了字符，则单独作为一个段 if (offset <= text.length()) { final String result = text.substring(offset); - if (! ignoreEmpty || ! result.isEmpty()) { + if (!ignoreEmpty || !result.isEmpty()) { // 返回非空串 offset = Integer.MAX_VALUE; return result; diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/BlockPolicy.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/BlockPolicy.java index 6a93d8f55..1d0a648a3 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/BlockPolicy.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/thread/BlockPolicy.java @@ -54,7 +54,7 @@ public class BlockPolicy implements RejectedExecutionHandler { @Override public void rejectedExecution(final Runnable r, final ThreadPoolExecutor e) { // 线程池未关闭时，阻塞等待 - if (! e.isShutdown()) { + if (!e.isShutdown()) { try { e.getQueue().put(r); } catch (InterruptedException ex) { diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/NamedThreadFactory.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/NamedThreadFactory.java index 1a36e85c7..aefdfe3e9 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/NamedThreadFactory.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/thread/NamedThreadFactory.java @@ -86,12 +86,12 @@ public class NamedThreadFactory implements ThreadFactory { final Thread t = new Thread(this.group, r, StrUtil.format("{}{}", prefix, threadNumber.getAndIncrement())); //守护线程 - if (! t.isDaemon()) { + if (!t.isDaemon()) { if (isDaemon) { // 原线程为非守护则设置为守护 t.setDaemon(true); } - } else if (! isDaemon) { + } else if (!isDaemon) { // 原线程为守护则还原为非守护 t.setDaemon(false); } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/ThreadUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/ThreadUtil.java index 72f7b7325..e61577bdd 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/ThreadUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/thread/ThreadUtil.java @@ -505,7 +505,7 @@ public class ThreadUtil { long spendTime; while (done >= 0 && done < millis) { before = System.currentTimeMillis(); - if (! sleep(millis - done)) { + if (!sleep(millis - done)) { return false; } spendTime = System.currentTimeMillis() - before; @@ -597,7 +597,7 @@ public class ThreadUtil { * @param isJoin 是否等待结束 */ public static void interrupt(final Thread thread, final boolean isJoin) { - if (null != thread && ! thread.isInterrupted()) { + if (null != thread && !thread.isInterrupted()) { thread.interrupt(); if (isJoin) { waitForDie(thread); @@ -630,7 +630,7 @@ public class ThreadUtil { } catch (final InterruptedException e) { // ignore } - } while (! dead); + } while (!dead); } /** diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/tree/MapTree.java b/hutool-core/src/main/java/org/dromara/hutool/core/tree/MapTree.java index c55985de2..0cee702b6 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/tree/MapTree.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/tree/MapTree.java @@ -226,7 +226,7 @@ public class MapTree extends LinkedHashMap implements Node // 加入FIFO队列 final Queue> queue = new LinkedList<>(); queue.offer(this); - while (! queue.isEmpty()) { + while (!queue.isEmpty()) { final MapTree node = queue.poll(); consumer.accept(node); final List> children = node.getChildren(); @@ -238,7 +238,7 @@ public class MapTree extends LinkedHashMap implements Node // 入栈,FILO final Stack> stack = new Stack<>(); stack.add(this); - while (! stack.isEmpty()) { + while (!stack.isEmpty()) { final MapTree node = stack.pop(); consumer.accept(node); final List> children = node.getChildren(); diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/util/BooleanUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/BooleanUtil.java index 6449c9630..c63cf372e 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/util/BooleanUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/BooleanUtil.java @@ -366,7 +366,7 @@ public class BooleanUtil { throw new IllegalArgumentException("The Array must not be empty !"); } for (final boolean element : array) { - if (! element) { + if (!element) { return false; } } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/util/CharUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/CharUtil.java index 93f59c5a5..597f62520 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/util/CharUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/CharUtil.java @@ -290,7 +290,7 @@ public class CharUtil implements CharPool { */ public static boolean isEmoji(final char c) { //noinspection ConstantConditions - return ! ((c == 0x0) || // + return !((c == 0x0) || // (c == 0x9) || // (c == 0xA) || // (c == 0xD) || // diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/util/CoordinateUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/CoordinateUtil.java index ce064ae1c..4494a7f70 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/util/CoordinateUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/CoordinateUtil.java @@ -194,7 +194,7 @@ public class CoordinateUtil { dlng = (dlng * 180.0) / (RADIUS / sqrtMagic * Math.cos(lat / 180.0 * PI) * PI); dlat = (dlat * 180.0) / ((RADIUS * (1 - CORRECTION_PARAM)) / (magic * sqrtMagic) * PI); - if(! isPlus){ + if(!isPlus){ dlng = - dlng; dlat = - dlat; } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/util/CreditCodeUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/CreditCodeUtil.java index b23ddb066..1727dddfe 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/util/CreditCodeUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/CreditCodeUtil.java @@ -94,7 +94,7 @@ public class CreditCodeUtil { * @return 校验结果 */ public static boolean isCreditCode(final CharSequence creditCode) { - if (! isCreditCodeSimple(creditCode)) { + if (!isCreditCodeSimple(creditCode)) { return false; } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/util/EnumUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/EnumUtil.java index 0229ae11a..80760e6b5 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/util/EnumUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/EnumUtil.java @@ -218,7 +218,7 @@ public class EnumUtil { if (field.getType().isEnum() || name.contains("$VALUES") || "ordinal".equals(name)) { continue; } - if (! names.contains(name)) { + if (!names.contains(name)) { names.add(name); } } @@ -351,7 +351,7 @@ public class EnumUtil { * @return 是否不存在 */ public static > boolean notContains(final Class enumClass, final String val) { - return ! contains(enumClass, val); + return !contains(enumClass, val); } /** diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/util/IdcardUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/IdcardUtil.java index c18c309d8..53ddab476 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/util/IdcardUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/IdcardUtil.java @@ -297,7 +297,7 @@ public class IdcardUtil { } //校验生日 - if (! Validator.isBirthday(idcard.substring(6, 14))) { + if (!Validator.isBirthday(idcard.substring(6, 14))) { return false; } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/util/ObjUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/ObjUtil.java index e18f2dc2d..455cb0d53 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/util/ObjUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/ObjUtil.java @@ -72,7 +72,7 @@ public class ObjUtil { * @see #equals(Object, Object) */ public static boolean notEquals(final Object obj1, final Object obj2) { - return ! equals(obj1, obj2); + return !equals(obj1, obj2); } /** diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/util/SystemUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/SystemUtil.java index 7da2fae69..341ac600a 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/util/SystemUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/SystemUtil.java @@ -86,7 +86,7 @@ public class SystemUtil { try { value = System.getProperty(name); } catch (final SecurityException e) { - if (! quiet) { + if (!quiet) { Console.error("Caught a SecurityException reading the system property '{}'; " + "the SystemUtil property value will default to null.", name); } @@ -96,7 +96,7 @@ public class SystemUtil { try { value = System.getenv(name); } catch (final SecurityException e) { - if (! quiet) { + if (!quiet) { Console.error("Caught a SecurityException reading the system env '{}'; " + "the SystemUtil env value will default to null.", name); } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/util/XmlUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/util/XmlUtil.java index c0fc1cde8..6d175dba2 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/util/XmlUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/util/XmlUtil.java @@ -163,10 +163,10 @@ public class XmlUtil { */ public static Document readXML(File file) { Assert.notNull(file, "Xml file is null !"); - if (! file.exists()) { + if (!file.exists()) { throw new UtilException("File [{}] not a exist!", file.getAbsolutePath()); } - if (! file.isFile()) { + if (!file.isFile()) { throw new UtilException("[{}] not a file!", file.getAbsolutePath()); } @@ -1055,7 +1055,7 @@ public class XmlUtil { Element childEle; for (int i = 0; i < length; ++i) { childNode = nodeList.item(i); - if (! isElement(childNode)) { + if (!isElement(childNode)) { continue; } @@ -1468,7 +1468,7 @@ public class XmlUtil { } } - if (! attributesOnly) { + if (!attributesOnly) { final NodeList childNodes = node.getChildNodes(); //noinspection ConstantConditions if(null != childNodes){ diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanUtilTest.java index 1f2915c75..e5c2f167d 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/bean/BeanUtilTest.java @@ -721,7 +721,7 @@ public class BeanUtilTest { new LinkedHashMap<>(), false, entry -> { - if(! Arrays.asList("id", "name", "code", "sortOrder").contains(entry.getKey())){ + if(!Arrays.asList("id", "name", "code", "sortOrder").contains(entry.getKey())){ entry.setKey(null); } return entry; diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/collection/IterUtilTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/collection/IterUtilTest.java index 6bb5bb98d..b1d4b1ec6 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/collection/IterUtilTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/collection/IterUtilTest.java @@ -107,7 +107,7 @@ public class IterUtilTest { final List obj2 = ListUtil.of("3"); final List obj = ListUtil.of("1", "3"); - IterUtil.remove(obj.iterator(), (e)-> ! obj2.contains(e)); + IterUtil.remove(obj.iterator(), (e)-> !obj2.contains(e)); Assertions.assertEquals(1, obj.size()); Assertions.assertEquals("3", obj.get(0)); diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/lang/SnowflakeTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/lang/SnowflakeTest.java index dc70d5c9f..4d693488a 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/lang/SnowflakeTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/lang/SnowflakeTest.java @@ -61,7 +61,7 @@ public class SnowflakeTest { final Set ids = new ConcurrentHashSet<>(); ThreadUtil.concurrencyTest(100, () -> { for (int i = 0; i < 50000; i++) { - if(! ids.add(snowflake.nextId())){ + if(!ids.add(snowflake.nextId())){ throw new UtilException("重复ID！"); } } @@ -98,7 +98,7 @@ public class SnowflakeTest { final Set ids = new ConcurrentHashSet<>(); ThreadUtil.concurrencyTest(100, () -> { for (int i = 0; i < 50000; i++) { - if(! ids.add(snowflake.nextId())){ + if(!ids.add(snowflake.nextId())){ throw new UtilException("重复ID！"); } } diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/CronTimer.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/CronTimer.java index 0a42b49a7..6356bdfc5 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/CronTimer.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/CronTimer.java @@ -54,13 +54,13 @@ public class CronTimer extends Thread implements Serializable { long thisTime = System.currentTimeMillis(); long nextTime; long sleep; - while(! isStop){ + while(!isStop){ //下一时间计算是按照上一个执行点开始时间计算的 //此处除以定时单位是为了清零单位以下部分，例如单位是分则秒和毫秒清零 nextTime = ((thisTime / timerUnit) + 1) * timerUnit; sleep = nextTime - System.currentTimeMillis(); if(isValidSleepMillis(sleep, timerUnit)){ - if (! ThreadUtil.safeSleep(sleep)) { + if (!ThreadUtil.safeSleep(sleep)) { //等待直到下一个时间点，如果被中断直接退出Timer break; } diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/Scheduler.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/Scheduler.java index 5010bb15a..d880d5b2a 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/Scheduler.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/Scheduler.java @@ -463,7 +463,7 @@ public class Scheduler implements Serializable { public Scheduler stop(final boolean clearTasks) { lock.lock(); try { - if (! started) { + if (!started) { throw new IllegalStateException("Scheduler not started !"); } diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/CronPattern.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/CronPattern.java index 976b9aa2c..5c52647c3 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/CronPattern.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/CronPattern.java @@ -162,7 +162,7 @@ public class CronPattern { */ public Calendar nextMatchAfter(final Calendar calendar) { Calendar next = nextMatchAfter(PatternUtil.getFields(calendar, true), calendar.getTimeZone()); - if (! match(next, true)) { + if (!match(next, true)) { next.set(Calendar.DAY_OF_MONTH, next.get(Calendar.DAY_OF_MONTH) + 1); next = CalendarUtil.beginOfDay(next); return nextMatchAfter(next); diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/parser/PartParser.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/parser/PartParser.java index 83af1a1ca..aa97841b0 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/parser/PartParser.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/pattern/parser/PartParser.java @@ -171,7 +171,7 @@ public class PartParser { if (value.length() <= 2) { //根据步进的第一个数字确定起始时间，类似于 12/3则从12（秒、分等）开始 int minValue = part.getMin(); - if (! isMatchAllStr(value)) { + if (!isMatchAllStr(value)) { minValue = Math.max(minValue, parseNumber(value)); } else { //在全匹配模式下，如果步进不存在，表示步进为1 diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/SystemTimer.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/SystemTimer.java index c8a14613f..340b9d327 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/SystemTimer.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/SystemTimer.java @@ -70,7 +70,7 @@ public class SystemTimer { bossThreadPool = ThreadUtil.newSingleExecutor(); bossThreadPool.submit(() -> { while (true) { - if(! advanceClock()){ + if(!advanceClock()){ break; } } @@ -92,7 +92,7 @@ public class SystemTimer { */ public void addTask(final TimerTask timerTask) { //添加失败任务直接执行 - if (! timeWheel.addTask(timerTask)) { + if (!timeWheel.addTask(timerTask)) { ThreadUtil.execAsync(timerTask.getTask()); } } diff --git a/hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/TimerTaskList.java b/hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/TimerTaskList.java index 5b5b3115e..2dd89a0c5 100644 --- a/hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/TimerTaskList.java +++ b/hutool-cron/src/main/java/org/dromara/hutool/cron/timingwheel/TimerTaskList.java @@ -105,7 +105,7 @@ public class TimerTaskList implements Delayed { */ public synchronized void flush(final Consumer flush) { TimerTask timerTask = root.next; - while (! timerTask.equals(root)) { + while (!timerTask.equals(root)) { this.removeTask(timerTask); flush.accept(timerTask); timerTask = root.next; diff --git a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/KeyUtil.java b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/KeyUtil.java index 14a6fb74a..ddcbf475e 100644 --- a/hutool-crypto/src/main/java/org/dromara/hutool/crypto/KeyUtil.java +++ b/hutool-crypto/src/main/java/org/dromara/hutool/crypto/KeyUtil.java @@ -193,7 +193,7 @@ public class KeyUtil { * @return {@link SecretKey} */ public static SecretKey generateDESKey(final String algorithm, final byte[] key) { - if (StrUtil.isBlank(algorithm) || ! algorithm.startsWith("DES")) { + if (StrUtil.isBlank(algorithm) || !algorithm.startsWith("DES")) { throw new CryptoException("Algorithm [{}] is not a DES algorithm!", algorithm); } @@ -225,7 +225,7 @@ public class KeyUtil { * @return {@link SecretKey} */ public static SecretKey generatePBEKey(final String algorithm, char[] key) { - if (StrUtil.isBlank(algorithm) || ! algorithm.startsWith("PBE")) { + if (StrUtil.isBlank(algorithm) || !algorithm.startsWith("PBE")) { throw new CryptoException("Algorithm [{}] is not a PBE algorithm!", algorithm); } diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/AbstractDb.java b/hutool-db/src/main/java/org/dromara/hutool/db/AbstractDb.java index 030dbdce5..0b2013d75 100644 --- a/hutool-db/src/main/java/org/dromara/hutool/db/AbstractDb.java +++ b/hutool-db/src/main/java/org/dromara/hutool/db/AbstractDb.java @@ -980,7 +980,7 @@ public abstract class AbstractDb> extends DefaultConnect throw new DbRuntimeException(e); } } - if (! isSupportTransaction) { + if (!isSupportTransaction) { throw new DbRuntimeException("Transaction not supported for current database!"); } } diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/DaoTemplate.java b/hutool-db/src/main/java/org/dromara/hutool/db/DaoTemplate.java index a46fcc684..27867532e 100644 --- a/hutool-db/src/main/java/org/dromara/hutool/db/DaoTemplate.java +++ b/hutool-db/src/main/java/org/dromara/hutool/db/DaoTemplate.java @@ -326,7 +326,7 @@ public class DaoTemplate { */ public List findBySql(String sql, final Object... params) throws DbRuntimeException { final String selectKeyword = StrUtil.subPre(sql.trim(), 6).toLowerCase(); - if (! "select".equals(selectKeyword)) { + if (!"select".equals(selectKeyword)) { sql = "SELECT * FROM " + this.tableName + " " + sql; } return db.query(sql, params); diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/DefaultConnectionHolder.java b/hutool-db/src/main/java/org/dromara/hutool/db/DefaultConnectionHolder.java index fb132ecfb..c31e09c45 100644 --- a/hutool-db/src/main/java/org/dromara/hutool/db/DefaultConnectionHolder.java +++ b/hutool-db/src/main/java/org/dromara/hutool/db/DefaultConnectionHolder.java @@ -46,7 +46,7 @@ public class DefaultConnectionHolder implements ConnectionHolder { @Override public void closeConnection(final Connection conn) { try { - if (conn != null && ! conn.getAutoCommit()) { + if (conn != null && !conn.getAutoCommit()) { // 事务中的Session忽略关闭事件 return; } diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ThreadLocalConnection.java b/hutool-db/src/main/java/org/dromara/hutool/db/ThreadLocalConnection.java index 2be330971..b46674246 100644 --- a/hutool-db/src/main/java/org/dromara/hutool/db/ThreadLocalConnection.java +++ b/hutool-db/src/main/java/org/dromara/hutool/db/ThreadLocalConnection.java @@ -106,7 +106,7 @@ public enum ThreadLocalConnection { final Connection conn = connMap.get(ds); if (null != conn) { try { - if (! conn.getAutoCommit()) { + if (!conn.getAutoCommit()) { // 非自动提交事务的连接，不做关闭（可能处于事务中） return this; } diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/SqlServer2012Dialect.java b/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/SqlServer2012Dialect.java index c7441afe3..63aacf9f9 100644 --- a/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/SqlServer2012Dialect.java +++ b/hutool-db/src/main/java/org/dromara/hutool/db/dialect/impl/SqlServer2012Dialect.java @@ -34,7 +34,7 @@ public class SqlServer2012Dialect extends AnsiSqlDialect { @Override protected SqlBuilder wrapPageSql(final SqlBuilder find, final Page page) { - if (! StrUtil.containsIgnoreCase(find.toString(), "order by")) { + if (!StrUtil.containsIgnoreCase(find.toString(), "order by")) { //offset 分页必须要跟在order by后面，没有情况下补充默认排序 find.append(" order by current_timestamp"); } diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/sql/Condition.java b/hutool-db/src/main/java/org/dromara/hutool/db/sql/Condition.java index 1975d88f7..06a1aeb2c 100644 --- a/hutool-db/src/main/java/org/dromara/hutool/db/sql/Condition.java +++ b/hutool-db/src/main/java/org/dromara/hutool/db/sql/Condition.java @@ -359,7 +359,7 @@ public class Condition implements Cloneable, Serializable { // 类似：" (?,?,?)" 或者 " (1,2,3,4)" buildValuePartForIN(conditionStrBuilder, paramValues); } else { - if (isPlaceHolder() && ! isOperatorIs()) { + if (isPlaceHolder() && !isOperatorIs()) { // 使用条件表达式占位符，条件表达式并不适用于 IS NULL conditionStrBuilder.append(" ?"); if (null != paramValues) { @@ -473,7 +473,7 @@ public class Condition implements Cloneable, Serializable { } // 其他类型值，跳过 - if (! (this.value instanceof String)) { + if (!(this.value instanceof String)) { return; } @@ -575,7 +575,7 @@ public class Condition implements Cloneable, Serializable { * @return 转换后的值 */ private static Object tryToNumber(final String value) { - if (! NumberUtil.isNumber(value)) { + if (!NumberUtil.isNumber(value)) { return value; } try { diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/sql/Direction.java b/hutool-db/src/main/java/org/dromara/hutool/db/sql/Direction.java index d4bcd8b69..163528b1d 100644 --- a/hutool-db/src/main/java/org/dromara/hutool/db/sql/Direction.java +++ b/hutool-db/src/main/java/org/dromara/hutool/db/sql/Direction.java @@ -54,7 +54,7 @@ public enum Direction { return Direction.valueOf(value.toUpperCase()); } catch (final Exception e) { throw new IllegalArgumentException(StrUtil.format( - "Invalid value [{}] for orders given! Has to be either 'desc' or 'asc' (case insensitive).", value), e); + "Invalid value [{}] for orders given!Has to be either 'desc' or 'asc' (case insensitive).", value), e); } } } diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlFormatter.java b/hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlFormatter.java index e9993135d..b02fd264c 100644 --- a/hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlFormatter.java +++ b/hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlFormatter.java @@ -155,7 +155,7 @@ public class SqlFormatter { misc(); } - if (! isWhitespace(this.token)) { + if (!isWhitespace(this.token)) { this.lastToken = this.lcToken; } } diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/archiver/SevenZArchiver.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/archiver/SevenZArchiver.java index 5e5a6b927..849bbb43b 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/archiver/SevenZArchiver.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/archiver/SevenZArchiver.java @@ -133,7 +133,7 @@ public class SevenZArchiver implements Archiver { * @param filter 文件过滤器，指定哪些文件或目录可以加入，当{@link Predicate#test(Object)}为{@code true}保留，null表示保留全部 */ private void addInternal(final File file, final String path, final Predicate filter) throws IOException { - if (null != filter && ! filter.test(file)) { + if (null != filter && !filter.test(file)) { return; } final SevenZOutputFile out = this.sevenZOutputFile; diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/archiver/StreamArchiver.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/archiver/StreamArchiver.java index 9931f6249..de5219681 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/archiver/StreamArchiver.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/archiver/StreamArchiver.java @@ -168,7 +168,7 @@ public class StreamArchiver implements Archiver { * @param predicate 文件过滤器，指定哪些文件或目录可以加入，当{@link Predicate#test(Object)}为{@code true}加入。 */ private void addInternal(final File file, final String path, final Predicate predicate) throws IOException { - if (null != predicate && ! predicate.test(file)) { + if (null != predicate && !predicate.test(file)) { return; } final ArchiveOutputStream out = this.out; diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/SevenZExtractor.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/SevenZExtractor.java index ab2100a9a..de47eebed 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/SevenZExtractor.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/SevenZExtractor.java @@ -118,7 +118,7 @@ public class SevenZExtractor implements Extractor, RandomAccess { public InputStream getFirst(final Predicate predicate) { final SevenZFile sevenZFile = this.sevenZFile; for (final SevenZArchiveEntry entry : sevenZFile.getEntries()) { - if (null != predicate && ! predicate.test(entry)) { + if (null != predicate && !predicate.test(entry)) { continue; } if (entry.isDirectory()) { @@ -144,12 +144,12 @@ public class SevenZExtractor implements Extractor, RandomAccess { * @throws IOException IO异常 */ private void extractInternal(final File targetDir, final Predicate predicate) throws IOException { - Assert.isTrue(null != targetDir && ((! targetDir.exists()) || targetDir.isDirectory()), "target must be dir."); + Assert.isTrue(null != targetDir && ((!targetDir.exists()) || targetDir.isDirectory()), "target must be dir."); final SevenZFile sevenZFile = this.sevenZFile; SevenZArchiveEntry entry; File outItemFile; while (null != (entry = sevenZFile.getNextEntry())) { - if (null != predicate && ! predicate.test(entry)) { + if (null != predicate && !predicate.test(entry)) { continue; } outItemFile = FileUtil.file(targetDir, entry.getName()); diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/StreamExtractor.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/StreamExtractor.java index b26e2cd2f..56c309a0f 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/StreamExtractor.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/compress/extractor/StreamExtractor.java @@ -113,10 +113,10 @@ public class StreamExtractor implements Extractor { ArchiveEntry entry; try { while (null != (entry = in.getNextEntry())) { - if (null != predicate && ! predicate.test(entry)) { + if (null != predicate && !predicate.test(entry)) { continue; } - if (entry.isDirectory() || ! in.canReadEntryData(entry)) { + if (entry.isDirectory() || !in.canReadEntryData(entry)) { // 目录或无法读取的文件直接跳过 continue; } @@ -155,15 +155,15 @@ public class StreamExtractor implements Extractor { * @throws IOException IO异常 */ private void extractInternal(final File targetDir, final Predicate predicate) throws IOException { - Assert.isTrue(null != targetDir && ((! targetDir.exists()) || targetDir.isDirectory()), "target must be dir."); + Assert.isTrue(null != targetDir && ((!targetDir.exists()) || targetDir.isDirectory()), "target must be dir."); final ArchiveInputStream in = this.in; ArchiveEntry entry; File outItemFile; while (null != (entry = in.getNextEntry())) { - if (null != predicate && ! predicate.test(entry)) { + if (null != predicate && !predicate.test(entry)) { continue; } - if (! in.canReadEntryData(entry)) { + if (!in.canReadEntryData(entry)) { // 无法读取的文件直接跳过 continue; } diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/ExpressionFactory.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/ExpressionFactory.java index 9c03e6ac8..fb953b641 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/ExpressionFactory.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/expression/engine/ExpressionFactory.java @@ -61,6 +61,6 @@ public class ExpressionFactory { return engine; } - throw new ExpressionException("No expression jar found ! Please add one of it to your project !"); + throw new ExpressionException("No expression jar found !Please add one of it to your project !"); } } diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/AbstractFtp.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/AbstractFtp.java index ae93319fb..6a176436a 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/AbstractFtp.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/AbstractFtp.java @@ -186,13 +186,13 @@ public abstract class AbstractFtp implements Closeable { if (StrUtil.isNotEmpty(s)) { boolean exist = true; try { - if (! cd(s)) { + if (!cd(s)) { exist = false; } } catch (final FtpException e) { exist = false; } - if (! exist) { + if (!exist) { //目录不存在时创建 mkdir(s); cd(s); diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/Ftp.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/Ftp.java index d38c5609d..cb3164c5c 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/Ftp.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/Ftp.java @@ -232,7 +232,7 @@ public class Ftp extends AbstractFtp { throw new IORuntimeException(e); } final int replyCode = client.getReplyCode(); // 是否成功登录服务器 - if (! FTPReply.isPositiveCompletion(replyCode)) { + if (!FTPReply.isPositiveCompletion(replyCode)) { try { client.disconnect(); } catch (final IOException e) { @@ -369,7 +369,7 @@ public class Ftp extends AbstractFtp { String fileName; for (final FTPFile ftpFile : ftpFiles) { fileName = ftpFile.getName(); - if (! StrUtil.equals(".", fileName) && ! StrUtil.equals("..", fileName)) { + if (!StrUtil.equals(".", fileName) && !StrUtil.equals("..", fileName)) { if (null == predicate || predicate.test(ftpFile)) { result.add(ftpFile); } @@ -390,7 +390,7 @@ public class Ftp extends AbstractFtp { String pwd = null; if (StrUtil.isNotBlank(path)) { pwd = pwd(); - if (! cd(path)) { + if (!cd(path)) { throw new FtpException("Change dir to [{}] error, maybe path not exist!", path); } } @@ -455,7 +455,7 @@ public class Ftp extends AbstractFtp { final String pwd = pwd(); final String fileName = FileNameUtil.getName(path); final String dir = StrUtil.removeSuffix(path, fileName); - if (! cd(dir)) { + if (!cd(dir)) { throw new FtpException("Change dir to [{}] error, maybe dir not exist!", path); } @@ -486,7 +486,7 @@ public class Ftp extends AbstractFtp { childPath = StrUtil.format("{}/{}", dirPath, name); if (ftpFile.isDirectory()) { // 上级和本级目录除外 - if (! ".".equals(name) && ! "..".equals(name)) { + if (!".".equals(name) && !"..".equals(name)) { delDir(childPath); } } else { @@ -518,7 +518,7 @@ public class Ftp extends AbstractFtp { @Override public boolean uploadFile(final String remotePath, final File file) { Assert.notNull(file, "file to upload is null !"); - if (! FileUtil.isFile(file)) { + if (!FileUtil.isFile(file)) { throw new FtpException("[{}] is not a file!", file); } return uploadFile(remotePath, file.getName(), file); @@ -576,7 +576,7 @@ public class Ftp extends AbstractFtp { if (StrUtil.isNotBlank(remotePath)) { mkDirs(remotePath); - if (! cd(remotePath)) { + if (!cd(remotePath)) { throw new FtpException("Change dir to [{}] error, maybe dir not exist!", remotePath); } } @@ -601,7 +601,7 @@ public class Ftp extends AbstractFtp { * @param uploadFile 上传文件或目录 */ public void upload(final String remotePath, final File uploadFile) { - if (! FileUtil.isDirectory(uploadFile)) { + if (!FileUtil.isDirectory(uploadFile)) { this.uploadFile(remotePath, uploadFile); return; } @@ -656,9 +656,9 @@ public class Ftp extends AbstractFtp { srcFile = StrUtil.format("{}/{}", sourcePath, fileName); destFile = FileUtil.file(destDir, fileName); - if (! ftpFile.isDirectory()) { + if (!ftpFile.isDirectory()) { // 本地不存在文件或者ftp上文件有修改则下载 - if (! FileUtil.exists(destFile) + if (!FileUtil.exists(destFile) || (ftpFile.getTimestamp().getTimeInMillis() > destFile.lastModified())) { download(srcFile, destFile); } @@ -682,7 +682,7 @@ public class Ftp extends AbstractFtp { if (outFile.isDirectory()) { outFile = new File(outFile, fileName); } - if (! outFile.exists()) { + if (!outFile.exists()) { FileUtil.touch(outFile); } try (final OutputStream out = FileUtil.getOutputStream(outFile)) { @@ -719,7 +719,7 @@ public class Ftp extends AbstractFtp { pwd = pwd(); } - if (! cd(path)) { + if (!cd(path)) { throw new FtpException("Change dir to [{}] error, maybe dir not exist!", path); } diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/MailAccount.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/MailAccount.java index 710cb91c0..ef700b8e9 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/MailAccount.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/mail/MailAccount.java @@ -649,7 +649,7 @@ public class MailAccount implements Serializable { } if (null == this.auth) { // 如果密码非空白，则使用认证模式 - this.auth = (! StrUtil.isBlank(this.pass)); + this.auth = (!StrUtil.isBlank(this.pass)); } if (null == this.port) { // 端口在SSL状态下默认与socketFactoryPort一致，非SSL状态下默认为25 diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/PinyinFactory.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/PinyinFactory.java index 6be06052c..5d34b8928 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/PinyinFactory.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/PinyinFactory.java @@ -60,6 +60,6 @@ public class PinyinFactory { return engine; } - throw new PinyinException("No pinyin jar found ! Please add one of it to your project !"); + throw new PinyinException("No pinyin jar found !Please add one of it to your project !"); } } diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/tinypinyin/TinyPinyinEngine.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/tinypinyin/TinyPinyinEngine.java index e3e4cfe44..3c7176f6c 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/tinypinyin/TinyPinyinEngine.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/pinyin/engine/tinypinyin/TinyPinyinEngine.java @@ -55,7 +55,7 @@ public class TinyPinyinEngine implements PinyinEngine { @Override public String getPinyin(final char c) { - if(! Pinyin.isChinese(c)){ + if(!Pinyin.isChinese(c)){ return String.valueOf(c); } return Pinyin.toPinyin(c).toLowerCase(); diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/JschUtil.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/JschUtil.java index 83462adaf..f543a1854 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/JschUtil.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/JschUtil.java @@ -435,7 +435,7 @@ public class JschUtil { public static Channel createChannel(final Session session, final ChannelType channelType) { final Channel channel; try { - if (! session.isConnected()) { + if (!session.isConnected()) { session.connect(); } channel = session.openChannel(channelType.getValue()); diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/Sftp.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/Sftp.java index 7b159084b..338954c45 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/Sftp.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/ssh/Sftp.java @@ -307,7 +307,7 @@ public class Sftp extends AbstractFtp { * @since 4.0.5 */ public List lsFiles(final String path) { - return ls(path, t -> ! t.getAttrs().isDir()); + return ls(path, t -> !t.getAttrs().isDir()); } /** @@ -353,7 +353,7 @@ public class Sftp extends AbstractFtp { try { channel.ls(path, entry -> { final String fileName = entry.getFilename(); - if (! StrUtil.equals(".", fileName) && ! StrUtil.equals("..", fileName)) { + if (!StrUtil.equals(".", fileName) && !StrUtil.equals("..", fileName)) { if (null == predicate || predicate.test(entry)) { entryList.add(entry); } @@ -361,7 +361,7 @@ public class Sftp extends AbstractFtp { return LsEntrySelector.CONTINUE; }); } catch (final SftpException e) { - if (! StrUtil.startWithIgnoreCase(e.getMessage(), "No such file")) { + if (!StrUtil.startWithIgnoreCase(e.getMessage(), "No such file")) { throw new JschRuntimeException(e); } // 文件不存在忽略 @@ -446,7 +446,7 @@ public class Sftp extends AbstractFtp { @Override @SuppressWarnings("unchecked") public boolean delDir(final String dirPath) { - if (! cd(dirPath)) { + if (!cd(dirPath)) { return false; } @@ -460,7 +460,7 @@ public class Sftp extends AbstractFtp { String fileName; for (final LsEntry entry : list) { fileName = entry.getFilename(); - if (! ".".equals(fileName) && ! "..".equals(fileName)) { + if (!".".equals(fileName) && !"..".equals(fileName)) { if (entry.getAttrs().isDir()) { delDir(fileName); } else { @@ -469,7 +469,7 @@ public class Sftp extends AbstractFtp { } } - if (! cd("..")) { + if (!cd("..")) { return false; } @@ -490,7 +490,7 @@ public class Sftp extends AbstractFtp { * @since 5.7.6 */ public void upload(final String remotePath, final File file) { - if (! FileUtil.exists(file)) { + if (!FileUtil.exists(file)) { return; } if (file.isDirectory()) { @@ -514,7 +514,7 @@ public class Sftp extends AbstractFtp { @SuppressWarnings("resource") @Override public boolean uploadFile(final String destPath, final File file) { - if(! FileUtil.isFile(file)){ + if(!FileUtil.isFile(file)){ throw new FtpException("[{}] is not a file!", file); } this.mkDirs(destPath); @@ -634,9 +634,9 @@ public class Sftp extends AbstractFtp { srcFile = StrUtil.format("{}/{}", sourcePath, fileName); destFile = FileUtil.file(destDir, fileName); - if (! item.getAttrs().isDir()) { + if (!item.getAttrs().isDir()) { // 本地不存在文件或者ftp上文件有修改则下载 - if (! FileUtil.exists(destFile) + if (!FileUtil.exists(destFile) || (item.getAttrs().getMTime() > (destFile.lastModified() / 1000))) { download(srcFile, destFile); } diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/TemplateFactory.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/TemplateFactory.java index 56d28b53f..56296242c 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/TemplateFactory.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/TemplateFactory.java @@ -81,6 +81,6 @@ public class TemplateFactory { return engine.init(config); } - throw new TemplateException("No template found ! Please add one of template jar to your project !"); + throw new TemplateException("No template found !Please add one of template jar to your project !"); } } diff --git a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/TokenizerFactory.java b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/TokenizerFactory.java index 3cb2381d9..435a9ee79 100644 --- a/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/TokenizerFactory.java +++ b/hutool-extra/src/main/java/org/dromara/hutool/extra/tokenizer/engine/TokenizerFactory.java @@ -60,6 +60,6 @@ public class TokenizerFactory { return engine; } - throw new TokenizerException("No tokenizer found ! Please add some tokenizer jar to your project !"); + throw new TokenizerException("No tokenizer found !Please add some tokenizer jar to your project !"); } } diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/HttpUtil.java b/hutool-http/src/main/java/org/dromara/hutool/http/HttpUtil.java index 5f8f76138..3a8cd9364 100644 --- a/hutool-http/src/main/java/org/dromara/hutool/http/HttpUtil.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/HttpUtil.java @@ -190,7 +190,7 @@ public class HttpUtil { if (qmIndex > 0) { // 原URL带参数，则对这部分参数单独编码（如果选项为进行编码） urlBuilder.append(isEncode ? UrlQueryUtil.encodeQuery(url, charset) : url); - if (! StrUtil.endWith(url, '&')) { + if (!StrUtil.endWith(url, '&')) { // 已经带参数的情况下追加参数 urlBuilder.append('&'); } diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/body/MultipartOutputStream.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/body/MultipartOutputStream.java index 13e19eac4..fd57cb4c0 100644 --- a/hutool-http/src/main/java/org/dromara/hutool/http/client/body/MultipartOutputStream.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/body/MultipartOutputStream.java @@ -130,7 +130,7 @@ public class MultipartOutputStream extends OutputStream { * @throws IORuntimeException IO异常 */ public void finish() throws IORuntimeException { - if (! isFinish) { + if (!isFinish) { write(StrUtil.format("--{}--\r\n", boundary)); this.isFinish = true; } diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/body/ResponseBody.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/body/ResponseBody.java index 522d1ce2f..92c7fc45a 100644 --- a/hutool-http/src/main/java/org/dromara/hutool/http/client/body/ResponseBody.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/body/ResponseBody.java @@ -227,7 +227,7 @@ public class ResponseBody implements HttpBody, Closeable { * @since 5.4.1 */ private File getTargetFile(final File targetFileOrDir, final String customParamName) { - if (! targetFileOrDir.isDirectory()) { + if (!targetFileOrDir.isDirectory()) { // 非目录直接返回 return targetFileOrDir; } diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/ClientEngineFactory.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/ClientEngineFactory.java index e6093fb2e..65d487581 100644 --- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/ClientEngineFactory.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/ClientEngineFactory.java @@ -73,6 +73,6 @@ public class ClientEngineFactory { return engine; } - throw new HttpException("No http jar found ! Please add one of it to your project !"); + throw new HttpException("No http jar found !Please add one of it to your project !"); } } diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/HttpUrlConnectionUtil.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/HttpUrlConnectionUtil.java index 46e4c3712..ce7c1a75e 100644 --- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/HttpUrlConnectionUtil.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/HttpUrlConnectionUtil.java @@ -69,7 +69,7 @@ public class HttpUrlConnectionUtil { // 首先去除修饰符，否则设置值失败 ModifierUtil.removeFinalModify(methodsField); final Object staticFieldValue = FieldUtil.getStaticFieldValue(methodsField); - if (! ArrayUtil.equals(METHODS, staticFieldValue)) { + if (!ArrayUtil.equals(METHODS, staticFieldValue)) { // 去除final修饰 FieldUtil.setStaticFieldValue(methodsField, METHODS); } @@ -86,7 +86,7 @@ public class HttpUrlConnectionUtil { */ public static HttpURLConnection openHttp(final URL url, final Proxy proxy) throws IORuntimeException { final URLConnection conn = openConnection(url, proxy); - if (! conn instanceof HttpURLConnection) { + if (!(conn instanceof HttpURLConnection)) { // 防止其它协议造成的转换异常 throw new HttpException("'{}' of URL [{}] is not a http connection, make sure URL is format for http.", conn.getClass().getName(), url); diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkClientEngine.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkClientEngine.java index ec0abb8ef..f18b33d42 100644 --- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkClientEngine.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkClientEngine.java @@ -201,10 +201,10 @@ public class JdkClientEngine implements ClientEngine { */ private static UrlBuilder getLocationUrl(final UrlBuilder parentUrl, String location) { final UrlBuilder redirectUrl; - if (! HttpUtil.isHttp(location) && ! HttpUtil.isHttps(location)) { + if (!HttpUtil.isHttp(location) && !HttpUtil.isHttps(location)) { // issue#I5TPSY // location可能为相对路径 - if (! location.startsWith("/")) { + if (!location.startsWith("/")) { location = StrUtil.addSuffixIfNot(parentUrl.getPathStr(), "/") + location; } redirectUrl = UrlBuilder.of(parentUrl.getScheme(), parentUrl.getHost(), parentUrl.getPort(), diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkHttpInputStream.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkHttpInputStream.java index 19f6f1462..b1886cb6b 100644 --- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkHttpInputStream.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkHttpInputStream.java @@ -94,7 +94,7 @@ public class JdkHttpInputStream extends InputStream { try { this.in = (response.status < HttpStatus.HTTP_BAD_REQUEST) ? response.httpConnection.getInputStream() : response.httpConnection.getErrorStream(); } catch (final IOException e) { - if (! (e instanceof FileNotFoundException)) { + if (!(e instanceof FileNotFoundException)) { throw new HttpException(e); } // 服务器无返回内容，忽略之 diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkHttpResponse.java b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkHttpResponse.java index 18e26c7fc..68b0dd569 100644 --- a/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkHttpResponse.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/client/engine/jdk/JdkHttpResponse.java @@ -252,7 +252,7 @@ public class JdkHttpResponse implements Response, Closeable { try { this.status = httpConnection.getCode(); } catch (final IOException e) { - if (! (e instanceof FileNotFoundException)) { + if (!(e instanceof FileNotFoundException)) { throw new HttpException(e); } // 服务器无返回内容，忽略之 @@ -270,7 +270,7 @@ public class JdkHttpResponse implements Response, Closeable { GlobalCookieManager.store(httpConnection, this.headers); // 获取响应内容流 - if (! isIgnoreBody) { + if (!isIgnoreBody) { this.body = new ResponseBody(this, new JdkHttpInputStream(this), isAsync, this.ignoreEOFError); } } diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/html/HTMLFilter.java b/hutool-http/src/main/java/org/dromara/hutool/http/html/HTMLFilter.java index e9a717e98..8eb77c066 100644 --- a/hutool-http/src/main/java/org/dromara/hutool/http/html/HTMLFilter.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/html/HTMLFilter.java @@ -376,7 +376,7 @@ public final class HTMLFilter { if (m.find()) { final String name = m.group(1).toLowerCase(); if (allowed(name)) { - if (! inArray(name, vSelfClosingTags)) { + if (!inArray(name, vSelfClosingTags)) { if (vTagCounts.containsKey(name)) { vTagCounts.put(name, vTagCounts.get(name) - 1); return ""; diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/html/HtmlUtil.java b/hutool-http/src/main/java/org/dromara/hutool/http/html/HtmlUtil.java index b3a6d30a6..5b6bbb363 100644 --- a/hutool-http/src/main/java/org/dromara/hutool/http/html/HtmlUtil.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/html/HtmlUtil.java @@ -289,7 +289,7 @@ public class HtmlUtil { } // ignore } - if (null != charsetInContent && ! charset.equals(charsetInContent)) { + if (null != charsetInContent && !charset.equals(charsetInContent)) { content = new String(contentBytes, charsetInContent); } } diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/HttpServerRequest.java b/hutool-http/src/main/java/org/dromara/hutool/http/server/HttpServerRequest.java index b6a5ab08b..3bdd5a394 100644 --- a/hutool-http/src/main/java/org/dromara/hutool/http/server/HttpServerRequest.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/server/HttpServerRequest.java @@ -256,7 +256,7 @@ public class HttpServerRequest extends HttpServerBase { * @return 是否为Multipart类型表单，此类型表单用于文件上传 */ public boolean isMultipart() { - if (! isPostMethod()) { + if (!isPostMethod()) { return false; } @@ -406,7 +406,7 @@ public class HttpServerRequest extends HttpServerBase { String ip; for (final String header : headerNames) { ip = getHeader(header); - if (! NetUtil.isUnknown(ip)) { + if (!NetUtil.isUnknown(ip)) { return NetUtil.getMultistageReverseProxyIp(ip); } } diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/HttpServerResponse.java b/hutool-http/src/main/java/org/dromara/hutool/http/server/HttpServerResponse.java index 096df20eb..d37896e93 100644 --- a/hutool-http/src/main/java/org/dromara/hutool/http/server/HttpServerResponse.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/server/HttpServerResponse.java @@ -202,7 +202,7 @@ public class HttpServerResponse extends HttpServerBase { */ public HttpServerResponse setContentType(String contentType) { if (null != contentType && null != this.charset) { - if (! contentType.contains(";charset=")) { + if (!contentType.contains(";charset=")) { contentType = ContentType.build(contentType, this.charset); } } @@ -249,7 +249,7 @@ public class HttpServerResponse extends HttpServerBase { * @return 响应数据流 */ public OutputStream getOut() { - if (! this.isSendCode) { + if (!this.isSendCode) { sendOk(); } return this.httpExchange.getResponseBody(); @@ -355,7 +355,7 @@ public class HttpServerResponse extends HttpServerBase { * @return this */ public HttpServerResponse write(final InputStream in, final int length) { - if (! isSendCode) { + if (!isSendCode) { sendOk(Math.max(0, length)); } OutputStream out = null; @@ -433,7 +433,7 @@ public class HttpServerResponse extends HttpServerBase { public HttpServerResponse write(final InputStream in, final int length, final String contentType, final String fileName) { final Charset charset = ObjUtil.defaultIfNull(this.charset, DEFAULT_CHARSET); - if (! contentType.startsWith("text/")) { + if (!contentType.startsWith("text/")) { // 非文本类型数据直接走下载 setHeader(Header.CONTENT_DISPOSITION, StrUtil.format("attachment;filename={}", URLEncoder.encodeAll(fileName, charset))); } diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/JakartaServletUtil.java b/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/JakartaServletUtil.java index 2a2096326..0157321d6 100644 --- a/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/JakartaServletUtil.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/JakartaServletUtil.java @@ -244,7 +244,7 @@ public class JakartaServletUtil { String ip; for (final String header : headerNames) { ip = request.getHeader(header); - if (! NetUtil.isUnknown(ip)) { + if (!NetUtil.isUnknown(ip)) { return NetUtil.getMultistageReverseProxyIp(ip); } } @@ -426,7 +426,7 @@ public class JakartaServletUtil { * @return 是否为Multipart类型表单，此类型表单用于文件上传 */ public static boolean isMultipart(final HttpServletRequest request) { - if (! isPostMethod(request)) { + if (!isPostMethod(request)) { return false; } diff --git a/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/ServletUtil.java b/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/ServletUtil.java index cbdc14976..cbc1d7315 100644 --- a/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/ServletUtil.java +++ b/hutool-http/src/main/java/org/dromara/hutool/http/server/servlet/ServletUtil.java @@ -243,7 +243,7 @@ public class ServletUtil { String ip; for (final String header : headerNames) { ip = request.getHeader(header); - if (! NetUtil.isUnknown(ip)) { + if (!NetUtil.isUnknown(ip)) { return NetUtil.getMultistageReverseProxyIp(ip); } } @@ -437,7 +437,7 @@ public class ServletUtil { * @return 是否为Multipart类型表单，此类型表单用于文件上传 */ public static boolean isMultipart(final HttpServletRequest request) { - if (! isPostMethod(request)) { + if (!isPostMethod(request)) { return false; } diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/InternalJSONUtil.java b/hutool-json/src/main/java/org/dromara/hutool/json/InternalJSONUtil.java index b0ebf59e9..91fde68b9 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/InternalJSONUtil.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/InternalJSONUtil.java @@ -79,7 +79,7 @@ public final class InternalJSONUtil { || object instanceof Number // || ObjUtil.isBasicType(object) // ) { - if (! ObjUtil.isValidIfNumber(object)) { + if (!ObjUtil.isValidIfNumber(object)) { throw new JSONException("JSON does not allow non-finite numbers."); } return object; @@ -252,9 +252,9 @@ public final class InternalJSONUtil { * @since 4.3.1 */ static boolean defaultIgnoreNullValue(final Object obj) { - return (! (obj instanceof CharSequence))// - && (! (obj instanceof JSONTokener))// - && (! (obj instanceof Map)); + return (!(obj instanceof CharSequence))// + && (!(obj instanceof JSONTokener))// + && (!(obj instanceof Map)); } /** diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/JSONArray.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSONArray.java index f1ae6e732..921ade2c5 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/JSONArray.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSONArray.java @@ -456,7 +456,7 @@ public class JSONArray implements JSON, JSONGetter, List, Rando } this.rawList.add(index, InternalJSONUtil.wrap(element, this.config)); } else { - if (! config.isIgnoreNullValue()) { + if (!config.isIgnoreNullValue()) { while (index != this.size()) { // 非末尾，则填充null this.add(null); diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/JSONTokener.java b/hutool-json/src/main/java/org/dromara/hutool/json/JSONTokener.java index 464b2defb..ee29faf3b 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/JSONTokener.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/JSONTokener.java @@ -114,7 +114,7 @@ public class JSONTokener extends ReaderWrapper { * @return 是否进入结尾 */ public boolean end() { - return this.eof && ! this.usePrevious; + return this.eof && !this.usePrevious; } /** diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWT.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWT.java index 2f8f2b1b0..1aaa71d6c 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWT.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWT.java @@ -394,7 +394,7 @@ public class JWT implements RegisteredPayload { * @since 5.7.4 */ public boolean validate(final long leeway) { - if (! verify()) { + if (!verify()) { return false; } diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTValidator.java b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTValidator.java index 642bde838..cf8947549 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTValidator.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/jwt/JWTValidator.java @@ -172,13 +172,13 @@ public class JWTValidator { } final String algorithmIdInSigner = signer.getAlgorithmId(); - if (! StrUtil.equals(algorithmId, algorithmIdInSigner)) { + if (!StrUtil.equals(algorithmId, algorithmIdInSigner)) { throw new ValidateException("Algorithm [{}] defined in header doesn't match to [{}]!" , algorithmId, algorithmIdInSigner); } // 通过算法验证签名是否正确 - if (! jwt.verify(signer)) { + if (!jwt.verify(signer)) { throw new ValidateException("Signature verification failed!"); } } diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/mapper/JSONArrayMapper.java b/hutool-json/src/main/java/org/dromara/hutool/json/mapper/JSONArrayMapper.java index 2ab13ab68..8680095f9 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/mapper/JSONArrayMapper.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/mapper/JSONArrayMapper.java @@ -119,7 +119,7 @@ public class JSONArrayMapper { } else if (source instanceof Iterable) {// Iterable iter = ((Iterable) source).iterator(); } else { - if(! jsonArray.config().isIgnoreError()){ + if(!jsonArray.config().isIgnoreError()){ throw new JSONException("JSONArray initial value should be a string or collection or array."); } // 如果用户选择跳过异常，则跳过此值转换 diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/mapper/JSONObjectMapper.java b/hutool-json/src/main/java/org/dromara/hutool/json/mapper/JSONObjectMapper.java index 561897f90..8463939d4 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/mapper/JSONObjectMapper.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/mapper/JSONObjectMapper.java @@ -129,7 +129,7 @@ public class JSONObjectMapper { // 普通Bean mapFromBean(source, jsonObject); } else { - if(! jsonObject.config().isIgnoreError()){ + if(!jsonObject.config().isIgnoreError()){ // 不支持对象类型转换为JSONObject throw new JSONException("Unsupported type [{}] to JSONObject!", source.getClass()); } diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/writer/JSONWriter.java b/hutool-json/src/main/java/org/dromara/hutool/json/writer/JSONWriter.java index f99ff290e..ad3db5aad 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/writer/JSONWriter.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/writer/JSONWriter.java @@ -158,13 +158,13 @@ public class JSONWriter extends Writer { } if (null != predicate) { - if (! predicate.test(pair)) { + if (!predicate.test(pair)) { // 使用修改后的键值对 return this; } } - if (! arrayMode) { + if (!arrayMode) { // JSONObject模式，写出键，否则只输出值 writeKey(StrUtil.toString(pair.getKey())); } diff --git a/hutool-json/src/main/java/org/dromara/hutool/json/xml/XMLTokener.java b/hutool-json/src/main/java/org/dromara/hutool/json/xml/XMLTokener.java index f0318ff24..c48ff1646 100644 --- a/hutool-json/src/main/java/org/dromara/hutool/json/xml/XMLTokener.java +++ b/hutool-json/src/main/java/org/dromara/hutool/json/xml/XMLTokener.java @@ -162,7 +162,7 @@ public class XMLTokener extends JSONTokener { /** * Returns the next XML meta token. This is used for skipping over <!...> and <?...?> structures. * - * @return Syntax characters ({@code < > / = ! ?}) are returned as Character, and strings and names are returned as Boolean. We don't care what the values actually are. + * @return Syntax characters ({@code < > / = !?}) are returned as Character, and strings and names are returned as Boolean. We don't care what the values actually are. * @throws JSONException 字符串中属性未关闭或XML结构错误抛出此异常。If a string is not properly closed or if the XML is badly structured. */ public Object nextMeta() throws JSONException { @@ -223,7 +223,7 @@ public class XMLTokener extends JSONTokener { /** * Get the next XML Token. These tokens are found inside of angle brackets.
- * It may be one of these characters: {@code / > = ! ?} or it may be a string wrapped in single quotes or double + * It may be one of these characters: {@code / > = !?} or it may be a string wrapped in single quotes or double * quotes, or it may be a name. * * @return a String or a Character. diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/JSONArrayTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/JSONArrayTest.java index dd9d51cd1..54b077d64 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/JSONArrayTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/JSONArrayTest.java @@ -273,7 +273,7 @@ public class JSONArrayTest { .set("value3") .set(true); - final String s = json1.toJSONString(0, (pair) -> ! pair.getValue().equals("value2")); + final String s = json1.toJSONString(0, (pair) -> !pair.getValue().equals("value2")); Assertions.assertEquals("[\"value1\",\"value3\",true]", s); } diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/JSONObjectTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/JSONObjectTest.java index e4da327ab..4f8d3bd94 100644 --- a/hutool-json/src/test/java/org/dromara/hutool/json/JSONObjectTest.java +++ b/hutool-json/src/test/java/org/dromara/hutool/json/JSONObjectTest.java @@ -669,7 +669,7 @@ public class JSONObjectTest { .set("c", "value3") .set("d", true); - final String s = json1.toJSONString(0, (pair) -> ! pair.getKey().equals("b")); + final String s = json1.toJSONString(0, (pair) -> !pair.getKey().equals("b")); Assertions.assertEquals("{\"a\":\"value1\",\"c\":\"value3\",\"d\":true}", s); } diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleColorLog.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleColorLog.java index 35b3e52bb..cdb4261fc 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleColorLog.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleColorLog.java @@ -90,7 +90,7 @@ public class ConsoleColorLog extends ConsoleLog { @Override public synchronized void log(final String fqcn, final Level level, final Throwable t, final String format, final Object... arguments) { - if (! isEnabled(level)) { + if (!isEnabled(level)) { return; } diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleLog.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleLog.java index f6b3162c8..87b4d1f8b 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleLog.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleLog.java @@ -128,7 +128,7 @@ public class ConsoleLog extends AbstractLog { @Override public void log(final String fqcn, final Level level, final Throwable t, final String format, final Object... arguments) { // fqcn 无效 - if (! isEnabled(level)) { + if (!isEnabled(level)) { return; } diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/engine/slf4j/Slf4jLogFactory.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/slf4j/Slf4jLogFactory.java index 3600c2873..8549de485 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/engine/slf4j/Slf4jLogFactory.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/slf4j/Slf4jLogFactory.java @@ -43,7 +43,7 @@ public class Slf4jLogFactory extends LogFactory { public Slf4jLogFactory(final boolean failIfNOP) { super("Slf4j"); checkLogExist(LoggerFactory.class); - if(! failIfNOP){ + if(!failIfNOP){ return; } diff --git a/hutool-log/src/test/resources/logtube.properties b/hutool-log/src/test/resources/logtube.properties index feb474e82..1fdaf5a4f 100644 --- a/hutool-log/src/test/resources/logtube.properties +++ b/hutool-log/src/test/resources/logtube.properties @@ -4,10 +4,10 @@ # ########################################## # -# 项目名 !!!按照实际需要修改!!! 不允许点号，使用 - 分割 +# 项目名 !!!按照实际需要修改!!!不允许点号，使用 - 分割 logtube.project=test-hutool # -# 项目环境 !!!按照实际需要修改!!! 允许的值为 'dev', 'test', 'staging' 和 'prod' +# 项目环境 !!!按照实际需要修改!!!允许的值为 'dev', 'test', 'staging' 和 'prod' logtube.env=test # # 全局主题过滤器，默认设置为不包括 trace 和 debug，调试环境可以酌情打开 diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvParser.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvParser.java index 36ac4f0ea..82c21d6dd 100644 --- a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvParser.java +++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvParser.java @@ -132,7 +132,7 @@ public final class CsvParser extends ComputeIter implements Closeable, S public CsvRow nextRow() throws IORuntimeException { List currentFields; int fieldCount; - while (! finished) { + while (!finished) { currentFields = readLine(); fieldCount = currentFields.size(); if (fieldCount < 1) { @@ -196,7 +196,7 @@ public final class CsvParser extends ComputeIter implements Closeable, S // 自定义别名 field = ObjUtil.defaultIfNull(this.config.headerAlias.get(field), field); } - if (StrUtil.isNotEmpty(field) && ! localHeaderMap.containsKey(field)) { + if (StrUtil.isNotEmpty(field) && !localHeaderMap.containsKey(field)) { localHeaderMap.put(field, i); } } @@ -232,7 +232,7 @@ public final class CsvParser extends ComputeIter implements Closeable, S boolean inComment = false; while (true) { - if (! buf.hasRemaining()) { + if (!buf.hasRemaining()) { // 此Buffer读取结束，开始读取下一段 if (copyLen > 0) { buf.appendTo(currentField, copyLen); diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvWriter.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvWriter.java index e644dc788..b776d9aa6 100644 --- a/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvWriter.java +++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvWriter.java @@ -416,7 +416,7 @@ public final class CsvWriter implements Closeable, Flushable, Serializable { final char textDelimiter = config.textDelimiter; final char fieldSeparator = config.fieldSeparator; - if (! newline) { + if (!newline) { writer.write(fieldSeparator); } else { newline = false; diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/BigExcelWriter.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/BigExcelWriter.java index fdca76815..3341c04f9 100644 --- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/BigExcelWriter.java +++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/BigExcelWriter.java @@ -173,7 +173,7 @@ public class BigExcelWriter extends ExcelWriter { @Override public ExcelWriter flush(final OutputStream out, final boolean isCloseOut) throws IORuntimeException { - if (! isFlushed) { + if (!isFlushed) { isFlushed = true; return super.flush(out, isCloseOut); } @@ -182,7 +182,7 @@ public class BigExcelWriter extends ExcelWriter { @Override public void close() { - if (null != this.destFile && ! isFlushed) { + if (null != this.destFile && !isFlushed) { flush(); } diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelWriter.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelWriter.java index 5091627b9..1fd7c17f0 100644 --- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelWriter.java +++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelWriter.java @@ -1382,7 +1382,7 @@ public class ExcelWriter extends ExcelBase { if (null != aliasName) { // 别名键值对加入 filteredTable.put(key, aliasName, value); - } else if (! this.onlyAlias) { + } else if (!this.onlyAlias) { // 保留无别名设置的键值对 filteredTable.put(key, key, value); } diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/StyleSet.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/StyleSet.java index 938b45cc3..72c80106d 100644 --- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/StyleSet.java +++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/StyleSet.java @@ -214,7 +214,7 @@ public class StyleSet implements Serializable { * @since 4.1.0 */ public StyleSet setFont(final Font font, final boolean ignoreHead) { - if (! ignoreHead) { + if (!ignoreHead) { this.headCellStyle.setFont(font); } this.cellStyle.setFont(font); diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/EscapeStrCellSetter.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/EscapeStrCellSetter.java index 51a0c50bc..25e1bcbad 100644 --- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/EscapeStrCellSetter.java +++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/cell/setters/EscapeStrCellSetter.java @@ -46,7 +46,7 @@ public class EscapeStrCellSetter extends CharSequenceCellSetter { * @return 转义后的字符串 */ private static String escape(final String value) { - if (value == null || ! value.contains("_x")) { + if (value == null || !value.contains("_x")) { return value; } diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/ColumnSheetReader.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/ColumnSheetReader.java index 2461d2d80..31887b8b4 100644 --- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/ColumnSheetReader.java +++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/ColumnSheetReader.java @@ -50,7 +50,7 @@ public class ColumnSheetReader extends AbstractSheetReader> { Object value; for (int i = startRowIndex; i <= endRowIndex; i++) { value = CellUtil.getCellValue(CellUtil.getCell(sheet.getRow(i), columnIndex), cellEditor); - if(null != value || ! ignoreEmptyRow){ + if(null != value || !ignoreEmptyRow){ resultList.add(value); } } diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/ListSheetReader.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/ListSheetReader.java index e88cfcc58..901d92df1 100644 --- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/ListSheetReader.java +++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/ListSheetReader.java @@ -51,7 +51,7 @@ public class ListSheetReader extends AbstractSheetReader>> { List rowList; for (int i = startRowIndex; i <= endRowIndex; i++) { rowList = readRow(sheet, i); - if (CollUtil.isNotEmpty(rowList) || ! ignoreEmptyRow) { + if (CollUtil.isNotEmpty(rowList) || !ignoreEmptyRow) { if (aliasFirstLine && i == startRowIndex) { // 第一行作为标题行，替换别名 rowList = Convert.toList(Object.class, aliasHeader(rowList)); diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/MapSheetReader.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/MapSheetReader.java index 0bc24a865..0efb9f76a 100644 --- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/MapSheetReader.java +++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/reader/MapSheetReader.java @@ -73,7 +73,7 @@ public class MapSheetReader extends AbstractSheetReader // 跳过标题行 if (i != headerRowIndex) { rowList = readRow(sheet, i); - if (CollUtil.isNotEmpty(rowList) || ! ignoreEmptyRow) { + if (CollUtil.isNotEmpty(rowList) || !ignoreEmptyRow) { result.add(IterUtil.toMap(headerList, rowList, true)); } } diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/ExcelSaxUtil.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/ExcelSaxUtil.java index 1873a5341..cc9edea5b 100644 --- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/ExcelSaxUtil.java +++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/ExcelSaxUtil.java @@ -290,7 +290,7 @@ public class ExcelSaxUtil { */ private static Number getNumberValue(final double numValue, final String numFmtString) { // 普通数字 - if (null != numFmtString && ! StrUtil.contains(numFmtString, CharUtil.DOT)) { + if (null != numFmtString && !StrUtil.contains(numFmtString, CharUtil.DOT)) { final long longPart = (long) numValue; //noinspection RedundantIfStatement if (longPart == numValue) { diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/SheetDataSaxHandler.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/SheetDataSaxHandler.java index 127f9d8e6..d2132a3c2 100644 --- a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/SheetDataSaxHandler.java +++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/sax/SheetDataSaxHandler.java @@ -107,7 +107,7 @@ public class SheetDataSaxHandler extends DefaultHandler { return; } - if (! this.isInSheetData) { + if (!this.isInSheetData) { // 非sheetData标签，忽略解析 return; } @@ -140,7 +140,7 @@ public class SheetDataSaxHandler extends DefaultHandler { return; } - if (! this.isInSheetData) { + if (!this.isInSheetData) { // 非sheetData标签，忽略解析 return; } @@ -156,7 +156,7 @@ public class SheetDataSaxHandler extends DefaultHandler { @Override public void characters(final char[] ch, final int start, final int length) { - if (! this.isInSheetData) { + if (!this.isInSheetData) { // 非sheetData标签，忽略解析 return; } @@ -281,7 +281,7 @@ public class SheetDataSaxHandler extends DefaultHandler { * @param isEnd 是否为最后一个单元格 */ private void fillBlankCell(final String preCoordinate, final String curCoordinate, final boolean isEnd) { - if (! curCoordinate.equals(preCoordinate)) { + if (!curCoordinate.equals(preCoordinate)) { int len = ExcelSaxUtil.countNullCell(preCoordinate, curCoordinate); if (isEnd) { len++; diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/Setting.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/Setting.java index 2b0fa873c..60204723d 100644 --- a/hutool-setting/src/main/java/org/dromara/hutool/setting/Setting.java +++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/Setting.java @@ -762,10 +762,10 @@ public class Setting extends AbsSetting implements Map { if (other.charset != null) { return false; } - } else if (! charset.equals(other.charset)) { + } else if (!charset.equals(other.charset)) { return false; } - if (! groupedMap.equals(other.groupedMap)) { + if (!groupedMap.equals(other.groupedMap)) { return false; } if (isUseVariable != other.isUseVariable) { diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/dialect/Props.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/dialect/Props.java index 0ad61a5d6..23cff2e80 100644 --- a/hutool-setting/src/main/java/org/dromara/hutool/setting/dialect/Props.java +++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/dialect/Props.java @@ -352,7 +352,7 @@ public final class Props extends Properties implements TypeGetter String key; for (final java.util.Map.Entry entry : this.entrySet()) { key = (String) entry.getKey(); - if (! StrUtil.startWith(key, prefix)) { + if (!StrUtil.startWith(key, prefix)) { // 非指定开头的属性忽略掉 continue; } diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/profile/Profile.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/profile/Profile.java index 58d7c53a2..96484b3e5 100644 --- a/hutool-setting/src/main/java/org/dromara/hutool/setting/profile/Profile.java +++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/profile/Profile.java @@ -150,7 +150,7 @@ public class Profile implements Serializable { private String fixNameForProfile(final String name) { Assert.notBlank(name, "Setting name must be not blank !"); final String actralProfile = StrUtil.emptyIfNull(this.profile); - if (! name.contains(StrUtil.DOT)) { + if (!name.contains(StrUtil.DOT)) { return StrUtil.format("{}/{}.setting", actralProfile, name); } return StrUtil.format("{}/{}", actralProfile, name); diff --git a/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/TomlWriter.java b/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/TomlWriter.java index 2e22a00b2..9693fc96f 100644 --- a/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/TomlWriter.java +++ b/hutool-setting/src/main/java/org/dromara/hutool/setting/toml/TomlWriter.java @@ -149,7 +149,7 @@ public class TomlWriter { final Object value = entry.getValue(); if (value instanceof Collection) {// array final Collection c = (Collection) value; - if (! c.isEmpty() && c.iterator().next() instanceof Map) {// array of tables + if (!c.isEmpty() && c.iterator().next() instanceof Map) {// array of tables if (simpleValues) { continue; } @@ -166,7 +166,7 @@ public class TomlWriter { indentationLevel--; tablesNames.removeLast(); } else {// normal array - if (! simpleValues) { + if (!simpleValues) { continue; } indent(); @@ -193,7 +193,7 @@ public class TomlWriter { indentationLevel--; tablesNames.removeLast(); } else {// normal array - if (! simpleValues) { + if (!simpleValues) { continue; } indent(); @@ -234,7 +234,7 @@ public class TomlWriter { private void writeKey(final String key) throws IORuntimeException { for (int i = 0; i < key.length(); i++) { final char c = key.charAt(i); - if (! isValidCharOfKey(c)) { + if (!isValidCharOfKey(c)) { // 含有非法字符，包装之 writeString(key); return; diff --git a/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/AioServer.java b/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/AioServer.java index 75a5bcb84..4fa3f5f20 100644 --- a/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/AioServer.java +++ b/hutool-socket/src/main/java/org/dromara/hutool/socket/aio/AioServer.java @@ -161,7 +161,7 @@ public class AioServer implements Closeable { public void close() { IoUtil.closeQuietly(this.channel); - if (null != this.group && ! this.group.isShutdown()) { + if (null != this.group && !this.group.isShutdown()) { try { this.group.shutdownNow(); } catch (final IOException e) { diff --git a/hutool-socket/src/main/java/org/dromara/hutool/socket/nio/NioClient.java b/hutool-socket/src/main/java/org/dromara/hutool/socket/nio/NioClient.java index e907fc1c7..e9691d346 100644 --- a/hutool-socket/src/main/java/org/dromara/hutool/socket/nio/NioClient.java +++ b/hutool-socket/src/main/java/org/dromara/hutool/socket/nio/NioClient.java @@ -80,7 +80,7 @@ public class NioClient implements Closeable { // 等待建立连接 //noinspection StatementWithEmptyBody - while (! channel.finishConnect()){} + while (!channel.finishConnect()){} } catch (final IOException e) { close(); throw new IORuntimeException(e); diff --git a/hutool-socket/src/test/java/org/dromara/hutool/socket/aio/AioServerTest.java b/hutool-socket/src/test/java/org/dromara/hutool/socket/aio/AioServerTest.java index 4756c0e95..c8705ab8b 100644 --- a/hutool-socket/src/test/java/org/dromara/hutool/socket/aio/AioServerTest.java +++ b/hutool-socket/src/test/java/org/dromara/hutool/socket/aio/AioServerTest.java @@ -25,7 +25,7 @@ public class AioServerTest { public void doAction(final AioSession session, final ByteBuffer data) { Console.log(data); - if(! data.hasRemaining()) { + if(!data.hasRemaining()) { final StringBuilder response = StrUtil.builder()// .append("HTTP/1.1 200 OK\r\n")// .append("Date: ").append(DateUtil.formatHttpDate(DateUtil.now())).append("\r\n")// diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ClipboardMonitor.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ClipboardMonitor.java index 6dbd565be..07b08d1bb 100644 --- a/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ClipboardMonitor.java +++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ClipboardMonitor.java @@ -135,7 +135,7 @@ public class ClipboardMonitor implements ClipboardOwner, Runnable, Closeable { @Override public synchronized void run() { - if(! isRunning) { + if(!isRunning) { final Clipboard clipboard = this.clipboard; clipboard.setContents(clipboard.getContents(null), this); isRunning = true; diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ImageSelection.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ImageSelection.java index 73ae9d63c..fd4595348 100644 --- a/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ImageSelection.java +++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/clipboard/ImageSelection.java @@ -68,7 +68,7 @@ public class ImageSelection implements Transferable, Serializable { */ @Override public Object getTransferData(final DataFlavor flavor) throws UnsupportedFlavorException { - if (! DataFlavor.imageFlavor.equals(flavor)) { + if (!DataFlavor.imageFlavor.equals(flavor)) { throw new UnsupportedFlavorException(flavor); } return image; diff --git a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/ImgUtil.java b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/ImgUtil.java index 6308702e0..7cb951372 100644 --- a/hutool-swing/src/main/java/org/dromara/hutool/swing/img/ImgUtil.java +++ b/hutool-swing/src/main/java/org/dromara/hutool/swing/img/ImgUtil.java @@ -464,9 +464,9 @@ public class ImgUtil { * @param cols 目标切片列数。默认2，必须是范围 [1, 20] 之内 */ public static void sliceByRowsAndCols(final Image srcImage, final File destDir, final String formatName, int rows, int cols) { - if (! destDir.exists()) { + if (!destDir.exists()) { FileUtil.mkdir(destDir); - } else if (! destDir.isDirectory()) { + } else if (!destDir.isDirectory()) { throw new IllegalArgumentException("Destination must be a Directory !"); }