improvisiong

Author: nsahai8

core/src/main/java/com/expedia/www/haystack/client/SpanContext.java

@@ -16,6 +16,7 @@
  */
 package com.expedia.www.haystack.client;
 
+import org.apache.commons.lang3.Validate;
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -44,9 +45,7 @@ public SpanContext(UUID traceId, UUID spanId, UUID parentId, boolean extractedCo
     }
 
     SpanContext(UUID traceId, UUID spanId, UUID parentId, Map<String, String> baggage, boolean extractedContext) {
-        if (baggage == null) {
-            throw new NullPointerException();
-        }
+        Validate.notNull(baggage);
 
         this.traceId = traceId;
         this.spanId = spanId;
@@ -57,9 +56,7 @@ public SpanContext(UUID traceId, UUID spanId, UUID parentId, boolean extractedCo
 
 
     SpanContext(Object traceId, Object spanId, Object parentId, Map<String, String> baggage, boolean extractedContext) {
-        if (baggage == null) {
-            throw new NullPointerException();
-        }
+        Validate.notNull(baggage);
 
         this.traceId = traceId;
         this.spanId = spanId;