Skip to content

Commit eefdbb7

Browse files
committed
Merge Actuator's loggers package into its logging package
Closes gh-10430
1 parent 94fefbf commit eefdbb7

File tree

10 files changed

+9
-31
lines changed

10 files changed

+9
-31
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package org.springframework.boot.actuate.autoconfigure.logging;
1818

1919
import org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration;
20-
import org.springframework.boot.actuate.logger.LogFileWebEndpoint;
20+
import org.springframework.boot.actuate.logging.LogFileWebEndpoint;
2121
import org.springframework.boot.autoconfigure.condition.ConditionMessage;
2222
import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
2323
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import java.io.File;
2020

21-
import org.springframework.boot.actuate.logger.LogFileWebEndpoint;
21+
import org.springframework.boot.actuate.logging.LogFileWebEndpoint;
2222
import org.springframework.boot.context.properties.ConfigurationProperties;
2323

2424
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.junit.Test;
2525
import org.junit.rules.TemporaryFolder;
2626

27-
import org.springframework.boot.actuate.logger.LogFileWebEndpoint;
27+
import org.springframework.boot.actuate.logging.LogFileWebEndpoint;
2828
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
2929
import org.springframework.core.io.Resource;
3030
import org.springframework.util.FileCopyUtils;

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/logger/package-info.java

Lines changed: 0 additions & 20 deletions
This file was deleted.

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/logger/LogFileWebEndpoint.java renamed to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/logging/LogFileWebEndpoint.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.actuate.logger;
17+
package org.springframework.boot.actuate.logging;
1818

1919
import java.io.File;
2020

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/logging/package-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
*/
1616

1717
/**
18-
* Actuator support for AMQP and RabbitMQ.
18+
* Actuator support for logging.
1919
*/
2020
package org.springframework.boot.actuate.logging;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.actuate.logger;
17+
package org.springframework.boot.actuate.logging;
1818

1919
import java.io.File;
2020
import java.io.IOException;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.actuate.logger;
17+
package org.springframework.boot.actuate.logging;
1818

1919
import java.io.File;
2020
import java.io.IOException;

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logger/LoggersEndpointTests.java renamed to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LoggersEndpointTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.actuate.logger;
17+
package org.springframework.boot.actuate.logging;
1818

1919
import java.util.Collections;
2020
import java.util.EnumSet;
@@ -23,7 +23,6 @@
2323

2424
import org.junit.Test;
2525

26-
import org.springframework.boot.actuate.logging.LoggersEndpoint;
2726
import org.springframework.boot.actuate.logging.LoggersEndpoint.LoggerLevels;
2827
import org.springframework.boot.logging.LogLevel;
2928
import org.springframework.boot.logging.LoggerConfiguration;
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.actuate.logger;
17+
package org.springframework.boot.actuate.logging;
1818

1919
import java.util.Arrays;
2020
import java.util.Collections;
@@ -30,7 +30,6 @@
3030

3131
import org.springframework.boot.actuate.endpoint.http.ActuatorMediaType;
3232
import org.springframework.boot.actuate.endpoint.web.test.WebEndpointRunners;
33-
import org.springframework.boot.actuate.logging.LoggersEndpoint;
3433
import org.springframework.boot.logging.LogLevel;
3534
import org.springframework.boot.logging.LoggerConfiguration;
3635
import org.springframework.boot.logging.LoggingSystem;

0 commit comments

Comments
 (0)