diff --git a/alts/src/main/java/io/grpc/alts/internal/AltsChannelCrypter.java b/alts/src/main/java/io/grpc/alts/internal/AltsChannelCrypter.java index 3e999fa63b..5e4c6fec30 100644 --- a/alts/src/main/java/io/grpc/alts/internal/AltsChannelCrypter.java +++ b/alts/src/main/java/io/grpc/alts/internal/AltsChannelCrypter.java @@ -54,7 +54,6 @@ final class AltsChannelCrypter implements ChannelCrypterNetty { return COUNTER_LENGTH; } - @SuppressWarnings("BetaApi") // verify is stable in Guava @Override public void encrypt(ByteBuf outBuf, List plainBufs) throws GeneralSecurityException { checkArgument(outBuf.nioBufferCount() == 1); @@ -93,7 +92,6 @@ final class AltsChannelCrypter implements ChannelCrypterNetty { decrypt(out, cipherTextAndTag); } - @SuppressWarnings("BetaApi") // verify is stable in Guava @Override public void decrypt(ByteBuf out, ByteBuf ciphertextAndTag) throws GeneralSecurityException { int bytesRead = ciphertextAndTag.readableBytes(); diff --git a/alts/src/main/java/io/grpc/alts/internal/AltsTsiFrameProtector.java b/alts/src/main/java/io/grpc/alts/internal/AltsTsiFrameProtector.java index c112c319b8..23e1dc9e5a 100644 --- a/alts/src/main/java/io/grpc/alts/internal/AltsTsiFrameProtector.java +++ b/alts/src/main/java/io/grpc/alts/internal/AltsTsiFrameProtector.java @@ -128,7 +128,6 @@ public final class AltsTsiFrameProtector implements TsiFrameProtector { } } - @SuppressWarnings("BetaApi") // verify is stable in Guava private ByteBuf handleUnprotected(List unprotectedBufs, ByteBufAllocator alloc) throws GeneralSecurityException { long unprotectedBytes = 0; @@ -270,7 +269,6 @@ public final class AltsTsiFrameProtector implements TsiFrameProtector { state = DeframerState.READ_PROTECTED_PAYLOAD; } - @SuppressWarnings("BetaApi") // verify is stable in Guava private ByteBuf handlePayload(ByteBufAllocator alloc) throws GeneralSecurityException { int requiredCiphertextBytes = requiredProtectedBytes - suffixBytes; int firstFrameUnprotectedLen = requiredCiphertextBytes; diff --git a/auth/src/main/java/io/grpc/auth/GoogleAuthLibraryCallCredentials.java b/auth/src/main/java/io/grpc/auth/GoogleAuthLibraryCallCredentials.java index 32855e3bde..ce12f308a2 100644 --- a/auth/src/main/java/io/grpc/auth/GoogleAuthLibraryCallCredentials.java +++ b/auth/src/main/java/io/grpc/auth/GoogleAuthLibraryCallCredentials.java @@ -184,7 +184,6 @@ final class GoogleAuthLibraryCallCredentials extends CallCredentials2 { } } - @SuppressWarnings("BetaApi") // BaseEncoding is stable in Guava 20.0 private static Metadata toHeaders(@Nullable Map> metadata) { Metadata headers = new Metadata(); if (metadata != null) { diff --git a/core/src/main/java/io/grpc/Metadata.java b/core/src/main/java/io/grpc/Metadata.java index 89af041c77..7f97f7f61f 100644 --- a/core/src/main/java/io/grpc/Metadata.java +++ b/core/src/main/java/io/grpc/Metadata.java @@ -457,7 +457,6 @@ public final class Metadata { } } - @SuppressWarnings("BetaApi") // BaseEncoding is stable in Guava 20.0 @Override public String toString() { StringBuilder sb = new StringBuilder("Metadata("); diff --git a/core/src/main/java/io/grpc/internal/DnsNameResolver.java b/core/src/main/java/io/grpc/internal/DnsNameResolver.java index 2e0735f109..1b77a8b2f4 100644 --- a/core/src/main/java/io/grpc/internal/DnsNameResolver.java +++ b/core/src/main/java/io/grpc/internal/DnsNameResolver.java @@ -506,7 +506,6 @@ final class DnsNameResolver extends NameResolver { * @return The service config object or {@code null} if this choice does not apply. */ @Nullable - @SuppressWarnings("BetaApi") // Verify isn't all that beta @VisibleForTesting static Map maybeChooseServiceConfig( Map choice, Random random, String hostname) { diff --git a/core/src/main/java/io/grpc/internal/JndiResourceResolverFactory.java b/core/src/main/java/io/grpc/internal/JndiResourceResolverFactory.java index 5e76438b9a..fb8e18d180 100644 --- a/core/src/main/java/io/grpc/internal/JndiResourceResolverFactory.java +++ b/core/src/main/java/io/grpc/internal/JndiResourceResolverFactory.java @@ -204,7 +204,6 @@ final class JndiResourceResolverFactory implements DnsNameResolver.ResourceResol final int port; } - @SuppressWarnings("BetaApi") // Verify is only kinda beta private static SrvRecord parseSrvRecord(String rawRecord) { String[] parts = whitespace.split(rawRecord); Verify.verify(parts.length == 4, "Bad SRV Record: %s", rawRecord); diff --git a/core/src/main/java/io/grpc/internal/ServiceConfigInterceptor.java b/core/src/main/java/io/grpc/internal/ServiceConfigInterceptor.java index 50f888368d..63e92ec709 100644 --- a/core/src/main/java/io/grpc/internal/ServiceConfigInterceptor.java +++ b/core/src/main/java/io/grpc/internal/ServiceConfigInterceptor.java @@ -201,7 +201,6 @@ final class ServiceConfigInterceptor implements ClientInterceptor { .toString(); } - @SuppressWarnings("BetaApi") // Verify is stabilized since Guava v24.0 private static RetryPolicy retryPolicy(Map retryPolicy, int maxAttemptsLimit) { int maxAttempts = checkNotNull( ServiceConfigUtil.getMaxAttemptsFromRetryPolicy(retryPolicy), @@ -249,7 +248,6 @@ final class ServiceConfigInterceptor implements ClientInterceptor { } } - @SuppressWarnings("BetaApi") // Verify is stabilized since Guava v24.0 private static HedgingPolicy hedgingPolicy( Map hedgingPolicy, int maxAttemptsLimit) { int maxAttempts = checkNotNull( @@ -284,7 +282,6 @@ final class ServiceConfigInterceptor implements ClientInterceptor { static final CallOptions.Key HEDGING_POLICY_KEY = CallOptions.Key.create("internal-hedging-policy"); - @SuppressWarnings("BetaApi") // Verify is stabilized since Guava v24.0 @Override public ClientCall interceptCall( final MethodDescriptor method, CallOptions callOptions, Channel next) { diff --git a/core/src/main/java/io/grpc/internal/TransportFrameUtil.java b/core/src/main/java/io/grpc/internal/TransportFrameUtil.java index 71175ae1ba..5185441084 100644 --- a/core/src/main/java/io/grpc/internal/TransportFrameUtil.java +++ b/core/src/main/java/io/grpc/internal/TransportFrameUtil.java @@ -47,7 +47,6 @@ public final class TransportFrameUtil { * * @return the interleaved keys and values. */ - @SuppressWarnings("BetaApi") // BaseEncoding is stable in Guava 20.0 public static byte[][] toHttp2Headers(Metadata headers) { byte[][] serializedHeaders = InternalMetadata.serialize(headers); // TODO(carl-mastrangelo): eventually remove this once all callers are updated. @@ -97,7 +96,6 @@ public final class TransportFrameUtil { * @param http2Headers the interleaved keys and values of HTTP/2-compliant headers * @return the interleaved keys and values in the raw serialized format */ - @SuppressWarnings("BetaApi") // BaseEncoding is stable in Guava 20.0 @CheckReturnValue public static byte[][] toRawSerializedHeaders(byte[][] http2Headers) { for (int i = 0; i < http2Headers.length; i += 2) { diff --git a/netty/src/main/java/io/grpc/netty/GrpcHttp2HeadersUtils.java b/netty/src/main/java/io/grpc/netty/GrpcHttp2HeadersUtils.java index de52f0b043..b0df2aa29f 100644 --- a/netty/src/main/java/io/grpc/netty/GrpcHttp2HeadersUtils.java +++ b/netty/src/main/java/io/grpc/netty/GrpcHttp2HeadersUtils.java @@ -101,7 +101,6 @@ class GrpcHttp2HeadersUtils { values = new AsciiString[numHeadersGuess]; } - @SuppressWarnings("BetaApi") // BaseEncoding is stable in Guava 20.0 protected Http2Headers add(AsciiString name, AsciiString value) { byte[] nameBytes = bytes(name); byte[] valueBytes; diff --git a/netty/src/main/java/io/grpc/netty/NettyClientStream.java b/netty/src/main/java/io/grpc/netty/NettyClientStream.java index de2e8107c0..7659244dbb 100644 --- a/netty/src/main/java/io/grpc/netty/NettyClientStream.java +++ b/netty/src/main/java/io/grpc/netty/NettyClientStream.java @@ -114,7 +114,6 @@ class NettyClientStream extends AbstractClientStream { } private class Sink implements AbstractClientStream.Sink { - @SuppressWarnings("BetaApi") // BaseEncoding is stable in Guava 20.0 @Override public void writeHeaders(Metadata headers, byte[] requestPayload) { // Convert the headers into Netty HTTP/2 headers. diff --git a/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientStream.java b/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientStream.java index e62d0cf3ce..a54feeca14 100644 --- a/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientStream.java +++ b/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientStream.java @@ -139,7 +139,6 @@ class OkHttpClientStream extends AbstractClientStream { } class Sink implements AbstractClientStream.Sink { - @SuppressWarnings("BetaApi") // BaseEncoding is stable in Guava 20.0 @Override public void writeHeaders(Metadata metadata, byte[] payload) { String defaultPath = "/" + method.getFullMethodName(); diff --git a/testing/src/main/java/io/grpc/testing/GrpcCleanupRule.java b/testing/src/main/java/io/grpc/testing/GrpcCleanupRule.java index 82a986f77d..cd0d43010e 100644 --- a/testing/src/main/java/io/grpc/testing/GrpcCleanupRule.java +++ b/testing/src/main/java/io/grpc/testing/GrpcCleanupRule.java @@ -74,7 +74,7 @@ public final class GrpcCleanupRule implements TestRule { * * @return this */ - @SuppressWarnings("BetaApi") // Stopwatch.createUnstarted(Ticker ticker) is not Beta. Test only. + @SuppressWarnings("BetaApi") // Test only. @VisibleForTesting GrpcCleanupRule setTicker(Ticker ticker) { this.stopwatch = Stopwatch.createUnstarted(ticker);