From 9ae946c7daa09b20f4089f01202c5e73c5afb471 Mon Sep 17 00:00:00 2001 From: "Bruno P. Kinoshita" Date: Wed, 13 Sep 2017 00:44:46 +1200 Subject: [PATCH] Fix two PMD issues, but comment others where if's were added for readability --- .../collections4/functors/PrototypeFactory.java | 4 ++-- .../collections4/iterators/FilterIterator.java | 6 ++---- .../collections4/iterators/FilterListIterator.java | 12 ++++-------- .../collections4/iterators/PermutationIterator.java | 2 +- .../collections4/keyvalue/AbstractMapEntry.java | 2 +- .../collections4/map/AbstractReferenceMap.java | 3 ++- .../commons/collections4/map/MultiValueMap.java | 2 +- .../collections4/sequence/SequencesComparator.java | 4 ++-- .../collections4/trie/AbstractPatriciaTrie.java | 2 +- 9 files changed, 16 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/apache/commons/collections4/functors/PrototypeFactory.java b/src/main/java/org/apache/commons/collections4/functors/PrototypeFactory.java index 64173d2b7..03fea840f 100644 --- a/src/main/java/org/apache/commons/collections4/functors/PrototypeFactory.java +++ b/src/main/java/org/apache/commons/collections4/functors/PrototypeFactory.java @@ -193,12 +193,12 @@ public class PrototypeFactory { if (bais != null) { bais.close(); } - } catch (final IOException ex) { + } catch (final IOException ex) { //NOPMD // ignore } try { baos.close(); - } catch (final IOException ex) { + } catch (final IOException ex) { //NOPMD // ignore } } diff --git a/src/main/java/org/apache/commons/collections4/iterators/FilterIterator.java b/src/main/java/org/apache/commons/collections4/iterators/FilterIterator.java index 457430d4c..7789578f5 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/FilterIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/FilterIterator.java @@ -96,10 +96,8 @@ public class FilterIterator implements Iterator { */ @Override public E next() { - if (!nextObjectSet) { - if (!setNextObject()) { - throw new NoSuchElementException(); - } + if (!nextObjectSet && !setNextObject()) { + throw new NoSuchElementException(); } nextObjectSet = false; return nextObject; diff --git a/src/main/java/org/apache/commons/collections4/iterators/FilterListIterator.java b/src/main/java/org/apache/commons/collections4/iterators/FilterListIterator.java index 370dbb559..1f2bef298 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/FilterListIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/FilterListIterator.java @@ -132,10 +132,8 @@ public class FilterListIterator implements ListIterator { @Override public E next() { - if (!nextObjectSet) { - if (!setNextObject()) { - throw new NoSuchElementException(); - } + if (!nextObjectSet && !setNextObject()) { + throw new NoSuchElementException(); } nextIndex++; final E temp = nextObject; @@ -150,10 +148,8 @@ public class FilterListIterator implements ListIterator { @Override public E previous() { - if (!previousObjectSet) { - if (!setPreviousObject()) { - throw new NoSuchElementException(); - } + if (!previousObjectSet && !setPreviousObject()) { + throw new NoSuchElementException(); } nextIndex--; final E temp = previousObject; 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 494e79cfc..c0c5fe832 100644 --- a/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java +++ b/src/main/java/org/apache/commons/collections4/iterators/PermutationIterator.java @@ -116,7 +116,7 @@ public class PermutationIterator implements Iterator> { 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 (keys[i] > largestKey) { + if (keys[i] > largestKey) { // NOPMD largestKey = keys[i]; indexOfLargestMobileInteger = i; } diff --git a/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java index 518293099..15d461ee1 100644 --- a/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java +++ b/src/main/java/org/apache/commons/collections4/keyvalue/AbstractMapEntry.java @@ -48,7 +48,7 @@ public abstract class AbstractMapEntry extends AbstractKeyValue impl * @return the previous value */ @Override - public V setValue(final V value) { + public V setValue(final V value) { // NOPMD return super.setValue(value); } 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 9ccd7e5be..82ac7e3cd 100644 --- a/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java +++ b/src/main/java/org/apache/commons/collections4/map/AbstractReferenceMap.java @@ -291,7 +291,8 @@ public abstract class AbstractReferenceMap extends AbstractHashedMap @Override public void clear() { super.clear(); - while (queue.poll() != null) {} // drain the queue + // drain the queue + while (queue.poll() != null) {} // NOPMD } //----------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java b/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java index 5ff05cab5..a9290065c 100644 --- a/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java +++ b/src/main/java/org/apache/commons/collections4/map/MultiValueMap.java @@ -309,7 +309,7 @@ public class MultiValueMap extends AbstractMapDecorator impleme * @see #iterator() */ @Override - public Set> entrySet() { + public Set> entrySet() { // NOPMD return super.entrySet(); } 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 6228b85b8..7c6d4f54c 100644 --- a/src/main/java/org/apache/commons/collections4/sequence/SequencesComparator.java +++ b/src/main/java/org/apache/commons/collections4/sequence/SequencesComparator.java @@ -201,7 +201,7 @@ public class SequencesComparator { } // Second step if (delta % 2 != 0 && delta - d <= k && k <= delta + d) { - if (vUp[i-delta] <= vDown[i]) { + if (vUp[i-delta] <= vDown[i]) { // NOPMD return buildSnake(vUp[i-delta], k + start1 - start2, end1, end2); } } @@ -227,7 +227,7 @@ public class SequencesComparator { } // Second step if (delta % 2 == 0 && -d <= k && k <= d ) { - if (vUp[i] <= vDown[i + delta]) { + if (vUp[i] <= vDown[i + delta]) { // NOPMD return buildSnake(vUp[i], k + start1 - start2, end1, end2); } } diff --git a/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java b/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java index e46cbfb7d..65b9809be 100644 --- a/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java +++ b/src/main/java/org/apache/commons/collections4/trie/AbstractPatriciaTrie.java @@ -177,7 +177,7 @@ abstract class AbstractPatriciaTrie extends AbstractBitwiseTrie { // This is a very special and rare case. /* REPLACE OLD KEY+VALUE */ - if (found != root) { + if (found != root) { // NOPMD incrementModCount(); return found.setKeyValue(key, value); }