diff --git a/android/guava/src/com/google/common/util/concurrent/AbstractExecutionThreadService.java b/android/guava/src/com/google/common/util/concurrent/AbstractExecutionThreadService.java index 455d8a1b9e09..b06647ea3c9e 100644 --- a/android/guava/src/com/google/common/util/concurrent/AbstractExecutionThreadService.java +++ b/android/guava/src/com/google/common/util/concurrent/AbstractExecutionThreadService.java @@ -16,7 +16,6 @@ import static com.google.common.util.concurrent.Platform.restoreInterruptIfIsInterruptedException; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; @@ -142,7 +141,6 @@ protected void shutDown() throws Exception {} * implementing {@code stopping}. Note, however, that {@code stopping} does not run at exactly the * same times as {@code triggerShutdown}. */ - @Beta protected void triggerShutdown() {} /** diff --git a/android/guava/src/com/google/common/util/concurrent/AbstractFuture.java b/android/guava/src/com/google/common/util/concurrent/AbstractFuture.java index 19827fee0715..6dc7a6b395d8 100644 --- a/android/guava/src/com/google/common/util/concurrent/AbstractFuture.java +++ b/android/guava/src/com/google/common/util/concurrent/AbstractFuture.java @@ -21,7 +21,6 @@ import static java.util.Objects.requireNonNull; import static java.util.concurrent.atomic.AtomicReferenceFieldUpdater.newUpdater; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.base.Strings; import com.google.common.util.concurrent.internal.InternalFutureFailureAccess; @@ -1071,7 +1070,6 @@ private static void complete(AbstractFuture param, boolean callInterruptTask) * * @since 20.0 */ - @Beta @ForOverride protected void afterDone() {} diff --git a/android/guava/src/com/google/common/util/concurrent/AbstractListeningExecutorService.java b/android/guava/src/com/google/common/util/concurrent/AbstractListeningExecutorService.java index 72334be2e033..113665b91ab4 100644 --- a/android/guava/src/com/google/common/util/concurrent/AbstractListeningExecutorService.java +++ b/android/guava/src/com/google/common/util/concurrent/AbstractListeningExecutorService.java @@ -14,7 +14,6 @@ package com.google.common.util.concurrent; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; @@ -36,7 +35,6 @@ * @since 14.0 */ @CheckReturnValue -@Beta @GwtIncompatible @J2ktIncompatible @ElementTypesAreNonnullByDefault diff --git a/android/guava/src/com/google/common/util/concurrent/AbstractService.java b/android/guava/src/com/google/common/util/concurrent/AbstractService.java index a7c474c02d25..6ead7b4deea9 100644 --- a/android/guava/src/com/google/common/util/concurrent/AbstractService.java +++ b/android/guava/src/com/google/common/util/concurrent/AbstractService.java @@ -26,7 +26,6 @@ import static com.google.common.util.concurrent.Service.State.TERMINATED; import static java.util.Objects.requireNonNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.util.concurrent.Monitor.Guard; @@ -239,7 +238,6 @@ protected AbstractService() {} * * @since 27.0 */ - @Beta @ForOverride protected void doCancelStart() {} diff --git a/android/guava/src/com/google/common/util/concurrent/AtomicLongMap.java b/android/guava/src/com/google/common/util/concurrent/AtomicLongMap.java index e29f61de712f..ace5e3c53927 100644 --- a/android/guava/src/com/google/common/util/concurrent/AtomicLongMap.java +++ b/android/guava/src/com/google/common/util/concurrent/AtomicLongMap.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.annotations.J2ktIncompatible; import com.google.common.base.Function; @@ -294,7 +293,6 @@ boolean remove(K key, long value) { * * @since 20.0 */ - @Beta @CanIgnoreReturnValue public boolean removeIfZero(K key) { return remove(key, 0); diff --git a/android/guava/src/com/google/common/util/concurrent/Callables.java b/android/guava/src/com/google/common/util/concurrent/Callables.java index 0533605dd1b8..6a586bb2ee8b 100644 --- a/android/guava/src/com/google/common/util/concurrent/Callables.java +++ b/android/guava/src/com/google/common/util/concurrent/Callables.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.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; @@ -48,7 +47,6 @@ private Callables() {} * * @since 20.0 */ - @Beta @J2ktIncompatible @GwtIncompatible public static AsyncCallable asAsyncCallable( diff --git a/android/guava/src/com/google/common/util/concurrent/CycleDetectingLockFactory.java b/android/guava/src/com/google/common/util/concurrent/CycleDetectingLockFactory.java index 21c77e8f9ef1..0ec799cc493d 100644 --- a/android/guava/src/com/google/common/util/concurrent/CycleDetectingLockFactory.java +++ b/android/guava/src/com/google/common/util/concurrent/CycleDetectingLockFactory.java @@ -17,7 +17,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.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.annotations.VisibleForTesting; @@ -160,7 +159,6 @@ * @author Darick Tong * @since 13.0 */ -@Beta @J2ktIncompatible @GwtIncompatible @ElementTypesAreNonnullByDefault @@ -173,7 +171,6 @@ public class CycleDetectingLockFactory { * * @since 13.0 */ - @Beta public interface Policy { /** @@ -193,7 +190,6 @@ public interface Policy { * * @since 13.0 */ - @Beta public enum Policies implements Policy { /** * When potential deadlock is detected, this policy results in the throwing of the {@code @@ -394,7 +390,6 @@ private static String getLockName(Enum rank) { * @param The Enum type representing the explicit lock ordering. * @since 13.0 */ - @Beta public static final class WithExplicitOrdering> extends CycleDetectingLockFactory { @@ -534,7 +529,6 @@ private static class ExampleStackTrace extends IllegalStateException { * * @since 13.0 */ - @Beta public static final class PotentialDeadlockException extends ExampleStackTrace { private final ExampleStackTrace conflictingStackTrace; diff --git a/android/guava/src/com/google/common/util/concurrent/FakeTimeLimiter.java b/android/guava/src/com/google/common/util/concurrent/FakeTimeLimiter.java index ddaca50f5e3a..1c16cfb146d9 100644 --- a/android/guava/src/com/google/common/util/concurrent/FakeTimeLimiter.java +++ b/android/guava/src/com/google/common/util/concurrent/FakeTimeLimiter.java @@ -17,7 +17,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.util.concurrent.Platform.restoreInterruptIfIsInterruptedException; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; @@ -36,7 +35,6 @@ * @author Jens Nyman * @since 1.0 */ -@Beta @J2ktIncompatible @GwtIncompatible @ElementTypesAreNonnullByDefault diff --git a/android/guava/src/com/google/common/util/concurrent/JdkFutureAdapters.java b/android/guava/src/com/google/common/util/concurrent/JdkFutureAdapters.java index b91b5fe7ebc3..33403c978a09 100644 --- a/android/guava/src/com/google/common/util/concurrent/JdkFutureAdapters.java +++ b/android/guava/src/com/google/common/util/concurrent/JdkFutureAdapters.java @@ -17,7 +17,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.util.concurrent.Uninterruptibles.getUninterruptibly; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import java.util.concurrent.ExecutionException; @@ -39,7 +38,6 @@ * @author Sven Mawson * @since 10.0 (replacing {@code Futures.makeListenable}, which existed in 1.0) */ -@Beta @J2ktIncompatible @GwtIncompatible @ElementTypesAreNonnullByDefault diff --git a/android/guava/src/com/google/common/util/concurrent/Runnables.java b/android/guava/src/com/google/common/util/concurrent/Runnables.java index 5503f68ae545..f5b27f8afe9d 100644 --- a/android/guava/src/com/google/common/util/concurrent/Runnables.java +++ b/android/guava/src/com/google/common/util/concurrent/Runnables.java @@ -14,7 +14,6 @@ package com.google.common.util.concurrent; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; /** @@ -22,7 +21,6 @@ * * @since 16.0 */ -@Beta @GwtCompatible @ElementTypesAreNonnullByDefault public final class Runnables { diff --git a/android/guava/src/com/google/common/util/concurrent/SimpleTimeLimiter.java b/android/guava/src/com/google/common/util/concurrent/SimpleTimeLimiter.java index 551d598d0357..9c57e2d081a4 100644 --- a/android/guava/src/com/google/common/util/concurrent/SimpleTimeLimiter.java +++ b/android/guava/src/com/google/common/util/concurrent/SimpleTimeLimiter.java @@ -17,7 +17,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.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.collect.ObjectArrays; @@ -46,7 +45,6 @@ * @author Jens Nyman * @since 1.0 */ -@Beta @J2ktIncompatible @GwtIncompatible @ElementTypesAreNonnullByDefault diff --git a/android/guava/src/com/google/common/util/concurrent/TimeLimiter.java b/android/guava/src/com/google/common/util/concurrent/TimeLimiter.java index 43294d9e520e..35695ad023af 100644 --- a/android/guava/src/com/google/common/util/concurrent/TimeLimiter.java +++ b/android/guava/src/com/google/common/util/concurrent/TimeLimiter.java @@ -14,7 +14,7 @@ package com.google.common.util.concurrent; -import com.google.common.annotations.Beta; + import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; @@ -32,7 +32,6 @@ * @author Jens Nyman * @since 1.0 */ -@Beta @DoNotMock("Use FakeTimeLimiter") @J2ktIncompatible @GwtIncompatible diff --git a/guava/src/com/google/common/util/concurrent/AbstractExecutionThreadService.java b/guava/src/com/google/common/util/concurrent/AbstractExecutionThreadService.java index 9eadb2196b91..c52f9d4561b8 100644 --- a/guava/src/com/google/common/util/concurrent/AbstractExecutionThreadService.java +++ b/guava/src/com/google/common/util/concurrent/AbstractExecutionThreadService.java @@ -16,7 +16,6 @@ import static com.google.common.util.concurrent.Platform.restoreInterruptIfIsInterruptedException; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; @@ -143,7 +142,6 @@ protected void shutDown() throws Exception {} * implementing {@code stopping}. Note, however, that {@code stopping} does not run at exactly the * same times as {@code triggerShutdown}. */ - @Beta protected void triggerShutdown() {} /** diff --git a/guava/src/com/google/common/util/concurrent/AbstractFuture.java b/guava/src/com/google/common/util/concurrent/AbstractFuture.java index 338dea3f9bca..42ec5264cea9 100644 --- a/guava/src/com/google/common/util/concurrent/AbstractFuture.java +++ b/guava/src/com/google/common/util/concurrent/AbstractFuture.java @@ -21,7 +21,6 @@ import static java.util.Objects.requireNonNull; import static java.util.concurrent.atomic.AtomicReferenceFieldUpdater.newUpdater; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.base.Strings; import com.google.common.util.concurrent.internal.InternalFutureFailureAccess; @@ -1071,7 +1070,6 @@ private static void complete(AbstractFuture param, boolean callInterruptTask) * * @since 20.0 */ - @Beta @ForOverride protected void afterDone() {} diff --git a/guava/src/com/google/common/util/concurrent/AbstractListeningExecutorService.java b/guava/src/com/google/common/util/concurrent/AbstractListeningExecutorService.java index 72334be2e033..113665b91ab4 100644 --- a/guava/src/com/google/common/util/concurrent/AbstractListeningExecutorService.java +++ b/guava/src/com/google/common/util/concurrent/AbstractListeningExecutorService.java @@ -14,7 +14,6 @@ package com.google.common.util.concurrent; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; @@ -36,7 +35,6 @@ * @since 14.0 */ @CheckReturnValue -@Beta @GwtIncompatible @J2ktIncompatible @ElementTypesAreNonnullByDefault diff --git a/guava/src/com/google/common/util/concurrent/AbstractService.java b/guava/src/com/google/common/util/concurrent/AbstractService.java index 1ba3f79a4522..424206ef548c 100644 --- a/guava/src/com/google/common/util/concurrent/AbstractService.java +++ b/guava/src/com/google/common/util/concurrent/AbstractService.java @@ -26,7 +26,6 @@ import static com.google.common.util.concurrent.Service.State.TERMINATED; import static java.util.Objects.requireNonNull; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.util.concurrent.Monitor.Guard; @@ -240,7 +239,6 @@ protected AbstractService() {} * * @since 27.0 */ - @Beta @ForOverride protected void doCancelStart() {} diff --git a/guava/src/com/google/common/util/concurrent/AtomicLongMap.java b/guava/src/com/google/common/util/concurrent/AtomicLongMap.java index 1768c96a02f7..571e1b1d36e8 100644 --- a/guava/src/com/google/common/util/concurrent/AtomicLongMap.java +++ b/guava/src/com/google/common/util/concurrent/AtomicLongMap.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.common.annotations.J2ktIncompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; @@ -242,7 +241,6 @@ boolean remove(K key, long value) { * * @since 20.0 */ - @Beta @CanIgnoreReturnValue public boolean removeIfZero(K key) { return remove(key, 0); diff --git a/guava/src/com/google/common/util/concurrent/Callables.java b/guava/src/com/google/common/util/concurrent/Callables.java index 0533605dd1b8..6a586bb2ee8b 100644 --- a/guava/src/com/google/common/util/concurrent/Callables.java +++ b/guava/src/com/google/common/util/concurrent/Callables.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.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; @@ -48,7 +47,6 @@ private Callables() {} * * @since 20.0 */ - @Beta @J2ktIncompatible @GwtIncompatible public static AsyncCallable asAsyncCallable( diff --git a/guava/src/com/google/common/util/concurrent/CycleDetectingLockFactory.java b/guava/src/com/google/common/util/concurrent/CycleDetectingLockFactory.java index 21c77e8f9ef1..0ec799cc493d 100644 --- a/guava/src/com/google/common/util/concurrent/CycleDetectingLockFactory.java +++ b/guava/src/com/google/common/util/concurrent/CycleDetectingLockFactory.java @@ -17,7 +17,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.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.annotations.VisibleForTesting; @@ -160,7 +159,6 @@ * @author Darick Tong * @since 13.0 */ -@Beta @J2ktIncompatible @GwtIncompatible @ElementTypesAreNonnullByDefault @@ -173,7 +171,6 @@ public class CycleDetectingLockFactory { * * @since 13.0 */ - @Beta public interface Policy { /** @@ -193,7 +190,6 @@ public interface Policy { * * @since 13.0 */ - @Beta public enum Policies implements Policy { /** * When potential deadlock is detected, this policy results in the throwing of the {@code @@ -394,7 +390,6 @@ private static String getLockName(Enum rank) { * @param The Enum type representing the explicit lock ordering. * @since 13.0 */ - @Beta public static final class WithExplicitOrdering> extends CycleDetectingLockFactory { @@ -534,7 +529,6 @@ private static class ExampleStackTrace extends IllegalStateException { * * @since 13.0 */ - @Beta public static final class PotentialDeadlockException extends ExampleStackTrace { private final ExampleStackTrace conflictingStackTrace; diff --git a/guava/src/com/google/common/util/concurrent/FakeTimeLimiter.java b/guava/src/com/google/common/util/concurrent/FakeTimeLimiter.java index ddaca50f5e3a..1c16cfb146d9 100644 --- a/guava/src/com/google/common/util/concurrent/FakeTimeLimiter.java +++ b/guava/src/com/google/common/util/concurrent/FakeTimeLimiter.java @@ -17,7 +17,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.util.concurrent.Platform.restoreInterruptIfIsInterruptedException; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; @@ -36,7 +35,6 @@ * @author Jens Nyman * @since 1.0 */ -@Beta @J2ktIncompatible @GwtIncompatible @ElementTypesAreNonnullByDefault diff --git a/guava/src/com/google/common/util/concurrent/JdkFutureAdapters.java b/guava/src/com/google/common/util/concurrent/JdkFutureAdapters.java index b91b5fe7ebc3..33403c978a09 100644 --- a/guava/src/com/google/common/util/concurrent/JdkFutureAdapters.java +++ b/guava/src/com/google/common/util/concurrent/JdkFutureAdapters.java @@ -17,7 +17,6 @@ import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.util.concurrent.Uninterruptibles.getUninterruptibly; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import java.util.concurrent.ExecutionException; @@ -39,7 +38,6 @@ * @author Sven Mawson * @since 10.0 (replacing {@code Futures.makeListenable}, which existed in 1.0) */ -@Beta @J2ktIncompatible @GwtIncompatible @ElementTypesAreNonnullByDefault diff --git a/guava/src/com/google/common/util/concurrent/Runnables.java b/guava/src/com/google/common/util/concurrent/Runnables.java index 5503f68ae545..f5b27f8afe9d 100644 --- a/guava/src/com/google/common/util/concurrent/Runnables.java +++ b/guava/src/com/google/common/util/concurrent/Runnables.java @@ -14,7 +14,6 @@ package com.google.common.util.concurrent; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; /** @@ -22,7 +21,6 @@ * * @since 16.0 */ -@Beta @GwtCompatible @ElementTypesAreNonnullByDefault public final class Runnables { diff --git a/guava/src/com/google/common/util/concurrent/SimpleTimeLimiter.java b/guava/src/com/google/common/util/concurrent/SimpleTimeLimiter.java index 551d598d0357..9c57e2d081a4 100644 --- a/guava/src/com/google/common/util/concurrent/SimpleTimeLimiter.java +++ b/guava/src/com/google/common/util/concurrent/SimpleTimeLimiter.java @@ -17,7 +17,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.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.common.collect.ObjectArrays; @@ -46,7 +45,6 @@ * @author Jens Nyman * @since 1.0 */ -@Beta @J2ktIncompatible @GwtIncompatible @ElementTypesAreNonnullByDefault diff --git a/guava/src/com/google/common/util/concurrent/TimeLimiter.java b/guava/src/com/google/common/util/concurrent/TimeLimiter.java index d764d6067caa..babb6343146f 100644 --- a/guava/src/com/google/common/util/concurrent/TimeLimiter.java +++ b/guava/src/com/google/common/util/concurrent/TimeLimiter.java @@ -16,7 +16,6 @@ import static com.google.common.util.concurrent.Internal.toNanosSaturated; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtIncompatible; import com.google.common.annotations.J2ktIncompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; @@ -35,7 +34,6 @@ * @author Jens Nyman * @since 1.0 */ -@Beta @DoNotMock("Use FakeTimeLimiter") @J2ktIncompatible @GwtIncompatible