diff --git a/coverage-report/pom.xml b/coverage-report/pom.xml index b44c2a4baa..b787ec5a63 100644 --- a/coverage-report/pom.xml +++ b/coverage-report/pom.xml @@ -41,7 +41,7 @@ com.google.api gax-httpjson - 0.114.1-SNAPSHOT + 2.29.1-SNAPSHOT com.google.api diff --git a/gapic-generator-java/pom.xml b/gapic-generator-java/pom.xml index c8f88c6d14..df18381fd4 100644 --- a/gapic-generator-java/pom.xml +++ b/gapic-generator-java/pom.xml @@ -382,7 +382,6 @@ com.google.guava guava - 31.1-jre com.google.api diff --git a/gax-java/dependencies.properties b/gax-java/dependencies.properties index d8d4e3f82c..ab8f4ee706 100644 --- a/gax-java/dependencies.properties +++ b/gax-java/dependencies.properties @@ -16,8 +16,8 @@ version.gax_grpc=2.29.1-SNAPSHOT # {x-version-update-start:gax:current} version.gax_bom=2.29.1-SNAPSHOT # {x-version-update-end} -# {x-version-update-start:gax-httpjson:current} -version.gax_httpjson=0.114.1-SNAPSHOT +# {x-version-update-start:gax:current} +version.gax_httpjson=2.29.1-SNAPSHOT # {x-version-update-end} # Versions for dependencies which actual artifacts differ between Bazel and Gradle. diff --git a/gax-java/gax-bom/pom.xml b/gax-java/gax-bom/pom.xml index 561b67f1e3..f4842e774c 100644 --- a/gax-java/gax-bom/pom.xml +++ b/gax-java/gax-bom/pom.xml @@ -79,19 +79,19 @@ com.google.api gax-httpjson - 0.114.1-SNAPSHOT + 2.29.1-SNAPSHOT com.google.api gax-httpjson - 0.114.1-SNAPSHOT + 2.29.1-SNAPSHOT test-jar testlib com.google.api gax-httpjson - 0.114.1-SNAPSHOT + 2.29.1-SNAPSHOT testlib diff --git a/gax-java/gax-httpjson/pom.xml b/gax-java/gax-httpjson/pom.xml index fd027d4294..fec3375fdb 100644 --- a/gax-java/gax-httpjson/pom.xml +++ b/gax-java/gax-httpjson/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax-httpjson - 0.114.1-SNAPSHOT + 2.29.1-SNAPSHOT jar GAX (Google Api eXtensions) for Java (HTTP JSON) Google Api eXtensions for Java (HTTP JSON) diff --git a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ApiMethodDescriptor.java b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ApiMethodDescriptor.java index 6952f48859..69e2e0fff7 100644 --- a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ApiMethodDescriptor.java +++ b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ApiMethodDescriptor.java @@ -29,11 +29,9 @@ */ package com.google.api.gax.httpjson; -import com.google.api.core.BetaApi; import com.google.auto.value.AutoValue; import javax.annotation.Nullable; -@BetaApi @AutoValue /* Method descriptor for messages to be transmitted over HTTP. */ public abstract class ApiMethodDescriptor { diff --git a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ForwardingHttpJsonClientCall.java b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ForwardingHttpJsonClientCall.java index 8539b2b505..09e97a61c8 100644 --- a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ForwardingHttpJsonClientCall.java +++ b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ForwardingHttpJsonClientCall.java @@ -29,14 +29,12 @@ */ package com.google.api.gax.httpjson; -import com.google.api.core.BetaApi; import javax.annotation.Nullable; /** * A {@link HttpJsonClientCall} which forwards all of its methods to another {@link * HttpJsonClientCall}. */ -@BetaApi public abstract class ForwardingHttpJsonClientCall extends HttpJsonClientCall { diff --git a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ForwardingHttpJsonClientCallListener.java b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ForwardingHttpJsonClientCallListener.java index 8c64b957f6..1d6eb2599a 100644 --- a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ForwardingHttpJsonClientCallListener.java +++ b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ForwardingHttpJsonClientCallListener.java @@ -30,13 +30,10 @@ package com.google.api.gax.httpjson; -import com.google.api.core.BetaApi; - /** * A {@link HttpJsonClientCall.Listener} which forwards all of its methods to another {@link * HttpJsonClientCall.Listener}. */ -@BetaApi public abstract class ForwardingHttpJsonClientCallListener extends HttpJsonClientCall.Listener { diff --git a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonCallContext.java b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonCallContext.java index 469435d607..2d06244bf1 100644 --- a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonCallContext.java +++ b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonCallContext.java @@ -59,7 +59,6 @@ * copies of the object, but with one field changed. The immutability and thread safety of the * arguments solely depends on the arguments themselves. */ -@BetaApi("Reference ApiCallContext instead - this class is likely to experience breaking changes") public final class HttpJsonCallContext implements ApiCallContext { private final HttpJsonChannel channel; private final HttpJsonCallOptions callOptions; diff --git a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonCallOptions.java b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonCallOptions.java index dfe3258465..df2ca03edc 100644 --- a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonCallOptions.java +++ b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonCallOptions.java @@ -29,7 +29,6 @@ */ package com.google.api.gax.httpjson; -import com.google.api.core.BetaApi; import com.google.auth.Credentials; import com.google.auto.value.AutoValue; import com.google.protobuf.TypeRegistry; @@ -38,7 +37,6 @@ import org.threeten.bp.Instant; /** Options for an http-json call, including deadline and credentials. */ -@BetaApi @AutoValue public abstract class HttpJsonCallOptions { public static final HttpJsonCallOptions DEFAULT = newBuilder().build(); diff --git a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonChannel.java b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonChannel.java index 96db96b469..bea8c5ea80 100644 --- a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonChannel.java +++ b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonChannel.java @@ -29,10 +29,7 @@ */ package com.google.api.gax.httpjson; -import com.google.api.core.BetaApi; - /** HttpJsonChannel contains the functionality to issue http-json calls. */ -@BetaApi public interface HttpJsonChannel { HttpJsonClientCall newCall( ApiMethodDescriptor methodDescriptor, HttpJsonCallOptions callOptions); diff --git a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonClientCall.java b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonClientCall.java index 16ecd67952..e70a6eb857 100644 --- a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonClientCall.java +++ b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonClientCall.java @@ -29,7 +29,6 @@ */ package com.google.api.gax.httpjson; -import com.google.api.core.BetaApi; import javax.annotation.Nullable; // This class mimics the structure and behavior of the corresponding ClientCall from gRPC package as @@ -58,7 +57,6 @@ * @param type of message sent to the server * @param type of message received one or more times from the server */ -@BetaApi public abstract class HttpJsonClientCall { /** * Callbacks for receiving metadata, response messages and completion status from the server. @@ -67,7 +65,6 @@ public abstract class HttpJsonClientCall { * not required to be thread-safe, but they must not be thread-hostile. The caller is free to call * an instance from multiple threads, but only one call simultaneously. */ - @BetaApi public abstract static class Listener { /** * The response headers have been received. Headers always precede messages. diff --git a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonClientInterceptor.java b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonClientInterceptor.java index 446fe09f29..08dbe2970b 100644 --- a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonClientInterceptor.java +++ b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonClientInterceptor.java @@ -29,8 +29,6 @@ */ package com.google.api.gax.httpjson; -import com.google.api.core.BetaApi; - /** * Interface for intercepting outgoing calls before they are dispatched by a {@link * HttpJsonChannel}. @@ -38,7 +36,6 @@ *

