Merge branch '2.2.x'

philwebb · philwebb · commit 0ad1ea4352b4 · 2020-04-19T16:52:48.000-07:00
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/ExposeExcludePropertyEndpointFilterTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/ExposeExcludePropertyEndpointFilterTests.java
@@ -141,7 +141,7 @@ void matchWhenMixedCaseShouldMatch() {
 	}
 
 	@Test // gh-20997
-	public void matchWhenDashInName() throws Exception {
+	void matchWhenDashInName() throws Exception {
 		setupFilter("bus-refresh", "");
 		assertThat(match(EndpointId.of("bus-refresh"))).isTrue();
 	}

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ void matchWhenMixedCaseShouldMatch() {`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`@Test // gh-20997`
`144`		`- public void matchWhenDashInName() throws Exception {`
	`144`	`+ void matchWhenDashInName() throws Exception {`
`145`	`145`	`setupFilter("bus-refresh", "");`
`146`	`146`	`assertThat(match(EndpointId.of("bus-refresh"))).isTrue();`
`147`	`147`	`}`