Skip to content

Commit 81c2f0b

Browse files
garrettjonesgooglegarrettjonesgoogle
authored
---
yaml --- r: 8461 b: refs/heads/master c: 60b7912 h: refs/heads/master i: 8459: 69738ab
1 parent 5d55eaa commit 81c2f0b

123 files changed

Lines changed: 5547 additions & 2989 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: ca271453a6d62e302832eef460849812fd7ce4ab
2+
refs/heads/master: 60b791214ef2e950a7eef6c78fb2981df0286d78
33
refs/heads/travis: 47e4fee4fd5af9b2a8ce46f23c72ec95f9b195b2
44
refs/heads/gh-pages: 3e16a39145437096333db5811e5c0292719c1823
55
refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ public BaseGrpcServiceException(ApiException apiException) {
7272
.setMessage(apiException.getMessage())
7373
.setCause(apiException)
7474
.setRetryable(apiException.isRetryable())
75-
.setCode(((GrpcStatusCode) apiException.getStatusCode()).getCode().value())
76-
.setReason(((GrpcStatusCode) apiException.getStatusCode()).getCode().name())
75+
.setCode(apiException.getStatusCode().getCode().getHttpStatusCode())
76+
.setReason(apiException.getStatusCode().getCode().name())
7777
.setLocation(null)
7878
.setDebugInfo(null)
7979
.build());

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

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,17 @@
1818

1919
import static com.google.common.base.MoreObjects.firstNonNull;
2020

