Skip to content

WIP: Renames: Function -> ApiFunction, RpcStreamObserver -> ApiStreamObserver #1787

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 1 commit into from
Mar 22, 2017
Merged

WIP: Renames: Function -> ApiFunction, RpcStreamObserver -> ApiStreamObserver #1787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import static com.google.cloud.logging.Logging.WriteOption.OptionType.LOG_NAME;
import static com.google.cloud.logging.Logging.WriteOption.OptionType.RESOURCE;

import com.google.api.gax.core.ApiFunction;
import com.google.api.gax.core.ApiFuture;
import com.google.api.gax.core.ApiFutures;
import com.google.cloud.AsyncPage;
Expand Down Expand Up @@ -105,7 +106,7 @@ private static <V> V get(ApiFuture<V> future) {

private static <I, O> ApiFuture<O> transform(ApiFuture<I> future,
final Function<? super I, ? extends O> function) {
return ApiFutures.transform(future, new com.google.api.gax.core.Function<I, O>() {
return ApiFutures.transform(future, new ApiFunction<I, O>() {
@Override
public O apply(I i) {
return function.apply(i);
Expand Down
4 changes: 2 additions & 2 deletions google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/GrpcLoggingRpc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

package com.google.cloud.logging.spi.v2;

import com.google.api.gax.core.ApiFunction;
import com.google.api.gax.core.ApiFuture;
import com.google.api.gax.core.ApiFutures;
import com.google.api.gax.core.Function;
import com.google.api.gax.grpc.ApiException;
import com.google.api.gax.grpc.ChannelProvider;
import com.google.api.gax.grpc.ExecutorProvider;
Expand Down Expand Up @@ -132,7 +132,7 @@ private static <V> ApiFuture<V> translate(
return ApiFutures.catching(
from,
ApiException.class,
new Function<ApiException, V>() {
new ApiFunction<ApiException, V>() {
@Override
public V apply(ApiException exception) {
if (returnNullOnSet.contains(exception.getStatusCode())) {
Expand Down
3 changes: 2 additions & 1 deletion google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/deprecated/PubSubImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import static com.google.common.base.MoreObjects.firstNonNull;
import static com.google.common.base.Preconditions.checkArgument;

import com.google.api.gax.core.ApiFunction;
import com.google.api.gax.core.ApiFuture;
import com.google.api.gax.core.ApiFutureCallback;
import com.google.api.gax.core.ApiFutures;
Expand Down Expand Up @@ -203,7 +204,7 @@ private static <V> V get(ApiFuture<V> future) {

private static <I, O> ApiFuture<O> transform(ApiFuture<I> future,
final Function<? super I, ? extends O> function) {
return ApiFutures.transform(future, new com.google.api.gax.core.Function<I, O>() {
return ApiFutures.transform(future, new ApiFunction<I, O>() {
@Override
public O apply(I i) {
return function.apply(i);
Expand Down
4 changes: 2 additions & 2 deletions ...e-cloud-pubsub/src/main/java/com/google/cloud/pubsub/deprecated/spi/v1/GrpcPubSubRpc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

package com.google.cloud.pubsub.deprecated.spi.v1;

import com.google.api.gax.core.ApiFunction;
import com.google.api.gax.core.ApiFuture;
import com.google.api.gax.core.ApiFutures;
import com.google.api.gax.core.Function;
import com.google.api.gax.grpc.ApiException;
import com.google.api.gax.grpc.ChannelProvider;
import com.google.api.gax.grpc.ExecutorProvider;
Expand Down Expand Up @@ -135,7 +135,7 @@ private static <V> ApiFuture<V> translate(
return ApiFutures.<V, ApiException>catching(
from,
ApiException.class,
new Function<ApiException, V>() {
new ApiFunction<ApiException, V>() {
@Override
public V apply(ApiException exception) {
if (returnNullOnSet.contains(exception.getStatusCode().value())) {
Expand Down
6 changes: 3 additions & 3 deletions google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/SubscriberClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -897,8 +897,8 @@ public final UnaryCallable<PullRequest, PullResponse> pullCallable() {
*
* <pre><code>
* try (SubscriberClient subscriberClient = SubscriberClient.create()) {
* RpcStreamObserver&lt;StreamingPullResponse&gt; responseObserver =
* new RpcStreamObserver&lt;StreamingPullResponse&gt;() {
* ApiStreamObserver&lt;StreamingPullResponse&gt; responseObserver =
* new ApiStreamObserver&lt;StreamingPullResponse&gt;() {
* {@literal @}Override
* public void onNext(StreamingPullResponse response) {
* // Do something when receive a response
Expand All @@ -914,7 +914,7 @@ public final UnaryCallable<PullRequest, PullResponse> pullCallable() {
* // Do something when complete.
* }
* };
* RpcStreamObserver&lt;StreamingRecognizeRequest&gt; requestObserver =
* ApiStreamObserver&lt;StreamingRecognizeRequest&gt; requestObserver =
* subscriberClient.streamingPullCallable().bidiStreamingCall(responseObserver)});
*
* SubscriptionName subscription = SubscriptionName.create("[PROJECT]", "[SUBSCRIPTION]");
Expand Down
6 changes: 3 additions & 3 deletions google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/SubscriberClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

import static com.google.cloud.pubsub.spi.v1.PagedResponseWrappers.ListSubscriptionsPagedResponse;

import com.google.api.gax.core.RpcStreamObserver;
import com.google.api.gax.core.ApiStreamObserver;
import com.google.api.gax.grpc.ApiException;
import com.google.api.gax.grpc.StreamingCallable;
import com.google.api.gax.testing.MockGrpcService;
Expand Down Expand Up @@ -406,7 +406,7 @@ public void streamingPullTest() throws Exception {

StreamingCallable<StreamingPullRequest, StreamingPullResponse> callable =
client.streamingPullCallable();
RpcStreamObserver<StreamingPullRequest> requestObserver =
ApiStreamObserver<StreamingPullRequest> requestObserver =
callable.bidiStreamingCall(responseObserver);

requestObserver.onNext(request);
Expand Down Expand Up @@ -434,7 +434,7 @@ public void streamingPullExceptionTest() throws Exception {

StreamingCallable<StreamingPullRequest, StreamingPullResponse> callable =
client.streamingPullCallable();
RpcStreamObserver<StreamingPullRequest> requestObserver =
ApiStreamObserver<StreamingPullRequest> requestObserver =
callable.bidiStreamingCall(responseObserver);

requestObserver.onNext(request);
Expand Down
6 changes: 3 additions & 3 deletions google-cloud-speech/src/main/java/com/google/cloud/speech/spi/v1beta1/SpeechClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,8 +453,8 @@ public final UnaryCallable<AsyncRecognizeRequest, Operation> asyncRecognizeCalla
*
* <pre><code>
* try (SpeechClient speechClient = SpeechClient.create()) {
* RpcStreamObserver&lt;StreamingRecognizeResponse&gt; responseObserver =
* new RpcStreamObserver&lt;StreamingRecognizeResponse&gt;() {
* ApiStreamObserver&lt;StreamingRecognizeResponse&gt; responseObserver =
* new ApiStreamObserver&lt;StreamingRecognizeResponse&gt;() {
* {@literal @}Override
* public void onNext(StreamingRecognizeResponse response) {
* // Do something when receive a response
Expand All @@ -470,7 +470,7 @@ public final UnaryCallable<AsyncRecognizeRequest, Operation> asyncRecognizeCalla
* // Do something when complete.
* }
* };
* RpcStreamObserver&lt;StreamingRecognizeRequest&gt; requestObserver =
* ApiStreamObserver&lt;StreamingRecognizeRequest&gt; requestObserver =
* speechClient.streamingRecognizeCallable().bidiStreamingCall(responseObserver)});
*
* StreamingRecognizeRequest request = StreamingRecognizeRequest.newBuilder().build();
Expand Down
6 changes: 3 additions & 3 deletions google-cloud-speech/src/test/java/com/google/cloud/speech/spi/v1beta1/SpeechClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package com.google.cloud.speech.spi.v1beta1;

import com.google.api.gax.core.RpcStreamObserver;
import com.google.api.gax.core.ApiStreamObserver;
import com.google.api.gax.grpc.ApiException;
import com.google.api.gax.grpc.StreamingCallable;
import com.google.api.gax.testing.MockGrpcService;
Expand Down Expand Up @@ -191,7 +191,7 @@ public void streamingRecognizeTest() throws Exception {

StreamingCallable<StreamingRecognizeRequest, StreamingRecognizeResponse> callable =
client.streamingRecognizeCallable();
RpcStreamObserver<StreamingRecognizeRequest> requestObserver =
ApiStreamObserver<StreamingRecognizeRequest> requestObserver =
callable.bidiStreamingCall(responseObserver);

requestObserver.onNext(request);
Expand All @@ -213,7 +213,7 @@ public void streamingRecognizeExceptionTest() throws Exception {

StreamingCallable<StreamingRecognizeRequest, StreamingRecognizeResponse> callable =
client.streamingRecognizeCallable();
RpcStreamObserver<StreamingRecognizeRequest> requestObserver =
ApiStreamObserver<StreamingRecognizeRequest> requestObserver =
callable.bidiStreamingCall(responseObserver);

requestObserver.onNext(request);
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<github.global.server>github</github.global.server>
<google.auth.version>0.6.0</google.auth.version>
<grpc.version>1.0.3</grpc.version>
<gax.version>0.5.0</gax.version>
<gax.version>0.6.0</gax.version>

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

<generatedProto.version>0.1.5</generatedProto.version>
<core.version>0.10.1-alpha-SNAPSHOT</core.version>
<beta.version>0.10.1-beta-SNAPSHOT</beta.version>
Expand Down