Merge branch 'ImplementDocumentIdAnnotation' of github.com:firebase/firebase-android-sdk into ImplementDocumentIdAnnotation

Author: wu-hui

buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/license/LicenseResolverPlugin.groovy

@@ -23,6 +23,7 @@ import com.google.firebase.gradle.plugins.license.RemoteLicenseFetcher.BSDLicens
 import com.google.firebase.gradle.plugins.license.RemoteLicenseFetcher.CreativeCommonsLicenseFetcher
 import com.google.firebase.gradle.plugins.license.RemoteLicenseFetcher.GnuClasspathLicenseFetcher
 import com.google.firebase.gradle.plugins.license.RemoteLicenseFetcher.MITLicenseFetcher
+import com.google.firebase.gradle.plugins.license.RemoteLicenseFetcher.YetAnotherApache2LicenseFetcher
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Configuration
@@ -50,8 +51,9 @@ class LicenseResolverPlugin implements Plugin<Project> {
     List<RemoteLicenseFetcher> remoteLicenseFetchers =
             [new AndroidSdkTermsFetcher(),
              new Apache2LicenseFetcher(),
-             new BSDLicenseFetcher(),
              new AnotherApache2LicenseFetcher(),
+             new YetAnotherApache2LicenseFetcher(),
+             new BSDLicenseFetcher(),
              new CreativeCommonsLicenseFetcher(), new MITLicenseFetcher(), new AnotherMITLicenseFetcher(), new GnuClasspathLicenseFetcher()]
     final static ANDROID_PLUGINS = ["com.android.application", "com.android.library",
                                     "com.android.test"]

buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/license/RemoteLicenseFetcher.groovy

@@ -56,24 +56,24 @@ interface RemoteLicenseFetcher extends Serializable {
     }
   }
 
