Refactor if statement for improved readability

Author: smartandhandsome

spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java

@@ -202,7 +202,7 @@ public boolean checkNotModified(String etag) {
 
 	@Override
 	public boolean checkNotModified(@Nullable String etag, long lastModifiedTimestamp) {
-		if (this.notModified) {
+		if (isNotModified()) {
 			return true;
 		}
 
@@ -213,6 +213,8 @@ public boolean checkNotModified(@Nullable String etag, long lastModifiedTimestam
 
 		// Evaluate conditions in order of precedence.
 		// See https://datatracker.ietf.org/doc/html/rfc9110#section-13.2.2
+
+		// 1) If-Match
 		if (validateIfMatch(etag)) {
 			updateResponseStateChanging(etag, lastModifiedTimestamp);
 			return this.notModified;

spring-web/src/main/java/org/springframework/web/server/adapter/DefaultServerWebExchange.java

@@ -300,19 +300,25 @@ public boolean checkNotModified(String etag) {
 
 	@Override
 	public boolean checkNotModified(@Nullable String eTag, Instant lastModified) {
+		if (isNotModified()) {
+			return true;
+		}
+
 		HttpStatusCode status = getResponse().getStatusCode();
-		if (this.notModified || (status != null && !HttpStatus.OK.equals(status))) {
-			return this.notModified;
+		if (status != null && !HttpStatus.OK.equals(status)) {
+			return false;
 		}
+
 		// Evaluate conditions in order of precedence.
 		// See https://datatracker.ietf.org/doc/html/rfc9110#section-13.2.2
+
 		// 1) If-Match
 		if (validateIfMatch(eTag)) {
 			updateResponseStateChanging(eTag, lastModified);
 			return this.notModified;
 		}
 		// 2) If-Unmodified-Since
-		else if (validateIfUnmodifiedSince(lastModified)) {
+		if (validateIfUnmodifiedSince(lastModified)) {
 			updateResponseStateChanging(eTag, lastModified);
 			return this.notModified;
 		}