You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2022/11/06 16:51:35 UTC
[commons-collections] branch master updated (b9c22565f -> 882f00545)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-collections.git
from b9c22565f Javadoc
new 12bdb33dc Remove unnecessary parens
new 882f00545 Enable PMD check
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 2 +-
.../org/apache/commons/collections4/ArrayStack.java | 6 +++---
.../apache/commons/collections4/IterableUtils.java | 2 +-
.../org/apache/commons/collections4/ListUtils.java | 2 +-
.../apache/commons/collections4/SplitMapUtils.java | 6 +++---
.../commons/collections4/bloomfilter/BitMap.java | 2 +-
.../bloomfilter/EnhancedDoubleHasher.java | 4 ++--
.../commons/collections4/bloomfilter/Shape.java | 2 +-
.../collections4/bloomfilter/SimpleBloomFilter.java | 2 +-
.../collections4/comparators/BooleanComparator.java | 8 ++++----
.../collections4/comparators/ComparatorChain.java | 4 ++--
.../comparators/TransformingComparator.java | 4 ++--
.../collections4/functors/InstantiateTransformer.java | 6 +++---
.../collections4/functors/InvokerTransformer.java | 6 +++---
.../collections4/iterators/PermutationIterator.java | 4 ++--
.../commons/collections4/list/AbstractLinkedList.java | 2 +-
.../collections4/list/CursorableLinkedList.java | 2 +-
.../collections4/map/AbstractReferenceMap.java | 4 ++--
.../apache/commons/collections4/map/DefaultedMap.java | 2 +-
.../commons/collections4/map/StaticBucketMap.java | 19 +++++++++----------
.../collections4/multiset/AbstractMultiSet.java | 4 ++--
.../collections4/properties/PropertiesFactory.java | 2 +-
.../collections4/sequence/SequencesComparator.java | 4 ++--
.../apache/commons/collections4/ClosureUtilsTest.java | 4 ++--
.../apache/commons/collections4/FactoryUtilsTest.java | 4 ++--
.../bloomfilter/AbstractCountingBloomFilterTest.java | 2 +-
.../commons/collections4/bloomfilter/BitMapTest.java | 2 +-
.../collections4/bloomfilter/SetOperationsTest.java | 6 +++---
.../commons/collections4/keyvalue/MultiKeyTest.java | 2 +-
29 files changed, 59 insertions(+), 60 deletions(-)
[commons-collections] 01/02: Remove unnecessary parens
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-collections.git
commit 12bdb33dc0185c8c9c034f380fda5da2d9143055
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Nov 6 11:49:44 2022 -0500
Remove unnecessary parens
---
.../org/apache/commons/collections4/ArrayStack.java | 6 +++---
.../apache/commons/collections4/IterableUtils.java | 2 +-
.../org/apache/commons/collections4/ListUtils.java | 2 +-
.../apache/commons/collections4/SplitMapUtils.java | 6 +++---
.../commons/collections4/bloomfilter/BitMap.java | 2 +-
.../bloomfilter/EnhancedDoubleHasher.java | 4 ++--
.../commons/collections4/bloomfilter/Shape.java | 2 +-
.../collections4/bloomfilter/SimpleBloomFilter.java | 2 +-
.../collections4/comparators/BooleanComparator.java | 8 ++++----
.../collections4/comparators/ComparatorChain.java | 4 ++--
.../comparators/TransformingComparator.java | 4 ++--
.../collections4/functors/InstantiateTransformer.java | 6 +++---
.../collections4/functors/InvokerTransformer.java | 6 +++---
.../collections4/iterators/PermutationIterator.java | 4 ++--
.../commons/collections4/list/AbstractLinkedList.java | 2 +-
.../collections4/list/CursorableLinkedList.java | 2 +-
.../collections4/map/AbstractReferenceMap.java | 4 ++--
.../apache/commons/collections4/map/DefaultedMap.java | 2 +-
.../commons/collections4/map/StaticBucketMap.java | 19 +++++++++----------
.../collections4/multiset/AbstractMultiSet.java | 4 ++--
.../collections4/properties/PropertiesFactory.java | 2 +-
.../collections4/sequence/SequencesComparator.java | 4 ++--
.../apache/commons/collections4/ClosureUtilsTest.java | 4 ++--
.../apache/commons/collections4/FactoryUtilsTest.java | 4 ++--
.../bloomfilter/AbstractCountingBloomFilterTest.java | 2 +-
.../commons/collections4/bloomfilter/BitMapTest.java | 2 +-
.../collections4/bloomfilter/SetOperationsTest.java | 6 +++---
.../commons/collections4/keyvalue/MultiKeyTest.java | 2 +-
28 files changed, 58 insertions(+), 59 deletions(-)
diff --git a/src/main/java/org/apache/commons/collections4/ArrayStack.java b/src/main/java/org/apache/commons/collections4/ArrayStack.java
index 4b5dd3069..bc2e0f32a 100644
--- a/src/main/java/org/apache/commons/collections4/ArrayStack.java
+++ b/src/main/java/org/apache/commons/collections4/ArrayStack.java
@@ -103,7 +103,7 @@ public class ArrayStack<E> extends ArrayList<E> {
* stack to satisfy this request
*/
public E peek(final int n) throws EmptyStackException {
- final int m = (size() - n) - 1;
+ final int m = size() - n - 1;
if (m < 0) {
throw new EmptyStackException();
}
@@ -152,8 +152,8 @@ public class ArrayStack<E> extends ArrayList<E> {
int n = 1; // Current distance
while (i >= 0) {
final Object current = get(i);
- if ((object == null && current == null) ||
- (object != null && object.equals(current))) {
+ if (object == null && current == null ||
+ object != null && object.equals(current)) {
return n;
}
i--;
diff --git a/src/main/java/org/apache/commons/collections4/IterableUtils.java b/src/main/java/org/apache/commons/collections4/IterableUtils.java
index aea4e61fb..f924f9143 100644
--- a/src/main/java/org/apache/commons/collections4/IterableUtils.java
+++ b/src/main/java/org/apache/commons/collections4/IterableUtils.java
@@ -338,7 +338,7 @@ public class IterableUtils {
return new FluentIterable<E>() {
@Override
public Iterator<E> iterator() {
- final List<E> list = (iterable instanceof List<?>) ?
+ final List<E> list = iterable instanceof List<?> ?
(List<E>) iterable :
IteratorUtils.toList(iterable.iterator());
return new ReverseListIterator<>(list);
diff --git a/src/main/java/org/apache/commons/collections4/ListUtils.java b/src/main/java/org/apache/commons/collections4/ListUtils.java
index 274e2b50a..4dccc16a7 100644
--- a/src/main/java/org/apache/commons/collections4/ListUtils.java
+++ b/src/main/java/org/apache/commons/collections4/ListUtils.java
@@ -326,7 +326,7 @@ public class ListUtils {
final Object obj1 = it1.next();
final Object obj2 = it2.next();
- if (!(Objects.equals(obj1, obj2))) {
+ if (!Objects.equals(obj1, obj2)) {
return false;
}
}
diff --git a/src/main/java/org/apache/commons/collections4/SplitMapUtils.java b/src/main/java/org/apache/commons/collections4/SplitMapUtils.java
index 92fc079be..824614be3 100644
--- a/src/main/java/org/apache/commons/collections4/SplitMapUtils.java
+++ b/src/main/java/org/apache/commons/collections4/SplitMapUtils.java
@@ -86,7 +86,7 @@ public class SplitMapUtils {
@Override
public int hashCode() {
- return ("WrappedGet".hashCode() << 4) | get.hashCode();
+ return "WrappedGet".hashCode() << 4 | get.hashCode();
}
@Override
@@ -178,7 +178,7 @@ public class SplitMapUtils {
@Override
public int hashCode() {
- return ("WrappedPut".hashCode() << 4) | put.hashCode();
+ return "WrappedPut".hashCode() << 4 | put.hashCode();
}
@Override
@@ -235,7 +235,7 @@ public class SplitMapUtils {
Objects.requireNonNull(get, "get");
if (get instanceof Map) {
return get instanceof IterableMap ?
- ((IterableMap<K, V>) get) :
+ (IterableMap<K, V>) get :
MapUtils.iterableMap((Map<K, V>) get);
}
return new WrappedGet<>(get);
diff --git a/src/main/java/org/apache/commons/collections4/bloomfilter/BitMap.java b/src/main/java/org/apache/commons/collections4/bloomfilter/BitMap.java
index 527c33884..14366f96d 100644
--- a/src/main/java/org/apache/commons/collections4/bloomfilter/BitMap.java
+++ b/src/main/java/org/apache/commons/collections4/bloomfilter/BitMap.java
@@ -41,7 +41,7 @@ public class BitMap {
* @return the number of bit maps necessary.
*/
public static int numberOfBitMaps(final int numberOfBits) {
- return ((numberOfBits - 1) >> DIVIDE_BY_64) + 1;
+ return (numberOfBits - 1 >> DIVIDE_BY_64) + 1;
}
/**
diff --git a/src/main/java/org/apache/commons/collections4/bloomfilter/EnhancedDoubleHasher.java b/src/main/java/org/apache/commons/collections4/bloomfilter/EnhancedDoubleHasher.java
index 19296f37a..14b41869b 100644
--- a/src/main/java/org/apache/commons/collections4/bloomfilter/EnhancedDoubleHasher.java
+++ b/src/main/java/org/apache/commons/collections4/bloomfilter/EnhancedDoubleHasher.java
@@ -69,7 +69,7 @@ public class EnhancedDoubleHasher implements Hasher {
final int end = offset + Math.min(len, Long.BYTES);
for (int i = offset; i < end; i++) {
shift -= Byte.SIZE;
- val |= ((long) (byteArray[i] & 0xFF) << shift);
+ val |= (long) (byteArray[i] & 0xFF) << shift;
}
return val;
}
@@ -139,7 +139,7 @@ public class EnhancedDoubleHasher implements Hasher {
// See Hacker's Delight (2nd ed), section 9.3.
// Assume divisor is positive.
// Divide half the unsigned number and then double the quotient result.
- final long quotient = ((dividend >>> 1) / divisor) << 1;
+ final long quotient = (dividend >>> 1) / divisor << 1;
final long remainder = dividend - quotient * divisor;
// remainder in [0, 2 * divisor)
return (int) (remainder >= divisor ? remainder - divisor : remainder);
diff --git a/src/main/java/org/apache/commons/collections4/bloomfilter/Shape.java b/src/main/java/org/apache/commons/collections4/bloomfilter/Shape.java
index fbfeeef9f..9b903e9ce 100644
--- a/src/main/java/org/apache/commons/collections4/bloomfilter/Shape.java
+++ b/src/main/java/org/apache/commons/collections4/bloomfilter/Shape.java
@@ -163,7 +163,7 @@ public final class Shape {
* (number of indexes) is less than or equal to 2*number of bit maps the
* cardinality is sparse within the shape.
*/
- return cardinality <= (BitMap.numberOfBitMaps(getNumberOfBits()) * 2);
+ return cardinality <= BitMap.numberOfBitMaps(getNumberOfBits()) * 2;
}
/**
diff --git a/src/main/java/org/apache/commons/collections4/bloomfilter/SimpleBloomFilter.java b/src/main/java/org/apache/commons/collections4/bloomfilter/SimpleBloomFilter.java
index 5708ff7ad..6793d223b 100644
--- a/src/main/java/org/apache/commons/collections4/bloomfilter/SimpleBloomFilter.java
+++ b/src/main/java/org/apache/commons/collections4/bloomfilter/SimpleBloomFilter.java
@@ -119,7 +119,7 @@ public final class SimpleBloomFilter implements BloomFilter {
"BitMapProducer set a bit higher than the limit for the shape: %s", shape.getNumberOfBits() - 1));
}
if (idxLimit == idx[0]) {
- final long excess = (bitMap[idxLimit] >> shape.getNumberOfBits());
+ final long excess = bitMap[idxLimit] >> shape.getNumberOfBits();
if (excess != 0) {
throw new IllegalArgumentException(
String.format("BitMapProducer set a bit higher than the limit for the shape: %s",
diff --git a/src/main/java/org/apache/commons/collections4/comparators/BooleanComparator.java b/src/main/java/org/apache/commons/collections4/comparators/BooleanComparator.java
index b391f0886..e8ee73c5a 100644
--- a/src/main/java/org/apache/commons/collections4/comparators/BooleanComparator.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/BooleanComparator.java
@@ -138,7 +138,7 @@ public final class BooleanComparator implements Comparator<Boolean>, Serializabl
final boolean v1 = b1.booleanValue();
final boolean v2 = b2.booleanValue();
- return (v1 ^ v2) ? ( (v1 ^ trueFirst) ? 1 : -1 ) : 0;
+ return v1 ^ v2 ? v1 ^ trueFirst ? 1 : -1 : 0;
}
/**
@@ -167,9 +167,9 @@ public final class BooleanComparator implements Comparator<Boolean>, Serializabl
*/
@Override
public boolean equals(final Object object) {
- return (this == object) ||
- ((object instanceof BooleanComparator) &&
- (this.trueFirst == ((BooleanComparator) object).trueFirst));
+ return this == object ||
+ object instanceof BooleanComparator &&
+ this.trueFirst == ((BooleanComparator) object).trueFirst;
}
/**
diff --git a/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java b/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java
index 549b406a7..2d2cdf463 100644
--- a/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/ComparatorChain.java
@@ -339,8 +339,8 @@ public class ComparatorChain<E> implements Comparator<E>, Serializable {
}
if (object.getClass().equals(this.getClass())) {
final ComparatorChain<?> chain = (ComparatorChain<?>) object;
- return (Objects.equals(orderingBits, chain.orderingBits)) &&
- (Objects.equals(comparatorChain, chain.comparatorChain));
+ return Objects.equals(orderingBits, chain.orderingBits) &&
+ Objects.equals(comparatorChain, chain.comparatorChain);
}
return false;
}
diff --git a/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java b/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java
index 28f044eef..7d9d9a9f0 100644
--- a/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java
+++ b/src/main/java/org/apache/commons/collections4/comparators/TransformingComparator.java
@@ -121,8 +121,8 @@ public class TransformingComparator<I, O> implements Comparator<I>, Serializable
}
if (object.getClass().equals(this.getClass())) {
final TransformingComparator<?, ?> comp = (TransformingComparator<?, ?>) object;
- return (Objects.equals(decorated, comp.decorated)) &&
- (Objects.equals(transformer, comp.transformer));
+ return Objects.equals(decorated, comp.decorated) &&
+ Objects.equals(transformer, comp.transformer);
}
return false;
}
diff --git a/src/main/java/org/apache/commons/collections4/functors/InstantiateTransformer.java b/src/main/java/org/apache/commons/collections4/functors/InstantiateTransformer.java
index cbc91321d..135831ade 100644
--- a/src/main/java/org/apache/commons/collections4/functors/InstantiateTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/InstantiateTransformer.java
@@ -65,9 +65,9 @@ public class InstantiateTransformer<T> implements Transformer<Class<? extends T>
*/
public static <T> Transformer<Class<? extends T>, T> instantiateTransformer(final Class<?>[] paramTypes,
final Object[] args) {
- if (((paramTypes == null) && (args != null))
- || ((paramTypes != null) && (args == null))
- || ((paramTypes != null) && (args != null) && (paramTypes.length != args.length))) {
+ if (paramTypes == null && args != null
+ || paramTypes != null && args == null
+ || paramTypes != null && args != null && paramTypes.length != args.length) {
throw new IllegalArgumentException("Parameter types must match the arguments");
}
diff --git a/src/main/java/org/apache/commons/collections4/functors/InvokerTransformer.java b/src/main/java/org/apache/commons/collections4/functors/InvokerTransformer.java
index ce15744da..f01c5b301 100644
--- a/src/main/java/org/apache/commons/collections4/functors/InvokerTransformer.java
+++ b/src/main/java/org/apache/commons/collections4/functors/InvokerTransformer.java
@@ -72,9 +72,9 @@ public class InvokerTransformer<I, O> implements Transformer<I, O> {
public static <I, O> Transformer<I, O> invokerTransformer(final String methodName, final Class<?>[] paramTypes,
final Object[] args) {
Objects.requireNonNull(methodName, "methodName");
- if (((paramTypes == null) && (args != null))
- || ((paramTypes != null) && (args == null))
- || ((paramTypes != null) && (args != null) && (paramTypes.length != args.length))) {
+ if (paramTypes == null && args != null
+ || paramTypes != null && args == null
+ || paramTypes != null && args != null && paramTypes.length != args.length) {
throw new IllegalArgumentException("The parameter types must match the arguments");
}
if (paramTypes == null || paramTypes.length == 0) {
diff --git a/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java b/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java
index cebb6a4e2..449b110df 100644
--- a/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java
+++ b/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java
@@ -112,8 +112,8 @@ public class PermutationIterator<E> implements Iterator<List<E>> {
int indexOfLargestMobileInteger = -1;
int largestKey = -1;
for (int i = 0; i < keys.length; i++) {
- if ((direction[i] && i < keys.length - 1 && keys[i] > keys[i + 1]) ||
- (!direction[i] && i > 0 && keys[i] > keys[i - 1])) {
+ if (direction[i] && i < keys.length - 1 && keys[i] > keys[i + 1] ||
+ !direction[i] && i > 0 && keys[i] > keys[i - 1]) {
if (keys[i] > largestKey) { // NOPMD
largestKey = keys[i];
indexOfLargestMobileInteger = i;
diff --git a/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java b/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java
index 4125451ea..f282c42a0 100644
--- a/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java
+++ b/src/main/java/org/apache/commons/collections4/list/AbstractLinkedList.java
@@ -376,7 +376,7 @@ public abstract class AbstractLinkedList<E> implements List<E> {
final ListIterator<?> it1 = listIterator();
final ListIterator<?> it2 = other.listIterator();
while (it1.hasNext() && it2.hasNext()) {
- if (!(Objects.equals(it1.next(), it2.next()))) {
+ if (!Objects.equals(it1.next(), it2.next())) {
return false;
}
}
diff --git a/src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java b/src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java
index 32bc30afa..e01fd8dfe 100644
--- a/src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java
+++ b/src/main/java/org/apache/commons/collections4/list/CursorableLinkedList.java
@@ -526,7 +526,7 @@ public class CursorableLinkedList<E> extends AbstractLinkedList<E> implements Se
* @param node the node that was added
*/
protected void nodeInserted(final Node<E> node) {
- if ((node.previous == current) || (next.previous == node)) {
+ if (node.previous == current || next.previous == node) {
next = node;
} else {
nextIndexValid = false;
diff --git a/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java b/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java
index bfaa3f670..db4cc818f 100644
--- a/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java
@@ -971,7 +971,7 @@ public abstract class AbstractReferenceMap<K, V> extends AbstractHashedMap<K, V>
}
@Override
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
@@ -1004,7 +1004,7 @@ public abstract class AbstractReferenceMap<K, V> extends AbstractHashedMap<K, V>
}
@Override
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
diff --git a/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java b/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java
index 46d663aa8..eb9a76838 100644
--- a/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/DefaultedMap.java
@@ -195,7 +195,7 @@ public class DefaultedMap<K, V> extends AbstractMapDecorator<K, V> implements Se
@SuppressWarnings("unchecked")
public V get(final Object key) {
final V v;
- return (((v = map.get(key)) != null) || map.containsKey(key))
+ return (v = map.get(key)) != null || map.containsKey(key)
? v
: value.transform((K) key);
}
diff --git a/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java b/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java
index 1662dc634..a27528061 100644
--- a/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java
+++ b/src/main/java/org/apache/commons/collections4/map/StaticBucketMap.java
@@ -157,13 +157,13 @@ public final class StaticBucketMap<K, V> extends AbstractIterableMap<K, V> {
}
int hash = key.hashCode();
hash += ~(hash << 15);
- hash ^= (hash >>> 10);
- hash += (hash << 3);
- hash ^= (hash >>> 6);
+ hash ^= hash >>> 10;
+ hash += hash << 3;
+ hash ^= hash >>> 6;
hash += ~(hash << 11);
- hash ^= (hash >>> 16);
+ hash ^= hash >>> 16;
hash %= buckets.length;
- return (hash < 0) ? hash * -1 : hash;
+ return hash < 0 ? hash * -1 : hash;
}
/**
@@ -465,8 +465,8 @@ public final class StaticBucketMap<K, V> extends AbstractIterableMap<K, V> {
@Override
public int hashCode() {
- return ((key == null ? 0 : key.hashCode()) ^
- (value == null ? 0 : value.hashCode()));
+ return (key == null ? 0 : key.hashCode()) ^
+ (value == null ? 0 : value.hashCode());
}
@Override
@@ -479,9 +479,8 @@ public final class StaticBucketMap<K, V> extends AbstractIterableMap<K, V> {
}
final Map.Entry<?, ?> e2 = (Map.Entry<?, ?>) obj;
- return (
- (key == null ? e2.getKey() == null : key.equals(e2.getKey())) &&
- (value == null ? e2.getValue() == null : value.equals(e2.getValue())));
+ return (key == null ? e2.getKey() == null : key.equals(e2.getKey())) &&
+ (value == null ? e2.getValue() == null : value.equals(e2.getValue()));
}
@Override
diff --git a/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSet.java b/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSet.java
index 40c8629ad..312ae2b11 100644
--- a/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSet.java
+++ b/src/main/java/org/apache/commons/collections4/multiset/AbstractMultiSet.java
@@ -403,7 +403,7 @@ public abstract class AbstractMultiSet<E> extends AbstractCollection<E> implemen
final Object otherElement = other.getElement();
return this.getCount() == other.getCount() &&
- (Objects.equals(element, otherElement));
+ Objects.equals(element, otherElement);
}
return false;
}
@@ -411,7 +411,7 @@ public abstract class AbstractMultiSet<E> extends AbstractCollection<E> implemen
@Override
public int hashCode() {
final E element = getElement();
- return ((element == null) ? 0 : element.hashCode()) ^ getCount();
+ return (element == null ? 0 : element.hashCode()) ^ getCount();
}
@Override
diff --git a/src/main/java/org/apache/commons/collections4/properties/PropertiesFactory.java b/src/main/java/org/apache/commons/collections4/properties/PropertiesFactory.java
index fa7d1a71f..57045254c 100644
--- a/src/main/java/org/apache/commons/collections4/properties/PropertiesFactory.java
+++ b/src/main/java/org/apache/commons/collections4/properties/PropertiesFactory.java
@@ -100,7 +100,7 @@ public class PropertiesFactory extends AbstractPropertiesFactory<Properties> {
@Override
public synchronized boolean equals(final Object o) {
- return (o instanceof Properties) && ((Properties) o).isEmpty();
+ return o instanceof Properties && ((Properties) o).isEmpty();
}
@Override
diff --git a/src/main/java/org/apache/commons/collections4/sequence/SequencesComparator.java b/src/main/java/org/apache/commons/collections4/sequence/SequencesComparator.java
index 813c1d132..acd6aa984 100644
--- a/src/main/java/org/apache/commons/collections4/sequence/SequencesComparator.java
+++ b/src/main/java/org/apache/commons/collections4/sequence/SequencesComparator.java
@@ -203,7 +203,7 @@ public class SequencesComparator<T> {
++y;
}
// Second step
- if ((delta % 2 != 0 && delta - d <= k && k <= delta + d) && (vUp[i-delta] <= vDown[i])) { // NOPMD
+ if (delta % 2 != 0 && delta - d <= k && k <= delta + d && vUp[i-delta] <= vDown[i]) { // NOPMD
return buildSnake(vUp[i-delta], k + start1 - start2, end1, end2);
}
}
@@ -227,7 +227,7 @@ public class SequencesComparator<T> {
y--;
}
// Second step
- if ((delta % 2 == 0 && -d <= k && k <= d) && (vUp[i] <= vDown[i + delta])) { // NOPMD
+ if (delta % 2 == 0 && -d <= k && k <= d && vUp[i] <= vDown[i + delta]) { // NOPMD
return buildSnake(vUp[i], k + start1 - start2, end1, end2);
}
}
diff --git a/src/test/java/org/apache/commons/collections4/ClosureUtilsTest.java b/src/test/java/org/apache/commons/collections4/ClosureUtilsTest.java
index 4055047ff..dd89d26d3 100644
--- a/src/test/java/org/apache/commons/collections4/ClosureUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/ClosureUtilsTest.java
@@ -88,10 +88,10 @@ public class ClosureUtilsTest {
@Test
public void testInvokeClosure() {
- StringBuffer buf = new StringBuffer("Hello"); // Only StringBuffer has setLength() method
+ StringBuilder buf = new StringBuilder("Hello"); // Only StringBuffer has setLength() method
ClosureUtils.invokerClosure("reverse").execute(buf);
assertEquals("olleH", buf.toString());
- buf = new StringBuffer("Hello");
+ buf = new StringBuilder("Hello");
ClosureUtils.invokerClosure("setLength", new Class[] {Integer.TYPE}, new Object[] {Integer.valueOf(2)}).execute(buf);
assertEquals("He", buf.toString());
}
diff --git a/src/test/java/org/apache/commons/collections4/FactoryUtilsTest.java b/src/test/java/org/apache/commons/collections4/FactoryUtilsTest.java
index 37a0f758d..014852b05 100644
--- a/src/test/java/org/apache/commons/collections4/FactoryUtilsTest.java
+++ b/src/test/java/org/apache/commons/collections4/FactoryUtilsTest.java
@@ -134,7 +134,7 @@ public class FactoryUtilsTest {
}
@Override
public boolean equals(final Object obj) {
- if (obj instanceof Mock1 && (iVal == ((Mock1) obj).iVal)) {
+ if (obj instanceof Mock1 && iVal == ((Mock1) obj).iVal) {
return true;
}
return false;
@@ -156,7 +156,7 @@ public class FactoryUtilsTest {
}
@Override
public boolean equals(final Object obj) {
- if (obj instanceof Mock2 && (iVal == ((Mock2) obj).iVal)) {
+ if (obj instanceof Mock2 && iVal == ((Mock2) obj).iVal) {
return true;
}
return false;
diff --git a/src/test/java/org/apache/commons/collections4/bloomfilter/AbstractCountingBloomFilterTest.java b/src/test/java/org/apache/commons/collections4/bloomfilter/AbstractCountingBloomFilterTest.java
index e48044fda..d90a13769 100644
--- a/src/test/java/org/apache/commons/collections4/bloomfilter/AbstractCountingBloomFilterTest.java
+++ b/src/test/java/org/apache/commons/collections4/bloomfilter/AbstractCountingBloomFilterTest.java
@@ -287,6 +287,6 @@ public abstract class AbstractCountingBloomFilterTest<T extends CountingBloomFil
bf1.merge(hasher);
bf1.remove(hasher);
assertEquals(0, bf1.cardinality());
- assertTrue(bf1.forEachCount((x, y) -> (false)), "Hasher in removes results in value not equal to 0");
+ assertTrue(bf1.forEachCount((x, y) -> false), "Hasher in removes results in value not equal to 0");
}
}
diff --git a/src/test/java/org/apache/commons/collections4/bloomfilter/BitMapTest.java b/src/test/java/org/apache/commons/collections4/bloomfilter/BitMapTest.java
index c528234c3..a0b7b8a92 100644
--- a/src/test/java/org/apache/commons/collections4/bloomfilter/BitMapTest.java
+++ b/src/test/java/org/apache/commons/collections4/bloomfilter/BitMapTest.java
@@ -93,7 +93,7 @@ public class BitMapTest {
assertTrue(BitMap.contains(ary, 0));
assertFalse(BitMap.contains(ary, 63));
- ary[0] = (1L << 63);
+ ary[0] = 1L << 63;
assertTrue(BitMap.contains(ary, 63));
assertThrows(ArrayIndexOutOfBoundsException.class, () -> BitMap.contains(aryT, 64));
diff --git a/src/test/java/org/apache/commons/collections4/bloomfilter/SetOperationsTest.java b/src/test/java/org/apache/commons/collections4/bloomfilter/SetOperationsTest.java
index bddfb8761..6b90e1151 100644
--- a/src/test/java/org/apache/commons/collections4/bloomfilter/SetOperationsTest.java
+++ b/src/test/java/org/apache/commons/collections4/bloomfilter/SetOperationsTest.java
@@ -80,7 +80,7 @@ public class SetOperationsTest {
int dotProduct = /* [1,2] & [2,3] = [2] = */ 1;
int cardinalityA = 2;
int cardinalityB = 2;
- expected = 1 - (dotProduct / Math.sqrt(cardinalityA * cardinalityB));
+ expected = 1 - dotProduct / Math.sqrt(cardinalityA * cardinalityB);
assertSymmetricOperation(expected, SetOperations::cosineDistance, filter1, filter2);
filter1 = createFilter(shape, from1);
@@ -88,7 +88,7 @@ public class SetOperationsTest {
dotProduct = /* [1..17] & [11..27] = [] = */ 7;
cardinalityA = 17;
cardinalityB = 17;
- expected = 1 - (dotProduct / Math.sqrt(cardinalityA * cardinalityB));
+ expected = 1 - dotProduct / Math.sqrt(cardinalityA * cardinalityB);
assertSymmetricOperation(expected, SetOperations::cosineDistance, filter1, filter2);
// test with no values
@@ -168,7 +168,7 @@ public class SetOperationsTest {
filter2 = createFilter(shape, from11);
final double intersection = /* [1..17] & [11..27] = [11..17] = */ 7.0;
final int union = /* [1..17] | [11..27] = [1..27] = */ 27;
- final double expected = 1 - (intersection / union);
+ final double expected = 1 - intersection / union;
assertSymmetricOperation(expected, SetOperations::jaccardDistance, filter1, filter2);
// test no values
diff --git a/src/test/java/org/apache/commons/collections4/keyvalue/MultiKeyTest.java b/src/test/java/org/apache/commons/collections4/keyvalue/MultiKeyTest.java
index 727751b10..b23fc4bb1 100644
--- a/src/test/java/org/apache/commons/collections4/keyvalue/MultiKeyTest.java
+++ b/src/test/java/org/apache/commons/collections4/keyvalue/MultiKeyTest.java
@@ -282,7 +282,7 @@ public class MultiKeyTest {
assertEquals(mk1.hashCode(), mk2.hashCode());
assertTrue(mk1.hashCode() != mk3.hashCode());
- final int total = (0 ^ ONE.hashCode()) ^ TWO.hashCode();
+ final int total = 0 ^ ONE.hashCode() ^ TWO.hashCode();
assertEquals(total, mk1.hashCode());
}
[commons-collections] 02/02: Enable PMD check
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-collections.git
commit 882f005452f40e8b7d6fabbb42f20bb83a77b5f3
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Nov 6 11:51:29 2022 -0500
Enable PMD check
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 7c5252e62..afb262aa9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -599,7 +599,7 @@
<build>
- <defaultGoal>clean verify apache-rat:check checkstyle:check japicmp:cmp javadoc:javadoc</defaultGoal>
+ <defaultGoal>clean verify apache-rat:check pmd:check checkstyle:check japicmp:cmp javadoc:javadoc</defaultGoal>
<pluginManagement>
<plugins>
<plugin>