Skip to content

Regenerating clients (breaking changes) #2564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
garrettjonesgoogle merged 6 commits into from
Nov 1, 2017
Merged

Regenerating clients (breaking changes) #2564

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9b90d6f
Regenerating for gax-httpjson
garrettjonesgoogle Oct 27, 2017
6147dfe
fixing build errors
garrettjonesgoogle Oct 30, 2017
e0ba5e1
Moving off of deprecated methods
garrettjonesgoogle Oct 30, 2017
50ddb6d
Regenerating again (of->create renames)
garrettjonesgoogle Oct 31, 2017
bdc7e4d
PR feedback
garrettjonesgoogle Oct 31, 2017
2ea2e65
Bumping gax to the released version
garrettjonesgoogle Nov 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions google-cloud-core-grpc/src/main/java/com/google/cloud/grpc/BaseGrpcServiceException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

.setReason(apiException.getStatusCode().getCode().name())
.setLocation(null)
.setDebugInfo(null)
.build());
Expand Down
29 changes: 19 additions & 10 deletions google-cloud-core-grpc/src/main/java/com/google/cloud/grpc/GrpcTransportOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -189,20 +191,27 @@ 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();
}

public static CredentialsProvider setUpCredentialsProvider(ServiceOptions<?, ?> serviceOptions) {
Credentials scopedCredentials = serviceOptions.getScopedCredentials();
if (scopedCredentials != null && scopedCredentials != NoCredentials.getInstance()) {
return FixedCredentialsProvider.create(scopedCredentials);
return FixedCredentialsProvider.of(scopedCredentials);
}
return new NoCredentialsProvider();
return NoCredentialsProvider.of();
}


Expand Down
3 changes: 1 addition & 2 deletions google-cloud-core-grpc/src/test/java/com/google/cloud/grpc/BaseGrpcServiceExceptionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
Expand Down
4 changes: 2 additions & 2 deletions google-cloud-dep-verification/google-cloud-consumer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions google-cloud-dep-verification/google-cloud-errorreporting-consumer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion google-cloud-dep-verification/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 6 additions & 0 deletions google-cloud-dlp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading