You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/03/06 09:51:06 UTC
[camel] branch main updated (088b497c9f3 -> 27f760c9e9a)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 088b497c9f3 Sync deps
new e48c6f96a99 Upgrade to maven-compiler-plugin 3.11.0
new 27f760c9e9a CAMEL-19118: camel-health - Liveness check default false
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../cloudtrail/CloudtrailConsumerHealthCheck.java | 6 ------
.../SecretsManagerClientHealthCheck.java | 6 ------
.../aws2/athena/Athena2ClientHealthCheck.java | 6 ------
.../component/aws2/cw/Cw2ClientHealthCheck.java | 6 ------
.../component/aws2/ddb/Ddb2ClientHealthCheck.java | 6 ------
.../ddbstream/Ddb2StreamConsumerHealthCheck.java | 6 ------
.../camel/component/aws2/ec2/AWS2EC2HealthCheck.java | 6 ------
.../component/aws2/ecs/ECS2ClientHealthCheck.java | 6 ------
.../component/aws2/eks/EKS2ClientHealthCheck.java | 6 ------
.../eventbridge/EventbridgeClientHealthCheck.java | 6 ------
.../camel/component/aws2/iam/IAM2HealthCheck.java | 6 ------
.../aws2/kinesis/Kinesis2ConsumerHealthCheck.java | 6 ------
.../aws2/lambda/Lambda2ClientHealthCheck.java | 6 ------
.../component/aws2/mq/MQ2ClientHealthCheck.java | 6 ------
.../camel/component/aws2/msk/MSK2HealthCheck.java | 6 ------
.../component/aws2/s3/AWS2S3ConsumerHealthCheck.java | 6 ------
.../camel/component/aws2/ses/Ses2HealthCheck.java | 6 ------
.../camel/component/aws2/sns/Sns2HealthCheck.java | 6 ------
.../component/aws2/sqs/Sqs2ConsumerHealthCheck.java | 6 ------
.../aws2/translate/Translate2ClientHealthCheck.java | 6 ------
.../GoogleCloudStorageConsumerHealthCheck.java | 6 ------
.../component/kafka/KafkaConsumerHealthCheck.java | 6 ------
.../component/kafka/KafkaProducerHealthCheck.java | 6 ------
.../java/org/apache/camel/health/HealthCheck.java | 8 ++++++--
.../camel/impl/health/ReadinessAndLivenessTest.java | 20 ++++++++++++++++++++
.../apache/camel/impl/health/ContextHealthCheck.java | 4 ++--
.../apache/camel/impl/health/RouteHealthCheck.java | 6 ------
.../support/ScheduledPollConsumerHealthCheck.java | 2 +-
.../ROOT/pages/camel-3x-upgrade-guide-3_21.adoc | 7 +++++++
.../modules/ROOT/pages/camel-4-migration-guide.adoc | 8 ++++++++
pom.xml | 2 +-
31 files changed, 45 insertions(+), 150 deletions(-)
[camel] 02/02: CAMEL-19118: camel-health - Liveness check default false
Posted by da...@apache.org.
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.git
commit 27f760c9e9a5e2d2d3ec0536f90e31a9e88af518
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Mar 6 10:50:01 2023 +0100
CAMEL-19118: camel-health - Liveness check default false
---
.../cloudtrail/CloudtrailConsumerHealthCheck.java | 6 ------
.../SecretsManagerClientHealthCheck.java | 6 ------
.../aws2/athena/Athena2ClientHealthCheck.java | 6 ------
.../component/aws2/cw/Cw2ClientHealthCheck.java | 6 ------
.../component/aws2/ddb/Ddb2ClientHealthCheck.java | 6 ------
.../ddbstream/Ddb2StreamConsumerHealthCheck.java | 6 ------
.../camel/component/aws2/ec2/AWS2EC2HealthCheck.java | 6 ------
.../component/aws2/ecs/ECS2ClientHealthCheck.java | 6 ------
.../component/aws2/eks/EKS2ClientHealthCheck.java | 6 ------
.../eventbridge/EventbridgeClientHealthCheck.java | 6 ------
.../camel/component/aws2/iam/IAM2HealthCheck.java | 6 ------
.../aws2/kinesis/Kinesis2ConsumerHealthCheck.java | 6 ------
.../aws2/lambda/Lambda2ClientHealthCheck.java | 6 ------
.../component/aws2/mq/MQ2ClientHealthCheck.java | 6 ------
.../camel/component/aws2/msk/MSK2HealthCheck.java | 6 ------
.../component/aws2/s3/AWS2S3ConsumerHealthCheck.java | 6 ------
.../camel/component/aws2/ses/Ses2HealthCheck.java | 6 ------
.../camel/component/aws2/sns/Sns2HealthCheck.java | 6 ------
.../component/aws2/sqs/Sqs2ConsumerHealthCheck.java | 6 ------
.../aws2/translate/Translate2ClientHealthCheck.java | 6 ------
.../GoogleCloudStorageConsumerHealthCheck.java | 6 ------
.../component/kafka/KafkaConsumerHealthCheck.java | 6 ------
.../component/kafka/KafkaProducerHealthCheck.java | 6 ------
.../java/org/apache/camel/health/HealthCheck.java | 8 ++++++--
.../camel/impl/health/ReadinessAndLivenessTest.java | 20 ++++++++++++++++++++
.../apache/camel/impl/health/ContextHealthCheck.java | 4 ++--
.../apache/camel/impl/health/RouteHealthCheck.java | 6 ------
.../support/ScheduledPollConsumerHealthCheck.java | 2 +-
.../ROOT/pages/camel-3x-upgrade-guide-3_21.adoc | 7 +++++++
.../modules/ROOT/pages/camel-4-migration-guide.adoc | 8 ++++++++
30 files changed, 44 insertions(+), 149 deletions(-)
diff --git a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailConsumerHealthCheck.java b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailConsumerHealthCheck.java
index aea24fe3f00..bf24bdc11b1 100644
--- a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailConsumerHealthCheck.java
+++ b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailConsumerHealthCheck.java
@@ -35,12 +35,6 @@ public class CloudtrailConsumerHealthCheck extends AbstractHealthCheck {
this.cloudtrailConsumer = cloudtrailConsumer;
}
- @Override
- public boolean isLiveness() {
- // this health check is only readiness
- return false;
- }
-
@Override
protected void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) {
diff --git a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerClientHealthCheck.java b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerClientHealthCheck.java
index 0a29270ba74..d7197d1f46a 100644
--- a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerClientHealthCheck.java
+++ b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerClientHealthCheck.java
@@ -36,12 +36,6 @@ public class SecretsManagerClientHealthCheck extends AbstractHealthCheck {
this.secretsManagerEndpoint = secretsManagerEndpoint;
}
- @Override
- public boolean isLiveness() {
- // this health check is only readiness
- return false;
- }
-
@Override
protected void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) {
SecretsManagerConfiguration configuration = secretsManagerEndpoint.getConfiguration();
diff --git a/components/camel-aws/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2ClientHealthCheck.java b/components/camel-aws/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2ClientHealthCheck.java
index 56437e3eeb0..b4a489e5c0f 100644
--- a/components/camel-aws/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2ClientHealthCheck.java
+++ b/components/camel-aws/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2ClientHealthCheck.java
@@ -36,12 +36,6 @@ public class Athena2ClientHealthCheck extends AbstractHealthCheck {
this.athena2Endpoint = athena2Endpoint;
}
- @Override
- public boolean isLiveness() {
- // this health check is only readiness
- return false;
- }
-
@Override
protected void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) {
diff --git a/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2ClientHealthCheck.java b/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2ClientHealthCheck.java
index a3168da2edd..addd0f4ced0 100644
--- a/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2ClientHealthCheck.java
+++ b/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2ClientHealthCheck.java
@@ -36,12 +36,6 @@ public class Cw2ClientHealthCheck extends AbstractHealthCheck {
this.cw2Endpoint = cw2Endpoint;
}
- @Override
- public boolean isLiveness() {
- // this health check is only readiness
- return false;
- }
-
@Override
protected void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) {
Cw2Configuration configuration = cw2Endpoint.getConfiguration();
diff --git a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/Ddb2ClientHealthCheck.java b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/Ddb2ClientHealthCheck.java
index 1320e22bc3b..a924a435582 100644
--- a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/Ddb2ClientHealthCheck.java
+++ b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddb/Ddb2ClientHealthCheck.java
@@ -36,12 +36,6 @@ public class Ddb2ClientHealthCheck extends AbstractHealthCheck {
this.ddb2Endpoint = ddb2Endpoint;
}
- @Override
- public boolean isLiveness() {
- // this health check is only readiness
- return false;
- }
-
@Override
protected void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) {
Ddb2Configuration configuration = ddb2Endpoint.getConfiguration();
diff --git a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCheck.java b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCheck.java
index 56ec031e3d7..9f9b8b4c8a5 100644
--- a/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCheck.java
+++ b/components/camel-aws/camel-aws2-ddb/src/main/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCheck.java
@@ -35,12 +35,6 @@ public class Ddb2StreamConsumerHealthCheck extends AbstractHealthCheck {
this.ddb2StreamConsumer = ddb2StreamConsumer;
}
- @Override
- public boolean isLiveness() {
- // this health check is only readiness
- return false;
- }
-
@Override
protected void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) {
diff --git a/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2HealthCheck.java b/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2HealthCheck.java
index 3d76cbf8137..9c9b41edcb8 100644
--- a/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2HealthCheck.java
+++ b/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2HealthCheck.java
@@ -35,12 +35,6 @@ public class AWS2EC2HealthCheck extends AbstractHealthCheck {
this.aws2EC2Endpoint = aws2EC2Endpoint;
}
- @Override
- public boolean isLiveness() {
- // this health check is only readiness
- return false;
- }
-
@Override
protected void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) {
diff --git a/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/ECS2ClientHealthCheck.java b/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/ECS2ClientHealthCheck.java
index edce0862cd3..02a0403a8b4 100644
--- a/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/ECS2ClientHealthCheck.java
+++ b/components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/ECS2ClientHealthCheck.java
@@ -36,12 +36,6 @@ public class ECS2ClientHealthCheck extends AbstractHealthCheck {
this.ecs2Endpoint = ecs2Endpoint;
}
- @Override
- public boolean isLiveness() {
- // this health check is only readiness
- return false;
- }
-
@Override
protected void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) {
ECS2Configuration configuration = ecs2Endpoint.getConfiguration();
diff --git a/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/EKS2ClientHealthCheck.java b/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/EKS2ClientHealthCheck.java
index 7d0acd7d05a..a1cedb05727 100644
--- a/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/EKS2ClientHealthCheck.java
+++ b/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/EKS2ClientHealthCheck.java
@@ -36,12 +36,6 @@ public class EKS2ClientHealthCheck extends AbstractHealthCheck {
this.eks2Endpoint = eks2Endpoint;
}
- @Override
- public boolean isLiveness() {
- // this health check is only readiness
- return false;
- }
-
@Override
protected void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) {
EKS2Configuration configuration = eks2Endpoint.getConfiguration();
diff --git a/components/camel-aws/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/EventbridgeClientHealthCheck.java b/components/camel-aws/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/EventbridgeClientHealthCheck.java
index f4baa2601e1..61408d4315b 100644
--- a/components/camel-aws/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/EventbridgeClientHealthCheck.java
+++ b/components/camel-aws/camel-aws2-eventbridge/src/main/java/org/apache/camel/component/aws2/eventbridge/EventbridgeClientHealthCheck.java
@@ -36,12 +36,6 @@ public class EventbridgeClientHealthCheck extends AbstractHealthCheck {
this.eventbridgeEndpoint = eventbridgeEndpoint;
}
- @Override
- public boolean isLiveness() {
- // this health check is only readiness
- return false;
- }
-
@Override
protected void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) {
EventbridgeConfiguration configuration = eventbridgeEndpoint.getConfiguration();
diff --git a/components/camel-aws/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/IAM2HealthCheck.java b/components/camel-aws/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/IAM2HealthCheck.java
index 31aea3a3359..2af399cb35d 100644
--- a/components/camel-aws/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/IAM2HealthCheck.java
+++ b/components/camel-aws/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/IAM2HealthCheck.java
@@ -33,12 +33,6 @@ public class IAM2HealthCheck extends AbstractHealthCheck {
this.endpoint = endpoint;
}
- @Override
- public boolean isLiveness() {
- // this health check is only readiness
- return false;
- }
-
@Override
protected void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) {
try {
diff --git a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheck.java b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheck.java
index 701b8931b3d..7ea6919e7f5 100644
--- a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheck.java
+++ b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2ConsumerHealthCheck.java
@@ -37,12 +37,6 @@ public class Kinesis2ConsumerHealthCheck extends AbstractHealthCheck {
this.kinesis2Consumer = kinesis2Consumer;
}
- @Override
- public boolean isLiveness() {
- // this health check is only readiness
- return false;
- }
-
@Override
protected void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) {
diff --git a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2ClientHealthCheck.java b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2ClientHealthCheck.java
index a2b97b92453..7ea32ef700e 100644
--- a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2ClientHealthCheck.java
+++ b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2ClientHealthCheck.java
@@ -36,12 +36,6 @@ public class Lambda2ClientHealthCheck extends AbstractHealthCheck {
this.lambda2Endpoint = lambda2Endpoint;
}
- @Override
- public boolean isLiveness() {
- // this health check is only readiness
- return false;
- }
-
@Override
protected void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) {
Lambda2Configuration configuration = lambda2Endpoint.getConfiguration();
diff --git a/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2ClientHealthCheck.java b/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2ClientHealthCheck.java
index 9ebfeb40a17..cf4edada117 100644
--- a/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2ClientHealthCheck.java
+++ b/components/camel-aws/camel-aws2-mq/src/main/java/org/apache/camel/component/aws2/mq/MQ2ClientHealthCheck.java
@@ -36,12 +36,6 @@ public class MQ2ClientHealthCheck extends AbstractHealthCheck {
this.mq2Endpoint = mq2Endpoint;
}
- @Override
- public boolean isLiveness() {
- // this health check is only readiness
- return false;
- }
-
@Override
protected void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) {
MQ2Configuration configuration = mq2Endpoint.getConfiguration();
diff --git a/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/MSK2HealthCheck.java b/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/MSK2HealthCheck.java
index 1a4a8a2b8cb..f5e6feeec63 100644
--- a/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/MSK2HealthCheck.java
+++ b/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/MSK2HealthCheck.java
@@ -34,12 +34,6 @@ public class MSK2HealthCheck extends AbstractHealthCheck {
this.msk2Endpoint = msk2Endpoint;
}
- @Override
- public boolean isLiveness() {
- // this health check is only readiness
- return false;
- }
-
@Override
protected void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) {
diff --git a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheck.java b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheck.java
index 7742c6fbc87..e71c8449565 100644
--- a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheck.java
+++ b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3ConsumerHealthCheck.java
@@ -35,12 +35,6 @@ public class AWS2S3ConsumerHealthCheck extends AbstractHealthCheck {
this.aws2S3Consumer = aws2S3Consumer;
}
- @Override
- public boolean isLiveness() {
- // this health check is only readiness
- return false;
- }
-
@Override
protected void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) {
diff --git a/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2HealthCheck.java b/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2HealthCheck.java
index 8e94784b320..b57a0749ffd 100644
--- a/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2HealthCheck.java
+++ b/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2HealthCheck.java
@@ -33,12 +33,6 @@ public class Ses2HealthCheck extends AbstractHealthCheck {
this.ses2Endpoint = ses2Endpoint;
}
- @Override
- public boolean isLiveness() {
- // this health check is only readiness
- return false;
- }
-
@Override
protected void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) {
diff --git a/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2HealthCheck.java b/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2HealthCheck.java
index 769b6e3d51f..fe304e1f115 100644
--- a/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2HealthCheck.java
+++ b/components/camel-aws/camel-aws2-sns/src/main/java/org/apache/camel/component/aws2/sns/Sns2HealthCheck.java
@@ -33,12 +33,6 @@ public class Sns2HealthCheck extends AbstractHealthCheck {
this.sns2Endpoint = sns2Endpoint;
}
- @Override
- public boolean isLiveness() {
- // this health check is only readiness
- return false;
- }
-
@Override
protected void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) {
diff --git a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheck.java b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheck.java
index baf74f4c20d..49bfd0191ca 100644
--- a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheck.java
+++ b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheck.java
@@ -35,12 +35,6 @@ public class Sqs2ConsumerHealthCheck extends AbstractHealthCheck {
this.sqs2Consumer = sqs2Consumer;
}
- @Override
- public boolean isLiveness() {
- // this health check is only readiness
- return false;
- }
-
@Override
protected void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) {
diff --git a/components/camel-aws/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2ClientHealthCheck.java b/components/camel-aws/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2ClientHealthCheck.java
index 882c6db0580..553922d7e8f 100644
--- a/components/camel-aws/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2ClientHealthCheck.java
+++ b/components/camel-aws/camel-aws2-translate/src/main/java/org/apache/camel/component/aws2/translate/Translate2ClientHealthCheck.java
@@ -36,12 +36,6 @@ public class Translate2ClientHealthCheck extends AbstractHealthCheck {
this.translate2Endpoint = translate2Endpoint;
}
- @Override
- public boolean isLiveness() {
- // this health check is only readiness
- return false;
- }
-
@Override
protected void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) {
Translate2Configuration configuration = translate2Endpoint.getConfiguration();
diff --git a/components/camel-google/camel-google-storage/src/main/java/org/apache/camel/component/google/storage/GoogleCloudStorageConsumerHealthCheck.java b/components/camel-google/camel-google-storage/src/main/java/org/apache/camel/component/google/storage/GoogleCloudStorageConsumerHealthCheck.java
index d4942c119ff..3e5bf8e33c0 100644
--- a/components/camel-google/camel-google-storage/src/main/java/org/apache/camel/component/google/storage/GoogleCloudStorageConsumerHealthCheck.java
+++ b/components/camel-google/camel-google-storage/src/main/java/org/apache/camel/component/google/storage/GoogleCloudStorageConsumerHealthCheck.java
@@ -33,12 +33,6 @@ public class GoogleCloudStorageConsumerHealthCheck extends AbstractHealthCheck {
this.googleCloudStorageConsumer = googleCloudStorageConsumer;
}
- @Override
- public boolean isLiveness() {
- // this health check is only readiness
- return false;
- }
-
@Override
protected void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) {
Storage client;
diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumerHealthCheck.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumerHealthCheck.java
index 554df8a839f..fce7c06cb3e 100644
--- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumerHealthCheck.java
+++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumerHealthCheck.java
@@ -36,12 +36,6 @@ public class KafkaConsumerHealthCheck extends AbstractHealthCheck {
this.routeId = routeId;
}
- @Override
- public boolean isLiveness() {
- // this health check is only readiness
- return false;
- }
-
@Override
protected void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) {
List<TaskHealthState> healthStates = kafkaConsumer.healthStates();
diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducerHealthCheck.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducerHealthCheck.java
index 8be0c2ae268..70b1dcbb720 100644
--- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducerHealthCheck.java
+++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaProducerHealthCheck.java
@@ -37,12 +37,6 @@ public class KafkaProducerHealthCheck extends AbstractHealthCheck {
this.clientId = clientId;
}
- @Override
- public boolean isLiveness() {
- // this health check is only readiness
- return false;
- }
-
@Override
protected void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) {
if (!kafkaProducer.isReady()) {
diff --git a/core/camel-api/src/main/java/org/apache/camel/health/HealthCheck.java b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheck.java
index 78f66095a8f..7ebca16c661 100644
--- a/core/camel-api/src/main/java/org/apache/camel/health/HealthCheck.java
+++ b/core/camel-api/src/main/java/org/apache/camel/health/HealthCheck.java
@@ -80,7 +80,9 @@ public interface HealthCheck extends HasGroup, HasId, Ordered {
}
/**
- * Whether this health check can be used for readiness checks
+ * Whether this health check can be used for readiness checks.
+ *
+ * Readiness check is default.
*/
default boolean isReadiness() {
return true;
@@ -88,9 +90,11 @@ public interface HealthCheck extends HasGroup, HasId, Ordered {
/**
* Whether this health check can be used for liveness checks
+ *
+ * Liveness check is not default, and must be explicit enabled.
*/
default boolean isLiveness() {
- return true;
+ return false;
}
/**
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/health/ReadinessAndLivenessTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/health/ReadinessAndLivenessTest.java
index 9c8b873ad4f..ef6f3828b85 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/health/ReadinessAndLivenessTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/health/ReadinessAndLivenessTest.java
@@ -108,6 +108,11 @@ public class ReadinessAndLivenessTest {
super(group, id);
}
+ @Override
+ public boolean isReadiness() {
+ return true;
+ }
+
@Override
public boolean isLiveness() {
return false;
@@ -131,6 +136,11 @@ public class ReadinessAndLivenessTest {
return false;
}
+ @Override
+ public boolean isLiveness() {
+ return true;
+ }
+
@Override
public void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) {
builder.down();
@@ -144,6 +154,16 @@ public class ReadinessAndLivenessTest {
super(group, id);
}
+ @Override
+ public boolean isReadiness() {
+ return true;
+ }
+
+ @Override
+ public boolean isLiveness() {
+ return true;
+ }
+
@Override
public void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) {
String k = options.get(HealthCheck.CHECK_KIND).toString();
diff --git a/core/camel-health/src/main/java/org/apache/camel/impl/health/ContextHealthCheck.java b/core/camel-health/src/main/java/org/apache/camel/impl/health/ContextHealthCheck.java
index c009c7294d4..9f7c9b29a62 100644
--- a/core/camel-health/src/main/java/org/apache/camel/impl/health/ContextHealthCheck.java
+++ b/core/camel-health/src/main/java/org/apache/camel/impl/health/ContextHealthCheck.java
@@ -41,8 +41,8 @@ public final class ContextHealthCheck extends AbstractHealthCheck {
@Override
public boolean isLiveness() {
- // this check is only for readiness
- return false;
+ // context is also liveness to ensure we have at least one liveness check
+ return true;
}
@Override
diff --git a/core/camel-health/src/main/java/org/apache/camel/impl/health/RouteHealthCheck.java b/core/camel-health/src/main/java/org/apache/camel/impl/health/RouteHealthCheck.java
index 8e09f570d3a..2e6496c8f6e 100644
--- a/core/camel-health/src/main/java/org/apache/camel/impl/health/RouteHealthCheck.java
+++ b/core/camel-health/src/main/java/org/apache/camel/impl/health/RouteHealthCheck.java
@@ -39,12 +39,6 @@ public class RouteHealthCheck extends AbstractHealthCheck {
this.route = route;
}
- @Override
- public boolean isLiveness() {
- // this check is only for readiness
- return false;
- }
-
@Override
protected void doCall(HealthCheckResultBuilder builder, Map<String, Object> options) {
if (route.getId() != null) {
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumerHealthCheck.java b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumerHealthCheck.java
index 9426b97df4b..69563f260bc 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumerHealthCheck.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumerHealthCheck.java
@@ -60,7 +60,7 @@ public class ScheduledPollConsumerHealthCheck implements HealthCheck {
final HealthCheckResultBuilder builder = HealthCheckResultBuilder.on(this);
// set initial state
- builder.state(registry.getInitialState());
+ builder.state(initialState);
// ensure to sanitize uri, so we do not show sensitive information such as passwords
builder.detail(ENDPOINT_URI, sanitizedUri);
diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_21.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_21.adoc
index b4f28b0d4f6..20627825900 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_21.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_21.adoc
@@ -19,6 +19,13 @@ Component developers that has plugins for Camel Developer Console, should just u
`camel-support` and `camel-util-json` as dependencies,
and then extend `AbstractDevConsole` for custom console implementations.
+=== camel-health
+
+The `org.apache.camel.health.HealthCheck` method `isLiveness` is now default `false` instead of `true`.
+
+Camel provides the `CamelContextCheck` as both readiness and liveness checks, so there is at least
+one of each out of the box.
+
=== camel-main
The option `camel.main.routesReloadRestartDuration` has changed its default value from `true` to `false`.
diff --git a/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc
index 595012659e9..a1ceb05f1f1 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc
@@ -81,6 +81,7 @@ We have removed deprecated APIs such as the following:
- Removed `org.apache.camel.builder.SimpleBuilder`. Was mostly used internally in Camel with the Java DSL in some situations.
- Moved `org.apache.camel.support.IntrospectionSupport` to `camel-core-engine` for internal use only. End users should use `org.apache.camel.spi.BeanInspection` instead.
- Removed `archetypeCatalogAsXml` method from `org.apache.camel.catalog.CamelCatalog`.
+- The `org.apache.camel.health.HealthCheck` method `isLiveness` is now default `false` instead of `true`.
== EIP Changes
@@ -89,6 +90,13 @@ Removed `lang` attribute for the `<description>` on every EIPs.
The `InOnly` and `InOut` EIPs has been removed.
Instead, use `SetExchangePattern` or `To` where you can specify exchange pattern to use.
+== Camel Health
+
+Health checks are now by default only readiness checks out of the box.
+
+Camel provides the `CamelContextCheck` as both readiness and liveness checks, so there is at least
+one of each out of the box.
+
== YAML DSL
The backwards compatible mode Camel 3.14 or older, which allowed to have _steps_ as child to _route_ has been removed.
[camel] 01/02: Upgrade to maven-compiler-plugin 3.11.0
Posted by da...@apache.org.
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.git
commit e48c6f96a99c15271f12f518b885b14ed426ccf2
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Mar 6 10:05:15 2023 +0100
Upgrade to maven-compiler-plugin 3.11.0
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index beaa1437ded..6d85750a1c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,7 @@
<!-- reproduceable builds: https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
<project.build.outputTimestamp>1</project.build.outputTimestamp>
- <maven-compiler-plugin-version>3.10.1</maven-compiler-plugin-version>
+ <maven-compiler-plugin-version>3.11.0</maven-compiler-plugin-version>
<maven-javadoc-plugin-version>3.2.0</maven-javadoc-plugin-version>
<maven-surefire-plugin-version>3.0.0-M8</maven-surefire-plugin-version>
<maven-failsafe-plugin-version>3.0.0-M8</maven-failsafe-plugin-version>