diff --git a/android/guava/src/com/google/common/collect/ForwardingList.java b/android/guava/src/com/google/common/collect/ForwardingList.java index 4b4551e5e367..e9b4d8e35b6d 100644 --- a/android/guava/src/com/google/common/collect/ForwardingList.java +++ b/android/guava/src/com/google/common/collect/ForwardingList.java @@ -16,7 +16,6 @@ package com.google.common.collect; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.Collection; @@ -204,7 +203,6 @@ protected ListIterator standardListIterator() { * * @since 7.0 */ - @Beta protected ListIterator standardListIterator(int start) { return Lists.listIteratorImpl(this, start); } @@ -215,7 +213,6 @@ protected ListIterator standardListIterator(int start) { * * @since 7.0 */ - @Beta protected List standardSubList(int fromIndex, int toIndex) { return Lists.subListImpl(this, fromIndex, toIndex); } @@ -227,7 +224,6 @@ protected List standardSubList(int fromIndex, int toIndex) { * * @since 7.0 */ - @Beta protected boolean standardEquals(@CheckForNull Object object) { return Lists.equalsImpl(this, object); } @@ -239,7 +235,6 @@ protected boolean standardEquals(@CheckForNull Object object) { * * @since 7.0 */ - @Beta protected int standardHashCode() { return Lists.hashCodeImpl(this); } diff --git a/android/guava/src/com/google/common/collect/ForwardingMap.java b/android/guava/src/com/google/common/collect/ForwardingMap.java index fbde239b1ec3..24c40f23c9d8 100644 --- a/android/guava/src/com/google/common/collect/ForwardingMap.java +++ b/android/guava/src/com/google/common/collect/ForwardingMap.java @@ -16,7 +16,6 @@ package com.google.common.collect; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.base.Objects; import com.google.errorprone.annotations.CanIgnoreReturnValue; @@ -163,7 +162,6 @@ protected void standardPutAll(Map map) { * * @since 7.0 */ - @Beta @CheckForNull protected V standardRemove(@CheckForNull Object key) { Iterator> entryIterator = entrySet().iterator(); @@ -198,7 +196,6 @@ protected void standardClear() { * * @since 10.0 */ - @Beta protected class StandardKeySet extends Maps.KeySet { /** Constructor for use by subclasses. */ public StandardKeySet() { @@ -213,7 +210,6 @@ public StandardKeySet() { * * @since 7.0 */ - @Beta protected boolean standardContainsKey(@CheckForNull Object key) { return Maps.containsKeyImpl(this, key); } @@ -227,7 +223,6 @@ protected boolean standardContainsKey(@CheckForNull Object key) { * * @since 10.0 */ - @Beta protected class StandardValues extends Maps.Values { /** Constructor for use by subclasses. */ public StandardValues() { @@ -255,7 +250,6 @@ protected boolean standardContainsValue(@CheckForNull Object value) { * * @since 10.0 */ - @Beta protected abstract class StandardEntrySet extends Maps.EntrySet { /** Constructor for use by subclasses. */ protected StandardEntrySet() {} diff --git a/android/guava/src/com/google/common/collect/ForwardingMapEntry.java b/android/guava/src/com/google/common/collect/ForwardingMapEntry.java index 6816ccbbefce..2faa65152b82 100644 --- a/android/guava/src/com/google/common/collect/ForwardingMapEntry.java +++ b/android/guava/src/com/google/common/collect/ForwardingMapEntry.java @@ -16,7 +16,6 @@ package com.google.common.collect; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.base.Objects; import java.util.Map; @@ -123,7 +122,6 @@ protected int standardHashCode() { * * @since 7.0 */ - @Beta protected String standardToString() { return getKey() + "=" + getValue(); } diff --git a/android/guava/src/com/google/common/collect/ForwardingMultiset.java b/android/guava/src/com/google/common/collect/ForwardingMultiset.java index 857b9aec7bbe..d1187d4c5b63 100644 --- a/android/guava/src/com/google/common/collect/ForwardingMultiset.java +++ b/android/guava/src/com/google/common/collect/ForwardingMultiset.java @@ -16,7 +16,6 @@ package com.google.common.collect; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.base.Objects; import com.google.errorprone.annotations.CanIgnoreReturnValue; @@ -138,7 +137,6 @@ protected void standardClear() { * * @since 7.0 */ - @Beta protected int standardCount(@CheckForNull Object object) { for (Entry entry : this.entrySet()) { if (Objects.equal(entry.getElement(), object)) { @@ -167,7 +165,6 @@ protected boolean standardAdd(@ParametricNullness E element) { * * @since 7.0 */ - @Beta @Override protected boolean standardAddAll(Collection elementsToAdd) { return Multisets.addAllImpl(this, elementsToAdd); @@ -243,7 +240,6 @@ protected boolean standardSetCount(@ParametricNullness E element, int oldCount, * * @since 10.0 */ - @Beta protected class StandardElementSet extends Multisets.ElementSet { /** Constructor for use by subclasses. */ public StandardElementSet() {} diff --git a/android/guava/src/com/google/common/collect/ForwardingNavigableMap.java b/android/guava/src/com/google/common/collect/ForwardingNavigableMap.java index e0e1c39e8ef3..cdb36572bfca 100644 --- a/android/guava/src/com/google/common/collect/ForwardingNavigableMap.java +++ b/android/guava/src/com/google/common/collect/ForwardingNavigableMap.java @@ -18,7 +18,6 @@ import static com.google.common.collect.Maps.keyOrNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import java.util.Iterator; import java.util.NavigableMap; @@ -300,7 +299,6 @@ public NavigableMap descendingMap() { * * @since 12.0 */ - @Beta protected class StandardDescendingMap extends Maps.DescendingMap { /** Constructor for use by subclasses. */ public StandardDescendingMap() {} @@ -359,7 +357,6 @@ public NavigableSet navigableKeySet() { * * @since 12.0 */ - @Beta protected class StandardNavigableKeySet extends Maps.NavigableKeySet { /** Constructor for use by subclasses. */ public StandardNavigableKeySet() { @@ -379,7 +376,6 @@ public NavigableSet descendingKeySet() { * descendingMap}, you may wish to override {@code descendingKeySet} to forward to this * implementation. */ - @Beta protected NavigableSet standardDescendingKeySet() { return descendingMap().navigableKeySet(); } diff --git a/android/guava/src/com/google/common/collect/ForwardingNavigableSet.java b/android/guava/src/com/google/common/collect/ForwardingNavigableSet.java index 6822aa87d4fc..97f137a593d6 100644 --- a/android/guava/src/com/google/common/collect/ForwardingNavigableSet.java +++ b/android/guava/src/com/google/common/collect/ForwardingNavigableSet.java @@ -16,7 +16,6 @@ package com.google.common.collect; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import java.util.Iterator; import java.util.NavigableSet; @@ -181,7 +180,6 @@ public NavigableSet descendingSet() { * * @since 12.0 */ - @Beta protected class StandardDescendingSet extends Sets.DescendingSet { /** Constructor for use by subclasses. */ public StandardDescendingSet() { @@ -208,7 +206,6 @@ public NavigableSet subSet( * {@code headSet} and {@code tailSet} methods. In many cases, you may wish to override {@link * #subSet(Object, boolean, Object, boolean)} to forward to this implementation. */ - @Beta protected NavigableSet standardSubSet( @ParametricNullness E fromElement, boolean fromInclusive, diff --git a/android/guava/src/com/google/common/collect/ForwardingSortedMap.java b/android/guava/src/com/google/common/collect/ForwardingSortedMap.java index e0882abc7aa9..9779b97a785f 100644 --- a/android/guava/src/com/google/common/collect/ForwardingSortedMap.java +++ b/android/guava/src/com/google/common/collect/ForwardingSortedMap.java @@ -18,7 +18,6 @@ import static com.google.common.base.Preconditions.checkArgument; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import java.util.Comparator; import java.util.NoSuchElementException; @@ -103,7 +102,6 @@ public SortedMap tailMap(@ParametricNullness K fromKey) { * * @since 15.0 */ - @Beta protected class StandardKeySet extends Maps.SortedKeySet { /** Constructor for use by subclasses. */ public StandardKeySet() { @@ -130,7 +128,6 @@ static int unsafeCompare( * @since 7.0 */ @Override - @Beta protected boolean standardContainsKey(@CheckForNull Object key) { try { // any CCE or NPE will be caught @@ -150,7 +147,6 @@ protected boolean standardContainsKey(@CheckForNull Object key) { * * @since 7.0 */ - @Beta protected SortedMap standardSubMap(K fromKey, K toKey) { checkArgument(unsafeCompare(comparator(), fromKey, toKey) <= 0, "fromKey must be <= toKey"); return tailMap(fromKey).headMap(toKey); diff --git a/android/guava/src/com/google/common/collect/ForwardingSortedMultiset.java b/android/guava/src/com/google/common/collect/ForwardingSortedMultiset.java index 4626d3193a58..7777357414de 100644 --- a/android/guava/src/com/google/common/collect/ForwardingSortedMultiset.java +++ b/android/guava/src/com/google/common/collect/ForwardingSortedMultiset.java @@ -14,7 +14,6 @@ package com.google.common.collect; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import java.util.Comparator; import java.util.Iterator; @@ -44,7 +43,6 @@ * @author Louis Wasserman * @since 15.0 */ -@Beta @GwtCompatible(emulated = true) @ElementTypesAreNonnullByDefault public abstract class ForwardingSortedMultiset diff --git a/android/guava/src/com/google/common/collect/ForwardingSortedSet.java b/android/guava/src/com/google/common/collect/ForwardingSortedSet.java index 32625afd161f..ad7ef12235ef 100644 --- a/android/guava/src/com/google/common/collect/ForwardingSortedSet.java +++ b/android/guava/src/com/google/common/collect/ForwardingSortedSet.java @@ -18,7 +18,6 @@ import static com.google.common.collect.ForwardingSortedMap.unsafeCompare; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import java.util.Comparator; import java.util.Iterator; @@ -106,7 +105,6 @@ public SortedSet tailSet(@ParametricNullness E fromElement) { * @since 7.0 */ @Override - @Beta protected boolean standardContains(@CheckForNull Object object) { try { // any ClassCastExceptions and NullPointerExceptions are caught @@ -127,7 +125,6 @@ protected boolean standardContains(@CheckForNull Object object) { * @since 7.0 */ @Override - @Beta protected boolean standardRemove(@CheckForNull Object object) { try { // any ClassCastExceptions and NullPointerExceptions are caught @@ -154,7 +151,6 @@ protected boolean standardRemove(@CheckForNull Object object) { * * @since 7.0 */ - @Beta protected SortedSet standardSubSet( @ParametricNullness E fromElement, @ParametricNullness E toElement) { return tailSet(fromElement).headSet(toElement); diff --git a/guava/src/com/google/common/collect/ForwardingList.java b/guava/src/com/google/common/collect/ForwardingList.java index 4b4551e5e367..e9b4d8e35b6d 100644 --- a/guava/src/com/google/common/collect/ForwardingList.java +++ b/guava/src/com/google/common/collect/ForwardingList.java @@ -16,7 +16,6 @@ package com.google.common.collect; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; import java.util.Collection; @@ -204,7 +203,6 @@ protected ListIterator standardListIterator() { * * @since 7.0 */ - @Beta protected ListIterator standardListIterator(int start) { return Lists.listIteratorImpl(this, start); } @@ -215,7 +213,6 @@ protected ListIterator standardListIterator(int start) { * * @since 7.0 */ - @Beta protected List standardSubList(int fromIndex, int toIndex) { return Lists.subListImpl(this, fromIndex, toIndex); } @@ -227,7 +224,6 @@ protected List standardSubList(int fromIndex, int toIndex) { * * @since 7.0 */ - @Beta protected boolean standardEquals(@CheckForNull Object object) { return Lists.equalsImpl(this, object); } @@ -239,7 +235,6 @@ protected boolean standardEquals(@CheckForNull Object object) { * * @since 7.0 */ - @Beta protected int standardHashCode() { return Lists.hashCodeImpl(this); } diff --git a/guava/src/com/google/common/collect/ForwardingMap.java b/guava/src/com/google/common/collect/ForwardingMap.java index fbde239b1ec3..24c40f23c9d8 100644 --- a/guava/src/com/google/common/collect/ForwardingMap.java +++ b/guava/src/com/google/common/collect/ForwardingMap.java @@ -16,7 +16,6 @@ package com.google.common.collect; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.base.Objects; import com.google.errorprone.annotations.CanIgnoreReturnValue; @@ -163,7 +162,6 @@ protected void standardPutAll(Map map) { * * @since 7.0 */ - @Beta @CheckForNull protected V standardRemove(@CheckForNull Object key) { Iterator> entryIterator = entrySet().iterator(); @@ -198,7 +196,6 @@ protected void standardClear() { * * @since 10.0 */ - @Beta protected class StandardKeySet extends Maps.KeySet { /** Constructor for use by subclasses. */ public StandardKeySet() { @@ -213,7 +210,6 @@ public StandardKeySet() { * * @since 7.0 */ - @Beta protected boolean standardContainsKey(@CheckForNull Object key) { return Maps.containsKeyImpl(this, key); } @@ -227,7 +223,6 @@ protected boolean standardContainsKey(@CheckForNull Object key) { * * @since 10.0 */ - @Beta protected class StandardValues extends Maps.Values { /** Constructor for use by subclasses. */ public StandardValues() { @@ -255,7 +250,6 @@ protected boolean standardContainsValue(@CheckForNull Object value) { * * @since 10.0 */ - @Beta protected abstract class StandardEntrySet extends Maps.EntrySet { /** Constructor for use by subclasses. */ protected StandardEntrySet() {} diff --git a/guava/src/com/google/common/collect/ForwardingMapEntry.java b/guava/src/com/google/common/collect/ForwardingMapEntry.java index 6816ccbbefce..2faa65152b82 100644 --- a/guava/src/com/google/common/collect/ForwardingMapEntry.java +++ b/guava/src/com/google/common/collect/ForwardingMapEntry.java @@ -16,7 +16,6 @@ package com.google.common.collect; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.base.Objects; import java.util.Map; @@ -123,7 +122,6 @@ protected int standardHashCode() { * * @since 7.0 */ - @Beta protected String standardToString() { return getKey() + "=" + getValue(); } diff --git a/guava/src/com/google/common/collect/ForwardingMultiset.java b/guava/src/com/google/common/collect/ForwardingMultiset.java index 857b9aec7bbe..d1187d4c5b63 100644 --- a/guava/src/com/google/common/collect/ForwardingMultiset.java +++ b/guava/src/com/google/common/collect/ForwardingMultiset.java @@ -16,7 +16,6 @@ package com.google.common.collect; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.base.Objects; import com.google.errorprone.annotations.CanIgnoreReturnValue; @@ -138,7 +137,6 @@ protected void standardClear() { * * @since 7.0 */ - @Beta protected int standardCount(@CheckForNull Object object) { for (Entry entry : this.entrySet()) { if (Objects.equal(entry.getElement(), object)) { @@ -167,7 +165,6 @@ protected boolean standardAdd(@ParametricNullness E element) { * * @since 7.0 */ - @Beta @Override protected boolean standardAddAll(Collection elementsToAdd) { return Multisets.addAllImpl(this, elementsToAdd); @@ -243,7 +240,6 @@ protected boolean standardSetCount(@ParametricNullness E element, int oldCount, * * @since 10.0 */ - @Beta protected class StandardElementSet extends Multisets.ElementSet { /** Constructor for use by subclasses. */ public StandardElementSet() {} diff --git a/guava/src/com/google/common/collect/ForwardingNavigableMap.java b/guava/src/com/google/common/collect/ForwardingNavigableMap.java index c32468da1d21..845179d2d7af 100644 --- a/guava/src/com/google/common/collect/ForwardingNavigableMap.java +++ b/guava/src/com/google/common/collect/ForwardingNavigableMap.java @@ -18,7 +18,6 @@ import static com.google.common.collect.Maps.keyOrNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import java.util.Iterator; import java.util.NavigableMap; @@ -301,7 +300,6 @@ public NavigableMap descendingMap() { * * @since 12.0 */ - @Beta protected class StandardDescendingMap extends Maps.DescendingMap { /** Constructor for use by subclasses. */ public StandardDescendingMap() {} @@ -365,7 +363,6 @@ public NavigableSet navigableKeySet() { * * @since 12.0 */ - @Beta protected class StandardNavigableKeySet extends Maps.NavigableKeySet { /** Constructor for use by subclasses. */ public StandardNavigableKeySet() { @@ -385,7 +382,6 @@ public NavigableSet descendingKeySet() { * descendingMap}, you may wish to override {@code descendingKeySet} to forward to this * implementation. */ - @Beta protected NavigableSet standardDescendingKeySet() { return descendingMap().navigableKeySet(); } diff --git a/guava/src/com/google/common/collect/ForwardingNavigableSet.java b/guava/src/com/google/common/collect/ForwardingNavigableSet.java index 6822aa87d4fc..97f137a593d6 100644 --- a/guava/src/com/google/common/collect/ForwardingNavigableSet.java +++ b/guava/src/com/google/common/collect/ForwardingNavigableSet.java @@ -16,7 +16,6 @@ package com.google.common.collect; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import java.util.Iterator; import java.util.NavigableSet; @@ -181,7 +180,6 @@ public NavigableSet descendingSet() { * * @since 12.0 */ - @Beta protected class StandardDescendingSet extends Sets.DescendingSet { /** Constructor for use by subclasses. */ public StandardDescendingSet() { @@ -208,7 +206,6 @@ public NavigableSet subSet( * {@code headSet} and {@code tailSet} methods. In many cases, you may wish to override {@link * #subSet(Object, boolean, Object, boolean)} to forward to this implementation. */ - @Beta protected NavigableSet standardSubSet( @ParametricNullness E fromElement, boolean fromInclusive, diff --git a/guava/src/com/google/common/collect/ForwardingSortedMap.java b/guava/src/com/google/common/collect/ForwardingSortedMap.java index e0882abc7aa9..9779b97a785f 100644 --- a/guava/src/com/google/common/collect/ForwardingSortedMap.java +++ b/guava/src/com/google/common/collect/ForwardingSortedMap.java @@ -18,7 +18,6 @@ import static com.google.common.base.Preconditions.checkArgument; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import java.util.Comparator; import java.util.NoSuchElementException; @@ -103,7 +102,6 @@ public SortedMap tailMap(@ParametricNullness K fromKey) { * * @since 15.0 */ - @Beta protected class StandardKeySet extends Maps.SortedKeySet { /** Constructor for use by subclasses. */ public StandardKeySet() { @@ -130,7 +128,6 @@ static int unsafeCompare( * @since 7.0 */ @Override - @Beta protected boolean standardContainsKey(@CheckForNull Object key) { try { // any CCE or NPE will be caught @@ -150,7 +147,6 @@ protected boolean standardContainsKey(@CheckForNull Object key) { * * @since 7.0 */ - @Beta protected SortedMap standardSubMap(K fromKey, K toKey) { checkArgument(unsafeCompare(comparator(), fromKey, toKey) <= 0, "fromKey must be <= toKey"); return tailMap(fromKey).headMap(toKey); diff --git a/guava/src/com/google/common/collect/ForwardingSortedMultiset.java b/guava/src/com/google/common/collect/ForwardingSortedMultiset.java index 4626d3193a58..7777357414de 100644 --- a/guava/src/com/google/common/collect/ForwardingSortedMultiset.java +++ b/guava/src/com/google/common/collect/ForwardingSortedMultiset.java @@ -14,7 +14,6 @@ package com.google.common.collect; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import java.util.Comparator; import java.util.Iterator; @@ -44,7 +43,6 @@ * @author Louis Wasserman * @since 15.0 */ -@Beta @GwtCompatible(emulated = true) @ElementTypesAreNonnullByDefault public abstract class ForwardingSortedMultiset diff --git a/guava/src/com/google/common/collect/ForwardingSortedSet.java b/guava/src/com/google/common/collect/ForwardingSortedSet.java index 32625afd161f..ad7ef12235ef 100644 --- a/guava/src/com/google/common/collect/ForwardingSortedSet.java +++ b/guava/src/com/google/common/collect/ForwardingSortedSet.java @@ -18,7 +18,6 @@ import static com.google.common.collect.ForwardingSortedMap.unsafeCompare; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import java.util.Comparator; import java.util.Iterator; @@ -106,7 +105,6 @@ public SortedSet tailSet(@ParametricNullness E fromElement) { * @since 7.0 */ @Override - @Beta protected boolean standardContains(@CheckForNull Object object) { try { // any ClassCastExceptions and NullPointerExceptions are caught @@ -127,7 +125,6 @@ protected boolean standardContains(@CheckForNull Object object) { * @since 7.0 */ @Override - @Beta protected boolean standardRemove(@CheckForNull Object object) { try { // any ClassCastExceptions and NullPointerExceptions are caught @@ -154,7 +151,6 @@ protected boolean standardRemove(@CheckForNull Object object) { * * @since 7.0 */ - @Beta protected SortedSet standardSubSet( @ParametricNullness E fromElement, @ParametricNullness E toElement) { return tailSet(fromElement).headSet(toElement);