Skip to content

Commit 2e51b48

Browse files
philwebbphilwebb
committed
Refactor actuator package locations
Restructure actuator packages to improve structure. The following changes have been made: - Separate actuator and actuator auto-configuration into different modules. - Move endpoint code into `spring-boot-actuator`. - Move `Endpoint` implementations from a single package into technology specific packages. - Move `HealthIndicator` implementations from a single package into technology specific packages. - As much as possible attempt to mirror the `spring-boot` package structure and class naming in `spring-boot-actuator` and `spring-boot-actuator-autoconfigure`. - Move `DataSourceBuilder` and DataSource meta-data support from `spring-boot-actuator` to `spring-boot`. Fixes gh-10261
1 parent 0f99b29 commit 2e51b48

File tree

501 files changed

+8342
-4738
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

501 files changed

+8342
-4738
lines changed

‎pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
<module>spring-boot-autoconfigure</module>
8484
<module>spring-boot-test-autoconfigure</module>
8585
<module>spring-boot-actuator</module>
86+
<module>spring-boot-actuator-autoconfigure</module>
8687
<module>spring-boot-devtools</module>
8788
<module>spring-boot-docs</module>
8889
<module>spring-boot-starters</module>

‎spring-boot-actuator-autoconfigure/pom.xml

Lines changed: 373 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,373 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
<parent>
6+
<groupId>org.springframework.boot</groupId>
7+
<artifactId>spring-boot-parent</artifactId>
8+
<version>2.0.0.BUILD-SNAPSHOT</version>
9+
<relativePath>../spring-boot-parent</relativePath>
10+
</parent>
11+
<artifactId>spring-boot-actuator-autoconfigure</artifactId>
12+
<name>Spring Boot Actuator AutoConfigure</name>
13+
<description>Spring Boot Actuator AutoConfigure</description>
14+
<url>http://projects.spring.io/spring-boot/</url>
15+
<organization>
16+
<name>Pivotal Software, Inc.</name>
17+
<url>http://www.spring.io</url>
18+
</organization>
19+
<properties>
20+
<main.basedir>${basedir}/..</main.basedir>
21+
</properties>
22+
<dependencies>
23+
<!-- Compile -->
24+
<dependency>
25+
<groupId>org.springframework.boot</groupId>
26+
<artifactId>spring-boot-actuator</artifactId>
27+
</dependency>
28+
<dependency>
29+
<groupId>org.springframework.boot</groupId>
30+
<artifactId>spring-boot-autoconfigure</artifactId>
31+
</dependency>
32+
<dependency>
33+
<groupId>com.fasterxml.jackson.core</groupId>
34+
<artifactId>jackson-databind</artifactId>
35+
</dependency>
36+
<dependency>
37+
<groupId>org.springframework</groupId>
38+
<artifactId>spring-core</artifactId>
39+
</dependency>
40+
<dependency>
41+
<groupId>org.springframework</groupId>
42+
<artifactId>spring-context</artifactId>
43+
</dependency>
44+
<!-- Optional -->
45+
<dependency>
46+
<groupId>com.fasterxml.jackson.dataformat</groupId>
47+
<artifactId>jackson-dataformat-xml</artifactId>
48+
<optional>true</optional>
49+
</dependency>
50+
<dependency>
51+
<groupId>com.github.ben-manes.caffeine</groupId>
52+
<artifactId>caffeine</artifactId>
53+
<optional>true</optional>
54+
</dependency>
55+
<dependency>
56+
<groupId>com.hazelcast</groupId>
57+
<artifactId>hazelcast</artifactId>
58+
<optional>true</optional>
59+
</dependency>
60+
<dependency>
61+
<groupId>com.hazelcast</groupId>
62+
<artifactId>hazelcast-spring</artifactId>
63+
<optional>true</optional>
64+
</dependency>
65+
<dependency>
66+
<groupId>com.sun.mail</groupId>
67+
<artifactId>javax.mail</artifactId>
68+
<optional>true</optional>
69+
</dependency>
70+
<dependency>
71+
<groupId>com.timgroup</groupId>
72+
<artifactId>java-statsd-client</artifactId>
73+
<optional>true</optional>
74+
</dependency>
75+
<dependency>
76+
<groupId>com.zaxxer</groupId>
77+
<artifactId>HikariCP</artifactId>
78+
<optional>true</optional>
79+
</dependency>
80+
<dependency>
81+
<groupId>io.dropwizard.metrics</groupId>
82+
<artifactId>metrics-core</artifactId>
83+
<optional>true</optional>
84+
</dependency>
85+
<dependency>
86+
<groupId>io.lettuce</groupId>
87+
<artifactId>lettuce-core</artifactId>
88+
<optional>true</optional>
89+
</dependency>
90+
<dependency>
91+
<groupId>io.searchbox</groupId>
92+
<artifactId>jest</artifactId>
93+
<optional>true</optional>
94+
</dependency>
95+
<dependency>
96+
<groupId>javax.cache</groupId>
97+
<artifactId>cache-api</artifactId>
98+
<optional>true</optional>
99+
</dependency>
100+
<dependency>
101+
<groupId>javax.jms</groupId>
102+
<artifactId>javax.jms-api</artifactId>
103+
<optional>true</optional>
104+
</dependency>
105+
<dependency>
106+
<groupId>javax.servlet</groupId>
107+
<artifactId>javax.servlet-api</artifactId>
108+
<optional>true</optional>
109+
</dependency>
110+
<dependency>
111+
<groupId>net.sf.ehcache</groupId>
112+
<artifactId>ehcache</artifactId>
113+
<optional>true</optional>
114+
</dependency>
115+
<dependency>
116+
<groupId>org.apache.activemq</groupId>
117+
<artifactId>activemq-broker</artifactId>
118+
<optional>true</optional>
119+
<exclusions>
120+
<exclusion>
121+
<artifactId>geronimo-jms_1.1_spec</artifactId>
122+
<groupId>org.apache.geronimo.specs</groupId>
123+
</exclusion>
124+
</exclusions>
125+
</dependency>
126+
<dependency>
127+
<groupId>org.apache.commons</groupId>
128+
<artifactId>commons-dbcp2</artifactId>
129+
<optional>true</optional>
130+
</dependency>
131+
<dependency>
132+
<groupId>org.apache.tomcat.embed</groupId>
133+
<artifactId>tomcat-embed-core</artifactId>
134+
<optional>true</optional>
135+
</dependency>
136+
<dependency>
137+
<groupId>org.apache.tomcat.embed</groupId>
138+
<artifactId>tomcat-embed-el</artifactId>
139+
<optional>true</optional>
140+
</dependency>
141+
<dependency>
142+
<groupId>org.apache.tomcat</groupId>
143+
<artifactId>tomcat-jdbc</artifactId>
144+
<optional>true</optional>
145+
</dependency>
146+
<dependency>
147+
<groupId>org.elasticsearch</groupId>
148+
<artifactId>elasticsearch</artifactId>
149+
<optional>true</optional>
150+
</dependency>
151+
<dependency>
152+
<groupId>org.flywaydb</groupId>
153+
<artifactId>flyway-core</artifactId>
154+
<optional>true</optional>
155+
</dependency>
156+
<dependency>
157+
<groupId>org.glassfish.jersey.core</groupId>
158+
<artifactId>jersey-server</artifactId>
159+
<optional>true</optional>
160+
</dependency>
161+
<dependency>
162+
<groupId>org.glassfish.jersey.containers</groupId>
163+
<artifactId>jersey-container-servlet-core</artifactId>
164+
<optional>true</optional>
165+
</dependency>
166+
<dependency>
167+
<groupId>org.hibernate</groupId>
168+
<artifactId>hibernate-validator</artifactId>
169+
<optional>true</optional>
170+
</dependency>
171+
<dependency>
172+
<groupId>org.jolokia</groupId>
173+
<artifactId>jolokia-core</artifactId>
174+
<optional>true</optional>
175+
</dependency>
176+
<dependency>
177+
<groupId>org.infinispan</groupId>
178+
<artifactId>infinispan-spring4-embedded</artifactId>
179+
<optional>true</optional>
180+
</dependency>
181+
<dependency>
182+
<groupId>org.liquibase</groupId>
183+
<artifactId>liquibase-core</artifactId>
184+
<optional>true</optional>
185+
</dependency>
186+
<dependency>
187+
<groupId>org.springframework</groupId>
188+
<artifactId>spring-jdbc</artifactId>
189+
<optional>true</optional>
190+
</dependency>
191+
<dependency>
192+
<groupId>org.springframework</groupId>
193+
<artifactId>spring-messaging</artifactId>
194+
<optional>true</optional>
195+
</dependency>
196+
<dependency>
197+
<groupId>org.springframework</groupId>
198+
<artifactId>spring-webflux</artifactId>
199+
<optional>true</optional>
200+
</dependency>
201+
<dependency>
202+
<groupId>org.springframework</groupId>
203+
<artifactId>spring-webmvc</artifactId>
204+
<optional>true</optional>
205+
</dependency>
206+
<dependency>
207+
<groupId>org.springframework.amqp</groupId>
208+
<artifactId>spring-rabbit</artifactId>
209+
<optional>true</optional>
210+
</dependency>
211+
<dependency>
212+
<groupId>org.springframework.data</groupId>
213+
<artifactId>spring-data-cassandra</artifactId>
214+
<optional>true</optional>
215+
</dependency>
216+
<dependency>
217+
<groupId>org.springframework.data</groupId>
218+
<artifactId>spring-data-couchbase</artifactId>
219+
<optional>true</optional>
220+
</dependency>
221+
<dependency>
222+
<groupId>org.springframework.data</groupId>
223+
<artifactId>spring-data-ldap</artifactId>
224+
<optional>true</optional>
225+
</dependency>
226+
<dependency>
227+
<groupId>org.springframework.data</groupId>
228+
<artifactId>spring-data-mongodb</artifactId>
229+
<optional>true</optional>
230+
</dependency>
231+
<dependency>
232+
<groupId>org.springframework.data</groupId>
233+
<artifactId>spring-data-neo4j</artifactId>
234+
<optional>true</optional>
235+
</dependency>
236+
<dependency>
237+
<groupId>org.springframework.data</groupId>
238+
<artifactId>spring-data-redis</artifactId>
239+
<optional>true</optional>
240+
</dependency>
241+
<dependency>
242+
<groupId>org.springframework.data</groupId>
243+
<artifactId>spring-data-solr</artifactId>
244+
<optional>true</optional>
245+
<exclusions>
246+
<!-- the version of solr here is incompatible with jackson-xml because
247+
of an old woodstox -->
248+
<exclusion>
249+
<artifactId>wstx-asl</artifactId>
250+
<groupId>org.codehaus.woodstox</groupId>
251+
</exclusion>
252+
</exclusions>
253+
</dependency>
254+
<dependency>
255+
<groupId>org.springframework.integration</groupId>
256+
<artifactId>spring-integration-core</artifactId>
257+
<optional>true</optional>
258+
</dependency>
259+
<dependency>
260+
<groupId>org.springframework.security</groupId>
261+
<artifactId>spring-security-config</artifactId>
262+
<optional>true</optional>
263+
</dependency>
264+
<dependency>
265+
<groupId>org.springframework.security</groupId>
266+
<artifactId>spring-security-web</artifactId>
267+
<optional>true</optional>
268+
</dependency>
269+
<!-- Annotation processing -->
270+
<dependency>
271+
<groupId>org.springframework.boot</groupId>
272+
<artifactId>spring-boot-autoconfigure-processor</artifactId>
273+
<optional>true</optional>
274+
</dependency>
275+
<dependency>
276+
<groupId>org.springframework.boot</groupId>
277+
<artifactId>spring-boot-configuration-processor</artifactId>
278+
<optional>true</optional>
279+
</dependency>
280+
<!-- Test -->
281+
<dependency>
282+
<groupId>org.springframework.boot</groupId>
283+
<artifactId>spring-boot-test</artifactId>
284+
<scope>test</scope>
285+
</dependency>
286+
<dependency>
287+
<groupId>org.springframework.boot</groupId>
288+
<artifactId>spring-boot-test-support</artifactId>
289+
<scope>test</scope>
290+
</dependency>
291+
<dependency>
292+
<groupId>ch.qos.logback</groupId>
293+
<artifactId>logback-classic</artifactId>
294+
<scope>test</scope>
295+
</dependency>
296+
<dependency>
297+
<groupId>com.jayway.jsonpath</groupId>
298+
<artifactId>json-path</artifactId>
299+
<scope>test</scope>
300+
</dependency>
301+
<dependency>
302+
<groupId>io.projectreactor.ipc</groupId>
303+
<artifactId>reactor-netty</artifactId>
304+
<scope>test</scope>
305+
</dependency>
306+
<dependency>
307+
<groupId>io.undertow</groupId>
308+
<artifactId>undertow-core</artifactId>
309+
<scope>test</scope>
310+
</dependency>
311+
<dependency>
312+
<groupId>io.undertow</groupId>
313+
<artifactId>undertow-servlet</artifactId>
314+
<scope>test</scope>
315+
<exclusions>
316+
<exclusion>
317+
<groupId>org.jboss.spec.javax.servlet</groupId>
318+
<artifactId>jboss-servlet-api_3.1_spec</artifactId>
319+
</exclusion>
320+
</exclusions>
321+
</dependency>
322+
<dependency>
323+
<groupId>org.aspectj</groupId>
324+
<artifactId>aspectjrt</artifactId>
325+
<scope>test</scope>
326+
</dependency>
327+
<dependency>
328+
<groupId>org.hsqldb</groupId>
329+
<artifactId>hsqldb</artifactId>
330+
<scope>test</scope>
331+
</dependency>
332+
<dependency>
333+
<groupId>org.glassfish.jersey.media</groupId>
334+
<artifactId>jersey-media-json-jackson</artifactId>
335+
<scope>test</scope>
336+
</dependency>
337+
<dependency>
338+
<groupId>org.skyscreamer</groupId>
339+
<artifactId>jsonassert</artifactId>
340+
<scope>test</scope>
341+
</dependency>
342+
<dependency>
343+
<groupId>org.springframework.data</groupId>
344+
<artifactId>spring-data-elasticsearch</artifactId>
345+
<scope>test</scope>
346+
</dependency>
347+
<dependency>
348+
<groupId>org.springframework.data</groupId>
349+
<artifactId>spring-data-rest-webmvc</artifactId>
350+
<scope>test</scope>
351+
</dependency>
352+
<dependency>
353+
<groupId>org.springframework.integration</groupId>
354+
<artifactId>spring-integration-jmx</artifactId>
355+
<scope>test</scope>
356+
</dependency>
357+
<dependency>
358+
<groupId>org.springframework.security</groupId>
359+
<artifactId>spring-security-test</artifactId>
360+
<scope>test</scope>
361+
</dependency>
362+
<dependency>
363+
<groupId>org.yaml</groupId>
364+
<artifactId>snakeyaml</artifactId>
365+
<scope>test</scope>
366+
</dependency>
367+
<dependency>
368+
<groupId>redis.clients</groupId>
369+
<artifactId>jedis</artifactId>
370+
<optional>true</optional>
371+
</dependency>
372+
</dependencies>
373+
</project>

‎spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/OnEnabledEndpointElementCondition.java renamed to ‎spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/OnEndpointElementCondition.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@
3434
* @author Madhura Bhave
3535
* @since 2.0.0
3636
*/
37-
public abstract class OnEnabledEndpointElementCondition extends SpringBootCondition {
37+
public abstract class OnEndpointElementCondition extends SpringBootCondition {
3838

3939
private final String prefix;
4040

4141
private final Class<? extends Annotation> annotationType;
4242

43-
protected OnEnabledEndpointElementCondition(String prefix,
43+
protected OnEndpointElementCondition(String prefix,
4444
Class<? extends Annotation> annotationType) {
4545
this.prefix = prefix;
4646
this.annotationType = annotationType;

0 commit comments

Comments
 (0)