From fbde97f30258f90a08375dbe6a949ef4f3a172db Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Fri, 26 Jan 2018 17:06:01 -0500 Subject: [PATCH] Default order 0 for ServerResponseResultHandler Issue: SPR-16420 --- .../web/reactive/config/WebFluxConfigurationSupport.java | 6 +----- .../server/support/ServerResponseResultHandler.java | 8 ++++---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/config/WebFluxConfigurationSupport.java b/spring-webflux/src/main/java/org/springframework/web/reactive/config/WebFluxConfigurationSupport.java index eca05af22ae..5715552b376 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/config/WebFluxConfigurationSupport.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/config/WebFluxConfigurationSupport.java @@ -418,14 +418,10 @@ public class WebFluxConfigurationSupport implements ApplicationContextAware { @Bean public ServerResponseResultHandler serverResponseResultHandler() { - ViewResolverRegistry registry = getViewResolverRegistry(); - List resolvers = registry.getViewResolvers(); - + List resolvers = getViewResolverRegistry().getViewResolvers(); ServerResponseResultHandler handler = new ServerResponseResultHandler(); handler.setMessageWriters(serverCodecConfigurer().getWriters()); handler.setViewResolvers(resolvers); - handler.setOrder(registry.getOrder() + 1); - return handler; } diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/support/ServerResponseResultHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/support/ServerResponseResultHandler.java index 1130f932187..fb7b29cc219 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/support/ServerResponseResultHandler.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/support/ServerResponseResultHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -45,7 +45,7 @@ public class ServerResponseResultHandler implements HandlerResultHandler, Initia private List viewResolvers = Collections.emptyList(); - private int order = LOWEST_PRECEDENCE; + private int order = 0; /** @@ -63,8 +63,8 @@ public class ServerResponseResultHandler implements HandlerResultHandler, Initia /** * Set the order for this result handler relative to others. - *

By default set to {@link Ordered#LOWEST_PRECEDENCE}, however see - * Javadoc of sub-classes which may change this default. + *

By default set to 0. It is generally safe to place it early in the + * order as it looks for a concrete return type. * @param order the order */ public void setOrder(int order) {