Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Renamed packages

Browse Source 
Issue: #54095231
This commit is contained in:
Phillip Webb
2013-07-26 14:10:38 -07:00
parent 3f2bb03fb8
commit b665a2bb1d
332 changed files with 785 additions and 826 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-ops/docs/Features.md
View File

@@ -7,7 +7,7 @@ getting started project from the main README), and then try each
feature in turn there.
Many useful features of
[Spring Bootstrap](../../spring-bootstrap/README.md) are all available
[Spring Boot](../../spring-boot/README.md) are all available
in an Actuator application.
TODO: group things together and break them out into separate files.

2
spring-boot-ops/pom.xml
View File

@@ -74,7 +74,7 @@
<!-- Test -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot-strap</artifactId>
<artifactId>spring-boot</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>

6
spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/AuditAutoConfiguration.java
View File

@@ -17,15 +17,15 @@
package org.springframework.boot.ops.autoconfigure;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.config.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.context.condition.ConditionalOnClass;
import org.springframework.boot.context.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.boot.strap.context.condition.ConditionalOnClass;
import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

6
spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointAutoConfiguration.java
View File

@@ -22,7 +22,9 @@ import java.util.Properties;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.config.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.bind.PropertiesConfigurationFactory;
import org.springframework.boot.context.condition.ConditionalOnMissingBean;
import org.springframework.boot.ops.endpoint.BeansEndpoint;
import org.springframework.boot.ops.endpoint.DumpEndpoint;
import org.springframework.boot.ops.endpoint.Endpoint;
@@ -40,8 +42,6 @@ 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.boot.strap.bind.PropertiesConfigurationFactory;
import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.ConfigurableEnvironment;

18
spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcAutoConfiguration.java
View File

@@ -22,19 +22,19 @@ 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.config.AutoConfigureAfter;
import org.springframework.boot.config.EnableAutoConfiguration;
import org.springframework.boot.config.PropertyPlaceholderAutoConfiguration;
import org.springframework.boot.config.web.EmbeddedServletContainerAutoConfiguration;
import org.springframework.boot.config.web.WebMvcAutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
import org.springframework.boot.autoconfigure.web.EmbeddedServletContainerAutoConfiguration;
import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration;
import org.springframework.boot.context.condition.ConditionalOnClass;
import org.springframework.boot.context.condition.ConditionalOnMissingBean;
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.boot.strap.context.condition.ConditionalOnClass;
import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
import org.springframework.boot.strap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
import org.springframework.boot.strap.context.embedded.properties.ServerProperties;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.ApplicationListener;

12
spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcChildContextConfiguration.java
View File

@@ -21,15 +21,15 @@ 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.context.condition.ConditionalOnBean;
import org.springframework.boot.context.condition.ConditionalOnClass;
import org.springframework.boot.context.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.boot.strap.context.condition.ConditionalOnBean;
import org.springframework.boot.strap.context.condition.ConditionalOnClass;
import org.springframework.boot.strap.context.condition.SearchStrategy;
import org.springframework.boot.strap.context.embedded.ConfigurableEmbeddedServletContainerFactory;
import org.springframework.boot.strap.context.embedded.EmbeddedServletContainer;
import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerCustomizer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;

12
spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/ErrorMvcAutoConfiguration.java
View File

@@ -19,14 +19,14 @@ package org.springframework.boot.ops.autoconfigure;
import javax.servlet.Servlet;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.config.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.context.condition.ConditionalOnClass;
import org.springframework.boot.context.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.boot.strap.context.condition.ConditionalOnClass;
import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
import org.springframework.boot.strap.context.embedded.ConfigurableEmbeddedServletContainerFactory;
import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerCustomizer;
import org.springframework.boot.strap.context.embedded.ErrorPage;
import org.springframework.context.annotation.Bean;
import org.springframework.web.servlet.DispatcherServlet;

10
spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/ManagementServerPropertiesAutoConfiguration.java
View File

@@ -16,12 +16,12 @@
package org.springframework.boot.ops.autoconfigure;
import org.springframework.boot.config.AutoConfigureAfter;
import org.springframework.boot.config.EnableAutoConfiguration;
import org.springframework.boot.config.web.ServerPropertiesAutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.web.ServerPropertiesAutoConfiguration;
import org.springframework.boot.context.condition.ConditionalOnMissingBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.ops.properties.ManagementServerProperties;
import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
import org.springframework.boot.strap.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

8
spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/MetricFilterAutoConfiguration.java
View File

@@ -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.config.AutoConfigureAfter;
import org.springframework.boot.config.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.context.condition.ConditionalOnBean;
import org.springframework.boot.context.condition.ConditionalOnClass;
import org.springframework.boot.ops.metrics.CounterService;
import org.springframework.boot.ops.metrics.GaugeService;
import org.springframework.boot.strap.context.condition.ConditionalOnBean;
import org.springframework.boot.strap.context.condition.ConditionalOnClass;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.Ordered;

