build.gradle

@@ -40,7 +40,7 @@ configure(allprojects) { project ->
 	ext.ejbVersion           = "3.0"
 	ext.fileuploadVersion    = "1.3.3"
 	ext.freemarkerVersion    = "2.3.23"
-	ext.groovyVersion        = "2.4.12"
+	ext.groovyVersion        = "2.4.13"
 	ext.gsonVersion          = "2.8.2"
 	ext.guavaVersion         = "20.0"
 	ext.hamcrestVersion      = "1.3"
@@ -62,7 +62,7 @@ configure(allprojects) { project ->
 	ext.jtaVersion           = "1.2"
 	ext.junitVersion         = "4.12"
 	ext.log4jVersion         = "1.2.17"
-	ext.nettyVersion         = "4.1.16.Final"
+	ext.nettyVersion         = "4.1.17.Final"
 	ext.okhttpVersion        = "2.7.5"
 	ext.okhttp3Version       = "3.8.1"
 	ext.openjpaVersion       = "2.4.2"
@@ -77,7 +77,7 @@ configure(allprojects) { project ->
 	ext.tiles3Version        = "3.0.7"
 	ext.tomcatVersion        = "8.5.23"
 	ext.tyrusVersion         = "1.3.5"  // constrained by WebLogic 12.1.3 support
-	ext.undertowVersion      = "1.3.31.Final"
+	ext.undertowVersion      = "1.3.33.Final"
 	ext.xmlunitVersion       = "1.6"
 	ext.xstreamVersion       = "1.4.9"
 

gradle.properties

@@ -1 +1 @@
-version=4.3.12.BUILD-SNAPSHOT
+version=4.3.13.RELEASE

spring-beans/src/main/java/org/springframework/beans/factory/annotation/Autowired.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.
@@ -23,29 +23,33 @@
 import java.lang.annotation.Target;
 
 /**
- * Marks a constructor, field, setter method or config method as to be
- * autowired by Spring's dependency injection facilities.
+ * Marks a constructor, field, setter method or config method as to be autowired
+ * by Spring's dependency injection facilities.
  *
- * <p>Only one constructor (at max) of any given bean class may carry this
- * annotation, indicating the constructor to autowire when used as a Spring
- * bean. Such a constructor does not have to be public.
+ * <p>Only one constructor (at max) of any given bean class may carry this annotation,
+ * indicating the constructor to autowire when used as a Spring bean. Such a
+ * constructor does not have to be public.
  *
- * <p>Fields are injected right after construction of a bean, before any
- * config methods are invoked. Such a config field does not have to be public.
+ * <p>Fields are injected right after construction of a bean, before any config
+ * methods are invoked. Such a config field does not have to be public.
  *
- * <p>Config methods may have an arbitrary name and any number of arguments;
- * each of those arguments will be autowired with a matching bean in the
- * Spring container. Bean property setter methods are effectively just
- * a special case of such a general config method. Such config methods
- * do not have to be public.
+ * <p>Config methods may have an arbitrary name and any number of arguments; each of
+ * those arguments will be autowired with a matching bean in the Spring container.
+ * Bean property setter methods are effectively just a special case of such a general
+ * config method. Such config methods do not have to be public.
  *
- * <p>In the case of multiple argument methods, the 'required' parameter is
- * applicable for all arguments.
+ * <p>In the case of a multi-arg constructor or method, the 'required' parameter is
+ * applicable to all arguments. Individual parameters may be declared as Java-8-style
+ * {@link java.util.Optional}, overriding the base required semantics.
  *
- * <p>In case of a {@link java.util.Collection} or {@link java.util.Map}
- * dependency type, the container will autowire all beans matching the
- * declared value type. In case of a Map, the keys must be declared as
- * type String and will be resolved to the corresponding bean names.
+ * <p>In case of a {@link java.util.Collection} or {@link java.util.Map} dependency type,
+ * the container autowires all beans matching the declared value type. For such purposes,
+ * the map keys must be declared as type String which will be resolved to the corresponding
+ * bean names. Such a container-provided collection will be ordered, taking into account
+ * {@link org.springframework.core.Ordered}/{@link org.springframework.core.annotation.Order}
+ * values of the target components, otherwise following their registration order in the
+ * container. Alternatively, a single matching target bean may also be a generally typed
+ * {@code Collection} or {@code Map} itself, getting injected as such.
  *
  * <p>Note that actual injection is performed through a
  * {@link org.springframework.beans.factory.config.BeanPostProcessor

spring-beans/src/test/java/org/springframework/beans/factory/config/MethodInvokingFactoryBeanTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 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.
@@ -140,15 +140,15 @@ public void testGetObjectType() throws Exception {
 		mcfb.setTargetMethod("voidRetvalMethod");
 		mcfb.afterPropertiesSet();
 		Class<?> objType = mcfb.getObjectType();
-		assertTrue(objType.equals(void.class));
+		assertSame(objType, void.class);
 
 		// verify that we can call a method with args that are subtypes of the
 		// target method arg types
 		TestClass1._staticField1 = 0;
 		mcfb = new MethodInvokingFactoryBean();
 		mcfb.setTargetClass(TestClass1.class);
 		mcfb.setTargetMethod("supertypes");
-		mcfb.setArguments(new Object[] {new ArrayList<Object>(), new ArrayList<Object>(), "hello"});
+		mcfb.setArguments(new ArrayList<>(), new ArrayList<Object>(), "hello");
 		mcfb.afterPropertiesSet();
 		mcfb.getObjectType();
 
@@ -157,7 +157,7 @@ public void testGetObjectType() throws Exception {
 		mcfb.registerCustomEditor(String.class, new StringTrimmerEditor(false));
 		mcfb.setTargetClass(TestClass1.class);
 		mcfb.setTargetMethod("supertypes");
-		mcfb.setArguments(new Object[] {"1", new Object()});
+		mcfb.setArguments("1", new Object());
 		try {
 			mcfb.afterPropertiesSet();
 			fail("Should have thrown NoSuchMethodException");
@@ -225,7 +225,7 @@ public void testGetObject() throws Exception {
 		mcfb = new MethodInvokingFactoryBean();
 		mcfb.setTargetClass(TestClass1.class);
 		mcfb.setTargetMethod("supertypes");
-		mcfb.setArguments(new Object[] {new ArrayList<Object>(), new ArrayList<Object>(), "hello"});
+		mcfb.setArguments(new ArrayList<>(), new ArrayList<Object>(), "hello");
 		// should pass
 		mcfb.afterPropertiesSet();
 	}
@@ -235,7 +235,7 @@ public void testArgumentConversion() throws Exception {
 		MethodInvokingFactoryBean mcfb = new MethodInvokingFactoryBean();
 		mcfb.setTargetClass(TestClass1.class);
 		mcfb.setTargetMethod("supertypes");
-		mcfb.setArguments(new Object[] {new ArrayList<Object>(), new ArrayList<Object>(), "hello", "bogus"});
+		mcfb.setArguments(new ArrayList<>(), new ArrayList<Object>(), "hello", "bogus");
 		try {
 			mcfb.afterPropertiesSet();
 			fail("Matched method with wrong number of args");
@@ -247,7 +247,7 @@ public void testArgumentConversion() throws Exception {
 		mcfb = new MethodInvokingFactoryBean();
 		mcfb.setTargetClass(TestClass1.class);
 		mcfb.setTargetMethod("supertypes");
-		mcfb.setArguments(new Object[] {1, new Object()});
+		mcfb.setArguments(1, new Object());
 		try {
 			mcfb.afterPropertiesSet();
 			mcfb.getObject();
@@ -260,14 +260,14 @@ public void testArgumentConversion() throws Exception {
 		mcfb = new MethodInvokingFactoryBean();
 		mcfb.setTargetClass(TestClass1.class);
 		mcfb.setTargetMethod("supertypes2");
-		mcfb.setArguments(new Object[] {new ArrayList<Object>(), new ArrayList<Object>(), "hello", "bogus"});
+		mcfb.setArguments(new ArrayList<>(), new ArrayList<Object>(), "hello", "bogus");
 		mcfb.afterPropertiesSet();
 		assertEquals("hello", mcfb.getObject());
 
 		mcfb = new MethodInvokingFactoryBean();
 		mcfb.setTargetClass(TestClass1.class);
 		mcfb.setTargetMethod("supertypes2");
-		mcfb.setArguments(new Object[] {new ArrayList<Object>(), new ArrayList<Object>(), new Object()});
+		mcfb.setArguments(new ArrayList<>(), new ArrayList<Object>(), new Object());
 		try {
 			mcfb.afterPropertiesSet();
 			fail("Matched method when shouldn't have matched");
@@ -292,14 +292,14 @@ public void testInvokeWithIntArgument() throws Exception {
 		ArgumentConvertingMethodInvoker methodInvoker = new ArgumentConvertingMethodInvoker();
 		methodInvoker.setTargetClass(TestClass1.class);
 		methodInvoker.setTargetMethod("intArgument");
-		methodInvoker.setArguments(new Object[] {5});
+		methodInvoker.setArguments(5);
 		methodInvoker.prepare();
 		methodInvoker.invoke();
 
 		methodInvoker = new ArgumentConvertingMethodInvoker();
 		methodInvoker.setTargetClass(TestClass1.class);
 		methodInvoker.setTargetMethod("intArgument");
-		methodInvoker.setArguments(new Object[] {"5"});
+		methodInvoker.setArguments(5);
 		methodInvoker.prepare();
 		methodInvoker.invoke();
 	}
@@ -309,37 +309,37 @@ public void testInvokeWithIntArguments() throws Exception {
 		MethodInvokingBean methodInvoker = new MethodInvokingBean();
 		methodInvoker.setTargetClass(TestClass1.class);
 		methodInvoker.setTargetMethod("intArguments");
-		methodInvoker.setArguments(new Object[]{new Integer[] {5, 10}});
+		methodInvoker.setArguments(new Object[] {new Integer[] {5, 10}});
 		methodInvoker.afterPropertiesSet();
 
 		methodInvoker = new MethodInvokingBean();
 		methodInvoker.setTargetClass(TestClass1.class);
 		methodInvoker.setTargetMethod("intArguments");
-		methodInvoker.setArguments(new Object[]{new String[]{"5", "10"}});
+		methodInvoker.setArguments(new Object[] {new String[] {"5", "10"}});
 		methodInvoker.afterPropertiesSet();
 
 		methodInvoker = new MethodInvokingBean();
 		methodInvoker.setTargetClass(TestClass1.class);
 		methodInvoker.setTargetMethod("intArguments");
-		methodInvoker.setArguments(new Object[]{new Integer[] {5, 10}});
+		methodInvoker.setArguments(new Object[] {new Integer[] {5, 10}});
 		methodInvoker.afterPropertiesSet();
 
 		methodInvoker = new MethodInvokingBean();
 		methodInvoker.setTargetClass(TestClass1.class);
 		methodInvoker.setTargetMethod("intArguments");
-		methodInvoker.setArguments(new String[]{"5", "10"});
+		methodInvoker.setArguments("5", "10");
 		methodInvoker.afterPropertiesSet();
 
 		methodInvoker = new MethodInvokingBean();
 		methodInvoker.setTargetClass(TestClass1.class);
 		methodInvoker.setTargetMethod("intArguments");
-		methodInvoker.setArguments(new Object[]{new Integer[] {5, 10}});
+		methodInvoker.setArguments(new Object[] {new Integer[] {5, 10}});
 		methodInvoker.afterPropertiesSet();
 
 		methodInvoker = new MethodInvokingBean();
 		methodInvoker.setTargetClass(TestClass1.class);
 		methodInvoker.setTargetMethod("intArguments");
-		methodInvoker.setArguments(new Object[]{"5", "10"});
+		methodInvoker.setArguments("5", "10");
 		methodInvoker.afterPropertiesSet();
 	}
 

spring-context-support/src/main/java/org/springframework/mail/SimpleMailMessage.java

@@ -24,7 +24,8 @@
 import org.springframework.util.StringUtils;
 
 /**
- * Models a simple mail message, including data such as the from, to, cc, subject, and text fields.
+ * Models a simple mail message, including data such as the from, to, cc, subject,
+ * and text fields.
  *
  * <p>Consider {@code JavaMailSender} and JavaMail {@code MimeMessages} for creating
  * more sophisticated messages, for example messages with attachments, special
@@ -179,10 +180,9 @@ public String getText() {
 	/**
 	 * Copy the contents of this message to the given target message.
 	 * @param target the {@code MailMessage} to copy to
-	 * @throws IllegalArgumentException if the supplied {@code target} is {@code null}
 	 */
 	public void copyTo(MailMessage target) {
-		Assert.notNull(target, "The 'target' message argument cannot be null");
+		Assert.notNull(target, "'target' message argument must not be null");
 		if (getFrom() != null) {
 			target.setFrom(getFrom());
 		}

spring-context/src/main/java/org/springframework/cache/annotation/EnableCaching.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.
@@ -148,15 +148,19 @@
  * can be useful if you do not need to customize everything. See {@link CachingConfigurer}
  * Javadoc for further details.
  *
- * <p>The {@link #mode()} attribute controls how advice is applied; if the mode is
- * {@link AdviceMode#PROXY} (the default), then the other attributes such as
- * {@link #proxyTargetClass()} control the behavior of the proxying.
+ * <p>The {@link #mode} attribute controls how advice is applied: If the mode is
+ * {@link AdviceMode#PROXY} (the default), then the other attributes control the behavior
+ * of the proxying. Please note that proxy mode allows for interception of calls through
+ * the proxy only; local calls within the same class cannot get intercepted that way.
  *
- * <p>If the {@linkplain #mode} is set to {@link AdviceMode#ASPECTJ}, then the
- * {@link #proxyTargetClass()} attribute is obsolete. Note also that in this case the
- * {@code spring-aspects} module JAR must be present on the classpath.
+ * <p>Note that if the {@linkplain #mode} is set to {@link AdviceMode#ASPECTJ}, then the
+ * value of the {@link #proxyTargetClass} attribute will be ignored. Note also that in
+ * this case the {@code spring-aspects} module JAR must be present on the classpath, with
+ * compile-time weaving or load-time weaving applying the aspect to the affected classes.
+ * There is no proxy involved in such a scenario; local calls will be intercepted as well.
  *
  * @author Chris Beams
+ * @author Juergen Hoeller
  * @since 3.1
  * @see CachingConfigurer
  * @see CachingConfigurationSelector
@@ -183,16 +187,21 @@
 	boolean proxyTargetClass() default false;
 
 	/**
-	 * Indicate how caching advice should be applied. The default is
-	 * {@link AdviceMode#PROXY}.
-	 * @see AdviceMode
+	 * Indicate how caching advice should be applied.
+	 * <p><b>The default is {@link AdviceMode#PROXY}.</b>
+	 * Please note that proxy mode allows for interception of calls through the proxy
+	 * only. Local calls within the same class cannot get intercepted that way;
+	 * a caching annotation on such a method within a local call will be ignored
+	 * since Spring's interceptor does not even kick in for such a runtime scenario.
+	 * For a more advanced mode of interception, consider switching this to
+	 * {@link AdviceMode#ASPECTJ}.
 	 */
 	AdviceMode mode() default AdviceMode.PROXY;
 
 	/**
 	 * Indicate the ordering of the execution of the caching advisor
 	 * when multiple advices are applied at a specific joinpoint.
-	 * The default is {@link Ordered#LOWEST_PRECEDENCE}.
+	 * <p>The default is {@link Ordered#LOWEST_PRECEDENCE}.
 	 */
 	int order() default Ordered.LOWEST_PRECEDENCE;