Merge branch 'master' into ssrc

Author: rathovarun1032

pom.xml

@@ -59,7 +59,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <skipUTs>${skipTests}</skipUTs>
-        <netty.version>4.2.1.Final</netty.version>
+        <netty.version>4.2.3.Final</netty.version>
     </properties>
 
     <scm>
@@ -157,7 +157,7 @@
                 <plugins>
                     <plugin>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.2.7</version>
+                        <version>3.2.8</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
@@ -215,7 +215,7 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>exec-maven-plugin</artifactId>
-                        <version>3.5.0</version>
+                        <version>3.5.1</version>
                         <executions>
                             <execution>
                                 <phase>test</phase>
@@ -280,7 +280,7 @@
             <!-- Test Phase -->
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.5.2</version>
+                <version>3.5.3</version>
                 <configuration>
                     <skipTests>${skipUTs}</skipTests>
                 </configuration>
@@ -367,7 +367,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>3.8.0</version>
+                <version>3.9.0</version>
                 <reportSets>
                     <reportSet>
                         <configuration>
@@ -385,7 +385,7 @@
             <dependency>
                 <groupId>com.google.cloud</groupId>
                 <artifactId>libraries-bom</artifactId>
-                <version>26.59.0</version>
+                <version>26.65.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

src/main/java/com/google/firebase/cloud/FirestoreClient.java

@@ -19,7 +19,7 @@
 
 /**
  * {@code FirestoreClient} provides access to Google Cloud Firestore. Use this API to obtain a
- * <a href="https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/com/google/cloud/firestore/Firestore.html">{@code Firestore}</a>
+ * <a href="https://cloud.google.com/java/docs/reference/google-cloud-firestore/latest/com.google.cloud.firestore.Firestore">{@code Firestore}</a>
  * instance, which provides methods for updating and querying data in Firestore.
  *
  * <p>A Google Cloud project ID is required to access Firestore. FirestoreClient determines the
@@ -60,7 +60,7 @@ private FirestoreClient(FirebaseApp app, String databaseId) {
    * same instance for all invocations. The Firestore instance and all references obtained from it
    * becomes unusable, once the default app is deleted.
    *
-   * @return A non-null <a href="https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/com/google/cloud/firestore/Firestore.html">{@code Firestore}</a>
+   * @return A non-null <a href="https://cloud.google.com/java/docs/reference/google-cloud-firestore/latest/com.google.cloud.firestore.Firestore">{@code Firestore}</a>
    *     instance.
    */
   @NonNull
