From 5ec1360912ce94dabe801b1cf5826bf94947aa4e Mon Sep 17 00:00:00 2001 From: cpovirk Date: Mon, 3 Jun 2019 08:57:34 -0700 Subject: [PATCH] Remove `@Beta` from `setFuture`. RELNOTES=Removed `@Beta` from `setFuture`. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=251241741 --- .../src/com/google/common/util/concurrent/AbstractFuture.java | 1 - .../src/com/google/common/util/concurrent/SettableFuture.java | 2 -- guava/src/com/google/common/util/concurrent/AbstractFuture.java | 1 - guava/src/com/google/common/util/concurrent/SettableFuture.java | 2 -- 4 files changed, 6 deletions(-) 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 6504c8bc9af4..36cf17730005 100644 --- a/android/guava/src/com/google/common/util/concurrent/AbstractFuture.java +++ b/android/guava/src/com/google/common/util/concurrent/AbstractFuture.java @@ -777,7 +777,6 @@ protected boolean setException(Throwable throwable) { * cancelled or set. * @since 19.0 */ - @Beta @CanIgnoreReturnValue protected boolean setFuture(ListenableFuture future) { checkNotNull(future); diff --git a/android/guava/src/com/google/common/util/concurrent/SettableFuture.java b/android/guava/src/com/google/common/util/concurrent/SettableFuture.java index 3c8b90fbded0..1c220e607cf0 100644 --- a/android/guava/src/com/google/common/util/concurrent/SettableFuture.java +++ b/android/guava/src/com/google/common/util/concurrent/SettableFuture.java @@ -14,7 +14,6 @@ package com.google.common.util.concurrent; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; import org.checkerframework.checker.nullness.compatqual.NullableDecl; @@ -54,7 +53,6 @@ public boolean setException(Throwable throwable) { return super.setException(throwable); } - @Beta @CanIgnoreReturnValue @Override public boolean setFuture(ListenableFuture future) { diff --git a/guava/src/com/google/common/util/concurrent/AbstractFuture.java b/guava/src/com/google/common/util/concurrent/AbstractFuture.java index 808243f05b0a..da366085d732 100644 --- a/guava/src/com/google/common/util/concurrent/AbstractFuture.java +++ b/guava/src/com/google/common/util/concurrent/AbstractFuture.java @@ -777,7 +777,6 @@ protected boolean setException(Throwable throwable) { * cancelled or set. * @since 19.0 */ - @Beta @CanIgnoreReturnValue protected boolean setFuture(ListenableFuture future) { checkNotNull(future); diff --git a/guava/src/com/google/common/util/concurrent/SettableFuture.java b/guava/src/com/google/common/util/concurrent/SettableFuture.java index b8e9491b4c64..a0f47329027b 100644 --- a/guava/src/com/google/common/util/concurrent/SettableFuture.java +++ b/guava/src/com/google/common/util/concurrent/SettableFuture.java @@ -14,7 +14,6 @@ package com.google.common.util.concurrent; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.errorprone.annotations.CanIgnoreReturnValue; import org.checkerframework.checker.nullness.qual.Nullable; @@ -54,7 +53,6 @@ public boolean setException(Throwable throwable) { return super.setException(throwable); } - @Beta @CanIgnoreReturnValue @Override public boolean setFuture(ListenableFuture future) {