Let DelegatingHandlerMapping implement HandlerMapping directly.

We actually do not want to inherit all the functionality implemented in AbstractHandlerMapping. The sole reason we did so before was to override the method to propagate the PathPatternResolver to the downstream HandlerMappings. We now just declare the method on DHM directly.

Fixes GH-1955.

spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/DelegatingHandlerMapping.java

@@ -41,8 +41,8 @@
  * @author Oliver Gierke
  * @soundtrack Benny Greb - Stabila (Moving Parts)
  */
-class DelegatingHandlerMapping extends AbstractHandlerMapping
-		implements org.springframework.data.rest.webmvc.support.DelegatingHandlerMapping {
+class DelegatingHandlerMapping
+		implements org.springframework.data.rest.webmvc.support.DelegatingHandlerMapping, Ordered {
 
 	private final List<HandlerMapping> delegates;
 
@@ -58,22 +58,19 @@ public DelegatingHandlerMapping(List<HandlerMapping> delegates) {
 		this.delegates = delegates;
 	}
 
-	@java.lang.SuppressWarnings("all")
-	public List<HandlerMapping> getDelegates() {
-		return this.delegates;
-	}
-
-	@Override
-	public void setPatternParser(PathPatternParser parser) {
-
-		super.setPatternParser(parser);
+	void setPatternParser(PathPatternParser parser) {
 
 		delegates.stream() //
 				.filter(AbstractHandlerMapping.class::isInstance) //
 				.map(AbstractHandlerMapping.class::cast) //
 				.forEach(it -> it.setPatternParser(parser));
 	}
 
+	@SuppressWarnings("all")
+	public List<HandlerMapping> getDelegates() {
+		return this.delegates;
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see java.lang.Iterable#iterator()
@@ -94,10 +91,10 @@ public int getOrder() {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.web.servlet.handler.AbstractHandlerMapping#getHandlerInternal(javax.servlet.http.HttpServletRequest)
+	 * @see org.springframework.web.servlet.HandlerMapping#getHandler(javax.servlet.http.HttpServletRequest)
 	 */
 	@Override
-	protected Object getHandlerInternal(HttpServletRequest request) throws Exception {
+	public HandlerExecutionChain getHandler(HttpServletRequest request) throws Exception {
 		return HandlerSelectionResult.from(request, delegates).resultOrException();
 	}
 

spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RepositoryRestMvcConfiguration.java

@@ -183,7 +183,7 @@ public class RepositoryRestMvcConfiguration extends HateoasAwareSpringDataWebCon
 	private Lazy<BaseUri> baseUri;
 	private Lazy<RepositoryResourceMappings> resourceMappings;
 	private Lazy<Repositories> repositories;
-	private Lazy<AbstractHandlerMapping> restHandlerMapping;
+	private Lazy<DelegatingHandlerMapping> restHandlerMapping;
 	private Lazy<ResourceMetadataHandlerMethodArgumentResolver> resourceMetadataHandlerMethodArgumentResolver;
 	private Lazy<ExcerptProjector> excerptProjector;
 	private Lazy<PersistentEntities> persistentEntities;
@@ -241,7 +241,7 @@ public RepositoryRestMvcConfiguration( //
 		this.baseUri = Lazy.of(() -> context.getBean(BaseUri.class));
 		this.resourceMappings = Lazy.of(() -> context.getBean(RepositoryResourceMappings.class));
 		this.repositories = Lazy.of(() -> context.getBean(Repositories.class));
-		this.restHandlerMapping = Lazy.of(() -> context.getBean("restHandlerMapping", AbstractHandlerMapping.class));
+		this.restHandlerMapping = Lazy.of(() -> context.getBean("restHandlerMapping", DelegatingHandlerMapping.class));
 		this.resourceMetadataHandlerMethodArgumentResolver = Lazy
 				.of(() -> context.getBean(ResourceMetadataHandlerMethodArgumentResolver.class));
 		this.excerptProjector = Lazy.of(() -> context.getBean(ExcerptProjector.class));
@@ -638,7 +638,7 @@ public RequestMappingHandlerAdapter repositoryExporterHandlerAdapter(
 	 * @return
 	 */
 	@Bean
-	public AbstractHandlerMapping restHandlerMapping(Repositories repositories,
+	public DelegatingHandlerMapping restHandlerMapping(Repositories repositories,
 			RepositoryResourceMappings resourceMappings, Optional<JpaHelper> jpaHelper,
 			RepositoryRestConfiguration repositoryRestConfiguration, CorsConfigurationAware corsRestConfiguration) {