This library does not depend on GAX (#200)

elharo · web-flow · commit 319553eb18e4 · 2021-03-02T12:05:25.000-08:00
diff --git a/src/main/java/com/google/api/core/AbstractApiService.java b/src/main/java/com/google/api/core/AbstractApiService.java
@@ -38,11 +38,11 @@
 import java.util.concurrent.TimeoutException;
 
 /**
- * Base class for {@link ApiService}. Similar to Guava's {@code AbstractService} but redeclared to
+ * Base class for {@link ApiService}. Similar to Guava's {@code AbstractService} but redeclared so
  * that Guava can be shaded.
  */
 public abstract class AbstractApiService implements ApiService {
-  private static final ImmutableMap<Service.State, ApiService.State> guavaToGaxState =
+  private static final ImmutableMap<Service.State, ApiService.State> GUAVA_TO_API_SERVICE_STATE =
       ImmutableMap.<Service.State, ApiService.State>builder()
           .put(Service.State.FAILED, ApiService.State.FAILED)
           .put(Service.State.NEW, ApiService.State.NEW)
@@ -66,7 +66,7 @@ public void addListener(final ApiService.Listener listener, Executor executor) {
         new Service.Listener() {
           @Override
           public void failed(Service.State from, Throwable failure) {
-            listener.failed(guavaToGaxState.get(from), failure);
+            listener.failed(GUAVA_TO_API_SERVICE_STATE.get(from), failure);
           }
 
           @Override
@@ -81,12 +81,12 @@ public void starting() {
 
           @Override
           public void stopping(Service.State from) {
-            listener.stopping(guavaToGaxState.get(from));
+            listener.stopping(GUAVA_TO_API_SERVICE_STATE.get(from));
           }
 
           @Override
           public void terminated(Service.State from) {
-            listener.terminated(guavaToGaxState.get(from));
+            listener.terminated(GUAVA_TO_API_SERVICE_STATE.get(from));
           }
         },
         executor);
@@ -122,7 +122,7 @@ public ApiService startAsync() {
   }
 
   public State state() {
-    return guavaToGaxState.get(impl.state());
+    return GUAVA_TO_API_SERVICE_STATE.get(impl.state());
   }
 
   public ApiService stopAsync() {
diff --git a/src/main/java/com/google/api/core/ApiFutureToListenableFuture.java b/src/main/java/com/google/api/core/ApiFutureToListenableFuture.java
@@ -37,7 +37,7 @@
 import java.util.concurrent.TimeoutException;
 
 /**
- * INTERNAL USE ONLY. Adapter from GAX ApiFuture to Guava ListenableFuture.
+ * INTERNAL USE ONLY. Adapter from ApiFuture to Guava ListenableFuture.
  */
 @InternalApi
 public class ApiFutureToListenableFuture<V> implements ListenableFuture<V> {
diff --git a/src/main/java/com/google/api/core/ApiFutures.java b/src/main/java/com/google/api/core/ApiFutures.java
@@ -99,7 +99,7 @@ public static <V, X extends Throwable> ApiFuture<V> catching(
         Futures.catching(
             listenableFutureForApiFuture(input),
             exceptionType,
-            new GaxFunctionToGuavaFunction<X, V>(callback),
+            new ApiFunctionToGuavaFunction<X, V>(callback),
             executor);
     return new ListenableFutureToApiFuture<V>(catchingFuture);
   }
@@ -156,7 +156,7 @@ public static <V, X> ApiFuture<X> transform(
     return new ListenableFutureToApiFuture<>(
         Futures.transform(
             listenableFutureForApiFuture(input),
-            new GaxFunctionToGuavaFunction<V, X>(function),
+            new ApiFunctionToGuavaFunction<V, X>(function),
             executor));
   }
 
@@ -226,11 +226,11 @@ private static <V> ListenableFuture<V> listenableFutureForApiFuture(ApiFuture<V>
     return listenableFuture;
   }
 
-  private static class GaxFunctionToGuavaFunction<X, V>
+  private static class ApiFunctionToGuavaFunction<X, V>
       implements com.google.common.base.Function<X, V> {
     private ApiFunction<? super X, ? extends V> f;
 
-    public GaxFunctionToGuavaFunction(ApiFunction<? super X, ? extends V> f) {
+    public ApiFunctionToGuavaFunction(ApiFunction<? super X, ? extends V> f) {
       this.f = f;
     }
 
diff --git a/src/main/java/com/google/api/core/ListenableFutureToApiFuture.java b/src/main/java/com/google/api/core/ListenableFutureToApiFuture.java
@@ -34,7 +34,7 @@
 import com.google.common.util.concurrent.ListenableFuture;
 
 /**
- * INTERNAL USE ONLY. Adapter from Guava ListenableFuture to GAX ApiFuture.
+ * INTERNAL USE ONLY. Adapter from Guava ListenableFuture to ApiFuture.
  */
 @InternalApi
 public class ListenableFutureToApiFuture<V> extends SimpleForwardingListenableFuture<V>
