---

schmidt-sebastian · schmidt-sebastian · commit a821e2f63b9b · 2018-06-07T14:21:07.000-07:00
yaml --- r: 9891 b: refs/heads/mrschmidt-options c: e96c50a h: refs/heads/master i: 9889: 5e24aae 9887: b96a825
diff --git a/[refs] b/[refs]
@@ -95,7 +95,7 @@ refs/tags/v0.45.0: 4b4eb52d0823f5335cb8acf54a88bae199e013ae
 refs/tags/v0.46.0: 40dfc83a11b2cf2c21bf0f5a7b1e47087cbf0259
 refs/tags/0.47.0: 2e8688416bcae6150c0fa59936103554dbbe3821
 refs/heads/mrschmidt-core-timestamps: 19c1eca95467e588c21378cae2b136d14973d532
-refs/heads/mrschmidt-options: 19f5e67695f02f7941410ec78947a673c0c235f9
+refs/heads/mrschmidt-options: e96c50a91e308b4f2b86301f032de22e06b0edb0
 refs/heads/mrschmidt-timestamps: d50ea25fe0537a4e4bf161e0e27ab978a361ed47
 refs/tags/v0.48.0: 94a4b5648607953030555908d301c57e79c5afca
 refs/tags/v0.49.0: 6f75996bb3386bd4dac3d796497b10d24507ccd3
diff --git a/branches/mrschmidt-options/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreOptions.java b/branches/mrschmidt-options/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreOptions.java
@@ -169,16 +169,6 @@ public Builder setCredentialsProvider(@Nonnull CredentialsProvider credentialsPr
       return this;
     }
 
-    /**
-     * Sets the database ID to use with this Firestore client.
-     *
-     * @param databaseId The Firestore database ID to use with this client.
-     */
-    public Builder setDatabaseId(@Nonnull String databaseId) {
-      this.databaseId = databaseId;
-      return this;
-    }
-
     /**
      * Enables the use of {@link com.google.cloud.Timestamp Timestamps} for timestamp fields in
      * {@link DocumentSnapshot DocumentSnapshots}.
@@ -206,6 +196,17 @@ public Builder setTimestampsInSnapshotsEnabled(boolean value) {
       return this;
     }
 
+    /**
+     * Sets the database ID to use with this Firestore client.
+     *
+     * @param databaseId The Firestore database ID to use with this client.
+     */
+    @Nonnull
+    public Builder setDatabaseId(@Nonnull String databaseId) {
+      this.databaseId = databaseId;
+      return this;
+    }
+
     @Override
     @Nonnull
     public FirestoreOptions build() {
@@ -218,9 +219,9 @@ protected FirestoreOptions(Builder builder) {
     super(FirestoreFactory.class, FirestoreRpcFactory.class, builder, new FirestoreDefaults());
 
     this.databaseId = builder.databaseId;
+    this.timestampsInSnapshotsEnabled = builder.timestampsInSnapshotsEnabled;
     this.channelProvider = builder.channelProvider;
     this.credentialsProvider = builder.credentialsProvider;
-    this.timestampsInSnapshotsEnabled = builder.timestampsInSnapshotsEnabled;
   }
 
   private static class FirestoreDefaults implements ServiceDefaults<Firestore, FirestoreOptions> {
@@ -317,12 +318,19 @@ public boolean equals(Object o) {
     FirestoreOptions that = (FirestoreOptions) o;
     return Objects.equals(databaseId, that.databaseId)
         && Objects.equals(channelProvider, that.channelProvider)
+        && Objects.equals(credentialsProvider, that.credentialsProvider)
+        && Objects.equals(timestampsInSnapshotsEnabled, that.timestampsInSnapshotsEnabled)
         && baseEquals(that);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(databaseId, channelProvider, baseHashCode());
+    return Objects.hash(
+        databaseId,
+        channelProvider,
+        credentialsProvider,
+        timestampsInSnapshotsEnabled,
+        baseHashCode());
   }
 
   @Nonnull