The interceptor may be called for multiple {@link HttpJsonClientCall calls} by one or more * threads without completing the previous ones first. The implementations must be thread-safe. */ -@BetaApi public interface HttpJsonClientInterceptor { /** * Intercept {@link HttpJsonClientCall} creation by the {@code next} {@link HttpJsonChannel}. diff --git a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonHeaderEnhancer.java b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonHeaderEnhancer.java index 897fecf8f2..0efa599b8b 100644 --- a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonHeaderEnhancer.java +++ b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonHeaderEnhancer.java @@ -30,10 +30,8 @@ package com.google.api.gax.httpjson; import com.google.api.client.http.HttpHeaders; -import com.google.api.core.BetaApi; /** Interface for functionality to enhance headers for an http-json call. */ -@BetaApi public interface HttpJsonHeaderEnhancer { void enhance(HttpHeaders headers); } diff --git a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonHeaderEnhancers.java b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonHeaderEnhancers.java index 3d3deda300..074cfc29b2 100644 --- a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonHeaderEnhancers.java +++ b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonHeaderEnhancers.java @@ -30,10 +30,8 @@ package com.google.api.gax.httpjson; import com.google.api.client.http.HttpHeaders; -import com.google.api.core.BetaApi; /** Utility class that creates instances of {@link HttpJsonHeaderEnhancer}. */ -@BetaApi public class HttpJsonHeaderEnhancers { private HttpJsonHeaderEnhancers() {} diff --git a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonInterceptorProvider.java b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonInterceptorProvider.java index 4c5ddb4750..e8bb906d69 100644 --- a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonInterceptorProvider.java +++ b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonInterceptorProvider.java @@ -29,12 +29,9 @@ */ package com.google.api.gax.httpjson; -import com.google.api.core.BetaApi; import java.util.List; /** Provider of custom REST ClientInterceptors. */ -@BetaApi( - "The surface for adding custom interceptors is not stable yet and may change in the future.") public interface HttpJsonInterceptorProvider { /** diff --git a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonMetadata.java b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonMetadata.java index 7985396075..558217a9b0 100644 --- a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonMetadata.java +++ b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonMetadata.java @@ -29,7 +29,6 @@ */ package com.google.api.gax.httpjson; -import com.google.api.core.BetaApi; import com.google.api.core.InternalExtensionOnly; import com.google.auto.value.AutoValue; import java.util.Collections; @@ -39,7 +38,6 @@ import javax.annotation.Nullable; @AutoValue -@BetaApi @InternalExtensionOnly public abstract class HttpJsonMetadata { public abstract Map getHeaders(); diff --git a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonOperationSnapshot.java b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonOperationSnapshot.java index 1e616a31a2..599f2e231c 100644 --- a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonOperationSnapshot.java +++ b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonOperationSnapshot.java @@ -29,7 +29,6 @@ */ package com.google.api.gax.httpjson; -import com.google.api.core.BetaApi; import com.google.api.core.InternalApi; import com.google.api.gax.longrunning.OperationSnapshot; import com.google.api.gax.rpc.StatusCode; @@ -41,7 +40,6 @@ * *

Public for technical reasons. For internal use only. */ -@BetaApi @InternalApi public class HttpJsonOperationSnapshot implements OperationSnapshot { private final String name; diff --git a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonOperationSnapshotCallable.java b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonOperationSnapshotCallable.java index 58f99064ac..c0a61a5213 100644 --- a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonOperationSnapshotCallable.java +++ b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonOperationSnapshotCallable.java @@ -34,7 +34,6 @@ import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; -import com.google.api.core.BetaApi; import com.google.api.core.InternalApi; import com.google.api.gax.longrunning.OperationSnapshot; import com.google.api.gax.rpc.ApiCallContext; @@ -46,7 +45,6 @@ * *

Public for technical reasons. For internal use only. */ -@BetaApi @InternalApi public class HttpJsonOperationSnapshotCallable extends UnaryCallable { diff --git a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonStatusCode.java b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonStatusCode.java index 617496eb57..ab680db169 100644 --- a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonStatusCode.java +++ b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonStatusCode.java @@ -29,13 +29,11 @@ */ package com.google.api.gax.httpjson; -import com.google.api.core.BetaApi; import com.google.api.core.InternalExtensionOnly; import com.google.api.gax.rpc.StatusCode; import java.util.Objects; /** A failure code specific to an HTTP call. */ -@BetaApi @InternalExtensionOnly public class HttpJsonStatusCode implements StatusCode { private final int httpStatus; diff --git a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpRequestFormatter.java b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpRequestFormatter.java index a60bf08e9f..c85307d4cd 100644 --- a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpRequestFormatter.java +++ b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpRequestFormatter.java @@ -29,7 +29,6 @@ */ package com.google.api.gax.httpjson; -import com.google.api.core.BetaApi; import com.google.api.pathtemplate.PathTemplate; import java.util.Collections; import java.util.List; @@ -52,7 +51,6 @@ public interface HttpRequestFormatter { PathTemplate getPathTemplate(); /** Additional (alternative) path templates for endpoint URL path. */ - @BetaApi default List getAdditionalPathTemplates() { return Collections.emptyList(); } diff --git a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/InstantiatingHttpJsonChannelProvider.java b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/InstantiatingHttpJsonChannelProvider.java index c9dd85442e..6d464bf992 100644 --- a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/InstantiatingHttpJsonChannelProvider.java +++ b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/InstantiatingHttpJsonChannelProvider.java @@ -31,7 +31,6 @@ import com.google.api.client.http.HttpTransport; import com.google.api.client.http.javanet.NetHttpTransport; -import com.google.api.core.BetaApi; import com.google.api.core.InternalExtensionOnly; import com.google.api.gax.core.ExecutorProvider; import com.google.api.gax.rpc.FixedHeaderProvider; @@ -59,7 +58,6 @@ *

The client lib header and generator header values are used to form a value that goes into the * http header of requests to the service. */ -@BetaApi @InternalExtensionOnly public final class InstantiatingHttpJsonChannelProvider implements TransportChannelProvider { diff --git a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ManagedHttpJsonChannel.java b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ManagedHttpJsonChannel.java index 22e333752a..7a2e7a2f26 100644 --- a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ManagedHttpJsonChannel.java +++ b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ManagedHttpJsonChannel.java @@ -31,7 +31,6 @@ import com.google.api.client.http.HttpTransport; import com.google.api.client.http.javanet.NetHttpTransport; -import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.core.InstantiatingExecutorProvider; import com.google.common.annotations.VisibleForTesting; @@ -45,7 +44,6 @@ import javax.annotation.Nullable; /** Implementation of HttpJsonChannel which can issue http-json calls. */ -@BetaApi public class ManagedHttpJsonChannel implements HttpJsonChannel, BackgroundResource { private final Executor executor; diff --git a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ManagedHttpJsonInterceptorChannel.java b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ManagedHttpJsonInterceptorChannel.java index 56ab5a5abb..3e71031f1c 100644 --- a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ManagedHttpJsonInterceptorChannel.java +++ b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ManagedHttpJsonInterceptorChannel.java @@ -29,11 +29,9 @@ */ package com.google.api.gax.httpjson; -import com.google.api.core.BetaApi; import com.google.common.annotations.VisibleForTesting; import java.util.concurrent.TimeUnit; -@BetaApi class ManagedHttpJsonInterceptorChannel extends ManagedHttpJsonChannel { private final ManagedHttpJsonChannel channel; diff --git a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ProtoMessageRequestFormatter.java b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ProtoMessageRequestFormatter.java index c9153e4b26..aa3db693f5 100644 --- a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ProtoMessageRequestFormatter.java +++ b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ProtoMessageRequestFormatter.java @@ -29,7 +29,6 @@ */ package com.google.api.gax.httpjson; -import com.google.api.core.BetaApi; import com.google.api.core.InternalApi; import com.google.api.pathtemplate.PathTemplate; import com.google.protobuf.Message; @@ -121,7 +120,6 @@ public String getPath(RequestT apiMessage) { return path; } - @BetaApi @Override public List getAdditionalPathTemplates() { return additionalPathTemplates; @@ -161,7 +159,6 @@ public Builder setPath( return this; } - @BetaApi public Builder setAdditionalPaths(String... rawAdditionalPaths) { this.rawAdditionalPaths = Arrays.asList(rawAdditionalPaths); return this; diff --git a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ProtoRestSerializer.java b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ProtoRestSerializer.java index 0c5158f76e..af4068c438 100644 --- a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ProtoRestSerializer.java +++ b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/ProtoRestSerializer.java @@ -29,7 +29,6 @@ */ package com.google.api.gax.httpjson; -import com.google.api.core.BetaApi; import com.google.common.collect.ImmutableList; import com.google.gson.JsonElement; import com.google.gson.JsonParser; @@ -50,7 +49,6 @@ * URL path parameters, and query parameters. It deserializes JSON responses into response protobuf * message. */ -@BetaApi public class ProtoRestSerializer { private final TypeRegistry registry; diff --git a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/RestSerializationException.java b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/RestSerializationException.java index 7f5252595d..cbf1372387 100644 --- a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/RestSerializationException.java +++ b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/RestSerializationException.java @@ -29,13 +29,10 @@ */ package com.google.api.gax.httpjson; -import com.google.api.core.BetaApi; - /** * An exception thrown when a protobuf message cannot be serialized/deserialized for REST * interactions. */ -@BetaApi public class RestSerializationException extends RuntimeException { private static final long serialVersionUID = -6485633460933364916L; diff --git a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/OperationsClient.java b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/OperationsClient.java index fe5093c19a..71982aacd0 100644 --- a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/OperationsClient.java +++ b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/OperationsClient.java @@ -32,7 +32,6 @@ import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; -import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.httpjson.longrunning.stub.OperationsStub; import com.google.api.gax.httpjson.longrunning.stub.OperationsStubSettings; @@ -120,7 +119,6 @@ * *

Please refer to the GitHub repository's samples for more quickstart code snippets. */ -@BetaApi public class OperationsClient implements BackgroundResource { private final OperationsSettings settings; private final OperationsStub stub; @@ -163,7 +161,6 @@ protected OperationsClient(OperationsSettings settings) throws IOException { this.stub = ((OperationsStubSettings) settings.getStubSettings()).createStub(); } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") protected OperationsClient(OperationsStub stub) { this.settings = null; this.stub = stub; @@ -173,7 +170,6 @@ public final OperationsSettings getSettings() { return settings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public OperationsStub getStub() { return stub; } diff --git a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/OperationsSettings.java b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/OperationsSettings.java index 58aff3d7cd..99cbc48d92 100644 --- a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/OperationsSettings.java +++ b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/OperationsSettings.java @@ -32,7 +32,6 @@ import static com.google.api.gax.httpjson.longrunning.OperationsClient.ListOperationsPagedResponse; import com.google.api.core.ApiFunction; -import com.google.api.core.BetaApi; import com.google.api.gax.core.GoogleCredentialsProvider; import com.google.api.gax.core.InstantiatingExecutorProvider; import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider; @@ -84,7 +83,6 @@ * OperationsSettings operationsSettings = operationsSettingsBuilder.build(); * } */ -@BetaApi public class OperationsSettings extends ClientSettings { /** Returns the object with the settings used for calls to listOperations. */ diff --git a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/HttpJsonOperationsCallableFactory.java b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/HttpJsonOperationsCallableFactory.java index 9d8a435d8a..176e6e98c6 100644 --- a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/HttpJsonOperationsCallableFactory.java +++ b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/HttpJsonOperationsCallableFactory.java @@ -29,7 +29,6 @@ */ package com.google.api.gax.httpjson.longrunning.stub; -import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.httpjson.HttpJsonCallSettings; import com.google.api.gax.httpjson.HttpJsonCallableFactory; @@ -49,7 +48,6 @@ * *

This class is for advanced usage. */ -@BetaApi public class HttpJsonOperationsCallableFactory implements HttpJsonStubCallableFactory { diff --git a/java-common-protos/pom.xml b/java-common-protos/pom.xml index dc335eb084..341f68745e 100644 --- a/java-common-protos/pom.xml +++ b/java-common-protos/pom.xml @@ -54,7 +54,6 @@ github google-iam-parent 4.13.2 - 31.1-jre diff --git a/java-shared-dependencies/dependency-convergence-check/pom.xml b/java-shared-dependencies/dependency-convergence-check/pom.xml index 78d501cc4e..5a1e1d82cb 100644 --- a/java-shared-dependencies/dependency-convergence-check/pom.xml +++ b/java-shared-dependencies/dependency-convergence-check/pom.xml @@ -17,11 +17,22 @@ 1.8 + + + + com.google.cloud + google-cloud-shared-dependencies + 3.11.1-SNAPSHOT + pom + import + + + + com.google.guava guava - 31.0.1-jre test @@ -33,6 +44,7 @@ junit junit + 4.13.2 test diff --git a/rules_java_gapic/java_gapic_pkg.bzl b/rules_java_gapic/java_gapic_pkg.bzl index d6b7e7d66a..e41c94cb6d 100644 --- a/rules_java_gapic/java_gapic_pkg.bzl +++ b/rules_java_gapic/java_gapic_pkg.bzl @@ -25,7 +25,8 @@ def _wrapPropertyNamesInBraces(properties): # the version of protobuf defined in googleapis is higher than protobuf # defined in gax-java/dependencies.properties, use this replacement to # sync the two versions. -SYNCED_PROPERTIES = PROPERTIES | {"version.com_google_protobuf": PROTOBUF_JAVA_VERSION} +SYNCED_PROPERTIES = dict(PROPERTIES) +SYNCED_PROPERTIES.update({"version.com_google_protobuf": PROTOBUF_JAVA_VERSION}) _PROPERTIES = _wrapPropertyNamesInBraces(SYNCED_PROPERTIES) # ======================================================================== diff --git a/versions.txt b/versions.txt index 71d6dcd6df..a67011deb2 100644 --- a/versions.txt +++ b/versions.txt @@ -5,7 +5,7 @@ gapic-generator-java:2.21.0:2.21.1-SNAPSHOT api-common:2.12.0:2.12.1-SNAPSHOT gax:2.29.0:2.29.1-SNAPSHOT gax-grpc:2.29.0:2.29.1-SNAPSHOT -gax-httpjson:0.114.0:0.114.1-SNAPSHOT +gax-httpjson:0.114.0:2.29.1-SNAPSHOT proto-google-common-protos:2.20.0:2.20.1-SNAPSHOT grpc-google-common-protos:2.20.0:2.20.1-SNAPSHOT proto-google-iam-v1:1.15.0:1.15.1-SNAPSHOT