-  static final class BSDLicenseFetcher implements RemoteLicenseFetcher {
-    private URI BSD_LICENSE_URI = URI.create("http://www.opensource.org/licenses/bsd-license.php")
+  static final class AnotherApache2LicenseFetcher implements RemoteLicenseFetcher {
+    private URI APACHE_2_LICENSE_URI = URI.create("https://opensource.org/licenses/Apache-2.0")
 
     @Override
     URI getServiceUri() {
-      BSD_LICENSE_URI
+      APACHE_2_LICENSE_URI
     }
 
     @Override
     String get() {
-      def doc = Jsoup.connect(BSD_LICENSE_URI.toString()).get()
+      def doc = Jsoup.connect(APACHE_2_LICENSE_URI.toString()).get()
 
-      TEXT_FORMATTER.getPlainText(doc.select('#content-wrapper')[0])
+      TEXT_FORMATTER.getPlainText(doc.select('#content-wrapper'))
     }
   }
 
-  static final class AnotherApache2LicenseFetcher implements RemoteLicenseFetcher {
-    private URI APACHE_2_LICENSE_URI = URI.create("https://opensource.org/licenses/Apache-2.0")
+  static final class YetAnotherApache2LicenseFetcher implements RemoteLicenseFetcher {
+    private URI APACHE_2_LICENSE_URI = URI.create("http://www.apache.org/licenses/LICENSE-2.0")
 
     @Override
     URI getServiceUri() {
@@ -82,9 +82,23 @@ interface RemoteLicenseFetcher extends Serializable {
 
     @Override
     String get() {
-      def doc = Jsoup.connect(APACHE_2_LICENSE_URI.toString()).get()
+      APACHE_2_LICENSE_URI.toURL().getText()
+    }
+  }
 
-      TEXT_FORMATTER.getPlainText(doc.select('#content-wrapper'))
+  static final class BSDLicenseFetcher implements RemoteLicenseFetcher {
+    private URI BSD_LICENSE_URI = URI.create("http://www.opensource.org/licenses/bsd-license.php")
+
+    @Override
+    URI getServiceUri() {
+      BSD_LICENSE_URI
+    }
+
+    @Override
+    String get() {
+      def doc = Jsoup.connect(BSD_LICENSE_URI.toString()).get()
+
+      TEXT_FORMATTER.getPlainText(doc.select('#content-wrapper')[0])
     }
   }
 
@@ -151,4 +165,4 @@ interface RemoteLicenseFetcher extends Serializable {
       TEXT_FORMATTER.getPlainText(doc.select('body > table > tbody > tr:nth-child(2) > td:nth-child(2) > table > tbody > tr:nth-child(3) > td > en > blockquote'))
     }
   }
-}
+}

firebase-common/gradle.properties

@@ -1,2 +1,2 @@
-version=17.0.0
-latestReleasedVersion=16.1.0
+version=17.1.1
+latestReleasedVersion=17.1.0

firebase-datatransport/gradle.properties

@@ -1,2 +1,3 @@
-version=16.0.0
+version=16.0.1
+latestReleasedVersion=16.0.0
 android.enableUnitTestBinaryResources=true

firebase-firestore/CHANGELOG.md

@@ -1,4 +1,9 @@
 # Unreleased
+- [fixed] Updated gRPC to 1.21.0. A bug in the prior version would occasionally
+  cause a crash if a network state change occurred concurrently with an RPC.
+  (#428)
+
+# 19.0.1
 - [fixed] Fixed an issue that prevented schema migrations for clients with
   large offline datasets (#370).
 

firebase-firestore/README.md

@@ -10,12 +10,84 @@ responsive apps that work regardless of network latency or Internet
 connectivity. Cloud Firestore also offers seamless integration with other
 Firebase and Google Cloud Platform products, including Cloud Functions.
 
+## Building
+
 All Gradle commands should be run from the source root (which is one level up
 from this folder). See the README.md in the source root for instructions on
 publishing/testing Cloud Firestore.
 
-## Testing
+To build Cloud Firestore, from the source root run:
+```bash
+./gradlew :firebase-firestore:assembleRelease
+```
+
+## Unit Testing
+
+To run unit tests for Cloud Firestore, from the source root run:
+```bash
+./gradlew :firebase-firestore:check
+```
+
+## Integration Testing
+
+Running integration tests requires a Firebase project because they would try
+to connect to the Firestore backends.
+
+See [here](../README.md#project-setup) for how to setup a project.
+
+Once you setup the project, download `google-services.json` and place it in
+the source root.
+
+Make sure you have created a Firestore instance for your project, before
+you proceed.
+
+### Run on Local Emulator
+
+Then simply run:
+```bash
+./gradlew :firebase-firestore:connectedCheck
+```
+
+### Run on Firebase Test Lab
+
+You can also test on Firebase Test Lab, which allow you to run the integration
+tests on devices hosted in Google data center.
+
+See [here](../README.md#running-integration-tests-on-firebase-test-lab) for
+instructions of how to setup Firebase Test Lab for your project.
+
+Run:
+```bash
+./gradlew :firebase-firestore:deviceCheck
+```
+
+## Code Formatting
+
+Run below to format Java code:
+```bash
+./gradlew :firebase-firestore:googleJavaFormat
+```
+
+See [here](../README.md#code-formatting) if you want to be able to format code
+from within Android Studio.
+
+## Build Local Jar of Firestore SDK
+
+Run:
+```bash
+./gradlew publishAllToLocal
+```
+
+This will publish firebase SDK at SNAPSHOT versions. All pom level dependencies
+within the published artifacts will also point to SNAPSHOT versions that are
+co-published. The results will be built into your local maven repo.
+
+Developers may then take a dependency on these locally published versions by adding
+the `mavenLocal()` repository to your [repositories
+block](https://docs.gradle.org/current/userguide/declaring_repositories.html) in
+your app module's build.gradle.
 
+## Misc
 After importing the project into Android Studio and building successfully
 for the first time, Android Studio will delete the run configuration xml files
 in `./idea/runConfigurations`. Undo these changes with the command:

firebase-firestore/firebase-firestore.gradle

@@ -30,7 +30,7 @@ protobuf {
     }
     plugins {
         grpc {
-            artifact = 'io.grpc:protoc-gen-grpc-java:1.16.1'
+            artifact = 'io.grpc:protoc-gen-grpc-java:1.21.0'
         }
         javalite {
             // The codegen for lite comes as a separate artifact
@@ -102,10 +102,10 @@ dependencies {
     //To provide @Generated annotations
     compileOnly 'javax.annotation:jsr250-api:1.0'
 
-    implementation 'io.grpc:grpc-stub:1.16.1'
-    implementation 'io.grpc:grpc-protobuf-lite:1.16.1'
-    implementation 'io.grpc:grpc-okhttp:1.16.1'
-    implementation 'io.grpc:grpc-android:1.16.1'
+    implementation 'io.grpc:grpc-stub:1.21.0'
+    implementation 'io.grpc:grpc-protobuf-lite:1.21.0'
+    implementation 'io.grpc:grpc-okhttp:1.21.0'
+    implementation 'io.grpc:grpc-android:1.21.0'
     implementation "com.google.android.gms:play-services-basement:$playServicesVersion"
     implementation "com.google.android.gms:play-services-tasks:$playServicesVersion"
     implementation "com.google.android.gms:play-services-base:$playServicesVersion"

firebase-firestore/gradle.properties

@@ -1,2 +1,2 @@
-version=19.0.1
-latestReleasedVersion=19.0.0
+version=19.0.2
+latestReleasedVersion=19.0.1

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;

firebase-firestore/src/main/java/com/google/firebase/firestore/util/CustomClassMapper.java

@@ -861,6 +861,7 @@ private Type resolveType(Type type, Map<TypeVariable<Class<T>>, Type> types) {
     }
 
     Map<String, Object> serialize(T object, ErrorPath path) {
+      // TODO(wuandy): Add logic to skip @DocumentId annotated fields in serialization.
       if (!clazz.isAssignableFrom(object.getClass())) {
         throw new IllegalArgumentException(
             "Can't serialize object of class "

firebase-firestore/src/test/java/com/google/firebase/firestore/util/MapperTest.java

@@ -2411,7 +2411,6 @@ public void documentIdsDeserialize() {
   @Test
   public void documentIdsRoundTrip() {
     // Implicitly verifies @DocumentId is ignored during serialization.
-
     DocumentReference ref = TestUtil.documentReference("coll/doc123");
 
     assertEquals(

firebase-functions/ktx/gradle.properties

@@ -0,0 +1,2 @@
+android.enableUnitTestBinaryResources=true
+