Cleaning up null handling - reducing diff size

Author: dougqh

dd-trace-core/src/main/java/datadog/trace/common/metrics/MetricKey.java

@@ -2,11 +2,10 @@
 
 import static datadog.trace.bootstrap.instrumentation.api.UTF8BytesString.EMPTY;
 
-import datadog.trace.api.cache.DDCaches;
 import datadog.trace.api.cache.DDCache;
+import datadog.trace.api.cache.DDCaches;
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
 import datadog.trace.util.HashingUtils;
-
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
@@ -15,13 +14,15 @@
 public final class MetricKey {
   static final DDCache<String, UTF8BytesString> RESOURCE_CACHE = DDCaches.newFixedSizeCache(32);
   static final DDCache<String, UTF8BytesString> SERVICE_CACHE = DDCaches.newFixedSizeCache(8);
-  static final DDCache<String, UTF8BytesString> SERVICE_SOURCE_CACHE = DDCaches.newFixedSizeCache(16);
+  static final DDCache<String, UTF8BytesString> SERVICE_SOURCE_CACHE =
+      DDCaches.newFixedSizeCache(16);
   static final DDCache<String, UTF8BytesString> OPERATION_CACHE = DDCaches.newFixedSizeCache(64);
   static final DDCache<String, UTF8BytesString> TYPE_CACHE = DDCaches.newFixedSizeCache(8);
   static final DDCache<String, UTF8BytesString> KIND_CACHE = DDCaches.newFixedSizeCache(8);
   static final DDCache<String, UTF8BytesString> HTTP_METHOD_CACHE = DDCaches.newFixedSizeCache(8);
-  static final DDCache<String, UTF8BytesString> HTTP_ENDPOINT_CACHE = DDCaches.newFixedSizeCache(32);
-  
+  static final DDCache<String, UTF8BytesString> HTTP_ENDPOINT_CACHE =
+      DDCaches.newFixedSizeCache(32);
+
   private final UTF8BytesString resource;
   private final UTF8BytesString service;
   private final UTF8BytesString serviceSource;
@@ -49,19 +50,19 @@ public MetricKey(
       List<UTF8BytesString> peerTags,
       CharSequence httpMethod,
       CharSequence httpEndpoint) {
-    this.resource = resource == null ? EMPTY : utf8(RESOURCE_CACHE, resource);
-    this.service = service == null ? EMPTY : utf8(SERVICE_CACHE, service);
-    this.serviceSource = serviceSource == null ? null : utf8(SERVICE_SOURCE_CACHE, serviceSource);
-    this.operationName = operationName == null ? EMPTY : utf8(OPERATION_CACHE, operationName);
-    this.type = utf8(TYPE_CACHE, type);
+    this.resource = null == resource ? EMPTY : utf8(RESOURCE_CACHE, resource);
+    this.service = null == service ? EMPTY : utf8(SERVICE_CACHE, service);
+    this.serviceSource = null == serviceSource ? null : utf8(SERVICE_SOURCE_CACHE, serviceSource);
+    this.operationName = null == operationName ? EMPTY : utf8(OPERATION_CACHE, operationName);
+    this.type = null == type ? EMPTY : utf8(TYPE_CACHE, type);
     this.httpStatusCode = httpStatusCode;
     this.synthetics = synthetics;
     this.isTraceRoot = isTraceRoot;
     this.spanKind = null == spanKind ? EMPTY : utf8(KIND_CACHE, spanKind);
     this.peerTags = peerTags == null ? Collections.emptyList() : peerTags;
     this.httpMethod = httpMethod == null ? null : utf8(HTTP_METHOD_CACHE, httpMethod);
     this.httpEndpoint = httpEndpoint == null ? null : utf8(HTTP_ENDPOINT_CACHE, httpEndpoint);
-    
+
     int tmpHash = 0;
     tmpHash = HashingUtils.addToHash(tmpHash, this.isTraceRoot);
     tmpHash = HashingUtils.addToHash(tmpHash, this.spanKind);
@@ -77,13 +78,13 @@ public MetricKey(
     tmpHash = HashingUtils.addToHash(tmpHash, this.httpMethod);
     this.hash = tmpHash;
   }
-  
+
   static UTF8BytesString utf8(DDCache<String, UTF8BytesString> cache, CharSequence charSeq) {
-	if ( charSeq instanceof UTF8BytesString ) {
-	  return (UTF8BytesString)charSeq;
-	} else {
-	  return cache.computeIfAbsent(charSeq.toString(), UTF8BytesString::create);
-	}
+    if (charSeq instanceof UTF8BytesString) {
+      return (UTF8BytesString) charSeq;
+    } else {
+      return cache.computeIfAbsent(charSeq.toString(), UTF8BytesString::create);
+    }
   }
 
   public UTF8BytesString getResource() {