Merge branch '2.1.x' into 2.2.x

Closes gh-21082

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundrySecurityServiceTests.java

@@ -204,8 +204,6 @@ class ReactiveCloudFoundrySecurityServiceTests {
 		});
 		StepVerifier.create(this.securityService.getUaaUrl())
 				.consumeNextWith((uaaUrl) -> assertThat(uaaUrl).isEqualTo(UAA_URL)).expectComplete().verify();
-		// this.securityService.getUaaUrl().block(); //FIXME subscribe again to check that
-		// it isn't called again
 		expectRequest((request) -> assertThat(request.getPath()).isEqualTo(CLOUD_CONTROLLER + "/info"));
 		expectRequestCount(1);
 	}

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/info/InfoEndpointAutoConfigurationTests.java

@@ -42,7 +42,6 @@ class InfoEndpointAutoConfigurationTests {
 
 	@Test
 	void runShouldHaveEndpointBeanEvenIfDefaultIsDisabled() {
-		// FIXME
 		this.contextRunner.withPropertyValues("management.endpoint.default.enabled:false")
 				.run((context) -> assertThat(context).hasSingleBean(InfoEndpoint.class));
 	}

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/annotation/JmxEndpointDiscovererTests.java

@@ -79,18 +79,18 @@ class JmxEndpointDiscovererTests {
 			assertThat(getSomething.getDescription()).isEqualTo("Invoke getSomething for endpoint test");
 			assertThat(getSomething.getOutputType()).isEqualTo(String.class);
 			assertThat(getSomething.getParameters()).hasSize(1);
-			hasDefaultParameter(getSomething, 0, String.class);
+			assertThat(getSomething.getParameters().get(0).getType()).isEqualTo(String.class);
 			JmxOperation update = operationByName.get("update");
 			assertThat(update.getDescription()).isEqualTo("Invoke update for endpoint test");
 			assertThat(update.getOutputType()).isEqualTo(Void.TYPE);
 			assertThat(update.getParameters()).hasSize(2);
-			hasDefaultParameter(update, 0, String.class);
+			assertThat(update.getParameters().get(0).getType()).isEqualTo(String.class);
-			hasDefaultParameter(update, 1, String.class);
+			assertThat(update.getParameters().get(1).getType()).isEqualTo(String.class);
 			JmxOperation deleteSomething = operationByName.get("deleteSomething");
 			assertThat(deleteSomething.getDescription()).isEqualTo("Invoke deleteSomething for endpoint test");
 			assertThat(deleteSomething.getOutputType()).isEqualTo(Void.TYPE);
 			assertThat(deleteSomething.getParameters()).hasSize(1);
-			hasDefaultParameter(deleteSomething, 0, String.class);
+			assertThat(deleteSomething.getParameters().get(0).getType()).isEqualTo(String.class);
 		});
 	}
 
@@ -239,12 +239,6 @@ class JmxEndpointDiscovererTests {
 		assertThat(parameter.getDescription()).isEqualTo(description);
 	}
 
-	// FIXME rename
-	private void hasDefaultParameter(JmxOperation operation, int index, Class<?> type) {
-		JmxOperationParameter parameter = operation.getParameters().get(index);
-		assertThat(parameter.getType()).isEqualTo(type);
-	}
-
 	private Map<EndpointId, ExposableJmxEndpoint> discover(JmxEndpointDiscoverer discoverer) {
 		Map<EndpointId, ExposableJmxEndpoint> byId = new HashMap<>();
 		discoverer.getEndpoints().forEach((endpoint) -> byId.put(endpoint.getEndpointId(), endpoint));

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/HikariDataSourceConfigurationTests.java

@@ -55,7 +55,6 @@ class HikariDataSourceConfigurationTests {
 					assertThat(ds.getJdbcUrl()).isEqualTo("jdbc:foo//bar/spam");
 					assertThat(ds.getMaxLifetime()).isEqualTo(1234);
 				});
-		// TODO: test JDBC4 isValid()
 	}
 
 	@Test