Skip to content

Commit 87077d0

Browse files
schmidt-sebastianschmidt-sebastian
committed
---
yaml --- r: 8467 b: refs/heads/master c: 37b6dcf h: refs/heads/master i: 8465: 488a468 8463: ce3c968
1 parent 44db8e5 commit 87077d0

213 files changed

Lines changed: 3690 additions & 5176 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: 2e608b89b0f790acc30ee9481697f8b29ff0186a
2+
refs/heads/master: 37b6dcfc4e5319eebf6b548fbcc9c9f00fbd167e
33
refs/heads/travis: 47e4fee4fd5af9b2a8ce46f23c72ec95f9b195b2
44
refs/heads/gh-pages: 3e16a39145437096333db5811e5c0292719c1823
55
refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444

‎trunk/google-cloud-contrib/google-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/testing/FakeStorageRpc.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -343,27 +343,27 @@ public RewriteResponse continueRewrite(RewriteResponse previousResponse) throws
343343
}
344344

345345
@Override
346-
public BucketAccessControl getAcl(String bucket, String entity, Map<Option, ?> options) {
346+
public BucketAccessControl getAcl(String bucket, String entity) {
347347
throw new UnsupportedOperationException();
348348
}
349349

350350
@Override
351-
public boolean deleteAcl(String bucket, String entity, Map<Option, ?> options) {
351+
public boolean deleteAcl(String bucket, String entity) {
352352
throw new UnsupportedOperationException();
353353
}
354354

355355
@Override
356-
public BucketAccessControl createAcl(BucketAccessControl acl, Map<Option, ?> options) {
356+
public BucketAccessControl createAcl(BucketAccessControl acl) {
357357
throw new UnsupportedOperationException();
358358
}
359359

360360
@Override
361-
public BucketAccessControl patchAcl(BucketAccessControl acl, Map<Option, ?> options) {
361+
public BucketAccessControl patchAcl(BucketAccessControl acl) {
362362
throw new UnsupportedOperationException();
363363
}
364364

365365
@Override
366-
public List<BucketAccessControl> listAcls(String bucket, Map<Option, ?> options) {
366+
public List<BucketAccessControl> listAcls(String bucket) {
367367
throw new UnsupportedOperationException();
368368
}
369369

@@ -449,17 +449,17 @@ private static boolean processedAsFolder(StorageObject so, String delimiter, Str
449449
}
450450

451451
@Override
452-
public Policy getIamPolicy(String bucket, Map<Option, ?> options) {
452+
public Policy getIamPolicy(String bucket) {
453453
throw new UnsupportedOperationException();
454454
}
455455

456456
@Override
457-
public Policy setIamPolicy(String bucket, Policy policy, Map<Option, ?> options) {
457+
public Policy setIamPolicy(String bucket, Policy policy) {
458458
throw new UnsupportedOperationException();
459459
}
460460

461461
@Override
462-
public TestIamPermissionsResponse testIamPermissions(String bucket, List<String> permissions, Map<Option, ?> options) {
462+
public TestIamPermissionsResponse testIamPermissions(String bucket, List<String> permissions) {
463463
throw new UnsupportedOperationException();
464464
}
465465
}

‎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(apiException.getStatusCode().getCode().getHttpStatusCode())
76-
.setReason(apiException.getStatusCode().getCode().name())
75+
.setCode(((GrpcStatusCode) apiException.getStatusCode()).getCode().value())
76+
.setReason(((GrpcStatusCode) 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: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,15 @@
1818

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

21-
import com.google.api.core.BetaApi;
2221
import com.google.api.core.InternalApi;
2322
import com.google.api.gax.core.CredentialsProvider;
24-
import com.google.api.gax.core.FixedCredentialsProvider;
2523
import com.google.api.gax.core.GaxProperties;
24+
import com.google.api.gax.core.FixedCredentialsProvider;
2625
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.InstantiatingGrpcChannelProvider;
28+
import com.google.api.gax.grpc.InstantiatingChannelProvider;
2929
import com.google.api.gax.retrying.RetrySettings;
30-
import com.google.api.gax.rpc.ApiClientHeaderProvider;
31-
import com.google.api.gax.rpc.TransportChannelProvider;
3230
import com.google.api.gax.rpc.UnaryCallSettings;
3331
import com.google.auth.Credentials;
3432
import com.google.cloud.NoCredentials;
@@ -191,18 +189,11 @@ public UnaryCallSettings.Builder getApiCallSettings(RetrySettings retrySettings)
191189
/**
192190
* Returns a channel provider from the given default provider.
193191
*/
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(), ""));
192+
public static ChannelProvider setUpChannelProvider(
193+
InstantiatingChannelProvider.Builder providerBuilder, ServiceOptions<?, ?> serviceOptions) {
194+
providerBuilder.setEndpoint(serviceOptions.getHost())
195+
.setClientLibHeader(ServiceOptions.getGoogApiClientLibName(),
196+
firstNonNull(serviceOptions.getLibraryVersion(), ""));
206197
return providerBuilder.build();
207198
}
208199

@@ -211,7 +202,7 @@ public static CredentialsProvider setUpCredentialsProvider(ServiceOptions<?, ?>
211202
if (scopedCredentials != null && scopedCredentials != NoCredentials.getInstance()) {
212203
return FixedCredentialsProvider.create(scopedCredentials);
213204
}
214-
return NoCredentialsProvider.create();
205+
return new NoCredentialsProvider();
215206
}
216207

217208

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

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

3939
public class BaseGrpcServiceExceptionTest {
4040

41+
private static final int CODE = 1;
4142
private static final String MESSAGE = "some message";
4243
private static final boolean NOT_RETRYABLE = false;
4344
private static final boolean IDEMPOTENT = true;
@@ -80,7 +81,7 @@ public void testBaseServiceException() {
8081
assertFalse(serviceException.isRetryable());
8182
assertEquals(MESSAGE, serviceException.getMessage());
8283
assertEquals(apiException, serviceException.getCause());
83-
assertEquals(500, serviceException.getCode());
84+
assertEquals(Code.INTERNAL.value(), serviceException.getCode());
8485
assertEquals(Code.INTERNAL.name(), serviceException.getReason());
8586
assertNull(serviceException.getLocation());
8687
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.26.1-alpha-SNAPSHOT</version>
6+
<version>0.25.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.26.1-alpha-SNAPSHOT</version>
17+
<version>0.25.0-alpha</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.26.1-alpha-SNAPSHOT</version>
6+
<version>0.25.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.26.1-alpha-SNAPSHOT</version>
17+
<version>0.25.0-alpha</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.26.1-alpha-SNAPSHOT</version>
6+
<version>0.25.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: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,6 @@
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>
8882
</dependencies>
8983
<profiles>
9084
<profile>

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

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2017, Google LLC All rights reserved.
2+
* Copyright 2017, Google Inc. All rights reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -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;
2120
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,8 +121,10 @@
121121
* <code>
122122
* DlpServiceSettings dlpServiceSettings =
123123
* DlpServiceSettings.newBuilder()
124-
* .setTransportChannelProvider(DlpServiceSettings.defaultGrpcTransportProviderBuilder()
125-
* .setEndpoint(myEndpoint)
124+
* .setTransportProvider(DlpServiceSettings.defaultGrpcTransportProviderBuilder()
125+
* .setChannelProvider(DlpServiceSettings.defaultGrpcChannelProviderBuilder()
126+
* .setEndpoint(myEndpoint)
127+
* .build())
126128
* .build())
127129
* .build();
128130
* DlpServiceClient dlpServiceClient =
@@ -154,7 +156,6 @@ public static final DlpServiceClient create(DlpServiceSettings settings) throws
154156
* Constructs an instance of DlpServiceClient, using the given stub for making calls. This is for
155157
* advanced usage - prefer to use DlpServiceSettings}.
156158
*/
157-
@BetaApi
158159
public static final DlpServiceClient create(DlpServiceStub stub) {
159160
return new DlpServiceClient(stub);
160161
}
@@ -301,7 +302,8 @@ public final DeidentifyContentResponse deidentifyContent(DeidentifyContentReques
301302
* @param sourceTable Input dataset to compute metrics over.
302303
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
303304
*/
304-
public final OperationFuture<RiskAnalysisOperationResult, RiskAnalysisOperationMetadata>
305+
public final OperationFuture<
306+
RiskAnalysisOperationResult, RiskAnalysisOperationMetadata, Operation>
305307
analyzeDataSourceRiskAsync(PrivacyMetric privacyMetric, BigQueryTable sourceTable) {
306308

307309
AnalyzeDataSourceRiskRequest request =
@@ -334,7 +336,8 @@ public final DeidentifyContentResponse deidentifyContent(DeidentifyContentReques
334336
* @param request The request object containing all of the parameters for the API call.
335337
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
336338
*/
337-
public final OperationFuture<RiskAnalysisOperationResult, RiskAnalysisOperationMetadata>
339+
public final OperationFuture<
340+
RiskAnalysisOperationResult, RiskAnalysisOperationMetadata, Operation>
338341
analyzeDataSourceRiskAsync(AnalyzeDataSourceRiskRequest request) {
339342
return analyzeDataSourceRiskOperationCallable().futureCall(request);
340343
}
@@ -361,7 +364,8 @@ public final DeidentifyContentResponse deidentifyContent(DeidentifyContentReques
361364
* </code></pre>
362365
*/
363366
public final OperationCallable<
364-
AnalyzeDataSourceRiskRequest, RiskAnalysisOperationResult, RiskAnalysisOperationMetadata>
367+
AnalyzeDataSourceRiskRequest, RiskAnalysisOperationResult, RiskAnalysisOperationMetadata,
368+
Operation>
365369
analyzeDataSourceRiskOperationCallable() {
366370
return stub.analyzeDataSourceRiskOperationCallable();
367371
}
@@ -707,7 +711,7 @@ public final UnaryCallable<RedactContentRequest, RedactContentResponse> redactCo
707711
* @param outputConfig Optional location to store findings.
708712
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
709713
*/
710-
public final OperationFuture<InspectOperationResult, InspectOperationMetadata>
714+
public final OperationFuture<InspectOperationResult, InspectOperationMetadata, Operation>
711715
createInspectOperationAsync(
712716
InspectConfig inspectConfig,
713717
StorageConfig storageConfig,
@@ -761,7 +765,7 @@ public final UnaryCallable<RedactContentRequest, RedactContentResponse> redactCo
761765
* @param request The request object containing all of the parameters for the API call.
762766
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
763767
*/
764-
public final OperationFuture<InspectOperationResult, InspectOperationMetadata>
768+
public final OperationFuture<InspectOperationResult, InspectOperationMetadata, Operation>
765769
createInspectOperationAsync(CreateInspectOperationRequest request) {
766770
return createInspectOperationOperationCallable().futureCall(request);
767771
}
@@ -805,7 +809,8 @@ public final UnaryCallable<RedactContentRequest, RedactContentResponse> redactCo
805809
* </code></pre>
806810
*/
807811
public final OperationCallable<
808-
CreateInspectOperationRequest, InspectOperationResult, InspectOperationMetadata>
812+
CreateInspectOperationRequest, InspectOperationResult, InspectOperationMetadata,
813+
Operation>
809814
createInspectOperationOperationCallable() {
810815
return stub.createInspectOperationOperationCallable();
811816
}
@@ -861,7 +866,7 @@ public final UnaryCallable<RedactContentRequest, RedactContentResponse> redactCo
861866
*
862867
* <pre><code>
863868
* try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
864-
* ResultName name = ResultName.of("[RESULT]");
869+
* ResultName name = ResultName.create("[RESULT]");
865870
* ListInspectFindingsResponse response = dlpServiceClient.listInspectFindings(name);
866871
* }
867872
* </code></pre>
@@ -885,7 +890,7 @@ public final ListInspectFindingsResponse listInspectFindings(ResultName name) {
885890
*
886891
* <pre><code>
887892
* try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
888-
* ResultName name = ResultName.of("[RESULT]");
893+
* ResultName name = ResultName.create("[RESULT]");
889894
* ListInspectFindingsRequest request = ListInspectFindingsRequest.newBuilder()
890895
* .setNameWithResultName(name)
891896
* .build();
@@ -908,7 +913,7 @@ public final ListInspectFindingsResponse listInspectFindings(ListInspectFindings
908913
*
909914
* <pre><code>
910915
* try (DlpServiceClient dlpServiceClient = DlpServiceClient.create()) {
911-
* ResultName name = ResultName.of("[RESULT]");
916+
* ResultName name = ResultName.create("[RESULT]");
912917
* ListInspectFindingsRequest request = ListInspectFindingsRequest.newBuilder()
913918
* .setNameWithResultName(name)
914919
* .build();

0 commit comments

Comments
 (0)