Merge branch '2.0.x'

wilkinsona · wilkinsona · commit cefc7842d612 · 2018-10-18T15:38:17.000+01:00
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/properties/StepRegistryPropertiesConfigAdapterTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/properties/StepRegistryPropertiesConfigAdapterTests.java
@@ -25,6 +25,8 @@
 /**
  * Base test for {@link StepRegistryPropertiesConfigAdapter} implementations.
  *
+ * @param <P> properties used by the tests
+ * @param <A> adapter used by the tests
  * @author Stephane Nicoll
  */
 public abstract class StepRegistryPropertiesConfigAdapterTests<P extends StepRegistryProperties, A extends StepRegistryPropertiesConfigAdapter<P>> {

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,8 @@`
`25`	`25`	`/**`
`26`	`26`	`* Base test for {@link StepRegistryPropertiesConfigAdapter} implementations.`
`27`	`27`	`*`
	`28`	`+ * @param <P> properties used by the tests`
	`29`	`+ * @param <A> adapter used by the tests`
`28`	`30`	`* @author Stephane Nicoll`
`29`	`31`	`*/`
`30`	`32`	`public abstract class StepRegistryPropertiesConfigAdapterTests<P extends StepRegistryProperties, A extends StepRegistryPropertiesConfigAdapter<P>> {`