refactor

Author: blakeli0

sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/ApiTracerContext.java

@@ -37,6 +37,7 @@
 import com.google.common.base.Strings;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.function.Supplier;
 import javax.annotation.Nullable;
 
 /**
@@ -164,17 +165,16 @@ String rpcSystemName() {
   @Nullable
   public abstract String urlDomain();
 
-  @InternalApi
   @Nullable
-  protected abstract java.util.function.Supplier<String> destinationResourceIdSupplier();
+  protected abstract Supplier<String> destinationResourceIdSupplier();
 
   /**
    * The destination resource id of the request (e.g.
    * //pubsub.googleapis.com/projects/p/locations/l/topics/t).
    */
   @Nullable
   public String destinationResourceId() {
-    java.util.function.Supplier<String> supplier = destinationResourceIdSupplier();
+    Supplier<String> supplier = destinationResourceIdSupplier();
     if (supplier == null) {
       return null;
     }
@@ -188,7 +188,7 @@ public String destinationResourceId() {
     return "//" + urlDomain() + "/" + resourceId;
   }
 
-  public <RequestT> ApiTracerContext withResourceNameExtraction(
+  <RequestT> ApiTracerContext withResourceNameExtractor(
       @Nullable RequestT request,
       @Nullable com.google.api.gax.rpc.ResourceNameExtractor<RequestT> extractor) {
     if (extractor == null || request == null) {
@@ -361,7 +361,7 @@ public abstract static class Builder {
     public abstract Builder setUrlDomain(@Nullable String urlDomain);
 
     public abstract Builder setDestinationResourceIdSupplier(
-        @Nullable java.util.function.Supplier<String> destinationResourceIdSupplier);
+        @Nullable Supplier<String> destinationResourceIdSupplier);
 
     public abstract ApiTracerContext build();
   }

sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/TracedUnaryCallable.java

@@ -91,7 +91,7 @@ public ApiFuture<ResponseT> futureCall(RequestT request, ApiCallContext context)
       tracer =
           tracerFactory.newTracer(
               context.getTracer(),
-              apiTracerContext.withResourceNameExtraction(request, resourceNameExtractor));
+              apiTracerContext.withResourceNameExtractor(request, resourceNameExtractor));
     } else {
       tracer = tracerFactory.newTracer(context.getTracer(), spanName, OperationType.Unary);
     }

sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/tracing/ApiTracerContextTest.java

@@ -461,25 +461,25 @@ void testDestinationResourceId_withoutUrlDomain() {
   }
 
   @Test
-  void testWithResourceNameExtraction_nullExtractor() {
+  void testWithResourceNameExtractor_nullExtractor() {
     ApiTracerContext context = ApiTracerContext.empty();
-    ApiTracerContext result = context.withResourceNameExtraction("request", null);
+    ApiTracerContext result = context.withResourceNameExtractor("request", null);
     assertThat(result).isSameInstanceAs(context);
   }
 
   @Test
-  void testWithResourceNameExtraction_extractorReturnsNull() {
+  void testWithResourceNameExtractor_extractorReturnsNull() {
     ApiTracerContext context = ApiTracerContext.empty();
-    ApiTracerContext result = context.withResourceNameExtraction("request", req -> null);
+    ApiTracerContext result = context.withResourceNameExtractor("request", req -> null);
     assertThat(result.destinationResourceId()).isNull();
   }
 
   @Test
-  void testWithResourceNameExtraction_lazyExtraction() {
+  void testWithResourceNameExtraction_lazyExtractor() {
     ApiTracerContext context = ApiTracerContext.empty();
     boolean[] extracted = {false};
     ApiTracerContext result =
-        context.withResourceNameExtraction(
+        context.withResourceNameExtractor(
             "request",
             req -> {
               extracted[0] = true;
@@ -492,10 +492,10 @@ void testWithResourceNameExtraction_lazyExtraction() {
   }
 
   @Test
-  void testWithResourceNameExtraction_extractorThrowsException() {
+  void testWithResourceNameExtractor_extractorThrowsException() {
     ApiTracerContext context = ApiTracerContext.empty();
     ApiTracerContext result =
-        context.withResourceNameExtraction(
+        context.withResourceNameExtractor(
             "request",
             req -> {
               throw new RuntimeException("Intentional mock extraction failure");
@@ -522,7 +522,7 @@ void testMerge_preservesLaziness() {
     boolean[] extracted = {false};
     ApiTracerContext context2 =
         ApiTracerContext.empty()
-            .withResourceNameExtraction(
+            .withResourceNameExtractor(
                 "request",
                 req -> {
                   extracted[0] = true;
@@ -540,7 +540,7 @@ void testDestinationResourceId_evaluatedEveryTime() {
     ApiTracerContext context = ApiTracerContext.empty();
     int[] counter = {0};
     ApiTracerContext result =
-        context.withResourceNameExtraction(
+        context.withResourceNameExtractor(
             "request",
             req -> {
               counter[0]++;