From aa236ec38d39f434c1641aeaef9241aec18affde Mon Sep 17 00:00:00 2001
From: William Collishaw <williamcollishaw@hotmail.co.uk>
Date: Tue, 4 Jun 2019 12:03:45 -0600
Subject: [PATCH] Simplify BagOfPrimitives if statement (#1539)

* Simplify BagOfPrimitives if statement

* formatting
---
 .../google/gson/metrics/BagOfPrimitives.java  | 27 +++++++------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/metrics/src/main/java/com/google/gson/metrics/BagOfPrimitives.java b/metrics/src/main/java/com/google/gson/metrics/BagOfPrimitives.java
index 72cd6b6d..008e31f3 100644
--- a/metrics/src/main/java/com/google/gson/metrics/BagOfPrimitives.java
+++ b/metrics/src/main/java/com/google/gson/metrics/BagOfPrimitives.java
@@ -66,25 +66,18 @@ public class BagOfPrimitives {
 
   @Override
   public boolean equals(Object obj) {
-    if (this == obj)
-      return true;
-    if (obj == null)
-      return false;
-    if (getClass() != obj.getClass())
-      return false;
+    if (this == obj) return true;
+    if (obj == null) return false;
+    if (getClass() != obj.getClass()) return false;
     BagOfPrimitives other = (BagOfPrimitives) obj;
-    if (booleanValue != other.booleanValue)
-      return false;
-    if (intValue != other.intValue)
-      return false;
-    if (longValue != other.longValue)
-      return false;
+    if (booleanValue != other.booleanValue) return false;
+    if (intValue != other.intValue) return false;
+    if (longValue != other.longValue) return false;
     if (stringValue == null) {
-      if (other.stringValue != null)
-        return false;
-    } else if (!stringValue.equals(other.stringValue))
-      return false;
-    return true;
+      return other.stringValue == null;
+    } else {
+      return stringValue.equals(other.stringValue);
+    }
   }
 
   @Override