Merge pull request #16298 from yalov4uk

* pr/16298:
  Fix LogFile conditions to check for exposure as well

Author: snicoll

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointAutoConfiguration.java

@@ -17,6 +17,7 @@
 package org.springframework.boot.actuate.autoconfigure.logging;
 
 import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
+import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnExposedEndpoint;
 import org.springframework.boot.actuate.logging.LogFileWebEndpoint;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionMessage;
@@ -42,6 +43,7 @@
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnEnabledEndpoint(endpoint = LogFileWebEndpoint.class)
+@ConditionalOnExposedEndpoint(endpoint = LogFileWebEndpoint.class)
 @EnableConfigurationProperties(LogFileWebEndpointProperties.class)
 public class LogFileWebEndpointAutoConfiguration {
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointAutoConfigurationTests.java

@@ -92,6 +92,15 @@ public void logFileWebEndpointCanBeDisabled() {
 						.doesNotHaveBean(LogFileWebEndpoint.class));
 	}
 
+	@Test
+	public void logFileWebEndpointCanBeExcluded() {
+		this.contextRunner
+				.withPropertyValues("logging.file.name:test.log",
+						"management.endpoints.web.exposure.exclude=logfile")
+				.run((context) -> assertThat(context)
+						.doesNotHaveBean(LogFileWebEndpoint.class));
+	}
+
 	@Test
 	public void logFileWebEndpointUsesConfiguredExternalFile() throws IOException {
 		File file = this.temp.newFile();