This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new f16f869 CAMEL-17629: camel-health - Removed option to disable context
health check as it should always be enabled.
f16f869 is described below
commit f16f869fff733b81d882b020c91b30a45b49e4c0
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Feb 10 15:45:42 2022 +0100
CAMEL-17629: camel-health - Removed option to disable context health check
as it should always be enabled.
---
core/camel-spring-boot/src/main/docs/spring-boot.json | 6 ------
.../actuate/health/CamelHealthCheckAutoConfiguration.java | 3 ---
.../health/CamelHealthCheckConfigurationProperties.java | 15 ---------------
3 files changed, 24 deletions(-)
diff --git a/core/camel-spring-boot/src/main/docs/spring-boot.json
b/core/camel-spring-boot/src/main/docs/spring-boot.json
index c6a312d..6693e2a 100644
--- a/core/camel-spring-boot/src/main/docs/spring-boot.json
+++ b/core/camel-spring-boot/src/main/docs/spring-boot.json
@@ -396,12 +396,6 @@
"sourceType":
"org.apache.camel.spring.boot.actuate.health.CamelHealthCheckConfigurationProperties"
},
{
- "name": "camel.health.context-enabled",
- "type": "java.lang.Boolean",
- "description": "Whether context health check is enabled. <p> Is default
enabled",
- "sourceType":
"org.apache.camel.spring.boot.actuate.health.CamelHealthCheckConfigurationProperties"
- },
- {
"name": "camel.health.enabled",
"type": "java.lang.Boolean",
"description": "Whether health check is enabled globally. <p> Is default
enabled",
diff --git
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthCheckAutoConfiguration.java
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthCheckAutoConfiguration.java
index b1f8bd7..22b029a 100644
---
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthCheckAutoConfiguration.java
+++
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthCheckAutoConfiguration.java
@@ -80,9 +80,6 @@ public class CamelHealthCheckAutoConfiguration {
if (hcr.isEnabled()) {
HealthCheck hc = (HealthCheck) hcr.resolveById("context");
if (hc != null) {
- if (config.getContextEnabled() != null) {
- hc.setEnabled(config.getContextEnabled());
- }
hcr.register(hc);
}
}
diff --git
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthCheckConfigurationProperties.java
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthCheckConfigurationProperties.java
index ec54209..cfb4422 100644
---
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthCheckConfigurationProperties.java
+++
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthCheckConfigurationProperties.java
@@ -30,13 +30,6 @@ public class CamelHealthCheckConfigurationProperties {
private Boolean enabled;
/**
- * Whether context health check is enabled.
- * <p>
- * Is default enabled
- */
- private Boolean contextEnabled;
-
- /**
* Whether routes health check is enabled.
* <p>
* Is default enabled
@@ -85,14 +78,6 @@ public class CamelHealthCheckConfigurationProperties {
this.enabled = enabled;
}
- public Boolean getContextEnabled() {
- return contextEnabled;
- }
-
- public void setContextEnabled(Boolean contextEnabled) {
- this.contextEnabled = contextEnabled;
- }
-
public Boolean getRoutesEnabled() {
return routesEnabled;
}