Polishing

spring-web/src/main/java/org/springframework/http/client/support/AsyncHttpAccessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2017 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,12 +46,13 @@ public class AsyncHttpAccessor {
 
 	private AsyncClientHttpRequestFactory asyncRequestFactory;
 
+
 	/**
 	 * Set the request factory that this accessor uses for obtaining {@link
 	 * org.springframework.http.client.ClientHttpRequest HttpRequests}.
 	 */
 	public void setAsyncRequestFactory(AsyncClientHttpRequestFactory asyncRequestFactory) {
-		Assert.notNull(asyncRequestFactory, "'asyncRequestFactory' must not be null");
+		Assert.notNull(asyncRequestFactory, "AsyncClientHttpRequestFactory must not be null");
 		this.asyncRequestFactory = asyncRequestFactory;
 	}
 
@@ -64,15 +65,14 @@ public class AsyncHttpAccessor {
 	}
 
 	/**
-	 * Create a new {@link AsyncClientHttpRequest} via this template's {@link
-	 * AsyncClientHttpRequestFactory}.
+	 * Create a new {@link AsyncClientHttpRequest} via this template's
+	 * {@link AsyncClientHttpRequestFactory}.
 	 * @param url the URL to connect to
 	 * @param method the HTTP method to execute (GET, POST, etc.)
 	 * @return the created request
 	 * @throws IOException in case of I/O errors
 	 */
-	protected AsyncClientHttpRequest createAsyncRequest(URI url, HttpMethod method)
-			throws IOException {
+	protected AsyncClientHttpRequest createAsyncRequest(URI url, HttpMethod method) throws IOException {
 		AsyncClientHttpRequest request = getAsyncRequestFactory().createAsyncRequest(url, method);
 		if (logger.isDebugEnabled()) {
 			logger.debug("Created asynchronous " + method.name() + " request for \"" + url + "\"");

spring-web/src/main/java/org/springframework/web/context/support/LiveBeansViewServlet.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -39,6 +39,7 @@ public class LiveBeansViewServlet extends HttpServlet {
 
 	private LiveBeansView liveBeansView;
 
+
 	@Override
 	public void init() throws ServletException {
 		this.liveBeansView = buildLiveBeansView();
@@ -49,7 +50,9 @@ public class LiveBeansViewServlet extends HttpServlet {
 	}
 
 	@Override
-	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+	protected void doGet(HttpServletRequest request, HttpServletResponse response)
+			throws ServletException, IOException {
+
 		String content = this.liveBeansView.getSnapshotAsJson();
 		response.setContentType("application/json");
 		response.setContentLength(content.length());

spring-web/src/main/java/org/springframework/web/context/support/ServletContextAttributeExporter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -65,16 +65,18 @@ public class ServletContextAttributeExporter implements ServletContextAware {
 
 	@Override
 	public void setServletContext(ServletContext servletContext) {
-		for (Map.Entry<String, Object> entry : attributes.entrySet()) {
-			String attributeName = entry.getKey();
-			if (logger.isWarnEnabled()) {
-				if (servletContext.getAttribute(attributeName) != null) {
-					logger.warn("Replacing existing ServletContext attribute with name '" + attributeName + "'");
+		if (this.attributes != null) {
+			for (Map.Entry<String, Object> entry : this.attributes.entrySet()) {
+				String attributeName = entry.getKey();
+				if (logger.isWarnEnabled()) {
+					if (servletContext.getAttribute(attributeName) != null) {
+						logger.warn("Replacing existing ServletContext attribute with name '" + attributeName + "'");
+					}
+				}
+				servletContext.setAttribute(attributeName, entry.getValue());
+				if (logger.isInfoEnabled()) {
+					logger.info("Exported ServletContext attribute with name '" + attributeName + "'");
 				}
-			}
-			servletContext.setAttribute(attributeName, entry.getValue());
-			if (logger.isInfoEnabled()) {
-				logger.info("Exported ServletContext attribute with name '" + attributeName + "'");
 			}
 		}
 	}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -85,19 +85,17 @@ public class SessionAttributesHandler {
 	 * session attributes through an {@link SessionAttributes} annotation.
 	 */
 	public boolean hasSessionAttributes() {
-		return (this.attributeNames.size() > 0 || this.attributeTypes.size() > 0);
+		return (!this.attributeNames.isEmpty() || !this.attributeTypes.isEmpty());
 	}
 
 	/**
 	 * Whether the attribute name or type match the names and types specified
 	 * via {@code @SessionAttributes} in underlying controller.
-	 *
 	 * <p>Attributes successfully resolved through this method are "remembered"
 	 * and subsequently used in {@link #retrieveAttributes(WebRequest)} and
 	 * {@link #cleanupAttributes(WebRequest)}.
-	 *
-	 * @param attributeName the attribute name to check, never {@code null}
-	 * @param attributeType the type for the attribute, possibly {@code null}
+	 * @param attributeName the attribute name to check
+	 * @param attributeType the type for the attribute
 	 */
 	public boolean isHandlerSessionAttribute(String attributeName, Class<?> attributeType) {
 		Assert.notNull(attributeName, "Attribute name must not be null");
@@ -120,7 +118,6 @@ public class SessionAttributesHandler {
 		for (String name : attributes.keySet()) {
 			Object value = attributes.get(name);
 			Class<?> attrType = (value != null) ? value.getClass() : null;
-
 			if (isHandlerSessionAttribute(name, attrType)) {
 				this.sessionAttributeStore.storeAttribute(request, name, value);
 			}