Addressing PR comment about missed use of internal getter.

eBay · Aug 17, 2023 · f0bba68 · f0bba68
1 parent 2344293
commit f0bba68
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 14 deletions.
diff --git a/NST/src/main/java/com/ebay/jsonpath/JPBooleanCheck.java b/NST/src/main/java/com/ebay/jsonpath/JPBooleanCheck.java
@@ -71,7 +71,7 @@ public void processJsonPath(String jsonPath, SoftAssert softAssert, DocumentCont
       return;
     }
 
-    if (isNull) {
+    if (isNullExpected()) {
       softAssert.assertNull(value, AssertMessageBuilder.build(jsonPath, "with non-null boolean"));
     } else {
       softAssert.assertNotNull(value, AssertMessageBuilder.build(jsonPath, "with null boolean"));

diff --git a/NST/src/main/java/com/ebay/jsonpath/JPDoubleCheck.java b/NST/src/main/java/com/ebay/jsonpath/JPDoubleCheck.java
@@ -81,7 +81,7 @@ public void processJsonPath(String jsonPath, SoftAssert softAssert, DocumentCont
       return;
     }
 
-    if (isNull) {
+    if (isNullExpected()) {
       softAssert.assertNull(value, AssertMessageBuilder.build(jsonPath, "with non-null double"));
     } else {
       softAssert.assertNotNull(value, AssertMessageBuilder.build(jsonPath, "with null double"));

diff --git a/NST/src/main/java/com/ebay/jsonpath/JPIntegerCheck.java b/NST/src/main/java/com/ebay/jsonpath/JPIntegerCheck.java
@@ -71,7 +71,7 @@ public void processJsonPath(String jsonPath, SoftAssert softAssert, DocumentCont
       return;
     }
 
-    if (isNull) {
+    if (isNullExpected()) {
       softAssert.assertNull(value, AssertMessageBuilder.build(jsonPath, "with non-null integer"));
     } else {
       softAssert.assertNotNull(value, AssertMessageBuilder.build(jsonPath, "with null integer"));

diff --git a/NST/src/main/java/com/ebay/jsonpath/JPJsonArrayCheck.java b/NST/src/main/java/com/ebay/jsonpath/JPJsonArrayCheck.java
@@ -112,7 +112,7 @@ public void processJsonPath(String jsonPath, SoftAssert softAssert, DocumentCont
       return;
     }
 
-    if (isNull) {
+    if (isNullExpected()) {
       softAssert.assertNull(values, AssertMessageBuilder.build(jsonPath, "because the path does exist"));
     } else {
       softAssert.assertNotNull(values, AssertMessageBuilder.build(jsonPath, "because the path does not exist"));

diff --git a/NST/src/main/java/com/ebay/jsonpath/JPJsonObjectCheck.java b/NST/src/main/java/com/ebay/jsonpath/JPJsonObjectCheck.java
@@ -180,7 +180,7 @@ public void processJsonPath(String jsonPath, SoftAssert softAssert, DocumentCont
       return;
     }
 
-    if (isNull) {
+    if (isNullExpected()) {
       softAssert.assertNull(value, AssertMessageBuilder.build(jsonPath, "because the path does exist"));
     } else {
       softAssert.assertNotNull(value, AssertMessageBuilder.build(jsonPath, "because the path does not exist"));

diff --git a/NST/src/main/java/com/ebay/jsonpath/JPListOfBooleanCheck.java b/NST/src/main/java/com/ebay/jsonpath/JPListOfBooleanCheck.java
@@ -201,7 +201,7 @@ public void processJsonPath(String jsonPath, SoftAssert softAssert, DocumentCont
       return;
     }
 
-    if (!isNull) {
+    if (!isNullExpected()) {
       softAssert.assertNotNull(values, AssertMessageBuilder.build(jsonPath, "because the path does not exist"));
     }
 
@@ -219,7 +219,7 @@ public void processJsonPath(String jsonPath, SoftAssert softAssert, DocumentCont
         continue;
       }
 
-      if (isNull) {
+      if (isNullExpected()) {
         softAssert.assertNull(value, AssertMessageBuilder.build(jsonPath, String.format("with NON null value on index %d of the list of Booleans", i)));
       } else {
         softAssert.assertNotNull(value, AssertMessageBuilder.build(jsonPath, String.format("with null value on index %d of the list of Booleans", i)));

diff --git a/NST/src/main/java/com/ebay/jsonpath/JPListOfDoubleCheck.java b/NST/src/main/java/com/ebay/jsonpath/JPListOfDoubleCheck.java
@@ -233,7 +233,7 @@ public void processJsonPath(String jsonPath, SoftAssert softAssert, DocumentCont
       return;
     }
 
-    if (!isNull) {
+    if (!isNullExpected()) {
       softAssert.assertNotNull(values, AssertMessageBuilder.build(jsonPath, "because the path does not exist."));
     }
 
@@ -251,7 +251,7 @@ public void processJsonPath(String jsonPath, SoftAssert softAssert, DocumentCont
         continue;
       }
 
-      if (isNull) {
+      if (isNullExpected()) {
         softAssert.assertNull(value, AssertMessageBuilder.build(jsonPath, String.format("with NON null value on index %d of the list of Doubles", i)));
       } else {
         softAssert.assertNotNull(value, AssertMessageBuilder.build(jsonPath, String.format("with null value on index %d of the list of Doubles", i)));

diff --git a/NST/src/main/java/com/ebay/jsonpath/JPListOfIntegerCheck.java b/NST/src/main/java/com/ebay/jsonpath/JPListOfIntegerCheck.java
@@ -203,7 +203,7 @@ public void processJsonPath(String jsonPath, SoftAssert softAssert, DocumentCont
       return;
     }
 
-    if (!isNull) {
+    if (!isNullExpected()) {
       softAssert.assertNotNull(values, AssertMessageBuilder.build(jsonPath, "because the path does not exist"));
     }
 
@@ -221,7 +221,7 @@ public void processJsonPath(String jsonPath, SoftAssert softAssert, DocumentCont
         continue;
       }
 
-      if (isNull) {
+      if (isNullExpected()) {
         softAssert.assertNull(value, AssertMessageBuilder.build(jsonPath, String.format("with NON null value on index %d of the list of Integers", i)));
       } else {
         softAssert.assertNotNull(value, AssertMessageBuilder.build(jsonPath, String.format("with null value on index %d of the list of Integers", i)));

diff --git a/NST/src/main/java/com/ebay/jsonpath/JPListOfStringCheck.java b/NST/src/main/java/com/ebay/jsonpath/JPListOfStringCheck.java
@@ -231,7 +231,7 @@ public void processJsonPath(String jsonPath, SoftAssert softAssert, DocumentCont
       return;
     }
 
-    if (!isNull) {
+    if (!isNullExpected()) {
       softAssert.assertNotNull(values, AssertMessageBuilder.build(jsonPath, "because the path does not exist"));
     }
 
@@ -249,7 +249,7 @@ public void processJsonPath(String jsonPath, SoftAssert softAssert, DocumentCont
         continue;
       }
 
-      if (isNull) {
+      if (isNullExpected()) {
         softAssert.assertNull(value, AssertMessageBuilder.build(jsonPath, String.format("because the path does exist on index %d of the list of strings", i)));
       } else {
         softAssert.assertNotNull(value, AssertMessageBuilder.build(jsonPath, String.format("with null value on index %d of the list of strings", i)));

diff --git a/NST/src/main/java/com/ebay/jsonpath/JPStringCheck.java b/NST/src/main/java/com/ebay/jsonpath/JPStringCheck.java
@@ -206,7 +206,7 @@ public void processJsonPath(String jsonPath, SoftAssert softAssert, DocumentCont
       return;
     }
 
-    if (isNull) {
+    if (isNullExpected()) {
       softAssert.assertNull(value, AssertMessageBuilder.build(jsonPath, "with non-null string"));
     } else {
       softAssert.assertNotNull(value, AssertMessageBuilder.build(jsonPath, "with null string."));