21+
import com.google.api.core.BetaApi;
2122
import com.google.api.core.InternalApi;
2223
import com.google.api.gax.core.CredentialsProvider;
23-
import com.google.api.gax.core.GaxProperties;
2424
import com.google.api.gax.core.FixedCredentialsProvider;
25+
import com.google.api.gax.core.GaxProperties;
2526
import com.google.api.gax.core.NoCredentialsProvider;
26-
import com.google.api.gax.grpc.ChannelProvider;
2727
import com.google.api.gax.grpc.GaxGrpcProperties;
28-
import com.google.api.gax.grpc.InstantiatingChannelProvider;
28+
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
2929
import com.google.api.gax.retrying.RetrySettings;
30+
import com.google.api.gax.rpc.ApiClientHeaderProvider;
31+
import com.google.api.gax.rpc.TransportChannelProvider;
3032
import com.google.api.gax.rpc.UnaryCallSettings;
3133
import com.google.auth.Credentials;
3234
import com.google.cloud.NoCredentials;
@@ -189,11 +191,18 @@ public UnaryCallSettings.Builder getApiCallSettings(RetrySettings retrySettings)
189191
/**
190192
* Returns a channel provider from the given default provider.
191193
*/
192-
public static ChannelProvider setUpChannelProvider(
193-
InstantiatingChannelProvider.Builder providerBuilder, ServiceOptions<?, ?> serviceOptions) {
194-
providerBuilder.setEndpoint(serviceOptions.getHost())
195-
.setClientLibHeader(ServiceOptions.getGoogApiClientLibName(),
196-
firstNonNull(serviceOptions.getLibraryVersion(), ""));
194+
@BetaApi
195+
public static TransportChannelProvider setUpChannelProvider(
196+
InstantiatingGrpcChannelProvider.Builder providerBuilder, ServiceOptions<?, ?> serviceOptions) {
197+
providerBuilder.setEndpoint(serviceOptions.getHost());
198+
return providerBuilder.build();
199+
}
200+
201+
@BetaApi
202+
public static ApiClientHeaderProvider setUpHeaderProvider(
203+
ApiClientHeaderProvider.Builder providerBuilder, ServiceOptions<?, ?> serviceOptions) {
204+
providerBuilder.setClientLibHeader(ServiceOptions.getGoogApiClientLibName(),
205+
firstNonNull(serviceOptions.getLibraryVersion(), ""));
197206
return providerBuilder.build();
198207
}
199208

@@ -202,7 +211,7 @@ public static CredentialsProvider setUpCredentialsProvider(ServiceOptions<?, ?>
202211
if (scopedCredentials != null && scopedCredentials != NoCredentials.getInstance()) {
203212
return FixedCredentialsProvider.create(scopedCredentials);
204213
}
205-
return new NoCredentialsProvider();
214+
return NoCredentialsProvider.create();
206215
}
207216

208217

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838

3939
public class BaseGrpcServiceExceptionTest {
4040

41-
private static final int CODE = 1;
4241
private static final String MESSAGE = "some message";
4342
private static final boolean NOT_RETRYABLE = false;
4443
private static final boolean IDEMPOTENT = true;
@@ -81,7 +80,7 @@ public void testBaseServiceException() {
8180
assertFalse(serviceException.isRetryable());
8281
assertEquals(MESSAGE, serviceException.getMessage());
8382
assertEquals(apiException, serviceException.getCause());
84-
assertEquals(Code.INTERNAL.value(), serviceException.getCode());
83+
assertEquals(500, serviceException.getCode());
8584
assertEquals(Code.INTERNAL.name(), serviceException.getReason());
8685
assertNull(serviceException.getLocation());
8786
assertNull(serviceException.getDebugInfo());

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-consumer</artifactId>
6-
<version>0.25.1-alpha-SNAPSHOT</version>
6+
<version>0.26.1-alpha-SNAPSHOT</version>
77
<packaging>pom</packaging>
88
<name>Google Cloud Consumer</name>
99
<url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-consumer</url>
@@ -14,7 +14,7 @@
1414
<dependency>
1515
<groupId>com.google.cloud</groupId>
1616
<artifactId>google-cloud</artifactId>
17-
<version>0.25.0-alpha</version>
17+
<version>0.26.1-alpha-SNAPSHOT</version>
1818
</dependency>
1919
</dependencies>
2020
<build>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-errorreporting-consumer</artifactId>
6-
<version>0.25.1-alpha-SNAPSHOT</version>
6+
<version>0.26.1-alpha-SNAPSHOT</version>
77
<packaging>pom</packaging>
88
<name>Google Cloud Error Reporting Consumer</name>
99
<url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-errorreporting-consumer</url>
@@ -14,7 +14,7 @@
1414
<dependency>
1515
<groupId>com.google.cloud</groupId>
1616
<artifactId>google-cloud-errorreporting</artifactId>
17-
<version>0.25.0-alpha</version>
17+
<version>0.26.1-alpha-SNAPSHOT</version>
1818
</dependency>
1919
</dependencies>
2020
<build>

‎trunk/google-cloud-dep-verification/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-dep-verification</artifactId>
6-
<version>0.25.1-alpha-SNAPSHOT</version>
6+
<version>0.26.1-alpha-SNAPSHOT</version>
77
<packaging>pom</packaging>
88
<name>Google Cloud Dependency Verification</name>
99
<url>https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-dep-verification</url>

‎trunk/google-cloud-dlp/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,12 @@
7979
<version>2.6</version>
8080
<scope>test</scope>
8181
</dependency>
82+
<dependency>
83+
<groupId>com.google.api</groupId>
84+
<artifactId>gax-grpc</artifactId>
85+
<classifier>testlib</classifier>
86+
<scope>test</scope>
87+
</dependency>
8288
</dependencies>
8389
<profiles>
8490
<profile>

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

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
import com.google.api.core.BetaApi;
1919
import com.google.api.gax.core.BackgroundResource;
20+
import com.google.api.gax.longrunning.OperationFuture;
2021
import com.google.api.gax.rpc.OperationCallable;
21-
import com.google.api.gax.rpc.OperationFuture;
2222
import com.google.api.gax.rpc.UnaryCallable;
2323
import com.google.cloud.dlp.v2beta1.stub.DlpServiceStub;
2424
import com.google.longrunning.Operation;
@@ -121,10 +121,8 @@
121121
* <code>
122122
* DlpServiceSettings dlpServiceSettings =
123123
* DlpServiceSettings.newBuilder()
124-
* .setTransportProvider(DlpServiceSettings.defaultGrpcTransportProviderBuilder()
125-
* .setChannelProvider(DlpServiceSettings.defaultGrpcChannelProviderBuilder()
126-
* .setEndpoint(myEndpoint)
127-
* .build())
124+
* .setTransportChannelProvider(DlpServiceSettings.defaultGrpcTransportProviderBuilder()
125+
* .setEndpoint(myEndpoint)
128126
* .build())
129127
* .build();
130128
* DlpServiceClient dlpServiceClient =
@@ -156,6 +154,7 @@ public static final DlpServiceClient create(DlpServiceSettings settings) throws
156154
* Constructs an instance of DlpServiceClient, using the given stub for making calls. This is for
157155
* advanced usage - prefer to use DlpServiceSettings}.
158156
*/
157+
@BetaApi
159158
public static final DlpServiceClient create(DlpServiceStub stub) {
160159
return new DlpServiceClient(stub);
161160
}
@@ -302,8 +301,7 @@ public final DeidentifyContentResponse deidentifyContent(DeidentifyContentReques
302301
* @param sourceTable Input dataset to compute metrics over.
303302
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
304303
*/
305-
public final OperationFuture<
306-
RiskAnalysisOperationResult, RiskAnalysisOperationMetadata, Operation>
304+
public final OperationFuture<RiskAnalysisOperationResult, RiskAnalysisOperationMetadata>
307305
analyzeDataSourceRiskAsync(PrivacyMetric privacyMetric, BigQueryTable sourceTable) {
308306

309307
AnalyzeDataSourceRiskRequest request =
@@ -336,8 +334,7 @@ public final DeidentifyContentResponse deidentifyContent(DeidentifyContentReques
336334
* @param request The request object containing all of the parameters for the API call.
337335
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
338336
*/
339-
public final OperationFuture<
340-
RiskAnalysisOperationResult, RiskAnalysisOperationMetadata, Operation>
337+
public final OperationFuture<RiskAnalysisOperationResult, RiskAnalysisOperationMetadata>
341338
analyzeDataSourceRiskAsync(AnalyzeDataSourceRiskRequest request) {
342339
return analyzeDataSourceRiskOperationCallable().futureCall(request);
343340
}
@@ -364,8 +361,7 @@ public final DeidentifyContentResponse deidentifyContent(DeidentifyContentReques
364361
* </code></pre>
365362
*/
366363
public final OperationCallable<
367-
AnalyzeDataSourceRiskRequest, RiskAnalysisOperationResult, RiskAnalysisOperationMetadata,
368-
Operation>
364+
AnalyzeDataSourceRiskRequest, RiskAnalysisOperationResult, RiskAnalysisOperationMetadata>
369365
analyzeDataSourceRiskOperationCallable() {
370366
return stub.analyzeDataSourceRiskOperationCallable();
371367
}
@@ -711,7 +707,7 @@ public final UnaryCallable<RedactContentRequest, RedactContentResponse> redactCo
711707
* @param outputConfig Optional location to store findings.
712708
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
713709
*/
714-
public final OperationFuture<InspectOperationResult, InspectOperationMetadata, Operation>
710+
public final OperationFuture<InspectOperationResult, InspectOperationMetadata>
715711
createInspectOperationAsync(
716712
InspectConfig inspectConfig,
717713
StorageConfig storageConfig,
@@ -765,7 +761,7 @@ public final UnaryCallable<RedactContentRequest, RedactContentResponse> redactCo
765761
* @param request The request object containing all of the parameters for the API call.
766762
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
767763
*/
768-
public final OperationFuture<InspectOperationResult, InspectOperationMetadata, Operation>
764+
public final OperationFuture<InspectOperationResult, InspectOperationMetadata>
769765
createInspectOperationAsync(CreateInspectOperationRequest request) {
770766
return createInspectOperationOperationCallable().futureCall(request);
771767
}
@@ -809,8 +805,7 @@ public final UnaryCallable<RedactContentRequest, RedactContentResponse> redactCo
809805
* </code></pre>
810806
*/
811807
public final OperationCallable<
812-
CreateInspectOperationRequest, InspectOperationResult, InspectOperationMetadata,
813-
Operation>
808+
CreateInspectOperationRequest, InspectOperationResult, InspectOperationMetadata>
814809
createInspectOperationOperationCallable() {
815810
return stub.createInspectOperationOperationCallable();
816811
}

0 commit comments

Comments
 (0)