style: format and use convenience constructor in tests

Author: blakeli0

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

@@ -80,6 +80,13 @@ public TracedUnaryCallable(
     this.resourceNameExtractor = resourceNameExtractor;
   }
 
+  TracedUnaryCallable(
+      UnaryCallable<RequestT, ResponseT> innerCallable,
+      ApiTracerFactory tracerFactory,
+      ApiTracerContext apiTracerContext) {
+    this(innerCallable, tracerFactory, apiTracerContext, null);
+  }
+
   /**
    * Calls the wrapped {@link UnaryCallable} within the context of a new trace.
    *

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

@@ -56,7 +56,7 @@
 
 @ExtendWith(MockitoExtension.class)
 class TracedCallableTest {
-  private static final SpanName SPAN_NAME = SpanName.of("FakeClient", "FakeRpc");
+
   private static final ApiTracerContext TRACER_CONTEXT =
       ApiTracerContext.newBuilder()
           .setFullMethodName("FakeClient/FakeRpc")
@@ -94,7 +94,7 @@ public UnaryCallable<String, String> setupTracedUnaryCallable(
       UnaryCallSettings<Object, Object> callSettings) {
     UnaryCallable<String, String> callable =
         Callables.retrying(innerCallable, callSettings, clientContext);
-    return new TracedUnaryCallable<>(callable, tracerFactory, TRACER_CONTEXT, null);
+    return new TracedUnaryCallable<>(callable, tracerFactory, TRACER_CONTEXT);
   }
 
   @Test

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

@@ -53,7 +53,7 @@
 
 @ExtendWith(MockitoExtension.class)
 class TracedUnaryCallableTest {
-  private static final SpanName SPAN_NAME = SpanName.of("FakeClient", "FakeRpc");
+
   private static final ApiTracerContext TRACER_CONTEXT =
       ApiTracerContext.newBuilder()
           .setFullMethodName("FakeClient/FakeRpc")
@@ -77,8 +77,7 @@ void init() {
     // Wire the mock tracer factory
     when(tracerFactory.newTracer(any(ApiTracer.class), any(ApiTracerContext.class)))
         .thenReturn(tracer);
-    tracedUnaryCallable =
-        new TracedUnaryCallable<>(innerCallable, tracerFactory, TRACER_CONTEXT, null);
+    tracedUnaryCallable = new TracedUnaryCallable<>(innerCallable, tracerFactory, TRACER_CONTEXT);
 
     // Wire the mock inner callable
     innerResult = SettableApiFuture.create();
@@ -98,13 +97,12 @@ void testTracerCreated() {
   void testOperationTypeIsSet() {
     when(tracerFactory.newTracer(any(ApiTracer.class), any(ApiTracerContext.class)))
         .thenReturn(tracer);
-    tracedUnaryCallable =
-        new TracedUnaryCallable<>(innerCallable, tracerFactory, TRACER_CONTEXT, null);
+    tracedUnaryCallable = new TracedUnaryCallable<>(innerCallable, tracerFactory, TRACER_CONTEXT);
     ApiTracerContext contextWithWrongType =
         TRACER_CONTEXT.toBuilder().setOperationType(OperationType.BidiStreaming).build();
 
     tracedUnaryCallable =
-        new TracedUnaryCallable<>(innerCallable, tracerFactory, contextWithWrongType, null);
+        new TracedUnaryCallable<>(innerCallable, tracerFactory, contextWithWrongType);
 
     innerResult = SettableApiFuture.create();
     when(innerCallable.futureCall(anyString(), any(ApiCallContext.class))).thenReturn(innerResult);