Logging: Changing Future -> ApiFuture

Author: garrettjonesgoogle

google-cloud-logging/src/main/java/com/google/cloud/logging/Logging.java

@@ -25,6 +25,8 @@
 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.ApiFuture;
+import com.google.api.gax.core.ApiFutures;
 import com.google.cloud.AsyncPage;
 import com.google.cloud.AsyncPageImpl;
 import com.google.cloud.BaseService;
@@ -39,7 +41,6 @@
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.Uninterruptibles;
 import com.google.logging.v2.CreateLogMetricRequest;
 import com.google.logging.v2.CreateSinkRequest;
@@ -65,11 +66,9 @@
 import com.google.logging.v2.WriteLogEntriesRequest;
 import com.google.logging.v2.WriteLogEntriesResponse;
 import com.google.protobuf.Empty;
-
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
 
 class LoggingImpl extends BaseService<LoggingOptions> implements Logging {
 
@@ -96,17 +95,22 @@ public Void apply(WriteLogEntriesResponse input) {
     rpc = options.getRpc();
   }
 
-  private static <V> V get(Future<V> future) {
+  private static <V> V get(ApiFuture<V> future) {
     try {
       return Uninterruptibles.getUninterruptibly(future);
     } catch (ExecutionException ex) {
       throw Throwables.propagate(ex.getCause());
     }
   }
 
-  private static <I, O> Future<O> transform(Future<I> future,
-      Function<? super I, ? extends O> function) {
-    return Futures.lazyTransform(future, function);
+  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>() {
+      @Override
+      public O apply(I i) {
+        return function.apply(i);
+      }
+    });
   }
 
   private abstract static class BasePageFetcher<T> implements AsyncPageImpl.NextPageFetcher<T> {
@@ -143,7 +147,7 @@ private static class SinkPageFetcher extends BasePageFetcher<Sink> {
 
 
     @Override
-    public Future<AsyncPage<Sink>> getNextPage() {
+    public ApiFuture<AsyncPage<Sink>> getNextPage() {
       return listSinksAsync(serviceOptions(), requestOptions());
     }
   }
@@ -160,7 +164,7 @@ private static class MonitoredResourceDescriptorPageFetcher
 
 
     @Override
-    public Future<AsyncPage<MonitoredResourceDescriptor>> getNextPage() {
+    public ApiFuture<AsyncPage<MonitoredResourceDescriptor>> getNextPage() {
       return listMonitoredResourceDescriptorsAsync(serviceOptions(), requestOptions());
     }
   }
@@ -176,7 +180,7 @@ private static class MetricPageFetcher extends BasePageFetcher<Metric> {
 
 
     @Override
-    public Future<AsyncPage<Metric>> getNextPage() {
+    public ApiFuture<AsyncPage<Metric>> getNextPage() {
       return listMetricsAsync(serviceOptions(), requestOptions());
     }
   }
@@ -192,7 +196,7 @@ private static class LogEntryPageFetcher extends BasePageFetcher<LogEntry> {
 
 
     @Override
-    public Future<AsyncPage<LogEntry>> getNextPage() {
+    public ApiFuture<AsyncPage<LogEntry>> getNextPage() {
       return listLogEntriesAsync(serviceOptions(), requestOptions());
     }
   }
@@ -203,7 +207,7 @@ public Sink create(SinkInfo sink) {
   }
 
   @Override
-  public Future<Sink> createAsync(SinkInfo sink) {
+  public ApiFuture<Sink> createAsync(SinkInfo sink) {
     CreateSinkRequest request = CreateSinkRequest.newBuilder()
         .setParent(ProjectName.create(getOptions().getProjectId()).toString())
         .setSink(sink.toPb(getOptions().getProjectId()))
@@ -217,7 +221,7 @@ public Sink update(SinkInfo sink) {
   }
 
   @Override
-  public Future<Sink> updateAsync(SinkInfo sink) {
+  public ApiFuture<Sink> updateAsync(SinkInfo sink) {
     UpdateSinkRequest request = UpdateSinkRequest.newBuilder()
         .setSinkName(SinkName.create(getOptions().getProjectId(), sink.getName()).toString())
         .setSink(sink.toPb(getOptions().getProjectId()))
@@ -231,7 +235,7 @@ public Sink getSink(String sink) {
   }
 
   @Override
-  public Future<Sink> getSinkAsync(String sink) {
+  public ApiFuture<Sink> getSinkAsync(String sink) {
     GetSinkRequest request = GetSinkRequest.newBuilder()
         .setSinkName(SinkName.create(getOptions().getProjectId(), sink).toString())
         .build();
@@ -253,10 +257,10 @@ private static ListSinksRequest listSinksRequest(LoggingOptions serviceOptions,
     return builder.build();
   }
 
-  private static Future<AsyncPage<Sink>> listSinksAsync(final LoggingOptions serviceOptions,
+  private static ApiFuture<AsyncPage<Sink>> listSinksAsync(final LoggingOptions serviceOptions,
       final Map<Option.OptionType, ?> options) {
     final ListSinksRequest request = listSinksRequest(serviceOptions, options);
-    Future<ListSinksResponse> list = serviceOptions.getRpc().list(request);
+    ApiFuture<ListSinksResponse> list = serviceOptions.getRpc().list(request);
     return transform(list, new Function<ListSinksResponse, AsyncPage<Sink>>() {
       @Override
       public AsyncPage<Sink> apply(ListSinksResponse listSinksResponse) {
@@ -277,7 +281,7 @@ public Page<Sink> listSinks(ListOption... options) {
   }
 
   @Override
-  public Future<AsyncPage<Sink>> listSinksAsync(ListOption... options) {
+  public ApiFuture<AsyncPage<Sink>> listSinksAsync(ListOption... options) {
     return listSinksAsync(getOptions(), optionMap(options));
   }
 
@@ -287,7 +291,7 @@ public boolean deleteSink(String sink) {
   }
 
   @Override
-  public Future<Boolean> deleteSinkAsync(String sink) {
+  public ApiFuture<Boolean> deleteSinkAsync(String sink) {
     DeleteSinkRequest request = DeleteSinkRequest.newBuilder()
         .setSinkName(SinkName.create(getOptions().getProjectId(), sink).toString())
         .build();
@@ -298,7 +302,7 @@ public boolean deleteLog(String log) {
     return get(deleteLogAsync(log));
   }
 
-  public Future<Boolean> deleteLogAsync(String log) {
+  public ApiFuture<Boolean> deleteLogAsync(String log) {
     DeleteLogRequest request = DeleteLogRequest.newBuilder()
         .setLogName(LogName.create(getOptions().getProjectId(), log).toString())
         .build();
@@ -320,12 +324,12 @@ private static ListMonitoredResourceDescriptorsRequest listMonitoredResourceDesc
     return builder.build();
   }
 
-  private static Future<AsyncPage<MonitoredResourceDescriptor>>
+  private static ApiFuture<AsyncPage<MonitoredResourceDescriptor>>
       listMonitoredResourceDescriptorsAsync(final LoggingOptions serviceOptions,
           final Map<Option.OptionType, ?> options) {
     final ListMonitoredResourceDescriptorsRequest request =
         listMonitoredResourceDescriptorsRequest(options);
-    Future<ListMonitoredResourceDescriptorsResponse> list = serviceOptions.getRpc().list(request);
+    ApiFuture<ListMonitoredResourceDescriptorsResponse> list = serviceOptions.getRpc().list(request);
     return transform(list, new Function<ListMonitoredResourceDescriptorsResponse,
         AsyncPage<MonitoredResourceDescriptor>>() {
           @Override
@@ -349,7 +353,7 @@ public Page<MonitoredResourceDescriptor> listMonitoredResourceDescriptors(ListOp
     return get(listMonitoredResourceDescriptorsAsync(options));
   }
 
-  public Future<AsyncPage<MonitoredResourceDescriptor>> listMonitoredResourceDescriptorsAsync(
+  public ApiFuture<AsyncPage<MonitoredResourceDescriptor>> listMonitoredResourceDescriptorsAsync(
       ListOption... options) {
     return listMonitoredResourceDescriptorsAsync(getOptions(), optionMap(options));
   }
@@ -360,7 +364,7 @@ public Metric create(MetricInfo metric) {
   }
 
   @Override
-  public Future<Metric> createAsync(MetricInfo metric) {
+  public ApiFuture<Metric> createAsync(MetricInfo metric) {
     CreateLogMetricRequest request = CreateLogMetricRequest.newBuilder()
         .setParent(ProjectName.create(getOptions().getProjectId()).toString())
         .setMetric(metric.toPb())
@@ -374,7 +378,7 @@ public Metric update(MetricInfo metric) {
   }
 
   @Override
-  public Future<Metric> updateAsync(MetricInfo metric) {
+  public ApiFuture<Metric> updateAsync(MetricInfo metric) {
     UpdateLogMetricRequest request = UpdateLogMetricRequest.newBuilder()
         .setMetricName(MetricName.create(getOptions().getProjectId(), metric.getName()).toString())
         .setMetric(metric.toPb())
@@ -388,7 +392,7 @@ public Metric getMetric(String metric) {
   }
 
   @Override
-  public Future<Metric> getMetricAsync(String metric) {
+  public ApiFuture<Metric> getMetricAsync(String metric) {
     GetLogMetricRequest request = GetLogMetricRequest.newBuilder()
         .setMetricName(MetricName.create(getOptions().getProjectId(), metric).toString())
         .build();
@@ -410,10 +414,10 @@ private static ListLogMetricsRequest listMetricsRequest(LoggingOptions serviceOp
     return builder.build();
   }
 
-  private static Future<AsyncPage<Metric>> listMetricsAsync(final LoggingOptions serviceOptions,
+  private static ApiFuture<AsyncPage<Metric>> listMetricsAsync(final LoggingOptions serviceOptions,
       final Map<Option.OptionType, ?> options) {
     final ListLogMetricsRequest request = listMetricsRequest(serviceOptions, options);
-    Future<ListLogMetricsResponse> list = serviceOptions.getRpc().list(request);
+    ApiFuture<ListLogMetricsResponse> list = serviceOptions.getRpc().list(request);
     return transform(list, new Function<ListLogMetricsResponse, AsyncPage<Metric>>() {
       @Override
       public AsyncPage<Metric> apply(ListLogMetricsResponse listMetricsResponse) {
@@ -434,7 +438,7 @@ public Page<Metric> listMetrics(ListOption... options) {
   }
 
   @Override
-  public Future<AsyncPage<Metric>> listMetricsAsync(ListOption... options) {
+  public ApiFuture<AsyncPage<Metric>> listMetricsAsync(ListOption... options) {
     return listMetricsAsync(getOptions(), optionMap(options));
   }
 
@@ -444,7 +448,7 @@ public boolean deleteMetric(String metric) {
   }
 
   @Override
-  public Future<Boolean> deleteMetricAsync(String metric) {
+  public ApiFuture<Boolean> deleteMetricAsync(String metric) {
     DeleteLogMetricRequest request = DeleteLogMetricRequest.newBuilder()
         .setMetricName(MetricName.create(getOptions().getProjectId(), metric).toString())
         .build();
@@ -475,7 +479,7 @@ public void write(Iterable<LogEntry> logEntries, WriteOption... options) {
     get(writeAsync(logEntries, options));
   }
 
-  public Future<Void> writeAsync(Iterable<LogEntry> logEntries, WriteOption... options) {
+  public ApiFuture<Void> writeAsync(Iterable<LogEntry> logEntries, WriteOption... options) {
     return transform(
         rpc.write(writeLogEntriesRequest(getOptions(), logEntries, optionMap(options))),
         WRITE_RESPONSE_TO_VOID_FUNCTION);
@@ -504,10 +508,10 @@ private static ListLogEntriesRequest listLogEntriesRequest(LoggingOptions servic
     return builder.build();
   }
 
-  private static Future<AsyncPage<LogEntry>> listLogEntriesAsync(
+  private static ApiFuture<AsyncPage<LogEntry>> listLogEntriesAsync(
       final LoggingOptions serviceOptions, final Map<Option.OptionType, ?> options) {
     final ListLogEntriesRequest request = listLogEntriesRequest(serviceOptions, options);
-    Future<ListLogEntriesResponse> list = serviceOptions.getRpc().list(request);
+    ApiFuture<ListLogEntriesResponse> list = serviceOptions.getRpc().list(request);
     return transform(list, new Function<ListLogEntriesResponse, AsyncPage<LogEntry>>() {
       @Override
       public AsyncPage<LogEntry> apply(ListLogEntriesResponse listLogEntrysResponse) {
@@ -528,7 +532,7 @@ public Page<LogEntry> listLogEntries(EntryListOption... options) {
   }
 
   @Override
-  public Future<AsyncPage<LogEntry>> listLogEntriesAsync(EntryListOption... options) {
+  public ApiFuture<AsyncPage<LogEntry>> listLogEntriesAsync(EntryListOption... options) {
     return listLogEntriesAsync(getOptions(), optionMap(options));
   }
 

google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingImpl.java

@@ -18,13 +18,13 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import com.google.api.gax.core.ApiFuture;
 import com.google.common.base.Function;
 import com.google.logging.v2.LogMetric;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.util.Objects;
-import java.util.concurrent.Future;
 
 /**
  * Stackdriver Logging metrics describe logs-based metric. The value of the metric is the number of
@@ -141,13 +141,13 @@ public boolean delete() {
   }
 
   /**
-   * Sends a request for deleting this metric. This method returns a {@code Future} object to
-   * consume the result. {@link Future#get()} returns {@code true} if the metric was deleted,
+   * Sends a request for deleting this metric. This method returns a {@code ApiFuture} object to
+   * consume the result. {@link ApiFuture#get()} returns {@code true} if the metric was deleted,
    * {@code false} if it was not found.
    *
    * <p>Example of asynchronously deleting the metric.
    * <pre> {@code
-   * Future<Boolean> future = metric.deleteAsync();
+   * ApiFuture<Boolean> future = metric.deleteAsync();
    * // ...
    * boolean deleted = future.get();
    * if (deleted) {
@@ -159,7 +159,7 @@ public boolean delete() {
    *
    * @throws LoggingException upon failure
    */
-  public Future<Boolean> deleteAsync() {
+  public ApiFuture<Boolean> deleteAsync() {
     return logging.deleteMetricAsync(getName());
   }
 
@@ -183,12 +183,12 @@ public Metric reload() {
 
   /**
    * Sends a request to fetch current metric's latest information. This method returns a
-   * {@code Future} object to consume the result. {@link Future#get()} returns a {@code Metric}
+   * {@code ApiFuture} object to consume the result. {@link ApiFuture#get()} returns a {@code Metric}
    * object with latest information or {@code null} if not found.
    *
    * <p>Example of asynchronously getting the metric's latest information.
    * <pre> {@code
-   * Future<Metric> future = metric.reloadAsync();
+   * ApiFuture<Metric> future = metric.reloadAsync();
    * // ...
    * Metric latestMetric = future.get();
    * if (latestMetric == null) {
@@ -198,7 +198,7 @@ public Metric reload() {
    *
    * @throws LoggingException upon failure
    */
-  public Future<Metric> reloadAsync() {
+  public ApiFuture<Metric> reloadAsync() {
     return logging.getMetricAsync(getName());
   }
 
@@ -222,12 +222,12 @@ public Metric update() {
 
   /**
    * Sends a request to update current metric. If the metric does not exist, it is created. This
-   * method returns a {@code Future} object to consume the result. {@link Future#get()} returns a
+   * method returns a {@code ApiFuture} object to consume the result. {@link ApiFuture#get()} returns a
    * {@code Metric} object with updated information.
    *
    * <p>Example of asynchronously updating the metric's information.
    * <pre> {@code
-   * Future<Metric> future = metric.toBuilder()
+   * ApiFuture<Metric> future = metric.toBuilder()
    *     .setDescription("A more detailed description")
    *     .build()
    *     .updateAsync();
@@ -237,7 +237,7 @@ public Metric update() {
    *
    * @throws LoggingException upon failure
    */
-  public Future<Metric> updateAsync() {
+  public ApiFuture<Metric> updateAsync() {
     return logging.updateAsync(this);
   }