small clean up

mutianf · mutianf · commit 757d12b3d373 · 2020-12-10T01:14:37.000Z
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/HeaderTracerStreamingCallable.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/HeaderTracerStreamingCallable.java
@@ -44,19 +44,16 @@ public class HeaderTracerStreamingCallable<RequestT, ResponseT>
     extends ServerStreamingCallable<RequestT, ResponseT> {
 
   private final ServerStreamingCallable<RequestT, ResponseT> innerCallable;
-  private HeaderTracer headerTracer;
-  private String spanName;
+  private final HeaderTracer headerTracer;
+  private final String spanName;
 
   public HeaderTracerStreamingCallable(
       @Nonnull ServerStreamingCallable<RequestT, ResponseT> callable,
       @Nonnull HeaderTracer headerTracer,
       @Nonnull String spanName) {
-    Preconditions.checkNotNull(callable, "Inner callable must be set");
-    Preconditions.checkNotNull(headerTracer, "HeaderTracer must be set");
-    Preconditions.checkNotNull(spanName, "Span name must be set");
-    this.innerCallable = callable;
-    this.headerTracer = headerTracer;
-    this.spanName = spanName;
+    this.innerCallable = Preconditions.checkNotNull(callable, "Inner callable must be set");
+    this.headerTracer = Preconditions.checkNotNull(headerTracer, "HeaderTracer must be set");
+    this.spanName = Preconditions.checkNotNull(spanName, "Span name must be set");
   }
 
   @Override
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/HeaderTracerUnaryCallable.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/metrics/HeaderTracerUnaryCallable.java
@@ -44,19 +44,16 @@ public class HeaderTracerUnaryCallable<RequestT, ResponseT>
     extends UnaryCallable<RequestT, ResponseT> {
 
   private final UnaryCallable<RequestT, ResponseT> innerCallable;
-  private HeaderTracer headerTracer;
-  private String spanName;
+  private final HeaderTracer headerTracer;
+  private final String spanName;
 
   public HeaderTracerUnaryCallable(
       @Nonnull UnaryCallable<RequestT, ResponseT> innerCallable,
       @Nonnull HeaderTracer headerTracer,
       @Nonnull String spanName) {
-    Preconditions.checkNotNull(innerCallable, "Inner callable must be set");
-    Preconditions.checkNotNull(headerTracer, "HeaderTracer must be set");
-    Preconditions.checkNotNull(spanName, "Span name must be set");
-    this.innerCallable = innerCallable;
-    this.headerTracer = headerTracer;
-    this.spanName = spanName;
+    this.innerCallable = Preconditions.checkNotNull(innerCallable, "Inner callable must be set");
+    this.headerTracer = Preconditions.checkNotNull(headerTracer, "HeaderTracer must be set");
+    this.spanName = Preconditions.checkNotNull(spanName, "Span name must be set");
   }
 
   @Override
