Polishing

Author: jhoeller

spring-test/src/main/java/org/springframework/test/context/support/AbstractDelegatingSmartContextLoader.java

@@ -16,9 +16,6 @@
 
 package org.springframework.test.context.support;
 
-import java.util.Arrays;
-import java.util.List;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -87,33 +84,36 @@ public abstract class AbstractDelegatingSmartContextLoader implements SmartConte
 	protected abstract SmartContextLoader getAnnotationConfigLoader();
 
 
-	// SmartContextLoader
+	// ContextLoader
 
-	private static void delegateProcessing(SmartContextLoader loader, ContextConfigurationAttributes configAttributes) {
-		if (logger.isDebugEnabled()) {
-			logger.debug(String.format("Delegating to %s to process context configuration %s.",
-					name(loader), configAttributes));
-		}
-		loader.processContextConfiguration(configAttributes);
+	/**
+	 * {@code AbstractDelegatingSmartContextLoader} does not support the
+	 * {@link ContextLoader#processLocations(Class, String...)} method. Call
+	 * {@link #processContextConfiguration(ContextConfigurationAttributes)} instead.
+	 * @throws UnsupportedOperationException in this implementation
+	 */
+	@Override
+	public final String[] processLocations(Class<?> clazz, String... locations) {
+		throw new UnsupportedOperationException(
+				"DelegatingSmartContextLoaders do not support the ContextLoader SPI. " +
+						"Call processContextConfiguration(ContextConfigurationAttributes) instead.");
 	}
 
-	private static ApplicationContext delegateLoading(SmartContextLoader loader, MergedContextConfiguration mergedConfig)
-			throws Exception {
-
-		if (logger.isDebugEnabled()) {
-			logger.debug(String.format("Delegating to %s to load context from %s.", name(loader), mergedConfig));
-		}
-		return loader.loadContext(mergedConfig);
+	/**
+	 * {@code AbstractDelegatingSmartContextLoader} does not support the
+	 * {@link ContextLoader#loadContext(String...) } method. Call
+	 * {@link #loadContext(MergedContextConfiguration)} instead.
+	 * @throws UnsupportedOperationException in this implementation
+	 */
+	@Override
+	public final ApplicationContext loadContext(String... locations) throws Exception {
+		throw new UnsupportedOperationException(
+				"DelegatingSmartContextLoaders do not support the ContextLoader SPI. " +
+						"Call loadContext(MergedContextConfiguration) instead.");
 	}
 
-	private boolean supports(SmartContextLoader loader, MergedContextConfiguration mergedConfig) {
-		if (loader == getAnnotationConfigLoader()) {
-			return (mergedConfig.hasClasses() && !mergedConfig.hasLocations());
-		}
-		else {
-			return (mergedConfig.hasLocations() && !mergedConfig.hasClasses());
-		}
-	}
+
+	// SmartContextLoader
 
 	/**
 	 * Delegates to candidate {@code SmartContextLoaders} to process the supplied
@@ -232,8 +232,7 @@ else if (configAttributes.hasClasses()) {
 	 */
 	@Override
 	public ApplicationContext loadContext(MergedContextConfiguration mergedConfig) throws Exception {
-		Assert.notNull(mergedConfig, "mergedConfig must not be null");
-		List<SmartContextLoader> candidates = Arrays.asList(getXmlLoader(), getAnnotationConfigLoader());
+		Assert.notNull(mergedConfig, "MergedContextConfiguration must not be null");
 
 		if (mergedConfig.hasLocations() && mergedConfig.hasClasses()) {
 			throw new IllegalStateException(String.format(
@@ -242,6 +241,7 @@ public ApplicationContext loadContext(MergedContextConfiguration mergedConfig) t
 					name(getAnnotationConfigLoader()), mergedConfig));
 		}
 
+		SmartContextLoader[] candidates = {getXmlLoader(), getAnnotationConfigLoader()};
 		for (SmartContextLoader loader : candidates) {
 			// Determine if each loader can load a context from the mergedConfig. If it
 			// can, let it; otherwise, keep iterating.
@@ -259,41 +259,39 @@ public ApplicationContext loadContext(MergedContextConfiguration mergedConfig) t
 
 		// else...
 		throw new IllegalStateException(String.format(
-				"Neither %s nor %s was able to load an ApplicationContext from %s.", name(getXmlLoader()),
-				name(getAnnotationConfigLoader()), mergedConfig));
+				"Neither %s nor %s was able to load an ApplicationContext from %s.",
+				name(getXmlLoader()), name(getAnnotationConfigLoader()), mergedConfig));
 	}
 
-	private static String name(SmartContextLoader loader) {
-		return loader.getClass().getSimpleName();
+
+	private static void delegateProcessing(SmartContextLoader loader, ContextConfigurationAttributes configAttributes) {
+		if (logger.isDebugEnabled()) {
+			logger.debug(String.format("Delegating to %s to process context configuration %s.",
+					name(loader), configAttributes));
+		}
+		loader.processContextConfiguration(configAttributes);
 	}
 
+	private static ApplicationContext delegateLoading(SmartContextLoader loader, MergedContextConfiguration mergedConfig)
+			throws Exception {
 
-	// ContextLoader
+		if (logger.isDebugEnabled()) {
+			logger.debug(String.format("Delegating to %s to load context from %s.", name(loader), mergedConfig));
+		}
+		return loader.loadContext(mergedConfig);
+	}
 
-	/**
-	 * {@code AbstractDelegatingSmartContextLoader} does not support the
-	 * {@link ContextLoader#processLocations(Class, String...)} method. Call
-	 * {@link #processContextConfiguration(ContextConfigurationAttributes)} instead.
-	 * @throws UnsupportedOperationException in this implementation
-	 */
-	@Override
-	public final String[] processLocations(Class<?> clazz, String... locations) {
-		throw new UnsupportedOperationException(
-				"DelegatingSmartContextLoaders do not support the ContextLoader SPI. " +
-				"Call processContextConfiguration(ContextConfigurationAttributes) instead.");
+	private boolean supports(SmartContextLoader loader, MergedContextConfiguration mergedConfig) {
+		if (loader == getAnnotationConfigLoader()) {
+			return (mergedConfig.hasClasses() && !mergedConfig.hasLocations());
+		}
+		else {
+			return (mergedConfig.hasLocations() && !mergedConfig.hasClasses());
+		}
 	}
 
-	/**
-	 * {@code AbstractDelegatingSmartContextLoader} does not support the
-	 * {@link ContextLoader#loadContext(String...) } method. Call
-	 * {@link #loadContext(MergedContextConfiguration)} instead.
-	 * @throws UnsupportedOperationException
-	 */
-	@Override
-	public final ApplicationContext loadContext(String... locations) throws Exception {
-		throw new UnsupportedOperationException(
-				"DelegatingSmartContextLoaders do not support the ContextLoader SPI. " +
-				"Call loadContext(MergedContextConfiguration) instead.");
+	private static String name(SmartContextLoader loader) {
+		return loader.getClass().getSimpleName();
 	}
 
 }

spring-web/src/main/java/org/springframework/web/method/annotation/InitBinderDataBinderFactory.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.
@@ -16,11 +16,10 @@
 
 package org.springframework.web.method.annotation;
 
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.InitBinder;
 import org.springframework.web.bind.support.DefaultDataBinderFactory;
@@ -53,32 +52,33 @@ public InitBinderDataBinderFactory(List<InvocableHandlerMethod> binderMethods, W
 
 	/**
 	 * Initialize a WebDataBinder with {@code @InitBinder} methods.
-	 * If the {@code @InitBinder} annotation specifies attributes names, it is
-	 * invoked only if the names include the target object name.
-	 * @throws Exception if one of the invoked @{@link InitBinder} methods fail.
+	 * <p>If the {@code @InitBinder} annotation specifies attributes names,
+	 * it is invoked only if the names include the target object name.
+	 * @throws Exception if one of the invoked @{@link InitBinder} methods fails
+	 * @see #isBinderMethodApplicable
 	 */
 	@Override
-	public void initBinder(WebDataBinder binder, NativeWebRequest request) throws Exception {
+	public void initBinder(WebDataBinder dataBinder, NativeWebRequest request) throws Exception {
 		for (InvocableHandlerMethod binderMethod : this.binderMethods) {
-			if (isBinderMethodApplicable(binderMethod, binder)) {
-				Object returnValue = binderMethod.invokeForRequest(request, null, binder);
+			if (isBinderMethodApplicable(binderMethod, dataBinder)) {
+				Object returnValue = binderMethod.invokeForRequest(request, null, dataBinder);
 				if (returnValue != null) {
 					throw new IllegalStateException(
-							"@InitBinder methods should return void: " + binderMethod);
+							"@InitBinder methods must not return a value (should be void): " + binderMethod);
 				}
 			}
 		}
 	}
 
 	/**
-	 * Whether the given {@code @InitBinder} method should be used to initialize
-	 * the given WebDataBinder instance. By default we check the attributes
-	 * names of the annotation, if present.
+	 * Determine whether the given {@code @InitBinder} method should be used
+	 * to initialize the given {@link WebDataBinder} instance. By default we
+	 * check the specified attribute names in the annotation value, if any.
 	 */
-	protected boolean isBinderMethodApplicable(HandlerMethod initBinderMethod, WebDataBinder binder) {
+	protected boolean isBinderMethodApplicable(HandlerMethod initBinderMethod, WebDataBinder dataBinder) {
 		InitBinder ann = initBinderMethod.getMethodAnnotation(InitBinder.class);
-		Collection<String> names = Arrays.asList(ann.value());
-		return (names.isEmpty() || names.contains(binder.getObjectName()));
+		String[] names = ann.value();
+		return (ObjectUtils.isEmpty(names) || ObjectUtils.containsElement(names, dataBinder.getObjectName()));
 	}
 
 }