4
spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/MetricRepositoryAutoConfiguration.java
View File

@@ -16,14 +16,14 @@
package org.springframework.boot.ops.autoconfigure;
import org.springframework.boot.config.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.context.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.boot.strap.context.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

8
spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/SecurityAutoConfiguration.java
View File

@@ -21,14 +21,14 @@ import java.util.Arrays;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.config.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.context.condition.ConditionalOnClass;
import org.springframework.boot.context.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.boot.strap.context.condition.ConditionalOnClass;
import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
import org.springframework.boot.strap.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.Ordered;

4
spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/TraceRepositoryAutoConfiguration.java
View File

@@ -16,10 +16,10 @@
package org.springframework.boot.ops.autoconfigure;
import org.springframework.boot.config.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.context.condition.ConditionalOnMissingBean;
import org.springframework.boot.ops.trace.InMemoryTraceRepository;
import org.springframework.boot.ops.trace.TraceRepository;
import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

6
spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/TraceWebFilterAutoConfiguration.java
View File

@@ -21,11 +21,11 @@ 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.config.AutoConfigureAfter;
import org.springframework.boot.config.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.context.condition.ConditionalOnClass;
import org.springframework.boot.ops.trace.TraceRepository;
import org.springframework.boot.ops.trace.WebRequestTraceFilter;
import org.springframework.boot.strap.context.condition.ConditionalOnClass;
import org.springframework.context.annotation.Bean;
import org.springframework.web.servlet.DispatcherServlet;

2
spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/BeansEndpoint.java
View File

@@ -17,7 +17,7 @@
package org.springframework.boot.ops.endpoint;
import org.springframework.beans.BeansException;
import org.springframework.boot.strap.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.support.LiveBeansView;

2
spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/DumpEndpoint.java
View File

@@ -21,7 +21,7 @@ import java.lang.management.ThreadInfo;
import java.util.Arrays;
import java.util.List;
import org.springframework.boot.strap.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
* {@link Endpoint} to expose thread info.

2
spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/EnvironmentEndpoint.java
View File

@@ -19,7 +19,7 @@ package org.springframework.boot.ops.endpoint;
import java.util.LinkedHashMap;
import java.util.Map;
import org.springframework.boot.strap.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.EnvironmentAware;
import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.core.env.EnumerablePropertySource;

2
spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/HealthEndpoint.java
View File

