Skip to content

Commit 24b2440

Browse files
authored
Merge pull request #236 from antoinesd/microprofile-health-232
Revert @healthGroup Introduction
2 parents 9bd591c + 37fc951 commit 24b2440

File tree

10 files changed

+2
-500
lines changed

10 files changed

+2
-500
lines changed

api/src/main/java/org/eclipse/microprofile/health/HealthGroup.java

Lines changed: 0 additions & 85 deletions
This file was deleted.

api/src/main/java/org/eclipse/microprofile/health/HealthGroups.java

Lines changed: 0 additions & 50 deletions
This file was deleted.

spec/src/main/asciidoc/java-api.adoc

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ The nature of the procedure is defined by annotating the `HealthCheck` procedure
4242

4343
* Readiness checks defined with `@Readiness` annotation
4444
* Liveness checks defined with `@Liveness` annotation
45-
* Custom checks defined with `@HealthGroup` annotation
4645
* Backward compatible checks defined with `@Health` annotation
4746

4847

@@ -61,18 +60,6 @@ This means that if this procedure fails the application can be discarded (termin
6160

6261
The `@Liveness` annotation must be applied on a `HealthCheck` implementation to define a Liveness check procedure, otherwise, this annotation is ignored.
6362

64-
=== Custom check
65-
66-
A new kind of Health Check can be defined with the `@HealthGroup` annotation.
67-
68-
One or more Health Check procedure(s) can be annotated with `@HealthGroup` to apply a custom group name to the procedure.
69-
70-
All the Health Check procedures belonging to the same group define a new kind of Health Check.
71-
72-
The `@HealthGroup` annotation must be applied on a `HealthCheck` implementation to define a custom check procedure with the given name, otherwise, this annotation is ignored.
73-
74-
A `HealthCheck` implementation can have multiple `@HealthGroup` annotations to make it a member of multiple custom Health Check's groups.
75-
7663

7764
=== Backward compatible check
7865

@@ -162,7 +149,7 @@ public class CheckDiskspace implements HealthCheck {
162149

163150
== Integration with CDI
164151

165-
Any enabled bean with a bean of type `org.eclipse.microprofile.health.HealthCheck` and `@Liveness`, `@Readiness`, `@HealthGroup` or `@Health` qualifier can be used as health check procedure.
152+
Any enabled bean with a bean of type `org.eclipse.microprofile.health.HealthCheck` and `@Liveness`, `@Readiness` or `@Health` qualifier can be used as health check procedure.
166153

167154

168155
Contextual references of health check procedures are invoked by runtime when the outermost protocol entry point (i.e. `http://HOST:PORT/health`) receives an inbound request

spec/src/main/asciidoc/protocol-wireformat.adoc

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -184,18 +184,6 @@ Aspects regarding the secure access of health check information.
184184
| Readiness
185185
| See Appendix B
186186

187-
| /health/group/{name}
188-
| GET
189-
| 200, 500, 503
190-
| Custom with given name
191-
| See Appendix B
192-
193-
| /health/group
194-
| GET
195-
| 200, 500, 503
196-
| All custom groups
197-
| See Appendix B
198-
199187
| /health
200188
| GET
201189
| 200, 500, 503
@@ -220,8 +208,6 @@ The following table gives valid health check responses for all kinds of health c
220208
| Request | HTTP Status | JSON Payload | State | Comment
221209
| /health/live
222210
/health/ready
223-
/health/group/{name}
224-
/health/group
225211
/health
226212
| 200
227213
| Yes
@@ -230,8 +216,6 @@ The following table gives valid health check responses for all kinds of health c
230216

231217
| /health/live
232218
/health/ready
233-
/health/group/{name}
234-
/health/group
235219
/health
236220
| 200
237221
| Yes
@@ -240,8 +224,6 @@ The following table gives valid health check responses for all kinds of health c
240224

241225
| /health/live
242226
/health/ready
243-
/health/group/{name}
244-
/health/group
245227
/health
246228
| 503
247229
| Yes
@@ -250,8 +232,6 @@ The following table gives valid health check responses for all kinds of health c
250232

251233
| /health/live
252234
/health/ready
253-
/health/group/{name}
254-
/health/group
255235
/health
256236
| 503
257237
| Yes
@@ -260,8 +240,6 @@ The following table gives valid health check responses for all kinds of health c
260240

261241
| /health/live
262242
/health/ready
263-
/health/group/{name}
264-
/health/group
265243
/health
266244
| 500
267245
| No

tck/src/main/java/org/eclipse/microprofile/health/tck/AllCustomFailedTest.java

Lines changed: 0 additions & 85 deletions
This file was deleted.

0 commit comments

Comments
 (0)