Move validators inside metrics package to make it more self contained.

Author: visumickey

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

@@ -34,11 +34,11 @@
 import com.google.firebase.perf.logging.AndroidLogger;
 import com.google.firebase.perf.metrics.HttpMetric;
 import com.google.firebase.perf.metrics.Trace;
+import com.google.firebase.perf.metrics.validator.PerfMetricValidator;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Constants;
 import com.google.firebase.perf.util.ImmutableBundle;
 import com.google.firebase.perf.util.Timer;
-import com.google.firebase.perf.validator.PerfMetricValidator;
 import com.google.firebase.remoteconfig.RemoteConfigComponent;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

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

@@ -21,10 +21,10 @@
 import com.google.firebase.perf.config.ConfigResolver;
 import com.google.firebase.perf.impl.NetworkRequestMetricBuilder;
 import com.google.firebase.perf.logging.AndroidLogger;
+import com.google.firebase.perf.metrics.validator.PerfMetricValidator;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Constants;
 import com.google.firebase.perf.util.Timer;
-import com.google.firebase.perf.validator.PerfMetricValidator;
 import java.net.URL;
 import java.util.AbstractMap;
 import java.util.HashMap;

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

@@ -29,11 +29,11 @@
 import com.google.firebase.perf.internal.SessionAwareObject;
 import com.google.firebase.perf.internal.SessionManager;
 import com.google.firebase.perf.logging.AndroidLogger;
+import com.google.firebase.perf.metrics.validator.PerfMetricValidator;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Clock;
 import com.google.firebase.perf.util.Constants;
 import com.google.firebase.perf.util.Timer;
-import com.google.firebase.perf.validator.PerfMetricValidator;
 import java.lang.ref.WeakReference;
 import java.util.AbstractMap;
 import java.util.ArrayList;

firebase-perf/src/main/java/com/google/firebase/perf/validator/FirebasePerfApplicationInfoValidator.java renamed to firebase-perf/src/main/java/com/google/firebase/perf/metrics/validator/FirebasePerfApplicationInfoValidator.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.perf.validator;
+package com.google.firebase.perf.metrics.validator;
 
 import com.google.firebase.perf.logging.AndroidLogger;
 import com.google.firebase.perf.v1.ApplicationInfo;

firebase-perf/src/main/java/com/google/firebase/perf/validator/FirebasePerfGaugeMetricValidator.java renamed to firebase-perf/src/main/java/com/google/firebase/perf/metrics/validator/FirebasePerfGaugeMetricValidator.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.perf.validator;
+package com.google.firebase.perf.metrics.validator;
 
 import com.google.firebase.perf.v1.GaugeMetric;
 import com.google.firebase.perf.v1.PerfMetric;

firebase-perf/src/main/java/com/google/firebase/perf/validator/FirebasePerfNetworkValidator.java renamed to firebase-perf/src/main/java/com/google/firebase/perf/metrics/validator/FirebasePerfNetworkValidator.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.perf.validator;
+package com.google.firebase.perf.metrics.validator;
 
 import android.content.Context;
 import androidx.annotation.NonNull;

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

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.perf.validator;
+package com.google.firebase.perf.metrics.validator;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

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

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.perf.validator;
+package com.google.firebase.perf.metrics.validator;
 
 import android.content.Context;
 import androidx.annotation.NonNull;

firebase-perf/src/main/java/com/google/firebase/perf/transport/TransportManager.java

@@ -36,6 +36,7 @@
 import com.google.firebase.perf.internal.AppStateMonitor.AppStateCallback;
 import com.google.firebase.perf.internal.SessionManager;
 import com.google.firebase.perf.logging.AndroidLogger;
+import com.google.firebase.perf.metrics.validator.PerfMetricValidator;
 import com.google.firebase.perf.util.Constants;
 import com.google.firebase.perf.util.Constants.CounterNames;
 import com.google.firebase.perf.v1.AndroidApplicationInfo;
@@ -46,7 +47,6 @@
 import com.google.firebase.perf.v1.PerfMetric;
 import com.google.firebase.perf.v1.PerfMetricOrBuilder;
 import com.google.firebase.perf.v1.TraceMetric;
-import com.google.firebase.perf.validator.PerfMetricValidator;
 import java.lang.ref.WeakReference;
 import java.util.Collections;
 import java.util.Locale;

firebase-perf/src/test/java/com/google/firebase/perf/validator/FirebasePerfApplicationInfoValidatorTest.java renamed to firebase-perf/src/test/java/com/google/firebase/perf/metrics/validator/FirebasePerfApplicationInfoValidatorTest.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.perf.validator;
+package com.google.firebase.perf.metrics.validator;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -24,7 +24,8 @@
 import org.robolectric.RobolectricTestRunner;
 
 /**
- * Unit tests for {@link com.google.firebase.perf.validator.FirebasePerfApplicationInfoValidator}.
+ * Unit tests for {@link
+ * com.google.firebase.perf.metrics.validator.FirebasePerfApplicationInfoValidator}.
  */
 @RunWith(RobolectricTestRunner.class)
 public class FirebasePerfApplicationInfoValidatorTest {

firebase-perf/src/test/java/com/google/firebase/perf/validator/FirebasePerfGaugeManagerValidatorTest.java renamed to firebase-perf/src/test/java/com/google/firebase/perf/metrics/validator/FirebasePerfGaugeManagerValidatorTest.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.perf.validator;
+package com.google.firebase.perf.metrics.validator;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -27,7 +27,10 @@
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 
-/** Unit tests for {@link com.google.firebase.perf.validator.FirebasePerfGaugeMetricValidator}. */
+/**
+ * Unit tests for {@link
+ * com.google.firebase.perf.metrics.validator.FirebasePerfGaugeMetricValidator}.
+ */
 @RunWith(RobolectricTestRunner.class)
 public final class FirebasePerfGaugeManagerValidatorTest {
 

firebase-perf/src/test/java/com/google/firebase/perf/validator/FirebasePerfNetworkValidatorTest.java renamed to firebase-perf/src/test/java/com/google/firebase/perf/metrics/validator/FirebasePerfNetworkValidatorTest.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.perf.validator;
+package com.google.firebase.perf.metrics.validator;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertFalse;
@@ -29,7 +29,9 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 
-/** Unit tests for {@link com.google.firebase.perf.validator.FirebasePerfNetworkValidator}. */
+/**
+ * Unit tests for {@link com.google.firebase.perf.metrics.validator.FirebasePerfNetworkValidator}.
+ */
 @RunWith(RobolectricTestRunner.class)
 public class FirebasePerfNetworkValidatorTest extends FirebasePerformanceTestBase {
   private final FirebasePerfNetworkValidator validator =

firebase-perf/src/test/java/com/google/firebase/perf/validator/FirebasePerfTraceValidatorTest.java renamed to firebase-perf/src/test/java/com/google/firebase/perf/metrics/validator/FirebasePerfTraceValidatorTest.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.perf.validator;
+package com.google.firebase.perf.metrics.validator;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.doAnswer;
@@ -39,7 +39,7 @@
 import org.mockito.stubbing.Answer;
 import org.robolectric.RobolectricTestRunner;
 
-/** Unit tests for {@link com.google.firebase.perf.validator.FirebasePerfTraceValidator}. */
+/** Unit tests for {@link com.google.firebase.perf.metrics.validator.FirebasePerfTraceValidator}. */
 @RunWith(RobolectricTestRunner.class)
 public class FirebasePerfTraceValidatorTest extends FirebasePerformanceTestBase {