Skip to content
This repository was archived by the owner on Sep 26, 2023. It is now read-only.

Commit bfdfd55

Browse files
garrettjonesgooglegarrettjonesgoogle
authored
Moving code from gax-grpc to gax (#359)
1 parent 7d720bb commit bfdfd55

118 files changed

Lines changed: 6081 additions & 3777 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.

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ tmp_docs
1414

1515
# IntelliJ
1616
.idea
17+
out

‎benchmark/src/main/java/com/google/api/gax/grpc/CallableBenchmark.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import com.google.api.core.ApiFutures;
3434
import com.google.api.gax.retrying.RetrySettings;
3535
import com.google.api.gax.rpc.ApiCallContext;
36+
import com.google.api.gax.rpc.CallableFactory;
3637
import com.google.api.gax.rpc.SimpleCallSettings;
3738
import com.google.api.gax.rpc.UnaryCallable;
3839
import com.google.caliper.Benchmark;
@@ -71,8 +72,10 @@ public ApiFuture<Integer> futureCall(PublishRequest request, ApiCallContext cont
7172
.setRetrySettings(RETRY_SETTINGS)
7273
.setRetryableCodes(GrpcStatusCode.of(Code.UNAVAILABLE))
7374
.build();
75+
private static final CallableFactory callableFactory =
76+
CallableFactory.create(GrpcTransportDescriptor.create());
7477
private static final UnaryCallable<PublishRequest, Integer> ONE_UNARY_CALLABLE =
75-
GrpcCallableFactory.create(RETURN_ONE_CALLABLE, callSettings, null);
78+
callableFactory.create(RETURN_ONE_CALLABLE, callSettings, null);
7679
private static final List<PubsubMessage> MESSAGES = createMessages();
7780

7881
private static final int MESSAGES_NUM = 100;

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ apply plugin: 'io.codearte.nexus-staging'
2525
project.version = new File("gax/version.txt").text.trim()
2626

2727
ext {
28-
grpcVersion = '1.4.0'
28+
grpcVersion = '1.6.1'
2929
commonProtosVersion = '0.1.13'
3030
authVersion = '0.7.0'
3131
// Project names not used for release

‎gax-grpc/src/main/java/com/google/api/gax/grpc/ChannelProvider.java‎

Lines changed: 0 additions & 73 deletions
This file was deleted.

‎gax-grpc/src/main/java/com/google/api/gax/grpc/GaxGrpcProperties.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ public class GaxGrpcProperties {
4040
private static final String GAX_PROPERTY_FILE = "/com/google/api/gax/grpc/project.properties";
4141
private static final String DEFAULT_VERSION = "";
4242

43+
private GaxGrpcProperties() {}
44+
4345
/** Returns the current version of gRPC */
4446
public static String getGrpcVersion() {
4547
String version =

‎gax-grpc/src/main/java/com/google/api/gax/grpc/GrpcAttemptCallable.java‎

Lines changed: 0 additions & 103 deletions
This file was deleted.

0 commit comments

Comments
 (0)