diff --git a/hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationUtil.java b/hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationUtil.java
index dc7b666cf..e5877f900 100644
--- a/hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationUtil.java
@@ -21,28 +21,28 @@ import cn.hutool.core.util.ReflectUtil;
/**
* 注解工具类
* 快速获取注解对象、注解值等工具封装
- *
+ *
* @author looly
* @since 4.0.9
*/
public class AnnotationUtil {
-
+
/**
* 将指定的被注解的元素转换为组合注解元素
- *
+ *
* @param annotationEle 注解元素
* @return 组合注解元素
*/
public static CombinationAnnotationElement toCombination(AnnotatedElement annotationEle) {
- if(annotationEle instanceof CombinationAnnotationElement) {
- return (CombinationAnnotationElement)annotationEle;
+ if (annotationEle instanceof CombinationAnnotationElement) {
+ return (CombinationAnnotationElement) annotationEle;
}
return new CombinationAnnotationElement(annotationEle);
}
/**
* 获取指定注解
- *
+ *
* @param annotationEle {@link AnnotatedElement},可以是Class、Method、Field、Constructor、ReflectPermission
* @return 注解对象
*/
@@ -52,9 +52,9 @@ public class AnnotationUtil {
/**
* 获取指定注解
- *
- * @param 注解类型
- * @param annotationEle {@link AnnotatedElement},可以是Class、Method、Field、Constructor、ReflectPermission
+ *
+ * @param 注解类型
+ * @param annotationEle {@link AnnotatedElement},可以是Class、Method、Field、Constructor、ReflectPermission
* @param annotationType 注解类型
* @return 注解对象
*/
@@ -65,9 +65,9 @@ public class AnnotationUtil {
/**
* 获取指定注解默认值
* 如果无指定的属性方法返回null
- *
- * @param 注解值类型
- * @param annotationEle {@link AccessibleObject},可以是Class、Method、Field、Constructor、ReflectPermission
+ *
+ * @param 注解值类型
+ * @param annotationEle {@link AccessibleObject},可以是Class、Method、Field、Constructor、ReflectPermission
* @param annotationType 注解类型
* @return 注解对象
* @throws UtilException 调用注解中的方法时执行异常
@@ -79,11 +79,11 @@ public class AnnotationUtil {
/**
* 获取指定注解属性的值
* 如果无指定的属性方法返回null
- *
- * @param 注解值类型
- * @param annotationEle {@link AccessibleObject},可以是Class、Method、Field、Constructor、ReflectPermission
+ *
+ * @param 注解值类型
+ * @param annotationEle {@link AccessibleObject},可以是Class、Method、Field、Constructor、ReflectPermission
* @param annotationType 注解类型
- * @param propertyName 属性名,例如注解中定义了name()方法,则 此处传入name
+ * @param propertyName 属性名,例如注解中定义了name()方法,则 此处传入name
* @return 注解对象
* @throws UtilException 调用注解中的方法时执行异常
*/
@@ -103,8 +103,8 @@ public class AnnotationUtil {
/**
* 获取指定注解中所有属性值
* 如果无指定的属性方法返回null
- *
- * @param annotationEle {@link AnnotatedElement},可以是Class、Method、Field、Constructor、ReflectPermission
+ *
+ * @param annotationEle {@link AnnotatedElement},可以是Class、Method、Field、Constructor、ReflectPermission
* @param annotationType 注解类型
* @return 注解对象
* @throws UtilException 调用注解中的方法时执行异常
@@ -121,11 +121,10 @@ public class AnnotationUtil {
if (ArrayUtil.isEmpty(t.getParameterTypes())) {
// 只读取无参方法
final String name = t.getName();
- if ("hashCode".equals(name) || "toString".equals(name) || "annotationType".equals(name)) {
- // 跳过自有的几个方法
- return false;
- }
- return true;
+ // 跳过自有的几个方法
+ return (false == "hashCode".equals(name)) //
+ && (false == "toString".equals(name)) //
+ && (false == "annotationType".equals(name));
}
return false;
}
@@ -140,7 +139,7 @@ public class AnnotationUtil {
/**
* 获取注解类的保留时间,可选值 SOURCE(源码时),CLASS(编译时),RUNTIME(运行时),默认为 CLASS
- *
+ *
* @param annotationType 注解类
* @return 保留时间枚举
*/
@@ -154,14 +153,14 @@ public class AnnotationUtil {
/**
* 获取注解类可以用来修饰哪些程序元素,如 TYPE, METHOD, CONSTRUCTOR, FIELD, PARAMETER 等
- *
+ *
* @param annotationType 注解类
* @return 注解修饰的程序元素数组
*/
public static ElementType[] getTargetType(Class extends Annotation> annotationType) {
final Target target = annotationType.getAnnotation(Target.class);
if (null == target) {
- return new ElementType[] { ElementType.TYPE, //
+ return new ElementType[]{ElementType.TYPE, //
ElementType.FIELD, //
ElementType.METHOD, //
ElementType.PARAMETER, //
@@ -176,17 +175,17 @@ public class AnnotationUtil {
/**
* 是否会保存到 Javadoc 文档中
- *
+ *
* @param annotationType 注解类
* @return 是否会保存到 Javadoc 文档中
*/
public static boolean isDocumented(Class extends Annotation> annotationType) {
return annotationType.isAnnotationPresent(Documented.class);
}
-
+
/**
* 是否可以被继承,默认为 false
- *
+ *
* @param annotationType 注解类
* @return 是否会保存到 Javadoc 文档中
*/
diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/ArrayIter.java b/hutool-core/src/main/java/cn/hutool/core/collection/ArrayIter.java
index 1f48f1eeb..87c35ac1d 100644
--- a/hutool-core/src/main/java/cn/hutool/core/collection/ArrayIter.java
+++ b/hutool-core/src/main/java/cn/hutool/core/collection/ArrayIter.java
@@ -18,11 +18,11 @@ public class ArrayIter implements Iterator, Iterable, Serializable{
/** 数组 */
private Object array;
/** 起始位置 */
- private int startIndex = 0;
+ private int startIndex;
/** 结束位置 */
- private int endIndex = 0;
+ private int endIndex;
/** 当前位置 */
- private int index = 0;
+ private int index;
/**
* 构造
diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/BoundedPriorityQueue.java b/hutool-core/src/main/java/cn/hutool/core/collection/BoundedPriorityQueue.java
index 7630b32c5..fe09249d9 100644
--- a/hutool-core/src/main/java/cn/hutool/core/collection/BoundedPriorityQueue.java
+++ b/hutool-core/src/main/java/cn/hutool/core/collection/BoundedPriorityQueue.java
@@ -35,7 +35,7 @@ public class BoundedPriorityQueue extends PriorityQueue{
@Override
public int compare(E o1, E o2) {
- int cResult = 0;
+ int cResult;
if(comparator != null) {
cResult = comparator.compare(o1, o2);
}else {
diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/CopiedIter.java b/hutool-core/src/main/java/cn/hutool/core/collection/CopiedIter.java
index 9fb2fe79f..e9d514b84 100644
--- a/hutool-core/src/main/java/cn/hutool/core/collection/CopiedIter.java
+++ b/hutool-core/src/main/java/cn/hutool/core/collection/CopiedIter.java
@@ -25,7 +25,6 @@ import java.util.List;
public class CopiedIter implements Iterator, Iterable, Serializable {
private static final long serialVersionUID = 1L;
- private List eleList = new LinkedList<>();
private Iterator listIterator;
public static CopiedIter copyOf(Iterator iterator){
@@ -37,9 +36,7 @@ public class CopiedIter implements Iterator, Iterable, Serializable {
* @param iterator 被复制的Iterator
*/
public CopiedIter(Iterator iterator) {
- while (iterator.hasNext()) {
- eleList.add(iterator.next());
- }
+ final List eleList = CollUtil.newArrayList(iterator);
this.listIterator = eleList.iterator();
}
diff --git a/hutool-core/src/main/java/cn/hutool/core/collection/IterUtil.java b/hutool-core/src/main/java/cn/hutool/core/collection/IterUtil.java
index eddd7b62e..9d86a8892 100644
--- a/hutool-core/src/main/java/cn/hutool/core/collection/IterUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/collection/IterUtil.java
@@ -376,7 +376,7 @@ public class IterUtil {
* @return Map
*/
public static HashMap toMap(Iterable> entryIter) {
- final HashMap map = new HashMap();
+ final HashMap map = new HashMap<>();
if (isNotEmpty(entryIter)) {
for (Entry entry : entryIter) {
map.put(entry.getKey(), entry.getValue());
@@ -500,7 +500,7 @@ public class IterUtil {
* @return {@link Iterator}
*/
public static Iterator asIterator(Enumeration e) {
- return new EnumerationIter(e);
+ return new EnumerationIter<>(e);
}
/**
@@ -571,13 +571,10 @@ public class IterUtil {
*/
public static Class> getElementType(Iterator> iterator) {
final Iterator> iter2 = new CopiedIter<>(iterator);
- if (null != iter2) {
- Object t;
- while (iter2.hasNext()) {
- t = iter2.next();
- if (null != t) {
- return t.getClass();
- }
+ if (iter2.hasNext()) {
+ final Object t = iter2.next();
+ if (null != t) {
+ return t.getClass();
}
}
return null;