From 2c32c770d5fab6764c9d83c323fbaac471d94c2f Mon Sep 17 00:00:00 2001
From: rstoyanchev <rossen.stoyanchev@broadcom.com>
Date: Mon, 28 Jul 2025 09:06:19 +0100
Subject: [PATCH] Polishing in VersionRequestCondition

See gh-35237
---
 .../reactive/result/condition/VersionRequestCondition.java   | 5 +++--
 .../web/servlet/mvc/condition/VersionRequestCondition.java   | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/VersionRequestCondition.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/VersionRequestCondition.java
index b762aec91d2..1d0843f289a 100644
--- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/VersionRequestCondition.java
+++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/VersionRequestCondition.java
@@ -128,9 +128,10 @@ public final class VersionRequestCondition extends AbstractRequestCondition<Vers
 			return (-1 * compareVersions(this.version, otherVersion));
 		}
 		else {
-			// Prefer mapping without version for unversioned request
+			// Prefer mappings with a version unless the request is without a version
+			int result = this.version != null ? -1 : 1;
 			Comparable<?> version = exchange.getAttribute(HandlerMapping.API_VERSION_ATTRIBUTE);
-			return (version != null ? (this.version != null ? -1 : 1) : (this.version != null ? 1 : -1));
+			return (version == null ? -1 * result : result);
 		}
 	}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/VersionRequestCondition.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/VersionRequestCondition.java
index 2bc8f0a33e8..cc71d473bf7 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/VersionRequestCondition.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/VersionRequestCondition.java
@@ -127,9 +127,10 @@ public final class VersionRequestCondition extends AbstractRequestCondition<Vers
 			return (-1 * compareVersions(this.version, otherVersion));
 		}
 		else {
-			// Prefer mapping without version for unversioned request
+			// Prefer mappings with a version unless the request is without a version
+			int result = this.version != null ? -1 : 1;
 			Comparable<?> version = (Comparable<?>) request.getAttribute(HandlerMapping.API_VERSION_ATTRIBUTE);
-			return (version != null ? (this.version != null ? -1 : 1) : (this.version != null ? 1 : -1));
+			return (version == null ? -1 * result : result);
 		}
 	}