Make the attribute functions more compact and easily understandable.

Author: visumickey

firebase-perf/src/main/java/com/google/firebase/perf/FirebasePerformance.java

@@ -14,6 +14,8 @@
 
 package com.google.firebase.perf;
 
+import static com.google.firebase.perf.metrics.validator.PerfMetricValidator.*;
+
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
@@ -364,7 +366,7 @@ private void checkAttribute(@Nullable String key, @Nullable String value) {
               Constants.MAX_TRACE_CUSTOM_ATTRIBUTES));
     }
 
-    PerfMetricValidator.validateAttribute(new AbstractMap.SimpleEntry<>(key, value));
+    validateAttribute(key, value);
   }
 
   /**

firebase-perf/src/main/java/com/google/firebase/perf/metrics/HttpMetric.java

@@ -14,6 +14,8 @@
 
 package com.google.firebase.perf.metrics;
 
+import static com.google.firebase.perf.metrics.validator.PerfMetricValidator.*;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.firebase.perf.FirebasePerformance.HttpMethod;
@@ -195,7 +197,7 @@ private void checkAttribute(@NonNull String key, @NonNull String value) {
               "Exceeds max limit of number of attributes - %d",
               Constants.MAX_TRACE_CUSTOM_ATTRIBUTES));
     }
-    PerfMetricValidator.validateAttribute(new AbstractMap.SimpleEntry<>(key, value));
+    validateAttribute(key, value);
   }
 
   /**

firebase-perf/src/main/java/com/google/firebase/perf/metrics/Trace.java

@@ -641,7 +641,7 @@ private void checkAttribute(@NonNull String key, @NonNull String value) {
               "Exceeds max limit of number of attributes - %d",
               Constants.MAX_TRACE_CUSTOM_ATTRIBUTES));
     }
-    validateAttribute(new AbstractMap.SimpleEntry<>(key, value));
+    validateAttribute(key, value);
   }
 
   /**

firebase-perf/src/main/java/com/google/firebase/perf/metrics/validator/FirebasePerfTraceValidator.java

@@ -14,6 +14,8 @@
 
 package com.google.firebase.perf.metrics.validator;
 
+import static com.google.firebase.perf.metrics.validator.PerfMetricValidator.*;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.firebase.perf.logging.AndroidLogger;
@@ -144,7 +146,7 @@ private boolean isValidTrace(@Nullable TraceMetric trace, int deep) {
         return false;
       }
     }
-    if (!hasValidAttributes(trace.getCustomAttributesMap())) {
+    if (!areAllAttributesValid(trace.getCustomAttributesMap())) {
       return false;
     }
     return true;
@@ -178,10 +180,10 @@ private boolean isValidCounterId(@Nullable String counterId) {
     return true;
   }
 
-  private boolean hasValidAttributes(Map<String, String> customAttributes) {
+  private boolean areAllAttributesValid(Map<String, String> customAttributes) {
     for (Map.Entry<String, String> entry : customAttributes.entrySet()) {
       try {
-        PerfMetricValidator.validateAttribute(entry);
+        validateAttribute(entry.getKey(), entry.getValue());
       } catch (IllegalArgumentException exception) {
         logger.warn(exception.getLocalizedMessage());
         return false;

firebase-perf/src/main/java/com/google/firebase/perf/metrics/validator/PerfMetricValidator.java

@@ -135,14 +135,13 @@ public static String validateMetricName(@Nullable String str) {
   /**
    * Checks whether the given map entry fits key/value constraints for a Trace Attribute.
    *
-   * @param attribute A key/value pair for an Attribute
+   * @param key Key for the Attribute
+   * @param value Value for the Attribute
    * @return null if the entry can be used as an Attribute, if not, an error string explaining why
    *     it can't be used.
    */
   @Nullable
-  public static void validateAttribute(@NonNull Map.Entry<String, String> attribute) {
-    String key = attribute.getKey();
-    String value = attribute.getValue();
+  public static void validateAttribute(@NonNull String key, @NonNull String value) {
     if (key == null || key.length() == 0) {
       throw new IllegalArgumentException("Attribute key must not be null or empty");
     }