Merge branch '2.0.x' into 2.1.x

wilkinsona · wilkinsona · commit 9d06d22b99db · 2019-03-07T10:17:01.000Z
diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/neo4j/Neo4jHealthIndicatorTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/neo4j/Neo4jHealthIndicatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2019 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.
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/AbstractGenericProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/AbstractGenericProperties.java
@@ -22,6 +22,9 @@
 /**
  * A base properties class with generics.
  *
+ * @param <A> name type
+ * @param <B> mapping key type
+ * @param <C> mapping value type
  * @author Stephane Nicoll
  */
 public class AbstractGenericProperties<A, B, C> {
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/AbstractIntermediateGenericProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/AbstractIntermediateGenericProperties.java
@@ -19,6 +19,7 @@
 /**
  * An intermediate layer that resolves some of the generics from the parent but not all.
  *
+ * @param <C> mapping value type
  * @author Stephane Nicoll
  */
 public abstract class AbstractIntermediateGenericProperties<C>
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/UnresolvedGenericProperties.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/UnresolvedGenericProperties.java
@@ -21,6 +21,8 @@
 /**
  * Properties with unresolved generic information.
  *
+ * @param <B> mapping key type
+ * @param <C> mapping value type
  * @author Stephane Nicoll
  */
 @ConfigurationProperties("generic")

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2012-2017 the original author or authors.`
	`2`	`+ * Copyright 2012-2019 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`/**`
`20`	`20`	`* An intermediate layer that resolves some of the generics from the parent but not all.`
`21`	`21`	`*`
	`22`	`+ * @param <C> mapping value type`
`22`	`23`	`* @author Stephane Nicoll`
`23`	`24`	`*/`
`24`	`25`	`public abstract class AbstractIntermediateGenericProperties<C>`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@`
`21`	`21`	`/**`
`22`	`22`	`* Properties with unresolved generic information.`
`23`	`23`	`*`
	`24`	`+ * @param <B> mapping key type`
	`25`	`+ * @param <C> mapping value type`
`24`	`26`	`* @author Stephane Nicoll`
`25`	`27`	`*/`
`26`	`28`	`@ConfigurationProperties("generic")`