Refactor: Move network classes from util to remote (#476)

Author: schmidt-sebastian

firebase-firestore/src/main/java/com/google/firebase/firestore/remote/AbstractStream.java

@@ -23,8 +23,6 @@
 import com.google.firebase.firestore.util.AsyncQueue.DelayedTask;
 import com.google.firebase.firestore.util.AsyncQueue.TimerId;
 import com.google.firebase.firestore.util.ExponentialBackoff;
-import com.google.firebase.firestore.util.FirestoreChannel;
-import com.google.firebase.firestore.util.IncomingStreamObserver;
 import com.google.firebase.firestore.util.Logger;
 import io.grpc.ClientCall;
 import io.grpc.Metadata;

firebase-firestore/src/main/java/com/google/firebase/firestore/remote/Datastore.java

@@ -26,7 +26,6 @@
 import com.google.firebase.firestore.model.mutation.Mutation;
 import com.google.firebase.firestore.model.mutation.MutationResult;
 import com.google.firebase.firestore.util.AsyncQueue;
-import com.google.firebase.firestore.util.FirestoreChannel;
 import com.google.firebase.firestore.util.Supplier;
 import com.google.firestore.v1.BatchGetDocumentsRequest;
 import com.google.firestore.v1.BatchGetDocumentsResponse;
@@ -61,7 +60,7 @@
 public class Datastore {
 
   /** Set of lowercase, white-listed headers for logging purposes. */
-  public static final Set<String> WHITE_LISTED_HEADERS =
+  static final Set<String> WHITE_LISTED_HEADERS =
       new HashSet<>(
           Arrays.asList(
               "date",

firebase-firestore/src/main/java/com/google/firebase/firestore/remote/FirestoreCallCredentials.java

@@ -24,7 +24,7 @@
 import java.util.concurrent.Executor;
 
 /** CallCredentials that applies any authorization headers. */
-public final class FirestoreCallCredentials extends CallCredentials2 {
+final class FirestoreCallCredentials extends CallCredentials2 {
 
   private static final String LOG_TAG = "FirestoreCallCredentials";
 
@@ -33,7 +33,7 @@ public final class FirestoreCallCredentials extends CallCredentials2 {
 
   private final CredentialsProvider credentialsProvider;
 
-  public FirestoreCallCredentials(CredentialsProvider provider) {
+  FirestoreCallCredentials(CredentialsProvider provider) {
     credentialsProvider = provider;
   }
 

firebase-firestore/src/main/java/com/google/firebase/firestore/util/FirestoreChannel.java renamed to firebase-firestore/src/main/java/com/google/firebase/firestore/remote/FirestoreChannel.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.firestore.util;
+package com.google.firebase.firestore.remote;
 
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
@@ -21,7 +21,9 @@
 import com.google.firebase.firestore.FirebaseFirestoreException.Code;
 import com.google.firebase.firestore.auth.CredentialsProvider;
 import com.google.firebase.firestore.model.DatabaseId;
-import com.google.firebase.firestore.remote.FirestoreCallCredentials;
+import com.google.firebase.firestore.util.AsyncQueue;
+import com.google.firebase.firestore.util.Logger;
+import com.google.firebase.firestore.util.Util;
 import com.google.firestore.v1.FirestoreGrpc;
 import com.google.firestore.v1.FirestoreGrpc.FirestoreStub;
 import io.grpc.CallOptions;
@@ -38,7 +40,7 @@
  * Wrapper class around io.grpc.Channel that adds headers, exception handling and simplifies
  * invoking RPCs.
  */
-public class FirestoreChannel {
+class FirestoreChannel {
 
   private static final Metadata.Key<String> X_GOOG_API_CLIENT_HEADER =
       Metadata.Key.of("x-goog-api-client", Metadata.ASCII_STRING_MARSHALLER);
@@ -66,7 +68,7 @@ public class FirestoreChannel {
   /** The value to use as resource prefix header. */
   private final String resourcePrefixValue;
 
-  public FirestoreChannel(
+  FirestoreChannel(
       AsyncQueue asyncQueue,
       CredentialsProvider credentialsProvider,
       ManagedChannel grpcChannel,

firebase-firestore/src/main/java/com/google/firebase/firestore/util/IncomingStreamObserver.java renamed to firebase-firestore/src/main/java/com/google/firebase/firestore/remote/IncomingStreamObserver.java

@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.firestore.util;
+package com.google.firebase.firestore.remote;
 
 import io.grpc.Metadata;
 import io.grpc.Status;
 
 /** Interface used for incoming/receiving gRPC streams. */
-public interface IncomingStreamObserver<RespT> {
+interface IncomingStreamObserver<RespT> {
   /** Headers were received for this stream. */
   void onHeaders(Metadata headers);
 

firebase-firestore/src/main/java/com/google/firebase/firestore/remote/WatchStream.java

@@ -20,7 +20,6 @@
 import com.google.firebase.firestore.model.SnapshotVersion;
 import com.google.firebase.firestore.util.AsyncQueue;
 import com.google.firebase.firestore.util.AsyncQueue.TimerId;
-import com.google.firebase.firestore.util.FirestoreChannel;
 import com.google.firestore.v1.FirestoreGrpc;
 import com.google.firestore.v1.ListenRequest;
 import com.google.firestore.v1.ListenResponse;

firebase-firestore/src/main/java/com/google/firebase/firestore/remote/WriteStream.java

@@ -22,7 +22,6 @@
 import com.google.firebase.firestore.model.mutation.MutationResult;
 import com.google.firebase.firestore.util.AsyncQueue;
 import com.google.firebase.firestore.util.AsyncQueue.TimerId;
-import com.google.firebase.firestore.util.FirestoreChannel;
 import com.google.firestore.v1.FirestoreGrpc;
 import com.google.firestore.v1.WriteRequest;
 import com.google.firestore.v1.WriteResponse;