Merge branch '5.1.x'

Author: jhoeller

spring-core/src/main/java/org/springframework/util/StringUtils.java

@@ -76,15 +76,20 @@ public abstract class StringUtils {
 	//---------------------------------------------------------------------
 
 	/**
-	 * Check whether the given {@code String} is empty.
+	 * Check whether the given object (possibly a {@code String}) is empty.
+	 * This is effectly a shortcut for {@code !hasLength(String)}.
 	 * <p>This method accepts any Object as an argument, comparing it to
 	 * {@code null} and the empty String. As a consequence, this method
 	 * will never return {@code true} for a non-null non-String object.
 	 * <p>The Object signature is useful for general attribute handling code
 	 * that commonly deals with Strings but generally has to iterate over
 	 * Objects since attributes may e.g. be primitive value objects as well.
-	 * @param str the candidate String
+	 * <p><b>Note: If the object is typed to {@code String} upfront, prefer
+	 * {@link #hasLength(String)} or {@link #hasText(String)} instead.</b>
+	 * @param str the candidate object (possibly a {@code String})
 	 * @since 3.2.1
+	 * @see #hasLength(String)
+	 * @see #hasText(String)
 	 */
 	public static boolean isEmpty(@Nullable Object str) {
 		return (str == null || "".equals(str));
@@ -103,7 +108,8 @@ public static boolean isEmpty(@Nullable Object str) {
 	 * </pre>
 	 * @param str the {@code CharSequence} to check (may be {@code null})
 	 * @return {@code true} if the {@code CharSequence} is not {@code null} and has length
-	 * @see #hasText(String)
+	 * @see #hasLength(String)
+	 * @see #hasText(CharSequence)
 	 */
 	public static boolean hasLength(@Nullable CharSequence str) {
 		return (str != null && str.length() > 0);
@@ -137,6 +143,8 @@ public static boolean hasLength(@Nullable String str) {
 	 * @param str the {@code CharSequence} to check (may be {@code null})
 	 * @return {@code true} if the {@code CharSequence} is not {@code null},
 	 * its length is greater than 0, and it does not contain whitespace only
+	 * @see #hasText(String)
+	 * @see #hasLength(CharSequence)
 	 * @see Character#isWhitespace
 	 */
 	public static boolean hasText(@Nullable CharSequence str) {
@@ -152,6 +160,8 @@ public static boolean hasText(@Nullable CharSequence str) {
 	 * @return {@code true} if the {@code String} is not {@code null}, its
 	 * length is greater than 0, and it does not contain whitespace only
 	 * @see #hasText(CharSequence)
+	 * @see #hasLength(String)
+	 * @see Character#isWhitespace
 	 */
 	public static boolean hasText(@Nullable String str) {
 		return (str != null && !str.isEmpty() && containsText(str));

spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java

@@ -576,7 +576,7 @@ public int[] doInStatement(Statement stmt) throws SQLException, DataAccessExcept
 			}
 
 			private String appendSql(@Nullable String sql, String statement) {
-				return (StringUtils.isEmpty(sql) ? statement : sql + "; " + statement);
+				return (StringUtils.hasLength(sql) ? sql + "; " + statement : statement);
 			}
 
 			@Override

spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java

@@ -581,8 +581,8 @@ protected TransactionInfo prepareTransactionInfo(@Nullable PlatformTransactionMa
 			// The TransactionInfo.hasTransaction() method will return false. We created it only
 			// to preserve the integrity of the ThreadLocal stack maintained in this class.
 			if (logger.isTraceEnabled()) {
-				logger.trace("Don't need to create transaction for [" + joinpointIdentification +
-						"]: This method isn't transactional.");
+				logger.trace("No need to create transaction for [" + joinpointIdentification +
+						"]: This method is not transactional.");
 			}
 		}
 

spring-web/src/main/java/org/springframework/http/HttpHeaders.java

@@ -704,7 +704,7 @@ public void setAllow(Set<HttpMethod> allowedMethods) {
 	 */
 	public Set<HttpMethod> getAllow() {
 		String value = getFirst(ALLOW);
-		if (!StringUtils.isEmpty(value)) {
+		if (StringUtils.hasLength(value)) {
 			String[] tokens = StringUtils.tokenizeToStringArray(value, ",");
 			List<HttpMethod> result = new ArrayList<>(tokens.length);
 			for (String token : tokens) {

spring-web/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpRequest.java

@@ -71,17 +71,15 @@ public UndertowServerHttpRequest(HttpServerExchange exchange, DataBufferFactory
 	}
 
 	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.isEmpty(query) ? requestURL : requestURL + "?" + query;
+		String requestUriAndQuery = (StringUtils.hasLength(query) ? requestURL + "?" + query : requestURL);
 		return new URI(requestUriAndQuery);
 	}
 
 	private static HttpHeaders initHeaders(HttpServerExchange exchange) {
-		UndertowHeadersAdapter headersMap =
-				new UndertowHeadersAdapter(exchange.getRequestHeaders());
-		return new HttpHeaders(headersMap);
+		return new HttpHeaders(new UndertowHeadersAdapter(exchange.getRequestHeaders()));
 	}
 
 	@Override

spring-web/src/main/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.java

@@ -214,8 +214,8 @@ public void contributeMethodArgument(MethodParameter parameter, @Nullable Object
 		}
 
 		RequestParam requestParam = parameter.getParameterAnnotation(RequestParam.class);
-		String name = (requestParam == null || StringUtils.isEmpty(requestParam.name()) ?
-				parameter.getParameterName() : requestParam.name());
+		String name = (requestParam != null && StringUtils.hasLength(requestParam.name()) ?
+				requestParam.name() : parameter.getParameterName());
 		Assert.state(name != null, "Unresolvable parameter name");
 
 		parameter = parameter.nestedIfOptional();

spring-web/src/main/java/org/springframework/web/util/DefaultUriBuilderFactory.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.
@@ -33,7 +33,6 @@
  * <p>Provides options to create {@link UriBuilder} instances with a common
  * base URI, alternative encoding mode strategies, among others.
  *
- *
  * @author Rossen Stoyanchev
  * @since 5.0
  * @see UriComponentsBuilder
@@ -222,31 +221,27 @@ private class DefaultUriBuilder implements UriBuilder {
 
 		private final UriComponentsBuilder uriComponentsBuilder;
 
-
 		public DefaultUriBuilder(String uriTemplate) {
 			this.uriComponentsBuilder = initUriComponentsBuilder(uriTemplate);
 		}
 
 		private UriComponentsBuilder initUriComponentsBuilder(String uriTemplate) {
 			UriComponentsBuilder result;
-			if (StringUtils.isEmpty(uriTemplate)) {
-				result = baseUri != null ? baseUri.cloneBuilder() : UriComponentsBuilder.newInstance();
+			if (!StringUtils.hasLength(uriTemplate)) {
+				result = (baseUri != null ? baseUri.cloneBuilder() : UriComponentsBuilder.newInstance());
 			}
 			else if (baseUri != null) {
 				UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(uriTemplate);
 				UriComponents uri = builder.build();
-				result = uri.getHost() == null ? baseUri.cloneBuilder().uriComponents(uri) : builder;
+				result = (uri.getHost() == null ? baseUri.cloneBuilder().uriComponents(uri) : builder);
 			}
 			else {
 				result = UriComponentsBuilder.fromUriString(uriTemplate);
 			}
-
 			if (encodingMode.equals(EncodingMode.TEMPLATE_AND_VALUES)) {
 				result.encode();
 			}
-
 			parsePathIfNecessary(result);
-
 			return result;
 		}
 

spring-webflux/src/main/java/org/springframework/web/reactive/function/client/ExchangeStrategies.java

@@ -51,7 +51,7 @@ public interface ExchangeStrategies {
 	// Static builder methods
 
 	/**
-	 * Return a new {@code ExchangeStrategies} with default configuration
+	 * Return an {@code ExchangeStrategies} instance with default configuration
 	 * provided by {@link ClientCodecConfigurer}.
 	 */
 	static ExchangeStrategies withDefaults() {

spring-webflux/src/main/java/org/springframework/web/reactive/resource/VersionResourceResolver.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.
@@ -172,7 +172,7 @@ private Mono<Resource> resolveVersionedResource(@Nullable ServerWebExchange exch
 		}
 
 		String candidate = versionStrategy.extractVersion(requestPath);
-		if (StringUtils.isEmpty(candidate)) {
+		if (!StringUtils.hasLength(candidate)) {
 			return Mono.empty();
 		}
 

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 @@
  * 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.
  *
- * <p>By default {@link HttpStatus#SEE_OTHER} is used but alternate status
- * codes may be via constructor or setters arguments.
+ * <p>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 RedirectView(String redirectUrl, HttpStatus 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;
-	}
-
 	/**
 	 * Set an alternate redirect status code such as
 	 * {@link HttpStatus#TEMPORARY_REDIRECT} or
@@ -124,6 +108,22 @@ public HttpStatus getStatusCode() {
 		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).
@@ -309,7 +309,7 @@ protected boolean isRemoteHost(String targetUrl) {
 			return false;
 		}
 		String targetHost = UriComponentsBuilder.fromUriString(targetUrl).build().getHost();
-		if (StringUtils.isEmpty(targetHost)) {
+		if (!StringUtils.hasLength(targetHost)) {
 			return false;
 		}
 		for (String host : this.hosts) {

spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java

@@ -963,11 +963,12 @@ private void logRequest(HttpServletRequest request) {
 				params = (request.getParameterMap().isEmpty() ? "" : "masked");
 			}
 
-			String query = StringUtils.isEmpty(request.getQueryString()) ? "" : "?" + request.getQueryString();
+			String queryString = request.getQueryString();
+			String queryClause = (StringUtils.hasLength(queryString) ? "?" + queryString : "");
 			String dispatchType = (!request.getDispatcherType().equals(DispatcherType.REQUEST) ?
 					"\"" + request.getDispatcherType().name() + "\" dispatch for " : "");
 			String message = (dispatchType + request.getMethod() + " \"" + getRequestUri(request) +
-					query + "\", parameters={" + params + "}");
+					queryClause + "\", parameters={" + params + "}");
 
 			if (traceOn) {
 				List<String> values = Collections.list(request.getHeaderNames());

spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerExceptionResolver.java

@@ -100,16 +100,17 @@ public void setMappedHandlerClasses(Class<?>... mappedHandlerClasses) {
 	/**
 	 * Set the log category for warn logging. The name will be passed to the underlying logger
 	 * implementation through Commons Logging, getting interpreted as a log category according
-	 * to the logger's configuration. If {@code null} is passed, warn logging is turned off.
-	 * <p>By default there is no warn logging although sub-classes like
+	 * to the logger's configuration. If {@code null} or empty String is passed, warn logging
+	 * is turned off.
+	 * <p>By default there is no warn logging although subclasses like
 	 * {@link org.springframework.web.servlet.mvc.support.DefaultHandlerExceptionResolver}
 	 * can change that default. Specify this setting to activate warn logging into a specific
 	 * category. Alternatively, override the {@link #logException} method for custom logging.
 	 * @see org.apache.commons.logging.LogFactory#getLog(String)
 	 * @see java.util.logging.Logger#getLogger(String)
 	 */
 	public void setWarnLogCategory(String loggerName) {
-		this.warnLogger = (!StringUtils.isEmpty(loggerName) ? LogFactory.getLog(loggerName) : null);
+		this.warnLogger = (StringUtils.hasLength(loggerName) ? LogFactory.getLog(loggerName) : null);
 	}
 
 	/**

spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.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.
@@ -578,7 +578,7 @@ private static String getClassMapping(Class<?> controllerType) {
 			return "/";
 		}
 		String[] paths = mapping.path();
-		if (ObjectUtils.isEmpty(paths) || StringUtils.isEmpty(paths[0])) {
+		if (ObjectUtils.isEmpty(paths) || !StringUtils.hasLength(paths[0])) {
 			return "/";
 		}
 		if (paths.length > 1 && logger.isTraceEnabled()) {
@@ -594,7 +594,7 @@ private static String getMethodMapping(Method method) {
 			throw new IllegalArgumentException("No @RequestMapping on: " + method.toGenericString());
 		}
 		String[] paths = requestMapping.path();
-		if (ObjectUtils.isEmpty(paths) || StringUtils.isEmpty(paths[0])) {
+		if (ObjectUtils.isEmpty(paths) || !StringUtils.hasLength(paths[0])) {
 			return "/";
 		}
 		if (paths.length > 1 && logger.isTraceEnabled()) {

spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMethodArgumentResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 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.
@@ -125,7 +125,7 @@ public void contributeMethodArgument(MethodParameter parameter, Object value,
 		}
 
 		PathVariable ann = parameter.getParameterAnnotation(PathVariable.class);
-		String name = (ann != null && !StringUtils.isEmpty(ann.value()) ? ann.value() : parameter.getParameterName());
+		String name = (ann != null && StringUtils.hasLength(ann.value()) ? ann.value() : parameter.getParameterName());
 		String formatted = formatUriValue(conversionService, new TypeDescriptor(parameter.nestedIfOptional()), value);
 		uriVariables.put(name, formatted);
 	}

spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.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.
@@ -168,7 +168,7 @@ protected Resource resolveResourceInternal(@Nullable HttpServletRequest request,
 		}
 
 		String candidateVersion = versionStrategy.extractVersion(requestPath);
-		if (StringUtils.isEmpty(candidateVersion)) {
+		if (!StringUtils.hasLength(candidateVersion)) {
 			return null;
 		}
 

spring-webmvc/src/main/java/org/springframework/web/servlet/support/ServletUriComponentsBuilder.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.
@@ -206,7 +206,7 @@ public String removePathExtension() {
 		String extension = null;
 		if (this.originalPath != null) {
 			extension = UriUtils.extractFileExtension(this.originalPath);
-			if (!StringUtils.isEmpty(extension)) {
+			if (StringUtils.hasLength(extension)) {
 				int end = this.originalPath.length() - (extension.length() + 1);
 				replacePath(this.originalPath.substring(0, end));
 			}

spring-webmvc/src/main/java/org/springframework/web/servlet/view/RedirectView.java

@@ -650,7 +650,7 @@ protected boolean isRemoteHost(String targetUrl) {
 			return false;
 		}
 		String targetHost = UriComponentsBuilder.fromUriString(targetUrl).build().getHost();
-		if (StringUtils.isEmpty(targetHost)) {
+		if (!StringUtils.hasLength(targetHost)) {
 			return false;
 		}
 		for (String host : getHosts()) {

spring-websocket/src/main/java/org/springframework/web/socket/messaging/SubProtocolWebSocketHandler.java

@@ -429,7 +429,7 @@ protected final SubProtocolHandler findProtocolHandler(WebSocketSession session)
 		}
 
 		SubProtocolHandler handler;
-		if (!StringUtils.isEmpty(protocol)) {
+		if (StringUtils.hasLength(protocol)) {
 			handler = this.protocolHandlerLookup.get(protocol);
 			if (handler == null) {
 				throw new IllegalStateException(