Merge branch '2.2.x'

Closes gh-21062

Author: wilkinsona

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/ExposeExcludePropertyEndpointFilter.java

@@ -18,7 +18,7 @@
 
 import java.util.Collection;
 
-import org.springframework.boot.actuate.autoconfigure.endpoint.expose.IncludExcludeEndpointFilter;
+import org.springframework.boot.actuate.autoconfigure.endpoint.expose.IncludeExcludeEndpointFilter;
 import org.springframework.boot.actuate.endpoint.EndpointFilter;
 import org.springframework.boot.actuate.endpoint.ExposableEndpoint;
 import org.springframework.core.env.Environment;
@@ -30,11 +30,11 @@
  * @param <E> the endpoint type
  * @author Phillip Webb
  * @since 2.0.0
- * @deprecated since 2.2.7 in favor of {@link IncludExcludeEndpointFilter}
+ * @deprecated since 2.2.7 in favor of {@link IncludeExcludeEndpointFilter}
  */
 @Deprecated
 public class ExposeExcludePropertyEndpointFilter<E extends ExposableEndpoint<?>>
-		extends IncludExcludeEndpointFilter<E> {
+		extends IncludeExcludeEndpointFilter<E> {
 
 	public ExposeExcludePropertyEndpointFilter(Class<E> endpointType, Environment environment, String prefix,
 			String... exposeDefaults) {

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/OnAvailableEndpointCondition.java

@@ -20,8 +20,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.springframework.boot.actuate.autoconfigure.endpoint.expose.IncludExcludeEndpointFilter;
-import org.springframework.boot.actuate.autoconfigure.endpoint.expose.IncludExcludeEndpointFilter.DefaultIncludes;
+import org.springframework.boot.actuate.autoconfigure.endpoint.expose.IncludeExcludeEndpointFilter;
+import org.springframework.boot.actuate.autoconfigure.endpoint.expose.IncludeExcludeEndpointFilter.DefaultIncludes;
 import org.springframework.boot.actuate.endpoint.EndpointId;
 import org.springframework.boot.actuate.endpoint.ExposableEndpoint;
 import org.springframework.boot.autoconfigure.condition.ConditionMessage;
@@ -87,7 +87,7 @@ private Set<Exposure> getExposures(Environment environment) {
 		return exposures;
 	}
 
-	static class Exposure extends IncludExcludeEndpointFilter<ExposableEndpoint<?>> {
+	static class Exposure extends IncludeExcludeEndpointFilter<ExposableEndpoint<?>> {
 
 		private final String prefix;
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/expose/IncludExcludeEndpointFilter.java renamed to spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/expose/IncludeExcludeEndpointFilter.java

@@ -40,7 +40,7 @@
  * @author Phillip Webb
  * @since 2.2.7
  */
-public class IncludExcludeEndpointFilter<E extends ExposableEndpoint<?>> implements EndpointFilter<E> {
+public class IncludeExcludeEndpointFilter<E extends ExposableEndpoint<?>> implements EndpointFilter<E> {
 
 	private final Class<E> endpointType;
 
@@ -51,34 +51,34 @@ public class IncludExcludeEndpointFilter<E extends ExposableEndpoint<?>> impleme
 	private final EndpointPatterns exclude;
 
 	/**
-	 * Create a new {@link IncludExcludeEndpointFilter} with include/exclude rules bound
+	 * Create a new {@link IncludeExcludeEndpointFilter} with include/exclude rules bound
 	 * from the {@link Environment}.
 	 * @param endpointType the endpoint type that should be considered (other types always
 	 * match)
 	 * @param environment the environment containing the properties
 	 * @param prefix the property prefix to bind
 	 * @param defaultIncludes the default {@code includes} to use when none are specified.
 	 */
-	public IncludExcludeEndpointFilter(Class<E> endpointType, Environment environment, String prefix,
+	public IncludeExcludeEndpointFilter(Class<E> endpointType, Environment environment, String prefix,
 			String... defaultIncludes) {
 		this(endpointType, environment, prefix, new EndpointPatterns(defaultIncludes));
 	}
 
 	/**
-	 * Create a new {@link IncludExcludeEndpointFilter} with include/exclude rules bound
+	 * Create a new {@link IncludeExcludeEndpointFilter} with include/exclude rules bound
 	 * from the {@link Environment}.
 	 * @param endpointType the endpoint type that should be considered (other types always
 	 * match)
 	 * @param environment the environment containing the properties
 	 * @param prefix the property prefix to bind
 	 * @param defaultIncludes the default {@code includes} to use when none are specified.
 	 */
-	public IncludExcludeEndpointFilter(Class<E> endpointType, Environment environment, String prefix,
+	public IncludeExcludeEndpointFilter(Class<E> endpointType, Environment environment, String prefix,
 			DefaultIncludes defaultIncludes) {
 		this(endpointType, environment, prefix, DefaultIncludes.patterns(defaultIncludes));
 	}
 
-	private IncludExcludeEndpointFilter(Class<E> endpointType, Environment environment, String prefix,
+	private IncludeExcludeEndpointFilter(Class<E> endpointType, Environment environment, String prefix,
 			EndpointPatterns defaultIncludes) {
 		Assert.notNull(endpointType, "EndpointType must not be null");
 		Assert.notNull(environment, "Environment must not be null");
@@ -92,34 +92,34 @@ private IncludExcludeEndpointFilter(Class<E> endpointType, Environment environme
 	}
 
 	/**
-	 * Create a new {@link IncludExcludeEndpointFilter} with specific include/exclude
+	 * Create a new {@link IncludeExcludeEndpointFilter} with specific include/exclude
 	 * rules.
 	 * @param endpointType the endpoint type that should be considered (other types always
 	 * match)
 	 * @param include the include patterns
 	 * @param exclude the exclude patterns
 	 * @param defaultIncludes the default {@code includes} to use when none are specified.
 	 */
-	public IncludExcludeEndpointFilter(Class<E> endpointType, Collection<String> include, Collection<String> exclude,
+	public IncludeExcludeEndpointFilter(Class<E> endpointType, Collection<String> include, Collection<String> exclude,
 			String... defaultIncludes) {
 		this(endpointType, include, exclude, new EndpointPatterns(defaultIncludes));
 	}
 
 	/**
-	 * Create a new {@link IncludExcludeEndpointFilter} with specific include/exclude
+	 * Create a new {@link IncludeExcludeEndpointFilter} with specific include/exclude
 	 * rules.
 	 * @param endpointType the endpoint type that should be considered (other types always
 	 * match)
 	 * @param include the include patterns
 	 * @param exclude the exclude patterns
 	 * @param defaultIncludes the default {@code includes} to use when none are specified.
 	 */
-	public IncludExcludeEndpointFilter(Class<E> endpointType, Collection<String> include, Collection<String> exclude,
+	public IncludeExcludeEndpointFilter(Class<E> endpointType, Collection<String> include, Collection<String> exclude,
 			DefaultIncludes defaultIncludes) {
 		this(endpointType, include, exclude, DefaultIncludes.patterns(defaultIncludes));
 	}
 
-	private IncludExcludeEndpointFilter(Class<E> endpointType, Collection<String> include, Collection<String> exclude,
+	private IncludeExcludeEndpointFilter(Class<E> endpointType, Collection<String> include, Collection<String> exclude,
 			EndpointPatterns defaultIncludes) {
 		Assert.notNull(endpointType, "EndpointType Type must not be null");
 		Assert.notNull(defaultIncludes, "DefaultIncludes must not be null");

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/jmx/JmxEndpointAutoConfiguration.java

@@ -23,7 +23,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.boot.actuate.autoconfigure.endpoint.expose.IncludExcludeEndpointFilter;
+import org.springframework.boot.actuate.autoconfigure.endpoint.expose.IncludeExcludeEndpointFilter;
 import org.springframework.boot.actuate.endpoint.EndpointFilter;
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
 import org.springframework.boot.actuate.endpoint.invoke.OperationInvokerAdvisor;
@@ -97,9 +97,9 @@ public JmxEndpointExporter jmxMBeanExporter(MBeanServer mBeanServer, Environment
 	}
 
 	@Bean
-	public IncludExcludeEndpointFilter<ExposableJmxEndpoint> jmxIncludeExcludePropertyEndpointFilter() {
+	public IncludeExcludeEndpointFilter<ExposableJmxEndpoint> jmxIncludeExcludePropertyEndpointFilter() {
 		JmxEndpointProperties.Exposure exposure = this.properties.getExposure();
-		return new IncludExcludeEndpointFilter<>(ExposableJmxEndpoint.class, exposure.getInclude(),
+		return new IncludeExcludeEndpointFilter<>(ExposableJmxEndpoint.class, exposure.getInclude(),
 				exposure.getExclude(), "*");
 	}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/ServletEndpointManagementContextConfiguration.java

@@ -18,7 +18,7 @@
 
 import org.glassfish.jersey.server.ResourceConfig;
 
-import org.springframework.boot.actuate.autoconfigure.endpoint.expose.IncludExcludeEndpointFilter;
+import org.springframework.boot.actuate.autoconfigure.endpoint.expose.IncludeExcludeEndpointFilter;
 import org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration;
 import org.springframework.boot.actuate.endpoint.web.ExposableServletEndpoint;
 import org.springframework.boot.actuate.endpoint.web.ServletEndpointRegistrar;
@@ -47,10 +47,10 @@
 public class ServletEndpointManagementContextConfiguration {
 
 	@Bean
-	public IncludExcludeEndpointFilter<ExposableServletEndpoint> servletExposeExcludePropertyEndpointFilter(
+	public IncludeExcludeEndpointFilter<ExposableServletEndpoint> servletExposeExcludePropertyEndpointFilter(
 			WebEndpointProperties properties) {
 		WebEndpointProperties.Exposure exposure = properties.getExposure();
-		return new IncludExcludeEndpointFilter<>(ExposableServletEndpoint.class, exposure.getInclude(),
+		return new IncludeExcludeEndpointFilter<>(ExposableServletEndpoint.class, exposure.getInclude(),
 				exposure.getExclude());
 	}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointAutoConfiguration.java

@@ -22,8 +22,8 @@
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration;
-import org.springframework.boot.actuate.autoconfigure.endpoint.expose.IncludExcludeEndpointFilter;
-import org.springframework.boot.actuate.autoconfigure.endpoint.expose.IncludExcludeEndpointFilter.DefaultIncludes;
+import org.springframework.boot.actuate.autoconfigure.endpoint.expose.IncludeExcludeEndpointFilter;
+import org.springframework.boot.actuate.autoconfigure.endpoint.expose.IncludeExcludeEndpointFilter.DefaultIncludes;
 import org.springframework.boot.actuate.endpoint.EndpointFilter;
 import org.springframework.boot.actuate.endpoint.EndpointsSupplier;
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
@@ -113,16 +113,16 @@ public PathMappedEndpoints pathMappedEndpoints(Collection<EndpointsSupplier<?>>
 	}
 
 	@Bean
-	public IncludExcludeEndpointFilter<ExposableWebEndpoint> webExposeExcludePropertyEndpointFilter() {
+	public IncludeExcludeEndpointFilter<ExposableWebEndpoint> webExposeExcludePropertyEndpointFilter() {
 		WebEndpointProperties.Exposure exposure = this.properties.getExposure();
-		return new IncludExcludeEndpointFilter<>(ExposableWebEndpoint.class, exposure.getInclude(),
+		return new IncludeExcludeEndpointFilter<>(ExposableWebEndpoint.class, exposure.getInclude(),
 				exposure.getExclude(), DefaultIncludes.WEB);
 	}
 
 	@Bean
-	public IncludExcludeEndpointFilter<ExposableControllerEndpoint> controllerExposeExcludePropertyEndpointFilter() {
+	public IncludeExcludeEndpointFilter<ExposableControllerEndpoint> controllerExposeExcludePropertyEndpointFilter() {
 		WebEndpointProperties.Exposure exposure = this.properties.getExposure();
-		return new IncludExcludeEndpointFilter<>(ExposableControllerEndpoint.class, exposure.getInclude(),
+		return new IncludeExcludeEndpointFilter<>(ExposableControllerEndpoint.class, exposure.getInclude(),
 				exposure.getExclude());
 	}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/expose/IncludExcludeEndpointFilterTests.java renamed to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/expose/IncludeExcludeEndpointFilterTests.java

@@ -32,13 +32,13 @@
 import static org.mockito.Mockito.mock;
 
 /**
- * Tests for {@link IncludExcludeEndpointFilter}.
+ * Tests for {@link IncludeExcludeEndpointFilter}.
  *
  * @author Phillip Webb
  */
-class IncludExcludeEndpointFilterTests {
+class IncludeExcludeEndpointFilterTests {
 
-	private IncludExcludeEndpointFilter<?> filter;
+	private IncludeExcludeEndpointFilter<?> filter;
 
 	@BeforeEach
 	void setup() {
@@ -48,29 +48,30 @@ void setup() {
 	@Test
 	void createWhenEndpointTypeIsNullShouldThrowException() {
 		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new IncludExcludeEndpointFilter<>(null, new MockEnvironment(), "foo"))
+				.isThrownBy(() -> new IncludeExcludeEndpointFilter<>(null, new MockEnvironment(), "foo"))
 				.withMessageContaining("EndpointType must not be null");
 	}
 
 	@Test
 	void createWhenEnvironmentIsNullShouldThrowException() {
 		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new IncludExcludeEndpointFilter<>(ExposableEndpoint.class, null, "foo"))
+				.isThrownBy(() -> new IncludeExcludeEndpointFilter<>(ExposableEndpoint.class, null, "foo"))
 				.withMessageContaining("Environment must not be null");
 	}
 
 	@Test
 	void createWhenPrefixIsNullShouldThrowException() {
 		assertThatIllegalArgumentException()
 				.isThrownBy(
-						() -> new IncludExcludeEndpointFilter<>(ExposableEndpoint.class, new MockEnvironment(), null))
+						() -> new IncludeExcludeEndpointFilter<>(ExposableEndpoint.class, new MockEnvironment(), null))
 				.withMessageContaining("Prefix must not be empty");
 	}
 
 	@Test
 	void createWhenPrefixIsEmptyShouldThrowException() {
 		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new IncludExcludeEndpointFilter<>(ExposableEndpoint.class, new MockEnvironment(), ""))
+				.isThrownBy(
+						() -> new IncludeExcludeEndpointFilter<>(ExposableEndpoint.class, new MockEnvironment(), ""))
 				.withMessageContaining("Prefix must not be empty");
 	}
 
@@ -121,7 +122,7 @@ void matchWhenDiscovererDoesNotMatchShouldMatch() {
 		MockEnvironment environment = new MockEnvironment();
 		environment.setProperty("foo.include", "bar");
 		environment.setProperty("foo.exclude", "");
-		this.filter = new IncludExcludeEndpointFilter<>(DifferentTestExposableWebEndpoint.class, environment, "foo");
+		this.filter = new IncludeExcludeEndpointFilter<>(DifferentTestExposableWebEndpoint.class, environment, "foo");
 		assertThat(match(EndpointId.of("baz"))).isTrue();
 	}
 
@@ -157,7 +158,7 @@ private void setupFilter(String include, String exclude) {
 		MockEnvironment environment = new MockEnvironment();
 		environment.setProperty("foo.include", include);
 		environment.setProperty("foo.exclude", exclude);
-		this.filter = new IncludExcludeEndpointFilter<>(TestExposableWebEndpoint.class, environment, "foo", "def");
+		this.filter = new IncludeExcludeEndpointFilter<>(TestExposableWebEndpoint.class, environment, "foo", "def");
 	}
 
 	@SuppressWarnings({ "rawtypes", "unchecked" })

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/WebEndpointAutoConfigurationTests.java

@@ -24,7 +24,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration;
-import org.springframework.boot.actuate.autoconfigure.endpoint.expose.IncludExcludeEndpointFilter;
+import org.springframework.boot.actuate.autoconfigure.endpoint.expose.IncludeExcludeEndpointFilter;
 import org.springframework.boot.actuate.endpoint.EndpointId;
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
 import org.springframework.boot.actuate.endpoint.http.ActuatorMediaType;
@@ -104,7 +104,7 @@ void webApplicationConfiguresEndpointDiscoverer() {
 	@Test
 	void webApplicationConfiguresExposeExcludePropertyEndpointFilter() {
 		this.contextRunner
-				.run((context) -> assertThat(context).getBeans(IncludExcludeEndpointFilter.class).containsKeys(
+				.run((context) -> assertThat(context).getBeans(IncludeExcludeEndpointFilter.class).containsKeys(
 						"webExposeExcludePropertyEndpointFilter", "controllerExposeExcludePropertyEndpointFilter"));
 	}