DispatcherHandler orders HandlerMappings correctly again

Issue: SPR-15991

spring-webflux/src/main/java/org/springframework/web/reactive/DispatcherHandler.java

@@ -112,7 +112,7 @@ public class DispatcherHandler implements WebHandler, ApplicationContextAware {
 				context, HandlerMapping.class, true, false);
 
 		ArrayList<HandlerMapping> mappings = new ArrayList<>(mappingBeans.values());
-		AnnotationAwareOrderComparator.sort(this.handlerMappings);
+		AnnotationAwareOrderComparator.sort(mappings);
 		this.handlerMappings = Collections.unmodifiableList(mappings);
 
 		Map<String, HandlerAdapter> adapterBeans = BeanFactoryUtils.beansOfTypeIncludingAncestors(

spring-webflux/src/test/java/org/springframework/web/reactive/DispatcherHandlerTests.java

@@ -0,0 +1,112 @@
+/*
+ * Copyright 2002-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.web.reactive;
+
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import org.junit.Test;
+import org.mockito.MockSettings;
+import org.mockito.Mockito;
+import reactor.core.publisher.Mono;
+
+import org.springframework.context.support.StaticApplicationContext;
+import org.springframework.core.MethodParameter;
+import org.springframework.core.Ordered;
+import org.springframework.core.codec.CharSequenceEncoder;
+import org.springframework.core.io.buffer.DataBuffer;
+import org.springframework.core.io.buffer.DefaultDataBufferFactory;
+import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
+import org.springframework.mock.http.server.reactive.test.MockServerWebExchange;
+import org.springframework.web.method.ResolvableMethod;
+import org.springframework.web.server.ServerWebExchange;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.withSettings;
+
+/**
+ *
+ * @author Rossen Stoyanchev
+ */
+public class DispatcherHandlerTests {
+
+	private static final MethodParameter RETURN_TYPE =
+			ResolvableMethod.on(DispatcherHandler.class).named("handle").resolveReturnType();
+
+
+	@Test
+	public void handlerMappingOrder() throws Exception {
+
+		HandlerMapping hm1 = mock(HandlerMapping.class, withSettings().extraInterfaces(Ordered.class));
+		HandlerMapping hm2 = mock(HandlerMapping.class, withSettings().extraInterfaces(Ordered.class));
+		when(((Ordered) hm1).getOrder()).thenReturn(1);
+		when(((Ordered) hm2).getOrder()).thenReturn(2);
+		when((hm1).getHandler(any())).thenReturn(Mono.just((Supplier<String>) () -> "1"));
+		when((hm2).getHandler(any())).thenReturn(Mono.just((Supplier<String>) () -> "2"));
+
+		StaticApplicationContext context = new StaticApplicationContext();
+		context.registerBean("b2", HandlerMapping.class, () -> hm2);
+		context.registerBean("b1", HandlerMapping.class, () -> hm1);
+		context.registerBean(HandlerAdapter.class, SupplierHandlerAdapter::new);
+		context.registerBean(HandlerResultHandler.class, StringHandlerResultHandler::new);
+		context.refresh();
+
+		DispatcherHandler dispatcherHandler = new DispatcherHandler(context);
+
+		MockServerWebExchange exchange = MockServerHttpRequest.get("/").toExchange();
+		dispatcherHandler.handle(exchange).block(Duration.ofSeconds(0));
+		assertEquals("1", exchange.getResponse().getBodyAsString().block(Duration.ofSeconds(5)));
+	}
+
+
+	@SuppressWarnings("unused")
+	private void handle() {}
+
+
+	private static class SupplierHandlerAdapter implements HandlerAdapter {
+
+		@Override
+		public boolean supports(Object handler) {
+			return handler instanceof Supplier;
+		}
+
+		@Override
+		public Mono<HandlerResult> handle(ServerWebExchange exchange, Object handler) {
+			return Mono.just(new HandlerResult(handler, ((Supplier<?>) handler).get(), RETURN_TYPE));
+		}
+	}
+
+	private static class StringHandlerResultHandler implements HandlerResultHandler {
+
+		@Override
+		public boolean supports(HandlerResult result) {
+			Object value = result.getReturnValue();
+			return value != null && String.class.equals(value.getClass());
+		}
+
+		@Override
+		public Mono<Void> handleResult(ServerWebExchange exchange, HandlerResult result) {
+			byte[] bytes = ((String) result.getReturnValue()).getBytes(StandardCharsets.UTF_8);
+			DataBuffer dataBuffer = new DefaultDataBufferFactory().wrap(bytes);
+			return exchange.getResponse().writeWith(Mono.just(dataBuffer));
+		}
+	}
+}