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, Ordered { +class DelegatingHandlerMapping implements HandlerMapping, Iterable, Ordered { private final List 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 type) throws Exception {