Merge branch 'master' of github.com:googleapis/gax-java into feat/deprecate_isjittered

miraleung · miraleung · commit b454dcecb7db · 2021-02-19T10:53:20.000-08:00
diff --git a/gax-grpc/src/main/java/com/google/api/gax/grpc/GrpcCallContext.java b/gax-grpc/src/main/java/com/google/api/gax/grpc/GrpcCallContext.java
@@ -30,7 +30,6 @@
 package com.google.api.gax.grpc;
 
 import com.google.api.core.BetaApi;
-import com.google.api.core.InternalExtensionOnly;
 import com.google.api.gax.rpc.ApiCallContext;
 import com.google.api.gax.rpc.TransportChannel;
 import com.google.api.gax.rpc.internal.Headers;
@@ -62,7 +61,6 @@
  * and thread safety of the arguments solely depends on the arguments themselves.
  */
 @BetaApi("Reference ApiCallContext instead - this class is likely to experience breaking changes")
-@InternalExtensionOnly
 public final class GrpcCallContext implements ApiCallContext {
   static final CallOptions.Key<ApiTracer> TRACER_KEY = Key.create("gax.tracer");
 
diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ApiMessageHttpRequestFormatter.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ApiMessageHttpRequestFormatter.java
@@ -75,6 +75,7 @@ ApiMessageHttpRequestFormatter.Builder<RequestT> newBuilder() {
     return new ApiMessageHttpRequestFormatter.Builder<>();
   }
 
+  @SuppressWarnings("unchecked")
   @Override
   public Map<String, List<String>> getQueryParamNames(RequestT apiMessage) {
     Set<String> paramNames = getQueryParamNames();
diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ApiMethodDescriptor.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ApiMethodDescriptor.java
@@ -50,7 +50,7 @@ public abstract class ApiMethodDescriptor<RequestT, ResponseT> {
   public abstract String getHttpMethod();
 
   public static <RequestT, ResponseT> Builder<RequestT, ResponseT> newBuilder() {
-    return new AutoValue_ApiMethodDescriptor.Builder();
+    return new AutoValue_ApiMethodDescriptor.Builder<RequestT, ResponseT>();
   }
 
   @AutoValue.Builder
diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonCallContext.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonCallContext.java
@@ -30,7 +30,6 @@
 package com.google.api.gax.httpjson;
 
 import com.google.api.core.BetaApi;
-import com.google.api.core.InternalExtensionOnly;
 import com.google.api.gax.rpc.ApiCallContext;
 import com.google.api.gax.rpc.TransportChannel;
 import com.google.api.gax.rpc.internal.Headers;
@@ -56,7 +55,6 @@
  * arguments solely depends on the arguments themselves.
  */
 @BetaApi
-@InternalExtensionOnly
 public final class HttpJsonCallContext implements ApiCallContext {
   private final HttpJsonChannel channel;
   private final Duration timeout;

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@ ApiMessageHttpRequestFormatter.Builder<RequestT> newBuilder() {`
`75`	`75`	`return new ApiMessageHttpRequestFormatter.Builder<>();`
`76`	`76`	`}`
`77`	`77`
	`78`	`+ @SuppressWarnings("unchecked")`
`78`	`79`	`@Override`
`79`	`80`	`public Map<String, List<String>> getQueryParamNames(RequestT apiMessage) {`
`80`	`81`	`Set<String> paramNames = getQueryParamNames();`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public abstract class ApiMethodDescriptor<RequestT, ResponseT> {`
`50`	`50`	`public abstract String getHttpMethod();`
`51`	`51`
`52`	`52`	`public static <RequestT, ResponseT> Builder<RequestT, ResponseT> newBuilder() {`
`53`		`- return new AutoValue_ApiMethodDescriptor.Builder();`
	`53`	`+ return new AutoValue_ApiMethodDescriptor.Builder<RequestT, ResponseT>();`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`@AutoValue.Builder`