diff --git a/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointManagementContextConfiguration.java b/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointManagementContextConfiguration.java index fdae46504b..37b19e9a4d 100644 --- a/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointManagementContextConfiguration.java +++ b/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointManagementContextConfiguration.java @@ -17,7 +17,7 @@ package org.springframework.boot.actuate.autoconfigure.logging; import org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration; -import org.springframework.boot.actuate.logger.LogFileWebEndpoint; +import org.springframework.boot.actuate.logging.LogFileWebEndpoint; import org.springframework.boot.autoconfigure.condition.ConditionMessage; import org.springframework.boot.autoconfigure.condition.ConditionOutcome; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointProperties.java b/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointProperties.java index 11a56c9d15..0ebb85b0bf 100644 --- a/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointProperties.java +++ b/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointProperties.java @@ -18,7 +18,7 @@ package org.springframework.boot.actuate.autoconfigure.logging; import java.io.File; -import org.springframework.boot.actuate.logger.LogFileWebEndpoint; +import org.springframework.boot.actuate.logging.LogFileWebEndpoint; import org.springframework.boot.context.properties.ConfigurationProperties; /** diff --git a/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointManagementContextConfigurationTests.java b/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointManagementContextConfigurationTests.java index 4b13a2e39e..4c05330a08 100644 --- a/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointManagementContextConfigurationTests.java +++ b/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/logging/LogFileWebEndpointManagementContextConfigurationTests.java @@ -24,7 +24,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.springframework.boot.actuate.logger.LogFileWebEndpoint; +import org.springframework.boot.actuate.logging.LogFileWebEndpoint; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; import org.springframework.core.io.Resource; import org.springframework.util.FileCopyUtils; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/logger/package-info.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/logger/package-info.java deleted file mode 100644 index db84ae9a43..0000000000 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/logger/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2012-2017 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Actuator support for logging. - */ -package org.springframework.boot.actuate.logger; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/logger/LogFileWebEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/logging/LogFileWebEndpoint.java similarity index 97% rename from spring-boot-actuator/src/main/java/org/springframework/boot/actuate/logger/LogFileWebEndpoint.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/logging/LogFileWebEndpoint.java index d7fea69e6d..8357212efe 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/logger/LogFileWebEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/logging/LogFileWebEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.actuate.logger; +package org.springframework.boot.actuate.logging; import java.io.File; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/logging/package-info.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/logging/package-info.java index 34ca7ce0a2..7f49ec1321 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/logging/package-info.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/logging/package-info.java @@ -15,6 +15,6 @@ */ /** - * Actuator support for AMQP and RabbitMQ. + * Actuator support for logging. */ package org.springframework.boot.actuate.logging; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logger/LogFileWebEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LogFileWebEndpointTests.java similarity index 98% rename from spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logger/LogFileWebEndpointTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LogFileWebEndpointTests.java index a42fad882c..e2f1594d5a 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logger/LogFileWebEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LogFileWebEndpointTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.actuate.logger; +package org.springframework.boot.actuate.logging; import java.io.File; import java.io.IOException; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logger/LogFileWebEndpointWebIntegrationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LogFileWebEndpointWebIntegrationTests.java similarity index 98% rename from spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logger/LogFileWebEndpointWebIntegrationTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LogFileWebEndpointWebIntegrationTests.java index c1c3d96587..585417170d 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logger/LogFileWebEndpointWebIntegrationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LogFileWebEndpointWebIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.actuate.logger; +package org.springframework.boot.actuate.logging; import java.io.File; import java.io.IOException; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logger/LoggersEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LoggersEndpointTests.java similarity index 96% rename from spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logger/LoggersEndpointTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LoggersEndpointTests.java index 920f9a20cb..559d227370 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logger/LoggersEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LoggersEndpointTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.actuate.logger; +package org.springframework.boot.actuate.logging; import java.util.Collections; import java.util.EnumSet; @@ -23,7 +23,6 @@ import java.util.Set; import org.junit.Test; -import org.springframework.boot.actuate.logging.LoggersEndpoint; import org.springframework.boot.actuate.logging.LoggersEndpoint.LoggerLevels; import org.springframework.boot.logging.LogLevel; import org.springframework.boot.logging.LoggerConfiguration; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logger/LoggersEndpointWebIntegrationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LoggersEndpointWebIntegrationTests.java similarity index 98% rename from spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logger/LoggersEndpointWebIntegrationTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LoggersEndpointWebIntegrationTests.java index cfc1f4be10..48e88e0472 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logger/LoggersEndpointWebIntegrationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/logging/LoggersEndpointWebIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.actuate.logger; +package org.springframework.boot.actuate.logging; import java.util.Arrays; import java.util.Collections; @@ -30,7 +30,6 @@ import org.mockito.Mockito; import org.springframework.boot.actuate.endpoint.http.ActuatorMediaType; import org.springframework.boot.actuate.endpoint.web.test.WebEndpointRunners; -import org.springframework.boot.actuate.logging.LoggersEndpoint; import org.springframework.boot.logging.LogLevel; import org.springframework.boot.logging.LoggerConfiguration; import org.springframework.boot.logging.LoggingSystem;