diff --git a/android/guava/src/com/google/common/collect/ArrayTable.java b/android/guava/src/com/google/common/collect/ArrayTable.java index aa042877c87e..d63853a821b0 100644 --- a/android/guava/src/com/google/common/collect/ArrayTable.java +++ b/android/guava/src/com/google/common/collect/ArrayTable.java @@ -21,7 +21,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import static java.util.Collections.emptyMap; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.base.Objects; @@ -88,7 +87,6 @@ * @author Jared Levy * @since 10.0 */ -@Beta @GwtCompatible(emulated = true) @ElementTypesAreNonnullByDefault public final class ArrayTable extends AbstractTable diff --git a/android/guava/src/com/google/common/collect/Collections2.java b/android/guava/src/com/google/common/collect/Collections2.java index 8d799d5932b8..f2790c9db1f3 100644 --- a/android/guava/src/com/google/common/collect/Collections2.java +++ b/android/guava/src/com/google/common/collect/Collections2.java @@ -21,7 +21,6 @@ import static com.google.common.collect.CollectPreconditions.checkNonnegative; import static java.util.Objects.requireNonNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.base.Function; import com.google.common.base.Predicate; @@ -357,7 +356,6 @@ static StringBuilder newStringBuilderForCollection(int size) { * @throws NullPointerException if the specified iterable is null or has any null elements. * @since 12.0 */ - @Beta public static > Collection> orderedPermutations( Iterable elements) { return orderedPermutations(elements, Ordering.natural()); @@ -409,7 +407,6 @@ public static > Collection> orderedPermu * the specified comparator is null. * @since 12.0 */ - @Beta public static Collection> orderedPermutations( Iterable elements, Comparator comparator) { return new OrderedPermutationCollection(elements, comparator); @@ -571,7 +568,6 @@ int findNextL(int j) { * @throws NullPointerException if the specified collection is null or has any null elements. * @since 12.0 */ - @Beta public static Collection> permutations(Collection elements) { return new PermutationCollection(ImmutableList.copyOf(elements)); } diff --git a/android/guava/src/com/google/common/collect/ConcurrentHashMultiset.java b/android/guava/src/com/google/common/collect/ConcurrentHashMultiset.java index c01004039ca0..723ab0696aa9 100644 --- a/android/guava/src/com/google/common/collect/ConcurrentHashMultiset.java +++ b/android/guava/src/com/google/common/collect/ConcurrentHashMultiset.java @@ -21,7 +21,6 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.CollectPreconditions.checkNonnegative; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.annotations.VisibleForTesting; @@ -120,7 +119,6 @@ public static ConcurrentHashMultiset create(Iterable element * @throws IllegalArgumentException if {@code countMap} is not empty * @since 20.0 */ - @Beta public static ConcurrentHashMultiset create(ConcurrentMap countMap) { return new ConcurrentHashMultiset<>(countMap); } diff --git a/android/guava/src/com/google/common/collect/ContiguousSet.java b/android/guava/src/com/google/common/collect/ContiguousSet.java index 99cb172931f2..d0792054ea4f 100644 --- a/android/guava/src/com/google/common/collect/ContiguousSet.java +++ b/android/guava/src/com/google/common/collect/ContiguousSet.java @@ -18,7 +18,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import static java.util.Objects.requireNonNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.errorprone.annotations.DoNotCall; @@ -103,7 +102,6 @@ public static ContiguousSet create( * @throws IllegalArgumentException if {@code lower} is greater than {@code upper} * @since 23.0 */ - @Beta public static ContiguousSet closed(int lower, int upper) { return create(Range.closed(lower, upper), DiscreteDomain.integers()); } @@ -116,7 +114,6 @@ public static ContiguousSet closed(int lower, int upper) { * @throws IllegalArgumentException if {@code lower} is greater than {@code upper} * @since 23.0 */ - @Beta public static ContiguousSet closed(long lower, long upper) { return create(Range.closed(lower, upper), DiscreteDomain.longs()); } @@ -129,7 +126,6 @@ public static ContiguousSet closed(long lower, long upper) { * @throws IllegalArgumentException if {@code lower} is greater than {@code upper} * @since 23.0 */ - @Beta public static ContiguousSet closedOpen(int lower, int upper) { return create(Range.closedOpen(lower, upper), DiscreteDomain.integers()); } @@ -142,7 +138,6 @@ public static ContiguousSet closedOpen(int lower, int upper) { * @throws IllegalArgumentException if {@code lower} is greater than {@code upper} * @since 23.0 */ - @Beta public static ContiguousSet closedOpen(long lower, long upper) { return create(Range.closedOpen(lower, upper), DiscreteDomain.longs()); } diff --git a/android/guava/src/com/google/common/collect/EvictingQueue.java b/android/guava/src/com/google/common/collect/EvictingQueue.java index fe95f30b6049..71770b72ae11 100644 --- a/android/guava/src/com/google/common/collect/EvictingQueue.java +++ b/android/guava/src/com/google/common/collect/EvictingQueue.java @@ -19,7 +19,6 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.annotations.VisibleForTesting; @@ -44,7 +43,6 @@ * @author Kurt Alfred Kluever * @since 15.0 */ -@Beta @GwtCompatible @ElementTypesAreNonnullByDefault public final class EvictingQueue extends ForwardingQueue implements Serializable { diff --git a/android/guava/src/com/google/common/collect/ImmutableSortedMap.java b/android/guava/src/com/google/common/collect/ImmutableSortedMap.java index b1f183226fbc..6ee63c680229 100644 --- a/android/guava/src/com/google/common/collect/ImmutableSortedMap.java +++ b/android/guava/src/com/google/common/collect/ImmutableSortedMap.java @@ -22,7 +22,6 @@ import static com.google.common.collect.Maps.keyOrNull; import static java.util.Objects.requireNonNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; @@ -359,7 +358,6 @@ public static ImmutableSortedMap copyOf( * @throws IllegalArgumentException if any two keys are equal according to the comparator * @since 19.0 */ - @Beta public static ImmutableSortedMap copyOf( Iterable> entries) { // Hack around K not being a subtype of Comparable. @@ -377,7 +375,6 @@ public static ImmutableSortedMap copyOf( * @throws IllegalArgumentException if any two keys are equal according to the comparator * @since 19.0 */ - @Beta public static ImmutableSortedMap copyOf( Iterable> entries, Comparator comparator) { @@ -652,7 +649,6 @@ public Builder putAll(Map map) { * @since 19.0 */ @CanIgnoreReturnValue - @Beta @Override public Builder putAll(Iterable> entries) { super.putAll(entries); @@ -666,7 +662,6 @@ public Builder putAll(Iterable> * @deprecated Unsupported by ImmutableSortedMap.Builder. */ @CanIgnoreReturnValue - @Beta @Override @Deprecated @DoNotCall("Always throws UnsupportedOperationException") diff --git a/android/guava/src/com/google/common/collect/Iterables.java b/android/guava/src/com/google/common/collect/Iterables.java index 9279e0baae12..f4e664a2081e 100644 --- a/android/guava/src/com/google/common/collect/Iterables.java +++ b/android/guava/src/com/google/common/collect/Iterables.java @@ -20,7 +20,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.CollectPreconditions.checkRemove; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.base.Function; @@ -1053,7 +1052,6 @@ public static boolean isEmpty(Iterable iterable) { * * @since 11.0 */ - @Beta public static Iterable mergeSorted( final Iterable> iterables, final Comparator comparator) { diff --git a/android/guava/src/com/google/common/collect/Iterators.java b/android/guava/src/com/google/common/collect/Iterators.java index 71a93c63a129..1f3e55c646a9 100644 --- a/android/guava/src/com/google/common/collect/Iterators.java +++ b/android/guava/src/com/google/common/collect/Iterators.java @@ -24,7 +24,6 @@ import static com.google.common.collect.NullnessCasts.uncheckedCastNullableTToT; import static java.util.Objects.requireNonNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.base.Function; @@ -1295,7 +1294,6 @@ public E peek() { * * @since 11.0 */ - @Beta public static UnmodifiableIterator mergeSorted( Iterable> iterators, Comparator comparator) { checkNotNull(iterators, "iterators"); diff --git a/android/guava/src/com/google/common/collect/Lists.java b/android/guava/src/com/google/common/collect/Lists.java index 345947dda1c9..00a76c65f2b0 100644 --- a/android/guava/src/com/google/common/collect/Lists.java +++ b/android/guava/src/com/google/common/collect/Lists.java @@ -25,7 +25,6 @@ import static com.google.common.collect.CollectPreconditions.checkNonnegative; import static com.google.common.collect.CollectPreconditions.checkRemove; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; @@ -717,7 +716,6 @@ public static ImmutableList charactersOf(String string) { * @return an {@code List} view of the character sequence * @since 7.0 */ - @Beta public static List charactersOf(CharSequence sequence) { return new CharSequenceAsList(checkNotNull(sequence)); } diff --git a/android/guava/src/com/google/common/collect/Maps.java b/android/guava/src/com/google/common/collect/Maps.java index 5458ce67766c..99042180cd68 100644 --- a/android/guava/src/com/google/common/collect/Maps.java +++ b/android/guava/src/com/google/common/collect/Maps.java @@ -24,7 +24,6 @@ import static com.google.common.collect.NullnessCasts.uncheckedCastNullableTToT; import static java.util.Objects.requireNonNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; @@ -4355,7 +4354,6 @@ static ImmutableMap indexMap(Collection list) { * * @since 20.0 */ - @Beta @GwtIncompatible // NavigableMap public static , V extends @Nullable Object> NavigableMap subMap(NavigableMap map, Range range) { diff --git a/android/guava/src/com/google/common/collect/MinMaxPriorityQueue.java b/android/guava/src/com/google/common/collect/MinMaxPriorityQueue.java index 5774bb4ead7b..877d6bc0bb1f 100644 --- a/android/guava/src/com/google/common/collect/MinMaxPriorityQueue.java +++ b/android/guava/src/com/google/common/collect/MinMaxPriorityQueue.java @@ -23,7 +23,6 @@ import static com.google.common.collect.CollectPreconditions.checkRemove; import static java.util.Objects.requireNonNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.annotations.VisibleForTesting; @@ -99,7 +98,6 @@ * @author Torbjorn Gannholm * @since 8.0 */ -@Beta @GwtCompatible @ElementTypesAreNonnullByDefault public final class MinMaxPriorityQueue extends AbstractQueue { @@ -163,7 +161,6 @@ public static Builder maximumSize(int maximumSize) { * Queue} but not a {@code Queue}). * @since 8.0 */ - @Beta public static final class Builder { /* * TODO(kevinb): when the dust settles, see if we still need this or can diff --git a/android/guava/src/com/google/common/collect/Multisets.java b/android/guava/src/com/google/common/collect/Multisets.java index 03c0883e5bcb..0483de559643 100644 --- a/android/guava/src/com/google/common/collect/Multisets.java +++ b/android/guava/src/com/google/common/collect/Multisets.java @@ -22,7 +22,6 @@ import static com.google.common.collect.CollectPreconditions.checkRemove; import static java.util.Objects.requireNonNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.base.Objects; import com.google.common.base.Predicate; @@ -199,7 +198,6 @@ public boolean setCount(@ParametricNullness E element, int oldCount, int newCoun * @return an unmodifiable view of the multiset * @since 11.0 */ - @Beta public static SortedMultiset unmodifiableSortedMultiset( SortedMultiset sortedMultiset) { // it's in its own file so it can be emulated for GWT @@ -274,7 +272,6 @@ public ImmutableEntry nextInBucket() { * * @since 14.0 */ - @Beta public static Multiset filter( Multiset unfiltered, Predicate predicate) { if (unfiltered instanceof FilteredMultiset) { @@ -381,7 +378,6 @@ static int inferDistinctElements(Iterable elements) { * * @since 14.0 */ - @Beta public static Multiset union( final Multiset multiset1, final Multiset multiset2) { checkNotNull(multiset1); @@ -511,7 +507,6 @@ protected Entry computeNext() { * * @since 14.0 */ - @Beta public static Multiset sum( final Multiset multiset1, final Multiset multiset2) { checkNotNull(multiset1); @@ -589,7 +584,6 @@ protected Entry computeNext() { * * @since 14.0 */ - @Beta public static Multiset difference( final Multiset multiset1, final Multiset multiset2) { checkNotNull(multiset1); @@ -1143,7 +1137,6 @@ static int linearTimeSizeImpl(Multiset multiset) { * * @since 11.0 */ - @Beta public static ImmutableMultiset copyHighestCountFirst(Multiset multiset) { Entry[] entries = (Entry[]) multiset.entrySet().toArray(new Entry[0]); Arrays.sort(entries, DecreasingCount.INSTANCE); diff --git a/android/guava/src/com/google/common/collect/Queues.java b/android/guava/src/com/google/common/collect/Queues.java index 86da1daf805c..859120693934 100644 --- a/android/guava/src/com/google/common/collect/Queues.java +++ b/android/guava/src/com/google/common/collect/Queues.java @@ -14,7 +14,6 @@ package com.google.common.collect; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; @@ -283,7 +282,6 @@ public static SynchronousQueue newSynchronousQueue() { * @return the number of elements transferred * @throws InterruptedException if interrupted while waiting */ - @Beta @CanIgnoreReturnValue @J2ktIncompatible @GwtIncompatible // BlockingQueue @@ -332,7 +330,6 @@ public static int drain( * @param unit a {@code TimeUnit} determining how to interpret the timeout parameter * @return the number of elements transferred */ - @Beta @CanIgnoreReturnValue @J2ktIncompatible @GwtIncompatible // BlockingQueue diff --git a/android/guava/src/com/google/common/collect/Sets.java b/android/guava/src/com/google/common/collect/Sets.java index c00245e28138..514530a8bdaf 100644 --- a/android/guava/src/com/google/common/collect/Sets.java +++ b/android/guava/src/com/google/common/collect/Sets.java @@ -20,7 +20,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.CollectPreconditions.checkNonnegative; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; @@ -1598,7 +1597,6 @@ public String toString() { * @throws NullPointerException if {@code set} is or contains {@code null} * @since 23.0 */ - @Beta public static Set> combinations(Set set, final int size) { final ImmutableMap index = Maps.indexMap(set); checkNonnegative(size, "size"); @@ -2077,7 +2075,6 @@ public String toString() { * * @since 20.0 */ - @Beta @GwtIncompatible // NavigableSet public static > NavigableSet subSet( NavigableSet set, Range range) { diff --git a/android/guava/src/com/google/common/collect/SortedLists.java b/android/guava/src/com/google/common/collect/SortedLists.java index 0ebaab20f938..245d01821545 100644 --- a/android/guava/src/com/google/common/collect/SortedLists.java +++ b/android/guava/src/com/google/common/collect/SortedLists.java @@ -16,7 +16,6 @@ import static com.google.common.base.Preconditions.checkNotNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.base.Function; import java.util.Collections; @@ -35,7 +34,6 @@ * @author Louis Wasserman */ @GwtCompatible -@Beta @ElementTypesAreNonnullByDefault final class SortedLists { private SortedLists() {} diff --git a/android/guava/src/com/google/common/collect/Tables.java b/android/guava/src/com/google/common/collect/Tables.java index 7a170be4b10c..513404de1c5f 100644 --- a/android/guava/src/com/google/common/collect/Tables.java +++ b/android/guava/src/com/google/common/collect/Tables.java @@ -20,7 +20,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.NullnessCasts.uncheckedCastNullableTToT; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.base.Function; import com.google.common.base.Objects; @@ -311,7 +310,6 @@ Iterator> cellIterator() { * @throws IllegalArgumentException if {@code backingMap} is not empty * @since 10.0 */ - @Beta public static Table newCustomTable( Map> backingMap, Supplier> factory) { checkArgument(backingMap.isEmpty()); @@ -341,7 +339,6 @@ public static Table newCustomTable( * * @since 10.0 */ - @Beta public static < R extends @Nullable Object, C extends @Nullable Object, @@ -594,7 +591,6 @@ public Collection values() { * @return an unmodifiable view of the specified table * @since 11.0 */ - @Beta public static RowSortedTable unmodifiableRowSortedTable( RowSortedTable table) { diff --git a/guava/src/com/google/common/collect/ArrayTable.java b/guava/src/com/google/common/collect/ArrayTable.java index 1fce76244954..38902e3c9e4e 100644 --- a/guava/src/com/google/common/collect/ArrayTable.java +++ b/guava/src/com/google/common/collect/ArrayTable.java @@ -21,7 +21,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import static java.util.Collections.emptyMap; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.base.Objects; @@ -89,7 +88,6 @@ * @author Jared Levy * @since 10.0 */ -@Beta @GwtCompatible(emulated = true) @ElementTypesAreNonnullByDefault public final class ArrayTable extends AbstractTable diff --git a/guava/src/com/google/common/collect/Collections2.java b/guava/src/com/google/common/collect/Collections2.java index eb928596a378..91eb4562c830 100644 --- a/guava/src/com/google/common/collect/Collections2.java +++ b/guava/src/com/google/common/collect/Collections2.java @@ -21,7 +21,6 @@ import static com.google.common.collect.CollectPreconditions.checkNonnegative; import static java.util.Objects.requireNonNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.base.Function; import com.google.common.base.Predicate; @@ -380,7 +379,6 @@ static StringBuilder newStringBuilderForCollection(int size) { * @throws NullPointerException if the specified iterable is null or has any null elements. * @since 12.0 */ - @Beta public static > Collection> orderedPermutations( Iterable elements) { return orderedPermutations(elements, Ordering.natural()); @@ -432,7 +430,6 @@ public static > Collection> orderedPermu * the specified comparator is null. * @since 12.0 */ - @Beta public static Collection> orderedPermutations( Iterable elements, Comparator comparator) { return new OrderedPermutationCollection(elements, comparator); @@ -594,7 +591,6 @@ int findNextL(int j) { * @throws NullPointerException if the specified collection is null or has any null elements. * @since 12.0 */ - @Beta public static Collection> permutations(Collection elements) { return new PermutationCollection(ImmutableList.copyOf(elements)); } diff --git a/guava/src/com/google/common/collect/ConcurrentHashMultiset.java b/guava/src/com/google/common/collect/ConcurrentHashMultiset.java index c01004039ca0..723ab0696aa9 100644 --- a/guava/src/com/google/common/collect/ConcurrentHashMultiset.java +++ b/guava/src/com/google/common/collect/ConcurrentHashMultiset.java @@ -21,7 +21,6 @@ import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.CollectPreconditions.checkNonnegative; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.annotations.VisibleForTesting; @@ -120,7 +119,6 @@ public static ConcurrentHashMultiset create(Iterable element * @throws IllegalArgumentException if {@code countMap} is not empty * @since 20.0 */ - @Beta public static ConcurrentHashMultiset create(ConcurrentMap countMap) { return new ConcurrentHashMultiset<>(countMap); } diff --git a/guava/src/com/google/common/collect/ContiguousSet.java b/guava/src/com/google/common/collect/ContiguousSet.java index 99cb172931f2..d0792054ea4f 100644 --- a/guava/src/com/google/common/collect/ContiguousSet.java +++ b/guava/src/com/google/common/collect/ContiguousSet.java @@ -18,7 +18,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import static java.util.Objects.requireNonNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.errorprone.annotations.DoNotCall; @@ -103,7 +102,6 @@ public static ContiguousSet create( * @throws IllegalArgumentException if {@code lower} is greater than {@code upper} * @since 23.0 */ - @Beta public static ContiguousSet closed(int lower, int upper) { return create(Range.closed(lower, upper), DiscreteDomain.integers()); } @@ -116,7 +114,6 @@ public static ContiguousSet closed(int lower, int upper) { * @throws IllegalArgumentException if {@code lower} is greater than {@code upper} * @since 23.0 */ - @Beta public static ContiguousSet closed(long lower, long upper) { return create(Range.closed(lower, upper), DiscreteDomain.longs()); } @@ -129,7 +126,6 @@ public static ContiguousSet closed(long lower, long upper) { * @throws IllegalArgumentException if {@code lower} is greater than {@code upper} * @since 23.0 */ - @Beta public static ContiguousSet closedOpen(int lower, int upper) { return create(Range.closedOpen(lower, upper), DiscreteDomain.integers()); } @@ -142,7 +138,6 @@ public static ContiguousSet closedOpen(int lower, int upper) { * @throws IllegalArgumentException if {@code lower} is greater than {@code upper} * @since 23.0 */ - @Beta public static ContiguousSet closedOpen(long lower, long upper) { return create(Range.closedOpen(lower, upper), DiscreteDomain.longs()); } diff --git a/guava/src/com/google/common/collect/EvictingQueue.java b/guava/src/com/google/common/collect/EvictingQueue.java index fe95f30b6049..71770b72ae11 100644 --- a/guava/src/com/google/common/collect/EvictingQueue.java +++ b/guava/src/com/google/common/collect/EvictingQueue.java @@ -19,7 +19,6 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.annotations.VisibleForTesting; @@ -44,7 +43,6 @@ * @author Kurt Alfred Kluever * @since 15.0 */ -@Beta @GwtCompatible @ElementTypesAreNonnullByDefault public final class EvictingQueue extends ForwardingQueue implements Serializable { diff --git a/guava/src/com/google/common/collect/ImmutableSortedMap.java b/guava/src/com/google/common/collect/ImmutableSortedMap.java index 791f7763ab21..7479a6023e97 100644 --- a/guava/src/com/google/common/collect/ImmutableSortedMap.java +++ b/guava/src/com/google/common/collect/ImmutableSortedMap.java @@ -22,7 +22,6 @@ import static com.google.common.collect.Maps.keyOrNull; import static java.util.Objects.requireNonNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; @@ -406,7 +405,6 @@ public static ImmutableSortedMap copyOf( * @throws IllegalArgumentException if any two keys are equal according to the comparator * @since 19.0 */ - @Beta public static ImmutableSortedMap copyOf( Iterable> entries) { // Hack around K not being a subtype of Comparable. @@ -424,7 +422,6 @@ public static ImmutableSortedMap copyOf( * @throws IllegalArgumentException if any two keys are equal according to the comparator * @since 19.0 */ - @Beta public static ImmutableSortedMap copyOf( Iterable> entries, Comparator comparator) { @@ -679,7 +676,6 @@ public Builder putAll(Map map) { * @since 19.0 */ @CanIgnoreReturnValue - @Beta @Override public Builder putAll(Iterable> entries) { super.putAll(entries); @@ -693,7 +689,6 @@ public Builder putAll(Iterable> * @deprecated Unsupported by ImmutableSortedMap.Builder. */ @CanIgnoreReturnValue - @Beta @Override @Deprecated @DoNotCall("Always throws UnsupportedOperationException") diff --git a/guava/src/com/google/common/collect/Iterables.java b/guava/src/com/google/common/collect/Iterables.java index acd14e51086c..4e20a4efc513 100644 --- a/guava/src/com/google/common/collect/Iterables.java +++ b/guava/src/com/google/common/collect/Iterables.java @@ -20,7 +20,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.CollectPreconditions.checkRemove; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.base.Function; @@ -1063,7 +1062,6 @@ public static boolean isEmpty(Iterable iterable) { * * @since 11.0 */ - @Beta public static Iterable mergeSorted( final Iterable> iterables, final Comparator comparator) { diff --git a/guava/src/com/google/common/collect/Iterators.java b/guava/src/com/google/common/collect/Iterators.java index 71a93c63a129..1f3e55c646a9 100644 --- a/guava/src/com/google/common/collect/Iterators.java +++ b/guava/src/com/google/common/collect/Iterators.java @@ -24,7 +24,6 @@ import static com.google.common.collect.NullnessCasts.uncheckedCastNullableTToT; import static java.util.Objects.requireNonNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.base.Function; @@ -1295,7 +1294,6 @@ public E peek() { * * @since 11.0 */ - @Beta public static UnmodifiableIterator mergeSorted( Iterable> iterators, Comparator comparator) { checkNotNull(iterators, "iterators"); diff --git a/guava/src/com/google/common/collect/Lists.java b/guava/src/com/google/common/collect/Lists.java index 94e30ff331a0..d0ec8fb38afc 100644 --- a/guava/src/com/google/common/collect/Lists.java +++ b/guava/src/com/google/common/collect/Lists.java @@ -25,7 +25,6 @@ import static com.google.common.collect.CollectPreconditions.checkNonnegative; import static com.google.common.collect.CollectPreconditions.checkRemove; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; @@ -731,7 +730,6 @@ public static ImmutableList charactersOf(String string) { * @return an {@code List} view of the character sequence * @since 7.0 */ - @Beta public static List charactersOf(CharSequence sequence) { return new CharSequenceAsList(checkNotNull(sequence)); } diff --git a/guava/src/com/google/common/collect/Maps.java b/guava/src/com/google/common/collect/Maps.java index 212829fa2d5c..95fcae3a4b16 100644 --- a/guava/src/com/google/common/collect/Maps.java +++ b/guava/src/com/google/common/collect/Maps.java @@ -24,7 +24,6 @@ import static com.google.common.collect.NullnessCasts.uncheckedCastNullableTToT; import static java.util.Objects.requireNonNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; @@ -4598,7 +4597,6 @@ static ImmutableMap indexMap(Collection list) { * * @since 20.0 */ - @Beta @GwtIncompatible // NavigableMap public static , V extends @Nullable Object> NavigableMap subMap(NavigableMap map, Range range) { diff --git a/guava/src/com/google/common/collect/MinMaxPriorityQueue.java b/guava/src/com/google/common/collect/MinMaxPriorityQueue.java index 5774bb4ead7b..877d6bc0bb1f 100644 --- a/guava/src/com/google/common/collect/MinMaxPriorityQueue.java +++ b/guava/src/com/google/common/collect/MinMaxPriorityQueue.java @@ -23,7 +23,6 @@ import static com.google.common.collect.CollectPreconditions.checkRemove; import static java.util.Objects.requireNonNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.annotations.VisibleForTesting; @@ -99,7 +98,6 @@ * @author Torbjorn Gannholm * @since 8.0 */ -@Beta @GwtCompatible @ElementTypesAreNonnullByDefault public final class MinMaxPriorityQueue extends AbstractQueue { @@ -163,7 +161,6 @@ public static Builder maximumSize(int maximumSize) { * Queue} but not a {@code Queue}). * @since 8.0 */ - @Beta public static final class Builder { /* * TODO(kevinb): when the dust settles, see if we still need this or can diff --git a/guava/src/com/google/common/collect/Multiset.java b/guava/src/com/google/common/collect/Multiset.java index ca56a74531f1..fd71c54af5b3 100644 --- a/guava/src/com/google/common/collect/Multiset.java +++ b/guava/src/com/google/common/collect/Multiset.java @@ -18,7 +18,6 @@ import static com.google.common.base.Preconditions.checkNotNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; import com.google.errorprone.annotations.CompatibleWith; @@ -339,7 +338,6 @@ interface Entry { * * @since 21.0 */ - @Beta default void forEachEntry(ObjIntConsumer action) { checkNotNull(action); entrySet().forEach(entry -> action.accept(entry.getElement(), entry.getCount())); diff --git a/guava/src/com/google/common/collect/Multisets.java b/guava/src/com/google/common/collect/Multisets.java index f0cde750a755..88e458315628 100644 --- a/guava/src/com/google/common/collect/Multisets.java +++ b/guava/src/com/google/common/collect/Multisets.java @@ -22,7 +22,6 @@ import static com.google.common.collect.CollectPreconditions.checkRemove; import static java.util.Objects.requireNonNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.base.Objects; import com.google.common.base.Predicate; @@ -229,7 +228,6 @@ public boolean setCount(@ParametricNullness E element, int oldCount, int newCoun * @return an unmodifiable view of the multiset * @since 11.0 */ - @Beta public static SortedMultiset unmodifiableSortedMultiset( SortedMultiset sortedMultiset) { // it's in its own file so it can be emulated for GWT @@ -304,7 +302,6 @@ public ImmutableEntry nextInBucket() { * * @since 14.0 */ - @Beta public static Multiset filter( Multiset unfiltered, Predicate predicate) { if (unfiltered instanceof FilteredMultiset) { @@ -411,7 +408,6 @@ static int inferDistinctElements(Iterable elements) { * * @since 14.0 */ - @Beta public static Multiset union( final Multiset multiset1, final Multiset multiset2) { checkNotNull(multiset1); @@ -541,7 +537,6 @@ protected Entry computeNext() { * * @since 14.0 */ - @Beta public static Multiset sum( final Multiset multiset1, final Multiset multiset2) { checkNotNull(multiset1); @@ -619,7 +614,6 @@ protected Entry computeNext() { * * @since 14.0 */ - @Beta public static Multiset difference( final Multiset multiset1, final Multiset multiset2) { checkNotNull(multiset1); @@ -1164,7 +1158,6 @@ static int linearTimeSizeImpl(Multiset multiset) { * * @since 11.0 */ - @Beta public static ImmutableMultiset copyHighestCountFirst(Multiset multiset) { Entry[] entries = (Entry[]) multiset.entrySet().toArray(new Entry[0]); Arrays.sort(entries, DecreasingCount.INSTANCE); diff --git a/guava/src/com/google/common/collect/Queues.java b/guava/src/com/google/common/collect/Queues.java index ea6e1489e14a..58dc85e8fd56 100644 --- a/guava/src/com/google/common/collect/Queues.java +++ b/guava/src/com/google/common/collect/Queues.java @@ -14,7 +14,6 @@ package com.google.common.collect; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; @@ -283,7 +282,6 @@ public static SynchronousQueue newSynchronousQueue() { * @throws InterruptedException if interrupted while waiting * @since 28.0 */ - @Beta @CanIgnoreReturnValue @J2ktIncompatible @GwtIncompatible // BlockingQueue @@ -306,7 +304,6 @@ public static int drain( * @return the number of elements transferred * @throws InterruptedException if interrupted while waiting */ - @Beta @CanIgnoreReturnValue @J2ktIncompatible @GwtIncompatible // BlockingQueue @@ -355,7 +352,6 @@ public static int drain( * @return the number of elements transferred * @since 28.0 */ - @Beta @CanIgnoreReturnValue @J2ktIncompatible @GwtIncompatible // BlockingQueue @@ -381,7 +377,6 @@ public static int drainUninterruptibly( * @param unit a {@code TimeUnit} determining how to interpret the timeout parameter * @return the number of elements transferred */ - @Beta @CanIgnoreReturnValue @J2ktIncompatible @GwtIncompatible // BlockingQueue diff --git a/guava/src/com/google/common/collect/Sets.java b/guava/src/com/google/common/collect/Sets.java index 3e2d8cfbfbf0..4df1fb2f3820 100644 --- a/guava/src/com/google/common/collect/Sets.java +++ b/guava/src/com/google/common/collect/Sets.java @@ -20,7 +20,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.CollectPreconditions.checkNonnegative; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; @@ -1656,7 +1655,6 @@ public String toString() { * @throws NullPointerException if {@code set} is or contains {@code null} * @since 23.0 */ - @Beta public static Set> combinations(Set set, final int size) { final ImmutableMap index = Maps.indexMap(set); checkNonnegative(size, "size"); @@ -2158,7 +2156,6 @@ public String toString() { * * @since 20.0 */ - @Beta @GwtIncompatible // NavigableSet public static > NavigableSet subSet( NavigableSet set, Range range) { diff --git a/guava/src/com/google/common/collect/SortedLists.java b/guava/src/com/google/common/collect/SortedLists.java index 0ebaab20f938..245d01821545 100644 --- a/guava/src/com/google/common/collect/SortedLists.java +++ b/guava/src/com/google/common/collect/SortedLists.java @@ -16,7 +16,6 @@ import static com.google.common.base.Preconditions.checkNotNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.base.Function; import java.util.Collections; @@ -35,7 +34,6 @@ * @author Louis Wasserman */ @GwtCompatible -@Beta @ElementTypesAreNonnullByDefault final class SortedLists { private SortedLists() {} diff --git a/guava/src/com/google/common/collect/Streams.java b/guava/src/com/google/common/collect/Streams.java index cd7a07c34219..0b6e88ce2552 100644 --- a/guava/src/com/google/common/collect/Streams.java +++ b/guava/src/com/google/common/collect/Streams.java @@ -74,7 +74,6 @@ public final class Streams { * * @deprecated There is no reason to use this; just invoke {@code collection.stream()} directly. */ - @Beta @Deprecated @InlineMe(replacement = "collection.stream()") public static Stream stream(Collection collection) { @@ -85,7 +84,6 @@ public final class Streams { * Returns a sequential {@link Stream} of the remaining contents of {@code iterator}. Do not use * {@code iterator} directly after passing it to this method. */ - @Beta public static Stream stream(Iterator iterator) { return StreamSupport.stream(Spliterators.spliteratorUnknownSize(iterator, 0), false); } @@ -94,7 +92,6 @@ public final class Streams { * If a value is present in {@code optional}, returns a stream containing only that element, * otherwise returns an empty stream. */ - @Beta public static Stream stream(com.google.common.base.Optional optional) { return optional.isPresent() ? Stream.of(optional.get()) : Stream.empty(); } diff --git a/guava/src/com/google/common/collect/Tables.java b/guava/src/com/google/common/collect/Tables.java index 134834ab53c3..525c053559fc 100644 --- a/guava/src/com/google/common/collect/Tables.java +++ b/guava/src/com/google/common/collect/Tables.java @@ -20,7 +20,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.NullnessCasts.uncheckedCastNullableTToT; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.base.Function; import com.google.common.base.Objects; @@ -67,7 +66,6 @@ private Tables() {} * * @since 21.0 */ - @Beta public static < T extends @Nullable Object, R extends @Nullable Object, @@ -379,7 +377,6 @@ Spliterator> cellSpliterator() { * @throws IllegalArgumentException if {@code backingMap} is not empty * @since 10.0 */ - @Beta public static Table newCustomTable( Map> backingMap, Supplier> factory) { checkArgument(backingMap.isEmpty()); @@ -409,7 +406,6 @@ public static Table newCustomTable( * * @since 10.0 */ - @Beta public static < R extends @Nullable Object, C extends @Nullable Object, @@ -667,7 +663,6 @@ public Collection values() { * @return an unmodifiable view of the specified table * @since 11.0 */ - @Beta public static RowSortedTable unmodifiableRowSortedTable( RowSortedTable table) {