From ea4a1745839c65435431f94334f8d09f5848e051 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 3 May 2019 18:10:41 +0200 Subject: [PATCH] Polishing --- .../reactive/UndertowServerHttpRequest.java | 6 +-- .../reactive/result/view/RedirectView.java | 42 +++++++++---------- 2 files changed, 23 insertions(+), 25 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpRequest.java b/spring-web/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpRequest.java index 772679ef43..5a6771fd0f 100644 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpRequest.java +++ b/spring-web/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpRequest.java @@ -71,7 +71,7 @@ class UndertowServerHttpRequest extends AbstractServerHttpRequest { } private static URI initUri(HttpServerExchange exchange) throws URISyntaxException { - Assert.notNull(exchange, "HttpServerExchange is required."); + Assert.notNull(exchange, "HttpServerExchange is required"); String requestURL = exchange.getRequestURL(); String query = exchange.getQueryString(); String requestUriAndQuery = (StringUtils.hasLength(query) ? requestURL + "?" + query : requestURL); @@ -79,9 +79,7 @@ class UndertowServerHttpRequest extends AbstractServerHttpRequest { } private static HttpHeaders initHeaders(HttpServerExchange exchange) { - UndertowHeadersAdapter headersMap = - new UndertowHeadersAdapter(exchange.getRequestHeaders()); - return new HttpHeaders(headersMap); + return new HttpHeaders(new UndertowHeadersAdapter(exchange.getRequestHeaders())); } @Override diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RedirectView.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RedirectView.java index e20acf8641..4b3ae4f0b5 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RedirectView.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/view/RedirectView.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2018 the original author or authors. + * Copyright 2002-2019 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. @@ -44,8 +44,8 @@ import org.springframework.web.util.UriUtils; * URI template in which case the URI template variables will be replaced with * values from the model or with URI variables from the current request. * - *

By default {@link HttpStatus#SEE_OTHER} is used but alternate status - * codes may be via constructor or setters arguments. + *

By default {@link HttpStatus#SEE_OTHER} is used but alternate status codes + * may be via constructor or setters arguments. * * @author Sebastien Deleuze * @author Rossen Stoyanchev @@ -56,10 +56,10 @@ public class RedirectView extends AbstractUrlBasedView { private static final Pattern URI_TEMPLATE_VARIABLE_PATTERN = Pattern.compile("\\{([^/]+?)\\}"); - private boolean contextRelative = true; - private HttpStatus statusCode = HttpStatus.SEE_OTHER; + private boolean contextRelative = true; + private boolean propagateQuery = false; @Nullable @@ -91,22 +91,6 @@ public class RedirectView extends AbstractUrlBasedView { } - /** - * Whether to interpret a given redirect URLs that starts with a slash ("/") - * as relative to the current context path ({@code true}, the default) or to - * the web server root ({@code false}). - */ - public void setContextRelative(boolean contextRelative) { - this.contextRelative = contextRelative; - } - - /** - * Whether to interpret URLs as relative to the current context path. - */ - public boolean isContextRelative() { - return this.contextRelative; - } - /** * Set an alternate redirect status code such as * {@link HttpStatus#TEMPORARY_REDIRECT} or @@ -124,6 +108,22 @@ public class RedirectView extends AbstractUrlBasedView { return this.statusCode; } + /** + * Whether to interpret a given redirect URLs that starts with a slash ("/") + * as relative to the current context path ({@code true}, the default) or to + * the web server root ({@code false}). + */ + public void setContextRelative(boolean contextRelative) { + this.contextRelative = contextRelative; + } + + /** + * Whether to interpret URLs as relative to the current context path. + */ + public boolean isContextRelative() { + return this.contextRelative; + } + /** * Whether to append the query string of the current URL to the redirect URL * ({@code true}) or not ({@code false}, the default).