Move the NetworkRequestBuilder package inside metrics to unify the builders. (#2526)

Author: visumickey

firebase-perf/src/main/java/com/google/firebase/perf/impl/package-info.java

@@ -19,7 +19,6 @@
 import com.google.firebase.perf.FirebasePerformance.HttpMethod;
 import com.google.firebase.perf.FirebasePerformanceAttributable;
 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;

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

@@ -1,9 +1,9 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
-//
 // You may obtain a copy of the License at
+//
 //      http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.perf.impl;
+package com.google.firebase.perf.metrics;
 
 import static com.google.firebase.perf.network.NetworkRequestMetricBuilderUtil.isAllowedUserAgent;
 
@@ -25,7 +25,6 @@
 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.HttpMetric;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Constants;
 import com.google.firebase.perf.util.Timer;

firebase-perf/src/main/java/com/google/firebase/perf/impl/NetworkRequestMetricBuilder.java renamed to firebase-perf/src/main/java/com/google/firebase/perf/metrics/NetworkRequestMetricBuilder.java

@@ -15,7 +15,7 @@
 package com.google.firebase.perf.network;
 
 import androidx.annotation.Keep;
-import com.google.firebase.perf.impl.NetworkRequestMetricBuilder;
+import com.google.firebase.perf.metrics.NetworkRequestMetricBuilder;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Timer;
 import java.io.IOException;

firebase-perf/src/main/java/com/google/firebase/perf/network/FirebasePerfHttpClient.java

@@ -15,7 +15,7 @@
 package com.google.firebase.perf.network;
 
 import androidx.annotation.Keep;
-import com.google.firebase.perf.impl.NetworkRequestMetricBuilder;
+import com.google.firebase.perf.metrics.NetworkRequestMetricBuilder;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Timer;
 import java.io.IOException;

firebase-perf/src/main/java/com/google/firebase/perf/network/FirebasePerfOkHttpClient.java

@@ -15,7 +15,7 @@
 package com.google.firebase.perf.network;
 
 import androidx.annotation.Keep;
-import com.google.firebase.perf.impl.NetworkRequestMetricBuilder;
+import com.google.firebase.perf.metrics.NetworkRequestMetricBuilder;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Timer;
 import com.google.firebase.perf.util.URLWrapper;

firebase-perf/src/main/java/com/google/firebase/perf/network/FirebasePerfUrlConnection.java

@@ -14,7 +14,7 @@
 
 package com.google.firebase.perf.network;
 
-import com.google.firebase.perf.impl.NetworkRequestMetricBuilder;
+import com.google.firebase.perf.metrics.NetworkRequestMetricBuilder;
 import com.google.firebase.perf.util.Timer;
 import java.io.IOException;
 import java.io.InputStream;

firebase-perf/src/main/java/com/google/firebase/perf/network/InstrHttpInputStream.java

@@ -14,7 +14,7 @@
 
 package com.google.firebase.perf.network;
 
-import com.google.firebase.perf.impl.NetworkRequestMetricBuilder;
+import com.google.firebase.perf.metrics.NetworkRequestMetricBuilder;
 import com.google.firebase.perf.util.Timer;
 import java.io.IOException;
 import java.io.OutputStream;

firebase-perf/src/main/java/com/google/firebase/perf/network/InstrHttpOutputStream.java

@@ -14,7 +14,7 @@
 
 package com.google.firebase.perf.network;
 
-import com.google.firebase.perf.impl.NetworkRequestMetricBuilder;
+import com.google.firebase.perf.metrics.NetworkRequestMetricBuilder;
 import com.google.firebase.perf.util.Timer;
 import java.io.IOException;
 import java.io.InputStream;

firebase-perf/src/main/java/com/google/firebase/perf/network/InstrHttpURLConnection.java

@@ -14,7 +14,7 @@
 
 package com.google.firebase.perf.network;
 
-import com.google.firebase.perf.impl.NetworkRequestMetricBuilder;
+import com.google.firebase.perf.metrics.NetworkRequestMetricBuilder;
 import com.google.firebase.perf.util.Timer;
 import java.io.IOException;
 import java.io.InputStream;

firebase-perf/src/main/java/com/google/firebase/perf/network/InstrHttpsURLConnection.java

@@ -15,8 +15,8 @@
 package com.google.firebase.perf.network;
 
 import android.os.Build;
-import com.google.firebase.perf.impl.NetworkRequestMetricBuilder;
 import com.google.firebase.perf.logging.AndroidLogger;
+import com.google.firebase.perf.metrics.NetworkRequestMetricBuilder;
 import com.google.firebase.perf.util.Timer;
 import java.io.IOException;
 import java.io.InputStream;

firebase-perf/src/main/java/com/google/firebase/perf/network/InstrURLConnectionBase.java

@@ -14,7 +14,7 @@
 
 package com.google.firebase.perf.network;
 
-import com.google.firebase.perf.impl.NetworkRequestMetricBuilder;
+import com.google.firebase.perf.metrics.NetworkRequestMetricBuilder;
 import com.google.firebase.perf.util.Timer;
 import java.io.IOException;
 import org.apache.http.HttpResponse;

firebase-perf/src/main/java/com/google/firebase/perf/network/InstrumentApacheHttpResponseHandler.java

@@ -14,7 +14,7 @@
 
 package com.google.firebase.perf.network;
 
-import com.google.firebase.perf.impl.NetworkRequestMetricBuilder;
+import com.google.firebase.perf.metrics.NetworkRequestMetricBuilder;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Timer;
 import java.io.IOException;

firebase-perf/src/main/java/com/google/firebase/perf/network/InstrumentOkHttpEnqueueCallback.java

@@ -16,8 +16,8 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import com.google.firebase.perf.impl.NetworkRequestMetricBuilder;
 import com.google.firebase.perf.logging.AndroidLogger;
+import com.google.firebase.perf.metrics.NetworkRequestMetricBuilder;
 import java.util.regex.Pattern;
 import org.apache.http.Header;
 import org.apache.http.HttpMessage;

firebase-perf/src/main/java/com/google/firebase/perf/network/NetworkRequestMetricBuilderUtil.java

@@ -35,7 +35,7 @@
 import com.google.firebase.perf.FirebasePerformanceTestBase;
 import com.google.firebase.perf.config.ConfigResolver;
 import com.google.firebase.perf.config.DeviceCacheManager;
-import com.google.firebase.perf.impl.NetworkRequestMetricBuilder;
+import com.google.firebase.perf.metrics.NetworkRequestMetricBuilder;
 import com.google.firebase.perf.metrics.Trace;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Clock;

firebase-perf/src/test/java/com/google/firebase/perf/internal/AppStateMonitorTest.java

@@ -1,9 +1,9 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
-//
 // You may obtain a copy of the License at
+//
 //      http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.perf.impl;
+package com.google.firebase.perf.metrics;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.mock;
@@ -40,7 +40,7 @@
 import org.mockito.Mock;
 import org.robolectric.RobolectricTestRunner;
 
-/** Unit tests for {@link com.google.firebase.perf.impl.NetworkRequestMetricBuilder}. */
+/** Unit tests for {@link com.google.firebase.perf.metrics.NetworkRequestMetricBuilder}. */
 @RunWith(RobolectricTestRunner.class)
 public class NetworkRequestMetricBuilderTest extends FirebasePerformanceTestBase {
 

firebase-perf/src/test/java/com/google/firebase/perf/impl/NetworkRequestMetricBuilderTest.java renamed to firebase-perf/src/test/java/com/google/firebase/perf/metrics/NetworkRequestMetricBuilderTest.java

@@ -19,7 +19,7 @@
 import static org.junit.Assert.assertTrue;
 
 import com.google.firebase.perf.FirebasePerformanceTestBase;
-import com.google.firebase.perf.impl.NetworkRequestMetricBuilder;
+import com.google.firebase.perf.metrics.NetworkRequestMetricBuilder;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.v1.NetworkRequestMetric;
 import com.google.firebase.perf.v1.NetworkRequestMetric.HttpMethod;

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

@@ -18,7 +18,7 @@
 import static org.mockito.Mockito.verify;
 
 import com.google.firebase.perf.FirebasePerformanceTestBase;
-import com.google.firebase.perf.impl.NetworkRequestMetricBuilder;
+import com.google.firebase.perf.metrics.NetworkRequestMetricBuilder;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.v1.ApplicationProcessState;
 import com.google.firebase.perf.v1.NetworkRequestMetric;

firebase-perf/src/test/java/com/google/firebase/perf/network/FirebasePerfOkHttpClientTest.java

@@ -22,7 +22,7 @@
 import static org.mockito.Mockito.when;
 
 import com.google.firebase.perf.FirebasePerformanceTestBase;
-import com.google.firebase.perf.impl.NetworkRequestMetricBuilder;
+import com.google.firebase.perf.metrics.NetworkRequestMetricBuilder;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Timer;
 import com.google.firebase.perf.v1.ApplicationProcessState;

firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpInputStreamTest.java

@@ -21,7 +21,7 @@
 import static org.mockito.Mockito.when;
 
 import com.google.firebase.perf.FirebasePerformanceTestBase;
-import com.google.firebase.perf.impl.NetworkRequestMetricBuilder;
+import com.google.firebase.perf.metrics.NetworkRequestMetricBuilder;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Timer;
 import com.google.firebase.perf.v1.ApplicationProcessState;

firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpOutputStreamTest.java

@@ -24,7 +24,7 @@
 import static org.mockito.MockitoAnnotations.initMocks;
 
 import com.google.firebase.perf.FirebasePerformanceTestBase;
-import com.google.firebase.perf.impl.NetworkRequestMetricBuilder;
+import com.google.firebase.perf.metrics.NetworkRequestMetricBuilder;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Timer;
 import com.google.firebase.perf.v1.ApplicationProcessState;

firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpURLConnectionTest.java

@@ -21,7 +21,7 @@
 import static org.mockito.MockitoAnnotations.initMocks;
 
 import com.google.firebase.perf.FirebasePerformanceTestBase;
-import com.google.firebase.perf.impl.NetworkRequestMetricBuilder;
+import com.google.firebase.perf.metrics.NetworkRequestMetricBuilder;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Timer;
 import com.google.firebase.perf.v1.ApplicationProcessState;

firebase-perf/src/test/java/com/google/firebase/perf/network/InstrHttpsURLConnectionTest.java

@@ -23,7 +23,7 @@
 import static org.mockito.MockitoAnnotations.initMocks;
 
 import com.google.firebase.perf.FirebasePerformanceTestBase;
-import com.google.firebase.perf.impl.NetworkRequestMetricBuilder;
+import com.google.firebase.perf.metrics.NetworkRequestMetricBuilder;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Timer;
 import com.google.firebase.perf.v1.ApplicationProcessState;

firebase-perf/src/test/java/com/google/firebase/perf/network/InstrURLConnectionBaseTest.java

@@ -21,7 +21,7 @@
 import static org.mockito.Mockito.when;
 
 import com.google.firebase.perf.FirebasePerformanceTestBase;
-import com.google.firebase.perf.impl.NetworkRequestMetricBuilder;
+import com.google.firebase.perf.metrics.NetworkRequestMetricBuilder;
 import com.google.firebase.perf.transport.TransportManager;
 import com.google.firebase.perf.util.Timer;
 import com.google.firebase.perf.v1.ApplicationProcessState;