mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Restructure 'bootstrap' to use 'zero'
This commit is contained in:
parent
d039822064
commit
261955c50b
@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
<profiles version="12">
|
<profiles version="12">
|
||||||
<profile kind="CodeFormatterProfile" name="Spring Bootstrap" version="12">
|
<profile kind="CodeFormatterProfile" name="Spring Zero" version="12">
|
||||||
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="do not insert"/>
|
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="do not insert"/>
|
||||||
<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
|
<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
|
||||||
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
|
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# Spring Bootstrap Actuator
|
# Spring Zero Actuator
|
||||||
|
|
||||||
Minimum fuss for getting applications up and running in production,
|
Minimum fuss for getting applications up and running in production,
|
||||||
and in other environments. There is a strong emphasis on implementing
|
and in other environments. There is a strong emphasis on implementing
|
||||||
@ -23,8 +23,8 @@ RESTful web services but many features are more generic than that.
|
|||||||
|
|
||||||
For a quick introduction and to get started quickly with a new
|
For a quick introduction and to get started quickly with a new
|
||||||
project, carry on reading. For more in depth coverage of the features
|
project, carry on reading. For more in depth coverage of the features
|
||||||
of Spring Bootstrap Actuator, go to the
|
of Spring Zero Actuator, go to the
|
||||||
[Feature Guide](https://github.com/SpringSource/spring-bootstrap/tree/master/spring-bootstrap-actuator/docs/Features.md).
|
[Feature Guide](https://github.com/SpringSource/spring-bootstrap/tree/master/spring-zero-actuator/docs/Features.md).
|
||||||
|
|
||||||
# Getting Started
|
# Getting Started
|
||||||
|
|
||||||
@ -47,18 +47,18 @@ If you are using Maven create a really simple `pom.xml` with 2 dependencies:
|
|||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>1.0.0-SNAPSHOT</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.springframework.bootstrap</groupId>
|
<groupId>org.springframework.zero</groupId>
|
||||||
<artifactId>spring-bootstrap-applications</artifactId>
|
<artifactId>spring-zero-starter</artifactId>
|
||||||
<version>0.0.1-SNAPSHOT</version>
|
<version>0.0.1-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.bootstrap</groupId>
|
<groupId>org.springframework.zero</groupId>
|
||||||
<artifactId>spring-bootstrap-web-application</artifactId>
|
<artifactId>spring-zero-web-starter</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.bootstrap</groupId>
|
<groupId>org.springframework.zero</groupId>
|
||||||
<artifactId>spring-bootstrap-service</artifactId>
|
<artifactId>spring-zero-service</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<build>
|
<build>
|
||||||
@ -72,7 +72,7 @@ If you are using Maven create a really simple `pom.xml` with 2 dependencies:
|
|||||||
</project>
|
</project>
|
||||||
|
|
||||||
If you like Gradle, that's fine, and you will know what to do with
|
If you like Gradle, that's fine, and you will know what to do with
|
||||||
those dependencies. The first dependency adds Spring Bootstrap auto
|
those dependencies. The first dependency adds Spring Zero auto
|
||||||
configuration and the Jetty container to your application, and the
|
configuration and the Jetty container to your application, and the
|
||||||
second one adds some more opinionated stuff like the default
|
second one adds some more opinionated stuff like the default
|
||||||
management endpoints. If you prefer Tomcat you can just add the
|
management endpoints. If you prefer Tomcat you can just add the
|
||||||
@ -128,7 +128,7 @@ endpoint. An endpoint can be implemented as a Spring MVC
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
You can launch that straight away using the Spring Bootstrap CLI
|
You can launch that straight away using the Spring Zero CLI
|
||||||
(without the `@EnableAutoConfiguration` and even without the import
|
(without the `@EnableAutoConfiguration` and even without the import
|
||||||
statements that your IDE will add if you are using one), or you can
|
statements that your IDE will add if you are using one), or you can
|
||||||
use the main method to launch it from your project jar. Just add a
|
use the main method to launch it from your project jar. Just add a
|
||||||
@ -167,7 +167,7 @@ on a class and run it.
|
|||||||
|
|
||||||
## Externalizing configuration
|
## Externalizing configuration
|
||||||
|
|
||||||
Spring Bootstrap likes you to externalize your configuration so you
|
Spring Zero likes you to externalize your configuration so you
|
||||||
can work with the same application code in different environments. To
|
can work with the same application code in different environments. To
|
||||||
get started with this you create a file in the root of your classpath
|
get started with this you create a file in the root of your classpath
|
||||||
(`src/main/resources` if using Maven) - if you like YAML you can call
|
(`src/main/resources` if using Maven) - if you like YAML you can call
|
||||||
@ -187,7 +187,7 @@ or if you like Java `Properties` files, you can call it
|
|||||||
management.port: 9001
|
management.port: 9001
|
||||||
logging.file: target/log.out
|
logging.file: target/log.out
|
||||||
|
|
||||||
Those examples are properties that Spring Bootstrap itself binds to
|
Those examples are properties that Spring Zero itself binds to
|
||||||
out of the box, so if you make that change and run the app again, you
|
out of the box, so if you make that change and run the app again, you
|
||||||
will find the home page on port 9000 instead of 8080:
|
will find the home page on port 9000 instead of 8080:
|
||||||
|
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
# Spring Bootstrap Actuator Feature Guide
|
# Spring Zero Actuator Feature Guide
|
||||||
|
|
||||||
Here are some (most, hopefully all) the features of Spring Bootstrap
|
Here are some (most, hopefully all) the features of Spring Zero
|
||||||
Actuator with some commentary to help you start using them. We
|
Actuator 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 Bootstrap (or
|
TODO: some of these are features of Spring Zero (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 Bootstrap will
|
In addition to command line option arguments, Spring Zero 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 Bootstrap also binds the properties to any bean in your
|
Spring Zero 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 Bootstrap takes it a stage further. If you include in your
|
Spring Zero 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 Bootstrap loads additional properties files if there are active
|
Spring Zero 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 Bootstrap uses some relaxed rules for binding `Environment`
|
Spring Zero 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 Bootstrap Actuator. If you prefer to use
|
by Spring Zero 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
|
||||||
|
|
||||||
@ -217,7 +217,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 Bootstrap create the container for
|
need it. Instead of letting Spring Zero 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.
|
||||||
@ -261,7 +261,7 @@ this.
|
|||||||
|
|
||||||
## Customizing Logging
|
## Customizing Logging
|
||||||
|
|
||||||
Spring Bootstrap uses SLF4J for logging, but leaves the implementation
|
Spring Zero 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
|
||||||
@ -290,12 +290,12 @@ from the Spring `Environment` to System properties:
|
|||||||
|PID |PID | The current process ID is discovered if possible and not already provided |
|
|PID |PID | The current process ID is discovered if possible and not already provided |
|
||||||
|
|
||||||
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 defailt configurations in
|
parsing their configuration files. See the default configurations in
|
||||||
`spring-bootstrap.jar` for examples.
|
`spring-zero-core.jar` for examples.
|
||||||
|
|
||||||
## Application Context Initializers
|
## Application Context Initializers
|
||||||
|
|
||||||
To add additional application context initializers to the Bootstrap
|
To add additional application context initializers to the Zero
|
||||||
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`).
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.audit;
|
package org.springframework.zero.actuate.audit;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.audit;
|
package org.springframework.zero.actuate.audit;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.audit;
|
package org.springframework.zero.actuate.audit;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
@ -14,14 +14,14 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.audit.listener;
|
package org.springframework.zero.actuate.audit.listener;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.springframework.bootstrap.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.
|
@ -14,13 +14,13 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.audit.listener;
|
package org.springframework.zero.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.bootstrap.actuate.audit.AuditEvent;
|
|
||||||
import org.springframework.bootstrap.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
|
@ -14,20 +14,20 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.autoconfigure;
|
package org.springframework.zero.actuate.autoconfigure;
|
||||||
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.bootstrap.actuate.audit.AuditEvent;
|
|
||||||
import org.springframework.bootstrap.actuate.audit.AuditEventRepository;
|
|
||||||
import org.springframework.bootstrap.actuate.audit.InMemoryAuditEventRepository;
|
|
||||||
import org.springframework.bootstrap.actuate.audit.listener.AuditListener;
|
|
||||||
import org.springframework.bootstrap.actuate.security.AuthenticationAuditListener;
|
|
||||||
import org.springframework.bootstrap.actuate.security.AuthorizationAuditListener;
|
|
||||||
import org.springframework.bootstrap.context.annotation.ConditionalOnClass;
|
|
||||||
import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean;
|
|
||||||
import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration;
|
|
||||||
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.context.annotation.ConditionalOnClass;
|
||||||
|
import org.springframework.zero.context.annotation.ConditionalOnMissingBean;
|
||||||
|
import org.springframework.zero.context.annotation.EnableAutoConfiguration;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@link EnableAutoConfiguration Auto-configuration} for {@link AuditEvent}s.
|
* {@link EnableAutoConfiguration Auto-configuration} for {@link AuditEvent}s.
|
@ -13,7 +13,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.springframework.bootstrap.actuate.autoconfigure;
|
package org.springframework.zero.actuate.autoconfigure;
|
||||||
|
|
||||||
import java.util.LinkedHashMap;
|
import java.util.LinkedHashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@ -21,32 +21,32 @@ import java.util.Properties;
|
|||||||
|
|
||||||
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.actuate.endpoint.BeansEndpoint;
|
|
||||||
import org.springframework.bootstrap.actuate.endpoint.DumpEndpoint;
|
|
||||||
import org.springframework.bootstrap.actuate.endpoint.Endpoint;
|
|
||||||
import org.springframework.bootstrap.actuate.endpoint.EnvironmentEndpoint;
|
|
||||||
import org.springframework.bootstrap.actuate.endpoint.HealthEndpoint;
|
|
||||||
import org.springframework.bootstrap.actuate.endpoint.InfoEndpoint;
|
|
||||||
import org.springframework.bootstrap.actuate.endpoint.MetricsEndpoint;
|
|
||||||
import org.springframework.bootstrap.actuate.endpoint.PublicMetrics;
|
|
||||||
import org.springframework.bootstrap.actuate.endpoint.ShutdownEndpoint;
|
|
||||||
import org.springframework.bootstrap.actuate.endpoint.TraceEndpoint;
|
|
||||||
import org.springframework.bootstrap.actuate.endpoint.VanillaPublicMetrics;
|
|
||||||
import org.springframework.bootstrap.actuate.health.HealthIndicator;
|
|
||||||
import org.springframework.bootstrap.actuate.health.VanillaHealthIndicator;
|
|
||||||
import org.springframework.bootstrap.actuate.metrics.InMemoryMetricRepository;
|
|
||||||
import org.springframework.bootstrap.actuate.metrics.MetricRepository;
|
|
||||||
import org.springframework.bootstrap.actuate.trace.InMemoryTraceRepository;
|
|
||||||
import org.springframework.bootstrap.actuate.trace.TraceRepository;
|
|
||||||
import org.springframework.bootstrap.bind.PropertiesConfigurationFactory;
|
|
||||||
import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean;
|
|
||||||
import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration;
|
|
||||||
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.bind.PropertiesConfigurationFactory;
|
||||||
|
import org.springframework.zero.context.annotation.ConditionalOnMissingBean;
|
||||||
|
import org.springframework.zero.context.annotation.EnableAutoConfiguration;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@link EnableAutoConfiguration Auto-configuration} for common management
|
* {@link EnableAutoConfiguration Auto-configuration} for common management
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.autoconfigure;
|
package org.springframework.zero.actuate.autoconfigure;
|
||||||
|
|
||||||
import javax.servlet.Servlet;
|
import javax.servlet.Servlet;
|
||||||
|
|
||||||
@ -22,19 +22,6 @@ 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.actuate.endpoint.Endpoint;
|
|
||||||
import org.springframework.bootstrap.actuate.endpoint.mvc.EndpointHandlerAdapter;
|
|
||||||
import org.springframework.bootstrap.actuate.endpoint.mvc.EndpointHandlerMapping;
|
|
||||||
import org.springframework.bootstrap.actuate.properties.ManagementServerProperties;
|
|
||||||
import org.springframework.bootstrap.autoconfigure.PropertyPlaceholderAutoConfiguration;
|
|
||||||
import org.springframework.bootstrap.autoconfigure.web.EmbeddedServletContainerAutoConfiguration;
|
|
||||||
import org.springframework.bootstrap.autoconfigure.web.WebMvcAutoConfiguration;
|
|
||||||
import org.springframework.bootstrap.context.annotation.AutoConfigureAfter;
|
|
||||||
import org.springframework.bootstrap.context.annotation.ConditionalOnClass;
|
|
||||||
import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean;
|
|
||||||
import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration;
|
|
||||||
import org.springframework.bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
|
|
||||||
import org.springframework.bootstrap.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;
|
||||||
@ -44,6 +31,19 @@ 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.PropertyPlaceholderAutoConfiguration;
|
||||||
|
import org.springframework.zero.autoconfigure.web.EmbeddedServletContainerAutoConfiguration;
|
||||||
|
import org.springframework.zero.autoconfigure.web.WebMvcAutoConfiguration;
|
||||||
|
import org.springframework.zero.context.annotation.AutoConfigureAfter;
|
||||||
|
import org.springframework.zero.context.annotation.ConditionalOnClass;
|
||||||
|
import org.springframework.zero.context.annotation.ConditionalOnMissingBean;
|
||||||
|
import org.springframework.zero.context.annotation.EnableAutoConfiguration;
|
||||||
|
import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
|
||||||
|
import org.springframework.zero.properties.ServerProperties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@link EnableAutoConfiguration Auto-configuration} to enable Spring MVC to handle
|
* {@link EnableAutoConfiguration Auto-configuration} to enable Spring MVC to handle
|
@ -13,27 +13,27 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.springframework.bootstrap.actuate.autoconfigure;
|
package org.springframework.zero.actuate.autoconfigure;
|
||||||
|
|
||||||
import javax.servlet.Filter;
|
import javax.servlet.Filter;
|
||||||
|
|
||||||
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.actuate.endpoint.mvc.EndpointHandlerAdapter;
|
|
||||||
import org.springframework.bootstrap.actuate.endpoint.mvc.EndpointHandlerMapping;
|
|
||||||
import org.springframework.bootstrap.actuate.properties.ManagementServerProperties;
|
|
||||||
import org.springframework.bootstrap.context.annotation.ConditionalOnBean;
|
|
||||||
import org.springframework.bootstrap.context.annotation.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.annotation.ConditionalOnBean;
|
||||||
|
import org.springframework.zero.context.annotation.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
|
@ -14,21 +14,21 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.autoconfigure;
|
package org.springframework.zero.actuate.autoconfigure;
|
||||||
|
|
||||||
import javax.servlet.Servlet;
|
import javax.servlet.Servlet;
|
||||||
|
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.bootstrap.actuate.web.BasicErrorController;
|
|
||||||
import org.springframework.bootstrap.actuate.web.ErrorController;
|
|
||||||
import org.springframework.bootstrap.context.annotation.ConditionalOnClass;
|
|
||||||
import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean;
|
|
||||||
import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration;
|
|
||||||
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.context.annotation.ConditionalOnClass;
|
||||||
|
import org.springframework.zero.context.annotation.ConditionalOnMissingBean;
|
||||||
|
import org.springframework.zero.context.annotation.EnableAutoConfiguration;
|
||||||
|
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
|
@ -13,16 +13,16 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.springframework.bootstrap.actuate.autoconfigure;
|
package org.springframework.zero.actuate.autoconfigure;
|
||||||
|
|
||||||
import org.springframework.bootstrap.actuate.properties.ManagementServerProperties;
|
|
||||||
import org.springframework.bootstrap.autoconfigure.web.ServerPropertiesAutoConfiguration;
|
|
||||||
import org.springframework.bootstrap.context.annotation.AutoConfigureAfter;
|
|
||||||
import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean;
|
|
||||||
import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration;
|
|
||||||
import org.springframework.bootstrap.context.annotation.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.web.ServerPropertiesAutoConfiguration;
|
||||||
|
import org.springframework.zero.context.annotation.AutoConfigureAfter;
|
||||||
|
import org.springframework.zero.context.annotation.ConditionalOnMissingBean;
|
||||||
|
import org.springframework.zero.context.annotation.EnableAutoConfiguration;
|
||||||
|
import org.springframework.zero.context.annotation.EnableConfigurationProperties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@link EnableAutoConfiguration Auto-configuration} for the
|
* {@link EnableAutoConfiguration Auto-configuration} for the
|
||||||
@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
|
|||||||
@EnableConfigurationProperties
|
@EnableConfigurationProperties
|
||||||
public class ManagementServerPropertiesAutoConfiguration {
|
public class ManagementServerPropertiesAutoConfiguration {
|
||||||
|
|
||||||
@Bean(name = "org.springframework.bootstrap.actuate.properties.ManagementServerProperties")
|
@Bean(name = "org.springframework.zero.actuate.properties.ManagementServerProperties")
|
||||||
@ConditionalOnMissingBean
|
@ConditionalOnMissingBean
|
||||||
public ManagementServerProperties serverProperties() {
|
public ManagementServerProperties serverProperties() {
|
||||||
return new ManagementServerProperties();
|
return new ManagementServerProperties();
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.autoconfigure;
|
package org.springframework.zero.actuate.autoconfigure;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
@ -28,12 +28,6 @@ import javax.servlet.http.HttpServletRequest;
|
|||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.bootstrap.actuate.metrics.CounterService;
|
|
||||||
import org.springframework.bootstrap.actuate.metrics.GaugeService;
|
|
||||||
import org.springframework.bootstrap.context.annotation.AutoConfigureAfter;
|
|
||||||
import org.springframework.bootstrap.context.annotation.ConditionalOnBean;
|
|
||||||
import org.springframework.bootstrap.context.annotation.ConditionalOnClass;
|
|
||||||
import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration;
|
|
||||||
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;
|
||||||
@ -41,6 +35,12 @@ 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.context.annotation.AutoConfigureAfter;
|
||||||
|
import org.springframework.zero.context.annotation.ConditionalOnBean;
|
||||||
|
import org.springframework.zero.context.annotation.ConditionalOnClass;
|
||||||
|
import org.springframework.zero.context.annotation.EnableAutoConfiguration;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@link EnableAutoConfiguration Auto-configuration} that records Servlet interactions
|
* {@link EnableAutoConfiguration Auto-configuration} that records Servlet interactions
|
@ -14,18 +14,18 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.autoconfigure;
|
package org.springframework.zero.actuate.autoconfigure;
|
||||||
|
|
||||||
import org.springframework.bootstrap.actuate.metrics.CounterService;
|
|
||||||
import org.springframework.bootstrap.actuate.metrics.DefaultCounterService;
|
|
||||||
import org.springframework.bootstrap.actuate.metrics.DefaultGaugeService;
|
|
||||||
import org.springframework.bootstrap.actuate.metrics.GaugeService;
|
|
||||||
import org.springframework.bootstrap.actuate.metrics.InMemoryMetricRepository;
|
|
||||||
import org.springframework.bootstrap.actuate.metrics.MetricRepository;
|
|
||||||
import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean;
|
|
||||||
import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration;
|
|
||||||
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.context.annotation.ConditionalOnMissingBean;
|
||||||
|
import org.springframework.zero.context.annotation.EnableAutoConfiguration;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@link EnableAutoConfiguration Auto-configuration} for metrics services.
|
* {@link EnableAutoConfiguration Auto-configuration} for metrics services.
|
@ -14,21 +14,13 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.autoconfigure;
|
package org.springframework.zero.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.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.bootstrap.actuate.endpoint.Endpoint;
|
|
||||||
import org.springframework.bootstrap.actuate.endpoint.mvc.EndpointHandlerMapping;
|
|
||||||
import org.springframework.bootstrap.actuate.properties.SecurityProperties;
|
|
||||||
import org.springframework.bootstrap.actuate.web.ErrorController;
|
|
||||||
import org.springframework.bootstrap.context.annotation.ConditionalOnClass;
|
|
||||||
import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean;
|
|
||||||
import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration;
|
|
||||||
import org.springframework.bootstrap.context.annotation.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;
|
||||||
@ -45,6 +37,14 @@ 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.context.annotation.ConditionalOnClass;
|
||||||
|
import org.springframework.zero.context.annotation.ConditionalOnMissingBean;
|
||||||
|
import org.springframework.zero.context.annotation.EnableAutoConfiguration;
|
||||||
|
import org.springframework.zero.context.annotation.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.security.web.authentication.www.BasicAuthenticationEn
|
|||||||
@EnableConfigurationProperties
|
@EnableConfigurationProperties
|
||||||
public class SecurityAutoConfiguration {
|
public class SecurityAutoConfiguration {
|
||||||
|
|
||||||
@Bean(name = "org.springframework.bootstrap.actuate.properties.SecurityProperties")
|
@Bean(name = "org.springframework.zero.actuate.properties.SecurityProperties")
|
||||||
@ConditionalOnMissingBean
|
@ConditionalOnMissingBean
|
||||||
public SecurityProperties securityProperties() {
|
public SecurityProperties securityProperties() {
|
||||||
return new SecurityProperties();
|
return new SecurityProperties();
|
@ -14,14 +14,14 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.autoconfigure;
|
package org.springframework.zero.actuate.autoconfigure;
|
||||||
|
|
||||||
import org.springframework.bootstrap.actuate.trace.InMemoryTraceRepository;
|
|
||||||
import org.springframework.bootstrap.actuate.trace.TraceRepository;
|
|
||||||
import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean;
|
|
||||||
import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration;
|
|
||||||
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.context.annotation.ConditionalOnMissingBean;
|
||||||
|
import org.springframework.zero.context.annotation.EnableAutoConfiguration;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@link EnableAutoConfiguration Auto-configuration} for {@link TraceRepository tracing}.
|
* {@link EnableAutoConfiguration Auto-configuration} for {@link TraceRepository tracing}.
|
@ -13,20 +13,20 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.springframework.bootstrap.actuate.autoconfigure;
|
package org.springframework.zero.actuate.autoconfigure;
|
||||||
|
|
||||||
import javax.servlet.Servlet;
|
import javax.servlet.Servlet;
|
||||||
|
|
||||||
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.actuate.trace.TraceRepository;
|
|
||||||
import org.springframework.bootstrap.actuate.trace.WebRequestTraceFilter;
|
|
||||||
import org.springframework.bootstrap.context.annotation.AutoConfigureAfter;
|
|
||||||
import org.springframework.bootstrap.context.annotation.ConditionalOnClass;
|
|
||||||
import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration;
|
|
||||||
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.context.annotation.AutoConfigureAfter;
|
||||||
|
import org.springframework.zero.context.annotation.ConditionalOnClass;
|
||||||
|
import org.springframework.zero.context.annotation.EnableAutoConfiguration;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@link EnableAutoConfiguration Auto-configuration} for {@link WebRequestTraceFilter
|
* {@link EnableAutoConfiguration Auto-configuration} for {@link WebRequestTraceFilter
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.endpoint;
|
package org.springframework.zero.actuate.endpoint;
|
||||||
|
|
||||||
import javax.validation.constraints.NotNull;
|
import javax.validation.constraints.NotNull;
|
||||||
import javax.validation.constraints.Pattern;
|
import javax.validation.constraints.Pattern;
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.endpoint;
|
package org.springframework.zero.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.
|
@ -14,15 +14,15 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.endpoint;
|
package org.springframework.zero.actuate.endpoint;
|
||||||
|
|
||||||
import org.springframework.beans.BeansException;
|
import org.springframework.beans.BeansException;
|
||||||
import org.springframework.bootstrap.context.annotation.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.annotation.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
|
@ -14,14 +14,14 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.endpoint;
|
package org.springframework.zero.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.bootstrap.context.annotation.ConfigurationProperties;
|
import org.springframework.zero.context.annotation.ConfigurationProperties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@link Endpoint} to expose thread info.
|
* {@link Endpoint} to expose thread info.
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.endpoint;
|
package org.springframework.zero.actuate.endpoint;
|
||||||
|
|
||||||
import org.springframework.http.MediaType;
|
import org.springframework.http.MediaType;
|
||||||
|
|
@ -14,18 +14,18 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.endpoint;
|
package org.springframework.zero.actuate.endpoint;
|
||||||
|
|
||||||
import java.util.LinkedHashMap;
|
import java.util.LinkedHashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.springframework.bootstrap.context.annotation.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.annotation.ConfigurationProperties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@link Endpoint} to expose {@link ConfigurableEnvironment environment} information.
|
* {@link Endpoint} to expose {@link ConfigurableEnvironment environment} information.
|
@ -14,11 +14,11 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.endpoint;
|
package org.springframework.zero.actuate.endpoint;
|
||||||
|
|
||||||
import org.springframework.bootstrap.actuate.health.HealthIndicator;
|
|
||||||
import org.springframework.bootstrap.context.annotation.ConfigurationProperties;
|
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
|
import org.springframework.zero.actuate.health.HealthIndicator;
|
||||||
|
import org.springframework.zero.context.annotation.ConfigurationProperties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@link Endpoint} to expose application health.
|
* {@link Endpoint} to expose application health.
|
@ -14,14 +14,14 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.endpoint;
|
package org.springframework.zero.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.annotation.ConfigurationProperties;
|
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
|
import org.springframework.zero.context.annotation.ConfigurationProperties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@link Endpoint} to expose arbitrary application information.
|
* {@link Endpoint} to expose arbitrary application information.
|
@ -14,14 +14,14 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.endpoint;
|
package org.springframework.zero.actuate.endpoint;
|
||||||
|
|
||||||
import java.util.LinkedHashMap;
|
import java.util.LinkedHashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.springframework.bootstrap.actuate.metrics.Metric;
|
|
||||||
import org.springframework.bootstrap.context.annotation.ConfigurationProperties;
|
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
|
import org.springframework.zero.actuate.metrics.Metric;
|
||||||
|
import org.springframework.zero.context.annotation.ConfigurationProperties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@link Endpoint} to expose {@link PublicMetrics}.
|
* {@link Endpoint} to expose {@link PublicMetrics}.
|
@ -14,11 +14,11 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.endpoint;
|
package org.springframework.zero.actuate.endpoint;
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
|
|
||||||
import org.springframework.bootstrap.actuate.metrics.Metric;
|
import org.springframework.zero.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}.
|
@ -14,18 +14,18 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.endpoint;
|
package org.springframework.zero.actuate.endpoint;
|
||||||
|
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
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.actuate.properties.ManagementServerProperties;
|
|
||||||
import org.springframework.bootstrap.context.annotation.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.annotation.ConfigurationProperties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@link ActionEndpoint} to shutdown the {@link ApplicationContext}.
|
* {@link ActionEndpoint} to shutdown the {@link ApplicationContext}.
|
@ -14,14 +14,14 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.endpoint;
|
package org.springframework.zero.actuate.endpoint;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.springframework.bootstrap.actuate.trace.Trace;
|
|
||||||
import org.springframework.bootstrap.actuate.trace.TraceRepository;
|
|
||||||
import org.springframework.bootstrap.context.annotation.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.annotation.ConfigurationProperties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@link Endpoint} to expose {@link Trace} information.
|
* {@link Endpoint} to expose {@link Trace} information.
|
@ -14,14 +14,14 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.endpoint;
|
package org.springframework.zero.actuate.endpoint;
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.LinkedHashSet;
|
import java.util.LinkedHashSet;
|
||||||
|
|
||||||
import org.springframework.bootstrap.actuate.metrics.Metric;
|
|
||||||
import org.springframework.bootstrap.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
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.endpoint.mvc;
|
package org.springframework.zero.actuate.endpoint.mvc;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
@ -28,7 +28,6 @@ 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.bootstrap.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;
|
||||||
@ -40,6 +39,7 @@ 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;
|
||||||
|
|
@ -13,7 +13,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.springframework.bootstrap.actuate.endpoint.mvc;
|
package org.springframework.zero.actuate.endpoint.mvc;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
@ -24,8 +24,6 @@ import javax.servlet.http.HttpServletRequest;
|
|||||||
|
|
||||||
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.bootstrap.actuate.endpoint.ActionEndpoint;
|
|
||||||
import org.springframework.bootstrap.actuate.endpoint.Endpoint;
|
|
||||||
import org.springframework.context.ApplicationContext;
|
import org.springframework.context.ApplicationContext;
|
||||||
import org.springframework.context.ApplicationContextAware;
|
import org.springframework.context.ApplicationContextAware;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
@ -33,6 +31,8 @@ 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()}.
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.fixme;
|
package org.springframework.zero.actuate.fixme;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
@ -28,16 +28,6 @@ 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.actuate.properties.ManagementServerProperties;
|
|
||||||
import org.springframework.bootstrap.actuate.web.BasicErrorController;
|
|
||||||
import org.springframework.bootstrap.context.annotation.ConditionalOnBean;
|
|
||||||
import org.springframework.bootstrap.context.annotation.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;
|
||||||
@ -46,6 +36,16 @@ 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.annotation.ConditionalOnBean;
|
||||||
|
import org.springframework.zero.context.annotation.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.
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.health;
|
package org.springframework.zero.actuate.health;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Strategy interface used to provide an indication of application health.
|
* Strategy interface used to provide an indication of application health.
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.health;
|
package org.springframework.zero.actuate.health;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Default implementation of {@link HealthIndicator} that simply returns "ok".
|
* Default implementation of {@link HealthIndicator} that simply returns "ok".
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.metrics;
|
package org.springframework.zero.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}.
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.metrics;
|
package org.springframework.zero.actuate.metrics;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.metrics;
|
package org.springframework.zero.actuate.metrics;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.metrics;
|
package org.springframework.zero.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.
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.metrics;
|
package org.springframework.zero.actuate.metrics;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.metrics;
|
package org.springframework.zero.actuate.metrics;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.metrics;
|
package org.springframework.zero.actuate.metrics;
|
||||||
|
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
import org.springframework.util.ObjectUtils;
|
import org.springframework.util.ObjectUtils;
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.metrics;
|
package org.springframework.zero.actuate.metrics;
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
@ -14,14 +14,14 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.properties;
|
package org.springframework.zero.actuate.properties;
|
||||||
|
|
||||||
import java.net.InetAddress;
|
import java.net.InetAddress;
|
||||||
|
|
||||||
import javax.validation.constraints.NotNull;
|
import javax.validation.constraints.NotNull;
|
||||||
|
|
||||||
import org.springframework.bootstrap.context.annotation.ConfigurationProperties;
|
import org.springframework.zero.context.annotation.ConfigurationProperties;
|
||||||
import org.springframework.bootstrap.properties.ServerProperties;
|
import org.springframework.zero.properties.ServerProperties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Properties for the management server (e.g. port and path settings).
|
* Properties for the management server (e.g. port and path settings).
|
@ -14,10 +14,10 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.properties;
|
package org.springframework.zero.actuate.properties;
|
||||||
|
|
||||||
import org.springframework.bootstrap.context.annotation.ConfigurationProperties;
|
|
||||||
import org.springframework.security.config.annotation.web.configurers.SessionCreationPolicy;
|
import org.springframework.security.config.annotation.web.configurers.SessionCreationPolicy;
|
||||||
|
import org.springframework.zero.context.annotation.ConfigurationProperties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Properties for the security aspects of an application.
|
* Properties for the security aspects of an application.
|
@ -14,19 +14,19 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.security;
|
package org.springframework.zero.actuate.security;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.springframework.bootstrap.actuate.audit.AuditEvent;
|
|
||||||
import org.springframework.bootstrap.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
|
@ -14,19 +14,19 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.security;
|
package org.springframework.zero.actuate.security;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.springframework.bootstrap.actuate.audit.AuditEvent;
|
|
||||||
import org.springframework.bootstrap.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
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.trace;
|
package org.springframework.zero.actuate.trace;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.trace;
|
package org.springframework.zero.actuate.trace;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.trace;
|
package org.springframework.zero.actuate.trace;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.trace;
|
package org.springframework.zero.actuate.trace;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.web;
|
package org.springframework.zero.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
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.web;
|
package org.springframework.zero.actuate.web;
|
||||||
|
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
|
|
@ -1,11 +1,11 @@
|
|||||||
org.springframework.bootstrap.context.annotation.EnableAutoConfiguration=\
|
org.springframework.zero.context.annotation.EnableAutoConfiguration=\
|
||||||
org.springframework.bootstrap.actuate.autoconfigure.AuditAutoConfiguration,\
|
org.springframework.zero.actuate.autoconfigure.AuditAutoConfiguration,\
|
||||||
org.springframework.bootstrap.actuate.autoconfigure.EndpointAutoConfiguration,\
|
org.springframework.zero.actuate.autoconfigure.EndpointAutoConfiguration,\
|
||||||
org.springframework.bootstrap.actuate.autoconfigure.EndpointWebMvcAutoConfiguration,\
|
org.springframework.zero.actuate.autoconfigure.EndpointWebMvcAutoConfiguration,\
|
||||||
org.springframework.bootstrap.actuate.autoconfigure.ErrorMvcAutoConfiguration,\
|
org.springframework.zero.actuate.autoconfigure.ErrorMvcAutoConfiguration,\
|
||||||
org.springframework.bootstrap.actuate.autoconfigure.ManagementServerPropertiesAutoConfiguration,\
|
org.springframework.zero.actuate.autoconfigure.ManagementServerPropertiesAutoConfiguration,\
|
||||||
org.springframework.bootstrap.actuate.autoconfigure.MetricFilterAutoConfiguration,\
|
org.springframework.zero.actuate.autoconfigure.MetricFilterAutoConfiguration,\
|
||||||
org.springframework.bootstrap.actuate.autoconfigure.MetricRepositoryAutoConfiguration,\
|
org.springframework.zero.actuate.autoconfigure.MetricRepositoryAutoConfiguration,\
|
||||||
org.springframework.bootstrap.actuate.autoconfigure.SecurityAutoConfiguration,\
|
org.springframework.zero.actuate.autoconfigure.SecurityAutoConfiguration,\
|
||||||
org.springframework.bootstrap.actuate.autoconfigure.TraceRepositoryAutoConfiguration,\
|
org.springframework.zero.actuate.autoconfigure.TraceRepositoryAutoConfiguration,\
|
||||||
org.springframework.bootstrap.actuate.autoconfigure.TraceWebFilterAutoConfiguration
|
org.springframework.zero.actuate.autoconfigure.TraceWebFilterAutoConfiguration
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.springframework.bootstrap.actuate;
|
package org.springframework.zero.actuate;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
@ -14,11 +14,12 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.audit;
|
package org.springframework.zero.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 static org.junit.Assert.assertEquals;
|
import static org.junit.Assert.assertEquals;
|
||||||
import static org.junit.Assert.assertNotNull;
|
import static org.junit.Assert.assertNotNull;
|
@ -14,11 +14,13 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.audit;
|
package org.springframework.zero.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.zero.actuate.audit.InMemoryAuditEventRepository;
|
||||||
|
|
||||||
import static org.junit.Assert.assertEquals;
|
import static org.junit.Assert.assertEquals;
|
||||||
|
|
@ -13,13 +13,15 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.springframework.bootstrap.actuate.audit.listener;
|
package org.springframework.zero.actuate.audit.listener;
|
||||||
|
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.springframework.bootstrap.actuate.audit.AuditEvent;
|
import org.springframework.zero.actuate.audit.AuditEvent;
|
||||||
import org.springframework.bootstrap.actuate.audit.AuditEventRepository;
|
import org.springframework.zero.actuate.audit.AuditEventRepository;
|
||||||
|
import org.springframework.zero.actuate.audit.listener.AuditApplicationEvent;
|
||||||
|
import org.springframework.zero.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;
|
@ -14,16 +14,17 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.autoconfigure;
|
package org.springframework.zero.actuate.autoconfigure;
|
||||||
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.springframework.bootstrap.actuate.audit.AuditEventRepository;
|
|
||||||
import org.springframework.bootstrap.actuate.audit.InMemoryAuditEventRepository;
|
|
||||||
import org.springframework.bootstrap.actuate.security.AuthenticationAuditListener;
|
|
||||||
import org.springframework.bootstrap.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;
|
@ -13,20 +13,21 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.springframework.bootstrap.actuate.autoconfigure;
|
package org.springframework.zero.actuate.autoconfigure;
|
||||||
|
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.springframework.bootstrap.actuate.TestUtils;
|
|
||||||
import org.springframework.bootstrap.actuate.endpoint.BeansEndpoint;
|
|
||||||
import org.springframework.bootstrap.actuate.endpoint.DumpEndpoint;
|
|
||||||
import org.springframework.bootstrap.actuate.endpoint.EnvironmentEndpoint;
|
|
||||||
import org.springframework.bootstrap.actuate.endpoint.HealthEndpoint;
|
|
||||||
import org.springframework.bootstrap.actuate.endpoint.InfoEndpoint;
|
|
||||||
import org.springframework.bootstrap.actuate.endpoint.MetricsEndpoint;
|
|
||||||
import org.springframework.bootstrap.actuate.endpoint.ShutdownEndpoint;
|
|
||||||
import org.springframework.bootstrap.actuate.endpoint.TraceEndpoint;
|
|
||||||
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
|
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
|
||||||
|
import org.springframework.zero.actuate.TestUtils;
|
||||||
|
import org.springframework.zero.actuate.autoconfigure.EndpointAutoConfiguration;
|
||||||
|
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;
|
@ -13,7 +13,7 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.springframework.bootstrap.actuate.autoconfigure;
|
package org.springframework.zero.actuate.autoconfigure;
|
||||||
|
|
||||||
import java.io.FileNotFoundException;
|
import java.io.FileNotFoundException;
|
||||||
import java.net.SocketException;
|
import java.net.SocketException;
|
||||||
@ -22,15 +22,6 @@ import java.nio.charset.Charset;
|
|||||||
|
|
||||||
import org.junit.After;
|
import org.junit.After;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.springframework.bootstrap.actuate.TestUtils;
|
|
||||||
import org.springframework.bootstrap.actuate.endpoint.AbstractEndpoint;
|
|
||||||
import org.springframework.bootstrap.actuate.endpoint.Endpoint;
|
|
||||||
import org.springframework.bootstrap.actuate.properties.ManagementServerProperties;
|
|
||||||
import org.springframework.bootstrap.autoconfigure.PropertyPlaceholderAutoConfiguration;
|
|
||||||
import org.springframework.bootstrap.autoconfigure.web.EmbeddedServletContainerAutoConfiguration;
|
|
||||||
import org.springframework.bootstrap.autoconfigure.web.ServerPropertiesAutoConfiguration;
|
|
||||||
import org.springframework.bootstrap.autoconfigure.web.WebMvcAutoConfiguration;
|
|
||||||
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;
|
||||||
@ -41,6 +32,17 @@ 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.actuate.TestUtils;
|
||||||
|
import org.springframework.zero.actuate.autoconfigure.EndpointWebMvcAutoConfiguration;
|
||||||
|
import org.springframework.zero.actuate.autoconfigure.ManagementServerPropertiesAutoConfiguration;
|
||||||
|
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;
|
@ -13,13 +13,14 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.springframework.bootstrap.actuate.autoconfigure;
|
package org.springframework.zero.actuate.autoconfigure;
|
||||||
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.springframework.bootstrap.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.autoconfigure.ManagementServerPropertiesAutoConfiguration;
|
||||||
|
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;
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.autoconfigure;
|
package org.springframework.zero.actuate.autoconfigure;
|
||||||
|
|
||||||
import javax.servlet.Filter;
|
import javax.servlet.Filter;
|
||||||
import javax.servlet.FilterChain;
|
import javax.servlet.FilterChain;
|
||||||
@ -22,13 +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.bootstrap.actuate.metrics.CounterService;
|
|
||||||
import org.springframework.bootstrap.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;
|
@ -14,16 +14,17 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.autoconfigure;
|
package org.springframework.zero.actuate.autoconfigure;
|
||||||
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.springframework.bootstrap.actuate.metrics.CounterService;
|
|
||||||
import org.springframework.bootstrap.actuate.metrics.DefaultCounterService;
|
|
||||||
import org.springframework.bootstrap.actuate.metrics.DefaultGaugeService;
|
|
||||||
import org.springframework.bootstrap.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;
|
@ -14,10 +14,9 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.autoconfigure;
|
package org.springframework.zero.actuate.autoconfigure;
|
||||||
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.springframework.bootstrap.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;
|
||||||
@ -26,6 +25,9 @@ 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;
|
@ -14,14 +14,15 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.autoconfigure;
|
package org.springframework.zero.actuate.autoconfigure;
|
||||||
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.springframework.bootstrap.actuate.trace.InMemoryTraceRepository;
|
|
||||||
import org.springframework.bootstrap.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;
|
@ -14,12 +14,14 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.autoconfigure;
|
package org.springframework.zero.actuate.autoconfigure;
|
||||||
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.springframework.bootstrap.actuate.trace.WebRequestTraceFilter;
|
|
||||||
import org.springframework.bootstrap.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;
|
||||||
|
|
@ -14,17 +14,18 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.endpoint;
|
package org.springframework.zero.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.bootstrap.actuate.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.actuate.TestUtils;
|
||||||
|
import org.springframework.zero.actuate.endpoint.Endpoint;
|
||||||
|
|
||||||
import static org.hamcrest.Matchers.equalTo;
|
import static org.hamcrest.Matchers.equalTo;
|
||||||
import static org.junit.Assert.assertThat;
|
import static org.junit.Assert.assertThat;
|
@ -14,13 +14,14 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.endpoint;
|
package org.springframework.zero.actuate.endpoint;
|
||||||
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.springframework.bootstrap.context.annotation.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.annotation.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;
|
@ -14,15 +14,16 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.endpoint;
|
package org.springframework.zero.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.bootstrap.context.annotation.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.annotation.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;
|
@ -14,12 +14,13 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.endpoint;
|
package org.springframework.zero.actuate.endpoint;
|
||||||
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.springframework.bootstrap.context.annotation.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.annotation.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;
|
@ -14,13 +14,14 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.endpoint;
|
package org.springframework.zero.actuate.endpoint;
|
||||||
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.springframework.bootstrap.actuate.health.HealthIndicator;
|
|
||||||
import org.springframework.bootstrap.context.annotation.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.annotation.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;
|
@ -14,14 +14,15 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.endpoint;
|
package org.springframework.zero.actuate.endpoint;
|
||||||
|
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.springframework.bootstrap.context.annotation.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.annotation.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;
|
@ -14,16 +14,18 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.endpoint;
|
package org.springframework.zero.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.bootstrap.actuate.metrics.Metric;
|
|
||||||
import org.springframework.bootstrap.context.annotation.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.annotation.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;
|
@ -14,13 +14,14 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.endpoint;
|
package org.springframework.zero.actuate.endpoint;
|
||||||
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.springframework.bootstrap.actuate.properties.ManagementServerProperties;
|
|
||||||
import org.springframework.bootstrap.context.annotation.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.annotation.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;
|
@ -14,17 +14,18 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.endpoint;
|
package org.springframework.zero.actuate.endpoint;
|
||||||
|
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.springframework.bootstrap.actuate.trace.InMemoryTraceRepository;
|
|
||||||
import org.springframework.bootstrap.actuate.trace.Trace;
|
|
||||||
import org.springframework.bootstrap.actuate.trace.TraceRepository;
|
|
||||||
import org.springframework.bootstrap.context.annotation.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.annotation.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;
|
@ -14,15 +14,16 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.endpoint;
|
package org.springframework.zero.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.bootstrap.actuate.metrics.InMemoryMetricRepository;
|
import org.springframework.zero.actuate.endpoint.VanillaPublicMetrics;
|
||||||
import org.springframework.bootstrap.actuate.metrics.Metric;
|
import org.springframework.zero.actuate.metrics.InMemoryMetricRepository;
|
||||||
|
import org.springframework.zero.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;
|
@ -14,10 +14,11 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.endpoint.mvc;
|
package org.springframework.zero.actuate.endpoint.mvc;
|
||||||
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.springframework.bootstrap.actuate.endpoint.Endpoint;
|
import org.springframework.zero.actuate.endpoint.Endpoint;
|
||||||
|
import org.springframework.zero.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;
|
@ -14,14 +14,15 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.endpoint.mvc;
|
package org.springframework.zero.actuate.endpoint.mvc;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.springframework.bootstrap.actuate.endpoint.AbstractEndpoint;
|
|
||||||
import org.springframework.bootstrap.actuate.endpoint.ActionEndpoint;
|
|
||||||
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;
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.fixme;
|
package org.springframework.zero.actuate.fixme;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Dave Syer
|
* @author Dave Syer
|
@ -14,9 +14,10 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.health;
|
package org.springframework.zero.actuate.health;
|
||||||
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
import org.springframework.zero.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;
|
@ -14,10 +14,11 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.metrics;
|
package org.springframework.zero.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 static org.junit.Assert.fail;
|
import static org.junit.Assert.fail;
|
||||||
|
|
@ -14,10 +14,11 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.metrics;
|
package org.springframework.zero.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 static org.junit.Assert.fail;
|
import static org.junit.Assert.fail;
|
||||||
|
|
@ -13,10 +13,11 @@
|
|||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.springframework.bootstrap.actuate.metrics;
|
package org.springframework.zero.actuate.metrics;
|
||||||
|
|
||||||
import org.junit.Ignore;
|
import org.junit.Ignore;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
import org.springframework.zero.actuate.metrics.InMemoryMetricRepository;
|
||||||
|
|
||||||
import static org.junit.Assert.fail;
|
import static org.junit.Assert.fail;
|
||||||
|
|
@ -14,15 +14,15 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.properties;
|
package org.springframework.zero.actuate.properties;
|
||||||
|
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.springframework.beans.MutablePropertyValues;
|
import org.springframework.beans.MutablePropertyValues;
|
||||||
import org.springframework.bootstrap.actuate.properties.SecurityProperties;
|
|
||||||
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;
|
@ -14,10 +14,11 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.security;
|
package org.springframework.zero.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 static org.junit.Assert.fail;
|
import static org.junit.Assert.fail;
|
||||||
|
|
@ -14,10 +14,11 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.security;
|
package org.springframework.zero.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 static org.junit.Assert.fail;
|
import static org.junit.Assert.fail;
|
||||||
|
|
@ -14,12 +14,14 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.trace;
|
package org.springframework.zero.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.zero.actuate.trace.Trace;
|
||||||
|
|
||||||
import static org.junit.Assert.assertEquals;
|
import static org.junit.Assert.assertEquals;
|
||||||
|
|
@ -14,12 +14,14 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.actuate.trace;
|
package org.springframework.zero.actuate.trace;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
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;
|
||||||
|
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.autoconfigure;
|
package org.springframework.zero.autoconfigure;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
@ -14,17 +14,17 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.autoconfigure;
|
package org.springframework.zero.autoconfigure;
|
||||||
|
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean;
|
|
||||||
import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration;
|
|
||||||
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.annotation.ConditionalOnMissingBean;
|
||||||
|
import org.springframework.zero.context.annotation.EnableAutoConfiguration;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@link EnableAutoConfiguration Auto-configuration} for {@link MessageSource}.
|
* {@link EnableAutoConfiguration Auto-configuration} for {@link MessageSource}.
|
@ -14,16 +14,16 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.autoconfigure;
|
package org.springframework.zero.autoconfigure;
|
||||||
|
|
||||||
import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean;
|
|
||||||
import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration;
|
|
||||||
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.annotation.ConditionalOnMissingBean;
|
||||||
|
import org.springframework.zero.context.annotation.EnableAutoConfiguration;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@link EnableAutoConfiguration Auto-configuration} for
|
* {@link EnableAutoConfiguration Auto-configuration} for
|
@ -14,17 +14,17 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.autoconfigure.batch;
|
package org.springframework.zero.autoconfigure.batch;
|
||||||
|
|
||||||
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.annotation.ConditionalOnBean;
|
|
||||||
import org.springframework.bootstrap.context.annotation.ConditionalOnClass;
|
|
||||||
import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean;
|
|
||||||
import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration;
|
|
||||||
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.context.annotation.ConditionalOnBean;
|
||||||
|
import org.springframework.zero.context.annotation.ConditionalOnClass;
|
||||||
|
import org.springframework.zero.context.annotation.ConditionalOnMissingBean;
|
||||||
|
import org.springframework.zero.context.annotation.EnableAutoConfiguration;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@link EnableAutoConfiguration Auto-configuration} for Spring Batch.
|
* {@link EnableAutoConfiguration Auto-configuration} for Spring Batch.
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.autoconfigure.batch;
|
package org.springframework.zero.autoconfigure.batch;
|
||||||
|
|
||||||
import javax.annotation.PostConstruct;
|
import javax.annotation.PostConstruct;
|
||||||
import javax.sql.DataSource;
|
import javax.sql.DataSource;
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.autoconfigure.batch;
|
package org.springframework.zero.autoconfigure.batch;
|
||||||
|
|
||||||
import org.springframework.batch.core.JobExecution;
|
import org.springframework.batch.core.JobExecution;
|
||||||
import org.springframework.context.ApplicationEvent;
|
import org.springframework.context.ApplicationEvent;
|
@ -14,14 +14,14 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.autoconfigure.batch;
|
package org.springframework.zero.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.
|
@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.autoconfigure.batch;
|
package org.springframework.zero.autoconfigure.batch;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
@ -30,11 +30,11 @@ import org.springframework.batch.core.converter.DefaultJobParametersConverter;
|
|||||||
import org.springframework.batch.core.converter.JobParametersConverter;
|
import org.springframework.batch.core.converter.JobParametersConverter;
|
||||||
import org.springframework.batch.core.launch.JobLauncher;
|
import org.springframework.batch.core.launch.JobLauncher;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.bootstrap.CommandLineRunner;
|
|
||||||
import org.springframework.context.ApplicationEventPublisher;
|
import org.springframework.context.ApplicationEventPublisher;
|
||||||
import org.springframework.context.ApplicationEventPublisherAware;
|
import org.springframework.context.ApplicationEventPublisherAware;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
import org.springframework.util.StringUtils;
|
import org.springframework.util.StringUtils;
|
||||||
|
import org.springframework.zero.CommandLineRunner;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@link CommandLineRunner} to {@link JobLauncher launch} Spring Batch jobs.
|
* {@link CommandLineRunner} to {@link JobLauncher launch} Spring Batch jobs.
|
@ -14,16 +14,16 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.springframework.bootstrap.autoconfigure.data;
|
package org.springframework.zero.autoconfigure.data;
|
||||||
|
|
||||||
import org.springframework.bootstrap.context.annotation.ConditionalOnClass;
|
|
||||||
import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean;
|
|
||||||
import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration;
|
|
||||||
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.data.jpa.repository.JpaRepository;
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
|
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
|
||||||
import org.springframework.data.jpa.repository.support.JpaRepositoryFactoryBean;
|
import org.springframework.data.jpa.repository.support.JpaRepositoryFactoryBean;
|
||||||
|
import org.springframework.zero.context.annotation.ConditionalOnClass;
|
||||||
|
import org.springframework.zero.context.annotation.ConditionalOnMissingBean;
|
||||||
|
import org.springframework.zero.context.annotation.EnableAutoConfiguration;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@link EnableAutoConfiguration Auto-configuration} for Spring Data's JPA Repositories.
|
* {@link EnableAutoConfiguration Auto-configuration} for Spring Data's JPA Repositories.
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user