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

Restructure 'bootstrap' to use 'zero'

Browse Source
This commit is contained in:
Phillip Webb 2013-07-05 16:44:24 -07:00
parent d039822064
commit 261955c50b
443 changed files with 1361 additions and 1774 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eclipse/eclipse-code-formatter.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<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.disabling_tag" value="@formatter:off"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>

60
spring-zero-actuator/README.md
View File

@ -1,4 +1,4 @@
# Spring Bootstrap Actuator
# Spring Zero Actuator
Minimum fuss for getting applications up and running in production,
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
project, carry on reading. For more in depth coverage of the features
of Spring Bootstrap Actuator, go to the
[Feature Guide](https://github.com/SpringSource/spring-bootstrap/tree/master/spring-bootstrap-actuator/docs/Features.md).
of Spring Zero Actuator, go to the
[Feature Guide](https://github.com/SpringSource/spring-bootstrap/tree/master/spring-zero-actuator/docs/Features.md).
# 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>
<packaging>jar</packaging>
<parent>
<groupId>org.springframework.bootstrap</groupId>
<artifactId>spring-bootstrap-applications</artifactId>
<groupId>org.springframework.zero</groupId>
<artifactId>spring-zero-starter</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>org.springframework.bootstrap</groupId>
<artifactId>spring-bootstrap-web-application</artifactId>
<groupId>org.springframework.zero</groupId>
<artifactId>spring-zero-web-starter</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.bootstrap</groupId>
<artifactId>spring-bootstrap-service</artifactId>
<groupId>org.springframework.zero</groupId>
<artifactId>spring-zero-service</artifactId>
</dependency>
</dependencies>
<build>
@ -72,7 +72,7 @@ If you are using Maven create a really simple `pom.xml` with 2 dependencies:
</project>
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
second one adds some more opinionated stuff like the default
management endpoints. If you prefer Tomcat you can just add the
@ -89,7 +89,7 @@ Then in another terminal
ok
$ curl localhost:8080/metrics
{"counter.status.200.health":1.0,"gauge.response.health":10.0,"mem":120768.0,"mem.free":105012.0,"processors":4.0}
`/health` is the default location for the health endpoint - it tells
you if the application is running and healthy. `/metrics` is the default
location for the metrics endpoint - it gives you basic counts and
@ -121,14 +121,14 @@ endpoint. An endpoint can be implemented as a Spring MVC
public Map<String, String> helloWorld() {
return Collections.singletonMap("message", "Hello World");
}
public static void main(String[] args) throws Exception {
SpringApplication.run(SampleController.class, args);
}
}
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
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
@ -155,7 +155,7 @@ which are more convenient at development time. Here are a few:
1. Use the Maven exec plugin, e.g.
$ mvn exec:java
2. Run directly in your IDE, e.g. Eclipse or IDEA let you right click
on a class and run it.
@ -167,7 +167,7 @@ on a class and run it.
## 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
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
@ -187,7 +187,7 @@ or if you like Java `Properties` files, you can call it
management.port: 9001
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
will find the home page on port 9000 instead of 8080:
@ -217,7 +217,7 @@ that is to simply refer to it in an `@Value` annotation, e.g.
@Controller
@EnableAutoConfiguration
public class SampleController {
@Value("${service.message:Hello World}")
private String value = "Goodbye Everypone"
@ -226,7 +226,7 @@ that is to simply refer to it in an `@Value` annotation, e.g.
public Map<String, String> helloWorld() {
return Collections.singletonMap("message", message);
}
...
}
@ -251,13 +251,13 @@ automatically in a separate value object. For instance:
private int value = 0;
... getters and setters
}
// SampleController.java
@Controller
@EnableAutoConfiguration
@EnableConfigurationProperties(ServiceProperties.class)
public class SampleController {
@Autowired
private ServiceProperties properties;
@ -266,10 +266,10 @@ automatically in a separate value object. For instance:
public Map<String, String> helloWorld() {
return Collections.singletonMap("message", properties.getMessage());
}
...
}
When you ask to
`@EnableConfigurationProperties(ServiceProperties.class)` you are
saying you want a bean of type `ServiceProperties` and that you want
@ -341,9 +341,9 @@ Then you will be able to inject a `DataSource` into your controller:
@EnableAutoConfiguration
@EnableConfigurationProperties(ServiceProperties.class)
public class SampleController {
private JdbcTemplate jdbcTemplate;
@Autowired
public SampleController(DataSource dataSource) {
this.jdbcTemplate = new JdbcTemplate(dataSource);
@ -354,19 +354,19 @@ Then you will be able to inject a `DataSource` into your controller:
public Map<String, String> helloWorld() {
return jdbcTemplate.queryForMap("SELECT * FROM MESSAGES WHERE ID=?", 0);
}
...
}
The app will run (going back to the default security configuration):
$ curl user:password@localhost:8080/
{"error":"Internal Server Error", "status":500, "exception":...}
but there's no data in the database yet and the `MESSAGES` table
doesn't even exist, so there's an error. One easy way to fix it is
to provide a `schema.sql` script in the root of the classpath, e.g.
create table MESSAGES (
ID BIGINT NOT NULL PRIMARY KEY,
MESSAGE VARCHAR(255)
@ -377,6 +377,6 @@ Now when you run the app you get a sensible response:
$ curl user:password@localhost:8080/
{"ID":0, "MESSAGE":"Hello Phil"}
Obviously, this is only the start, but hopefully you have a good grasp
of the basics and are ready to try it out yourself.

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

@ -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
recommend you first build a project with the Actuator (e.g. the
getting started project from the main README), and then try each
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.
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
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
classpath (if there is one) and add those properties to the Spring
`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.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
Actuator provides some of those beans out of the box, so you can
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
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
`spring.active.profiles` then those profiles will be active by
default. E.g.
@ -72,7 +72,7 @@ default. E.g.
## 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`.
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.
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
to be an exact match between the `Environment` property name and the
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
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
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)
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
`TomcatEmbeddedServletContainerFactory` and override one of its
methods, or inject some customizations, e.g.
@ -261,7 +261,7 @@ this.
## 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
default, purely because it is always available. A default
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 |
All the logging systems supported can consult System properties when
parsing their configuration files. See the defailt configurations in
`spring-bootstrap.jar` for examples.
parsing their configuration files. See the default configurations in
`spring-zero-core.jar` for examples.
## 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
`Environment` property `context.initializer.classes` (can be specified
via `application.properties`).

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

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

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

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

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

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

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

@ -14,14 +14,14 @@
* 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.Map;
import org.springframework.bootstrap.actuate.audit.AuditEvent;
import org.springframework.context.ApplicationEvent;
import org.springframework.util.Assert;
import org.springframework.zero.actuate.audit.AuditEvent;
/**
* Spring {@link ApplicationEvent} to encapsulate {@link AuditEvent}s.

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

@ -14,13 +14,13 @@
* 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.LogFactory;
import org.springframework.bootstrap.actuate.audit.AuditEvent;
import org.springframework.bootstrap.actuate.audit.AuditEventRepository;
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

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

@ -14,20 +14,20 @@
* 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.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.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.

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

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.autoconfigure;
package org.springframework.zero.actuate.autoconfigure;
import java.util.LinkedHashMap;
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.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.Configuration;
import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.core.env.StandardEnvironment;
import org.springframework.core.io.Resource;
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

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

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.autoconfigure;
package org.springframework.zero.actuate.autoconfigure;
import javax.servlet.Servlet;
@ -22,19 +22,6 @@ import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.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.ApplicationContextAware;
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.ContextRefreshedEvent;
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

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

@ -13,27 +13,27 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.autoconfigure;
package org.springframework.zero.actuate.autoconfigure;
import javax.servlet.Filter;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.HierarchicalBeanFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.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.Configuration;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.web.servlet.DispatcherServlet;
import org.springframework.web.servlet.HandlerAdapter;
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

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

@ -14,21 +14,21 @@
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.autoconfigure;
package org.springframework.zero.actuate.autoconfigure;
import javax.servlet.Servlet;
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.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

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

@ -13,21 +13,21 @@
* See the License for the specific language governing permissions and
* 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.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 ManagementServerPropertiesAutoConfiguration} bean.
*
*
* @author Dave Syer
*/
@Configuration
@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties
public class ManagementServerPropertiesAutoConfiguration {
@Bean(name = "org.springframework.bootstrap.actuate.properties.ManagementServerProperties")
@Bean(name = "org.springframework.zero.actuate.properties.ManagementServerProperties")
@ConditionalOnMissingBean
public ManagementServerProperties serverProperties() {
return new ManagementServerProperties();

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

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.autoconfigure;
package org.springframework.zero.actuate.autoconfigure;
import java.io.IOException;
@ -28,12 +28,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
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.Configuration;
import org.springframework.core.Ordered;
@ -41,6 +35,12 @@ import org.springframework.core.annotation.Order;
import org.springframework.util.StopWatch;
import org.springframework.web.filter.GenericFilterBean;
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

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

@ -14,18 +14,18 @@
* 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.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.

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

@ -14,21 +14,13 @@
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.autoconfigure;
package org.springframework.zero.actuate.autoconfigure;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
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.Configuration;
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.web.AuthenticationEntryPoint;
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
@ -58,12 +58,12 @@ import org.springframework.security.web.authentication.www.BasicAuthenticationEn
* password=password)</code> but can easily be customized by providing a bean definition
* of type {@link AuthenticationManager}. Also provides audit logging of authentication
* events.
*
*
* <p>
* The framework {@link Endpoint}s (used to expose application information to operations)
* include a {@link Endpoint#isSensitive() sensitive} configuration option which will be
* used as a security hint by the filter created here.
*
*
* <p>
* Some common simple customizations:
* <ul>
@ -75,7 +75,7 @@ import org.springframework.security.web.authentication.www.BasicAuthenticationEn
* <li>Add form login for user facing resources: add a
* {@link WebSecurityConfigurerAdapter} and use {@link HttpSecurity#formLogin()}</li>
* </ul>
*
*
* @author Dave Syer
*/
@Configuration
@ -84,7 +84,7 @@ import org.springframework.security.web.authentication.www.BasicAuthenticationEn
@EnableConfigurationProperties
public class SecurityAutoConfiguration {
@Bean(name = "org.springframework.bootstrap.actuate.properties.SecurityProperties")
@Bean(name = "org.springframework.zero.actuate.properties.SecurityProperties")
@ConditionalOnMissingBean
public SecurityProperties securityProperties() {
return new SecurityProperties();

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

@ -14,14 +14,14 @@
* 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.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}.

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

@ -13,20 +13,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.autoconfigure;
package org.springframework.zero.actuate.autoconfigure;
import javax.servlet.Servlet;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.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.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

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

@ -14,7 +14,7 @@
* 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.Pattern;

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

@ -14,7 +14,7 @@
* 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.

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

@ -14,15 +14,15 @@
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.endpoint;
package org.springframework.zero.actuate.endpoint;
import org.springframework.beans.BeansException;
import org.springframework.bootstrap.context.annotation.ConfigurationProperties;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.support.LiveBeansView;
import org.springframework.core.env.Environment;
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

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

@ -14,14 +14,14 @@
* 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.ThreadInfo;
import java.util.Arrays;
import java.util.List;
import org.springframework.bootstrap.context.annotation.ConfigurationProperties;
import org.springframework.zero.context.annotation.ConfigurationProperties;
/**
* {@link Endpoint} to expose thread info.

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

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

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

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

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

@ -14,11 +14,11 @@
* 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.zero.actuate.health.HealthIndicator;
import org.springframework.zero.context.annotation.ConfigurationProperties;
/**
* {@link Endpoint} to expose application health.

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

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

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

@ -14,14 +14,14 @@
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.endpoint;
package org.springframework.zero.actuate.endpoint;
import java.util.LinkedHashMap;
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.zero.actuate.metrics.Metric;
import org.springframework.zero.context.annotation.ConfigurationProperties;
/**
* {@link Endpoint} to expose {@link PublicMetrics}.

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

@ -14,11 +14,11 @@
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.endpoint;
package org.springframework.zero.actuate.endpoint;
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}.

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

@ -14,18 +14,18 @@
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.endpoint;
package org.springframework.zero.actuate.endpoint;
import java.util.Collections;
import java.util.Map;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.bootstrap.actuate.properties.ManagementServerProperties;
import org.springframework.bootstrap.context.annotation.ConfigurationProperties;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
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}.

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

@ -14,14 +14,14 @@
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.endpoint;
package org.springframework.zero.actuate.endpoint;
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.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.

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

@ -14,14 +14,14 @@
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.endpoint;
package org.springframework.zero.actuate.endpoint;
import java.util.Collection;
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.zero.actuate.metrics.Metric;
import org.springframework.zero.actuate.metrics.MetricRepository;
/**
* Default implementation of {@link PublicMetrics} that exposes all metrics from the

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

@ -14,7 +14,7 @@
* 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.Arrays;
@ -28,7 +28,6 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.bootstrap.actuate.endpoint.Endpoint;
import org.springframework.http.MediaType;
import org.springframework.http.converter.HttpMessageConverter;
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.config.annotation.WebMvcConfigurationSupport;
import org.springframework.web.servlet.mvc.method.annotation.AbstractMessageConverterMethodProcessor;
import org.springframework.zero.actuate.endpoint.Endpoint;
import com.fasterxml.jackson.databind.SerializationFeature;

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

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* 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.Collection;
@ -24,8 +24,6 @@ import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.BeanFactoryUtils;
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.ApplicationContextAware;
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.HandlerMapping;
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()}.

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

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.fixme;
package org.springframework.zero.actuate.fixme;
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.annotation.Autowired;
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.annotation.Bean;
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.servlet.DispatcherServlet;
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.

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

@ -14,7 +14,7 @@
* 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.

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

@ -14,7 +14,7 @@
* 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".

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

@ -14,7 +14,7 @@
* 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}.

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

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

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

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

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

@ -14,7 +14,7 @@
* 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.

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

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

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

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

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

@ -14,7 +14,7 @@
* 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.ObjectUtils;

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

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

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

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

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

@ -14,10 +14,10 @@
* 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.zero.context.annotation.ConfigurationProperties;
/**
* Properties for the security aspects of an application.

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

@ -14,19 +14,19 @@
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.security;
package org.springframework.zero.actuate.security;
import java.util.HashMap;
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.ApplicationEventPublisherAware;
import org.springframework.context.ApplicationListener;
import org.springframework.security.authentication.event.AbstractAuthenticationEvent;
import org.springframework.security.authentication.event.AbstractAuthenticationFailureEvent;
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

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

@ -14,19 +14,19 @@
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.security;
package org.springframework.zero.actuate.security;
import java.util.HashMap;
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.ApplicationEventPublisherAware;
import org.springframework.context.ApplicationListener;
import org.springframework.security.access.event.AbstractAuthorizationEvent;
import org.springframework.security.access.event.AuthenticationCredentialsNotFoundEvent;
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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.bootstrap.actuate;
package org.springframework.zero.actuate;
import java.util.HashMap;
import java.util.Map;

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

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

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

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

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

@ -13,13 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.audit.listener;
package org.springframework.zero.actuate.audit.listener;
import java.util.Collections;
import org.junit.Test;
import org.springframework.bootstrap.actuate.audit.AuditEvent;
import org.springframework.bootstrap.actuate.audit.AuditEventRepository;
import org.springframework.zero.actuate.audit.AuditEvent;
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.verify;

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

@ -14,16 +14,17 @@
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.autoconfigure;
package org.springframework.zero.actuate.autoconfigure;
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.Bean;
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.junit.Assert.assertNotNull;

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

@ -13,20 +13,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.autoconfigure;
package org.springframework.zero.actuate.autoconfigure;
import org.junit.Before;
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.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.assertNotNull;

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

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.autoconfigure;
package org.springframework.zero.actuate.autoconfigure;
import java.io.FileNotFoundException;
import java.net.SocketException;
@ -22,15 +22,6 @@ import java.nio.charset.Charset;
import org.junit.After;
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.Configuration;
import org.springframework.http.HttpMethod;
@ -41,6 +32,17 @@ import org.springframework.stereotype.Controller;
import org.springframework.util.StreamUtils;
import org.springframework.web.bind.annotation.RequestMapping;
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.junit.Assert.assertThat;

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

@ -13,13 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.autoconfigure;
package org.springframework.zero.actuate.autoconfigure;
import org.junit.Test;
import org.springframework.bootstrap.actuate.properties.ManagementServerProperties;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
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.nullValue;

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

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.autoconfigure;
package org.springframework.zero.actuate.autoconfigure;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
@ -22,13 +22,14 @@ import javax.servlet.FilterChain;
import org.junit.Test;
import org.mockito.invocation.InvocationOnMock;
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.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.mock.web.MockHttpServletRequest;
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.junit.Assert.assertThat;

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

@ -14,16 +14,17 @@
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.autoconfigure;
package org.springframework.zero.actuate.autoconfigure;
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.Bean;
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.junit.Assert.assertNotNull;

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

@ -14,10 +14,9 @@
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.autoconfigure;
package org.springframework.zero.actuate.autoconfigure;
import org.junit.Test;
import org.springframework.bootstrap.autoconfigure.PropertyPlaceholderAutoConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
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.AuthenticationException;
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.assertNotNull;

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

@ -14,14 +14,15 @@
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.autoconfigure;
package org.springframework.zero.actuate.autoconfigure;
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.Bean;
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.junit.Assert.assertNotNull;

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

@ -14,12 +14,14 @@
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.autoconfigure;
package org.springframework.zero.actuate.autoconfigure;
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.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;

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

@ -14,17 +14,18 @@
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.endpoint;
package org.springframework.zero.actuate.endpoint;
import java.util.Collections;
import org.junit.Before;
import org.junit.Test;
import org.springframework.bootstrap.actuate.TestUtils;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.core.env.MapPropertySource;
import org.springframework.core.env.PropertySource;
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.junit.Assert.assertThat;

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

@ -14,13 +14,14 @@
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.endpoint;
package org.springframework.zero.actuate.endpoint;
import org.junit.Test;
import org.springframework.bootstrap.context.annotation.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
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.junit.Assert.assertThat;

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

@ -14,15 +14,16 @@
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.endpoint;
package org.springframework.zero.actuate.endpoint;
import java.lang.management.ThreadInfo;
import java.util.List;
import org.junit.Test;
import org.springframework.bootstrap.context.annotation.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
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.junit.Assert.assertThat;

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

@ -14,12 +14,13 @@
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.endpoint;
package org.springframework.zero.actuate.endpoint;
import org.junit.Test;
import org.springframework.bootstrap.context.annotation.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
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.junit.Assert.assertThat;

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

@ -14,13 +14,14 @@
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.endpoint;
package org.springframework.zero.actuate.endpoint;
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.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.junit.Assert.assertThat;

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

@ -14,14 +14,15 @@
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.endpoint;
package org.springframework.zero.actuate.endpoint;
import java.util.Collections;
import org.junit.Test;
import org.springframework.bootstrap.context.annotation.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
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.junit.Assert.assertThat;

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

@ -14,16 +14,18 @@
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.endpoint;
package org.springframework.zero.actuate.endpoint;
import java.util.Collection;
import java.util.Collections;
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.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.junit.Assert.assertThat;

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

@ -14,13 +14,14 @@
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.endpoint;
package org.springframework.zero.actuate.endpoint;
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.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.junit.Assert.assertFalse;

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

@ -14,17 +14,18 @@
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.endpoint;
package org.springframework.zero.actuate.endpoint;
import java.util.Collections;
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.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.junit.Assert.assertThat;

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

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

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

@ -14,10 +14,11 @@
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.endpoint.mvc;
package org.springframework.zero.actuate.endpoint.mvc;
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.assertTrue;

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

@ -14,14 +14,15 @@
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.endpoint.mvc;
package org.springframework.zero.actuate.endpoint.mvc;
import java.util.Arrays;
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.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.nullValue;

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

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

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

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

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

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

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

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

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

@ -13,10 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.metrics;
package org.springframework.zero.actuate.metrics;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.zero.actuate.metrics.InMemoryMetricRepository;
import static org.junit.Assert.fail;

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

@ -14,15 +14,15 @@
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.properties;
package org.springframework.zero.actuate.properties;
import java.util.Collections;
import org.junit.Test;
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.zero.actuate.properties.SecurityProperties;
import org.springframework.zero.bind.RelaxedDataBinder;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;

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

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

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

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

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

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

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

@ -14,12 +14,14 @@
* limitations under the License.
*/
package org.springframework.bootstrap.actuate.trace;
package org.springframework.zero.actuate.trace;
import java.util.Map;
import org.junit.Test;
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;

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

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

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

@ -14,17 +14,17 @@
* limitations under the License.
*/
package org.springframework.bootstrap.autoconfigure;
package org.springframework.zero.autoconfigure;
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.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.support.ResourceBundleMessageSource;
import org.springframework.core.Ordered;
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}.

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

@ -14,16 +14,16 @@
* 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.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
import org.springframework.core.Ordered;
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

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

@ -14,17 +14,17 @@
* 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.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.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.

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

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

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

@ -14,7 +14,7 @@
* 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.context.ApplicationEvent;

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

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

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

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.bootstrap.autoconfigure.batch;
package org.springframework.zero.autoconfigure.batch;
import java.util.Arrays;
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.launch.JobLauncher;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.bootstrap.CommandLineRunner;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.ApplicationEventPublisherAware;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
import org.springframework.zero.CommandLineRunner;
/**
* {@link CommandLineRunner} to {@link JobLauncher launch} Spring Batch jobs.

8
spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfiguration.java → spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfiguration.java
View File

@ -14,16 +14,16 @@
* 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.Import;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
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.

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