From 2c9ec55c2bcc1e15427cd18d2d671e224d8819ed Mon Sep 17 00:00:00 2001
From: arimu1 <19286898+arimu1@users.noreply.github.com>
Date: Sun, 13 Sep 2026 07:13:12 +0700
Subject: [PATCH] Remove MatchableHandlerMapping from DelegatingHandlerMapping

Spring Framework 7.1 removed HandlerMappingIntrospector and
MatchableHandlerMapping; drop the interface, match() delegation, and the
unit test that covered pattern matching via the selected delegate.

Closes #2582

Signed-off-by: arimu1 <19286898+arimu1@users.noreply.github.com>
---
 .../config/DelegatingHandlerMapping.java      | 44 +++++--------------
 .../DelegatingHandlerMappingUnitTests.java    | 22 ----------
 2 files changed, 10 insertions(+), 56 deletions(-)

diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/DelegatingHandlerMapping.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/DelegatingHandlerMapping.java
index 6d9a0e489..6c113e4d8 100644
--- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/DelegatingHandlerMapping.java
+++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/DelegatingHandlerMapping.java
@@ -31,8 +31,6 @@
 import org.springframework.web.bind.UnsatisfiedServletRequestParameterException;
 import org.springframework.web.servlet.HandlerExecutionChain;
 import org.springframework.web.servlet.HandlerMapping;
-import org.springframework.web.servlet.handler.MatchableHandlerMapping;
-import org.springframework.web.servlet.handler.RequestMatchResult;
 import org.springframework.web.util.pattern.PathPatternParser;
 
 /**
@@ -42,7 +40,7 @@
  * @author Oliver Gierke
  * @soundtrack Benny Greb - Stabila (Moving Parts)
  */
