[Fix] Minor improvements to new type definitions. (#2)

Author: ehsannas

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

@@ -26,7 +26,7 @@
 public class BsonBinaryData implements Serializable {
   private static final long serialVersionUID = 1830984831902814656L;
   private final int subtype;
-  private final ByteString data;
+  @Nonnull private final ByteString data;
 
   private BsonBinaryData(int subtype, @Nonnull ByteString data) {
     // By definition the subtype should be 1 byte and should therefore
@@ -108,7 +108,7 @@ public boolean equals(Object obj) {
       return false;
     }
     BsonBinaryData other = (BsonBinaryData) obj;
-    return Objects.equals(this.subtype, other.subtype) && Objects.equals(this.data, other.data);
+    return this.subtype == other.subtype && Objects.equals(this.data, other.data);
   }
 
   @Override
@@ -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/BsonObjectId.java

@@ -24,7 +24,7 @@
 /** Represents a BSON ObjectId type in Firestore documents. */
 public class BsonObjectId implements Serializable {
   private static final long serialVersionUID = 430753173775328933L;
-  public final String value;
+  @Nonnull public final String value;
 
   /**
    * Constructor that creates a new BSON ObjectId value with the given value.
@@ -65,6 +65,6 @@ public int hashCode() {
   @Nonnull
   @Override
   public String toString() {
-    return "BsonObjectId { value=" + this.value + " }";
+    return "BsonObjectId{value=" + this.value + "}";
   }
 }

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

@@ -65,8 +65,7 @@ public boolean equals(Object obj) {
       return false;
     }
     BsonTimestamp other = (BsonTimestamp) obj;
-    return Objects.equals(this.seconds, other.seconds)
-        && Objects.equals(this.increment, other.increment);
+    return this.seconds == other.seconds && this.increment == other.increment;
   }
 
   @Override
@@ -77,6 +76,6 @@ public int hashCode() {
   @Nonnull
   @Override
   public String toString() {
-    return "BsonTimestamp { seconds=" + this.seconds + ", increment=" + this.increment + " }";
+    return "BsonTimestamp{seconds=" + this.seconds + ", increment=" + this.increment + "}";
   }
 }

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

@@ -359,7 +359,7 @@ public static MaxKey maxKey() {
    * @return A new {@link RegexValue} constructed using the given pattern and options.
    */
   @Nonnull
-  public static RegexValue regex(String pattern, String options) {
+  public static RegexValue regex(@Nonnull String pattern, @Nonnull String options) {
     return new RegexValue(pattern, options);
   }
 
@@ -393,7 +393,7 @@ public static BsonTimestamp bsonTimestamp(long seconds, long increment) {
    * @return A new {@link BsonObjectId} constructed using the given value.
    */
   @Nonnull
-  public static BsonObjectId bsonObjectId(String oid) {
+  public static BsonObjectId bsonObjectId(@Nonnull String oid) {
     return new BsonObjectId(oid);
   }
 

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

@@ -56,6 +56,6 @@ public int hashCode() {
   @Nonnull
   @Override
   public String toString() {
-    return "Int32Value { value=" + this.value + " }";
+    return "Int32Value{value=" + this.value + "}";
   }
 }

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

@@ -28,6 +28,7 @@ public class MaxKey implements Serializable {
 
   private MaxKey() {}
 
+  @Nonnull
   public static MaxKey instance() {
     return INSTANCE;
   }
@@ -44,10 +45,7 @@ MapValue toProto() {
    */
   @Override
   public boolean equals(Object obj) {
-    if (this == obj) {
-      return true;
-    }
-    return obj != null && getClass() == obj.getClass();
+    return this == obj;
   }
 
   @Override

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

@@ -28,6 +28,7 @@ public class MinKey implements Serializable {
 
   private MinKey() {}
 
+  @Nonnull
   public static MinKey instance() {
     return INSTANCE;
   }
@@ -44,10 +45,7 @@ MapValue toProto() {
    */
   @Override
   public boolean equals(Object obj) {
-    if (this == obj) {
-      return true;
-    }
-    return obj != null && getClass() == obj.getClass();
+    return this == obj;
   }
 
   @Override

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

@@ -28,7 +28,7 @@ public class RegexValue implements Serializable {
   public final String pattern;
   public final String options;
 
-  public RegexValue(String pattern, String options) {
+  public RegexValue(@Nonnull String pattern, @Nonnull String options) {
     this.pattern = pattern;
     this.options = options;
   }
@@ -63,6 +63,6 @@ public int hashCode() {
   @Nonnull
   @Override
   public String toString() {
-    return "RegexValue { pattern=" + this.pattern + ", options=" + this.options + " }";
+    return "RegexValue{pattern=" + this.pattern + ", options=" + this.options + "}";
   }
 }