Fix Checkstyle

Author: tom-andersen

Diff for: src/main/java/com/google/firebase/cloud/FirestoreClient.java

@@ -11,12 +11,11 @@
 import com.google.firebase.ImplFirebaseTrampolines;
 import com.google.firebase.internal.FirebaseService;
 import com.google.firebase.internal.NonNull;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * {@code FirestoreClient} provides access to Google Cloud Firestore. Use this API to obtain a
@@ -57,8 +56,8 @@ private FirestoreClient(FirebaseApp app, String databaseId) {
   }
 
   /**
-   * Returns the default Firestore instance associated with the default Firebase app. Returns the same
-   * instance for all invocations. The Firestore instance and all references obtained from it
+   * Returns the default Firestore instance associated with the default Firebase app. Returns the
+   * same instance for all invocations. The Firestore instance and all references obtained from it
    * becomes unusable, once the default app is deleted.
    *
    * @return A non-null <a href="https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/com/google/cloud/firestore/Firestore.html">{@code Firestore}</a>
@@ -70,9 +69,9 @@ public static Firestore getFirestore() {
   }
 
   /**
-   * Returns the default Firestore instance associated with the specified Firebase app. For a given app,
-   * always returns the same instance. The Firestore instance and all references obtained from it
-   * becomes unusable, once the specified app is deleted.
+   * Returns the default Firestore instance associated with the specified Firebase app. For a given
+   * app, always returns the same instance. The Firestore instance and all references obtained from
+   * it becomes unusable, once the specified app is deleted.
    *
    * @param app A non-null {@link FirebaseApp}.
    * @return A non-null <a href="https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/com/google/cloud/firestore/Firestore.html">{@code Firestore}</a>
@@ -88,7 +87,7 @@ public static Firestore getFirestore(FirebaseApp app) {
    * always returns the same instance. The Firestore instance and all references obtained from it
    * becomes unusable, once the specified app is deleted.
    *
-   * @param app A non-null {@link FirebaseApp}.
+   * @param app      A non-null {@link FirebaseApp}.
    * @param database - The name of database.
    * @return A non-null <a href="https://googlecloudplatform.github.io/google-cloud-java/google-cloud-clients/apidocs/com/google/cloud/firestore/Firestore.html">{@code Firestore}</a>
    *     instance.
@@ -140,7 +139,7 @@ private static class FirestoreInstances {
     private final FirebaseApp app;
 
     private final Map<String, FirestoreClient> clients =
-      Collections.synchronizedMap(new HashMap<>());
+        Collections.synchronizedMap(new HashMap<>());
 
     private FirestoreInstances(FirebaseApp app) {
       this.app = app;

Diff for: src/test/java/com/google/firebase/cloud/FirestoreClientTest.java

@@ -1,5 +1,11 @@
 package com.google.firebase.cloud;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThrows;
+
 import com.google.auth.oauth2.GoogleCredentials;
 import com.google.cloud.firestore.DocumentReference;
 import com.google.cloud.firestore.Firestore;
@@ -14,8 +20,6 @@
 import org.junit.After;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
-
 public class FirestoreClientTest {
 
   private static final FirestoreOptions FIRESTORE_OPTIONS = FirestoreOptions.newBuilder()
@@ -32,7 +36,7 @@ public void tearDown() {
 
   @Test
   public void testExplicitProjectId() throws IOException {
-    String databaseId = "databaseIdInTestExplicitProjectId";
+    final String databaseId = "databaseIdInTestExplicitProjectId";
     FirebaseApp app = FirebaseApp.initializeApp(FirebaseOptions.builder()
         .setCredentials(GoogleCredentials.fromStream(ServiceAccount.EDITOR.asStream()))
         .setProjectId("explicit-project-id")
@@ -55,7 +59,7 @@ public void testExplicitProjectId() throws IOException {
 
   @Test
   public void testServiceAccountProjectId() throws IOException {
-    String databaseId = "databaseIdInTestServiceAccountProjectId";
+    final String databaseId = "databaseIdInTestServiceAccountProjectId";
     FirebaseApp app = FirebaseApp.initializeApp(FirebaseOptions.builder()
         .setCredentials(GoogleCredentials.fromStream(ServiceAccount.EDITOR.asStream()))
         .setFirestoreOptions(FIRESTORE_OPTIONS)
@@ -77,7 +81,7 @@ public void testServiceAccountProjectId() throws IOException {
 
   @Test
   public void testFirestoreOptions() throws IOException {
-    String databaseId = "databaseIdInTestFirestoreOptions";
+    final String databaseId = "databaseIdInTestFirestoreOptions";
     FirebaseApp app = FirebaseApp.initializeApp(FirebaseOptions.builder()
         .setCredentials(GoogleCredentials.fromStream(ServiceAccount.EDITOR.asStream()))
         .setProjectId("explicit-project-id")
@@ -100,7 +104,7 @@ public void testFirestoreOptions() throws IOException {
 
   @Test
   public void testFirestoreOptionsOverride() throws IOException {
-    String databaseId = "databaseIdInTestFirestoreOptions";
+    final String databaseId = "databaseIdInTestFirestoreOptions";
     FirebaseApp app = FirebaseApp.initializeApp(FirebaseOptions.builder()
         .setCredentials(GoogleCredentials.fromStream(ServiceAccount.EDITOR.asStream()))
         .setProjectId("explicit-project-id")
@@ -120,7 +124,7 @@ public void testFirestoreOptionsOverride() throws IOException {
     Firestore firestore2 = FirestoreClient.getFirestore(app, databaseId);
     assertEquals("explicit-project-id", firestore2.getOptions().getProjectId());
     assertSame(ImplFirebaseTrampolines.getCredentials(app),
-            firestore2.getOptions().getCredentialsProvider().getCredentials());
+        firestore2.getOptions().getCredentialsProvider().getCredentials());
     assertEquals(databaseId, firestore2.getOptions().getDatabaseId());
 
     assertSame(firestore2, FirestoreClient.getFirestore(databaseId));
@@ -130,7 +134,7 @@ public void testFirestoreOptionsOverride() throws IOException {
 
   @Test
   public void testAppDelete() throws IOException {
-    String databaseId = "databaseIdInTestAppDelete";
+    final String databaseId = "databaseIdInTestAppDelete";
     FirebaseApp app = FirebaseApp.initializeApp(FirebaseOptions.builder()
         .setCredentials(GoogleCredentials.fromStream(ServiceAccount.EDITOR.asStream()))
         .setProjectId("mock-project-id")