Merge branch '2.1.x'

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/repackage-name.apt.vm

@@ -6,7 +6,7 @@
  2019-03-29
  -----
 
-  If you need the repackage jar to have a different local name than the one defined by
+  If you need the repackaged jar to have a different local name than the one defined by
   the <<<artifactId>>> attribute of the project, simply use the standard <<<finalName>>>
   as shown in the following example:
 

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/handler/NoUnboundElementsBindHandler.java

@@ -116,10 +116,9 @@ public class NoUnboundElementsBindHandler extends AbstractBindHandler {
 	}
 
 	private boolean isOverriddenCollectionElement(ConfigurationPropertyName candidate) {
-		int length = candidate.getNumberOfElements();
-		if (candidate.isNumericIndex(length - 1)) {
-			ConfigurationPropertyName propertyName = candidate
-					.chop(candidate.getNumberOfElements() - 1);
+		int lastIndex = candidate.getNumberOfElements() - 1;
+		if (candidate.isNumericIndex(lastIndex)) {
+			ConfigurationPropertyName propertyName = candidate.chop(lastIndex);
 			return this.boundNames.contains(propertyName);
 		}
 		return false;