diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/AuditEvent.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/AuditEvent.java index 75ca0c69c43..81582b6450f 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/AuditEvent.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/AuditEvent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.audit; +package org.springframework.boot.actuate.audit; import java.io.Serializable; import java.util.Collections; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/AuditEventRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/AuditEventRepository.java index 3751d706c7f..d85a92164d5 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/AuditEventRepository.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/AuditEventRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.audit; +package org.springframework.boot.actuate.audit; import java.util.Date; import java.util.List; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepository.java index 43127c1031b..07b7f175c9e 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepository.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.audit; +package org.springframework.boot.actuate.audit; import java.util.ArrayList; import java.util.Collections; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/listener/AuditApplicationEvent.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/listener/AuditApplicationEvent.java index 92db931a946..b02a5c4eedd 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/listener/AuditApplicationEvent.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/listener/AuditApplicationEvent.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.boot.ops.audit.listener; +package org.springframework.boot.actuate.audit.listener; import java.util.Date; import java.util.Map; -import org.springframework.boot.ops.audit.AuditEvent; +import org.springframework.boot.actuate.audit.AuditEvent; import org.springframework.context.ApplicationEvent; import org.springframework.util.Assert; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/listener/AuditListener.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/listener/AuditListener.java index 9cea90835b5..1e3240b93a4 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/listener/AuditListener.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/listener/AuditListener.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.boot.ops.audit.listener; +package org.springframework.boot.actuate.audit.listener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.boot.ops.audit.AuditEvent; -import org.springframework.boot.ops.audit.AuditEventRepository; +import org.springframework.boot.actuate.audit.AuditEvent; +import org.springframework.boot.actuate.audit.AuditEventRepository; import org.springframework.context.ApplicationListener; /** diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/AuditAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/AuditAutoConfiguration.java index de8a6eb505e..6a87e9bf369 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/AuditAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/AuditAutoConfiguration.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.springframework.boot.ops.autoconfigure; +package org.springframework.boot.actuate.autoconfigure; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.actuate.audit.AuditEvent; +import org.springframework.boot.actuate.audit.AuditEventRepository; +import org.springframework.boot.actuate.audit.InMemoryAuditEventRepository; +import org.springframework.boot.actuate.audit.listener.AuditListener; +import org.springframework.boot.actuate.security.AuthenticationAuditListener; +import org.springframework.boot.actuate.security.AuthorizationAuditListener; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.ops.audit.AuditEvent; -import org.springframework.boot.ops.audit.AuditEventRepository; -import org.springframework.boot.ops.audit.InMemoryAuditEventRepository; -import org.springframework.boot.ops.audit.listener.AuditListener; -import org.springframework.boot.ops.security.AuthenticationAuditListener; -import org.springframework.boot.ops.security.AuthorizationAuditListener; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfiguration.java index e10acc24631..cc851e7938b 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.autoconfigure; +package org.springframework.boot.actuate.autoconfigure; import java.util.LinkedHashMap; import java.util.Map; @@ -22,26 +22,26 @@ import java.util.Properties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.actuate.endpoint.BeansEndpoint; +import org.springframework.boot.actuate.endpoint.DumpEndpoint; +import org.springframework.boot.actuate.endpoint.Endpoint; +import org.springframework.boot.actuate.endpoint.EnvironmentEndpoint; +import org.springframework.boot.actuate.endpoint.HealthEndpoint; +import org.springframework.boot.actuate.endpoint.InfoEndpoint; +import org.springframework.boot.actuate.endpoint.MetricsEndpoint; +import org.springframework.boot.actuate.endpoint.PublicMetrics; +import org.springframework.boot.actuate.endpoint.ShutdownEndpoint; +import org.springframework.boot.actuate.endpoint.TraceEndpoint; +import org.springframework.boot.actuate.endpoint.VanillaPublicMetrics; +import org.springframework.boot.actuate.health.HealthIndicator; +import org.springframework.boot.actuate.health.VanillaHealthIndicator; +import org.springframework.boot.actuate.metrics.InMemoryMetricRepository; +import org.springframework.boot.actuate.metrics.MetricRepository; +import org.springframework.boot.actuate.trace.InMemoryTraceRepository; +import org.springframework.boot.actuate.trace.TraceRepository; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.bind.PropertiesConfigurationFactory; -import org.springframework.boot.ops.endpoint.BeansEndpoint; -import org.springframework.boot.ops.endpoint.DumpEndpoint; -import org.springframework.boot.ops.endpoint.Endpoint; -import org.springframework.boot.ops.endpoint.EnvironmentEndpoint; -import org.springframework.boot.ops.endpoint.HealthEndpoint; -import org.springframework.boot.ops.endpoint.InfoEndpoint; -import org.springframework.boot.ops.endpoint.MetricsEndpoint; -import org.springframework.boot.ops.endpoint.PublicMetrics; -import org.springframework.boot.ops.endpoint.ShutdownEndpoint; -import org.springframework.boot.ops.endpoint.TraceEndpoint; -import org.springframework.boot.ops.endpoint.VanillaPublicMetrics; -import org.springframework.boot.ops.health.HealthIndicator; -import org.springframework.boot.ops.health.VanillaHealthIndicator; -import org.springframework.boot.ops.metrics.InMemoryMetricRepository; -import org.springframework.boot.ops.metrics.MetricRepository; -import org.springframework.boot.ops.trace.InMemoryTraceRepository; -import org.springframework.boot.ops.trace.TraceRepository; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.ConfigurableEnvironment; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java index 3b333abb4a1..d27d2c8e0b0 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.autoconfigure; +package org.springframework.boot.actuate.autoconfigure; import javax.servlet.Servlet; @@ -22,6 +22,10 @@ import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.actuate.endpoint.Endpoint; +import org.springframework.boot.actuate.endpoint.mvc.EndpointHandlerAdapter; +import org.springframework.boot.actuate.endpoint.mvc.EndpointHandlerMapping; +import org.springframework.boot.actuate.properties.ManagementServerProperties; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; @@ -31,10 +35,6 @@ import org.springframework.boot.autoconfigure.web.EmbeddedServletContainerAutoCo import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration; import org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; import org.springframework.boot.context.embedded.properties.ServerProperties; -import org.springframework.boot.ops.endpoint.Endpoint; -import org.springframework.boot.ops.endpoint.mvc.EndpointHandlerAdapter; -import org.springframework.boot.ops.endpoint.mvc.EndpointHandlerMapping; -import org.springframework.boot.ops.properties.ManagementServerProperties; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.ApplicationListener; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java index c642bdef036..463b2ef2a8f 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java @@ -14,22 +14,22 @@ * limitations under the License. */ -package org.springframework.boot.ops.autoconfigure; +package org.springframework.boot.actuate.autoconfigure; import javax.servlet.Filter; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.HierarchicalBeanFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.actuate.endpoint.mvc.EndpointHandlerAdapter; +import org.springframework.boot.actuate.endpoint.mvc.EndpointHandlerMapping; +import org.springframework.boot.actuate.properties.ManagementServerProperties; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.SearchStrategy; import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainerFactory; import org.springframework.boot.context.embedded.EmbeddedServletContainer; import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer; -import org.springframework.boot.ops.endpoint.mvc.EndpointHandlerAdapter; -import org.springframework.boot.ops.endpoint.mvc.EndpointHandlerMapping; -import org.springframework.boot.ops.properties.ManagementServerProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ErrorMvcAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ErrorMvcAutoConfiguration.java index aaec4b5bcc0..b0c408c6c7b 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ErrorMvcAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ErrorMvcAutoConfiguration.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.springframework.boot.ops.autoconfigure; +package org.springframework.boot.actuate.autoconfigure; import javax.servlet.Servlet; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.actuate.web.BasicErrorController; +import org.springframework.boot.actuate.web.ErrorController; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainerFactory; import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer; import org.springframework.boot.context.embedded.ErrorPage; -import org.springframework.boot.ops.web.BasicErrorController; -import org.springframework.boot.ops.web.ErrorController; import org.springframework.context.annotation.Bean; import org.springframework.web.servlet.DispatcherServlet; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java index 16deb652983..816149ca338 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.boot.ops.autoconfigure; +package org.springframework.boot.actuate.autoconfigure; +import org.springframework.boot.actuate.properties.ManagementServerProperties; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.web.ServerPropertiesAutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.ops.properties.ManagementServerProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfiguration.java index 168137c50a5..90ad9e30340 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.autoconfigure; +package org.springframework.boot.actuate.autoconfigure; import java.io.IOException; @@ -28,12 +28,12 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.actuate.metrics.CounterService; +import org.springframework.boot.actuate.metrics.GaugeService; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.boot.ops.metrics.CounterService; -import org.springframework.boot.ops.metrics.GaugeService; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java index f636b721687..293463e3148 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.springframework.boot.ops.autoconfigure; +package org.springframework.boot.actuate.autoconfigure; +import org.springframework.boot.actuate.metrics.CounterService; +import org.springframework.boot.actuate.metrics.DefaultCounterService; +import org.springframework.boot.actuate.metrics.DefaultGaugeService; +import org.springframework.boot.actuate.metrics.GaugeService; +import org.springframework.boot.actuate.metrics.InMemoryMetricRepository; +import org.springframework.boot.actuate.metrics.MetricRepository; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.ops.metrics.CounterService; -import org.springframework.boot.ops.metrics.DefaultCounterService; -import org.springframework.boot.ops.metrics.DefaultGaugeService; -import org.springframework.boot.ops.metrics.GaugeService; -import org.springframework.boot.ops.metrics.InMemoryMetricRepository; -import org.springframework.boot.ops.metrics.MetricRepository; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfiguration.java index ecdd9378b44..1f2ef7ba5d4 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfiguration.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package org.springframework.boot.ops.autoconfigure; +package org.springframework.boot.actuate.autoconfigure; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.actuate.endpoint.Endpoint; +import org.springframework.boot.actuate.endpoint.mvc.EndpointHandlerMapping; +import org.springframework.boot.actuate.properties.SecurityProperties; +import org.springframework.boot.actuate.web.ErrorController; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.ops.endpoint.Endpoint; -import org.springframework.boot.ops.endpoint.mvc.EndpointHandlerMapping; -import org.springframework.boot.ops.properties.SecurityProperties; -import org.springframework.boot.ops.web.ErrorController; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java index 2e05ed9a224..81b2664b918 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.boot.ops.autoconfigure; +package org.springframework.boot.actuate.autoconfigure; +import org.springframework.boot.actuate.trace.InMemoryTraceRepository; +import org.springframework.boot.actuate.trace.TraceRepository; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.ops.trace.InMemoryTraceRepository; -import org.springframework.boot.ops.trace.TraceRepository; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java index d077e889667..d8937132b82 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.springframework.boot.ops.autoconfigure; +package org.springframework.boot.actuate.autoconfigure; import javax.servlet.Servlet; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.actuate.trace.TraceRepository; +import org.springframework.boot.actuate.trace.WebRequestTraceFilter; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.boot.ops.trace.TraceRepository; -import org.springframework.boot.ops.trace.WebRequestTraceFilter; import org.springframework.context.annotation.Bean; import org.springframework.web.servlet.DispatcherServlet; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/AbstractEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/AbstractEndpoint.java index 9600fd4202f..6b3bbae9c7c 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/AbstractEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/AbstractEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.endpoint; +package org.springframework.boot.actuate.endpoint; import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ActionEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ActionEndpoint.java index a4ae2203654..bb4a476f871 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ActionEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ActionEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.endpoint; +package org.springframework.boot.actuate.endpoint; /** * Tagging interface used to indicate that {@link Endpoint} that performs some action. diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/BeansEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/BeansEndpoint.java index bd6a6eb8d94..281dab2e5e0 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/BeansEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/BeansEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.endpoint; +package org.springframework.boot.actuate.endpoint; import org.springframework.beans.BeansException; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/DumpEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/DumpEndpoint.java index 76d65ff7a1a..7ac1744b9f3 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/DumpEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/DumpEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.endpoint; +package org.springframework.boot.actuate.endpoint; import java.lang.management.ManagementFactory; import java.lang.management.ThreadInfo; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/Endpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/Endpoint.java index dbbfd2d4ed5..8e6800ddc6e 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/Endpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/Endpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.endpoint; +package org.springframework.boot.actuate.endpoint; import org.springframework.http.MediaType; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpoint.java index c17be6a3da0..6569ca03305 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.endpoint; +package org.springframework.boot.actuate.endpoint; import java.util.LinkedHashMap; import java.util.Map; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/HealthEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/HealthEndpoint.java index 8233e4b2979..a1b9885fa90 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/HealthEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/HealthEndpoint.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.boot.ops.endpoint; +package org.springframework.boot.actuate.endpoint; +import org.springframework.boot.actuate.health.HealthIndicator; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.ops.health.HealthIndicator; import org.springframework.util.Assert; /** diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/InfoEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/InfoEndpoint.java index 60dbfa801d4..bea2b90757d 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/InfoEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/InfoEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.endpoint; +package org.springframework.boot.actuate.endpoint; import java.util.Collections; import java.util.LinkedHashMap; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/MetricsEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/MetricsEndpoint.java index d95cd426024..fff41f266ce 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/MetricsEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/MetricsEndpoint.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.boot.ops.endpoint; +package org.springframework.boot.actuate.endpoint; import java.util.LinkedHashMap; import java.util.Map; +import org.springframework.boot.actuate.metrics.Metric; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.ops.metrics.Metric; import org.springframework.util.Assert; /** diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/PublicMetrics.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/PublicMetrics.java index ed5d4dca955..82ad4728003 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/PublicMetrics.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/PublicMetrics.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.boot.ops.endpoint; +package org.springframework.boot.actuate.endpoint; import java.util.Collection; -import org.springframework.boot.ops.metrics.Metric; +import org.springframework.boot.actuate.metrics.Metric; /** * Interface to expose specific {@link Metric}s via a {@link MetricsEndpoint}. diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ShutdownEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ShutdownEndpoint.java index d9ecd347d5b..7b08be8554c 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ShutdownEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ShutdownEndpoint.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.boot.ops.endpoint; +package org.springframework.boot.actuate.endpoint; import java.util.Collections; import java.util.Map; import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.actuate.properties.ManagementServerProperties; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.ops.properties.ManagementServerProperties; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.ConfigurableApplicationContext; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/TraceEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/TraceEndpoint.java index ed3d1f56e1a..02e51567bb2 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/TraceEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/TraceEndpoint.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.boot.ops.endpoint; +package org.springframework.boot.actuate.endpoint; import java.util.List; +import org.springframework.boot.actuate.trace.Trace; +import org.springframework.boot.actuate.trace.TraceRepository; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.ops.trace.Trace; -import org.springframework.boot.ops.trace.TraceRepository; import org.springframework.util.Assert; /** diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/VanillaPublicMetrics.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/VanillaPublicMetrics.java index bf954008037..1520256252c 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/VanillaPublicMetrics.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/VanillaPublicMetrics.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.boot.ops.endpoint; +package org.springframework.boot.actuate.endpoint; import java.util.Collection; import java.util.LinkedHashSet; -import org.springframework.boot.ops.metrics.Metric; -import org.springframework.boot.ops.metrics.MetricRepository; +import org.springframework.boot.actuate.metrics.Metric; +import org.springframework.boot.actuate.metrics.MetricRepository; import org.springframework.util.Assert; /** diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerAdapter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerAdapter.java index 32aa08ca2f7..3b50bdd64ad 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerAdapter.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.endpoint.mvc; +package org.springframework.boot.actuate.endpoint.mvc; import java.util.ArrayList; import java.util.Arrays; @@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.boot.ops.endpoint.Endpoint; +import org.springframework.boot.actuate.endpoint.Endpoint; import org.springframework.http.MediaType; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerMapping.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerMapping.java index c3da435bfb3..571349d32fe 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerMapping.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerMapping.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.endpoint.mvc; +package org.springframework.boot.actuate.endpoint.mvc; import java.util.ArrayList; import java.util.Collection; @@ -25,8 +25,8 @@ import javax.servlet.http.HttpServletRequest; import org.springframework.beans.factory.BeanFactoryUtils; import org.springframework.beans.factory.InitializingBean; -import org.springframework.boot.ops.endpoint.ActionEndpoint; -import org.springframework.boot.ops.endpoint.Endpoint; +import org.springframework.boot.actuate.endpoint.ActionEndpoint; +import org.springframework.boot.actuate.endpoint.Endpoint; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.util.Assert; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicator.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicator.java index 7a3c80bd7f9..6e82b451a8c 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicator.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/HealthIndicator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.health; +package org.springframework.boot.actuate.health; /** * Strategy interface used to provide an indication of application health. diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/VanillaHealthIndicator.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/VanillaHealthIndicator.java index 1f813c32908..f98f91ee170 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/VanillaHealthIndicator.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/VanillaHealthIndicator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.health; +package org.springframework.boot.actuate.health; /** * Default implementation of {@link HealthIndicator} that simply returns "ok". diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/CounterService.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/CounterService.java index e41695b475c..f550dc06b70 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/CounterService.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/CounterService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.metrics; +package org.springframework.boot.actuate.metrics; /** * A service that can be used to increment, decrement and reset a {@link Metric}. diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/DefaultCounterService.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/DefaultCounterService.java index 7166bc3b5f1..31e6e1438a6 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/DefaultCounterService.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/DefaultCounterService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.metrics; +package org.springframework.boot.actuate.metrics; import java.util.Date; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/DefaultGaugeService.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/DefaultGaugeService.java index 2520a68b868..299f0dcadfa 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/DefaultGaugeService.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/DefaultGaugeService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.metrics; +package org.springframework.boot.actuate.metrics; import java.util.Date; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/GaugeService.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/GaugeService.java index e0fecde0dbe..0295c8514d3 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/GaugeService.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/GaugeService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.metrics; +package org.springframework.boot.actuate.metrics; /** * A service that can be used to manage a {@link Metric} as a gauge. diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/InMemoryMetricRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/InMemoryMetricRepository.java index c69a3e9fb13..99f35b7aecc 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/InMemoryMetricRepository.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/InMemoryMetricRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.metrics; +package org.springframework.boot.actuate.metrics; import java.util.ArrayList; import java.util.Collection; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/Measurement.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/Measurement.java index bc7339cd66b..206e6f390d4 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/Measurement.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/Measurement.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.metrics; +package org.springframework.boot.actuate.metrics; import java.util.Date; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/Metric.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/Metric.java index 03387cb7076..245dee71510 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/Metric.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/Metric.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.metrics; +package org.springframework.boot.actuate.metrics; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/MetricRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/MetricRepository.java index aee98274b15..77ac665cf45 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/MetricRepository.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/MetricRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.metrics; +package org.springframework.boot.actuate.metrics; import java.util.Collection; import java.util.Date; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/properties/ManagementServerProperties.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/properties/ManagementServerProperties.java index f031649b24f..cfaf790f21f 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/properties/ManagementServerProperties.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/properties/ManagementServerProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.properties; +package org.springframework.boot.actuate.properties; import java.net.InetAddress; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/properties/SecurityProperties.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/properties/SecurityProperties.java index 217d31a1e0d..efea4de379e 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/properties/SecurityProperties.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/properties/SecurityProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.properties; +package org.springframework.boot.actuate.properties; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.security.config.annotation.web.configurers.SessionCreationPolicy; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthenticationAuditListener.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthenticationAuditListener.java index 329030adfdf..ecfdb06c167 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthenticationAuditListener.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthenticationAuditListener.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.boot.ops.security; +package org.springframework.boot.actuate.security; import java.util.HashMap; import java.util.Map; -import org.springframework.boot.ops.audit.AuditEvent; -import org.springframework.boot.ops.audit.listener.AuditApplicationEvent; +import org.springframework.boot.actuate.audit.AuditEvent; +import org.springframework.boot.actuate.audit.listener.AuditApplicationEvent; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.context.ApplicationListener; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthorizationAuditListener.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthorizationAuditListener.java index 4b0267f8584..9b15a01b6d1 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthorizationAuditListener.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthorizationAuditListener.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.boot.ops.security; +package org.springframework.boot.actuate.security; import java.util.HashMap; import java.util.Map; -import org.springframework.boot.ops.audit.AuditEvent; -import org.springframework.boot.ops.audit.listener.AuditApplicationEvent; +import org.springframework.boot.actuate.audit.AuditEvent; +import org.springframework.boot.actuate.audit.listener.AuditApplicationEvent; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.context.ApplicationListener; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/InMemoryTraceRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/InMemoryTraceRepository.java index 79f852487f6..1a9ce9ec7e3 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/InMemoryTraceRepository.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/InMemoryTraceRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.trace; +package org.springframework.boot.actuate.trace; import java.util.ArrayList; import java.util.Collections; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/Trace.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/Trace.java index 2b19b92c185..f797f322714 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/Trace.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/Trace.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.trace; +package org.springframework.boot.actuate.trace; import java.util.Date; import java.util.Map; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/TraceRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/TraceRepository.java index c91c2b0e5c6..d55817aefce 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/TraceRepository.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/TraceRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.trace; +package org.springframework.boot.actuate.trace; import java.util.List; import java.util.Map; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/WebRequestTraceFilter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/WebRequestTraceFilter.java index b35a630c681..e0022530ea9 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/WebRequestTraceFilter.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/WebRequestTraceFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.trace; +package org.springframework.boot.actuate.trace; import java.io.IOException; import java.util.Collections; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/BasicErrorController.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/BasicErrorController.java index 0be7f355dba..0c64466d066 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/BasicErrorController.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/BasicErrorController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.web; +package org.springframework.boot.actuate.web; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/ErrorController.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/ErrorController.java index 90ab20eb713..3166c9597bd 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/ErrorController.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/ErrorController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.web; +package org.springframework.boot.actuate.web; import org.springframework.stereotype.Controller; diff --git a/spring-boot-actuator/src/main/resources/META-INF/spring.factories b/spring-boot-actuator/src/main/resources/META-INF/spring.factories index 5756f0fe3d6..55cabc4f408 100644 --- a/spring-boot-actuator/src/main/resources/META-INF/spring.factories +++ b/spring-boot-actuator/src/main/resources/META-INF/spring.factories @@ -1,11 +1,11 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.boot.ops.autoconfigure.AuditAutoConfiguration,\ -org.springframework.boot.ops.autoconfigure.EndpointAutoConfiguration,\ -org.springframework.boot.ops.autoconfigure.EndpointWebMvcAutoConfiguration,\ -org.springframework.boot.ops.autoconfigure.ErrorMvcAutoConfiguration,\ -org.springframework.boot.ops.autoconfigure.ManagementServerPropertiesAutoConfiguration,\ -org.springframework.boot.ops.autoconfigure.MetricFilterAutoConfiguration,\ -org.springframework.boot.ops.autoconfigure.MetricRepositoryAutoConfiguration,\ -org.springframework.boot.ops.autoconfigure.SecurityAutoConfiguration,\ -org.springframework.boot.ops.autoconfigure.TraceRepositoryAutoConfiguration,\ -org.springframework.boot.ops.autoconfigure.TraceWebFilterAutoConfiguration +org.springframework.boot.actuate.autoconfigure.AuditAutoConfiguration,\ +org.springframework.boot.actuate.autoconfigure.EndpointAutoConfiguration,\ +org.springframework.boot.actuate.autoconfigure.EndpointWebMvcAutoConfiguration,\ +org.springframework.boot.actuate.autoconfigure.ErrorMvcAutoConfiguration,\ +org.springframework.boot.actuate.autoconfigure.ManagementServerPropertiesAutoConfiguration,\ +org.springframework.boot.actuate.autoconfigure.MetricFilterAutoConfiguration,\ +org.springframework.boot.actuate.autoconfigure.MetricRepositoryAutoConfiguration,\ +org.springframework.boot.actuate.autoconfigure.SecurityAutoConfiguration,\ +org.springframework.boot.actuate.autoconfigure.TraceRepositoryAutoConfiguration,\ +org.springframework.boot.actuate.autoconfigure.TraceWebFilterAutoConfiguration diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/AuditEventTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/AuditEventTests.java index c1b5609db79..20453a83067 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/AuditEventTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/AuditEventTests.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.boot.ops.audit; +package org.springframework.boot.actuate.audit; import java.util.Collections; import org.junit.Test; -import org.springframework.boot.ops.audit.AuditEvent; +import org.springframework.boot.actuate.audit.AuditEvent; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepositoryTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepositoryTests.java index afa9b7c9d41..3271133538b 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepositoryTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepositoryTests.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.boot.ops.audit; +package org.springframework.boot.actuate.audit; import java.util.Date; import org.junit.Test; -import org.springframework.boot.ops.audit.AuditEvent; -import org.springframework.boot.ops.audit.InMemoryAuditEventRepository; +import org.springframework.boot.actuate.audit.AuditEvent; +import org.springframework.boot.actuate.audit.InMemoryAuditEventRepository; import static org.junit.Assert.assertEquals; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/listener/AuditListenerTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/listener/AuditListenerTests.java index 03adb4db942..36dc0caffc4 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/listener/AuditListenerTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/listener/AuditListenerTests.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.boot.ops.audit.listener; +package org.springframework.boot.actuate.audit.listener; import java.util.Collections; import org.junit.Test; -import org.springframework.boot.ops.audit.AuditEvent; -import org.springframework.boot.ops.audit.AuditEventRepository; -import org.springframework.boot.ops.audit.listener.AuditApplicationEvent; -import org.springframework.boot.ops.audit.listener.AuditListener; +import org.springframework.boot.actuate.audit.AuditEvent; +import org.springframework.boot.actuate.audit.AuditEventRepository; +import org.springframework.boot.actuate.audit.listener.AuditApplicationEvent; +import org.springframework.boot.actuate.audit.listener.AuditListener; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/AuditAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/AuditAutoConfigurationTests.java index cc1ac71004d..5fbbd657f11 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/AuditAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/AuditAutoConfigurationTests.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.boot.ops.autoconfigure; +package org.springframework.boot.actuate.autoconfigure; import org.junit.Test; -import org.springframework.boot.ops.audit.AuditEventRepository; -import org.springframework.boot.ops.audit.InMemoryAuditEventRepository; -import org.springframework.boot.ops.autoconfigure.AuditAutoConfiguration; -import org.springframework.boot.ops.security.AuthenticationAuditListener; -import org.springframework.boot.ops.security.AuthorizationAuditListener; +import org.springframework.boot.actuate.audit.AuditEventRepository; +import org.springframework.boot.actuate.audit.InMemoryAuditEventRepository; +import org.springframework.boot.actuate.autoconfigure.AuditAutoConfiguration; +import org.springframework.boot.actuate.security.AuthenticationAuditListener; +import org.springframework.boot.actuate.security.AuthorizationAuditListener; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfigurationTests.java index 165a7a7b551..b3a38bb11a9 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfigurationTests.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.springframework.boot.ops.autoconfigure; +package org.springframework.boot.actuate.autoconfigure; import org.junit.Before; import org.junit.Test; import org.springframework.boot.TestUtils; -import org.springframework.boot.ops.autoconfigure.EndpointAutoConfiguration; -import org.springframework.boot.ops.endpoint.BeansEndpoint; -import org.springframework.boot.ops.endpoint.DumpEndpoint; -import org.springframework.boot.ops.endpoint.EnvironmentEndpoint; -import org.springframework.boot.ops.endpoint.HealthEndpoint; -import org.springframework.boot.ops.endpoint.InfoEndpoint; -import org.springframework.boot.ops.endpoint.MetricsEndpoint; -import org.springframework.boot.ops.endpoint.ShutdownEndpoint; -import org.springframework.boot.ops.endpoint.TraceEndpoint; +import org.springframework.boot.actuate.autoconfigure.EndpointAutoConfiguration; +import org.springframework.boot.actuate.endpoint.BeansEndpoint; +import org.springframework.boot.actuate.endpoint.DumpEndpoint; +import org.springframework.boot.actuate.endpoint.EnvironmentEndpoint; +import org.springframework.boot.actuate.endpoint.HealthEndpoint; +import org.springframework.boot.actuate.endpoint.InfoEndpoint; +import org.springframework.boot.actuate.endpoint.MetricsEndpoint; +import org.springframework.boot.actuate.endpoint.ShutdownEndpoint; +import org.springframework.boot.actuate.endpoint.TraceEndpoint; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import static org.junit.Assert.assertEquals; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java index 4f9096889cb..63c140dae0c 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.autoconfigure; +package org.springframework.boot.actuate.autoconfigure; import java.io.FileNotFoundException; import java.net.SocketException; @@ -24,16 +24,16 @@ import java.nio.charset.Charset; import org.junit.After; import org.junit.Test; import org.springframework.boot.TestUtils; +import org.springframework.boot.actuate.autoconfigure.EndpointWebMvcAutoConfiguration; +import org.springframework.boot.actuate.autoconfigure.ManagementServerPropertiesAutoConfiguration; +import org.springframework.boot.actuate.endpoint.AbstractEndpoint; +import org.springframework.boot.actuate.endpoint.Endpoint; +import org.springframework.boot.actuate.properties.ManagementServerProperties; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.autoconfigure.web.EmbeddedServletContainerAutoConfiguration; import org.springframework.boot.autoconfigure.web.ServerPropertiesAutoConfiguration; import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration; import org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; -import org.springframework.boot.ops.autoconfigure.EndpointWebMvcAutoConfiguration; -import org.springframework.boot.ops.autoconfigure.ManagementServerPropertiesAutoConfiguration; -import org.springframework.boot.ops.endpoint.AbstractEndpoint; -import org.springframework.boot.ops.endpoint.Endpoint; -import org.springframework.boot.ops.properties.ManagementServerProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpMethod; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java index 3f0e6209616..a397595bc1f 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.boot.ops.autoconfigure; +package org.springframework.boot.actuate.autoconfigure; import org.junit.Test; -import org.springframework.boot.ops.autoconfigure.ManagementServerPropertiesAutoConfiguration; -import org.springframework.boot.ops.properties.ManagementServerProperties; +import org.springframework.boot.actuate.autoconfigure.ManagementServerPropertiesAutoConfiguration; +import org.springframework.boot.actuate.properties.ManagementServerProperties; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java index f9c3a9aeda7..3de0240fb6d 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.autoconfigure; +package org.springframework.boot.actuate.autoconfigure; import javax.servlet.Filter; import javax.servlet.FilterChain; @@ -22,9 +22,9 @@ import javax.servlet.FilterChain; import org.junit.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import org.springframework.boot.ops.autoconfigure.MetricFilterAutoConfiguration; -import org.springframework.boot.ops.metrics.CounterService; -import org.springframework.boot.ops.metrics.GaugeService; +import org.springframework.boot.actuate.autoconfigure.MetricFilterAutoConfiguration; +import org.springframework.boot.actuate.metrics.CounterService; +import org.springframework.boot.actuate.metrics.GaugeService; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java index 865d24b3f5a..e490e395e79 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.boot.ops.autoconfigure; +package org.springframework.boot.actuate.autoconfigure; import org.junit.Test; -import org.springframework.boot.ops.autoconfigure.MetricRepositoryAutoConfiguration; -import org.springframework.boot.ops.metrics.CounterService; -import org.springframework.boot.ops.metrics.DefaultCounterService; -import org.springframework.boot.ops.metrics.DefaultGaugeService; -import org.springframework.boot.ops.metrics.GaugeService; +import org.springframework.boot.actuate.autoconfigure.MetricRepositoryAutoConfiguration; +import org.springframework.boot.actuate.metrics.CounterService; +import org.springframework.boot.actuate.metrics.DefaultCounterService; +import org.springframework.boot.actuate.metrics.DefaultGaugeService; +import org.springframework.boot.actuate.metrics.GaugeService; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfigurationTests.java index eb923a56ee3..f63c0875a52 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/SecurityAutoConfigurationTests.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.boot.ops.autoconfigure; +package org.springframework.boot.actuate.autoconfigure; import org.junit.Test; +import org.springframework.boot.actuate.autoconfigure.EndpointAutoConfiguration; +import org.springframework.boot.actuate.autoconfigure.SecurityAutoConfiguration; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; -import org.springframework.boot.ops.autoconfigure.EndpointAutoConfiguration; -import org.springframework.boot.ops.autoconfigure.SecurityAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.mock.web.MockServletContext; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java index a16788027c7..c7da9bb07ef 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.boot.ops.autoconfigure; +package org.springframework.boot.actuate.autoconfigure; import org.junit.Test; -import org.springframework.boot.ops.autoconfigure.TraceRepositoryAutoConfiguration; -import org.springframework.boot.ops.trace.InMemoryTraceRepository; -import org.springframework.boot.ops.trace.TraceRepository; +import org.springframework.boot.actuate.autoconfigure.TraceRepositoryAutoConfiguration; +import org.springframework.boot.actuate.trace.InMemoryTraceRepository; +import org.springframework.boot.actuate.trace.TraceRepository; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java index cce79934dda..b46dd370c06 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.boot.ops.autoconfigure; +package org.springframework.boot.actuate.autoconfigure; import org.junit.Test; +import org.springframework.boot.actuate.autoconfigure.TraceRepositoryAutoConfiguration; +import org.springframework.boot.actuate.autoconfigure.TraceWebFilterAutoConfiguration; +import org.springframework.boot.actuate.trace.WebRequestTraceFilter; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; -import org.springframework.boot.ops.autoconfigure.TraceRepositoryAutoConfiguration; -import org.springframework.boot.ops.autoconfigure.TraceWebFilterAutoConfiguration; -import org.springframework.boot.ops.trace.WebRequestTraceFilter; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import static org.junit.Assert.assertNotNull; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/AbstractEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/AbstractEndpointTests.java index f2b3dd95e4b..96b8a9b03d1 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/AbstractEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/AbstractEndpointTests.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.boot.ops.endpoint; +package org.springframework.boot.actuate.endpoint; import java.util.Collections; import org.junit.Before; import org.junit.Test; import org.springframework.boot.TestUtils; -import org.springframework.boot.ops.endpoint.Endpoint; +import org.springframework.boot.actuate.endpoint.Endpoint; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.core.env.MapPropertySource; import org.springframework.core.env.PropertySource; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/BeansEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/BeansEndpointTests.java index bc7cdeb570e..04804d171d3 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/BeansEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/BeansEndpointTests.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.boot.ops.endpoint; +package org.springframework.boot.actuate.endpoint; import org.junit.Test; +import org.springframework.boot.actuate.endpoint.BeansEndpoint; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.ops.endpoint.BeansEndpoint; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.MediaType; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/DumpEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/DumpEndpointTests.java index 7101799e2d0..b0bbf05285e 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/DumpEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/DumpEndpointTests.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.boot.ops.endpoint; +package org.springframework.boot.actuate.endpoint; import java.lang.management.ThreadInfo; import java.util.List; import org.junit.Test; +import org.springframework.boot.actuate.endpoint.DumpEndpoint; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.ops.endpoint.DumpEndpoint; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpointTests.java index eed0fc87a33..133e897f68a 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpointTests.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.boot.ops.endpoint; +package org.springframework.boot.actuate.endpoint; import org.junit.Test; +import org.springframework.boot.actuate.endpoint.EnvironmentEndpoint; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.ops.endpoint.EnvironmentEndpoint; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/HealthEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/HealthEndpointTests.java index b4b069df04b..05ed4853c28 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/HealthEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/HealthEndpointTests.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.boot.ops.endpoint; +package org.springframework.boot.actuate.endpoint; import org.junit.Test; +import org.springframework.boot.actuate.endpoint.HealthEndpoint; +import org.springframework.boot.actuate.health.HealthIndicator; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.ops.endpoint.HealthEndpoint; -import org.springframework.boot.ops.health.HealthIndicator; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/InfoEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/InfoEndpointTests.java index 422d60200af..a6378771018 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/InfoEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/InfoEndpointTests.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.boot.ops.endpoint; +package org.springframework.boot.actuate.endpoint; import java.util.Collections; import org.junit.Test; +import org.springframework.boot.actuate.endpoint.InfoEndpoint; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.ops.endpoint.InfoEndpoint; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/MetricsEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/MetricsEndpointTests.java index 8a8d497f7d6..76be87ac053 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/MetricsEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/MetricsEndpointTests.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.springframework.boot.ops.endpoint; +package org.springframework.boot.actuate.endpoint; import java.util.Collection; import java.util.Collections; import org.junit.Test; +import org.springframework.boot.actuate.endpoint.MetricsEndpoint; +import org.springframework.boot.actuate.endpoint.PublicMetrics; +import org.springframework.boot.actuate.metrics.Metric; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.ops.endpoint.MetricsEndpoint; -import org.springframework.boot.ops.endpoint.PublicMetrics; -import org.springframework.boot.ops.metrics.Metric; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ShutdownEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ShutdownEndpointTests.java index 0a94827ce8e..920583b042d 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ShutdownEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ShutdownEndpointTests.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.boot.ops.endpoint; +package org.springframework.boot.actuate.endpoint; import org.junit.Test; +import org.springframework.boot.actuate.endpoint.ShutdownEndpoint; +import org.springframework.boot.actuate.properties.ManagementServerProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.ops.endpoint.ShutdownEndpoint; -import org.springframework.boot.ops.properties.ManagementServerProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/TraceEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/TraceEndpointTests.java index f1561c8f705..13e1842fb66 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/TraceEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/TraceEndpointTests.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.springframework.boot.ops.endpoint; +package org.springframework.boot.actuate.endpoint; import java.util.Collections; import org.junit.Test; +import org.springframework.boot.actuate.endpoint.TraceEndpoint; +import org.springframework.boot.actuate.trace.InMemoryTraceRepository; +import org.springframework.boot.actuate.trace.Trace; +import org.springframework.boot.actuate.trace.TraceRepository; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.ops.endpoint.TraceEndpoint; -import org.springframework.boot.ops.trace.InMemoryTraceRepository; -import org.springframework.boot.ops.trace.Trace; -import org.springframework.boot.ops.trace.TraceRepository; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/VanillaPublicMetricsTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/VanillaPublicMetricsTests.java index 609ff1e205d..58f10884458 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/VanillaPublicMetricsTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/VanillaPublicMetricsTests.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.springframework.boot.ops.endpoint; +package org.springframework.boot.actuate.endpoint; import java.util.Date; import java.util.HashMap; import java.util.Map; import org.junit.Test; -import org.springframework.boot.ops.endpoint.VanillaPublicMetrics; -import org.springframework.boot.ops.metrics.InMemoryMetricRepository; -import org.springframework.boot.ops.metrics.Metric; +import org.springframework.boot.actuate.endpoint.VanillaPublicMetrics; +import org.springframework.boot.actuate.metrics.InMemoryMetricRepository; +import org.springframework.boot.actuate.metrics.Metric; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java index de6b220cbb2..bb0251d9cc4 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.boot.ops.endpoint.mvc; +package org.springframework.boot.actuate.endpoint.mvc; import org.junit.Test; -import org.springframework.boot.ops.endpoint.Endpoint; -import org.springframework.boot.ops.endpoint.mvc.EndpointHandlerAdapter; +import org.springframework.boot.actuate.endpoint.Endpoint; +import org.springframework.boot.actuate.endpoint.mvc.EndpointHandlerAdapter; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerMappingTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerMappingTests.java index 2396e05de48..4e41f5b5544 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerMappingTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/EndpointHandlerMappingTests.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.boot.ops.endpoint.mvc; +package org.springframework.boot.actuate.endpoint.mvc; import java.util.Arrays; import org.junit.Test; -import org.springframework.boot.ops.endpoint.AbstractEndpoint; -import org.springframework.boot.ops.endpoint.ActionEndpoint; -import org.springframework.boot.ops.endpoint.mvc.EndpointHandlerMapping; +import org.springframework.boot.actuate.endpoint.AbstractEndpoint; +import org.springframework.boot.actuate.endpoint.ActionEndpoint; +import org.springframework.boot.actuate.endpoint.mvc.EndpointHandlerMapping; import org.springframework.mock.web.MockHttpServletRequest; import static org.hamcrest.Matchers.equalTo; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/fixme/ErrorConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/fixme/ErrorConfigurationTests.java index e4c9abbab30..4025f3380f1 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/fixme/ErrorConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/fixme/ErrorConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.ops.fixme; +package org.springframework.boot.actuate.fixme; /** * @author Dave Syer diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/VanillaHealthIndicatorTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/VanillaHealthIndicatorTests.java index 7ab275d9d7d..5c0a669e855 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/VanillaHealthIndicatorTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/VanillaHealthIndicatorTests.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.boot.ops.health; +package org.springframework.boot.actuate.health; import org.junit.Test; -import org.springframework.boot.ops.health.VanillaHealthIndicator; +import org.springframework.boot.actuate.health.VanillaHealthIndicator; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/DefaultCounterServiceTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/DefaultCounterServiceTests.java index f933f363238..319296c32a0 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/DefaultCounterServiceTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/DefaultCounterServiceTests.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.boot.ops.metrics; +package org.springframework.boot.actuate.metrics; import org.junit.Ignore; import org.junit.Test; -import org.springframework.boot.ops.metrics.DefaultCounterService; +import org.springframework.boot.actuate.metrics.DefaultCounterService; import static org.junit.Assert.fail; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/DefaultGaugeServiceTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/DefaultGaugeServiceTests.java index 970833712a0..1810e93e40d 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/DefaultGaugeServiceTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/DefaultGaugeServiceTests.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.boot.ops.metrics; +package org.springframework.boot.actuate.metrics; import org.junit.Ignore; import org.junit.Test; -import org.springframework.boot.ops.metrics.DefaultGaugeService; +import org.springframework.boot.actuate.metrics.DefaultGaugeService; import static org.junit.Assert.fail; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/InMemoryMetricRepositoryTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/InMemoryMetricRepositoryTests.java index de0aed551c8..ad48d2f607c 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/InMemoryMetricRepositoryTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/InMemoryMetricRepositoryTests.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.boot.ops.metrics; +package org.springframework.boot.actuate.metrics; import org.junit.Ignore; import org.junit.Test; -import org.springframework.boot.ops.metrics.InMemoryMetricRepository; +import org.springframework.boot.actuate.metrics.InMemoryMetricRepository; import static org.junit.Assert.fail; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/properties/SecurityPropertiesTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/properties/SecurityPropertiesTests.java index 2b9f1d26e01..59736f80144 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/properties/SecurityPropertiesTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/properties/SecurityPropertiesTests.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.boot.ops.properties; +package org.springframework.boot.actuate.properties; import java.util.Collections; import org.junit.Test; import org.springframework.beans.MutablePropertyValues; +import org.springframework.boot.actuate.properties.SecurityProperties; import org.springframework.boot.bind.RelaxedDataBinder; -import org.springframework.boot.ops.properties.SecurityProperties; import org.springframework.core.convert.support.DefaultConversionService; import static org.junit.Assert.assertEquals; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthenticationAuditListenerTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthenticationAuditListenerTests.java index f5f45b1429d..8778c78123e 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthenticationAuditListenerTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthenticationAuditListenerTests.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.boot.ops.security; +package org.springframework.boot.actuate.security; import org.junit.Ignore; import org.junit.Test; -import org.springframework.boot.ops.security.AuthenticationAuditListener; +import org.springframework.boot.actuate.security.AuthenticationAuditListener; import static org.junit.Assert.fail; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthorizationAuditListenerTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthorizationAuditListenerTests.java index 74408d2b8b8..1d344b11b2f 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthorizationAuditListenerTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/security/AuthorizationAuditListenerTests.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.boot.ops.security; +package org.springframework.boot.actuate.security; import org.junit.Ignore; import org.junit.Test; -import org.springframework.boot.ops.security.AuthenticationAuditListener; +import org.springframework.boot.actuate.security.AuthenticationAuditListener; import static org.junit.Assert.fail; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/InMemoryTraceRepositoryTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/InMemoryTraceRepositoryTests.java index 4302c3acf36..0d9b6a036fe 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/InMemoryTraceRepositoryTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/InMemoryTraceRepositoryTests.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.boot.ops.trace; +package org.springframework.boot.actuate.trace; import java.util.Collections; import java.util.List; import org.junit.Test; -import org.springframework.boot.ops.trace.InMemoryTraceRepository; -import org.springframework.boot.ops.trace.Trace; +import org.springframework.boot.actuate.trace.InMemoryTraceRepository; +import org.springframework.boot.actuate.trace.Trace; import static org.junit.Assert.assertEquals; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/WebRequestTraceFilterTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/WebRequestTraceFilterTests.java index d0c25dd8801..cade5c64c97 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/WebRequestTraceFilterTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/WebRequestTraceFilterTests.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.boot.ops.trace; +package org.springframework.boot.actuate.trace; import java.util.Map; import org.junit.Test; -import org.springframework.boot.ops.trace.InMemoryTraceRepository; -import org.springframework.boot.ops.trace.WebRequestTraceFilter; +import org.springframework.boot.actuate.trace.InMemoryTraceRepository; +import org.springframework.boot.actuate.trace.WebRequestTraceFilter; import org.springframework.mock.web.MockHttpServletRequest; import static org.junit.Assert.assertEquals; diff --git a/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplication.java b/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplication.java index 97b22deb36b..503d1e8e665 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplication.java +++ b/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplication.java @@ -20,8 +20,8 @@ import java.util.Date; import java.util.Map; import org.springframework.boot.SpringApplication; +import org.springframework.boot.actuate.properties.SecurityProperties; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.ops.properties.SecurityProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.stereotype.Controller;