@@ -74,7 +74,7 @@ public static Firestore getFirestore() {
    * obtained from it becomes unusable, once the specified app is deleted.
    *
    * @param app A non-null {@link FirebaseApp}.
-   * @return A non-null <a href="https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/com/google/cloud/firestore/Firestore.html">{@code Firestore}</a>
+   * @return A non-null <a href="https://cloud.google.com/java/docs/reference/google-cloud-firestore/latest/com.google.cloud.firestore.Firestore">{@code Firestore}</a>
    *     instance.
    */
   @NonNull
@@ -90,7 +90,7 @@ public static Firestore getFirestore(FirebaseApp app) {
    *
    * @param app      A non-null {@link FirebaseApp}.
    * @param database - The name of database.
-   * @return A non-null <a href="https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/com/google/cloud/firestore/Firestore.html">{@code Firestore}</a>
+   * @return A non-null <a href="https://cloud.google.com/java/docs/reference/google-cloud-firestore/latest/com.google.cloud.firestore.Firestore">{@code Firestore}</a>
    *     instance.
    */
   @NonNull
@@ -104,7 +104,7 @@ public static Firestore getFirestore(FirebaseApp app, String database) {
    * references obtained from it becomes unusable, once the default app is deleted.
    *
    * @param database - The name of database.
-   * @return A non-null <a href="https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/com/google/cloud/firestore/Firestore.html">{@code Firestore}</a>
+   * @return A non-null <a href="https://cloud.google.com/java/docs/reference/google-cloud-firestore/latest/com.google.cloud.firestore.Firestore">{@code Firestore}</a>
    *     instance.
    */
   @NonNull

src/main/java/com/google/firebase/cloud/StorageClient.java

@@ -71,7 +71,7 @@ public static synchronized StorageClient getInstance(FirebaseApp app) {
    * configured via {@link com.google.firebase.FirebaseOptions} when initializing the app. If
    * no bucket was configured via options, this method throws an exception.
    *
-   * @return a cloud storage <a href="https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/com/google/cloud/storage/Bucket.html">{@code Bucket}</a>
+   * @return a cloud storage <a href="https://cloud.google.com/java/docs/reference/google-cloud-storage/latest/com.google.cloud.storage.Bucket">{@code Bucket}</a>
    *     instance.
    * @throws IllegalArgumentException If no bucket is configured via <code>FirebaseOptions</code>,
    *     or if the bucket does not exist.
@@ -84,7 +84,7 @@ public Bucket bucket() {
    * Returns a cloud storage Bucket instance for the specified bucket name.
    *
    * @param name a non-null, non-empty bucket name.
-   * @return a cloud storage <a href="https://googlecloudplatform.github.io/google-cloud-java/latest/google-cloud-clients/com/google/cloud/storage/Bucket.html">{@code Bucket}</a>
+   * @return a cloud storage <a href="https://cloud.google.com/java/docs/reference/google-cloud-storage/latest/com.google.cloud.storage.Bucket">{@code Bucket}</a>
    *     instance.
    * @throws IllegalArgumentException If the bucket name is null, empty, or if the specified
    *     bucket does not exist.

src/test/java/com/google/firebase/auth/FirebaseUserManagerTest.java

@@ -402,19 +402,23 @@ public void testGetUserByProviderUidWithPhone() throws Exception {
     TestResponseInterceptor interceptor = initializeAppForUserManagement(
         TestUtils.loadResource("getUser.json"));
     UserRecord userRecord = FirebaseAuth.getInstance()
-        .getUserByProviderUidAsync("phone", "+1234567890").get();
+        .getUserByProviderUidAsync(new String("phone"), "+1234567890").get();
     checkUserRecord(userRecord);
     checkRequestHeaders(interceptor);
+    GenericJson parsed = parseRequestContent(interceptor);
+    assertEquals(ImmutableList.of("+1234567890"), parsed.get("phoneNumber"));
   }
 
   @Test
   public void testGetUserByProviderUidWithEmail() throws Exception {
     TestResponseInterceptor interceptor = initializeAppForUserManagement(
         TestUtils.loadResource("getUser.json"));
     UserRecord userRecord = FirebaseAuth.getInstance()
-        .getUserByProviderUidAsync("email", "[email protected]").get();
+        .getUserByProviderUidAsync(new String("email"), "[email protected]").get();
     checkUserRecord(userRecord);
     checkRequestHeaders(interceptor);
+    GenericJson parsed = parseRequestContent(interceptor);
+    assertEquals(ImmutableList.of("[email protected]"), parsed.get("email"));
   }
 
   @Test
@@ -1248,20 +1252,22 @@ public void testDeleteProviderAndPhone() {
 
   @Test
   public void testDoubleDeletePhoneProvider() throws Exception {
+    String providerId = new String("phone");
     UserRecord.UpdateRequest update = new UserRecord.UpdateRequest("uid")
         .setPhoneNumber(null);
 
     try {
-      update.setProvidersToUnlink(ImmutableList.of("phone"));
+      update.setProvidersToUnlink(ImmutableList.of(providerId));
       fail("No error thrown for double delete phone provider");
     } catch (IllegalArgumentException expected) {
     }
   }
 
   @Test
   public void testDoubleDeletePhoneProviderReverseOrder() throws Exception {
+    String providerId = new String("phone");
     UserRecord.UpdateRequest update = new UserRecord.UpdateRequest("uid")
-        .setProvidersToUnlink(ImmutableList.of("phone"));
+        .setProvidersToUnlink(ImmutableList.of(providerId));
 
     try {
       update.setPhoneNumber(null);

src/test/java/com/google/firebase/snippets/FirebaseMessagingSnippets.java

@@ -149,6 +149,36 @@ public void sendAll() throws FirebaseMessagingException {
     // [END send_all]
   }
 
+  public void sendEach() throws FirebaseMessagingException {
+    String registrationToken = "YOUR_REGISTRATION_TOKEN";
+
+    // [START send_each]
+    // Create a list containing up to 500 messages.
+    List<Message> messages = Arrays.asList(
+        Message.builder()
+            .setNotification(Notification.builder()
+                .setTitle("Price drop")
+                .setBody("5% off all electronics")
+                .build())
+            .setToken(registrationToken)
+            .build(),
+        // ...
+        Message.builder()
+            .setNotification(Notification.builder()
+                .setTitle("Price drop")
+                .setBody("2% off all books")
+                .build())
+            .setTopic("readers-club")
+            .build()
+    );
+
+    BatchResponse response = FirebaseMessaging.getInstance().sendEach(messages);
+    // See the BatchResponse reference documentation
+    // for the contents of response.
+    System.out.println(response.getSuccessCount() + " messages were sent successfully");
+    // [END send_each]
+  }
+
   public void sendMulticast() throws FirebaseMessagingException {
     // [START send_multicast]
     // Create a list containing up to 500 registration tokens.
@@ -201,6 +231,36 @@ public void sendMulticastAndHandleErrors() throws FirebaseMessagingException {
     // [END send_multicast_error]
   }
 
+  public void sendEachForMulticastAndHandleErrors() throws FirebaseMessagingException {
+    // [START send_each_for_multicast_error]
+    // These registration tokens come from the client FCM SDKs.
+    List<String> registrationTokens = Arrays.asList(
+        "YOUR_REGISTRATION_TOKEN_1",
+        // ...
+        "YOUR_REGISTRATION_TOKEN_n"
+    );
+
+    MulticastMessage message = MulticastMessage.builder()
+        .putData("score", "850")
+        .putData("time", "2:45")
+        .addAllTokens(registrationTokens)
+        .build();
+    BatchResponse response = FirebaseMessaging.getInstance().sendEachForMulticast(message);
+    if (response.getFailureCount() > 0) {
+      List<SendResponse> responses = response.getResponses();
+      List<String> failedTokens = new ArrayList<>();
+      for (int i = 0; i < responses.size(); i++) {
+        if (!responses.get(i).isSuccessful()) {
+          // The order of responses corresponds to the order of the registration tokens.
+          failedTokens.add(registrationTokens.get(i));
+        }
+      }
+
+      System.out.println("List of tokens that caused failures: " + failedTokens);
+    }
+    // [END send_each_for_multicast_error]
+  }
+
   public Message androidMessage() {
     // [START android_message]
     Message message = Message.builder()

src/test/java/com/google/firebase/snippets/FirebaseStorageSnippets.java

@@ -42,7 +42,7 @@ public void initializeAppForStorage() throws IOException {
     Bucket bucket = StorageClient.getInstance().bucket();
 
     // 'bucket' is an object defined in the google-cloud-storage Java library.
-    // See http://googlecloudplatform.github.io/google-cloud-java/latest/apidocs/com/google/cloud/storage/Bucket.html
+    // See https://cloud.google.com/java/docs/reference/google-cloud-storage/latest/com.google.cloud.storage.Bucket
     // for more details.
     // [END init_admin_sdk_for_storage]
     System.out.println("Retrieved bucket: " + bucket.getName());