import com.google.common.annotations.Beta;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.MoreObjects;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.Range;
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.util.NavigableSet;
import java.util.TreeSet;
import org.eclipse.jdt.annotation.NonNull;
-import org.opendaylight.yangtools.concepts.Mutable;
+import org.opendaylight.yangtools.concepts.Immutable;
import org.opendaylight.yangtools.concepts.WritableObjects;
/**
abstract class UnsignedLongSet {
@Beta
@VisibleForTesting
- public static final class Entry implements Comparable<Entry>, Mutable {
- // Note: mutable to allow efficient merges.
- long lowerBits;
- long upperBits;
+ public static final class Entry implements Comparable<Entry>, Immutable {
+ public final long lowerBits;
+ public final long upperBits;
private Entry(final long lowerBits, final long upperBits) {
this.lowerBits = lowerBits;
this.upperBits = upperBits;
}
- static Entry of(final long longBits) {
+ static @NonNull Entry of(final long longBits) {
return of(longBits, longBits);
}
- static Entry of(final long lowerBits, final long upperBits) {
+ static @NonNull Entry of(final long lowerBits, final long upperBits) {
return new Entry(lowerBits, upperBits);
}
- @VisibleForTesting
- public UnsignedLong lower() {
- return UnsignedLong.fromLongBits(lowerBits);
+ @NonNull Entry withLower(final long newLowerBits) {
+ return of(newLowerBits, upperBits);
}
- @VisibleForTesting
- public UnsignedLong upper() {
- return UnsignedLong.fromLongBits(upperBits);
- }
-
- Entry copy() {
- return new Entry(lowerBits, upperBits);
- }
-
- // Provides compatibility with RangeSet<UnsignedLong> using [lower, upper + 1)
- Range<UnsignedLong> toUnsigned() {
- return Range.closedOpen(UnsignedLong.fromLongBits(lowerBits), UnsignedLong.fromLongBits(upperBits + 1));
+ @NonNull Entry withUpper(final long newUpperBits) {
+ return of(lowerBits, newUpperBits);
}
// These two methods provide the same serialization format as the one we've used to serialize
return ranges.isEmpty();
}
- public final int size() {
+ public final int rangeSize() {
return ranges.size();
}
public abstract @NonNull ImmutableUnsignedLongSet immutableCopy();
public final @NonNull MutableUnsignedLongSet mutableCopy() {
- return new MutableUnsignedLongSet(new TreeSet<>(Collections2.transform(ranges, Entry::copy)));
+ return new MutableUnsignedLongSet(new TreeSet<>(ranges));
}
public final @NonNull NavigableSet<Entry> ranges() {