-class DelegatingHandlerMapping implements MatchableHandlerMapping, Iterable<HandlerMapping>, Ordered {
+class DelegatingHandlerMapping implements HandlerMapping, Iterable<HandlerMapping>, Ordered {
 
 	private final List<HandlerMapping> delegates;
 	private final @Nullable PathPatternParser parser;
@@ -66,7 +64,6 @@ public boolean usesPathPatterns() {
 	}
 
 	@Nullable
-	@Override
 	public PathPatternParser getPatternParser() {
 		return parser;
 	}
@@ -91,20 +88,9 @@ public int getOrder() {
 		return HandlerSelectionResult.from(request, delegates).resultOrException();
 	}
 
-	@Override
-	public @Nullable RequestMatchResult match(HttpServletRequest request, String pattern) {
-
-		try {
-			return HandlerSelectionResult.from(request, delegates).match(pattern);
-		} catch (Exception o_O) {
-			return null;
-		}
-	}
-
 	private static class HandlerSelectionResult {
 
 		private final HttpServletRequest request;
-		private final @Nullable HandlerMapping mapping;
 		private final @Nullable HandlerExecutionChain result;
 		private final @Nullable Exception ignoredException;
 
@@ -120,7 +106,7 @@ public static HandlerSelectionResult from(HttpServletRequest request, Iterable<H
 					HandlerExecutionChain result = delegate.getHandler(request);
 
 					if (result != null) {
-						return HandlerSelectionResult.forResult(request, delegate, result);
+						return HandlerSelectionResult.forResult(request, result);
 					}
 
 				} catch (HttpMediaTypeNotSupportedException o_O) {
@@ -137,13 +123,12 @@ public static HandlerSelectionResult from(HttpServletRequest request, Iterable<H
 			return HandlerSelectionResult.withoutResult(request, ignoredException);
 		}
 
-		private static HandlerSelectionResult forResult(HttpServletRequest request, HandlerMapping delegate,
-				HandlerExecutionChain result) {
-			return new HandlerSelectionResult(request, delegate, result, null);
+		private static HandlerSelectionResult forResult(HttpServletRequest request, HandlerExecutionChain result) {
+			return new HandlerSelectionResult(request, result, null);
 		}
 
 		private static HandlerSelectionResult withoutResult(HttpServletRequest request, @Nullable Exception exception) {
-			return new HandlerSelectionResult(request, null, null, exception);
+			return new HandlerSelectionResult(request, null, exception);
 		}
 
 		public @Nullable HandlerExecutionChain resultOrException() throws Exception {
@@ -155,20 +140,12 @@ private static HandlerSelectionResult withoutResult(HttpServletRequest request,
 			return result;
 		}
 
-		public @Nullable RequestMatchResult match(String pattern) {
-
-			return MatchableHandlerMapping.class.isInstance(mapping) //
-					? ((MatchableHandlerMapping) mapping).match(request, pattern) //
-					: null;
-		}
-
-		public HandlerSelectionResult(HttpServletRequest request, @Nullable HandlerMapping mapping,
-				@Nullable HandlerExecutionChain result, @Nullable Exception ignoredException) {
+		public HandlerSelectionResult(HttpServletRequest request, @Nullable HandlerExecutionChain result,
+				@Nullable Exception ignoredException) {
 
 			Assert.notNull(request, "HttpServletRequest must not be null");
 
 			this.request = request;
-			this.mapping = mapping;
 			this.result = result;
 			this.ignoredException = ignoredException;
 		}
@@ -187,20 +164,19 @@ public boolean equals(@Nullable Object o) {
 			HandlerSelectionResult other = (HandlerSelectionResult) o;
 
 			return Objects.equals(request, other.request) //
-					&& Objects.equals(mapping, other.mapping) //
 					&& Objects.equals(result, other.result) //
 					&& Objects.equals(ignoredException, other.ignoredException);
 		}
 
 		@Override
 		public int hashCode() {
-			return Objects.hash(request, mapping, result, ignoredException);
+			return Objects.hash(request, result, ignoredException);
 		}
 
 		@Override
 		public java.lang.String toString() {
-			return "DelegatingHandlerMapping.HandlerSelectionResult(request=" + request + ", mapping=" + mapping + ", result="
-					+ result + ", ignoredException=" + ignoredException + ")";
+			return "DelegatingHandlerMapping.HandlerSelectionResult(request=" + request + ", result=" + result
+					+ ", ignoredException=" + ignoredException + ")";
 		}
 	}
 }
diff --git a/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/config/DelegatingHandlerMappingUnitTests.java b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/config/DelegatingHandlerMappingUnitTests.java
index 163889aeb..5575f9b22 100755
--- a/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/config/DelegatingHandlerMappingUnitTests.java
+++ b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/webmvc/config/DelegatingHandlerMappingUnitTests.java
@@ -16,7 +16,6 @@
 package org.springframework.data.rest.webmvc.config;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import jakarta.servlet.http.HttpServletRequest;
@@ -25,7 +24,6 @@
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Answers;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.web.HttpMediaTypeNotAcceptableException;
@@ -33,8 +31,6 @@
 import org.springframework.web.HttpRequestMethodNotSupportedException;
 import org.springframework.web.bind.UnsatisfiedServletRequestParameterException;
 import org.springframework.web.servlet.HandlerMapping;
-import org.springframework.web.servlet.handler.MatchableHandlerMapping;
-import org.springframework.web.servlet.handler.RequestMatchResult;
 
 /**
  * Unit tests for {@link DelegatingHandlerMapping}.
@@ -59,24 +55,6 @@ void consultsAllHandlerMappingsAndThrowsExceptionEventually() throws Exception {
 		assertHandlerTriedButExceptionThrown(mapping, HttpMediaTypeNotSupportedException.class); // DATAREST-1387
 	}
 
-	@Test // DATAREST-1193
-	void exposesMatchabilityOfSelectedMapping() {
-
-		// Given:
-		// A matching mapping that doesn't get selected
-		MatchableHandlerMapping third = mock(MatchableHandlerMapping.class, withSettings().lenient());
-		doReturn(mock(RequestMatchResult.class)).when(third).match(any(), any(String.class));
-
-		// A matching mapping that gets selected
-		RequestMatchResult result = mock(RequestMatchResult.class);
-		MatchableHandlerMapping fourth = mock(MatchableHandlerMapping.class, Answers.RETURNS_MOCKS);
-		doReturn(result).when(fourth).match(any(), any(String.class));
-
-		DelegatingHandlerMapping mapping = new DelegatingHandlerMapping(Arrays.asList(first, second, third, fourth), null);
-
-		assertThat(mapping.match(request, "somePattern")).isEqualTo(result);
-	}
-
 	private final void assertHandlerTriedButExceptionThrown(HandlerMapping mapping, Class<? extends Exception> type)
 			throws Exception {