This is an automated email from the ASF dual-hosted git repository.
aherbert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-collections.git
commit 28b381008e41875139be04edc27a0d4187454171
Author: aherbert <a.herb...@sussex.ac.uk>
AuthorDate: Mon Feb 17 12:56:53 2020 +0000
Eliminate extra lines.
---
.../apache/commons/collections4/bloomfilter/AbstractBloomFilter.java | 1 -
.../apache/commons/collections4/bloomfilter/BitSetBloomFilter.java | 3 ---
.../java/org/apache/commons/collections4/bloomfilter/BloomFilter.java | 4 ----
.../apache/commons/collections4/bloomfilter/CountingBloomFilter.java | 1 -
.../apache/commons/collections4/bloomfilter/HasherBloomFilter.java | 1 -
.../org/apache/commons/collections4/bloomfilter/SetOperations.java | 1 -
.../apache/commons/collections4/bloomfilter/hasher/DynamicHasher.java | 1 -
.../apache/commons/collections4/bloomfilter/hasher/HashFunction.java | 2 --
.../commons/collections4/bloomfilter/hasher/HashFunctionIdentity.java | 1 -
.../collections4/bloomfilter/hasher/HashFunctionIdentityImpl.java | 1 -
.../org/apache/commons/collections4/bloomfilter/hasher/Hasher.java | 1 -
.../commons/collections4/bloomfilter/hasher/function/MD5Cyclic.java | 1 -
.../collections4/bloomfilter/hasher/function/Murmur128x86Cyclic.java | 2 --
.../bloomfilter/hasher/function/ObjectsHashIterative.java | 1 -
14 files changed, 21 deletions(-)
diff --git
a/src/main/java/org/apache/commons/collections4/bloomfilter/AbstractBloomFilter.java
b/src/main/java/org/apache/commons/collections4/bloomfilter/AbstractBloomFilter.java
index d805182..992631c 100644
---
a/src/main/java/org/apache/commons/collections4/bloomfilter/AbstractBloomFilter.java
+++
b/src/main/java/org/apache/commons/collections4/bloomfilter/AbstractBloomFilter.java
@@ -273,5 +273,4 @@ public abstract class AbstractBloomFilter implements
BloomFilter {
}
return BitSet.valueOf(result).cardinality();
}
-
}
diff --git
a/src/main/java/org/apache/commons/collections4/bloomfilter/BitSetBloomFilter.java
b/src/main/java/org/apache/commons/collections4/bloomfilter/BitSetBloomFilter.java
index 63ed587..e7bb69b 100644
---
a/src/main/java/org/apache/commons/collections4/bloomfilter/BitSetBloomFilter.java
+++
b/src/main/java/org/apache/commons/collections4/bloomfilter/BitSetBloomFilter.java
@@ -115,7 +115,6 @@ public class BitSetBloomFilter extends AbstractBloomFilter {
}
}
-
@Override
public void merge(final Hasher hasher) {
verifyHasher(hasher);
@@ -127,7 +126,6 @@ public class BitSetBloomFilter extends AbstractBloomFilter {
return bitSet.toString();
}
-
@Override
public int xorCardinality(final BloomFilter other) {
if (other instanceof BitSetBloomFilter) {
@@ -138,5 +136,4 @@ public class BitSetBloomFilter extends AbstractBloomFilter {
}
return super.xorCardinality(other);
}
-
}
diff --git
a/src/main/java/org/apache/commons/collections4/bloomfilter/BloomFilter.java
b/src/main/java/org/apache/commons/collections4/bloomfilter/BloomFilter.java
index 01e6c73..a485f53 100644
--- a/src/main/java/org/apache/commons/collections4/bloomfilter/BloomFilter.java
+++ b/src/main/java/org/apache/commons/collections4/bloomfilter/BloomFilter.java
@@ -121,8 +121,4 @@ public interface BloomFilter {
* @return the cardinality of the result of {@code( this XOR other )}
*/
int xorCardinality(BloomFilter other);
-
-
-
-
}
diff --git
a/src/main/java/org/apache/commons/collections4/bloomfilter/CountingBloomFilter.java
b/src/main/java/org/apache/commons/collections4/bloomfilter/CountingBloomFilter.java
index c010af5..ed872e2 100644
---
a/src/main/java/org/apache/commons/collections4/bloomfilter/CountingBloomFilter.java
+++
b/src/main/java/org/apache/commons/collections4/bloomfilter/CountingBloomFilter.java
@@ -33,7 +33,6 @@ import
org.apache.commons.collections4.bloomfilter.hasher.Hasher;
import org.apache.commons.collections4.bloomfilter.hasher.Shape;
import org.apache.commons.collections4.bloomfilter.hasher.StaticHasher;
-
/**
* A counting Bloom filter.
* This Bloom filter maintains a count of the number of times a bit has been
diff --git
a/src/main/java/org/apache/commons/collections4/bloomfilter/HasherBloomFilter.java
b/src/main/java/org/apache/commons/collections4/bloomfilter/HasherBloomFilter.java
index e781179..4ab8c51 100644
---
a/src/main/java/org/apache/commons/collections4/bloomfilter/HasherBloomFilter.java
+++
b/src/main/java/org/apache/commons/collections4/bloomfilter/HasherBloomFilter.java
@@ -139,5 +139,4 @@ public class HasherBloomFilter extends AbstractBloomFilter {
hasher.getBits(getShape()));
this.hasher = new StaticHasher(iter, getShape());
}
-
}
diff --git
a/src/main/java/org/apache/commons/collections4/bloomfilter/SetOperations.java
b/src/main/java/org/apache/commons/collections4/bloomfilter/SetOperations.java
index a42e900..80017a3 100644
---
a/src/main/java/org/apache/commons/collections4/bloomfilter/SetOperations.java
+++
b/src/main/java/org/apache/commons/collections4/bloomfilter/SetOperations.java
@@ -69,7 +69,6 @@ public final class SetOperations {
return estimateSize(first) - estimateUnionSize(first,second) +
estimateSize(second);
}
-
/**
* Estimates the number of items in the Bloom filter based on the shape
and the number
* of bits that are enabled.
diff --git
a/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/DynamicHasher.java
b/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/DynamicHasher.java
index 2b598a8..9036d79 100644
---
a/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/DynamicHasher.java
+++
b/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/DynamicHasher.java
@@ -176,5 +176,4 @@ public class DynamicHasher implements Hasher {
public boolean isEmpty() {
return buffers.isEmpty();
}
-
}
diff --git
a/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/HashFunction.java
b/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/HashFunction.java
index e8added..11b18e4 100644
---
a/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/HashFunction.java
+++
b/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/HashFunction.java
@@ -23,7 +23,6 @@ package org.apache.commons.collections4.bloomfilter.hasher;
*/
public interface HashFunction extends HashFunctionIdentity {
-
/**
* Applies the hash function to the buffer.
*
@@ -32,5 +31,4 @@ public interface HashFunction extends HashFunctionIdentity {
* @return the long value of the hash.
*/
long apply(byte[] buffer, int seed);
-
}
diff --git
a/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/HashFunctionIdentity.java
b/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/HashFunctionIdentity.java
index bdf53fe..65383e1 100644
---
a/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/HashFunctionIdentity.java
+++
b/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/HashFunctionIdentity.java
@@ -157,5 +157,4 @@ public interface HashFunctionIdentity {
* @return signedness of this function.
*/
Signedness getSignedness();
-
}
diff --git
a/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/HashFunctionIdentityImpl.java
b/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/HashFunctionIdentityImpl.java
index 93b0d77..a0a047b 100644
---
a/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/HashFunctionIdentityImpl.java
+++
b/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/HashFunctionIdentityImpl.java
@@ -84,5 +84,4 @@ public final class HashFunctionIdentityImpl implements
HashFunctionIdentity {
public Signedness getSignedness() {
return signedness;
}
-
}
diff --git
a/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/Hasher.java
b/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/Hasher.java
index 9e46f18..224902b 100644
---
a/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/Hasher.java
+++
b/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/Hasher.java
@@ -19,7 +19,6 @@ package org.apache.commons.collections4.bloomfilter.hasher;
import java.util.PrimitiveIterator;
-
/**
* The class that performs hashing.
* <p>
diff --git
a/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/function/MD5Cyclic.java
b/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/function/MD5Cyclic.java
index e7f785e..d2aeb49 100644
---
a/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/function/MD5Cyclic.java
+++
b/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/function/MD5Cyclic.java
@@ -108,5 +108,4 @@ public final class MD5Cyclic implements HashFunction {
public Signedness getSignedness() {
return Signedness.SIGNED;
}
-
}
diff --git
a/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/function/Murmur128x86Cyclic.java
b/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/function/Murmur128x86Cyclic.java
index 218a82e..d4782c9 100644
---
a/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/function/Murmur128x86Cyclic.java
+++
b/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/function/Murmur128x86Cyclic.java
@@ -53,7 +53,6 @@ public final class Murmur128x86Cyclic implements HashFunction
{
signature = apply(HashFunctionIdentity.prepareSignatureBuffer(this),
0);
}
-
@Override
public long apply(final byte[] buffer, final int seed) {
if (parts == null || seed == 0) {
@@ -88,5 +87,4 @@ public final class Murmur128x86Cyclic implements HashFunction
{
public Signedness getSignedness() {
return Signedness.SIGNED;
}
-
}
diff --git
a/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/function/ObjectsHashIterative.java
b/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/function/ObjectsHashIterative.java
index b8c4449..ad97aba 100644
---
a/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/function/ObjectsHashIterative.java
+++
b/src/main/java/org/apache/commons/collections4/bloomfilter/hasher/function/ObjectsHashIterative.java
@@ -21,7 +21,6 @@ import java.util.Arrays;
import org.apache.commons.collections4.bloomfilter.hasher.HashFunction;
import org.apache.commons.collections4.bloomfilter.hasher.HashFunctionIdentity;
-
/**
* An implementation of HashFunction that
* performs {@code Objects.hash} hashing using a signed iterative method.