@@ -16,8 +16,8 @@
package org.springframework.boot.ops.endpoint;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.ops.health.HealthIndicator;
import org.springframework.boot.strap.context.properties.ConfigurationProperties;
import org.springframework.util.Assert;
/**

2
spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/InfoEndpoint.java
View File

@@ -20,7 +20,7 @@ import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;
import org.springframework.boot.strap.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.util.Assert;
/**

2
spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/MetricsEndpoint.java
View File

@@ -19,8 +19,8 @@ package org.springframework.boot.ops.endpoint;
import java.util.LinkedHashMap;
import java.util.Map;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.ops.metrics.Metric;
import org.springframework.boot.strap.context.properties.ConfigurationProperties;
import org.springframework.util.Assert;
/**

2
spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/ShutdownEndpoint.java
View File

@@ -21,8 +21,8 @@ import java.util.Map;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.ops.properties.ManagementServerProperties;
import org.springframework.boot.strap.context.properties.ConfigurationProperties;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.ConfigurableApplicationContext;

2
spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/TraceEndpoint.java
View File

@@ -18,9 +18,9 @@ package org.springframework.boot.ops.endpoint;
import java.util.List;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.ops.trace.Trace;
import org.springframework.boot.ops.trace.TraceRepository;
import org.springframework.boot.strap.context.properties.ConfigurationProperties;
import org.springframework.util.Assert;
/**

4
spring-boot-ops/src/main/java/org/springframework/boot/ops/properties/ManagementServerProperties.java
View File

@@ -20,8 +20,8 @@ import java.net.InetAddress;
import javax.validation.constraints.NotNull;
import org.springframework.boot.strap.context.embedded.properties.ServerProperties;
import org.springframework.boot.strap.context.properties.ConfigurationProperties;
import org.springframework.boot.context.embedded.properties.ServerProperties;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
* Properties for the management server (e.g. port and path settings).

2
spring-boot-ops/src/main/java/org/springframework/boot/ops/properties/SecurityProperties.java
View File

@@ -16,7 +16,7 @@
package org.springframework.boot.ops.properties;
import org.springframework.boot.strap.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.security.config.annotation.web.configurers.SessionCreationPolicy;
/**

2
spring-boot-ops/src/main/java/org/springframework/boot/ops/web/BasicErrorController.java
View File

@@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletRequest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.strap.context.embedded.AbstractEmbeddedServletContainerFactory;
import org.springframework.boot.context.embedded.AbstractEmbeddedServletContainerFactory;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;

2
spring-boot-ops/src/main/resources/META-INF/spring.factories
View File

@@ -1,4 +1,4 @@
org.springframework.boot.config.EnableAutoConfiguration=\
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.springframework.boot.ops.autoconfigure.AuditAutoConfiguration,\
org.springframework.boot.ops.autoconfigure.EndpointAutoConfiguration,\
org.springframework.boot.ops.autoconfigure.EndpointWebMvcAutoConfiguration,\

2
spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/EndpointAutoConfigurationTests.java
View File

@@ -18,6 +18,7 @@ package org.springframework.boot.ops.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;
@@ -27,7 +28,6 @@ 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.strap.TestUtils;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import static org.junit.Assert.assertEquals;

12
spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcAutoConfigurationTests.java
View File

@@ -23,17 +23,17 @@ import java.nio.charset.Charset;
import org.junit.After;
import org.junit.Test;
import org.springframework.boot.config.PropertyPlaceholderAutoConfiguration;
import org.springframework.boot.config.web.EmbeddedServletContainerAutoConfiguration;
import org.springframework.boot.config.web.ServerPropertiesAutoConfiguration;
import org.springframework.boot.config.web.WebMvcAutoConfiguration;
import org.springframework.boot.TestUtils;
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.boot.strap.TestUtils;
import org.springframework.boot.strap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpMethod;

2
spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/SecurityAutoConfigurationTests.java
View File

@@ -17,7 +17,7 @@
package org.springframework.boot.ops.autoconfigure;
import org.junit.Test;
import org.springframework.boot.config.PropertyPlaceholderAutoConfiguration;
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;

2
spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/TraceWebFilterAutoConfigurationTest.java
View File

@@ -17,7 +17,7 @@
package org.springframework.boot.ops.autoconfigure;
import org.junit.Test;
import org.springframework.boot.config.PropertyPlaceholderAutoConfiguration;
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;

2
spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/AbstractEndpointTests.java
View File

@@ -20,8 +20,8 @@ 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.strap.TestUtils;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.core.env.MapPropertySource;
import org.springframework.core.env.PropertySource;

2
spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/BeansEndpointTests.java
View File

@@ -17,8 +17,8 @@
package org.springframework.boot.ops.endpoint;
import org.junit.Test;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.ops.endpoint.BeansEndpoint;
import org.springframework.boot.strap.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.MediaType;

2
spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/DumpEndpointTests.java
View File

@@ -20,8 +20,8 @@ import java.lang.management.ThreadInfo;
import java.util.List;
import org.junit.Test;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.ops.endpoint.DumpEndpoint;
import org.springframework.boot.strap.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

2
spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/EnvironmentEndpointTests.java
View File

@@ -17,8 +17,8 @@
package org.springframework.boot.ops.endpoint;
import org.junit.Test;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.ops.endpoint.EnvironmentEndpoint;
import org.springframework.boot.strap.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

2
spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/HealthEndpointTests.java
View File

@@ -17,9 +17,9 @@
package org.springframework.boot.ops.endpoint;
import org.junit.Test;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.ops.endpoint.HealthEndpoint;
import org.springframework.boot.ops.health.HealthIndicator;
import org.springframework.boot.strap.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

2
spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/InfoEndpointTests.java
View File

@@ -19,8 +19,8 @@ package org.springframework.boot.ops.endpoint;
import java.util.Collections;
import org.junit.Test;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.ops.endpoint.InfoEndpoint;
import org.springframework.boot.strap.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

2
spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/MetricsEndpointTests.java
View File

@@ -20,10 +20,10 @@ import java.util.Collection;
import java.util.Collections;
import org.junit.Test;
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.boot.strap.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

2
spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/ShutdownEndpointTests.java
View File

@@ -17,9 +17,9 @@
package org.springframework.boot.ops.endpoint;
import org.junit.Test;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.ops.endpoint.ShutdownEndpoint;
import org.springframework.boot.ops.properties.ManagementServerProperties;
import org.springframework.boot.strap.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

2
spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/TraceEndpointTests.java
View File

@@ -19,11 +19,11 @@ package org.springframework.boot.ops.endpoint;
import java.util.Collections;
import org.junit.Test;
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.boot.strap.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

2
spring-boot-ops/src/test/java/org/springframework/boot/ops/properties/SecurityPropertiesTests.java
View File

@@ -20,8 +20,8 @@ import java.util.Collections;
import org.junit.Test;
import org.springframework.beans.MutablePropertyValues;
import org.springframework.boot.bind.RelaxedDataBinder;
import org.springframework.boot.ops.properties.SecurityProperties;
import org.springframework.boot.strap.bind.RelaxedDataBinder;
import org.springframework.core.convert.support.DefaultConversionService;
import static org.junit.Assert.assertEquals;