Polishing

Author: jhoeller

spring-context/src/test/java/org/springframework/tests/mock/jndi/ExpectedLookupTemplate.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.
@@ -53,6 +53,7 @@ public ExpectedLookupTemplate(String name, Object object) {
 		addObject(name, object);
 	}
 
+
 	/**
 	 * Add the given object to the list of JNDI objects that this template will expose.
 	 * @param name the name the client is expected to look up

spring-test/src/main/java/org/springframework/mock/jndi/ExpectedLookupTemplate.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.
@@ -53,6 +53,7 @@ public ExpectedLookupTemplate(String name, Object object) {
 		addObject(name, object);
 	}
 
+
 	/**
 	 * Add the given object to the list of JNDI objects that this template will expose.
 	 * @param name the name the client is expected to look up

spring-web/src/main/java/org/springframework/web/server/ServerWebExchange.java

@@ -148,9 +148,9 @@ default <T> T getAttributeOrDefault(String name, T defaultValue) {
 	/**
 	 * Return the {@link ApplicationContext} associated with the web application,
 	 * if it was initialized with one via
-	 * {@link org.springframework.web.server.adapter.WebHttpHandlerBuilder#applicationContext}.
+	 * {@link org.springframework.web.server.adapter.WebHttpHandlerBuilder#applicationContext(ApplicationContext)}.
 	 * @since 5.0.3
-	 * @see org.springframework.web.server.adapter.WebHttpHandlerBuilder#applicationContext
+	 * @see org.springframework.web.server.adapter.WebHttpHandlerBuilder#applicationContext(ApplicationContext)
 	 */
 	@Nullable
 	ApplicationContext getApplicationContext();

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

@@ -264,8 +264,7 @@ public static <T, P extends Publisher<T>> MultipartInserter fromMultipartAsyncDa
 	}
 
 	/**
-	 * Inserter to write the given
-	 * {@code Publisher<DataBuffer>} to the body.
+	 * Inserter to write the given {@code Publisher<DataBuffer>} to the body.
 	 * @param publisher the data buffer publisher to write
 	 * @param <T> the type of the publisher
 	 * @return the inserter to write directly to the body

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

@@ -494,18 +494,24 @@ private boolean isInvalidEncodedPath(String path) {
 	 */
 	protected boolean isInvalidPath(String path) {
 		if (path.contains("WEB-INF") || path.contains("META-INF")) {
-			logger.warn("Path with \"WEB-INF\" or \"META-INF\": [" + path + "]");
+			if (logger.isWarnEnabled()) {
+				logger.warn("Path with \"WEB-INF\" or \"META-INF\": [" + path + "]");
+			}
 			return true;
 		}
 		if (path.contains(":/")) {
 			String relativePath = (path.charAt(0) == '/' ? path.substring(1) : path);
 			if (ResourceUtils.isUrl(relativePath) || relativePath.startsWith("url:")) {
-				logger.warn("Path represents URL or has \"url:\" prefix: [" + path + "]");
+				if (logger.isWarnEnabled()) {
+					logger.warn("Path represents URL or has \"url:\" prefix: [" + path + "]");
+				}
 				return true;
 			}
 		}
 		if (path.contains("..") && StringUtils.cleanPath(path).contains("../")) {
-			logger.warn("Path contains \"../\" after call to StringUtils#cleanPath: [" + path + "]");
+			if (logger.isWarnEnabled()) {
+				logger.warn("Path contains \"../\" after call to StringUtils#cleanPath: [" + path + "]");
+			}
 			return true;
 		}
 		return false;

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

@@ -630,18 +630,24 @@ private boolean isInvalidEncodedPath(String path) {
 	 */
 	protected boolean isInvalidPath(String path) {
 		if (path.contains("WEB-INF") || path.contains("META-INF")) {
-			logger.warn("Path with \"WEB-INF\" or \"META-INF\": [" + path + "]");
+			if (logger.isWarnEnabled()) {
+				logger.warn("Path with \"WEB-INF\" or \"META-INF\": [" + path + "]");
+			}
 			return true;
 		}
 		if (path.contains(":/")) {
 			String relativePath = (path.charAt(0) == '/' ? path.substring(1) : path);
 			if (ResourceUtils.isUrl(relativePath) || relativePath.startsWith("url:")) {
-				logger.warn("Path represents URL or has \"url:\" prefix: [" + path + "]");
+				if (logger.isWarnEnabled()) {
+					logger.warn("Path represents URL or has \"url:\" prefix: [" + path + "]");
+				}
 				return true;
 			}
 		}
 		if (path.contains("..") && StringUtils.cleanPath(path).contains("../")) {
-			logger.warn("Invalid Path contains \"../\" after call to StringUtils#cleanPath: [" + path + "]");
+			if (logger.isWarnEnabled()) {
+				logger.warn("Path contains \"../\" after call to StringUtils#cleanPath: [" + path + "]");
+			}
 			return true;
 		}
 		return false;