Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-15 01:07:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Package restructure

Browse Source
This commit is contained in:
Phillip Webb 2013-07-08 13:39:03 -07:00
parent cd51f357a3
commit 0b863611d9
389 changed files with 1111 additions and 1051 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
spring-actuator/docs/Features.md
View File

@ -1,12 +1,12 @@
# Spring Zero Actuator Feature Guide # Spring Actuator Feature Guide
Here are some (most, hopefully all) the features of Spring Zero Here are some (most, hopefully all) the features of Spring Actuator
Actuator with some commentary to help you start using them. We with some commentary to help you start using them. We
recommend you first build a project with the Actuator (e.g. the recommend you first build a project with the Actuator (e.g. the
getting started project from the main README), and then try each getting started project from the main README), and then try each
feature in turn there. feature in turn there.
TODO: some of these are features of Spring Zero (or TODO: some of these are features of Spring Bootstrap (or
`SpringApplication`) not the Actuator. `SpringApplication`) not the Actuator.
TODO: group things together and break them out into separate files. TODO: group things together and break them out into separate files.
@ -33,7 +33,7 @@ The default value comes after the first colon (":").
## Externalized Configuration ## Externalized Configuration
In addition to command line option arguments, Spring Zero will In addition to command line option arguments, Spring Bootstrap will
pick up a file called `application.properties` in the root of your pick up a file called `application.properties` in the root of your
classpath (if there is one) and add those properties to the Spring classpath (if there is one) and add those properties to the Spring
`Environment`. The search path for `application.properties` is `Environment`. The search path for `application.properties` is
@ -49,7 +49,7 @@ previously defined values (e.g. from System properties), e.g.
app.name: MyApp app.name: MyApp
app.description: ${app.name} is a Cool New App app.description: ${app.name} is a Cool New App
Spring Zero also binds the properties to any bean in your Spring Bootstrap also binds the properties to any bean in your
application context whose type is `@ConfigurationProperties`. The application context whose type is `@ConfigurationProperties`. The
Actuator provides some of those beans out of the box, so you can Actuator provides some of those beans out of the box, so you can
easily customize server and management properties (ports etc.), easily customize server and management properties (ports etc.),
@ -63,7 +63,7 @@ configuration and make it only available in certain environments. Any
`@Component` that is marked with `@Profile` will only be loaded in the `@Component` that is marked with `@Profile` will only be loaded in the
profile specified by the latter annotation. profile specified by the latter annotation.
Spring Zero takes it a stage further. If you include in your Spring Bootstap takes it a stage further. If you include in your
`application.properties` a value for a property named `application.properties` a value for a property named
`spring.active.profiles` then those profiles will be active by `spring.active.profiles` then those profiles will be active by
default. E.g. default. E.g.
@ -72,7 +72,7 @@ default. E.g.
## Profile-dependent configuration ## Profile-dependent configuration
Spring Zero loads additional properties files if there are active Spring Bootstrap loads additional properties files if there are active
profiles using a naming convention `application-{profile}.properties`. profiles using a naming convention `application-{profile}.properties`.
Property values from those files override trhe default ones. Property values from those files override trhe default ones.
@ -98,7 +98,7 @@ to one of your `@Configuration` (or `@Component`) classes. Then you can
in any of your component classes to grab that configuration and use it. in any of your component classes to grab that configuration and use it.
Spring Zero uses some relaxed rules for binding `Environment` Spring Bootstrap uses some relaxed rules for binding `Environment`
properties to `@ConfigurationProperties` beans, so there doesn't need properties to `@ConfigurationProperties` beans, so there doesn't need
to be an exact match between the `Environment` property name and the to be an exact match between the `Environment` property name and the
bean property name. Common examples where this is useful include bean property name. Common examples where this is useful include
@ -137,7 +137,7 @@ compiler or IDE.
YAML is a superset of JSON, and as such is a very convenient format YAML is a superset of JSON, and as such is a very convenient format
for specifying hierarchical configuration data, such as that supported for specifying hierarchical configuration data, such as that supported
by Spring Zero Actuator. If you prefer to use by Spring Actuator. If you prefer to use
[YAML](http://yaml.org) instead of Properties files you just need to [YAML](http://yaml.org) instead of Properties files you just need to
include a file called `application.yml` in the root of your classpath include a file called `application.yml` in the root of your classpath
@ -212,7 +212,7 @@ properties in the application properties (see
* To enable the Tomcat access log valve (very common in production environments) * To enable the Tomcat access log valve (very common in production environments)
More fine-grained control of the Tomcat container is available if you More fine-grained control of the Tomcat container is available if you
need it. Instead of letting Spring Zero create the container for need it. Instead of letting Spring Actuator create the container for
you, just create a bean of type you, just create a bean of type
`TomcatEmbeddedServletContainerFactory` and override one of its `TomcatEmbeddedServletContainerFactory` and override one of its
methods, or inject some customizations, e.g. methods, or inject some customizations, e.g.
@ -256,7 +256,7 @@ this.
## Customizing Logging ## Customizing Logging
Spring Zero uses SLF4J for logging, but leaves the implementation Spring Actuator uses SLF4J for logging, but leaves the implementation
open. The Starter projects and the Actuator use JDK native logging by open. The Starter projects and the Actuator use JDK native logging by
default, purely because it is always available. A default default, purely because it is always available. A default
configuration file is provided for JDK logging, and also for log4j and configuration file is provided for JDK logging, and also for log4j and
@ -286,11 +286,11 @@ from the Spring `Environment` to System properties:
All the logging systems supported can consult System properties when All the logging systems supported can consult System properties when
parsing their configuration files. See the default configurations in parsing their configuration files. See the default configurations in
`spring-zero-core.jar` for examples. `spring-bootstrap.jar` for examples.
## Application Context Initializers ## Application Context Initializers
To add additional application context initializers to the Zero To add additional application context initializers to the bootstrap
startup process, add a comma-delimited list of class names to the startup process, add a comma-delimited list of class names to the
`Environment` property `context.initializer.classes` (can be specified `Environment` property `context.initializer.classes` (can be specified
via `application.properties`). via `application.properties`).

2
spring-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEvent.java → spring-actuator/src/main/java/org/springframework/actuate/audit/AuditEvent.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.audit; package org.springframework.actuate.audit;
import java.io.Serializable; import java.io.Serializable;
import java.util.Collections; import java.util.Collections;

2
spring-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEventRepository.java → spring-actuator/src/main/java/org/springframework/actuate/audit/AuditEventRepository.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.audit; package org.springframework.actuate.audit;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;

2
spring-actuator/src/main/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepository.java → spring-actuator/src/main/java/org/springframework/actuate/audit/InMemoryAuditEventRepository.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.audit; package org.springframework.actuate.audit;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;

4
spring-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditApplicationEvent.java → spring-actuator/src/main/java/org/springframework/actuate/audit/listener/AuditApplicationEvent.java
View File

@ -14,14 +14,14 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.audit.listener; package org.springframework.actuate.audit.listener;
import java.util.Date; import java.util.Date;
import java.util.Map; import java.util.Map;
import org.springframework.actuate.audit.AuditEvent;
import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEvent;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.zero.actuate.audit.AuditEvent;
/** /**
* Spring {@link ApplicationEvent} to encapsulate {@link AuditEvent}s. * Spring {@link ApplicationEvent} to encapsulate {@link AuditEvent}s.

6
spring-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditListener.java → spring-actuator/src/main/java/org/springframework/actuate/audit/listener/AuditListener.java
View File

@ -14,13 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.audit.listener; package org.springframework.actuate.audit.listener;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.actuate.audit.AuditEvent;
import org.springframework.actuate.audit.AuditEventRepository;
import org.springframework.context.ApplicationListener; import org.springframework.context.ApplicationListener;
import org.springframework.zero.actuate.audit.AuditEvent;
import org.springframework.zero.actuate.audit.AuditEventRepository;
/** /**
* {@link ApplicationListener} that listens for {@link AuditEvent}s and stores them in a * {@link ApplicationListener} that listens for {@link AuditEvent}s and stores them in a

20
spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfiguration.java → spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/AuditAutoConfiguration.java
View File

@ -14,20 +14,20 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.autoconfigure; package org.springframework.actuate.autoconfigure;
import org.springframework.actuate.audit.AuditEvent;
import org.springframework.actuate.audit.AuditEventRepository;
import org.springframework.actuate.audit.InMemoryAuditEventRepository;
import org.springframework.actuate.audit.listener.AuditListener;
import org.springframework.actuate.security.AuthenticationAuditListener;
import org.springframework.actuate.security.AuthorizationAuditListener;
import org.springframework.autoconfigure.EnableAutoConfiguration;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.bootstrap.context.condition.ConditionalOnClass;
import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.zero.actuate.audit.AuditEvent;
import org.springframework.zero.actuate.audit.AuditEventRepository;
import org.springframework.zero.actuate.audit.InMemoryAuditEventRepository;
import org.springframework.zero.actuate.audit.listener.AuditListener;
import org.springframework.zero.actuate.security.AuthenticationAuditListener;
import org.springframework.zero.actuate.security.AuthorizationAuditListener;
import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
import org.springframework.zero.context.condition.ConditionalOnClass;
import org.springframework.zero.context.condition.ConditionalOnMissingBean;
/** /**
* {@link EnableAutoConfiguration Auto-configuration} for {@link AuditEvent}s. * {@link EnableAutoConfiguration Auto-configuration} for {@link AuditEvent}s.

42
spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java → spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/EndpointAutoConfiguration.java
View File

@ -14,40 +14,40 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.autoconfigure; package org.springframework.actuate.autoconfigure;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import java.util.Properties; import java.util.Properties;
import org.springframework.actuate.endpoint.BeansEndpoint;
import org.springframework.actuate.endpoint.DumpEndpoint;
import org.springframework.actuate.endpoint.Endpoint;
import org.springframework.actuate.endpoint.EnvironmentEndpoint;
import org.springframework.actuate.endpoint.HealthEndpoint;
import org.springframework.actuate.endpoint.InfoEndpoint;
import org.springframework.actuate.endpoint.MetricsEndpoint;
import org.springframework.actuate.endpoint.PublicMetrics;
import org.springframework.actuate.endpoint.ShutdownEndpoint;
import org.springframework.actuate.endpoint.TraceEndpoint;
import org.springframework.actuate.endpoint.VanillaPublicMetrics;
import org.springframework.actuate.health.HealthIndicator;
import org.springframework.actuate.health.VanillaHealthIndicator;
import org.springframework.actuate.metrics.InMemoryMetricRepository;
import org.springframework.actuate.metrics.MetricRepository;
import org.springframework.actuate.trace.InMemoryTraceRepository;
import org.springframework.actuate.trace.TraceRepository;
import org.springframework.autoconfigure.EnableAutoConfiguration;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.bootstrap.bind.PropertiesConfigurationFactory;
import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.core.env.StandardEnvironment; import org.springframework.core.env.StandardEnvironment;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PropertiesLoaderUtils; import org.springframework.core.io.support.PropertiesLoaderUtils;
import org.springframework.zero.actuate.endpoint.BeansEndpoint;
import org.springframework.zero.actuate.endpoint.DumpEndpoint;
import org.springframework.zero.actuate.endpoint.Endpoint;
import org.springframework.zero.actuate.endpoint.EnvironmentEndpoint;
import org.springframework.zero.actuate.endpoint.HealthEndpoint;
import org.springframework.zero.actuate.endpoint.InfoEndpoint;
import org.springframework.zero.actuate.endpoint.MetricsEndpoint;
import org.springframework.zero.actuate.endpoint.PublicMetrics;
import org.springframework.zero.actuate.endpoint.ShutdownEndpoint;
import org.springframework.zero.actuate.endpoint.TraceEndpoint;
import org.springframework.zero.actuate.endpoint.VanillaPublicMetrics;
import org.springframework.zero.actuate.health.HealthIndicator;
import org.springframework.zero.actuate.health.VanillaHealthIndicator;
import org.springframework.zero.actuate.metrics.InMemoryMetricRepository;
import org.springframework.zero.actuate.metrics.MetricRepository;
import org.springframework.zero.actuate.trace.InMemoryTraceRepository;
import org.springframework.zero.actuate.trace.TraceRepository;
import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
import org.springframework.zero.bind.PropertiesConfigurationFactory;
import org.springframework.zero.context.condition.ConditionalOnMissingBean;
/** /**
* {@link EnableAutoConfiguration Auto-configuration} for common management * {@link EnableAutoConfiguration Auto-configuration} for common management

28
spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java → spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java
View File

@ -14,14 +14,27 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.autoconfigure; package org.springframework.actuate.autoconfigure;
import javax.servlet.Servlet; import javax.servlet.Servlet;
import org.springframework.actuate.endpoint.Endpoint;
import org.springframework.actuate.endpoint.mvc.EndpointHandlerAdapter;
import org.springframework.actuate.endpoint.mvc.EndpointHandlerMapping;
import org.springframework.actuate.properties.ManagementServerProperties;
import org.springframework.autoconfigure.AutoConfigureAfter;
import org.springframework.autoconfigure.EnableAutoConfiguration;
import org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration;
import org.springframework.autoconfigure.web.EmbeddedServletContainerAutoConfiguration;
import org.springframework.autoconfigure.web.WebMvcAutoConfiguration;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.bootstrap.context.condition.ConditionalOnClass;
import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean;
import org.springframework.bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
import org.springframework.bootstrap.context.embedded.properties.ServerProperties;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware; import org.springframework.context.ApplicationContextAware;
import org.springframework.context.ApplicationListener; import org.springframework.context.ApplicationListener;
@ -31,19 +44,6 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.event.ContextClosedEvent; import org.springframework.context.event.ContextClosedEvent;
import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.web.servlet.DispatcherServlet; import org.springframework.web.servlet.DispatcherServlet;
import org.springframework.zero.actuate.endpoint.Endpoint;
import org.springframework.zero.actuate.endpoint.mvc.EndpointHandlerAdapter;
import org.springframework.zero.actuate.endpoint.mvc.EndpointHandlerMapping;
import org.springframework.zero.actuate.properties.ManagementServerProperties;
import org.springframework.zero.autoconfigure.AutoConfigureAfter;
import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration;
import org.springframework.zero.autoconfigure.web.EmbeddedServletContainerAutoConfiguration;
import org.springframework.zero.autoconfigure.web.WebMvcAutoConfiguration;
import org.springframework.zero.context.condition.ConditionalOnClass;
import org.springframework.zero.context.condition.ConditionalOnMissingBean;
import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
import org.springframework.zero.context.embedded.properties.ServerProperties;
/** /**
* {@link EnableAutoConfiguration Auto-configuration} to enable Spring MVC to handle * {@link EnableAutoConfiguration Auto-configuration} to enable Spring MVC to handle

18
spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java → spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java
View File

@ -14,27 +14,27 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.autoconfigure; package org.springframework.actuate.autoconfigure;
import javax.servlet.Filter; import javax.servlet.Filter;
import org.springframework.actuate.endpoint.mvc.EndpointHandlerAdapter;
import org.springframework.actuate.endpoint.mvc.EndpointHandlerMapping;
import org.springframework.actuate.properties.ManagementServerProperties;
import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.HierarchicalBeanFactory; import org.springframework.beans.factory.HierarchicalBeanFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.bootstrap.context.condition.ConditionalOnBean;
import org.springframework.bootstrap.context.condition.ConditionalOnClass;
import org.springframework.bootstrap.context.embedded.ConfigurableEmbeddedServletContainerFactory;
import org.springframework.bootstrap.context.embedded.EmbeddedServletContainer;
import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerCustomizer;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.web.servlet.DispatcherServlet; import org.springframework.web.servlet.DispatcherServlet;
import org.springframework.web.servlet.HandlerAdapter; import org.springframework.web.servlet.HandlerAdapter;
import org.springframework.web.servlet.HandlerMapping; import org.springframework.web.servlet.HandlerMapping;
import org.springframework.zero.actuate.endpoint.mvc.EndpointHandlerAdapter;
import org.springframework.zero.actuate.endpoint.mvc.EndpointHandlerMapping;
import org.springframework.zero.actuate.properties.ManagementServerProperties;
import org.springframework.zero.context.condition.ConditionalOnBean;
import org.springframework.zero.context.condition.ConditionalOnClass;
import org.springframework.zero.context.embedded.ConfigurableEmbeddedServletContainerFactory;
import org.springframework.zero.context.embedded.EmbeddedServletContainer;
import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizer;
/** /**
* Configuration for triggered from {@link EndpointWebMvcAutoConfiguration} when a new * Configuration for triggered from {@link EndpointWebMvcAutoConfiguration} when a new

18
spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ErrorMvcAutoConfiguration.java → spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/ErrorMvcAutoConfiguration.java
View File

@ -14,21 +14,21 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.autoconfigure; package org.springframework.actuate.autoconfigure;
import javax.servlet.Servlet; import javax.servlet.Servlet;
import org.springframework.actuate.web.BasicErrorController;
import org.springframework.actuate.web.ErrorController;
import org.springframework.autoconfigure.EnableAutoConfiguration;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.bootstrap.context.condition.ConditionalOnClass;
import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean;
import org.springframework.bootstrap.context.embedded.ConfigurableEmbeddedServletContainerFactory;
import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerCustomizer;
import org.springframework.bootstrap.context.embedded.ErrorPage;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.web.servlet.DispatcherServlet; import org.springframework.web.servlet.DispatcherServlet;
import org.springframework.zero.actuate.web.BasicErrorController;
import org.springframework.zero.actuate.web.ErrorController;
import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
import org.springframework.zero.context.condition.ConditionalOnClass;
import org.springframework.zero.context.condition.ConditionalOnMissingBean;
import org.springframework.zero.context.embedded.ConfigurableEmbeddedServletContainerFactory;
import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizer;
import org.springframework.zero.context.embedded.ErrorPage;
/** /**
* {@link EnableAutoConfiguration Auto-configuration} to render errors via a MVC error * {@link EnableAutoConfiguration Auto-configuration} to render errors via a MVC error

16
spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java → spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java
View File

@ -14,16 +14,16 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.autoconfigure; package org.springframework.actuate.autoconfigure;
import org.springframework.actuate.properties.ManagementServerProperties;
import org.springframework.autoconfigure.AutoConfigureAfter;
import org.springframework.autoconfigure.EnableAutoConfiguration;
import org.springframework.autoconfigure.web.ServerPropertiesAutoConfiguration;
import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean;
import org.springframework.bootstrap.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.zero.actuate.properties.ManagementServerProperties;
import org.springframework.zero.autoconfigure.AutoConfigureAfter;
import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
import org.springframework.zero.autoconfigure.web.ServerPropertiesAutoConfiguration;
import org.springframework.zero.context.condition.ConditionalOnMissingBean;
import org.springframework.zero.context.properties.EnableConfigurationProperties;
/** /**
* {@link EnableAutoConfiguration Auto-configuration} for the * {@link EnableAutoConfiguration Auto-configuration} for the
@ -36,7 +36,7 @@ import org.springframework.zero.context.properties.EnableConfigurationProperties
@EnableConfigurationProperties @EnableConfigurationProperties
public class ManagementServerPropertiesAutoConfiguration { public class ManagementServerPropertiesAutoConfiguration {
@Bean(name = "org.springframework.zero.actuate.properties.ManagementServerProperties") @Bean(name = "org.springframework.actuate.properties.ManagementServerProperties")
@ConditionalOnMissingBean @ConditionalOnMissingBean
public ManagementServerProperties serverProperties() { public ManagementServerProperties serverProperties() {
return new ManagementServerProperties(); return new ManagementServerProperties();

14
spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java → spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/MetricFilterAutoConfiguration.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.autoconfigure; package org.springframework.actuate.autoconfigure;
import java.io.IOException; import java.io.IOException;
@ -27,7 +27,13 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.springframework.actuate.metrics.CounterService;
import org.springframework.actuate.metrics.GaugeService;
import org.springframework.autoconfigure.AutoConfigureAfter;
import org.springframework.autoconfigure.EnableAutoConfiguration;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.bootstrap.context.condition.ConditionalOnBean;
import org.springframework.bootstrap.context.condition.ConditionalOnClass;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.core.Ordered; import org.springframework.core.Ordered;
@ -35,12 +41,6 @@ import org.springframework.core.annotation.Order;
import org.springframework.util.StopWatch; import org.springframework.util.StopWatch;
import org.springframework.web.filter.GenericFilterBean; import org.springframework.web.filter.GenericFilterBean;
import org.springframework.web.util.UrlPathHelper; import org.springframework.web.util.UrlPathHelper;
import org.springframework.zero.actuate.metrics.CounterService;
import org.springframework.zero.actuate.metrics.GaugeService;
import org.springframework.zero.autoconfigure.AutoConfigureAfter;
import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
import org.springframework.zero.context.condition.ConditionalOnBean;
import org.springframework.zero.context.condition.ConditionalOnClass;
/** /**
* {@link EnableAutoConfiguration Auto-configuration} that records Servlet interactions * {@link EnableAutoConfiguration Auto-configuration} that records Servlet interactions

18
spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java → spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java
View File

@ -14,18 +14,18 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.autoconfigure; package org.springframework.actuate.autoconfigure;
import org.springframework.actuate.metrics.CounterService;
import org.springframework.actuate.metrics.DefaultCounterService;
import org.springframework.actuate.metrics.DefaultGaugeService;
import org.springframework.actuate.metrics.GaugeService;
import org.springframework.actuate.metrics.InMemoryMetricRepository;
import org.springframework.actuate.metrics.MetricRepository;
import org.springframework.autoconfigure.EnableAutoConfiguration;
import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.zero.actuate.metrics.CounterService;
import org.springframework.zero.actuate.metrics.DefaultCounterService;
import org.springframework.zero.actuate.metrics.DefaultGaugeService;
import org.springframework.zero.actuate.metrics.GaugeService;
import org.springframework.zero.actuate.metrics.InMemoryMetricRepository;
import org.springframework.zero.actuate.metrics.MetricRepository;
import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
import org.springframework.zero.context.condition.ConditionalOnMissingBean;
/** /**
* {@link EnableAutoConfiguration Auto-configuration} for metrics services. * {@link EnableAutoConfiguration Auto-configuration} for metrics services.

20
spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java → spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/SecurityAutoConfiguration.java
View File

@ -14,13 +14,21 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.autoconfigure; package org.springframework.actuate.autoconfigure;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import org.springframework.actuate.endpoint.Endpoint;
import org.springframework.actuate.endpoint.mvc.EndpointHandlerMapping;
import org.springframework.actuate.properties.SecurityProperties;
import org.springframework.actuate.web.ErrorController;
import org.springframework.autoconfigure.EnableAutoConfiguration;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.bootstrap.context.condition.ConditionalOnClass;
import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean;
import org.springframework.bootstrap.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.core.Ordered; import org.springframework.core.Ordered;
@ -37,14 +45,6 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.security.web.AuthenticationEntryPoint;
import org.springframework.security.web.authentication.www.BasicAuthenticationEntryPoint; import org.springframework.security.web.authentication.www.BasicAuthenticationEntryPoint;
import org.springframework.zero.actuate.endpoint.Endpoint;
import org.springframework.zero.actuate.endpoint.mvc.EndpointHandlerMapping;
import org.springframework.zero.actuate.properties.SecurityProperties;
import org.springframework.zero.actuate.web.ErrorController;
import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
import org.springframework.zero.context.condition.ConditionalOnClass;
import org.springframework.zero.context.condition.ConditionalOnMissingBean;
import org.springframework.zero.context.properties.EnableConfigurationProperties;
/** /**
* {@link EnableAutoConfiguration Auto-configuration} for security of a web application or * {@link EnableAutoConfiguration Auto-configuration} for security of a web application or
@ -84,7 +84,7 @@ import org.springframework.zero.context.properties.EnableConfigurationProperties
@EnableConfigurationProperties @EnableConfigurationProperties
public class SecurityAutoConfiguration { public class SecurityAutoConfiguration {
@Bean(name = "org.springframework.zero.actuate.properties.SecurityProperties") @Bean(name = "org.springframework.actuate.properties.SecurityProperties")
@ConditionalOnMissingBean @ConditionalOnMissingBean
public SecurityProperties securityProperties() { public SecurityProperties securityProperties() {
return new SecurityProperties(); return new SecurityProperties();

10
spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java → spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java
View File

@ -14,14 +14,14 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.autoconfigure; package org.springframework.actuate.autoconfigure;
import org.springframework.actuate.trace.InMemoryTraceRepository;
import org.springframework.actuate.trace.TraceRepository;
import org.springframework.autoconfigure.EnableAutoConfiguration;
import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.zero.actuate.trace.InMemoryTraceRepository;
import org.springframework.zero.actuate.trace.TraceRepository;
import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
import org.springframework.zero.context.condition.ConditionalOnMissingBean;
/** /**
* {@link EnableAutoConfiguration Auto-configuration} for {@link TraceRepository tracing}. * {@link EnableAutoConfiguration Auto-configuration} for {@link TraceRepository tracing}.

12
spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java → spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java
View File

@ -14,20 +14,20 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.autoconfigure; package org.springframework.actuate.autoconfigure;
import javax.servlet.Servlet; import javax.servlet.Servlet;
import org.springframework.actuate.trace.TraceRepository;
import org.springframework.actuate.trace.WebRequestTraceFilter;
import org.springframework.autoconfigure.AutoConfigureAfter;
import org.springframework.autoconfigure.EnableAutoConfiguration;
import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.bootstrap.context.condition.ConditionalOnClass;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.web.servlet.DispatcherServlet; import org.springframework.web.servlet.DispatcherServlet;
import org.springframework.zero.actuate.trace.TraceRepository;
import org.springframework.zero.actuate.trace.WebRequestTraceFilter;
import org.springframework.zero.autoconfigure.AutoConfigureAfter;
import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
import org.springframework.zero.context.condition.ConditionalOnClass;
/** /**
* {@link EnableAutoConfiguration Auto-configuration} for {@link WebRequestTraceFilter * {@link EnableAutoConfiguration Auto-configuration} for {@link WebRequestTraceFilter

2
spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/AbstractEndpoint.java → spring-actuator/src/main/java/org/springframework/actuate/endpoint/AbstractEndpoint.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.endpoint; package org.springframework.actuate.endpoint;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern; import javax.validation.constraints.Pattern;

2
spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ActionEndpoint.java → spring-actuator/src/main/java/org/springframework/actuate/endpoint/ActionEndpoint.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.endpoint; package org.springframework.actuate.endpoint;
/** /**
* Tagging interface used to indicate that {@link Endpoint} that performs some action. * Tagging interface used to indicate that {@link Endpoint} that performs some action.

4
spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/BeansEndpoint.java → spring-actuator/src/main/java/org/springframework/actuate/endpoint/BeansEndpoint.java
View File

@ -14,15 +14,15 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.endpoint; package org.springframework.actuate.endpoint;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.bootstrap.context.properties.ConfigurationProperties;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware; import org.springframework.context.ApplicationContextAware;
import org.springframework.context.support.LiveBeansView; import org.springframework.context.support.LiveBeansView;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.zero.context.properties.ConfigurationProperties;
/** /**
* Exposes JSON view of Spring beans. If the {@link Environment} contains a key setting * Exposes JSON view of Spring beans. If the {@link Environment} contains a key setting

4
spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/DumpEndpoint.java → spring-actuator/src/main/java/org/springframework/actuate/endpoint/DumpEndpoint.java
View File

@ -14,14 +14,14 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.endpoint; package org.springframework.actuate.endpoint;
import java.lang.management.ManagementFactory; import java.lang.management.ManagementFactory;
import java.lang.management.ThreadInfo; import java.lang.management.ThreadInfo;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import org.springframework.zero.context.properties.ConfigurationProperties; import org.springframework.bootstrap.context.properties.ConfigurationProperties;
/** /**
* {@link Endpoint} to expose thread info. * {@link Endpoint} to expose thread info.

2
spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/Endpoint.java → spring-actuator/src/main/java/org/springframework/actuate/endpoint/Endpoint.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.endpoint; package org.springframework.actuate.endpoint;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;

4
spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpoint.java → spring-actuator/src/main/java/org/springframework/actuate/endpoint/EnvironmentEndpoint.java
View File

@ -14,18 +14,18 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.endpoint; package org.springframework.actuate.endpoint;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import org.springframework.bootstrap.context.properties.ConfigurationProperties;
import org.springframework.context.EnvironmentAware; import org.springframework.context.EnvironmentAware;
import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.core.env.EnumerablePropertySource; import org.springframework.core.env.EnumerablePropertySource;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;
import org.springframework.core.env.PropertySource; import org.springframework.core.env.PropertySource;
import org.springframework.core.env.StandardEnvironment; import org.springframework.core.env.StandardEnvironment;
import org.springframework.zero.context.properties.ConfigurationProperties;
/** /**
* {@link Endpoint} to expose {@link ConfigurableEnvironment environment} information. * {@link Endpoint} to expose {@link ConfigurableEnvironment environment} information.

6
spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/HealthEndpoint.java → spring-actuator/src/main/java/org/springframework/actuate/endpoint/HealthEndpoint.java
View File

@ -14,11 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.endpoint; package org.springframework.actuate.endpoint;
import org.springframework.actuate.health.HealthIndicator;
import org.springframework.bootstrap.context.properties.ConfigurationProperties;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.zero.actuate.health.HealthIndicator;
import org.springframework.zero.context.properties.ConfigurationProperties;
/** /**
* {@link Endpoint} to expose application health. * {@link Endpoint} to expose application health.

4
spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/InfoEndpoint.java → spring-actuator/src/main/java/org/springframework/actuate/endpoint/InfoEndpoint.java
View File

@ -14,14 +14,14 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.endpoint; package org.springframework.actuate.endpoint;
import java.util.Collections; import java.util.Collections;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import org.springframework.bootstrap.context.properties.ConfigurationProperties;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.zero.context.properties.ConfigurationProperties;
/** /**
* {@link Endpoint} to expose arbitrary application information. * {@link Endpoint} to expose arbitrary application information.

6
spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/MetricsEndpoint.java → spring-actuator/src/main/java/org/springframework/actuate/endpoint/MetricsEndpoint.java
View File

@ -14,14 +14,14 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.endpoint; package org.springframework.actuate.endpoint;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import org.springframework.actuate.metrics.Metric;
import org.springframework.bootstrap.context.properties.ConfigurationProperties;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.zero.actuate.metrics.Metric;
import org.springframework.zero.context.properties.ConfigurationProperties;
/** /**
* {@link Endpoint} to expose {@link PublicMetrics}. * {@link Endpoint} to expose {@link PublicMetrics}.

4
spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/PublicMetrics.java → spring-actuator/src/main/java/org/springframework/actuate/endpoint/PublicMetrics.java
View File

@ -14,11 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.endpoint; package org.springframework.actuate.endpoint;
import java.util.Collection; import java.util.Collection;
import org.springframework.zero.actuate.metrics.Metric; import org.springframework.actuate.metrics.Metric;
/** /**
* Interface to expose specific {@link Metric}s via a {@link MetricsEndpoint}. * Interface to expose specific {@link Metric}s via a {@link MetricsEndpoint}.

6
spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ShutdownEndpoint.java → spring-actuator/src/main/java/org/springframework/actuate/endpoint/ShutdownEndpoint.java
View File

@ -14,18 +14,18 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.endpoint; package org.springframework.actuate.endpoint;
import java.util.Collections; import java.util.Collections;
import java.util.Map; import java.util.Map;
import org.springframework.actuate.properties.ManagementServerProperties;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.bootstrap.context.properties.ConfigurationProperties;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware; import org.springframework.context.ApplicationContextAware;
import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.zero.actuate.properties.ManagementServerProperties;
import org.springframework.zero.context.properties.ConfigurationProperties;
/** /**
* {@link ActionEndpoint} to shutdown the {@link ApplicationContext}. * {@link ActionEndpoint} to shutdown the {@link ApplicationContext}.

8
spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/TraceEndpoint.java → spring-actuator/src/main/java/org/springframework/actuate/endpoint/TraceEndpoint.java
View File

@ -14,14 +14,14 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.endpoint; package org.springframework.actuate.endpoint;
import java.util.List; import java.util.List;
import org.springframework.actuate.trace.Trace;
import org.springframework.actuate.trace.TraceRepository;
import org.springframework.bootstrap.context.properties.ConfigurationProperties;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.zero.actuate.trace.Trace;
import org.springframework.zero.actuate.trace.TraceRepository;
import org.springframework.zero.context.properties.ConfigurationProperties;
/** /**
* {@link Endpoint} to expose {@link Trace} information. * {@link Endpoint} to expose {@link Trace} information.

6
spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetrics.java → spring-actuator/src/main/java/org/springframework/actuate/endpoint/VanillaPublicMetrics.java
View File

@ -14,14 +14,14 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.endpoint; package org.springframework.actuate.endpoint;
import java.util.Collection; import java.util.Collection;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import org.springframework.actuate.metrics.Metric;
import org.springframework.actuate.metrics.MetricRepository;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.zero.actuate.metrics.Metric;
import org.springframework.zero.actuate.metrics.MetricRepository;
/** /**
* Default implementation of {@link PublicMetrics} that exposes all metrics from the * Default implementation of {@link PublicMetrics} that exposes all metrics from the

4
spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapter.java → spring-actuator/src/main/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerAdapter.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.endpoint.mvc; package org.springframework.actuate.endpoint.mvc;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -28,6 +28,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.actuate.endpoint.Endpoint;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
@ -39,7 +40,6 @@ import org.springframework.web.servlet.HandlerAdapter;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
import org.springframework.web.servlet.mvc.method.annotation.AbstractMessageConverterMethodProcessor; import org.springframework.web.servlet.mvc.method.annotation.AbstractMessageConverterMethodProcessor;
import org.springframework.zero.actuate.endpoint.Endpoint;
import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.SerializationFeature;

6
spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMapping.java → spring-actuator/src/main/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerMapping.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.endpoint.mvc; package org.springframework.actuate.endpoint.mvc;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
@ -23,6 +23,8 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import org.springframework.actuate.endpoint.ActionEndpoint;
import org.springframework.actuate.endpoint.Endpoint;
import org.springframework.beans.factory.BeanFactoryUtils; import org.springframework.beans.factory.BeanFactoryUtils;
import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.InitializingBean;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
@ -32,8 +34,6 @@ import org.springframework.util.StringUtils;
import org.springframework.web.servlet.HandlerExecutionChain; import org.springframework.web.servlet.HandlerExecutionChain;
import org.springframework.web.servlet.HandlerMapping; import org.springframework.web.servlet.HandlerMapping;
import org.springframework.web.servlet.handler.AbstractUrlHandlerMapping; import org.springframework.web.servlet.handler.AbstractUrlHandlerMapping;
import org.springframework.zero.actuate.endpoint.ActionEndpoint;
import org.springframework.zero.actuate.endpoint.Endpoint;
/** /**
* {@link HandlerMapping} to map {@link Endpoint}s to URLs via {@link Endpoint#getPath()}. * {@link HandlerMapping} to map {@link Endpoint}s to URLs via {@link Endpoint#getPath()}.

22
spring-actuator/src/main/java/org/springframework/zero/actuate/fixme/ManagementServerConfiguration.java → spring-actuator/src/main/java/org/springframework/actuate/fixme/ManagementServerConfiguration.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.fixme; package org.springframework.actuate.fixme;
import java.io.IOException; import java.io.IOException;
@ -24,10 +24,20 @@ import javax.servlet.ServletException;
import javax.servlet.ServletRequest; import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse; import javax.servlet.ServletResponse;
import org.springframework.actuate.properties.ManagementServerProperties;
import org.springframework.actuate.web.BasicErrorController;
import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.HierarchicalBeanFactory; import org.springframework.beans.factory.HierarchicalBeanFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.bootstrap.context.condition.ConditionalOnBean;
import org.springframework.bootstrap.context.condition.ConditionalOnClass;
import org.springframework.bootstrap.context.embedded.ConfigurableEmbeddedServletContainerFactory;
import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerCustomizer;
import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory;
import org.springframework.bootstrap.context.embedded.ErrorPage;
import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServletContainerFactory;
import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@ -36,16 +46,6 @@ import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
import org.springframework.web.filter.GenericFilterBean; import org.springframework.web.filter.GenericFilterBean;
import org.springframework.web.servlet.DispatcherServlet; import org.springframework.web.servlet.DispatcherServlet;
import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.zero.actuate.properties.ManagementServerProperties;
import org.springframework.zero.actuate.web.BasicErrorController;
import org.springframework.zero.context.condition.ConditionalOnBean;
import org.springframework.zero.context.condition.ConditionalOnClass;
import org.springframework.zero.context.embedded.ConfigurableEmbeddedServletContainerFactory;
import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizer;
import org.springframework.zero.context.embedded.EmbeddedServletContainerFactory;
import org.springframework.zero.context.embedded.ErrorPage;
import org.springframework.zero.context.embedded.jetty.JettyEmbeddedServletContainerFactory;
import org.springframework.zero.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
/** /**
* Configuration for creating a new container (e.g. tomcat) for the management endpoints. * Configuration for creating a new container (e.g. tomcat) for the management endpoints.

2
spring-actuator/src/main/java/org/springframework/zero/actuate/health/HealthIndicator.java → spring-actuator/src/main/java/org/springframework/actuate/health/HealthIndicator.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.health; package org.springframework.actuate.health;
/** /**
* Strategy interface used to provide an indication of application health. * Strategy interface used to provide an indication of application health.

2
spring-actuator/src/main/java/org/springframework/zero/actuate/health/VanillaHealthIndicator.java → spring-actuator/src/main/java/org/springframework/actuate/health/VanillaHealthIndicator.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.health; package org.springframework.actuate.health;
/** /**
* Default implementation of {@link HealthIndicator} that simply returns "ok". * Default implementation of {@link HealthIndicator} that simply returns "ok".

2
spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/CounterService.java → spring-actuator/src/main/java/org/springframework/actuate/metrics/CounterService.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.metrics; package org.springframework.actuate.metrics;
/** /**
* A service that can be used to increment, decrement and reset a {@link Metric}. * A service that can be used to increment, decrement and reset a {@link Metric}.

2
spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultCounterService.java → spring-actuator/src/main/java/org/springframework/actuate/metrics/DefaultCounterService.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.metrics; package org.springframework.actuate.metrics;
import java.util.Date; import java.util.Date;

2
spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultGaugeService.java → spring-actuator/src/main/java/org/springframework/actuate/metrics/DefaultGaugeService.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.metrics; package org.springframework.actuate.metrics;
import java.util.Date; import java.util.Date;

2
spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/GaugeService.java → spring-actuator/src/main/java/org/springframework/actuate/metrics/GaugeService.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.metrics; package org.springframework.actuate.metrics;
/** /**
* A service that can be used to manage a {@link Metric} as a gauge. * A service that can be used to manage a {@link Metric} as a gauge.

2
spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepository.java → spring-actuator/src/main/java/org/springframework/actuate/metrics/InMemoryMetricRepository.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.metrics; package org.springframework.actuate.metrics;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;

2
spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/Measurement.java → spring-actuator/src/main/java/org/springframework/actuate/metrics/Measurement.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.metrics; package org.springframework.actuate.metrics;
import java.util.Date; import java.util.Date;

2
spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/Metric.java → spring-actuator/src/main/java/org/springframework/actuate/metrics/Metric.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.metrics; package org.springframework.actuate.metrics;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;

2
spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/MetricRepository.java → spring-actuator/src/main/java/org/springframework/actuate/metrics/MetricRepository.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.metrics; package org.springframework.actuate.metrics;
import java.util.Collection; import java.util.Collection;
import java.util.Date; import java.util.Date;

6
spring-actuator/src/main/java/org/springframework/zero/actuate/properties/ManagementServerProperties.java → spring-actuator/src/main/java/org/springframework/actuate/properties/ManagementServerProperties.java
View File

@ -14,14 +14,14 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.properties; package org.springframework.actuate.properties;
import java.net.InetAddress; import java.net.InetAddress;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import org.springframework.zero.context.embedded.properties.ServerProperties; import org.springframework.bootstrap.context.embedded.properties.ServerProperties;
import org.springframework.zero.context.properties.ConfigurationProperties; import org.springframework.bootstrap.context.properties.ConfigurationProperties;
/** /**
* Properties for the management server (e.g. port and path settings). * Properties for the management server (e.g. port and path settings).

4
spring-actuator/src/main/java/org/springframework/zero/actuate/properties/SecurityProperties.java → spring-actuator/src/main/java/org/springframework/actuate/properties/SecurityProperties.java
View File

@ -14,10 +14,10 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.properties; package org.springframework.actuate.properties;
import org.springframework.bootstrap.context.properties.ConfigurationProperties;
import org.springframework.security.config.annotation.web.configurers.SessionCreationPolicy; import org.springframework.security.config.annotation.web.configurers.SessionCreationPolicy;
import org.springframework.zero.context.properties.ConfigurationProperties;
/** /**
* Properties for the security aspects of an application. * Properties for the security aspects of an application.

6
spring-actuator/src/main/java/org/springframework/zero/actuate/security/AuthenticationAuditListener.java → spring-actuator/src/main/java/org/springframework/actuate/security/AuthenticationAuditListener.java
View File

@ -14,19 +14,19 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.security; package org.springframework.actuate.security;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.springframework.actuate.audit.AuditEvent;
import org.springframework.actuate.audit.listener.AuditApplicationEvent;
import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.context.ApplicationEventPublisherAware;
import org.springframework.context.ApplicationListener; import org.springframework.context.ApplicationListener;
import org.springframework.security.authentication.event.AbstractAuthenticationEvent; import org.springframework.security.authentication.event.AbstractAuthenticationEvent;
import org.springframework.security.authentication.event.AbstractAuthenticationFailureEvent; import org.springframework.security.authentication.event.AbstractAuthenticationFailureEvent;
import org.springframework.security.web.authentication.switchuser.AuthenticationSwitchUserEvent; import org.springframework.security.web.authentication.switchuser.AuthenticationSwitchUserEvent;
import org.springframework.zero.actuate.audit.AuditEvent;
import org.springframework.zero.actuate.audit.listener.AuditApplicationEvent;
/** /**
* {@link ApplicationListener} expose Spring Security {@link AbstractAuthenticationEvent * {@link ApplicationListener} expose Spring Security {@link AbstractAuthenticationEvent

6
spring-actuator/src/main/java/org/springframework/zero/actuate/security/AuthorizationAuditListener.java → spring-actuator/src/main/java/org/springframework/actuate/security/AuthorizationAuditListener.java
View File

@ -14,19 +14,19 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.security; package org.springframework.actuate.security;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.springframework.actuate.audit.AuditEvent;
import org.springframework.actuate.audit.listener.AuditApplicationEvent;
import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.context.ApplicationEventPublisherAware;
import org.springframework.context.ApplicationListener; import org.springframework.context.ApplicationListener;
import org.springframework.security.access.event.AbstractAuthorizationEvent; import org.springframework.security.access.event.AbstractAuthorizationEvent;
import org.springframework.security.access.event.AuthenticationCredentialsNotFoundEvent; import org.springframework.security.access.event.AuthenticationCredentialsNotFoundEvent;
import org.springframework.security.access.event.AuthorizationFailureEvent; import org.springframework.security.access.event.AuthorizationFailureEvent;
import org.springframework.zero.actuate.audit.AuditEvent;
import org.springframework.zero.actuate.audit.listener.AuditApplicationEvent;
/** /**
* {@link ApplicationListener} expose Spring Security {@link AbstractAuthorizationEvent * {@link ApplicationListener} expose Spring Security {@link AbstractAuthorizationEvent

2
spring-actuator/src/main/java/org/springframework/zero/actuate/trace/InMemoryTraceRepository.java → spring-actuator/src/main/java/org/springframework/actuate/trace/InMemoryTraceRepository.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.trace; package org.springframework.actuate.trace;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;

2
spring-actuator/src/main/java/org/springframework/zero/actuate/trace/Trace.java → spring-actuator/src/main/java/org/springframework/actuate/trace/Trace.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.trace; package org.springframework.actuate.trace;
import java.util.Date; import java.util.Date;
import java.util.Map; import java.util.Map;

2
spring-actuator/src/main/java/org/springframework/zero/actuate/trace/TraceRepository.java → spring-actuator/src/main/java/org/springframework/actuate/trace/TraceRepository.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.trace; package org.springframework.actuate.trace;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

2
spring-actuator/src/main/java/org/springframework/zero/actuate/trace/WebRequestTraceFilter.java → spring-actuator/src/main/java/org/springframework/actuate/trace/WebRequestTraceFilter.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.trace; package org.springframework.actuate.trace;
import java.io.IOException; import java.io.IOException;
import java.util.Collections; import java.util.Collections;

4
spring-actuator/src/main/java/org/springframework/zero/actuate/web/BasicErrorController.java → spring-actuator/src/main/java/org/springframework/actuate/web/BasicErrorController.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.web; package org.springframework.actuate.web;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.StringWriter; import java.io.StringWriter;
@ -28,12 +28,12 @@ import javax.servlet.http.HttpServletRequest;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.bootstrap.context.embedded.AbstractEmbeddedServletContainerFactory;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import org.springframework.zero.context.embedded.AbstractEmbeddedServletContainerFactory;
/** /**
* Basic global error {@link Controller}, rendering servlet container error codes and * Basic global error {@link Controller}, rendering servlet container error codes and

2
spring-actuator/src/main/java/org/springframework/zero/actuate/web/ErrorController.java → spring-actuator/src/main/java/org/springframework/actuate/web/ErrorController.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.web; package org.springframework.actuate.web;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;

22
spring-actuator/src/main/resources/META-INF/spring.factories
View File

@ -1,11 +1,11 @@
org.springframework.zero.autoconfigure.EnableAutoConfiguration=\ org.springframework.autoconfigure.EnableAutoConfiguration=\
org.springframework.zero.actuate.autoconfigure.AuditAutoConfiguration,\ org.springframework.actuate.autoconfigure.AuditAutoConfiguration,\
org.springframework.zero.actuate.autoconfigure.EndpointAutoConfiguration,\ org.springframework.actuate.autoconfigure.EndpointAutoConfiguration,\
org.springframework.zero.actuate.autoconfigure.EndpointWebMvcAutoConfiguration,\ org.springframework.actuate.autoconfigure.EndpointWebMvcAutoConfiguration,\
org.springframework.zero.actuate.autoconfigure.ErrorMvcAutoConfiguration,\ org.springframework.actuate.autoconfigure.ErrorMvcAutoConfiguration,\
org.springframework.zero.actuate.autoconfigure.ManagementServerPropertiesAutoConfiguration,\ org.springframework.actuate.autoconfigure.ManagementServerPropertiesAutoConfiguration,\
org.springframework.zero.actuate.autoconfigure.MetricFilterAutoConfiguration,\ org.springframework.actuate.autoconfigure.MetricFilterAutoConfiguration,\
org.springframework.zero.actuate.autoconfigure.MetricRepositoryAutoConfiguration,\ org.springframework.actuate.autoconfigure.MetricRepositoryAutoConfiguration,\
org.springframework.zero.actuate.autoconfigure.SecurityAutoConfiguration,\ org.springframework.actuate.autoconfigure.SecurityAutoConfiguration,\
org.springframework.zero.actuate.autoconfigure.TraceRepositoryAutoConfiguration,\ org.springframework.actuate.autoconfigure.TraceRepositoryAutoConfiguration,\
org.springframework.zero.actuate.autoconfigure.TraceWebFilterAutoConfiguration org.springframework.actuate.autoconfigure.TraceWebFilterAutoConfiguration

4
spring-actuator/src/test/java/org/springframework/zero/actuate/audit/AuditEventTests.java → spring-actuator/src/test/java/org/springframework/actuate/audit/AuditEventTests.java
View File

@ -14,12 +14,12 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.audit; package org.springframework.actuate.audit;
import java.util.Collections; import java.util.Collections;
import org.junit.Test; import org.junit.Test;
import org.springframework.zero.actuate.audit.AuditEvent; import org.springframework.actuate.audit.AuditEvent;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;

6
spring-actuator/src/test/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepositoryTests.java → spring-actuator/src/test/java/org/springframework/actuate/audit/InMemoryAuditEventRepositoryTests.java
View File

@ -14,13 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.audit; package org.springframework.actuate.audit;
import java.util.Date; import java.util.Date;
import org.junit.Test; import org.junit.Test;
import org.springframework.zero.actuate.audit.AuditEvent; import org.springframework.actuate.audit.AuditEvent;
import org.springframework.zero.actuate.audit.InMemoryAuditEventRepository; import org.springframework.actuate.audit.InMemoryAuditEventRepository;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;

8
spring-actuator/src/test/java/org/springframework/zero/actuate/audit/listener/AuditListenerTests.java → spring-actuator/src/test/java/org/springframework/actuate/audit/listener/AuditListenerTests.java
View File

@ -14,13 +14,15 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.audit.listener; package org.springframework.actuate.audit.listener;
import java.util.Collections; import java.util.Collections;
import org.junit.Test; import org.junit.Test;
import org.springframework.zero.actuate.audit.AuditEvent; import org.springframework.actuate.audit.AuditEvent;
import org.springframework.zero.actuate.audit.AuditEventRepository; import org.springframework.actuate.audit.AuditEventRepository;
import org.springframework.actuate.audit.listener.AuditApplicationEvent;
import org.springframework.actuate.audit.listener.AuditListener;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;

12
spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfigurationTests.java → spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/AuditAutoConfigurationTests.java
View File

@ -14,17 +14,17 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.autoconfigure; package org.springframework.actuate.autoconfigure;
import org.junit.Test; import org.junit.Test;
import org.springframework.actuate.audit.AuditEventRepository;
import org.springframework.actuate.audit.InMemoryAuditEventRepository;
import org.springframework.actuate.autoconfigure.AuditAutoConfiguration;
import org.springframework.actuate.security.AuthenticationAuditListener;
import org.springframework.actuate.security.AuthorizationAuditListener;
import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.zero.actuate.audit.AuditEventRepository;
import org.springframework.zero.actuate.audit.InMemoryAuditEventRepository;
import org.springframework.zero.actuate.autoconfigure.AuditAutoConfiguration;
import org.springframework.zero.actuate.security.AuthenticationAuditListener;
import org.springframework.zero.actuate.security.AuthorizationAuditListener;
import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.instanceOf;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;

21
spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfigurationTests.java → spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/EndpointAutoConfigurationTests.java
View File

@ -14,20 +14,21 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.autoconfigure; package org.springframework.actuate.autoconfigure;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.springframework.actuate.autoconfigure.EndpointAutoConfiguration;
import org.springframework.actuate.endpoint.BeansEndpoint;
import org.springframework.actuate.endpoint.DumpEndpoint;
import org.springframework.actuate.endpoint.EnvironmentEndpoint;
import org.springframework.actuate.endpoint.HealthEndpoint;
import org.springframework.actuate.endpoint.InfoEndpoint;
import org.springframework.actuate.endpoint.MetricsEndpoint;
import org.springframework.actuate.endpoint.ShutdownEndpoint;
import org.springframework.actuate.endpoint.TraceEndpoint;
import org.springframework.bootstrap.TestUtils;
import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.zero.TestUtils;
import org.springframework.zero.actuate.endpoint.BeansEndpoint;
import org.springframework.zero.actuate.endpoint.DumpEndpoint;
import org.springframework.zero.actuate.endpoint.EnvironmentEndpoint;
import org.springframework.zero.actuate.endpoint.HealthEndpoint;
import org.springframework.zero.actuate.endpoint.InfoEndpoint;
import org.springframework.zero.actuate.endpoint.MetricsEndpoint;
import org.springframework.zero.actuate.endpoint.ShutdownEndpoint;
import org.springframework.zero.actuate.endpoint.TraceEndpoint;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;

22
spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java → spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.autoconfigure; package org.springframework.actuate.autoconfigure;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.net.SocketException; import java.net.SocketException;
@ -23,6 +23,17 @@ import java.nio.charset.Charset;
import org.junit.After; import org.junit.After;
import org.junit.Test; import org.junit.Test;
import org.springframework.actuate.autoconfigure.EndpointWebMvcAutoConfiguration;
import org.springframework.actuate.autoconfigure.ManagementServerPropertiesAutoConfiguration;
import org.springframework.actuate.endpoint.AbstractEndpoint;
import org.springframework.actuate.endpoint.Endpoint;
import org.springframework.actuate.properties.ManagementServerProperties;
import org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration;
import org.springframework.autoconfigure.web.EmbeddedServletContainerAutoConfiguration;
import org.springframework.autoconfigure.web.ServerPropertiesAutoConfiguration;
import org.springframework.autoconfigure.web.WebMvcAutoConfiguration;
import org.springframework.bootstrap.TestUtils;
import org.springframework.bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpMethod; import org.springframework.http.HttpMethod;
@ -33,15 +44,6 @@ import org.springframework.stereotype.Controller;
import org.springframework.util.StreamUtils; import org.springframework.util.StreamUtils;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.zero.TestUtils;
import org.springframework.zero.actuate.endpoint.AbstractEndpoint;
import org.springframework.zero.actuate.endpoint.Endpoint;
import org.springframework.zero.actuate.properties.ManagementServerProperties;
import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration;
import org.springframework.zero.autoconfigure.web.EmbeddedServletContainerAutoConfiguration;
import org.springframework.zero.autoconfigure.web.ServerPropertiesAutoConfiguration;
import org.springframework.zero.autoconfigure.web.WebMvcAutoConfiguration;
import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;

5
spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java → spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java
View File

@ -14,13 +14,14 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.autoconfigure; package org.springframework.actuate.autoconfigure;
import org.junit.Test; import org.junit.Test;
import org.springframework.actuate.autoconfigure.ManagementServerPropertiesAutoConfiguration;
import org.springframework.actuate.properties.ManagementServerProperties;
import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.zero.actuate.properties.ManagementServerProperties;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.nullValue;

8
spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java → spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.autoconfigure; package org.springframework.actuate.autoconfigure;
import javax.servlet.Filter; import javax.servlet.Filter;
import javax.servlet.FilterChain; import javax.servlet.FilterChain;
@ -22,14 +22,14 @@ import javax.servlet.FilterChain;
import org.junit.Test; import org.junit.Test;
import org.mockito.invocation.InvocationOnMock; import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer; import org.mockito.stubbing.Answer;
import org.springframework.actuate.autoconfigure.MetricFilterAutoConfiguration;
import org.springframework.actuate.metrics.CounterService;
import org.springframework.actuate.metrics.GaugeService;
import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.zero.actuate.autoconfigure.MetricFilterAutoConfiguration;
import org.springframework.zero.actuate.metrics.CounterService;
import org.springframework.zero.actuate.metrics.GaugeService;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;

12
spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java → spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java
View File

@ -14,17 +14,17 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.autoconfigure; package org.springframework.actuate.autoconfigure;
import org.junit.Test; import org.junit.Test;
import org.springframework.actuate.autoconfigure.MetricRepositoryAutoConfiguration;
import org.springframework.actuate.metrics.CounterService;
import org.springframework.actuate.metrics.DefaultCounterService;
import org.springframework.actuate.metrics.DefaultGaugeService;
import org.springframework.actuate.metrics.GaugeService;
import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.zero.actuate.autoconfigure.MetricRepositoryAutoConfiguration;
import org.springframework.zero.actuate.metrics.CounterService;
import org.springframework.zero.actuate.metrics.DefaultCounterService;
import org.springframework.zero.actuate.metrics.DefaultGaugeService;
import org.springframework.zero.actuate.metrics.GaugeService;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;

8
spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfigurationTests.java → spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/SecurityAutoConfigurationTests.java
View File

@ -14,9 +14,12 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.autoconfigure; package org.springframework.actuate.autoconfigure;
import org.junit.Test; import org.junit.Test;
import org.springframework.actuate.autoconfigure.EndpointAutoConfiguration;
import org.springframework.actuate.autoconfigure.SecurityAutoConfiguration;
import org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.mock.web.MockServletContext; import org.springframework.mock.web.MockServletContext;
@ -25,9 +28,6 @@ import org.springframework.security.authentication.TestingAuthenticationToken;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
import org.springframework.security.core.AuthenticationException; import org.springframework.security.core.AuthenticationException;
import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
import org.springframework.zero.actuate.autoconfigure.EndpointAutoConfiguration;
import org.springframework.zero.actuate.autoconfigure.SecurityAutoConfiguration;
import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;

8
spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java → spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java
View File

@ -14,15 +14,15 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.autoconfigure; package org.springframework.actuate.autoconfigure;
import org.junit.Test; import org.junit.Test;
import org.springframework.actuate.autoconfigure.TraceRepositoryAutoConfiguration;
import org.springframework.actuate.trace.InMemoryTraceRepository;
import org.springframework.actuate.trace.TraceRepository;
import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.zero.actuate.autoconfigure.TraceRepositoryAutoConfiguration;
import org.springframework.zero.actuate.trace.InMemoryTraceRepository;
import org.springframework.zero.actuate.trace.TraceRepository;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;

10
spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java → spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java
View File

@ -14,14 +14,14 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.autoconfigure; package org.springframework.actuate.autoconfigure;
import org.junit.Test; import org.junit.Test;
import org.springframework.actuate.autoconfigure.TraceRepositoryAutoConfiguration;
import org.springframework.actuate.autoconfigure.TraceWebFilterAutoConfiguration;
import org.springframework.actuate.trace.WebRequestTraceFilter;
import org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration;
import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.zero.actuate.autoconfigure.TraceRepositoryAutoConfiguration;
import org.springframework.zero.actuate.autoconfigure.TraceWebFilterAutoConfiguration;
import org.springframework.zero.actuate.trace.WebRequestTraceFilter;
import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;

5
spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/AbstractEndpointTests.java → spring-actuator/src/test/java/org/springframework/actuate/endpoint/AbstractEndpointTests.java
View File

@ -14,17 +14,18 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.endpoint; package org.springframework.actuate.endpoint;
import java.util.Collections; import java.util.Collections;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.springframework.actuate.endpoint.Endpoint;
import org.springframework.bootstrap.TestUtils;
import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.core.env.MapPropertySource; import org.springframework.core.env.MapPropertySource;
import org.springframework.core.env.PropertySource; import org.springframework.core.env.PropertySource;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.zero.TestUtils;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;

6
spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/BeansEndpointTests.java → spring-actuator/src/test/java/org/springframework/actuate/endpoint/BeansEndpointTests.java
View File

@ -14,14 +14,14 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.endpoint; package org.springframework.actuate.endpoint;
import org.junit.Test; import org.junit.Test;
import org.springframework.actuate.endpoint.BeansEndpoint;
import org.springframework.bootstrap.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.zero.actuate.endpoint.BeansEndpoint;
import org.springframework.zero.context.properties.EnableConfigurationProperties;
import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.containsString;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;

6
spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/DumpEndpointTests.java → spring-actuator/src/test/java/org/springframework/actuate/endpoint/DumpEndpointTests.java
View File

@ -14,16 +14,16 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.endpoint; package org.springframework.actuate.endpoint;
import java.lang.management.ThreadInfo; import java.lang.management.ThreadInfo;
import java.util.List; import java.util.List;
import org.junit.Test; import org.junit.Test;
import org.springframework.actuate.endpoint.DumpEndpoint;
import org.springframework.bootstrap.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.zero.actuate.endpoint.DumpEndpoint;
import org.springframework.zero.context.properties.EnableConfigurationProperties;
import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.greaterThan;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;

6
spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpointTests.java → spring-actuator/src/test/java/org/springframework/actuate/endpoint/EnvironmentEndpointTests.java
View File

@ -14,13 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.endpoint; package org.springframework.actuate.endpoint;
import org.junit.Test; import org.junit.Test;
import org.springframework.actuate.endpoint.EnvironmentEndpoint;
import org.springframework.bootstrap.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.zero.actuate.endpoint.EnvironmentEndpoint;
import org.springframework.zero.context.properties.EnableConfigurationProperties;
import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.greaterThan;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;

8
spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/HealthEndpointTests.java → spring-actuator/src/test/java/org/springframework/actuate/endpoint/HealthEndpointTests.java
View File

@ -14,14 +14,14 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.endpoint; package org.springframework.actuate.endpoint;
import org.junit.Test; import org.junit.Test;
import org.springframework.actuate.endpoint.HealthEndpoint;
import org.springframework.actuate.health.HealthIndicator;
import org.springframework.bootstrap.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.zero.actuate.endpoint.HealthEndpoint;
import org.springframework.zero.actuate.health.HealthIndicator;
import org.springframework.zero.context.properties.EnableConfigurationProperties;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;

6
spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/InfoEndpointTests.java → spring-actuator/src/test/java/org/springframework/actuate/endpoint/InfoEndpointTests.java
View File

@ -14,15 +14,15 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.endpoint; package org.springframework.actuate.endpoint;
import java.util.Collections; import java.util.Collections;
import org.junit.Test; import org.junit.Test;
import org.springframework.actuate.endpoint.InfoEndpoint;
import org.springframework.bootstrap.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.zero.actuate.endpoint.InfoEndpoint;
import org.springframework.zero.context.properties.EnableConfigurationProperties;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;

10
spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/MetricsEndpointTests.java → spring-actuator/src/test/java/org/springframework/actuate/endpoint/MetricsEndpointTests.java
View File

@ -14,18 +14,18 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.endpoint; package org.springframework.actuate.endpoint;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import org.junit.Test; import org.junit.Test;
import org.springframework.actuate.endpoint.MetricsEndpoint;
import org.springframework.actuate.endpoint.PublicMetrics;
import org.springframework.actuate.metrics.Metric;
import org.springframework.bootstrap.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.zero.actuate.endpoint.MetricsEndpoint;
import org.springframework.zero.actuate.endpoint.PublicMetrics;
import org.springframework.zero.actuate.metrics.Metric;
import org.springframework.zero.context.properties.EnableConfigurationProperties;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;

8
spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/ShutdownEndpointTests.java → spring-actuator/src/test/java/org/springframework/actuate/endpoint/ShutdownEndpointTests.java
View File

@ -14,14 +14,14 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.endpoint; package org.springframework.actuate.endpoint;
import org.junit.Test; import org.junit.Test;
import org.springframework.actuate.endpoint.ShutdownEndpoint;
import org.springframework.actuate.properties.ManagementServerProperties;
import org.springframework.bootstrap.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.zero.actuate.endpoint.ShutdownEndpoint;
import org.springframework.zero.actuate.properties.ManagementServerProperties;
import org.springframework.zero.context.properties.EnableConfigurationProperties;
import static org.hamcrest.Matchers.startsWith; import static org.hamcrest.Matchers.startsWith;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;

12
spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/TraceEndpointTests.java → spring-actuator/src/test/java/org/springframework/actuate/endpoint/TraceEndpointTests.java
View File

@ -14,18 +14,18 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.endpoint; package org.springframework.actuate.endpoint;
import java.util.Collections; import java.util.Collections;
import org.junit.Test; import org.junit.Test;
import org.springframework.actuate.endpoint.TraceEndpoint;
import org.springframework.actuate.trace.InMemoryTraceRepository;
import org.springframework.actuate.trace.Trace;
import org.springframework.actuate.trace.TraceRepository;
import org.springframework.bootstrap.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.zero.actuate.endpoint.TraceEndpoint;
import org.springframework.zero.actuate.trace.InMemoryTraceRepository;
import org.springframework.zero.actuate.trace.Trace;
import org.springframework.zero.actuate.trace.TraceRepository;
import org.springframework.zero.context.properties.EnableConfigurationProperties;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;

8
spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetricsTests.java → spring-actuator/src/test/java/org/springframework/actuate/endpoint/VanillaPublicMetricsTests.java
View File

@ -14,16 +14,16 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.endpoint; package org.springframework.actuate.endpoint;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.junit.Test; import org.junit.Test;
import org.springframework.zero.actuate.endpoint.VanillaPublicMetrics; import org.springframework.actuate.endpoint.VanillaPublicMetrics;
import org.springframework.zero.actuate.metrics.InMemoryMetricRepository; import org.springframework.actuate.metrics.InMemoryMetricRepository;
import org.springframework.zero.actuate.metrics.Metric; import org.springframework.actuate.metrics.Metric;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;

6
spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java → spring-actuator/src/test/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java
View File

@ -14,11 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.endpoint.mvc; package org.springframework.actuate.endpoint.mvc;
import org.junit.Test; import org.junit.Test;
import org.springframework.zero.actuate.endpoint.Endpoint; import org.springframework.actuate.endpoint.Endpoint;
import org.springframework.zero.actuate.endpoint.mvc.EndpointHandlerAdapter; import org.springframework.actuate.endpoint.mvc.EndpointHandlerAdapter;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;

8
spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMappingTests.java → spring-actuator/src/test/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerMappingTests.java
View File

@ -14,15 +14,15 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.endpoint.mvc; package org.springframework.actuate.endpoint.mvc;
import java.util.Arrays; import java.util.Arrays;
import org.junit.Test; import org.junit.Test;
import org.springframework.actuate.endpoint.AbstractEndpoint;
import org.springframework.actuate.endpoint.ActionEndpoint;
import org.springframework.actuate.endpoint.mvc.EndpointHandlerMapping;
import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.zero.actuate.endpoint.AbstractEndpoint;
import org.springframework.zero.actuate.endpoint.ActionEndpoint;
import org.springframework.zero.actuate.endpoint.mvc.EndpointHandlerMapping;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.nullValue;

2
spring-actuator/src/test/java/org/springframework/zero/actuate/fixme/ErrorConfigurationTests.java → spring-actuator/src/test/java/org/springframework/actuate/fixme/ErrorConfigurationTests.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.fixme; package org.springframework.actuate.fixme;
/** /**
* @author Dave Syer * @author Dave Syer

4
spring-actuator/src/test/java/org/springframework/zero/actuate/health/VanillaHealthIndicatorTests.java → spring-actuator/src/test/java/org/springframework/actuate/health/VanillaHealthIndicatorTests.java
View File

@ -14,10 +14,10 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.health; package org.springframework.actuate.health;
import org.junit.Test; import org.junit.Test;
import org.springframework.zero.actuate.health.VanillaHealthIndicator; import org.springframework.actuate.health.VanillaHealthIndicator;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;

4
spring-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultCounterServiceTests.java → spring-actuator/src/test/java/org/springframework/actuate/metrics/DefaultCounterServiceTests.java
View File

@ -14,11 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.metrics; package org.springframework.actuate.metrics;
import org.junit.Ignore; import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.springframework.zero.actuate.metrics.DefaultCounterService; import org.springframework.actuate.metrics.DefaultCounterService;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;

4
spring-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultGaugeServiceTests.java → spring-actuator/src/test/java/org/springframework/actuate/metrics/DefaultGaugeServiceTests.java
View File

@ -14,11 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.metrics; package org.springframework.actuate.metrics;
import org.junit.Ignore; import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.springframework.zero.actuate.metrics.DefaultGaugeService; import org.springframework.actuate.metrics.DefaultGaugeService;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;

3
spring-actuator/src/test/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepositoryTests.java → spring-actuator/src/test/java/org/springframework/actuate/metrics/InMemoryMetricRepositoryTests.java
View File

@ -14,10 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.metrics; package org.springframework.actuate.metrics;
import org.junit.Ignore; import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.springframework.actuate.metrics.InMemoryMetricRepository;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;

6
spring-actuator/src/test/java/org/springframework/zero/actuate/properties/SecurityPropertiesTests.java → spring-actuator/src/test/java/org/springframework/actuate/properties/SecurityPropertiesTests.java
View File

@ -14,15 +14,15 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.properties; package org.springframework.actuate.properties;
import java.util.Collections; import java.util.Collections;
import org.junit.Test; import org.junit.Test;
import org.springframework.actuate.properties.SecurityProperties;
import org.springframework.beans.MutablePropertyValues; import org.springframework.beans.MutablePropertyValues;
import org.springframework.bootstrap.bind.RelaxedDataBinder;
import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.core.convert.support.DefaultConversionService;
import org.springframework.zero.actuate.properties.SecurityProperties;
import org.springframework.zero.bind.RelaxedDataBinder;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;

4
spring-actuator/src/test/java/org/springframework/zero/actuate/security/AuthenticationAuditListenerTests.java → spring-actuator/src/test/java/org/springframework/actuate/security/AuthenticationAuditListenerTests.java
View File

@ -14,11 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.security; package org.springframework.actuate.security;
import org.junit.Ignore; import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.springframework.zero.actuate.security.AuthenticationAuditListener; import org.springframework.actuate.security.AuthenticationAuditListener;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;

4
spring-actuator/src/test/java/org/springframework/zero/actuate/security/AuthorizationAuditListenerTests.java → spring-actuator/src/test/java/org/springframework/actuate/security/AuthorizationAuditListenerTests.java
View File

@ -14,11 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.security; package org.springframework.actuate.security;
import org.junit.Ignore; import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.springframework.zero.actuate.security.AuthenticationAuditListener; import org.springframework.actuate.security.AuthenticationAuditListener;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;

6
spring-actuator/src/test/java/org/springframework/zero/actuate/trace/InMemoryTraceRepositoryTests.java → spring-actuator/src/test/java/org/springframework/actuate/trace/InMemoryTraceRepositoryTests.java
View File

@ -14,14 +14,14 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.trace; package org.springframework.actuate.trace;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import org.junit.Test; import org.junit.Test;
import org.springframework.zero.actuate.trace.InMemoryTraceRepository; import org.springframework.actuate.trace.InMemoryTraceRepository;
import org.springframework.zero.actuate.trace.Trace; import org.springframework.actuate.trace.Trace;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;

6
spring-actuator/src/test/java/org/springframework/zero/actuate/trace/WebRequestTraceFilterTests.java → spring-actuator/src/test/java/org/springframework/actuate/trace/WebRequestTraceFilterTests.java
View File

@ -14,14 +14,14 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.actuate.trace; package org.springframework.actuate.trace;
import java.util.Map; import java.util.Map;
import org.junit.Test; import org.junit.Test;
import org.springframework.actuate.trace.InMemoryTraceRepository;
import org.springframework.actuate.trace.WebRequestTraceFilter;
import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.zero.actuate.trace.InMemoryTraceRepository;
import org.springframework.zero.actuate.trace.WebRequestTraceFilter;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;

2
spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationSorter.java → spring-autoconfigure/src/main/java/org/springframework/autoconfigure/AutoConfigurationSorter.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.autoconfigure; package org.springframework.autoconfigure;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;

2
spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationUtils.java → spring-autoconfigure/src/main/java/org/springframework/autoconfigure/AutoConfigurationUtils.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.autoconfigure; package org.springframework.autoconfigure;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;

2
spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigureAfter.java → spring-autoconfigure/src/main/java/org/springframework/autoconfigure/AutoConfigureAfter.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.autoconfigure; package org.springframework.autoconfigure;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;

2
spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/ComponentScanDetector.java → spring-autoconfigure/src/main/java/org/springframework/autoconfigure/ComponentScanDetector.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.autoconfigure; package org.springframework.autoconfigure;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;

12
spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfiguration.java → spring-autoconfigure/src/main/java/org/springframework/autoconfigure/EnableAutoConfiguration.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.autoconfigure; package org.springframework.autoconfigure;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
@ -22,15 +22,15 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
import org.springframework.bootstrap.context.condition.ConditionalOnBean;
import org.springframework.bootstrap.context.condition.ConditionalOnClass;
import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean;
import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory;
import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
import org.springframework.core.io.support.SpringFactoriesLoader; import org.springframework.core.io.support.SpringFactoriesLoader;
import org.springframework.zero.context.condition.ConditionalOnBean;
import org.springframework.zero.context.condition.ConditionalOnClass;
import org.springframework.zero.context.condition.ConditionalOnMissingBean;
import org.springframework.zero.context.embedded.EmbeddedServletContainerFactory;
import org.springframework.zero.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
/** /**
* Enable auto-configuration of the Spring Application Context, attempting to guess and * Enable auto-configuration of the Spring Application Context, attempting to guess and

2
spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfigurationImportSelector.java → spring-autoconfigure/src/main/java/org/springframework/autoconfigure/EnableAutoConfigurationImportSelector.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.autoconfigure; package org.springframework.autoconfigure;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;

4
spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfiguration.java → spring-autoconfigure/src/main/java/org/springframework/autoconfigure/MessageSourceAutoConfiguration.java
View File

@ -14,16 +14,16 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.autoconfigure; package org.springframework.autoconfigure;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean;
import org.springframework.context.MessageSource; import org.springframework.context.MessageSource;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.support.ResourceBundleMessageSource; import org.springframework.context.support.ResourceBundleMessageSource;
import org.springframework.core.Ordered; import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order; import org.springframework.core.annotation.Order;
import org.springframework.zero.context.condition.ConditionalOnMissingBean;
/** /**
* {@link EnableAutoConfiguration Auto-configuration} for {@link MessageSource}. * {@link EnableAutoConfiguration Auto-configuration} for {@link MessageSource}.

4
spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/PropertyPlaceholderAutoConfiguration.java → spring-autoconfigure/src/main/java/org/springframework/autoconfigure/PropertyPlaceholderAutoConfiguration.java
View File

@ -14,15 +14,15 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.autoconfigure; package org.springframework.autoconfigure;
import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
import org.springframework.core.Ordered; import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order; import org.springframework.core.annotation.Order;
import org.springframework.zero.context.condition.ConditionalOnMissingBean;
/** /**
* {@link EnableAutoConfiguration Auto-configuration} for * {@link EnableAutoConfiguration Auto-configuration} for

14
spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfiguration.java → spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/BatchAutoConfiguration.java
View File

@ -14,17 +14,17 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.autoconfigure.batch; package org.springframework.autoconfigure.batch;
import org.springframework.autoconfigure.EnableAutoConfiguration;
import org.springframework.batch.core.launch.JobLauncher; import org.springframework.batch.core.launch.JobLauncher;
import org.springframework.bootstrap.CommandLineRunner;
import org.springframework.bootstrap.ExitCodeGenerator;
import org.springframework.bootstrap.context.condition.ConditionalOnBean;
import org.springframework.bootstrap.context.condition.ConditionalOnClass;
import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.zero.CommandLineRunner;
import org.springframework.zero.ExitCodeGenerator;
import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
import org.springframework.zero.context.condition.ConditionalOnBean;
import org.springframework.zero.context.condition.ConditionalOnClass;
import org.springframework.zero.context.condition.ConditionalOnMissingBean;
/** /**
* {@link EnableAutoConfiguration Auto-configuration} for Spring Batch. * {@link EnableAutoConfiguration Auto-configuration} for Spring Batch.

2
spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchDatabaseInitializer.java → spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/BatchDatabaseInitializer.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.autoconfigure.batch; package org.springframework.autoconfigure.batch;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import javax.sql.DataSource; import javax.sql.DataSource;

2
spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionEvent.java → spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/JobExecutionEvent.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.autoconfigure.batch; package org.springframework.autoconfigure.batch;
import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobExecution;
import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEvent;

4
spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGenerator.java → spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/JobExecutionExitCodeGenerator.java
View File

@ -14,14 +14,14 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.zero.autoconfigure.batch; package org.springframework.autoconfigure.batch;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobExecution;
import org.springframework.bootstrap.ExitCodeGenerator;
import org.springframework.context.ApplicationListener; import org.springframework.context.ApplicationListener;
import org.springframework.zero.ExitCodeGenerator;
/** /**
* {@link ExitCodeGenerator} for {@link JobExecutionEvent}s. * {@link ExitCodeGenerator} for {@link JobExecutionEvent}s.

Some files were not shown because too many files have changed in this diff Show More