diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyProcessorSupport.java b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyProcessorSupport.java index 1bcb7978964..71cf05e6342 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyProcessorSupport.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyProcessorSupport.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. @@ -52,9 +52,9 @@ public class ProxyProcessorSupport extends ProxyConfig implements Ordered, BeanC /** - * Set the ordering which will apply to this class's implementation - * of Ordered, used when applying multiple processors. - *

Default value is {@code Integer.MAX_VALUE}, meaning that it's non-ordered. + * Set the ordering which will apply to this processor's implementation + * of {@link Ordered}, used when applying multiple processors. + *

The default value is {@code Ordered.LOWEST_PRECEDENCE}, meaning non-ordered. * @param order the ordering value */ public void setOrder(int order) { diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java index 3b4896273fb..b6ad61c4825 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java @@ -46,7 +46,7 @@ public class DefaultIntroductionAdvisor implements IntroductionAdvisor, ClassFil private final Set> interfaces = new LinkedHashSet<>(); - private int order = Integer.MAX_VALUE; + private int order = Ordered.LOWEST_PRECEDENCE; /** @@ -119,7 +119,6 @@ public class DefaultIntroductionAdvisor implements IntroductionAdvisor, ClassFil } } - public void setOrder(int order) { this.order = order; } @@ -129,7 +128,6 @@ public class DefaultIntroductionAdvisor implements IntroductionAdvisor, ClassFil return this.order; } - @Override public Advice getAdvice() { return this.advice; diff --git a/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcherPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcherPointcutAdvisor.java index ecbc42397b5..70970388acf 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcherPointcutAdvisor.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcherPointcutAdvisor.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. @@ -36,10 +36,10 @@ import org.springframework.util.Assert; public abstract class StaticMethodMatcherPointcutAdvisor extends StaticMethodMatcherPointcut implements PointcutAdvisor, Ordered, Serializable { - private int order = Integer.MAX_VALUE; - private Advice advice = EMPTY_ADVICE; + private int order = Ordered.LOWEST_PRECEDENCE; + /** * Create a new StaticMethodMatcherPointcutAdvisor, diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistry.java b/spring-webflux/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistry.java index 3ca0bb3bdfe..3d9ae6f5957 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistry.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistry.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. @@ -23,6 +23,7 @@ import java.util.List; import java.util.Map; import org.springframework.beans.factory.BeanInitializationException; +import org.springframework.core.Ordered; import org.springframework.core.io.ResourceLoader; import org.springframework.lang.Nullable; import org.springframework.web.reactive.handler.AbstractUrlHandlerMapping; @@ -56,7 +57,7 @@ public class ResourceHandlerRegistry { private final List registrations = new ArrayList<>(); - private int order = Integer.MAX_VALUE -1; + private int order = Ordered.LOWEST_PRECEDENCE -1; /** diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractHandlerMapping.java b/spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractHandlerMapping.java index cae5ea8e484..2783640711e 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractHandlerMapping.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractHandlerMapping.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. @@ -49,33 +49,20 @@ public abstract class AbstractHandlerMapping extends ApplicationObjectSupport im private static final WebHandler REQUEST_HANDLED_HANDLER = exchange -> Mono.empty(); - private int order = Integer.MAX_VALUE; // default: same as non-Ordered - private final PathPatternParser patternParser; private final UrlBasedCorsConfigurationSource globalCorsConfigSource; private CorsProcessor corsProcessor = new DefaultCorsProcessor(); + private int order = Ordered.LOWEST_PRECEDENCE; // default: same as non-Ordered + public AbstractHandlerMapping() { this.patternParser = new PathPatternParser(); this.globalCorsConfigSource = new UrlBasedCorsConfigurationSource(this.patternParser); } - /** - * Specify the order value for this HandlerMapping bean. - *

Default value is {@code Integer.MAX_VALUE}, meaning that it's non-ordered. - * @see org.springframework.core.Ordered#getOrder() - */ - public final void setOrder(int order) { - this.order = order; - } - - @Override - public final int getOrder() { - return this.order; - } /** * Shortcut method for setting the same property on the underlying pattern @@ -140,6 +127,20 @@ public abstract class AbstractHandlerMapping extends ApplicationObjectSupport im return this.corsProcessor; } + /** + * Specify the order value for this HandlerMapping bean. + *

The default value is {@code Ordered.LOWEST_PRECEDENCE}, meaning non-ordered. + * @see org.springframework.core.Ordered#getOrder() + */ + public void setOrder(int order) { + this.order = order; + } + + @Override + public int getOrder() { + return this.order; + } + @Override public Mono getHandler(ServerWebExchange exchange) { diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/ViewResolverSupport.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/ViewResolverSupport.java index bd621ae75f8..b6a92f9e3fe 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/ViewResolverSupport.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/ViewResolverSupport.java @@ -41,7 +41,7 @@ public abstract class ViewResolverSupport implements Ordered { private Charset defaultCharset = StandardCharsets.UTF_8; - private int order = Integer.MAX_VALUE; + private int order = Ordered.LOWEST_PRECEDENCE; public ViewResolverSupport() { @@ -84,17 +84,15 @@ public abstract class ViewResolverSupport implements Ordered { return this.defaultCharset; } - /** - * Set the order in which this {@link ViewResolver} is evaluated. + * Specify the order value for this ViewResolver bean. + *

The default value is {@code Ordered.LOWEST_PRECEDENCE}, meaning non-ordered. + * @see org.springframework.core.Ordered#getOrder() */ public void setOrder(int order) { this.order = order; } - /** - * Return the order in which this {@link ViewResolver} is evaluated. - */ @Override public int getOrder() { return this.order; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java index 2b7f35e1f41..f30598dfa55 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.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. @@ -25,6 +25,7 @@ import javax.servlet.ServletContext; import org.springframework.beans.factory.BeanInitializationException; import org.springframework.context.ApplicationContext; +import org.springframework.core.Ordered; import org.springframework.lang.Nullable; import org.springframework.util.Assert; import org.springframework.web.HttpRequestHandler; @@ -65,7 +66,7 @@ public class ResourceHandlerRegistry { private final List registrations = new ArrayList<>(); - private int order = Integer.MAX_VALUE -1; + private int order = Ordered.LOWEST_PRECEDENCE - 1; /** diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java index 45389c38a63..8f05d0cccb4 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java @@ -67,8 +67,6 @@ import org.springframework.web.util.UrlPathHelper; */ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport implements HandlerMapping, Ordered { - private int order = Integer.MAX_VALUE; // default: same as non-Ordered - @Nullable private Object defaultHandler; @@ -84,20 +82,8 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport private CorsProcessor corsProcessor = new DefaultCorsProcessor(); + private int order = Ordered.LOWEST_PRECEDENCE; // default: same as non-Ordered - /** - * Specify the order value for this HandlerMapping bean. - *

Default value is {@code Integer.MAX_VALUE}, meaning that it's non-ordered. - * @see org.springframework.core.Ordered#getOrder() - */ - public final void setOrder(int order) { - this.order = order; - } - - @Override - public final int getOrder() { - return this.order; - } /** * Set the default handler for this handler mapping. @@ -231,6 +217,20 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport return this.corsProcessor; } + /** + * Specify the order value for this HandlerMapping bean. + *

The default value is {@code Ordered.LOWEST_PRECEDENCE}, meaning non-ordered. + * @see org.springframework.core.Ordered#getOrder() + */ + public void setOrder(int order) { + this.order = order; + } + + @Override + public int getOrder() { + return this.order; + } + /** * Initializes the interceptors. diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/AbstractHandlerMethodAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/AbstractHandlerMethodAdapter.java index 3fc9eba11e9..0b4388be726 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/AbstractHandlerMethodAdapter.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/AbstractHandlerMethodAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 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. @@ -46,7 +46,7 @@ public abstract class AbstractHandlerMethodAdapter extends WebContentGenerator i /** * Specify the order value for this HandlerAdapter bean. - *

Default value is {@code Integer.MAX_VALUE}, meaning that it's non-ordered. + *

The default value is {@code Ordered.LOWEST_PRECEDENCE}, meaning non-ordered. * @see org.springframework.core.Ordered#getOrder() */ public void setOrder(int order) { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/BeanNameViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/BeanNameViewResolver.java index 13312ff5327..a645f34c64b 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/BeanNameViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/BeanNameViewResolver.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. @@ -54,9 +54,14 @@ import org.springframework.web.servlet.ViewResolver; */ public class BeanNameViewResolver extends WebApplicationObjectSupport implements ViewResolver, Ordered { - private int order = Integer.MAX_VALUE; // default: same as non-Ordered + private int order = Ordered.LOWEST_PRECEDENCE; // default: same as non-Ordered + /** + * Specify the order value for this ViewResolver bean. + *

The default value is {@code Ordered.LOWEST_PRECEDENCE}, meaning non-ordered. + * @see org.springframework.core.Ordered#getOrder() + */ public void setOrder(int order) { this.order = order; } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ResourceBundleViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ResourceBundleViewResolver.java index fe8cca9d3fb..792a67d22be 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ResourceBundleViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/ResourceBundleViewResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 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. @@ -67,8 +67,6 @@ public class ResourceBundleViewResolver extends AbstractCachingViewResolver public static final String DEFAULT_BASENAME = "views"; - private int order = Integer.MAX_VALUE; // default: same as non-Ordered - private String[] basenames = new String[] {DEFAULT_BASENAME}; private ClassLoader bundleClassLoader = Thread.currentThread().getContextClassLoader(); @@ -85,15 +83,8 @@ public class ResourceBundleViewResolver extends AbstractCachingViewResolver /* List of ResourceBundle -> BeanFactory */ private final Map, ConfigurableApplicationContext> bundleCache = new HashMap<>(); + private int order = Ordered.LOWEST_PRECEDENCE; // default: same as non-Ordered - public void setOrder(int order) { - this.order = order; - } - - @Override - public int getOrder() { - return this.order; - } /** * Set a single basename, following {@link java.util.ResourceBundle} conventions. @@ -176,6 +167,20 @@ public class ResourceBundleViewResolver extends AbstractCachingViewResolver this.localesToInitialize = localesToInitialize; } + /** + * Specify the order value for this ViewResolver bean. + *

The default value is {@code Ordered.LOWEST_PRECEDENCE}, meaning non-ordered. + * @see org.springframework.core.Ordered#getOrder() + */ + public void setOrder(int order) { + this.order = order; + } + + @Override + public int getOrder() { + return this.order; + } + /** * Eagerly initialize Locales if necessary. * @see #setLocalesToInitialize diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/UrlBasedViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/UrlBasedViewResolver.java index 70c3cf48ec0..8b19ea0eea0 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/UrlBasedViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/UrlBasedViewResolver.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. @@ -137,7 +137,7 @@ public class UrlBasedViewResolver extends AbstractCachingViewResolver implements @Nullable private String[] viewNames; - private int order = Integer.MAX_VALUE; + private int order = Ordered.LOWEST_PRECEDENCE; /** @@ -423,17 +423,14 @@ public class UrlBasedViewResolver extends AbstractCachingViewResolver implements } /** - * Set the order in which this {@link org.springframework.web.servlet.ViewResolver} - * is evaluated. + * Specify the order value for this ViewResolver bean. + *

The default value is {@code Ordered.LOWEST_PRECEDENCE}, meaning non-ordered. + * @see org.springframework.core.Ordered#getOrder() */ public void setOrder(int order) { this.order = order; } - /** - * Return the order in which this {@link org.springframework.web.servlet.ViewResolver} - * is evaluated. - */ @Override public int getOrder() { return this.order; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/XmlViewResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/XmlViewResolver.java index 36a44440823..1c9d2d53bc8 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/XmlViewResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/XmlViewResolver.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. @@ -62,23 +62,14 @@ public class XmlViewResolver extends AbstractCachingViewResolver public static final String DEFAULT_LOCATION = "/WEB-INF/views.xml"; - private int order = Integer.MAX_VALUE; // default: same as non-Ordered - @Nullable private Resource location; @Nullable private ConfigurableApplicationContext cachedFactory; + private int order = Ordered.LOWEST_PRECEDENCE; // default: same as non-Ordered - public void setOrder(int order) { - this.order = order; - } - - @Override - public int getOrder() { - return this.order; - } /** * Set the location of the XML file that defines the view beans. @@ -89,6 +80,20 @@ public class XmlViewResolver extends AbstractCachingViewResolver this.location = location; } + /** + * Specify the order value for this ViewResolver bean. + *

The default value is {@code Ordered.LOWEST_PRECEDENCE}, meaning non-ordered. + * @see org.springframework.core.Ordered#getOrder() + */ + public void setOrder(int order) { + this.order = order; + } + + @Override + public int getOrder() { + return this.order; + } + /** * Pre-initialize the factory from the XML file. * Only effective if caching is enabled.