lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-05-04 12:47:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly 2019-09-17 13:04:39 +08:00
parent feb8b8ee45
commit be91b672d2
5 changed files with 39 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hutool-core/src/main/java/cn/hutool/core/annotation/AnnotationUtil.java
View File

@ -34,8 +34,8 @@ public class AnnotationUtil {
* @return 组合注解元素 * @return 组合注解元素
*/ */
public static CombinationAnnotationElement toCombination(AnnotatedElement annotationEle) { public static CombinationAnnotationElement toCombination(AnnotatedElement annotationEle) {
if(annotationEle instanceof CombinationAnnotationElement) { if (annotationEle instanceof CombinationAnnotationElement) {
return (CombinationAnnotationElement)annotationEle; return (CombinationAnnotationElement) annotationEle;
} }
return new CombinationAnnotationElement(annotationEle); return new CombinationAnnotationElement(annotationEle);
} }
@ -121,11 +121,10 @@ public class AnnotationUtil {
if (ArrayUtil.isEmpty(t.getParameterTypes())) { if (ArrayUtil.isEmpty(t.getParameterTypes())) {
// 只读取无参方法 // 只读取无参方法
final String name = t.getName(); final String name = t.getName();
if ("hashCode".equals(name) || "toString".equals(name) || "annotationType".equals(name)) {
// 跳过自有的几个方法 // 跳过自有的几个方法
return false; return (false == "hashCode".equals(name)) //
} && (false == "toString".equals(name)) //
return true; && (false == "annotationType".equals(name));
} }
return false; return false;
} }
@ -161,7 +160,7 @@ public class AnnotationUtil {
public static ElementType[] getTargetType(Class<? extends Annotation> annotationType) { public static ElementType[] getTargetType(Class<? extends Annotation> annotationType) {
final Target target = annotationType.getAnnotation(Target.class); final Target target = annotationType.getAnnotation(Target.class);
if (null == target) { if (null == target) {
return new ElementType[] { ElementType.TYPE, // return new ElementType[]{ElementType.TYPE, //
ElementType.FIELD, // ElementType.FIELD, //
ElementType.METHOD, // ElementType.METHOD, //
ElementType.PARAMETER, // ElementType.PARAMETER, //

6
hutool-core/src/main/java/cn/hutool/core/collection/ArrayIter.java
View File

@ -18,11 +18,11 @@ public class ArrayIter<E> implements Iterator<E>, Iterable<E>, Serializable{
/** 数组 */ /** 数组 */
private Object array; private Object array;
/** 起始位置 */ /** 起始位置 */
private int startIndex = 0; private int startIndex;
/** 结束位置 */ /** 结束位置 */
private int endIndex = 0; private int endIndex;
/** 当前位置 */ /** 当前位置 */
private int index = 0; private int index;
/** /**
* 构造 * 构造

2
hutool-core/src/main/java/cn/hutool/core/collection/BoundedPriorityQueue.java
View File

@ -35,7 +35,7 @@ public class BoundedPriorityQueue<E> extends PriorityQueue<E>{
@Override @Override
public int compare(E o1, E o2) { public int compare(E o1, E o2) {
int cResult = 0; int cResult;
if(comparator != null) { if(comparator != null) {
cResult = comparator.compare(o1, o2); cResult = comparator.compare(o1, o2);
}else { }else {

5
hutool-core/src/main/java/cn/hutool/core/collection/CopiedIter.java
View File

@ -25,7 +25,6 @@ import java.util.List;
public class CopiedIter<E> implements Iterator<E>, Iterable<E>, Serializable { public class CopiedIter<E> implements Iterator<E>, Iterable<E>, Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private List<E> eleList = new LinkedList<>();
private Iterator<E> listIterator; private Iterator<E> listIterator;
public static <V> CopiedIter<V> copyOf(Iterator<V> iterator){ public static <V> CopiedIter<V> copyOf(Iterator<V> iterator){
@ -37,9 +36,7 @@ public class CopiedIter<E> implements Iterator<E>, Iterable<E>, Serializable {
* @param iterator 被复制的Iterator * @param iterator 被复制的Iterator
*/ */
public CopiedIter(Iterator<E> iterator) { public CopiedIter(Iterator<E> iterator) {
while (iterator.hasNext()) { final List<E> eleList = CollUtil.newArrayList(iterator);
eleList.add(iterator.next());
}
this.listIterator = eleList.iterator(); this.listIterator = eleList.iterator();
} }

11
hutool-core/src/main/java/cn/hutool/core/collection/IterUtil.java
View File

@ -376,7 +376,7 @@ public class IterUtil {
* @return Map * @return Map
*/ */
public static <K, V> HashMap<K, V> toMap(Iterable<Entry<K, V>> entryIter) { public static <K, V> HashMap<K, V> toMap(Iterable<Entry<K, V>> entryIter) {
final HashMap<K, V> map = new HashMap<K, V>(); final HashMap<K, V> map = new HashMap<>();
if (isNotEmpty(entryIter)) { if (isNotEmpty(entryIter)) {
for (Entry<K, V> entry : entryIter) { for (Entry<K, V> entry : entryIter) {
map.put(entry.getKey(), entry.getValue()); map.put(entry.getKey(), entry.getValue());
@ -500,7 +500,7 @@ public class IterUtil {
* @return {@link Iterator} * @return {@link Iterator}
*/ */
public static <E> Iterator<E> asIterator(Enumeration<E> e) { public static <E> Iterator<E> asIterator(Enumeration<E> e) {
return new EnumerationIter<E>(e); return new EnumerationIter<>(e);
} }
/** /**
@ -571,15 +571,12 @@ public class IterUtil {
*/ */
public static Class<?> getElementType(Iterator<?> iterator) { public static Class<?> getElementType(Iterator<?> iterator) {
final Iterator<?> iter2 = new CopiedIter<>(iterator); final Iterator<?> iter2 = new CopiedIter<>(iterator);
if (null != iter2) { if (iter2.hasNext()) {
Object t; final Object t = iter2.next();
while (iter2.hasNext()) {
t = iter2.next();
if (null != t) { if (null != t) {
return t.getClass(); return t.getClass();
} }
} }
}
return null; return null;
} }