Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Rename UnsignedLongSet.size()
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
utils
/
UnsignedLongSet.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/UnsignedLongSet.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/UnsignedLongSet.java
index b9bf8c33f3df8c889c9a3bc293a7179f9e8c0aa2..59393a3ee0c4699e06093a2e3750170625a01257 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/UnsignedLongSet.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/UnsignedLongSet.java
@@
-12,9
+12,7
@@
import static java.util.Objects.requireNonNull;
import com.google.common.annotations.Beta;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.MoreObjects;
import com.google.common.annotations.Beta;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.MoreObjects;
-import com.google.common.collect.Range;
import com.google.common.collect.RangeSet;
import com.google.common.collect.RangeSet;
-import com.google.common.primitives.UnsignedLong;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@
-39,8
+37,8
@@
abstract class UnsignedLongSet {
@Beta
@VisibleForTesting
public static final class Entry implements Comparable<Entry>, Immutable {
@Beta
@VisibleForTesting
public static final class Entry implements Comparable<Entry>, Immutable {
- final long lowerBits;
- final long upperBits;
+
public
final long lowerBits;
+
public
final long upperBits;
private Entry(final long lowerBits, final long upperBits) {
this.lowerBits = lowerBits;
private Entry(final long lowerBits, final long upperBits) {
this.lowerBits = lowerBits;
@@
-55,16
+53,6
@@
abstract class UnsignedLongSet {
return new Entry(lowerBits, upperBits);
}
return new Entry(lowerBits, upperBits);
}
- @VisibleForTesting
- public @NonNull UnsignedLong lower() {
- return UnsignedLong.fromLongBits(lowerBits);
- }
-
- @VisibleForTesting
- public @NonNull UnsignedLong upper() {
- return UnsignedLong.fromLongBits(upperBits);
- }
-
@NonNull Entry withLower(final long newLowerBits) {
return of(newLowerBits, upperBits);
}
@NonNull Entry withLower(final long newLowerBits) {
return of(newLowerBits, upperBits);
}
@@
-73,11
+61,6
@@
abstract class UnsignedLongSet {
return of(lowerBits, newUpperBits);
}
return of(lowerBits, newUpperBits);
}
- // Provides compatibility with RangeSet<UnsignedLong> using [lower, upper + 1)
- @NonNull Range<UnsignedLong> toUnsigned() {
- return Range.closedOpen(UnsignedLong.fromLongBits(lowerBits), UnsignedLong.fromLongBits(upperBits + 1));
- }
-
// These two methods provide the same serialization format as the one we've used to serialize
// Range<UnsignedLong>
static @NonNull Entry readUnsigned(final DataInput in) throws IOException {
// These two methods provide the same serialization format as the one we've used to serialize
// Range<UnsignedLong>
static @NonNull Entry readUnsigned(final DataInput in) throws IOException {
@@
-146,7
+129,7
@@
abstract class UnsignedLongSet {
return ranges.isEmpty();
}
return ranges.isEmpty();
}
- public final int
s
ize() {
+ public final int
rangeS
ize() {
return ranges.size();
}
return ranges.size();
}