Polishing

Author: jhoeller

spring-context/src/main/java/org/springframework/cache/interceptor/CacheProxyFactoryBean.java

@@ -54,7 +54,7 @@ public class CacheProxyFactoryBean extends AbstractSingletonProxyFactoryBean
 
 
 	/**
-	 * Set the sources used to find cache operations.
+	 * Set one or more sources to find cache operations.
 	 * @see CacheInterceptor#setCacheOperationSources
 	 */
 	public void setCacheOperationSources(CacheOperationSource... cacheOperationSources) {
@@ -95,9 +95,9 @@ public void setCacheManager(CacheManager cacheManager) {
 	}
 
 	/**
-	 * Set a pointcut, i.e a bean that can cause conditional invocation
-	 * of the CacheInterceptor depending on method and attributes passed.
-	 * Note: Additional interceptors are always invoked.
+	 * Set a pointcut, i.e. a bean that triggers conditional invocation of the
+	 * {@link CacheInterceptor} depending on the method and attributes passed.
+	 * <p>Note: Additional interceptors are always invoked.
 	 * @see #setPreInterceptors
 	 * @see #setPostInterceptors
 	 */

spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java

@@ -85,7 +85,8 @@
  * @see ResourceBundleMessageSource
  * @see java.util.ResourceBundle
  */
-public class ReloadableResourceBundleMessageSource extends AbstractResourceBasedMessageSource implements ResourceLoaderAware {
+public class ReloadableResourceBundleMessageSource extends AbstractResourceBasedMessageSource
+		implements ResourceLoaderAware {
 
 	private static final String PROPERTIES_SUFFIX = ".properties";
 
@@ -101,13 +102,13 @@ public class ReloadableResourceBundleMessageSource extends AbstractResourceBased
 
 	private ResourceLoader resourceLoader = new DefaultResourceLoader();
 
-	/** Cache to hold filename lists per Locale */
+	// Cache to hold filename lists per Locale
 	private final ConcurrentMap<String, Map<Locale, List<String>>> cachedFilenames = new ConcurrentHashMap<>();
 
-	/** Cache to hold already loaded properties per filename */
+	// Cache to hold already loaded properties per filename
 	private final ConcurrentMap<String, PropertiesHolder> cachedProperties = new ConcurrentHashMap<>();
 
-	/** Cache to hold merged loaded properties per locale */
+	// Cache to hold already loaded properties per filename
 	private final ConcurrentMap<Locale, PropertiesHolder> cachedMergedProperties = new ConcurrentHashMap<>();
 
 

spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java

@@ -741,7 +741,7 @@ public static class GenericBroadcasterImpl implements Broadcaster {
 	}
 
 
-	@SuppressWarnings({ "unused", "unchecked" })
+	@SuppressWarnings({"unused", "unchecked"})
 	public static abstract class GenericEventBroadcasterImpl<T extends Event>
 			extends GenericBroadcasterImpl implements EventBroadcaster {
 

spring-expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java

@@ -72,9 +72,8 @@ public TypedValue getValueInternal(ExpressionState state) throws EvaluationExcep
 		if (value == TypedValue.NULL) {
 			throw new SpelEvaluationException(getStartPosition(), SpelMessage.FUNCTION_NOT_DEFINED, this.name);
 		}
-
-		// Two possibilities: a lambda function or a Java static method registered as a function
 		if (!(value.getValue() instanceof Method)) {
+			// Two possibilities: a lambda function or a Java static method registered as a function
 			throw new SpelEvaluationException(
 					SpelMessage.FUNCTION_REFERENCE_CANNOT_BE_INVOKED, this.name, value.getClass());
 		}
@@ -98,11 +97,13 @@ public TypedValue getValueInternal(ExpressionState state) throws EvaluationExcep
 	private TypedValue executeFunctionJLRMethod(ExpressionState state, Method method) throws EvaluationException {
 		Object[] functionArgs = getArguments(state);
 
-		if (!method.isVarArgs() && method.getParameterCount() != functionArgs.length) {
-			throw new SpelEvaluationException(SpelMessage.INCORRECT_NUMBER_OF_ARGUMENTS_TO_FUNCTION,
-					functionArgs.length, method.getParameterCount());
+		if (!method.isVarArgs()) {
+			int declaredParamCount = method.getParameterCount();
+			if (declaredParamCount != functionArgs.length) {
+				throw new SpelEvaluationException(SpelMessage.INCORRECT_NUMBER_OF_ARGUMENTS_TO_FUNCTION,
+						functionArgs.length, declaredParamCount);
+			}
 		}
-		// Only static methods can be called in this way
 		if (!Modifier.isStatic(method.getModifiers())) {
 			throw new SpelEvaluationException(getStartPosition(),
 					SpelMessage.FUNCTION_MUST_BE_STATIC, ClassUtils.getQualifiedMethodName(method), this.name);

spring-jdbc/src/main/java/org/springframework/jdbc/core/SqlParameter.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.
@@ -36,18 +36,18 @@
  */
 public class SqlParameter {
 
-	/** The name of the parameter, if any */
+	// The name of the parameter, if any
 	@Nullable
 	private String name;
 
-	/** SQL type constant from {@code java.sql.Types} */
+	// SQL type constant from {@code java.sql.Types}
 	private final int sqlType;
 
-	/** Used for types that are user-named like: STRUCT, DISTINCT, JAVA_OBJECT, named array types */
+	// Used for types that are user-named like: STRUCT, DISTINCT, JAVA_OBJECT, named array types
 	@Nullable
 	private String typeName;
 
-	/** The scale to apply in case of a NUMERIC or DECIMAL type, if any */
+	// The scale to apply in case of a NUMERIC or DECIMAL type, if any
 	@Nullable
 	private Integer scale;
 

spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java

@@ -53,47 +53,47 @@
  */
 public class CallMetaDataContext {
 
-	/** Logger available to subclasses */
+	// Logger available to subclasses
 	protected final Log logger = LogFactory.getLog(getClass());
 
-	/** Name of procedure to call **/
+	// Name of procedure to call
 	@Nullable
 	private String procedureName;
 
-	/** Name of catalog for call **/
+	// Name of catalog for call
 	@Nullable
 	private String catalogName;
 
-	/** Name of schema for call **/
+	// Name of schema for call
 	@Nullable
 	private String schemaName;
 
-	/** List of SqlParameter objects to be used in call execution */
+	// List of SqlParameter objects to be used in call execution
 	private List<SqlParameter> callParameters = new ArrayList<>();
 
-	/** Actual name to use for the return value in the output map */
+	// Actual name to use for the return value in the output map
 	@Nullable
 	private String actualFunctionReturnName;
 
-	/** Set of in parameter names to exclude use for any not listed */
+	// Set of in parameter names to exclude use for any not listed
 	private Set<String> limitedInParameterNames = new HashSet<>();
 
-	/** List of SqlParameter names for out parameters */
+	// List of SqlParameter names for out parameters
 	private List<String> outParameterNames = new ArrayList<>();
 
-	/** Indicates whether this is a procedure or a function **/
+	// Indicates whether this is a procedure or a function
 	private boolean function = false;
 
-	/** Indicates whether this procedure's return value should be included  **/
+	// Indicates whether this procedure's return value should be included
 	private boolean returnValueRequired = false;
 
-	/** Should we access call parameter meta data info or not */
+	// Should we access call parameter meta data info or not
 	private boolean accessCallParameterMetaData = true;
 
-	/** Should we bind parameter by name **/
+	// Should we bind parameter by name
 	private boolean namedBinding;
 
-	/** The provider of call meta data */
+	// The provider of call meta data
 	@Nullable
 	private CallMetaDataProvider metaDataProvider;
 

spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java

@@ -45,35 +45,35 @@
  */
 public class TableMetaDataContext {
 
-	/** Logger available to subclasses */
+	// Logger available to subclasses
 	protected final Log logger = LogFactory.getLog(getClass());
 
-	/** Name of table for this context */
+	// Name of table for this context
 	@Nullable
 	private String tableName;
 
-	/** Name of catalog for this context */
+	// Name of catalog for this context
 	@Nullable
 	private String catalogName;
 
-	/** Name of schema for this context */
+	// Name of schema for this context
 	@Nullable
 	private String schemaName;
 
-	/** List of columns objects to be used in this context */
+	// List of columns objects to be used in this context
 	private List<String> tableColumns = new ArrayList<>();
 
-	/** should we access insert parameter meta data info or not */
+	// Should we access insert parameter meta data info or not
 	private boolean accessTableColumnMetaData = true;
 
-	/** should we override default for including synonyms for meta data lookups */
+	// Should we override default for including synonyms for meta data lookups
 	private boolean overrideIncludeSynonymsDefault = false;
 
-	/** the provider of table meta data */
+	// The provider of table meta data
 	@Nullable
 	private TableMetaDataProvider metaDataProvider;
 
-	/** are we using generated key columns */
+	// Are we using generated key columns
 	private boolean generatedKeyColumnsUsed = false;
 
 

spring-jms/src/main/java/org/springframework/jms/config/MethodJmsListenerEndpoint.java

@@ -105,13 +105,14 @@ public Method getMostSpecificMethod() {
 			return this.mostSpecificMethod;
 		}
 		Method method = getMethod();
-		if (method != null && AopUtils.isAopProxy(this.bean)) {
-			Class<?> targetClass = AopProxyUtils.ultimateTargetClass(this.bean);
-			return AopUtils.getMostSpecificMethod(method, targetClass);
-		}
-		else {
-			return method;
+		if (method != null) {
+			Object bean = getBean();
+			if (AopUtils.isAopProxy(bean)) {
+				Class<?> targetClass = AopProxyUtils.ultimateTargetClass(bean);
+				method = AopUtils.getMostSpecificMethod(method, targetClass);
+			}
 		}
+		return method;
 	}
 
 	/**

spring-web/src/main/java/org/springframework/web/util/HierarchicalUriComponents.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.
@@ -702,7 +702,7 @@ public String getPath() {
 
 		@Override
 		public List<String> getPathSegments() {
-			String[] segments = StringUtils.tokenizeToStringArray(this.path, PATH_DELIMITER_STRING);
+			String[] segments = StringUtils.tokenizeToStringArray(getPath(), PATH_DELIMITER_STRING);
 			return Collections.unmodifiableList(Arrays.asList(segments));
 		}
 
@@ -714,7 +714,7 @@ public PathComponent encode(Charset charset) {
 
 		@Override
 		public void verify() {
-			verifyUriComponent(this.path, Type.PATH);
+			verifyUriComponent(getPath(), Type.PATH);
 		}
 
 		@Override