GAX rename: RpcFuture -> ApiFuture

google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceClient.java

@@ -214,7 +214,7 @@ private final ErrorGroup getGroup(GetGroupRequest request) {
    *   GetGroupRequest request = GetGroupRequest.newBuilder()
    *     .setGroupNameWithGroupName(groupName)
    *     .build();
-   *   RpcFuture<ErrorGroup> future = errorGroupServiceClient.getGroupCallable().futureCall(request);
+   *   ApiFuture<ErrorGroup> future = errorGroupServiceClient.getGroupCallable().futureCall(request);
    *   // Do something
    *   ErrorGroup response = future.get();
    * }
@@ -281,7 +281,7 @@ private final ErrorGroup updateGroup(UpdateGroupRequest request) {
    *   UpdateGroupRequest request = UpdateGroupRequest.newBuilder()
    *     .setGroup(group)
    *     .build();
-   *   RpcFuture<ErrorGroup> future = errorGroupServiceClient.updateGroupCallable().futureCall(request);
+   *   ApiFuture<ErrorGroup> future = errorGroupServiceClient.updateGroupCallable().futureCall(request);
    *   // Do something
    *   ErrorGroup response = future.get();
    * }

google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceClient.java

@@ -251,7 +251,7 @@ public final ListGroupStatsPagedResponse listGroupStats(ListGroupStatsRequest re
    *     .setProjectNameWithProjectName(projectName)
    *     .setTimeRange(timeRange)
    *     .build();
-   *   RpcFuture<ListGroupStatsPagedResponse> future = errorStatsServiceClient.listGroupStatsPagedCallable().futureCall(request);
+   *   ApiFuture<ListGroupStatsPagedResponse> future = errorStatsServiceClient.listGroupStatsPagedCallable().futureCall(request);
    *   // Do something
    *   for (ErrorGroupStats element : future.get().iterateAllElements()) {
    *     // doThingsWith(element);
@@ -370,7 +370,7 @@ public final ListEventsPagedResponse listEvents(ListEventsRequest request) {
    *     .setProjectNameWithProjectName(projectName)
    *     .setGroupId(groupId)
    *     .build();
-   *   RpcFuture<ListEventsPagedResponse> future = errorStatsServiceClient.listEventsPagedCallable().futureCall(request);
+   *   ApiFuture<ListEventsPagedResponse> future = errorStatsServiceClient.listEventsPagedCallable().futureCall(request);
    *   // Do something
    *   for (ErrorEvent element : future.get().iterateAllElements()) {
    *     // doThingsWith(element);
@@ -475,7 +475,7 @@ private final DeleteEventsResponse deleteEvents(DeleteEventsRequest request) {
    *   DeleteEventsRequest request = DeleteEventsRequest.newBuilder()
    *     .setProjectNameWithProjectName(projectName)
    *     .build();
-   *   RpcFuture<DeleteEventsResponse> future = errorStatsServiceClient.deleteEventsCallable().futureCall(request);
+   *   ApiFuture<DeleteEventsResponse> future = errorStatsServiceClient.deleteEventsCallable().futureCall(request);
    *   // Do something
    *   DeleteEventsResponse response = future.get();
    * }

google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ReportErrorsServiceClient.java

@@ -241,7 +241,7 @@ public final ReportErrorEventResponse reportErrorEvent(ReportErrorEventRequest r
    *     .setProjectNameWithProjectName(projectName)
    *     .setEvent(event)
    *     .build();
-   *   RpcFuture<ReportErrorEventResponse> future = reportErrorsServiceClient.reportErrorEventCallable().futureCall(request);
+   *   ApiFuture<ReportErrorEventResponse> future = reportErrorsServiceClient.reportErrorEventCallable().futureCall(request);
    *   // Do something
    *   ReportErrorEventResponse response = future.get();
    * }

google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateTopicAndPublishMessages.java

@@ -16,7 +16,7 @@
 
 package com.google.cloud.examples.pubsub.snippets;
 
-import com.google.api.gax.core.RpcFuture;
+import com.google.api.gax.core.ApiFuture;
 import com.google.cloud.pubsub.spi.v1.Publisher;
 import com.google.cloud.pubsub.spi.v1.PublisherClient;
 import com.google.protobuf.ByteString;
@@ -41,14 +41,14 @@ public static void main(String... args) throws Exception {
     try {
       publisher = Publisher.newBuilder(topic).build();
       List<String> messages = Arrays.asList("first message", "second message");
-      List<RpcFuture<String>> messageIds = new ArrayList<>();
+      List<ApiFuture<String>> messageIds = new ArrayList<>();
       for (String message : messages) {
         ByteString data = ByteString.copyFromUtf8(message);
         PubsubMessage pubsubMessage = PubsubMessage.newBuilder().setData(data).build();
-        RpcFuture<String> messageIdFuture = publisher.publish(pubsubMessage);
+        ApiFuture<String> messageIdFuture = publisher.publish(pubsubMessage);
         messageIds.add(messageIdFuture);
       }
-      for (RpcFuture<String> messageId : messageIds) {
+      for (ApiFuture<String> messageId : messageIds) {
         System.out.println("published with message ID: " + messageId.get());
       }
     } finally {

google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/PublisherSnippets.java

@@ -22,8 +22,9 @@
 
 package com.google.cloud.examples.pubsub.snippets;
 
-import com.google.api.gax.core.RpcFuture;
-import com.google.api.gax.core.RpcFutureCallback;
+import com.google.api.gax.core.ApiFuture;
+import com.google.api.gax.core.ApiFutureCallback;
+import com.google.api.gax.core.ApiFutures;
 import com.google.cloud.pubsub.spi.v1.Publisher;
 import com.google.protobuf.ByteString;
 import com.google.pubsub.v1.PubsubMessage;
@@ -40,21 +41,20 @@ public PublisherSnippets(Publisher publisher) {
   /** Example of publishing a message. */
   // [TARGET publish(PubsubMessage)]
   // [VARIABLE "my_message"]
-  public RpcFuture<String> publish(String message) {
+  public ApiFuture<String> publish(String message) {
     // [START publish]
     ByteString data = ByteString.copyFromUtf8(message);
     PubsubMessage pubsubMessage = PubsubMessage.newBuilder().setData(data).build();
-    RpcFuture<String> messageIdFuture = publisher.publish(pubsubMessage);
-    messageIdFuture.addCallback(
-        new RpcFutureCallback<String>() {
-          public void onSuccess(String messageId) {
-            System.out.println("published with message id: " + messageId);
-          }
+    ApiFuture<String> messageIdFuture = publisher.publish(pubsubMessage);
+    ApiFutures.addCallback(messageIdFuture, new ApiFutureCallback<String>() {
+      public void onSuccess(String messageId) {
+        System.out.println("published with message id: " + messageId);
+      }
 
-          public void onFailure(Throwable t) {
-            System.out.println("failed to publish: " + t);
-          }
-        });
+      public void onFailure(Throwable t) {
+        System.out.println("failed to publish: " + t);
+      }
+    });
     // [END publish]
     return messageIdFuture;
   }

google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriberSnippets.java

@@ -22,7 +22,7 @@
 
 package com.google.cloud.examples.pubsub.snippets;
 
-import com.google.api.gax.core.RpcFuture;
+import com.google.api.gax.core.ApiFuture;
 import com.google.cloud.pubsub.spi.v1.MessageReceiver;
 import com.google.cloud.pubsub.spi.v1.Subscriber;
 import com.google.pubsub.v1.SubscriptionName;
@@ -33,13 +33,13 @@ public class SubscriberSnippets {
 
   private final SubscriptionName subscription;
   private final MessageReceiver receiver;
-  private final RpcFuture<Void> done;
+  private final ApiFuture<Void> done;
   private final Executor executor;
 
   public SubscriberSnippets(
       SubscriptionName subscription,
       MessageReceiver receiver,
-      RpcFuture<Void> done,
+      ApiFuture<Void> done,
       Executor executor) {
     this.subscription = subscription;
     this.receiver = receiver;

google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITPubSubSnippets.java

@@ -21,8 +21,9 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-import com.google.api.gax.core.RpcFutureCallback;
-import com.google.api.gax.core.SettableRpcFuture;
+import com.google.api.gax.core.ApiFutureCallback;
+import com.google.api.gax.core.ApiFutures;
+import com.google.api.gax.core.SettableApiFuture;
 import com.google.cloud.Identity;
 import com.google.cloud.Page;
 import com.google.cloud.Policy;
@@ -306,19 +307,18 @@ private void testPublisherSubscriberHelper(
     try {
       publisher = Publisher.newBuilder(topicName).build();
       PublisherSnippets snippets = new PublisherSnippets(publisher);
-      final SettableRpcFuture<Void> done = new SettableRpcFuture<>();
-      snippets
-          .publish(messageToPublish)
-          .addCallback(
-              new RpcFutureCallback<String>() {
-                public void onSuccess(String messageId) {
-                  done.set(null);
-                }
+      final SettableApiFuture<Void> done = SettableApiFuture.create();
+      ApiFutures.addCallback(
+          snippets.publish(messageToPublish),
+          new ApiFutureCallback<String>() {
+            public void onSuccess(String messageId) {
+              done.set(null);
+            }
 
-                public void onFailure(Throwable t) {
-                  done.setException(t);
-                }
-              });
+            public void onFailure(Throwable t) {
+              done.setException(t);
+            }
+          });
       done.get();
     } finally {
       if (publisher != null) {
@@ -327,8 +327,8 @@ public void onFailure(Throwable t) {
     }
 
     final BlockingQueue<PubsubMessage> queue = new ArrayBlockingQueue<>(1);
-    final SettableRpcFuture<Void> done = new SettableRpcFuture<>();
-    final SettableRpcFuture<PubsubMessage> received = new SettableRpcFuture<>();
+    final SettableApiFuture<Void> done = SettableApiFuture.create();
+    final SettableApiFuture<PubsubMessage> received = SettableApiFuture.create();
     SubscriberSnippets snippets =
         new SubscriberSnippets(
             subscriptionName,

google-cloud-language/src/main/java/com/google/cloud/language/spi/v1/LanguageServiceClient.java

@@ -225,7 +225,7 @@ private final AnalyzeSentimentResponse analyzeSentiment(AnalyzeSentimentRequest
    *   AnalyzeSentimentRequest request = AnalyzeSentimentRequest.newBuilder()
    *     .setDocument(document)
    *     .build();
-   *   RpcFuture<AnalyzeSentimentResponse> future = languageServiceClient.analyzeSentimentCallable().futureCall(request);
+   *   ApiFuture<AnalyzeSentimentResponse> future = languageServiceClient.analyzeSentimentCallable().futureCall(request);
    *   // Do something
    *   AnalyzeSentimentResponse response = future.get();
    * }
@@ -307,7 +307,7 @@ public final AnalyzeEntitiesResponse analyzeEntities(AnalyzeEntitiesRequest requ
    *     .setDocument(document)
    *     .setEncodingType(encodingType)
    *     .build();
-   *   RpcFuture<AnalyzeEntitiesResponse> future = languageServiceClient.analyzeEntitiesCallable().futureCall(request);
+   *   ApiFuture<AnalyzeEntitiesResponse> future = languageServiceClient.analyzeEntitiesCallable().futureCall(request);
    *   // Do something
    *   AnalyzeEntitiesResponse response = future.get();
    * }
@@ -388,7 +388,7 @@ public final AnalyzeSyntaxResponse analyzeSyntax(AnalyzeSyntaxRequest request) {
    *     .setDocument(document)
    *     .setEncodingType(encodingType)
    *     .build();
-   *   RpcFuture<AnalyzeSyntaxResponse> future = languageServiceClient.analyzeSyntaxCallable().futureCall(request);
+   *   ApiFuture<AnalyzeSyntaxResponse> future = languageServiceClient.analyzeSyntaxCallable().futureCall(request);
    *   // Do something
    *   AnalyzeSyntaxResponse response = future.get();
    * }
@@ -476,7 +476,7 @@ public final AnnotateTextResponse annotateText(AnnotateTextRequest request) {
    *     .setFeatures(features)
    *     .setEncodingType(encodingType)
    *     .build();
-   *   RpcFuture<AnnotateTextResponse> future = languageServiceClient.annotateTextCallable().futureCall(request);
+   *   ApiFuture<AnnotateTextResponse> future = languageServiceClient.annotateTextCallable().futureCall(request);
    *   // Do something
    *   AnnotateTextResponse response = future.get();
    * }

google-cloud-logging/src/main/java/com/google/cloud/logging/spi/DefaultLoggingRpc.java

@@ -16,8 +16,9 @@
 
 package com.google.cloud.logging.spi;
 
+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.core.RpcFuture;
 import com.google.api.gax.grpc.ApiException;
 import com.google.api.gax.grpc.ChannelProvider;
 import com.google.api.gax.grpc.ExecutorProvider;
@@ -147,14 +148,15 @@ public DefaultLoggingRpc(LoggingOptions options) throws IOException {
   }
 
   private static <V> Future<V> translate(
-      RpcFuture<V> from, final boolean idempotent, Code... returnNullOn) {
+      ApiFuture<V> from, final boolean idempotent, Code... returnNullOn) {
     final Set<Code> returnNullOnSet;
     if (returnNullOn.length > 0) {
       returnNullOnSet = EnumSet.of(returnNullOn[0], returnNullOn);
     } else {
       returnNullOnSet = Collections.<Code>emptySet();
     }
-    return from.catching(
+    return ApiFutures.catching(
+        from,
         ApiException.class,
         new Function<ApiException, V>() {
           @Override

google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/ConfigServiceV2Client.java

@@ -231,7 +231,7 @@ public final ListSinksPagedResponse listSinks(ListSinksRequest request) {
    *   ListSinksRequest request = ListSinksRequest.newBuilder()
    *     .setParentWithParentNameOneof(parent)
    *     .build();
-   *   RpcFuture<ListSinksPagedResponse> future = configServiceV2Client.listSinksPagedCallable().futureCall(request);
+   *   ApiFuture<ListSinksPagedResponse> future = configServiceV2Client.listSinksPagedCallable().futureCall(request);
    *   // Do something
    *   for (LogSink element : future.get().iterateAllElements()) {
    *     // doThingsWith(element);
@@ -335,7 +335,7 @@ private final LogSink getSink(GetSinkRequest request) {
    *   GetSinkRequest request = GetSinkRequest.newBuilder()
    *     .setSinkNameWithSinkNameOneof(sinkName)
    *     .build();
-   *   RpcFuture<LogSink> future = configServiceV2Client.getSinkCallable().futureCall(request);
+   *   ApiFuture<LogSink> future = configServiceV2Client.getSinkCallable().futureCall(request);
    *   // Do something
    *   LogSink response = future.get();
    * }
@@ -421,7 +421,7 @@ public final LogSink createSink(CreateSinkRequest request) {
    *     .setParentWithParentNameOneof(parent)
    *     .setSink(sink)
    *     .build();
-   *   RpcFuture<LogSink> future = configServiceV2Client.createSinkCallable().futureCall(request);
+   *   ApiFuture<LogSink> future = configServiceV2Client.createSinkCallable().futureCall(request);
    *   // Do something
    *   LogSink response = future.get();
    * }
@@ -515,7 +515,7 @@ public final LogSink updateSink(UpdateSinkRequest request) {
    *     .setSinkNameWithSinkNameOneof(sinkName)
    *     .setSink(sink)
    *     .build();
-   *   RpcFuture<LogSink> future = configServiceV2Client.updateSinkCallable().futureCall(request);
+   *   ApiFuture<LogSink> future = configServiceV2Client.updateSinkCallable().futureCall(request);
    *   // Do something
    *   LogSink response = future.get();
    * }
@@ -591,7 +591,7 @@ private final void deleteSink(DeleteSinkRequest request) {
    *   DeleteSinkRequest request = DeleteSinkRequest.newBuilder()
    *     .setSinkNameWithSinkNameOneof(sinkName)
    *     .build();
-   *   RpcFuture<Void> future = configServiceV2Client.deleteSinkCallable().futureCall(request);
+   *   ApiFuture<Void> future = configServiceV2Client.deleteSinkCallable().futureCall(request);
    *   // Do something
    *   future.get();
    * }

google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingServiceV2Client.java

@@ -256,7 +256,7 @@ private final void deleteLog(DeleteLogRequest request) {
    *   DeleteLogRequest request = DeleteLogRequest.newBuilder()
    *     .setLogNameWithLogNameOneof(logName)
    *     .build();
-   *   RpcFuture<Void> future = loggingServiceV2Client.deleteLogCallable().futureCall(request);
+   *   ApiFuture<Void> future = loggingServiceV2Client.deleteLogCallable().futureCall(request);
    *   // Do something
    *   future.get();
    * }
@@ -356,7 +356,7 @@ public final WriteLogEntriesResponse writeLogEntries(WriteLogEntriesRequest requ
    *   WriteLogEntriesRequest request = WriteLogEntriesRequest.newBuilder()
    *     .addAllEntries(entries)
    *     .build();
-   *   RpcFuture<WriteLogEntriesResponse> future = loggingServiceV2Client.writeLogEntriesCallable().futureCall(request);
+   *   ApiFuture<WriteLogEntriesResponse> future = loggingServiceV2Client.writeLogEntriesCallable().futureCall(request);
    *   // Do something
    *   WriteLogEntriesResponse response = future.get();
    * }
@@ -452,7 +452,7 @@ public final ListLogEntriesPagedResponse listLogEntries(ListLogEntriesRequest re
    *   ListLogEntriesRequest request = ListLogEntriesRequest.newBuilder()
    *     .addAllResourceNames(resourceNames)
    *     .build();
-   *   RpcFuture<ListLogEntriesPagedResponse> future = loggingServiceV2Client.listLogEntriesPagedCallable().futureCall(request);
+   *   ApiFuture<ListLogEntriesPagedResponse> future = loggingServiceV2Client.listLogEntriesPagedCallable().futureCall(request);
    *   // Do something
    *   for (LogEntry element : future.get().iterateAllElements()) {
    *     // doThingsWith(element);
@@ -530,7 +530,7 @@ public final ListMonitoredResourceDescriptorsPagedResponse listMonitoredResource
    * <pre><code>
    * try (LoggingServiceV2Client loggingServiceV2Client = LoggingServiceV2Client.create()) {
    *   ListMonitoredResourceDescriptorsRequest request = ListMonitoredResourceDescriptorsRequest.newBuilder().build();
-   *   RpcFuture&lt;ListMonitoredResourceDescriptorsPagedResponse&gt; future = loggingServiceV2Client.listMonitoredResourceDescriptorsPagedCallable().futureCall(request);
+   *   ApiFuture&lt;ListMonitoredResourceDescriptorsPagedResponse&gt; future = loggingServiceV2Client.listMonitoredResourceDescriptorsPagedCallable().futureCall(request);
    *   // Do something
    *   for (MonitoredResourceDescriptor element : future.get().iterateAllElements()) {
    *     // doThingsWith(element);
@@ -636,7 +636,7 @@ public final ListLogsPagedResponse listLogs(ListLogsRequest request) {
    *   ListLogsRequest request = ListLogsRequest.newBuilder()
    *     .setParentWithParentNameOneof(parent)
    *     .build();
-   *   RpcFuture&lt;ListLogsPagedResponse&gt; future = loggingServiceV2Client.listLogsPagedCallable().futureCall(request);
+   *   ApiFuture&lt;ListLogsPagedResponse&gt; future = loggingServiceV2Client.listLogsPagedCallable().futureCall(request);
    *   // Do something
    *   for (String element : future.get().iterateAllElements()) {
    *     // doThingsWith(element);