Extract some logic to methods in DefaultComparator to improve readability

Tamas Balog · Tamas Balog · commit 9a62815cc643 · 2017-02-17T20:16:09.000+01:00
diff --git a/src/main/java/org/skyscreamer/jsonassert/comparator/DefaultComparator.java b/src/main/java/org/skyscreamer/jsonassert/comparator/DefaultComparator.java
@@ -1,17 +1,17 @@
 package org.skyscreamer.jsonassert.comparator;
 
+import static org.skyscreamer.jsonassert.comparator.JSONCompareUtil.allJSONObjects;
+import static org.skyscreamer.jsonassert.comparator.JSONCompareUtil.allSimpleValues;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.skyscreamer.jsonassert.JSONCompareMode;
 import org.skyscreamer.jsonassert.JSONCompareResult;
 
-import static org.skyscreamer.jsonassert.comparator.JSONCompareUtil.allJSONObjects;
-import static org.skyscreamer.jsonassert.comparator.JSONCompareUtil.allSimpleValues;
-
 /**
  * This class is the default json comparator implementation. <p/>
- * Comparison is performed according to  {@link JSONCompareMode} that is passed as constructor's argument.
+ * Comparison is performed according to {@link JSONCompareMode} that is passed as constructor's argument.
  */
 public class DefaultComparator extends AbstractComparator {
 
@@ -36,8 +36,8 @@ public void compareJSON(String prefix, JSONObject expected, JSONObject actual, J
     @Override
     public void compareValues(String prefix, Object expectedValue, Object actualValue, JSONCompareResult result)
             throws JSONException {
-        if (expectedValue instanceof Number && actualValue instanceof Number) {
-            if (((Number)expectedValue).doubleValue() != ((Number)actualValue).doubleValue()) {
+        if (areNumbers(expectedValue, actualValue)) {
+            if (areSameDoubles(expectedValue, actualValue)) {
                 result.fail(prefix, expectedValue, actualValue);
             }
         } else if (expectedValue.getClass().isAssignableFrom(actualValue.getClass())) {
@@ -74,4 +74,12 @@ public void compareJSONArray(String prefix, JSONArray expected, JSONArray actual
             recursivelyCompareJSONArray(prefix, expected, actual, result);
         }
     }
+
+    private boolean areNumbers(Object expectedValue, Object actualValue) {
+        return expectedValue instanceof Number && actualValue instanceof Number;
+    }
+
+    private boolean areSameDoubles(Object expectedValue, Object actualValue) {
+        return ((Number) expectedValue).doubleValue() != ((Number) actualValue).doubleValue();
+    }
 }
