fix: Remove some remaining BsonTimestampValue mentions. (#3)

Author: ehsannas

google-cloud-firestore/src/main/java/com/google/cloud/firestore/BsonBinaryData.java

@@ -119,7 +119,7 @@ public int hashCode() {
   @Nonnull
   @Override
   public String toString() {
-    return "BsonBinaryData{subtype=" + this.subtype + ", data=" + this.data.toString() + " }";
+    return "BsonBinaryData{subtype=" + this.subtype + ", data=" + this.data.toString() + "}";
   }
 
   MapValue toProto() {

google-cloud-firestore/src/main/java/com/google/cloud/firestore/BsonTimestamp.java

@@ -47,14 +47,14 @@ public BsonTimestamp(long seconds, long increment) {
   }
 
   MapValue toProto() {
-    return UserDataConverter.encodeBsonTimestampValue(seconds, increment);
+    return UserDataConverter.encodeBsonTimestamp(seconds, increment);
   }
 
   /**
-   * Returns true if this BsonTimestampValue is equal to the provided object.
+   * Returns true if this BsonTimestamp is equal to the provided object.
    *
    * @param obj The object to compare against.
-   * @return Whether this BsonTimestampValue is equal to the provided object.
+   * @return Whether this BsonTimestamp is equal to the provided object.
    */
   @Override
   public boolean equals(Object obj) {

google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentSnapshot.java

@@ -459,14 +459,14 @@ public BsonObjectId getBsonObjectId(@Nonnull String field) {
   }
 
   /**
-   * Returns the value of the field as a BsonTimestampValue.
+   * Returns the value of the field as a BsonTimestamp.
    *
    * @param field The path to the field.
-   * @throws RuntimeException if the value is not a BsonTimestampValue.
+   * @throws RuntimeException if the value is not a BsonTimestamp.
    * @return The value of the field.
    */
   @Nullable
-  public BsonTimestamp getBsonTimestampValue(@Nonnull String field) {
+  public BsonTimestamp getBsonTimestamp(@Nonnull String field) {
     return (BsonTimestamp) get(field);
   }
 

google-cloud-firestore/src/main/java/com/google/cloud/firestore/UserDataConverter.java

@@ -290,7 +290,7 @@ static MapValue encodeBsonObjectId(String oid) {
         .build();
   }
 
-  static MapValue encodeBsonTimestampValue(long seconds, long increment) {
+  static MapValue encodeBsonTimestamp(long seconds, long increment) {
     return MapValue.newBuilder()
         .putFields(
             MapType.RESERVED_BSON_TIMESTAMP_KEY,

google-cloud-firestore/src/main/java/com/google/cloud/firestore/encoding/CustomClassMapper.java

@@ -340,7 +340,7 @@ private static <T> T deserializeToClass(Object o, Class<T> clazz, DeserializeCon
     } else if (BsonObjectId.class.isAssignableFrom(clazz)) {
       return (T) convertBsonObjectId(o, context.errorPath);
     } else if (BsonTimestamp.class.isAssignableFrom(clazz)) {
-      return (T) convertBsonTimestampValue(o, context.errorPath);
+      return (T) convertBsonTimestamp(o, context.errorPath);
     } else if (BsonBinaryData.class.isAssignableFrom(clazz)) {
       return (T) convertBsonBinaryData(o, context.errorPath);
     } else if (DocumentReference.class.isAssignableFrom(clazz)) {
@@ -661,13 +661,13 @@ private static BsonObjectId convertBsonObjectId(
     }
   }
 
-  private static BsonTimestamp convertBsonTimestampValue(
+  private static BsonTimestamp convertBsonTimestamp(
       Object o, DeserializeContext.ErrorPath errorPath) {
     if (o instanceof BsonTimestamp) {
       return (BsonTimestamp) o;
     } else {
       throw errorPath.deserializeError(
-          "Failed to convert value of type " + o.getClass().getName() + " to BsonTimestampValue");
+          "Failed to convert value of type " + o.getClass().getName() + " to BsonTimestamp");
     }
   }
 

google-cloud-firestore/src/test/java/com/google/cloud/firestore/OrderTest.java

@@ -157,6 +157,8 @@ public void verifyOrder() {
     groups.add(new Value[] {objectValue("bar", intValue(2))});
     groups.add(new Value[] {objectValue("bar", stringValue("0"))});
 
+    groups.add(new Value[] {maxKeyValue(), maxKeyValue()});
+
     for (int left = 0; left < groups.size(); left++) {
       for (int right = 0; right < groups.size(); right++) {
         for (int i = 0; i < groups.get(left).length; i++) {

google-cloud-firestore/src/test/java/com/google/cloud/firestore/it/ITSystemTest.java

@@ -2353,7 +2353,7 @@ public void canWriteAndReadBackBsonObjectId() throws Exception {
   }
 
   @Test
-  public void canWriteAndReadBackBsonTimestampValue() throws Exception {
+  public void canWriteAndReadBackBsonTimestamp() throws Exception {
     checkRoundTrip(FieldValue.bsonTimestamp(123, 45));
   }