Builder instance is returned so subsequent calls can be chained.
+ */
+ public Builder setWriteTimeout(int writeTimeout) {
+ this.writeTimeout = writeTimeout;
+ return this;
+ }
+
/**
* Builds the {@link FirebaseOptions} instance from the previously set options.
*
diff --git a/src/main/java/com/google/firebase/ImplFirebaseTrampolines.java b/src/main/java/com/google/firebase/ImplFirebaseTrampolines.java
index 0d3008b18..3dff2764c 100644
--- a/src/main/java/com/google/firebase/ImplFirebaseTrampolines.java
+++ b/src/main/java/com/google/firebase/ImplFirebaseTrampolines.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/IncomingHttpResponse.java b/src/main/java/com/google/firebase/IncomingHttpResponse.java
index cfeac5e70..794479040 100644
--- a/src/main/java/com/google/firebase/IncomingHttpResponse.java
+++ b/src/main/java/com/google/firebase/IncomingHttpResponse.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2020 Google Inc.
+ * Copyright 2020 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/OutgoingHttpRequest.java b/src/main/java/com/google/firebase/OutgoingHttpRequest.java
index 44af4bff0..fdaee7458 100644
--- a/src/main/java/com/google/firebase/OutgoingHttpRequest.java
+++ b/src/main/java/com/google/firebase/OutgoingHttpRequest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2020 Google Inc.
+ * Copyright 2020 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/ThreadManager.java b/src/main/java/com/google/firebase/ThreadManager.java
index 8903101f6..29e7b42d0 100644
--- a/src/main/java/com/google/firebase/ThreadManager.java
+++ b/src/main/java/com/google/firebase/ThreadManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/auth/AbstractFirebaseAuth.java b/src/main/java/com/google/firebase/auth/AbstractFirebaseAuth.java
index d1b4a513e..44fe9b7d2 100644
--- a/src/main/java/com/google/firebase/auth/AbstractFirebaseAuth.java
+++ b/src/main/java/com/google/firebase/auth/AbstractFirebaseAuth.java
@@ -600,9 +600,10 @@ private CallableOperationA 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 {@code Firestore}
+ * @return A non-null {@code Firestore}
* 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 {@code Firestore}
+ * @return A non-null {@code Firestore}
* instance.
*/
@NonNull
@@ -90,11 +90,11 @@ public static Firestore getFirestore(FirebaseApp app) {
*
* @param app A non-null {@link FirebaseApp}.
* @param database - The name of database.
- * @return A non-null {@code Firestore}
+ * @return A non-null {@code Firestore}
* instance.
*/
@NonNull
- static Firestore getFirestore(FirebaseApp app, String database) {
+ public static Firestore getFirestore(FirebaseApp app, String database) {
return getInstance(app, database).firestore;
}
@@ -104,11 +104,11 @@ 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 {@code Firestore}
+ * @return A non-null {@code Firestore}
* instance.
*/
@NonNull
- static Firestore getFirestore(String database) {
+ public static Firestore getFirestore(String database) {
return getFirestore(FirebaseApp.getInstance(), database);
}
diff --git a/src/main/java/com/google/firebase/cloud/StorageClient.java b/src/main/java/com/google/firebase/cloud/StorageClient.java
index 955abd7e2..4176b5329 100644
--- a/src/main/java/com/google/firebase/cloud/StorageClient.java
+++ b/src/main/java/com/google/firebase/cloud/StorageClient.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -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 {@code Bucket}
+ * @return a cloud storage {@code Bucket}
* instance.
* @throws IllegalArgumentException If no bucket is configured via If the {@code dryRun} option is set to true, the message will not be actually sent. Instead
* FCM performs all the necessary validations and emulates the send operation. The {@code dryRun}
- * option is useful for determining whether an FCM registration has been deleted. However, it
+ * option is useful for determining whether an FCM registration has been deleted. However, it
* cannot be used to validate APNs tokens.
*
* @param message A non-null {@link Message} to be sent.
@@ -139,6 +144,204 @@ protected String execute() throws FirebaseMessagingException {
};
}
+ /**
+ * Sends each message in the given list via Firebase Cloud Messaging.
+ * Unlike {@link #sendAll(List)}, this method makes an HTTP call for each message in the
+ * given array.
+ *
+ * The list of responses obtained by calling {@link BatchResponse#getResponses()} on the return
+ * value is in the same order as the input list.
+ *
+ * @param messages A non-null, non-empty list containing up to 500 messages.
+ * @return A {@link BatchResponse} indicating the result of the operation.
+ * @throws FirebaseMessagingException If an error occurs while handing the messages off to FCM for
+ * delivery. An exception here or a {@link BatchResponse} with all failures indicates a total
+ * failure, meaning that none of the messages in the list could be sent. Partial failures or
+ * no failures are only indicated by a {@link BatchResponse}.
+ */
+ public BatchResponse sendEach(@NonNull List If the {@code dryRun} option is set to true, the message will not be actually sent. Instead
+ * FCM performs all the necessary validations, and emulates the send operation. The {@code dryRun}
+ * option is useful for determining whether an FCM registration has been deleted. But it cannot be
+ * used to validate APNs tokens.
+ *
+ * The list of responses obtained by calling {@link BatchResponse#getResponses()} on the return
+ * value is in the same order as the input list.
+ *
+ * @param messages A non-null, non-empty list containing up to 500 messages.
+ * @param dryRun A boolean indicating whether to perform a dry run (validation only) of the send.
+ * @return A {@link BatchResponse} indicating the result of the operation.
+ * @throws FirebaseMessagingException If an error occurs while handing the messages off to FCM for
+ * delivery. An exception here or a {@link BatchResponse} with all failures indicates a total
+ * failure, meaning that none of the messages in the list could be sent. Partial failures or
+ * no failures are only indicated by a {@link BatchResponse}.
+ */
+ public BatchResponse sendEach(
+ @NonNull List This method uses the {@link #sendEach(List)} API under the hood to send the given
+ * message to all the target recipients. The list of responses obtained by calling
+ * {@link BatchResponse#getResponses()} on the return value is in the same order as the
+ * tokens and/or FIDs in the {@link MulticastMessage}. If both tokens and FIDs are
+ * provided, tokens are processed first, followed by FIDs.
+ *
+ * @param message A non-null {@link MulticastMessage}
+ * @return A {@link BatchResponse} indicating the result of the operation.
+ * @throws FirebaseMessagingException If an error occurs while handing the messages off to FCM for
+ * delivery. An exception here or a {@link BatchResponse} with all failures indicates a total
+ * failure, meaning that none of the messages in the list could be sent. Partial failures or
+ * no failures are only indicated by a {@link BatchResponse}.
+ */
+ public BatchResponse sendEachForMulticast(
+ @NonNull MulticastMessage message) throws FirebaseMessagingException {
+ return sendEachForMulticast(message, false);
+ }
+
+ /**
+ * Sends the given multicast message to all the FCM registration tokens and/or FIDs
+ * specified in it.
+ *
+ * If the {@code dryRun} option is set to true, the message will not be actually sent.
+ * Instead FCM performs all the necessary validations, and emulates the send operation.
+ * The {@code dryRun} option is useful for determining whether an FCM registration has
+ * been deleted. But it cannot be used to validate APNs tokens.
+ *
+ * This method uses the {@link #sendEach(List)} API under the hood to send the given
+ * message to all the target recipients. The list of responses obtained by calling
+ * {@link BatchResponse#getResponses()} on the return value is in the same order as the
+ * tokens and/or FIDs in the {@link MulticastMessage}. If both tokens and FIDs are
+ * provided, tokens are processed first, followed by FIDs.
+ *
+ * @param message A non-null {@link MulticastMessage}.
+ * @param dryRun A boolean indicating whether to perform a dry run (validation only) of the send.
+ * @return A {@link BatchResponse} indicating the result of the operation.
+ * @throws FirebaseMessagingException If an error occurs while handing the messages off to FCM for
+ * delivery. An exception here or a {@link BatchResponse} with all failures indicates a total
+ * failure, meaning that none of the messages in the list could be sent. Partial failures or
+ * no failures are only indicated by a {@link BatchResponse}.
+ */
+ public BatchResponse sendEachForMulticast(@NonNull MulticastMessage message, boolean dryRun)
+ throws FirebaseMessagingException {
+ checkNotNull(message, "multicast message must not be null");
+ return sendEach(message.getMessageList(), dryRun);
+ }
+
+ /**
+ * Similar to {@link #sendEachForMulticast(MulticastMessage)} but performs the operation
+ * asynchronously.
+ *
+ * @param message A non-null {@link MulticastMessage}.
+ * @return An {@code ApiFuture} that will complete with a {@link BatchResponse} when
+ * the messages have been sent.
+ */
+ public ApiFuture This method uses the {@link #sendAll(List)} API under the hood to send the given
* message to all the target recipients. The responses list obtained by calling
- * {@link BatchResponse#getResponses()} on the return value corresponds to the order of tokens
- * in the {@link MulticastMessage}.
+ * {@link BatchResponse#getResponses()} on the return value corresponds to the order of
+ * tokens and/or FIDs in the {@link MulticastMessage}. If both tokens and FIDs are
+ * provided, tokens are processed first, followed by FIDs.
*
* @param message A non-null {@link MulticastMessage}
* @return A {@link BatchResponse} indicating the result of the operation.
* @throws FirebaseMessagingException If an error occurs while handing the messages off to FCM for
- * delivery. An exception here indicates a total failure -- i.e. the messages could not be
- * delivered to any recipient. Partial failures are indicated by a {@link BatchResponse}
+ * delivery. An exception here indicates a total failure, meaning that the messages could not
+ * be delivered to any recipient. Partial failures are indicated by a {@link BatchResponse}
* return value.
+ * @deprecated Use {@link #sendEachForMulticast(MulticastMessage)} instead.
*/
+ @Deprecated
public BatchResponse sendMulticast(
@NonNull MulticastMessage message) throws FirebaseMessagingException {
return sendMulticast(message, false);
}
/**
- * Sends the given multicast message to all the FCM registration tokens specified in it.
+ * Sends the given multicast message to all the FCM registration tokens and/or FIDs
+ * specified in it.
*
- * If the {@code dryRun} option is set to true, the message will not be actually sent. Instead
- * FCM performs all the necessary validations, and emulates the send operation. The {@code dryRun}
- * option is useful for determining whether an FCM registration has been deleted. But it cannot be
- * used to validate APNs tokens.
+ * If the {@code dryRun} option is set to true, the message will not be actually sent.
+ * Instead FCM performs all the necessary validations, and emulates the send operation.
+ * The {@code dryRun} option is useful for determining whether an FCM registration has
+ * been deleted. But it cannot be used to validate APNs tokens.
*
* This method uses the {@link #sendAll(List)} API under the hood to send the given
* message to all the target recipients. The responses list obtained by calling
- * {@link BatchResponse#getResponses()} on the return value corresponds to the order of tokens
- * in the {@link MulticastMessage}.
+ * {@link BatchResponse#getResponses()} on the return value corresponds to the order of
+ * tokens and/or FIDs in the {@link MulticastMessage}. If both tokens and FIDs are
+ * provided, tokens are processed first, followed by FIDs.
*
* @param message A non-null {@link MulticastMessage}.
* @param dryRun A boolean indicating whether to perform a dry run (validation only) of the send.
* @return A {@link BatchResponse} indicating the result of the operation.
* @throws FirebaseMessagingException If an error occurs while handing the messages off to FCM for
- * delivery. An exception here indicates a total failure -- i.e. the messages could not be
- * delivered to any recipient. Partial failures are indicated by a {@link BatchResponse}
+ * delivery. An exception here indicates a total failure, meaning that the messages could not
+ * be delivered to any recipient. Partial failures are indicated by a {@link BatchResponse}
* return value.
+ * @deprecated Use {@link #sendEachForMulticast(MulticastMessage, boolean)} instead.
*/
+ @Deprecated
public BatchResponse sendMulticast(
@NonNull MulticastMessage message, boolean dryRun) throws FirebaseMessagingException {
checkNotNull(message, "multicast message must not be null");
@@ -261,7 +482,9 @@ public BatchResponse sendMulticast(
* @param message A non-null {@link MulticastMessage}.
* @return An {@code ApiFuture} that will complete with a {@link BatchResponse} when
* the messages have been sent.
+ * @deprecated Use {@link #sendEachForMulticastAsync(MulticastMessage)} instead.
*/
+ @Deprecated
public ApiFuture Instances of this class are thread-safe and immutable. Use {@link MulticastMessage.Builder}
* to create new instances. See {@link FirebaseMessaging#sendMulticast(MulticastMessage)} for
* details on how to send the message to FCM for multicast delivery.
*
- * This class and the associated Builder retain the order of tokens. Therefore the order of
- * the responses list obtained by calling {@link BatchResponse#getResponses()} on the return value
- * of {@link FirebaseMessaging#sendMulticast(MulticastMessage)} corresponds to the order in which
- * tokens were added to the {@link MulticastMessage.Builder}.
+ * This class and the associated Builder retain the order of tokens and FIDs. Therefore
+ * the order of the responses list obtained by calling {@link BatchResponse#getResponses()}
+ * on the return value of {@link FirebaseMessaging#sendMulticast(MulticastMessage)}
+ * corresponds to the order in which targets were added to the
+ * {@link MulticastMessage.Builder}. If both tokens and FIDs are provided, tokens are
+ * processed first, followed by FIDs.
*/
public class MulticastMessage {
+ @Deprecated
private final List You can get an instance of {@link FirebasePhoneNumberVerification} via {@link #getInstance()},
+ * or {@link #getInstance(FirebaseApp)}.
+ */
+public final class FirebasePhoneNumberVerification {
+ private static final String SERVICE_ID = FirebasePhoneNumberVerification.class.getName();
+ private final FirebasePhoneNumberVerificationTokenVerifier tokenVerifier;
+
+ private FirebasePhoneNumberVerification(FirebaseApp app) {
+ this.tokenVerifier = new FirebasePhoneNumberVerificationTokenVerifier(app);
+ }
+
+ /**
+ * Gets the {@link FirebasePhoneNumberVerification} instance for the default {@link FirebaseApp}.
+ *
+ * @return The {@link FirebasePhoneNumberVerification} instance for the default
+ * {@link FirebaseApp}.
+ */
+ public static FirebasePhoneNumberVerification getInstance() {
+ return getInstance(FirebaseApp.getInstance());
+ }
+
+ /**
+ * Gets the {@link FirebasePhoneNumberVerification} instance for the specified
+ * {@link FirebaseApp}.
+ *
+ * @return The {@link FirebasePhoneNumberVerification} instance for the specified
+ * {@link FirebaseApp}.
+ */
+ public static synchronized FirebasePhoneNumberVerification getInstance(FirebaseApp app) {
+ FirebasePhoneNumberVerificationService service =
+ ImplFirebaseTrampolines.getService(app, SERVICE_ID,
+ FirebasePhoneNumberVerificationService.class);
+ if (service == null) {
+ service = ImplFirebaseTrampolines.addService(
+ app, new FirebasePhoneNumberVerificationService(app));
+ }
+ return service.getInstance();
+ }
+
+ /**
+ * Verifies a Firebase Phone Number Verification token (JWT).
+ *
+ * @param phoneNumberVerificationJwt The JWT string to verify.
+ * @return A verified {@link FirebasePhoneNumberVerificationToken}.
+ * @throws FirebasePhoneNumberVerificationException If verification fails.
+ */
+ public FirebasePhoneNumberVerificationToken verifyToken(String phoneNumberVerificationJwt)
+ throws FirebasePhoneNumberVerificationException {
+ return this.tokenVerifier.verifyToken(phoneNumberVerificationJwt);
+ }
+
+ private static class FirebasePhoneNumberVerificationService
+ extends FirebaseServiceFirebaseOptions,
* 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 {@code Bucket}
+ * @return a cloud storage {@code Bucket}
* instance.
* @throws IllegalArgumentException If the bucket name is null, empty, or if the specified
* bucket does not exist.
diff --git a/src/main/java/com/google/firebase/database/ChildEventListener.java b/src/main/java/com/google/firebase/database/ChildEventListener.java
index 65bcdfdce..21f74db54 100644
--- a/src/main/java/com/google/firebase/database/ChildEventListener.java
+++ b/src/main/java/com/google/firebase/database/ChildEventListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/DataSnapshot.java b/src/main/java/com/google/firebase/database/DataSnapshot.java
index f1f470505..64fa7f7b7 100644
--- a/src/main/java/com/google/firebase/database/DataSnapshot.java
+++ b/src/main/java/com/google/firebase/database/DataSnapshot.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/DatabaseError.java b/src/main/java/com/google/firebase/database/DatabaseError.java
index 456eb99e6..1b0deb059 100644
--- a/src/main/java/com/google/firebase/database/DatabaseError.java
+++ b/src/main/java/com/google/firebase/database/DatabaseError.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/DatabaseException.java b/src/main/java/com/google/firebase/database/DatabaseException.java
index c85e93878..a5aff67b8 100644
--- a/src/main/java/com/google/firebase/database/DatabaseException.java
+++ b/src/main/java/com/google/firebase/database/DatabaseException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/DatabaseReference.java b/src/main/java/com/google/firebase/database/DatabaseReference.java
index 10dfe40ba..7a1bebac1 100644
--- a/src/main/java/com/google/firebase/database/DatabaseReference.java
+++ b/src/main/java/com/google/firebase/database/DatabaseReference.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/Exclude.java b/src/main/java/com/google/firebase/database/Exclude.java
index e4d90c7da..4eb65dc46 100644
--- a/src/main/java/com/google/firebase/database/Exclude.java
+++ b/src/main/java/com/google/firebase/database/Exclude.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/FirebaseDatabase.java b/src/main/java/com/google/firebase/database/FirebaseDatabase.java
index e59cd38fa..9dea16566 100644
--- a/src/main/java/com/google/firebase/database/FirebaseDatabase.java
+++ b/src/main/java/com/google/firebase/database/FirebaseDatabase.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/GenericTypeIndicator.java b/src/main/java/com/google/firebase/database/GenericTypeIndicator.java
index 3d9bb94d9..5a519d4d7 100644
--- a/src/main/java/com/google/firebase/database/GenericTypeIndicator.java
+++ b/src/main/java/com/google/firebase/database/GenericTypeIndicator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/IgnoreExtraProperties.java b/src/main/java/com/google/firebase/database/IgnoreExtraProperties.java
index ff953fd88..ce5d92a66 100644
--- a/src/main/java/com/google/firebase/database/IgnoreExtraProperties.java
+++ b/src/main/java/com/google/firebase/database/IgnoreExtraProperties.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/InternalHelpers.java b/src/main/java/com/google/firebase/database/InternalHelpers.java
index f5ef4e249..73a92f972 100644
--- a/src/main/java/com/google/firebase/database/InternalHelpers.java
+++ b/src/main/java/com/google/firebase/database/InternalHelpers.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/MutableData.java b/src/main/java/com/google/firebase/database/MutableData.java
index 7a0e7983b..862330357 100644
--- a/src/main/java/com/google/firebase/database/MutableData.java
+++ b/src/main/java/com/google/firebase/database/MutableData.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/OnDisconnect.java b/src/main/java/com/google/firebase/database/OnDisconnect.java
index 7b4cc0859..fc81e2d42 100644
--- a/src/main/java/com/google/firebase/database/OnDisconnect.java
+++ b/src/main/java/com/google/firebase/database/OnDisconnect.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/PropertyName.java b/src/main/java/com/google/firebase/database/PropertyName.java
index 70a8f1345..0b9a58cec 100644
--- a/src/main/java/com/google/firebase/database/PropertyName.java
+++ b/src/main/java/com/google/firebase/database/PropertyName.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/Query.java b/src/main/java/com/google/firebase/database/Query.java
index e22a4931a..9903cf525 100644
--- a/src/main/java/com/google/firebase/database/Query.java
+++ b/src/main/java/com/google/firebase/database/Query.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/ServerValue.java b/src/main/java/com/google/firebase/database/ServerValue.java
index de0bb6a0f..410860bc5 100644
--- a/src/main/java/com/google/firebase/database/ServerValue.java
+++ b/src/main/java/com/google/firebase/database/ServerValue.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/ThrowOnExtraProperties.java b/src/main/java/com/google/firebase/database/ThrowOnExtraProperties.java
index d0a354c4d..49e91ba78 100644
--- a/src/main/java/com/google/firebase/database/ThrowOnExtraProperties.java
+++ b/src/main/java/com/google/firebase/database/ThrowOnExtraProperties.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/Transaction.java b/src/main/java/com/google/firebase/database/Transaction.java
index 525005b5c..e2733f26e 100644
--- a/src/main/java/com/google/firebase/database/Transaction.java
+++ b/src/main/java/com/google/firebase/database/Transaction.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/ValueEventListener.java b/src/main/java/com/google/firebase/database/ValueEventListener.java
index bb50e0e26..4b89b59a2 100644
--- a/src/main/java/com/google/firebase/database/ValueEventListener.java
+++ b/src/main/java/com/google/firebase/database/ValueEventListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/annotations/NotNull.java b/src/main/java/com/google/firebase/database/annotations/NotNull.java
index fe60cf688..3d79b48e3 100644
--- a/src/main/java/com/google/firebase/database/annotations/NotNull.java
+++ b/src/main/java/com/google/firebase/database/annotations/NotNull.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/annotations/Nullable.java b/src/main/java/com/google/firebase/database/annotations/Nullable.java
index 7c58d121c..da4e931d0 100644
--- a/src/main/java/com/google/firebase/database/annotations/Nullable.java
+++ b/src/main/java/com/google/firebase/database/annotations/Nullable.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/annotations/package-info.java b/src/main/java/com/google/firebase/database/annotations/package-info.java
index 23e1605a2..e23aff54e 100644
--- a/src/main/java/com/google/firebase/database/annotations/package-info.java
+++ b/src/main/java/com/google/firebase/database/annotations/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/collection/ArraySortedMap.java b/src/main/java/com/google/firebase/database/collection/ArraySortedMap.java
index edc7afabe..46043e30e 100644
--- a/src/main/java/com/google/firebase/database/collection/ArraySortedMap.java
+++ b/src/main/java/com/google/firebase/database/collection/ArraySortedMap.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/collection/ImmutableSortedMap.java b/src/main/java/com/google/firebase/database/collection/ImmutableSortedMap.java
index 525f9edc5..8beb8bb91 100644
--- a/src/main/java/com/google/firebase/database/collection/ImmutableSortedMap.java
+++ b/src/main/java/com/google/firebase/database/collection/ImmutableSortedMap.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/collection/ImmutableSortedMapIterator.java b/src/main/java/com/google/firebase/database/collection/ImmutableSortedMapIterator.java
index 5229579d7..d901ef71f 100644
--- a/src/main/java/com/google/firebase/database/collection/ImmutableSortedMapIterator.java
+++ b/src/main/java/com/google/firebase/database/collection/ImmutableSortedMapIterator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/collection/ImmutableSortedSet.java b/src/main/java/com/google/firebase/database/collection/ImmutableSortedSet.java
index f5ab4f7fb..ba6079602 100644
--- a/src/main/java/com/google/firebase/database/collection/ImmutableSortedSet.java
+++ b/src/main/java/com/google/firebase/database/collection/ImmutableSortedSet.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/collection/LLRBBlackValueNode.java b/src/main/java/com/google/firebase/database/collection/LLRBBlackValueNode.java
index 99a59f980..a0e471637 100644
--- a/src/main/java/com/google/firebase/database/collection/LLRBBlackValueNode.java
+++ b/src/main/java/com/google/firebase/database/collection/LLRBBlackValueNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/collection/LLRBEmptyNode.java b/src/main/java/com/google/firebase/database/collection/LLRBEmptyNode.java
index e1e72ff91..c2e04d033 100644
--- a/src/main/java/com/google/firebase/database/collection/LLRBEmptyNode.java
+++ b/src/main/java/com/google/firebase/database/collection/LLRBEmptyNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/collection/LLRBNode.java b/src/main/java/com/google/firebase/database/collection/LLRBNode.java
index bb3214c7f..c8fe496ba 100644
--- a/src/main/java/com/google/firebase/database/collection/LLRBNode.java
+++ b/src/main/java/com/google/firebase/database/collection/LLRBNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/collection/LLRBRedValueNode.java b/src/main/java/com/google/firebase/database/collection/LLRBRedValueNode.java
index 642d3cbf3..488fdb22b 100644
--- a/src/main/java/com/google/firebase/database/collection/LLRBRedValueNode.java
+++ b/src/main/java/com/google/firebase/database/collection/LLRBRedValueNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/collection/LLRBValueNode.java b/src/main/java/com/google/firebase/database/collection/LLRBValueNode.java
index 091af493e..b8d29d16a 100644
--- a/src/main/java/com/google/firebase/database/collection/LLRBValueNode.java
+++ b/src/main/java/com/google/firebase/database/collection/LLRBValueNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/collection/RBTreeSortedMap.java b/src/main/java/com/google/firebase/database/collection/RBTreeSortedMap.java
index 177eb2dcd..283bd2d8b 100644
--- a/src/main/java/com/google/firebase/database/collection/RBTreeSortedMap.java
+++ b/src/main/java/com/google/firebase/database/collection/RBTreeSortedMap.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/collection/StandardComparator.java b/src/main/java/com/google/firebase/database/collection/StandardComparator.java
index 9f2cb985a..a4de5bd8d 100644
--- a/src/main/java/com/google/firebase/database/collection/StandardComparator.java
+++ b/src/main/java/com/google/firebase/database/collection/StandardComparator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/collection/package-info.java b/src/main/java/com/google/firebase/database/collection/package-info.java
index ab03ce9d9..cd9ec39a9 100644
--- a/src/main/java/com/google/firebase/database/collection/package-info.java
+++ b/src/main/java/com/google/firebase/database/collection/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/connection/CompoundHash.java b/src/main/java/com/google/firebase/database/connection/CompoundHash.java
index 443a899fb..a3456dbd4 100644
--- a/src/main/java/com/google/firebase/database/connection/CompoundHash.java
+++ b/src/main/java/com/google/firebase/database/connection/CompoundHash.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/connection/Connection.java b/src/main/java/com/google/firebase/database/connection/Connection.java
index 83e377304..111d3a897 100644
--- a/src/main/java/com/google/firebase/database/connection/Connection.java
+++ b/src/main/java/com/google/firebase/database/connection/Connection.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/connection/ConnectionAuthTokenProvider.java b/src/main/java/com/google/firebase/database/connection/ConnectionAuthTokenProvider.java
index 8874238ed..21e0a3076 100644
--- a/src/main/java/com/google/firebase/database/connection/ConnectionAuthTokenProvider.java
+++ b/src/main/java/com/google/firebase/database/connection/ConnectionAuthTokenProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/connection/ConnectionContext.java b/src/main/java/com/google/firebase/database/connection/ConnectionContext.java
index 574bc1df9..110935605 100644
--- a/src/main/java/com/google/firebase/database/connection/ConnectionContext.java
+++ b/src/main/java/com/google/firebase/database/connection/ConnectionContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/connection/ConnectionUtils.java b/src/main/java/com/google/firebase/database/connection/ConnectionUtils.java
index de04b58e6..6821bc5ef 100644
--- a/src/main/java/com/google/firebase/database/connection/ConnectionUtils.java
+++ b/src/main/java/com/google/firebase/database/connection/ConnectionUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/connection/Constants.java b/src/main/java/com/google/firebase/database/connection/Constants.java
index 6ec9a3da0..6a42939cf 100644
--- a/src/main/java/com/google/firebase/database/connection/Constants.java
+++ b/src/main/java/com/google/firebase/database/connection/Constants.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/connection/HostInfo.java b/src/main/java/com/google/firebase/database/connection/HostInfo.java
index 1bfa7758d..23be57cbe 100644
--- a/src/main/java/com/google/firebase/database/connection/HostInfo.java
+++ b/src/main/java/com/google/firebase/database/connection/HostInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/connection/ListenHashProvider.java b/src/main/java/com/google/firebase/database/connection/ListenHashProvider.java
index 9ab58bb23..9be415379 100644
--- a/src/main/java/com/google/firebase/database/connection/ListenHashProvider.java
+++ b/src/main/java/com/google/firebase/database/connection/ListenHashProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/connection/PersistentConnection.java b/src/main/java/com/google/firebase/database/connection/PersistentConnection.java
index eca676121..4a53a2261 100644
--- a/src/main/java/com/google/firebase/database/connection/PersistentConnection.java
+++ b/src/main/java/com/google/firebase/database/connection/PersistentConnection.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/connection/PersistentConnectionImpl.java b/src/main/java/com/google/firebase/database/connection/PersistentConnectionImpl.java
index fc79b4cfe..2ec6af5e8 100644
--- a/src/main/java/com/google/firebase/database/connection/PersistentConnectionImpl.java
+++ b/src/main/java/com/google/firebase/database/connection/PersistentConnectionImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/connection/RangeMerge.java b/src/main/java/com/google/firebase/database/connection/RangeMerge.java
index eb74cf2a9..5a2508efe 100644
--- a/src/main/java/com/google/firebase/database/connection/RangeMerge.java
+++ b/src/main/java/com/google/firebase/database/connection/RangeMerge.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/connection/RequestResultCallback.java b/src/main/java/com/google/firebase/database/connection/RequestResultCallback.java
index 53c77f87e..8051c23c6 100644
--- a/src/main/java/com/google/firebase/database/connection/RequestResultCallback.java
+++ b/src/main/java/com/google/firebase/database/connection/RequestResultCallback.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/connection/WebsocketConnection.java b/src/main/java/com/google/firebase/database/connection/WebsocketConnection.java
index a421b90d4..88a2be670 100644
--- a/src/main/java/com/google/firebase/database/connection/WebsocketConnection.java
+++ b/src/main/java/com/google/firebase/database/connection/WebsocketConnection.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/connection/package-info.java b/src/main/java/com/google/firebase/database/connection/package-info.java
index e83511690..9bce1cc1d 100644
--- a/src/main/java/com/google/firebase/database/connection/package-info.java
+++ b/src/main/java/com/google/firebase/database/connection/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/connection/util/RetryHelper.java b/src/main/java/com/google/firebase/database/connection/util/RetryHelper.java
index f8f6bb77a..c92c8e763 100644
--- a/src/main/java/com/google/firebase/database/connection/util/RetryHelper.java
+++ b/src/main/java/com/google/firebase/database/connection/util/RetryHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/connection/util/package-info.java b/src/main/java/com/google/firebase/database/connection/util/package-info.java
index d1b554d62..f31b84af5 100644
--- a/src/main/java/com/google/firebase/database/connection/util/package-info.java
+++ b/src/main/java/com/google/firebase/database/connection/util/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/AuthTokenProvider.java b/src/main/java/com/google/firebase/database/core/AuthTokenProvider.java
index 15da9e7c0..b93e8154c 100644
--- a/src/main/java/com/google/firebase/database/core/AuthTokenProvider.java
+++ b/src/main/java/com/google/firebase/database/core/AuthTokenProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/ChildEventRegistration.java b/src/main/java/com/google/firebase/database/core/ChildEventRegistration.java
index 8b0460294..592aa1749 100644
--- a/src/main/java/com/google/firebase/database/core/ChildEventRegistration.java
+++ b/src/main/java/com/google/firebase/database/core/ChildEventRegistration.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/CompoundWrite.java b/src/main/java/com/google/firebase/database/core/CompoundWrite.java
index 22c049645..f8f135319 100644
--- a/src/main/java/com/google/firebase/database/core/CompoundWrite.java
+++ b/src/main/java/com/google/firebase/database/core/CompoundWrite.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/Constants.java b/src/main/java/com/google/firebase/database/core/Constants.java
index b30b45f3d..c9706e3aa 100644
--- a/src/main/java/com/google/firebase/database/core/Constants.java
+++ b/src/main/java/com/google/firebase/database/core/Constants.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/Context.java b/src/main/java/com/google/firebase/database/core/Context.java
index a0025f997..02e7fe7a8 100644
--- a/src/main/java/com/google/firebase/database/core/Context.java
+++ b/src/main/java/com/google/firebase/database/core/Context.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/DatabaseConfig.java b/src/main/java/com/google/firebase/database/core/DatabaseConfig.java
index 844f59266..4e4cb7cdf 100644
--- a/src/main/java/com/google/firebase/database/core/DatabaseConfig.java
+++ b/src/main/java/com/google/firebase/database/core/DatabaseConfig.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/EventRegistration.java b/src/main/java/com/google/firebase/database/core/EventRegistration.java
index 815884303..5517f2ffb 100644
--- a/src/main/java/com/google/firebase/database/core/EventRegistration.java
+++ b/src/main/java/com/google/firebase/database/core/EventRegistration.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/EventRegistrationZombieListener.java b/src/main/java/com/google/firebase/database/core/EventRegistrationZombieListener.java
index bce5fecde..cebcddd6e 100644
--- a/src/main/java/com/google/firebase/database/core/EventRegistrationZombieListener.java
+++ b/src/main/java/com/google/firebase/database/core/EventRegistrationZombieListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/EventTarget.java b/src/main/java/com/google/firebase/database/core/EventTarget.java
index 2f0b91ad5..f87c6645d 100644
--- a/src/main/java/com/google/firebase/database/core/EventTarget.java
+++ b/src/main/java/com/google/firebase/database/core/EventTarget.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/JvmAuthTokenProvider.java b/src/main/java/com/google/firebase/database/core/JvmAuthTokenProvider.java
index 9b862ba86..e4c03cb24 100644
--- a/src/main/java/com/google/firebase/database/core/JvmAuthTokenProvider.java
+++ b/src/main/java/com/google/firebase/database/core/JvmAuthTokenProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/JvmPlatform.java b/src/main/java/com/google/firebase/database/core/JvmPlatform.java
index 2a226c078..fac2f6b93 100644
--- a/src/main/java/com/google/firebase/database/core/JvmPlatform.java
+++ b/src/main/java/com/google/firebase/database/core/JvmPlatform.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/Path.java b/src/main/java/com/google/firebase/database/core/Path.java
index b6fd451b9..22c2f0dde 100644
--- a/src/main/java/com/google/firebase/database/core/Path.java
+++ b/src/main/java/com/google/firebase/database/core/Path.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/Platform.java b/src/main/java/com/google/firebase/database/core/Platform.java
index 2d2742a62..e3a2353ed 100644
--- a/src/main/java/com/google/firebase/database/core/Platform.java
+++ b/src/main/java/com/google/firebase/database/core/Platform.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/Repo.java b/src/main/java/com/google/firebase/database/core/Repo.java
index 98777d04d..0850cca5a 100644
--- a/src/main/java/com/google/firebase/database/core/Repo.java
+++ b/src/main/java/com/google/firebase/database/core/Repo.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/RepoInfo.java b/src/main/java/com/google/firebase/database/core/RepoInfo.java
index 79f83346a..1d7e31d34 100644
--- a/src/main/java/com/google/firebase/database/core/RepoInfo.java
+++ b/src/main/java/com/google/firebase/database/core/RepoInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/RepoManager.java b/src/main/java/com/google/firebase/database/core/RepoManager.java
index a1d0eafce..e694fd943 100644
--- a/src/main/java/com/google/firebase/database/core/RepoManager.java
+++ b/src/main/java/com/google/firebase/database/core/RepoManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/RunLoop.java b/src/main/java/com/google/firebase/database/core/RunLoop.java
index 723f9430d..16b341da5 100644
--- a/src/main/java/com/google/firebase/database/core/RunLoop.java
+++ b/src/main/java/com/google/firebase/database/core/RunLoop.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/ServerValues.java b/src/main/java/com/google/firebase/database/core/ServerValues.java
index e484976f9..d4af3637b 100644
--- a/src/main/java/com/google/firebase/database/core/ServerValues.java
+++ b/src/main/java/com/google/firebase/database/core/ServerValues.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/SnapshotHolder.java b/src/main/java/com/google/firebase/database/core/SnapshotHolder.java
index 60d51bd84..55d497739 100644
--- a/src/main/java/com/google/firebase/database/core/SnapshotHolder.java
+++ b/src/main/java/com/google/firebase/database/core/SnapshotHolder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/SparseSnapshotTree.java b/src/main/java/com/google/firebase/database/core/SparseSnapshotTree.java
index e73c7587f..c47e31195 100644
--- a/src/main/java/com/google/firebase/database/core/SparseSnapshotTree.java
+++ b/src/main/java/com/google/firebase/database/core/SparseSnapshotTree.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/SyncPoint.java b/src/main/java/com/google/firebase/database/core/SyncPoint.java
index 8a3c91fa2..cd8bdbe9c 100644
--- a/src/main/java/com/google/firebase/database/core/SyncPoint.java
+++ b/src/main/java/com/google/firebase/database/core/SyncPoint.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/SyncTree.java b/src/main/java/com/google/firebase/database/core/SyncTree.java
index f7da11750..01562caa2 100644
--- a/src/main/java/com/google/firebase/database/core/SyncTree.java
+++ b/src/main/java/com/google/firebase/database/core/SyncTree.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/Tag.java b/src/main/java/com/google/firebase/database/core/Tag.java
index e25fcb359..d25adb357 100644
--- a/src/main/java/com/google/firebase/database/core/Tag.java
+++ b/src/main/java/com/google/firebase/database/core/Tag.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/ThreadPoolEventTarget.java b/src/main/java/com/google/firebase/database/core/ThreadPoolEventTarget.java
index 34162fbe2..3a32d9167 100644
--- a/src/main/java/com/google/firebase/database/core/ThreadPoolEventTarget.java
+++ b/src/main/java/com/google/firebase/database/core/ThreadPoolEventTarget.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/UserWriteRecord.java b/src/main/java/com/google/firebase/database/core/UserWriteRecord.java
index 02c46a2d9..21fa08a79 100644
--- a/src/main/java/com/google/firebase/database/core/UserWriteRecord.java
+++ b/src/main/java/com/google/firebase/database/core/UserWriteRecord.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/ValidationPath.java b/src/main/java/com/google/firebase/database/core/ValidationPath.java
index 3ea3d03c6..bc3620ec3 100644
--- a/src/main/java/com/google/firebase/database/core/ValidationPath.java
+++ b/src/main/java/com/google/firebase/database/core/ValidationPath.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/ValueEventRegistration.java b/src/main/java/com/google/firebase/database/core/ValueEventRegistration.java
index 839ce5344..d46580daa 100644
--- a/src/main/java/com/google/firebase/database/core/ValueEventRegistration.java
+++ b/src/main/java/com/google/firebase/database/core/ValueEventRegistration.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/WriteTree.java b/src/main/java/com/google/firebase/database/core/WriteTree.java
index 86ba8536f..95a57d4d8 100644
--- a/src/main/java/com/google/firebase/database/core/WriteTree.java
+++ b/src/main/java/com/google/firebase/database/core/WriteTree.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/WriteTreeRef.java b/src/main/java/com/google/firebase/database/core/WriteTreeRef.java
index d66f041b4..3123987ea 100644
--- a/src/main/java/com/google/firebase/database/core/WriteTreeRef.java
+++ b/src/main/java/com/google/firebase/database/core/WriteTreeRef.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/ZombieEventManager.java b/src/main/java/com/google/firebase/database/core/ZombieEventManager.java
index 2b23b89fa..c488c4d0b 100644
--- a/src/main/java/com/google/firebase/database/core/ZombieEventManager.java
+++ b/src/main/java/com/google/firebase/database/core/ZombieEventManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/operation/AckUserWrite.java b/src/main/java/com/google/firebase/database/core/operation/AckUserWrite.java
index 3016e3b2f..0ffeea3e6 100644
--- a/src/main/java/com/google/firebase/database/core/operation/AckUserWrite.java
+++ b/src/main/java/com/google/firebase/database/core/operation/AckUserWrite.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/operation/ListenComplete.java b/src/main/java/com/google/firebase/database/core/operation/ListenComplete.java
index 816881bb4..fac4dbdbf 100644
--- a/src/main/java/com/google/firebase/database/core/operation/ListenComplete.java
+++ b/src/main/java/com/google/firebase/database/core/operation/ListenComplete.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/operation/Merge.java b/src/main/java/com/google/firebase/database/core/operation/Merge.java
index 1f859dfa2..520433af5 100644
--- a/src/main/java/com/google/firebase/database/core/operation/Merge.java
+++ b/src/main/java/com/google/firebase/database/core/operation/Merge.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/operation/Operation.java b/src/main/java/com/google/firebase/database/core/operation/Operation.java
index 951dce939..8a42cd89c 100644
--- a/src/main/java/com/google/firebase/database/core/operation/Operation.java
+++ b/src/main/java/com/google/firebase/database/core/operation/Operation.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/operation/OperationSource.java b/src/main/java/com/google/firebase/database/core/operation/OperationSource.java
index e73fca9a5..fa9aadd82 100644
--- a/src/main/java/com/google/firebase/database/core/operation/OperationSource.java
+++ b/src/main/java/com/google/firebase/database/core/operation/OperationSource.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/operation/Overwrite.java b/src/main/java/com/google/firebase/database/core/operation/Overwrite.java
index 6177e576a..75cc15e69 100644
--- a/src/main/java/com/google/firebase/database/core/operation/Overwrite.java
+++ b/src/main/java/com/google/firebase/database/core/operation/Overwrite.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/operation/package-info.java b/src/main/java/com/google/firebase/database/core/operation/package-info.java
index d92e9cf5e..91d53d0b7 100644
--- a/src/main/java/com/google/firebase/database/core/operation/package-info.java
+++ b/src/main/java/com/google/firebase/database/core/operation/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/package-info.java b/src/main/java/com/google/firebase/database/core/package-info.java
index 62dcee2ef..4598d4bfc 100644
--- a/src/main/java/com/google/firebase/database/core/package-info.java
+++ b/src/main/java/com/google/firebase/database/core/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/persistence/CachePolicy.java b/src/main/java/com/google/firebase/database/core/persistence/CachePolicy.java
index c82b5fdcb..52997369f 100644
--- a/src/main/java/com/google/firebase/database/core/persistence/CachePolicy.java
+++ b/src/main/java/com/google/firebase/database/core/persistence/CachePolicy.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/persistence/DefaultPersistenceManager.java b/src/main/java/com/google/firebase/database/core/persistence/DefaultPersistenceManager.java
index 40e1b99dc..a528c2767 100644
--- a/src/main/java/com/google/firebase/database/core/persistence/DefaultPersistenceManager.java
+++ b/src/main/java/com/google/firebase/database/core/persistence/DefaultPersistenceManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/persistence/LRUCachePolicy.java b/src/main/java/com/google/firebase/database/core/persistence/LRUCachePolicy.java
index 744c34c48..2f62d38b3 100644
--- a/src/main/java/com/google/firebase/database/core/persistence/LRUCachePolicy.java
+++ b/src/main/java/com/google/firebase/database/core/persistence/LRUCachePolicy.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/persistence/NoopPersistenceManager.java b/src/main/java/com/google/firebase/database/core/persistence/NoopPersistenceManager.java
index 15bb3a970..da44d7ec8 100644
--- a/src/main/java/com/google/firebase/database/core/persistence/NoopPersistenceManager.java
+++ b/src/main/java/com/google/firebase/database/core/persistence/NoopPersistenceManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/persistence/PersistenceManager.java b/src/main/java/com/google/firebase/database/core/persistence/PersistenceManager.java
index 61d11bfa0..68e7f0469 100644
--- a/src/main/java/com/google/firebase/database/core/persistence/PersistenceManager.java
+++ b/src/main/java/com/google/firebase/database/core/persistence/PersistenceManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/persistence/PersistenceStorageEngine.java b/src/main/java/com/google/firebase/database/core/persistence/PersistenceStorageEngine.java
index 31ef88761..edc9abfd0 100644
--- a/src/main/java/com/google/firebase/database/core/persistence/PersistenceStorageEngine.java
+++ b/src/main/java/com/google/firebase/database/core/persistence/PersistenceStorageEngine.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/persistence/PruneForest.java b/src/main/java/com/google/firebase/database/core/persistence/PruneForest.java
index 64872d4f8..7d8499a92 100644
--- a/src/main/java/com/google/firebase/database/core/persistence/PruneForest.java
+++ b/src/main/java/com/google/firebase/database/core/persistence/PruneForest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/persistence/TrackedQuery.java b/src/main/java/com/google/firebase/database/core/persistence/TrackedQuery.java
index 61169b4eb..7efeba5a8 100644
--- a/src/main/java/com/google/firebase/database/core/persistence/TrackedQuery.java
+++ b/src/main/java/com/google/firebase/database/core/persistence/TrackedQuery.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/persistence/TrackedQueryManager.java b/src/main/java/com/google/firebase/database/core/persistence/TrackedQueryManager.java
index 20278b947..d8b072dd1 100644
--- a/src/main/java/com/google/firebase/database/core/persistence/TrackedQueryManager.java
+++ b/src/main/java/com/google/firebase/database/core/persistence/TrackedQueryManager.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/persistence/package-info.java b/src/main/java/com/google/firebase/database/core/persistence/package-info.java
index 710cf90e9..5d7217861 100644
--- a/src/main/java/com/google/firebase/database/core/persistence/package-info.java
+++ b/src/main/java/com/google/firebase/database/core/persistence/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/utilities/ImmutableTree.java b/src/main/java/com/google/firebase/database/core/utilities/ImmutableTree.java
index 617cbd0e4..e47d2f072 100644
--- a/src/main/java/com/google/firebase/database/core/utilities/ImmutableTree.java
+++ b/src/main/java/com/google/firebase/database/core/utilities/ImmutableTree.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/utilities/Predicate.java b/src/main/java/com/google/firebase/database/core/utilities/Predicate.java
index 667ac34c0..45478ace1 100644
--- a/src/main/java/com/google/firebase/database/core/utilities/Predicate.java
+++ b/src/main/java/com/google/firebase/database/core/utilities/Predicate.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/utilities/Tree.java b/src/main/java/com/google/firebase/database/core/utilities/Tree.java
index 54923ae09..598984c8d 100644
--- a/src/main/java/com/google/firebase/database/core/utilities/Tree.java
+++ b/src/main/java/com/google/firebase/database/core/utilities/Tree.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/utilities/TreeNode.java b/src/main/java/com/google/firebase/database/core/utilities/TreeNode.java
index 84df758b2..909c0d648 100644
--- a/src/main/java/com/google/firebase/database/core/utilities/TreeNode.java
+++ b/src/main/java/com/google/firebase/database/core/utilities/TreeNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/utilities/package-info.java b/src/main/java/com/google/firebase/database/core/utilities/package-info.java
index e17c4c192..57a9ee9ae 100644
--- a/src/main/java/com/google/firebase/database/core/utilities/package-info.java
+++ b/src/main/java/com/google/firebase/database/core/utilities/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/view/CacheNode.java b/src/main/java/com/google/firebase/database/core/view/CacheNode.java
index f51de2db4..abebe54a0 100644
--- a/src/main/java/com/google/firebase/database/core/view/CacheNode.java
+++ b/src/main/java/com/google/firebase/database/core/view/CacheNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/view/CancelEvent.java b/src/main/java/com/google/firebase/database/core/view/CancelEvent.java
index 660111c73..3625d18b2 100644
--- a/src/main/java/com/google/firebase/database/core/view/CancelEvent.java
+++ b/src/main/java/com/google/firebase/database/core/view/CancelEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/view/Change.java b/src/main/java/com/google/firebase/database/core/view/Change.java
index c69ca81a7..3c3a7e065 100644
--- a/src/main/java/com/google/firebase/database/core/view/Change.java
+++ b/src/main/java/com/google/firebase/database/core/view/Change.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/view/DataEvent.java b/src/main/java/com/google/firebase/database/core/view/DataEvent.java
index ae5f7fa22..cc1fd648c 100644
--- a/src/main/java/com/google/firebase/database/core/view/DataEvent.java
+++ b/src/main/java/com/google/firebase/database/core/view/DataEvent.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/view/Event.java b/src/main/java/com/google/firebase/database/core/view/Event.java
index 2c2ea2522..46b6100e1 100644
--- a/src/main/java/com/google/firebase/database/core/view/Event.java
+++ b/src/main/java/com/google/firebase/database/core/view/Event.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/view/EventGenerator.java b/src/main/java/com/google/firebase/database/core/view/EventGenerator.java
index 0b28c3bac..3e9e54445 100644
--- a/src/main/java/com/google/firebase/database/core/view/EventGenerator.java
+++ b/src/main/java/com/google/firebase/database/core/view/EventGenerator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/view/EventRaiser.java b/src/main/java/com/google/firebase/database/core/view/EventRaiser.java
index d2bbacee6..6cb0f1e3f 100644
--- a/src/main/java/com/google/firebase/database/core/view/EventRaiser.java
+++ b/src/main/java/com/google/firebase/database/core/view/EventRaiser.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/view/QueryParams.java b/src/main/java/com/google/firebase/database/core/view/QueryParams.java
index d361f8727..afa7f0a1a 100644
--- a/src/main/java/com/google/firebase/database/core/view/QueryParams.java
+++ b/src/main/java/com/google/firebase/database/core/view/QueryParams.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/view/QuerySpec.java b/src/main/java/com/google/firebase/database/core/view/QuerySpec.java
index 923a77d7d..3174ec087 100644
--- a/src/main/java/com/google/firebase/database/core/view/QuerySpec.java
+++ b/src/main/java/com/google/firebase/database/core/view/QuerySpec.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/view/View.java b/src/main/java/com/google/firebase/database/core/view/View.java
index 9aa05976f..2aa4fa1cd 100644
--- a/src/main/java/com/google/firebase/database/core/view/View.java
+++ b/src/main/java/com/google/firebase/database/core/view/View.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/view/ViewCache.java b/src/main/java/com/google/firebase/database/core/view/ViewCache.java
index 417fcbb41..f008348b1 100644
--- a/src/main/java/com/google/firebase/database/core/view/ViewCache.java
+++ b/src/main/java/com/google/firebase/database/core/view/ViewCache.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/view/ViewProcessor.java b/src/main/java/com/google/firebase/database/core/view/ViewProcessor.java
index 57fcf07c1..3b3aedaff 100644
--- a/src/main/java/com/google/firebase/database/core/view/ViewProcessor.java
+++ b/src/main/java/com/google/firebase/database/core/view/ViewProcessor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/view/filter/ChildChangeAccumulator.java b/src/main/java/com/google/firebase/database/core/view/filter/ChildChangeAccumulator.java
index 9f74fe172..f78f7bf51 100644
--- a/src/main/java/com/google/firebase/database/core/view/filter/ChildChangeAccumulator.java
+++ b/src/main/java/com/google/firebase/database/core/view/filter/ChildChangeAccumulator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/view/filter/IndexedFilter.java b/src/main/java/com/google/firebase/database/core/view/filter/IndexedFilter.java
index bd2c4b717..ff0da3b1e 100644
--- a/src/main/java/com/google/firebase/database/core/view/filter/IndexedFilter.java
+++ b/src/main/java/com/google/firebase/database/core/view/filter/IndexedFilter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/view/filter/LimitedFilter.java b/src/main/java/com/google/firebase/database/core/view/filter/LimitedFilter.java
index eb6ca2eec..1f71b1758 100644
--- a/src/main/java/com/google/firebase/database/core/view/filter/LimitedFilter.java
+++ b/src/main/java/com/google/firebase/database/core/view/filter/LimitedFilter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/view/filter/NodeFilter.java b/src/main/java/com/google/firebase/database/core/view/filter/NodeFilter.java
index 6a81b9bde..8df4e4c16 100644
--- a/src/main/java/com/google/firebase/database/core/view/filter/NodeFilter.java
+++ b/src/main/java/com/google/firebase/database/core/view/filter/NodeFilter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/view/filter/RangedFilter.java b/src/main/java/com/google/firebase/database/core/view/filter/RangedFilter.java
index 003754745..380309300 100644
--- a/src/main/java/com/google/firebase/database/core/view/filter/RangedFilter.java
+++ b/src/main/java/com/google/firebase/database/core/view/filter/RangedFilter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/view/filter/package-info.java b/src/main/java/com/google/firebase/database/core/view/filter/package-info.java
index 405959f3e..44d2f0f3a 100644
--- a/src/main/java/com/google/firebase/database/core/view/filter/package-info.java
+++ b/src/main/java/com/google/firebase/database/core/view/filter/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/core/view/package-info.java b/src/main/java/com/google/firebase/database/core/view/package-info.java
index 455b97e2c..fcc5f5e30 100644
--- a/src/main/java/com/google/firebase/database/core/view/package-info.java
+++ b/src/main/java/com/google/firebase/database/core/view/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/snapshot/BooleanNode.java b/src/main/java/com/google/firebase/database/snapshot/BooleanNode.java
index 1f6505642..e824964e3 100644
--- a/src/main/java/com/google/firebase/database/snapshot/BooleanNode.java
+++ b/src/main/java/com/google/firebase/database/snapshot/BooleanNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/snapshot/ChildKey.java b/src/main/java/com/google/firebase/database/snapshot/ChildKey.java
index 9ac8e25c5..6f7a4670f 100644
--- a/src/main/java/com/google/firebase/database/snapshot/ChildKey.java
+++ b/src/main/java/com/google/firebase/database/snapshot/ChildKey.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/snapshot/ChildrenNode.java b/src/main/java/com/google/firebase/database/snapshot/ChildrenNode.java
index 1b5c8d694..163a31234 100644
--- a/src/main/java/com/google/firebase/database/snapshot/ChildrenNode.java
+++ b/src/main/java/com/google/firebase/database/snapshot/ChildrenNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/snapshot/CompoundHash.java b/src/main/java/com/google/firebase/database/snapshot/CompoundHash.java
index ff786a855..d1525e4ee 100644
--- a/src/main/java/com/google/firebase/database/snapshot/CompoundHash.java
+++ b/src/main/java/com/google/firebase/database/snapshot/CompoundHash.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/snapshot/DeferredValueNode.java b/src/main/java/com/google/firebase/database/snapshot/DeferredValueNode.java
index 4290eee00..7a8df1c16 100644
--- a/src/main/java/com/google/firebase/database/snapshot/DeferredValueNode.java
+++ b/src/main/java/com/google/firebase/database/snapshot/DeferredValueNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/snapshot/DoubleNode.java b/src/main/java/com/google/firebase/database/snapshot/DoubleNode.java
index c4c4df50d..36f5cf9c1 100644
--- a/src/main/java/com/google/firebase/database/snapshot/DoubleNode.java
+++ b/src/main/java/com/google/firebase/database/snapshot/DoubleNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/snapshot/EmptyNode.java b/src/main/java/com/google/firebase/database/snapshot/EmptyNode.java
index 5b76855fb..de755d7b3 100644
--- a/src/main/java/com/google/firebase/database/snapshot/EmptyNode.java
+++ b/src/main/java/com/google/firebase/database/snapshot/EmptyNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/snapshot/Index.java b/src/main/java/com/google/firebase/database/snapshot/Index.java
index ac8876ab5..e4bf10083 100644
--- a/src/main/java/com/google/firebase/database/snapshot/Index.java
+++ b/src/main/java/com/google/firebase/database/snapshot/Index.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/snapshot/IndexedNode.java b/src/main/java/com/google/firebase/database/snapshot/IndexedNode.java
index 5809bbaf3..db8f88077 100644
--- a/src/main/java/com/google/firebase/database/snapshot/IndexedNode.java
+++ b/src/main/java/com/google/firebase/database/snapshot/IndexedNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/snapshot/KeyIndex.java b/src/main/java/com/google/firebase/database/snapshot/KeyIndex.java
index 5c40a3c1d..0ee62f639 100644
--- a/src/main/java/com/google/firebase/database/snapshot/KeyIndex.java
+++ b/src/main/java/com/google/firebase/database/snapshot/KeyIndex.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/snapshot/LeafNode.java b/src/main/java/com/google/firebase/database/snapshot/LeafNode.java
index 27a101ff2..9f6e72a0e 100644
--- a/src/main/java/com/google/firebase/database/snapshot/LeafNode.java
+++ b/src/main/java/com/google/firebase/database/snapshot/LeafNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/snapshot/LongNode.java b/src/main/java/com/google/firebase/database/snapshot/LongNode.java
index 493be9e0b..43e1b31e8 100644
--- a/src/main/java/com/google/firebase/database/snapshot/LongNode.java
+++ b/src/main/java/com/google/firebase/database/snapshot/LongNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/snapshot/NamedNode.java b/src/main/java/com/google/firebase/database/snapshot/NamedNode.java
index f47884a43..202c108e0 100644
--- a/src/main/java/com/google/firebase/database/snapshot/NamedNode.java
+++ b/src/main/java/com/google/firebase/database/snapshot/NamedNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/snapshot/Node.java b/src/main/java/com/google/firebase/database/snapshot/Node.java
index 7108633eb..d1535c77a 100644
--- a/src/main/java/com/google/firebase/database/snapshot/Node.java
+++ b/src/main/java/com/google/firebase/database/snapshot/Node.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/snapshot/NodeUtilities.java b/src/main/java/com/google/firebase/database/snapshot/NodeUtilities.java
index 36e1e603c..b5c200191 100644
--- a/src/main/java/com/google/firebase/database/snapshot/NodeUtilities.java
+++ b/src/main/java/com/google/firebase/database/snapshot/NodeUtilities.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/snapshot/PathIndex.java b/src/main/java/com/google/firebase/database/snapshot/PathIndex.java
index 451f3e6b0..c6007fc6b 100644
--- a/src/main/java/com/google/firebase/database/snapshot/PathIndex.java
+++ b/src/main/java/com/google/firebase/database/snapshot/PathIndex.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/snapshot/PriorityIndex.java b/src/main/java/com/google/firebase/database/snapshot/PriorityIndex.java
index fa1836be0..9a014bcc8 100644
--- a/src/main/java/com/google/firebase/database/snapshot/PriorityIndex.java
+++ b/src/main/java/com/google/firebase/database/snapshot/PriorityIndex.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/snapshot/PriorityUtilities.java b/src/main/java/com/google/firebase/database/snapshot/PriorityUtilities.java
index 14c758f67..8f2e4a71f 100644
--- a/src/main/java/com/google/firebase/database/snapshot/PriorityUtilities.java
+++ b/src/main/java/com/google/firebase/database/snapshot/PriorityUtilities.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/snapshot/RangeMerge.java b/src/main/java/com/google/firebase/database/snapshot/RangeMerge.java
index ce846ea34..e6aa48e6a 100644
--- a/src/main/java/com/google/firebase/database/snapshot/RangeMerge.java
+++ b/src/main/java/com/google/firebase/database/snapshot/RangeMerge.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/snapshot/StringNode.java b/src/main/java/com/google/firebase/database/snapshot/StringNode.java
index e1af493b0..52f140c05 100644
--- a/src/main/java/com/google/firebase/database/snapshot/StringNode.java
+++ b/src/main/java/com/google/firebase/database/snapshot/StringNode.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/snapshot/ValueIndex.java b/src/main/java/com/google/firebase/database/snapshot/ValueIndex.java
index e915fe29e..26b6cf0a1 100644
--- a/src/main/java/com/google/firebase/database/snapshot/ValueIndex.java
+++ b/src/main/java/com/google/firebase/database/snapshot/ValueIndex.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/snapshot/package-info.java b/src/main/java/com/google/firebase/database/snapshot/package-info.java
index 722941ccd..ba871dbf5 100644
--- a/src/main/java/com/google/firebase/database/snapshot/package-info.java
+++ b/src/main/java/com/google/firebase/database/snapshot/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/util/EmulatorHelper.java b/src/main/java/com/google/firebase/database/util/EmulatorHelper.java
index 11c358fc6..c474261aa 100644
--- a/src/main/java/com/google/firebase/database/util/EmulatorHelper.java
+++ b/src/main/java/com/google/firebase/database/util/EmulatorHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2019 Google Inc.
+ * Copyright 2019 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/util/GAuthToken.java b/src/main/java/com/google/firebase/database/util/GAuthToken.java
index 976724081..dfb4c2d6d 100644
--- a/src/main/java/com/google/firebase/database/util/GAuthToken.java
+++ b/src/main/java/com/google/firebase/database/util/GAuthToken.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/util/JsonMapper.java b/src/main/java/com/google/firebase/database/util/JsonMapper.java
index 0321c8bb2..b71b2bdc2 100644
--- a/src/main/java/com/google/firebase/database/util/JsonMapper.java
+++ b/src/main/java/com/google/firebase/database/util/JsonMapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/util/package-info.java b/src/main/java/com/google/firebase/database/util/package-info.java
index 321042633..1db9cbbb4 100644
--- a/src/main/java/com/google/firebase/database/util/package-info.java
+++ b/src/main/java/com/google/firebase/database/util/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/utilities/Clock.java b/src/main/java/com/google/firebase/database/utilities/Clock.java
index f25fa6db7..5cd64c9f6 100644
--- a/src/main/java/com/google/firebase/database/utilities/Clock.java
+++ b/src/main/java/com/google/firebase/database/utilities/Clock.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/utilities/DefaultClock.java b/src/main/java/com/google/firebase/database/utilities/DefaultClock.java
index 731096be8..b38d71374 100644
--- a/src/main/java/com/google/firebase/database/utilities/DefaultClock.java
+++ b/src/main/java/com/google/firebase/database/utilities/DefaultClock.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/utilities/DefaultRunLoop.java b/src/main/java/com/google/firebase/database/utilities/DefaultRunLoop.java
index e84b7b561..a06c6f2fa 100644
--- a/src/main/java/com/google/firebase/database/utilities/DefaultRunLoop.java
+++ b/src/main/java/com/google/firebase/database/utilities/DefaultRunLoop.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/utilities/NodeSizeEstimator.java b/src/main/java/com/google/firebase/database/utilities/NodeSizeEstimator.java
index 1c91fc5d4..cb88a0901 100644
--- a/src/main/java/com/google/firebase/database/utilities/NodeSizeEstimator.java
+++ b/src/main/java/com/google/firebase/database/utilities/NodeSizeEstimator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/utilities/OffsetClock.java b/src/main/java/com/google/firebase/database/utilities/OffsetClock.java
index 8fb8ce4a1..0f5f5ce7b 100644
--- a/src/main/java/com/google/firebase/database/utilities/OffsetClock.java
+++ b/src/main/java/com/google/firebase/database/utilities/OffsetClock.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/utilities/Pair.java b/src/main/java/com/google/firebase/database/utilities/Pair.java
index 6372a5e29..0cf41af36 100644
--- a/src/main/java/com/google/firebase/database/utilities/Pair.java
+++ b/src/main/java/com/google/firebase/database/utilities/Pair.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/utilities/ParsedUrl.java b/src/main/java/com/google/firebase/database/utilities/ParsedUrl.java
index e43ee9514..b7a0e1b98 100644
--- a/src/main/java/com/google/firebase/database/utilities/ParsedUrl.java
+++ b/src/main/java/com/google/firebase/database/utilities/ParsedUrl.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/utilities/PushIdGenerator.java b/src/main/java/com/google/firebase/database/utilities/PushIdGenerator.java
index 53d8a25ce..2b2b44534 100644
--- a/src/main/java/com/google/firebase/database/utilities/PushIdGenerator.java
+++ b/src/main/java/com/google/firebase/database/utilities/PushIdGenerator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/google/firebase/database/utilities/Utilities.java b/src/main/java/com/google/firebase/database/utilities/Utilities.java
index 5a3c64822..54ba9e50f 100644
--- a/src/main/java/com/google/firebase/database/utilities/Utilities.java
+++ b/src/main/java/com/google/firebase/database/utilities/Utilities.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Google Inc.
+ * Copyright 2017 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
import com.google.api.core.ApiFuture;
import com.google.api.core.SettableApiFuture;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Charsets;
import com.google.common.base.Strings;
import com.google.common.io.BaseEncoding;
import com.google.common.net.UrlEscapers;
@@ -32,6 +31,7 @@
import java.net.URI;
import java.net.URLDecoder;
import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
@@ -108,8 +108,8 @@ static Map