Regenerating clients (breaking changes) (googleapis#2564)

Author: garrettjonesgoogle

google-cloud-core-grpc/src/main/java/com/google/cloud/grpc/BaseGrpcServiceException.java

@@ -72,8 +72,8 @@ public BaseGrpcServiceException(ApiException apiException) {
         .setMessage(apiException.getMessage())
         .setCause(apiException)
         .setRetryable(apiException.isRetryable())
-        .setCode(((GrpcStatusCode) apiException.getStatusCode()).getCode().value())
-        .setReason(((GrpcStatusCode) apiException.getStatusCode()).getCode().name())
+        .setCode(apiException.getStatusCode().getCode().getHttpStatusCode())
+        .setReason(apiException.getStatusCode().getCode().name())
         .setLocation(null)
         .setDebugInfo(null)
         .build());

google-cloud-core-grpc/src/main/java/com/google/cloud/grpc/GrpcTransportOptions.java

@@ -18,15 +18,17 @@
 
 import static com.google.common.base.MoreObjects.firstNonNull;
 
+import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
 import com.google.api.gax.core.CredentialsProvider;
-import com.google.api.gax.core.GaxProperties;
 import com.google.api.gax.core.FixedCredentialsProvider;
+import com.google.api.gax.core.GaxProperties;
 import com.google.api.gax.core.NoCredentialsProvider;
-import com.google.api.gax.grpc.ChannelProvider;
 import com.google.api.gax.grpc.GaxGrpcProperties;
-import com.google.api.gax.grpc.InstantiatingChannelProvider;
+import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
 import com.google.api.gax.retrying.RetrySettings;
+import com.google.api.gax.rpc.ApiClientHeaderProvider;
+import com.google.api.gax.rpc.TransportChannelProvider;
 import com.google.api.gax.rpc.UnaryCallSettings;
 import com.google.auth.Credentials;
 import com.google.cloud.NoCredentials;
@@ -189,11 +191,18 @@ public UnaryCallSettings.Builder getApiCallSettings(RetrySettings retrySettings)
   /**
    * Returns a channel provider from the given default provider.
    */
-  public static ChannelProvider setUpChannelProvider(
-      InstantiatingChannelProvider.Builder providerBuilder, ServiceOptions<?, ?> serviceOptions) {
-    providerBuilder.setEndpoint(serviceOptions.getHost())
-        .setClientLibHeader(ServiceOptions.getGoogApiClientLibName(),
-            firstNonNull(serviceOptions.getLibraryVersion(), ""));
+  @BetaApi
+  public static TransportChannelProvider setUpChannelProvider(
+      InstantiatingGrpcChannelProvider.Builder providerBuilder, ServiceOptions<?, ?> serviceOptions) {
+    providerBuilder.setEndpoint(serviceOptions.getHost());
+    return providerBuilder.build();
+  }
+
+  @BetaApi
+  public static ApiClientHeaderProvider setUpHeaderProvider(
+      ApiClientHeaderProvider.Builder providerBuilder, ServiceOptions<?, ?> serviceOptions) {
+    providerBuilder.setClientLibHeader(ServiceOptions.getGoogApiClientLibName(),
+        firstNonNull(serviceOptions.getLibraryVersion(), ""));
     return providerBuilder.build();
   }
 
@@ -202,7 +211,7 @@ public static CredentialsProvider setUpCredentialsProvider(ServiceOptions<?, ?>
      if (scopedCredentials != null && scopedCredentials != NoCredentials.getInstance()) {
        return FixedCredentialsProvider.create(scopedCredentials);
      }
-     return new NoCredentialsProvider();
+     return NoCredentialsProvider.create();
   }
 
 

google-cloud-core-grpc/src/test/java/com/google/cloud/grpc/BaseGrpcServiceExceptionTest.java

@@ -38,7 +38,6 @@
 
 public class BaseGrpcServiceExceptionTest {
 
-  private static final int CODE = 1;
   private static final String MESSAGE = "some message";
   private static final boolean NOT_RETRYABLE = false;
   private static final boolean IDEMPOTENT = true;
@@ -81,7 +80,7 @@ public void testBaseServiceException() {
     assertFalse(serviceException.isRetryable());
     assertEquals(MESSAGE, serviceException.getMessage());
     assertEquals(apiException, serviceException.getCause());
-    assertEquals(Code.INTERNAL.value(), serviceException.getCode());
+    assertEquals(500, serviceException.getCode());
     assertEquals(Code.INTERNAL.name(), serviceException.getReason());
     assertNull(serviceException.getLocation());
     assertNull(serviceException.getDebugInfo());

google-cloud-dep-verification/google-cloud-consumer/pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-consumer</artifactId>
-  <version>0.25.1-alpha-SNAPSHOT</version>
+  <version>0.26.1-alpha-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Google Cloud Consumer</name>
   <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-consumer</url>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud</artifactId>
-      <version>0.25.0-alpha</version>
+      <version>0.26.1-alpha-SNAPSHOT</version>
     </dependency>
   </dependencies>
   <build>

google-cloud-dep-verification/google-cloud-errorreporting-consumer/pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-errorreporting-consumer</artifactId>
-  <version>0.25.1-alpha-SNAPSHOT</version>
+  <version>0.26.1-alpha-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Google Cloud Error Reporting Consumer</name>
   <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-errorreporting-consumer</url>
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-errorreporting</artifactId>
-      <version>0.25.0-alpha</version>
+      <version>0.26.1-alpha-SNAPSHOT</version>
     </dependency>
   </dependencies>
   <build>

google-cloud-dep-verification/pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-dep-verification</artifactId>
-  <version>0.25.1-alpha-SNAPSHOT</version>
+  <version>0.26.1-alpha-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Google Cloud Dependency Verification</name>
   <url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-dep-verification</url>

google-cloud-dlp/pom.xml

@@ -79,6 +79,12 @@
       <version>2.6</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.api</groupId>
+      <artifactId>gax-grpc</artifactId>
+      <classifier>testlib</classifier>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <profiles>
     <profile>

google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2beta1/DlpServiceClient.java

@@ -17,8 +17,8 @@
 
 import com.google.api.core.BetaApi;
 import com.google.api.gax.core.BackgroundResource;
+import com.google.api.gax.longrunning.OperationFuture;
 import com.google.api.gax.rpc.OperationCallable;
-import com.google.api.gax.rpc.OperationFuture;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.dlp.v2beta1.stub.DlpServiceStub;
 import com.google.longrunning.Operation;
@@ -121,10 +121,8 @@
  * <code>
  * DlpServiceSettings dlpServiceSettings =
  *     DlpServiceSettings.newBuilder()
- *         .setTransportProvider(DlpServiceSettings.defaultGrpcTransportProviderBuilder()
- *             .setChannelProvider(DlpServiceSettings.defaultGrpcChannelProviderBuilder()
- *                 .setEndpoint(myEndpoint)
- *                 .build())
+ *         .setTransportChannelProvider(DlpServiceSettings.defaultGrpcTransportProviderBuilder()
+ *             .setEndpoint(myEndpoint)
  *             .build())
  *         .build();
  * DlpServiceClient dlpServiceClient =
@@ -156,6 +154,7 @@ public static final DlpServiceClient create(DlpServiceSettings settings) throws
    * Constructs an instance of DlpServiceClient, using the given stub for making calls. This is for
    * advanced usage - prefer to use DlpServiceSettings}.
    */
+  @BetaApi
   public static final DlpServiceClient create(DlpServiceStub stub) {
     return new DlpServiceClient(stub);
   }
@@ -302,8 +301,7 @@ public final DeidentifyContentResponse deidentifyContent(DeidentifyContentReques
    * @param sourceTable Input dataset to compute metrics over.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final OperationFuture<
-          RiskAnalysisOperationResult, RiskAnalysisOperationMetadata, Operation>
+  public final OperationFuture<RiskAnalysisOperationResult, RiskAnalysisOperationMetadata>
       analyzeDataSourceRiskAsync(PrivacyMetric privacyMetric, BigQueryTable sourceTable) {
 
     AnalyzeDataSourceRiskRequest request =
@@ -336,8 +334,7 @@ public final DeidentifyContentResponse deidentifyContent(DeidentifyContentReques
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final OperationFuture<
-          RiskAnalysisOperationResult, RiskAnalysisOperationMetadata, Operation>
+  public final OperationFuture<RiskAnalysisOperationResult, RiskAnalysisOperationMetadata>
       analyzeDataSourceRiskAsync(AnalyzeDataSourceRiskRequest request) {
     return analyzeDataSourceRiskOperationCallable().futureCall(request);
   }
@@ -364,8 +361,7 @@ public final DeidentifyContentResponse deidentifyContent(DeidentifyContentReques
    * </code></pre>
    */
   public final OperationCallable<
-          AnalyzeDataSourceRiskRequest, RiskAnalysisOperationResult, RiskAnalysisOperationMetadata,
-          Operation>
+          AnalyzeDataSourceRiskRequest, RiskAnalysisOperationResult, RiskAnalysisOperationMetadata>
       analyzeDataSourceRiskOperationCallable() {
     return stub.analyzeDataSourceRiskOperationCallable();
   }
@@ -711,7 +707,7 @@ public final UnaryCallable<RedactContentRequest, RedactContentResponse> redactCo
    * @param outputConfig Optional location to store findings.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final OperationFuture<InspectOperationResult, InspectOperationMetadata, Operation>
+  public final OperationFuture<InspectOperationResult, InspectOperationMetadata>
       createInspectOperationAsync(
           InspectConfig inspectConfig,
           StorageConfig storageConfig,
@@ -765,7 +761,7 @@ public final UnaryCallable<RedactContentRequest, RedactContentResponse> redactCo
    * @param request The request object containing all of the parameters for the API call.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final OperationFuture<InspectOperationResult, InspectOperationMetadata, Operation>
+  public final OperationFuture<InspectOperationResult, InspectOperationMetadata>
       createInspectOperationAsync(CreateInspectOperationRequest request) {
     return createInspectOperationOperationCallable().futureCall(request);
   }
@@ -809,8 +805,7 @@ public final UnaryCallable<RedactContentRequest, RedactContentResponse> redactCo
    * </code></pre>
    */
   public final OperationCallable<
-          CreateInspectOperationRequest, InspectOperationResult, InspectOperationMetadata,
-          Operation>
+          CreateInspectOperationRequest, InspectOperationResult, InspectOperationMetadata>
       createInspectOperationOperationCallable() {
     return stub.createInspectOperationOperationCallable();
   }