Merge branch '2.0.x'

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/export/properties/StepRegistryPropertiesConfigAdapterTests.java

@@ -25,6 +25,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
  * 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>> {