Re: [PR] CAMEL-20227: avoid calling the consumer test unless Kafka consumer has been paused [camel]
orpiske commented on PR #14769: URL: https://github.com/apache/camel/pull/14769#issuecomment-2219625591 BTW, this is just a remedy. Longer term I think I should consider augmenting the `RoutePolicy` API - as you suggested - and checking if this could be moved there in some way. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20227: avoid calling the consumer test unless Kafka consumer has been paused [camel]
github-actions[bot] commented on PR #14769: URL: https://github.com/apache/camel/pull/14769#issuecomment-2219624124 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] CAMEL-20227: avoid calling the consumer test unless Kafka consumer has been paused [camel]
orpiske opened a new pull request, #14769: URL: https://github.com/apache/camel/pull/14769 Hey @davsclaus, this is more or less what I was thinking about in my comment on https://github.com/apache/camel/pull/14745#issuecomment-2212350669. I'm wondering if we should add a log on to inform that we are not calling the `afterConsumeEval.test(null)` because it has not been paused (I have not done so yet, as I think it would flood the log with those messages, because it would be called after every `poll`). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Kafka dev console and jbang command [camel]
davsclaus commented on code in PR #14768:
URL: https://github.com/apache/camel/pull/14768#discussion_r1671660004
##
components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java:
##
@@ -343,6 +371,30 @@ protected void startPolling() {
final KafkaRecordProcessorFacade recordProcessorFacade =
createRecordProcessor();
while (isKafkaConsumerRunnableAndNotStopped() && isConnected() &&
pollExceptionStrategy.canContinue()) {
+
+if (commitRecordsRequested.compareAndSet(true, false)) {
+try {
+// we want to get details about last committed offsets
(which MUST be done by this consumer thread)
+Map commits =
consumer.committed(consumer.assignment());
+commitRecords.clear();
+for (var e : commits.entrySet()) {
+KafkaTopicPosition p
+= new KafkaTopicPosition(
+e.getKey().topic(),
e.getKey().partition(), e.getValue().offset(),
+
e.getValue().leaderEpoch().orElse(0));
+commitRecords.add(p);
+}
+CountDownLatch count = latch.get();
+if (count != null) {
+count.countDown();
+}
+} catch (Exception e) {
+// ignore cannot get last commit details
+LOG.debug("Cannot get last offset committed from Kafka
brokers due to: {}. This exception is ignored.",
+e.getMessage(), e);
+}
+}
+
Review Comment:
No its only in use on special request
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] Kafka dev console and jbang command [camel]
davsclaus commented on code in PR #14768:
URL: https://github.com/apache/camel/pull/14768#discussion_r1671659607
##
components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaDevConsole.java:
##
@@ -0,0 +1,181 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.kafka;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.camel.Route;
+import org.apache.camel.spi.annotations.DevConsole;
+import org.apache.camel.support.console.AbstractDevConsole;
+import org.apache.camel.util.StopWatch;
+import org.apache.camel.util.TimeUtils;
+import org.apache.camel.util.json.JsonArray;
+import org.apache.camel.util.json.JsonObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@DevConsole(name = "kafka", displayName = "Kafka", description = "Apache
Kafka")
+public class KafkaDevConsole extends AbstractDevConsole {
+
+private static final Logger LOG =
LoggerFactory.getLogger(KafkaDevConsole.class);
+
+private static final long COMMITTED_TIMEOUT = 1;
+
+/**
+ * Whether to include committed offset (sync operation to Kafka broker)
+ */
+public static final String COMMITTED = "committed";
+
+public KafkaDevConsole() {
+super("camel", "kafka", "Kafka", "Apache Kafka");
+}
+
+@Override
+protected String doCallText(Map options) {
+final boolean committed =
"true".equals(options.getOrDefault(COMMITTED, "false"));
+
+StringBuilder sb = new StringBuilder();
+for (Route route : getCamelContext().getRoutes()) {
+if (route.getConsumer() instanceof KafkaConsumer kc) {
+sb.append(String.format("\nRoute Id: %s",
route.getRouteId()));
+sb.append(String.format("\nFrom: %s",
route.getEndpoint().getEndpointUri()));
+for (KafkaFetchRecords t : kc.tasks()) {
+sb.append(String.format("\nWorked Thread: %s",
t.getThreadId()));
+sb.append(String.format("\nWorker State: %s",
t.getState()));
+TaskHealthState hs = t.healthState();
+if (!hs.isReady()) {
+sb.append(String.format("\nWorker Last Error:
%s", hs.buildStateMessage()));
+}
+KafkaFetchRecords.GroupMetadata meta =
t.getGroupMetadata();
+if (meta != null) {
+sb.append(String.format("\nGroup Id: %s",
meta.groupId()));
+sb.append(String.format("\nGroup Instance Id:
%s", meta.groupInstanceId()));
+sb.append(String.format("\nMember Id: %s",
meta.memberId()));
+sb.append(String.format("\nGeneration Id: %d",
meta.generationId()));
+}
+if (t.getLastRecord() != null) {
+sb.append(String.format("\nLast Topic: %s",
t.getLastRecord().topic()));
+sb.append(String.format("\nLast Partition:
%d", t.getLastRecord().partition()));
+sb.append(String.format("\nLast Offset: %d",
t.getLastRecord().offset()));
+}
+if (committed) {
+List l =
fetchCommitOffsets(kc, t);
+if (l != null) {
+for (KafkaFetchRecords.KafkaTopicPosition r : l) {
+sb.append(String.format("\nCommit
Topic: %s", r.topic()));
+sb.append(String.format("\nCommit
Partition: %s", r.partition()));
+sb.append(String.format("\nCommit
Offset: %s", r.offset()));
+if (r.epoch() > 0) {
+long delta = System.currentTimeMillis() -
r.epoch();
+sb.append(String.format("\nCommit
Offset Since: %s",
+
Re: [PR] Kafka dev console and jbang command [camel]
orpiske commented on code in PR #14768:
URL: https://github.com/apache/camel/pull/14768#discussion_r1671653582
##
components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java:
##
@@ -343,6 +371,30 @@ protected void startPolling() {
final KafkaRecordProcessorFacade recordProcessorFacade =
createRecordProcessor();
while (isKafkaConsumerRunnableAndNotStopped() && isConnected() &&
pollExceptionStrategy.canContinue()) {
+
+if (commitRecordsRequested.compareAndSet(true, false)) {
+try {
+// we want to get details about last committed offsets
(which MUST be done by this consumer thread)
+Map commits =
consumer.committed(consumer.assignment());
+commitRecords.clear();
+for (var e : commits.entrySet()) {
+KafkaTopicPosition p
+= new KafkaTopicPosition(
+e.getKey().topic(),
e.getKey().partition(), e.getValue().offset(),
+
e.getValue().leaderEpoch().orElse(0));
+commitRecords.add(p);
+}
+CountDownLatch count = latch.get();
+if (count != null) {
+count.countDown();
+}
+} catch (Exception e) {
+// ignore cannot get last commit details
+LOG.debug("Cannot get last offset committed from Kafka
brokers due to: {}. This exception is ignored.",
+e.getMessage(), e);
+}
+}
+
Review Comment:
IMHO, it would be better to do this using a decorator. The biggest problem
here is that we are attaching an edge case behavior right into the hot path of
the component.
##
components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaDevConsole.java:
##
@@ -0,0 +1,181 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.kafka;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.camel.Route;
+import org.apache.camel.spi.annotations.DevConsole;
+import org.apache.camel.support.console.AbstractDevConsole;
+import org.apache.camel.util.StopWatch;
+import org.apache.camel.util.TimeUtils;
+import org.apache.camel.util.json.JsonArray;
+import org.apache.camel.util.json.JsonObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@DevConsole(name = "kafka", displayName = "Kafka", description = "Apache
Kafka")
+public class KafkaDevConsole extends AbstractDevConsole {
+
+private static final Logger LOG =
LoggerFactory.getLogger(KafkaDevConsole.class);
+
+private static final long COMMITTED_TIMEOUT = 1;
+
+/**
+ * Whether to include committed offset (sync operation to Kafka broker)
+ */
+public static final String COMMITTED = "committed";
+
+public KafkaDevConsole() {
+super("camel", "kafka", "Kafka", "Apache Kafka");
+}
+
+@Override
+protected String doCallText(Map options) {
+final boolean committed =
"true".equals(options.getOrDefault(COMMITTED, "false"));
+
+StringBuilder sb = new StringBuilder();
+for (Route route : getCamelContext().getRoutes()) {
+if (route.getConsumer() instanceof KafkaConsumer kc) {
+sb.append(String.format("\nRoute Id: %s",
route.getRouteId()));
+sb.append(String.format("\nFrom: %s",
route.getEndpoint().getEndpointUri()));
+for (KafkaFetchRecords t : kc.tasks()) {
+sb.append(String.format("\nWorked Thread: %s",
t.getThreadId()));
+sb.append(String.format("\nWorker State: %s",
t.getState()));
+TaskHealthState hs = t.healthState();
+if (!hs.isReady()) {
+
(camel) branch kafka-console updated (35d604965c4 -> 70c4f61216f)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch kafka-console in repository https://gitbox.apache.org/repos/asf/camel.git from 35d604965c4 CAMEL-20956: camel-kafka - Add dev console and jbang command add 70c4f61216f CAMEL-20956: camel-kafka - Add dev console and jbang command No new revisions were added by this update. Summary of changes: .../camel/component/kafka/KafkaDevConsole.java | 10 +--- .../camel/component/kafka/TaskHealthState.java | 5 +--- .../jbang/core/commands/process/ListHealth.java| 18 +- .../dsl/jbang/core/commands/process/ListKafka.java | 29 -- .../core/commands/version/VersionGetTest.java | 5 ++-- 5 files changed, 42 insertions(+), 25 deletions(-)
(camel-website) branch regen_bot updated (4337ad44 -> 2482aa50)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel-website.git from 4337ad44 Camel Quarkus 3.8.3 announcement blog post add 2482aa50 Update team.md No new revisions were added by this update. Summary of changes: content/community/team.md | 1 + 1 file changed, 1 insertion(+)
(camel-website) branch main updated: Update team.md
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-website.git The following commit(s) were added to refs/heads/main by this push: new 2482aa50 Update team.md 2482aa50 is described below commit 2482aa5064e0a36adc57c88e14cb3d0b00a4307c Author: Claus Ibsen AuthorDate: Wed Jul 10 07:02:53 2024 +0200 Update team.md --- content/community/team.md | 1 + 1 file changed, 1 insertion(+) diff --git a/content/community/team.md b/content/community/team.md index 5d76ca46..b8f2194e 100644 --- a/content/community/team.md +++ b/content/community/team.md @@ -115,6 +115,7 @@ If you have been contributing to the Apache Camel project, and you want your nam | Charles Anthony || | Christopher Köster || | Claus Straube || +| Craig Ziesman | Red Hat| | Dan Checkoway || | Dennis Byrne| Thoughtworks | | Dimitrios Liapis||
(camel) branch main updated (f7fba19c047 -> 82b4ae7135a)
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 f7fba19c047 chore(deps): Bump micrometer-tracing-version from 1.3.1 to 1.3.2 (#14761) add 82b4ae7135a chore(deps): Bump maven-resolver-version from 1.9.20 to 1.9.21 (#14763) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch dependabot/maven/micrometer-tracing-version-1.3.2 deleted (was 71b8dd5f602)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/micrometer-tracing-version-1.3.2 in repository https://gitbox.apache.org/repos/asf/camel.git was 71b8dd5f602 chore(deps): Bump micrometer-tracing-version from 1.3.1 to 1.3.2 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
Re: [PR] chore(deps): Bump maven-resolver-version from 1.9.20 to 1.9.21 [camel]
davsclaus merged PR #14763: URL: https://github.com/apache/camel/pull/14763 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch main updated (a40eb9a7472 -> f7fba19c047)
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 a40eb9a7472 chore(deps): Bump org.codehaus.mojo:versions-maven-plugin (#14759) add f7fba19c047 chore(deps): Bump micrometer-tracing-version from 1.3.1 to 1.3.2 (#14761) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch dependabot/maven/maven-resolver-version-1.9.21 deleted (was 978f4dca2fa)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/maven-resolver-version-1.9.21 in repository https://gitbox.apache.org/repos/asf/camel.git was 978f4dca2fa chore(deps): Bump maven-resolver-version from 1.9.20 to 1.9.21 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
Re: [PR] chore(deps): Bump micrometer-tracing-version from 1.3.1 to 1.3.2 [camel]
davsclaus merged PR #14761: URL: https://github.com/apache/camel/pull/14761 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch main updated: chore(deps): Bump org.codehaus.mojo:versions-maven-plugin (#14759)
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
The following commit(s) were added to refs/heads/main by this push:
new a40eb9a7472 chore(deps): Bump org.codehaus.mojo:versions-maven-plugin
(#14759)
a40eb9a7472 is described below
commit a40eb9a74723b2467fcba3112aab2deca724222c
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Wed Jul 10 06:30:43 2024 +0200
chore(deps): Bump org.codehaus.mojo:versions-maven-plugin (#14759)
Bumps
[org.codehaus.mojo:versions-maven-plugin](https://github.com/mojohaus/versions)
from 2.16.2 to 2.17.0.
- [Release notes](https://github.com/mojohaus/versions/releases)
-
[Changelog](https://github.com/mojohaus/versions/blob/master/ReleaseNotes.md)
- [Commits](https://github.com/mojohaus/versions/compare/2.16.2...2.17.0)
---
updated-dependencies:
- dependency-name: org.codehaus.mojo:versions-maven-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 71bb2aa8cc7..ad71cb9535f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,7 +134,7 @@
3.0.1
3.2.0
3.3.0
-2.16.2
+2.17.0
false
${skipTests}
(camel) branch dependabot/maven/org.codehaus.mojo-versions-maven-plugin-2.17.0 deleted (was 3fd1ac38b7b)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.codehaus.mojo-versions-maven-plugin-2.17.0 in repository https://gitbox.apache.org/repos/asf/camel.git was 3fd1ac38b7b chore(deps): Bump org.codehaus.mojo:versions-maven-plugin The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
Re: [PR] chore(deps): Bump org.codehaus.mojo:versions-maven-plugin from 2.16.2 to 2.17.0 [camel]
davsclaus merged PR #14759: URL: https://github.com/apache/camel/pull/14759 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-kafka-connector) branch automatic-periodic-sync updated (a1728a7a59 -> 2003ae6afd)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch automatic-periodic-sync in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git from a1728a7a59 Remove camel-hdfs as they are not in kamelets anymore add 060c29d27b Updated CHANGELOG.md add 2003ae6afd Upgrade to maven wrapper 3.9.8 No new revisions were added by this update. Summary of changes: .mvn/wrapper/maven-wrapper.properties | 5 +- CHANGELOG.md | 1 + mvnw | 435 +++--- mvnw.cmd | 304 ++-- 4 files changed, 321 insertions(+), 424 deletions(-)
Re: [I] [CI] - Quarkus Main Branch Build Failure [camel-quarkus]
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-2219391561 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 9867107537-1539-4ceb700d-b41d-413e-8e98-40e5013159e3 * Camel Quarkus Commit: 357456e8d70efdb5df1ddbbda234e4fed98c7176 * Quarkus Main Commit: 330583843f34f50d05afa7e2601c34d0250c7245 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/9867107537 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-k) branch release-2.2.x updated: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-2.2.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-2.2.x by this push: new 333eacd69 chore: changelog automatic update 333eacd69 is described below commit 333eacd696b9475dc6ac0aa3d60f63d8f4e2cc8e Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed Jul 10 01:06:15 2024 + chore: changelog automatic update --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5701c7dc1..1d02c0e98 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - `make uninstall` should consider lease [\#5671](https://github.com/apache/camel-k/issues/5671) - Jolokia trait failure [\#5666](https://github.com/apache/camel-k/issues/5666) +- Cluster role global false still deploying cluster role [\#5656](https://github.com/apache/camel-k/issues/5656) - Add TimeoutSeconds to knative-service trait [\#5652](https://github.com/apache/camel-k/issues/5652) - Explain how to clean registry [\#5645](https://github.com/apache/camel-k/issues/5645) - Add TLS configuration in the ingress trait [\#5635](https://github.com/apache/camel-k/issues/5635)
Re: [I] [CI] - Camel Main Branch Build Failure [camel-quarkus]
github-actions[bot] commented on issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927#issuecomment-2219170087 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 9865972033-1435-f36fb527-5c98-4e83-af86-b717ae2ec713 * Camel Quarkus Commit: 4df0f39c4b1986c840097719638643bf12a9f281 * Camel Main Commit: 330583843f34f50d05afa7e2601c34d0250c7245 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/9865972033 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-k) branch release-2.3.x updated: chore: nightly automatic updates
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-2.3.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-2.3.x by this push: new 5a9c33a0a chore: nightly automatic updates 5a9c33a0a is described below commit 5a9c33a0a87e970720208ce015c6cdb5a77002be Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed Jul 10 00:28:21 2024 + chore: nightly automatic updates --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5701c7dc1..1d02c0e98 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - `make uninstall` should consider lease [\#5671](https://github.com/apache/camel-k/issues/5671) - Jolokia trait failure [\#5666](https://github.com/apache/camel-k/issues/5666) +- Cluster role global false still deploying cluster role [\#5656](https://github.com/apache/camel-k/issues/5656) - Add TimeoutSeconds to knative-service trait [\#5652](https://github.com/apache/camel-k/issues/5652) - Explain how to clean registry [\#5645](https://github.com/apache/camel-k/issues/5645) - Add TLS configuration in the ingress trait [\#5635](https://github.com/apache/camel-k/issues/5635)
[PR] [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) [camel-spring-boot]
github-actions[bot] opened a new pull request, #1173: URL: https://github.com/apache/camel-spring-boot/pull/1173 Periodic Sync of Camel Spring Boot Main Branch with main Camel Main. see https://github.com/apache/camel-spring-boot/blob/main/.github/workflows/automatic-sync-main.yml -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] OLM missing recommeded resource requests [camel-k]
github-actions[bot] commented on issue #5340: URL: https://github.com/apache/camel-k/issues/5340#issuecomment-2219129554 This issue has been automatically marked as stale due to 90 days of inactivity. It will be closed if no further activity occurs within 15 days. If you think that’s incorrect or the issue should never stale, please simply write any comment. Thanks for your contributions! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-k) branch main updated: chore: nightly automatic updates
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/main by this push: new 17c61e994 chore: nightly automatic updates 17c61e994 is described below commit 17c61e994d314b9accba2eda0a39ef8725f96fa4 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Jul 9 23:43:40 2024 + chore: nightly automatic updates --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8291323cd..5b99cffaf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - `make uninstall` should consider lease [\#5671](https://github.com/apache/camel-k/issues/5671) - Jolokia trait failure [\#5666](https://github.com/apache/camel-k/issues/5666) +- Cluster role global false still deploying cluster role [\#5656](https://github.com/apache/camel-k/issues/5656) - Add TimeoutSeconds to knative-service trait [\#5652](https://github.com/apache/camel-k/issues/5652) - Explain how to clean registry [\#5645](https://github.com/apache/camel-k/issues/5645) - Add TLS configuration in the ingress trait [\#5635](https://github.com/apache/camel-k/issues/5635) @@ -43,6 +44,8 @@ **Merged pull requests:** +- fix\(helm\): Remove duplicate clusterrole camel-k edit [\#5690](https://github.com/apache/camel-k/pull/5690) ([gansheer](https://github.com/gansheer)) +- chore\(build\): Fix docker build warnings [\#5689](https://github.com/apache/camel-k/pull/5689) ([gansheer](https://github.com/gansheer)) - chore\(deps\): bump fabric8-version from 6.13.0 to 6.13.1 in /java/crds [\#5688](https://github.com/apache/camel-k/pull/5688) ([dependabot[bot]](https://github.com/apps/dependabot)) - chore\(deps\): bump golang.org/x/term from 0.21.0 to 0.22.0 [\#5687](https://github.com/apache/camel-k/pull/5687) ([dependabot[bot]](https://github.com/apps/dependabot)) - fix\(install\): avoid kubectl execution on Makefile evaluation [\#5686](https://github.com/apache/camel-k/pull/5686) ([gansheer](https://github.com/gansheer))
Re: [PR] Add camel-base64 integration test [camel-karaf]
f2par0 commented on code in PR #417:
URL: https://github.com/apache/camel-karaf/pull/417#discussion_r1671192643
##
tests/camel-integration-test/src/main/java/org/apache/karaf/camel/itests/AbstractCamelRouteWithBundleITest.java:
##
@@ -41,7 +43,8 @@ protected List installRequiredBundles() throws
Exception {
throw new IllegalArgumentException("The system property
project.version must be set to the version of the " +
"test bundle to install or the method getTestBundleVersion
must be overridden to provide the version");
}
-installBundle("file://%s/%s-%s.jar".formatted(getBaseDir(),
testBundleName, testBundleVersion), true);
+Path bundlePath = Paths.get("%s/%s-%s.jar".formatted(getBaseDir(),
testBundleName, testBundleVersion));
+installBundle(bundlePath.toUri().toString(), true);
Review Comment:
ok, I guess you're the first one to test on windows :)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] CAMEL-20904: Add Kubernetes Camel JBang plugin [camel]
christophd commented on PR #14757: URL: https://github.com/apache/camel/pull/14757#issuecomment-2218576260 Many thanks for the initial feedback. I think this one is ready for final review. I have fixed some reported issues, added unit tests, added documentation and the ability to auto remove the deployment when terminating a process with `--dev` option. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus-examples) branch dependabot/maven/message-bridge/camel-quarkus-main/maven-3b045276ba created (now 3015415)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/message-bridge/camel-quarkus-main/maven-3b045276ba in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git at 3015415 Bump org.assertj:assertj-core No new revisions were added by this update.
[PR] Bump org.assertj:assertj-core from 3.26.0 to 3.26.3 in /message-bridge in the maven group across 1 directory [camel-quarkus-examples]
dependabot[bot] opened a new pull request, #244: URL: https://github.com/apache/camel-quarkus-examples/pull/244 Bumps the maven group with 1 update in the /message-bridge directory: [org.assertj:assertj-core](https://github.com/assertj/assertj). Updates `org.assertj:assertj-core` from 3.26.0 to 3.26.3 Release notes Sourced from https://github.com/assertj/assertj/releases;>org.assertj:assertj-core's releases. v3.26.3 :jigsaw: Binary Compatibility The release is: Binary compatible with the previous minor version. Binary incompatible with the previous patch version. :boom: Breaking Changes Core Replace assertThat(Temporal) with assertThatTemporal(Temporal) https://redirect.github.com/assertj/assertj/issues/3519;>#3519 :bug: Bug Fixes Core Fix Javadoc rendering on FactoryBasedNavigableListAssert::assertThat Allow ComparingNormalizedFields instances to be reused across different assertions https://redirect.github.com/assertj/assertj/issues/3493;>#3493 :hammer: Dependency Upgrades Core Upgrade to Byte Buddy 1.14.18 https://redirect.github.com/assertj/assertj/issues/3531;>#3531 Upgrade to JUnit BOM 5.10.3 https://redirect.github.com/assertj/assertj/issues/3525;>#3525 Guava Upgrade to Guava 33.2.1-jre https://redirect.github.com/assertj/assertj/issues/3499;>#3499 :heart: Contributors Thanks to all the contributors who worked on this release: https://github.com/genuss;>@genuss Commits https://github.com/assertj/assertj/commit/8e97f90d62782a5fe2e49f739164361ecb54738b;>8e97f90 [maven-release-plugin] prepare release assertj-build-3.26.3 https://github.com/assertj/assertj/commit/d1afefca4e99fe6476e04d61d670fe24c25b7f4d;>d1afefc chore(deps): bump com.github.spotbugs:spotbugs-maven-plugin from 4.8.6.1 to 4... https://github.com/assertj/assertj/commit/2dc2cbfa4070d2bbeb1a748c0833c277047fd93d;>2dc2cbf chore(deps): bump byte-buddy.version from 1.14.17 to 1.14.18 (https://redirect.github.com/assertj/assertj/issues/3531;>#3531) https://github.com/assertj/assertj/commit/2541d3c1722a923c9a1cf3b33255e3fc8ee07135;>2541d3c chore(deps-dev): bump com.fasterxml.jackson.core:jackson-databind from 2.17.1... https://github.com/assertj/assertj/commit/cdb906fb0d9ee0dfddb2925f15a46a5b7b16c5da;>cdb906f [maven-release-plugin] prepare for next development iteration https://github.com/assertj/assertj/commit/c3b1f4a5eef1284e484e43374e9d5ba8ba33707d;>c3b1f4a [maven-release-plugin] prepare release assertj-build-3.26.2 https://github.com/assertj/assertj/commit/d5b52abe63cca2b84b6abc38dd9b15a0e63f9b9d;>d5b52ab [maven-release-plugin] prepare for next development iteration https://github.com/assertj/assertj/commit/17ea711f63eea0c3081be2e36f1d089edaba1f07;>17ea711 [maven-release-plugin] prepare release assertj-build-3.26.1 https://github.com/assertj/assertj/commit/8cf054db3230522155c5b637e332e485622c8b82;>8cf054d chore(deps): bump org.codehaus.mojo:versions-maven-plugin from 2.16.2 to 2.17... https://github.com/assertj/assertj/commit/5e708b48ef69f4d8c35ec86690ba6bc491cb579a;>5e708b4 chore(deps-dev): bump org.apache.groovy:groovy from 4.0.21 to 4.0.22 (https://redirect.github.com/assertj/assertj/issues/3527;>#3527) Additional commits viewable in https://github.com/assertj/assertj/compare/assertj-build-3.26.0...assertj-build-3.26.3;>compare view [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore major version` will close this group update PR and stop Dependabot creating any more for the
(camel) branch kafka-console updated (224b4d46b17 -> 35d604965c4)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch kafka-console in repository https://gitbox.apache.org/repos/asf/camel.git from 224b4d46b17 CAMEL-20956: camel-kafka - Add dev console and jbang command add 35d604965c4 CAMEL-20956: camel-kafka - Add dev console and jbang command No new revisions were added by this update. Summary of changes: .../main/java/org/apache/camel/component/kafka/KafkaDevConsole.java | 3 ++- .../main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-)
(camel-karaf) branch main updated: Ref #414: Add camel-barcode integration test (#415)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new a01f9413 Ref #414: Add camel-barcode integration test (#415)
a01f9413 is described below
commit a01f94132fb3be859694e5f5a4334300d53d4386
Author: François de Parscau <116000379+f2p...@users.noreply.github.com>
AuthorDate: Tue Jul 9 18:48:48 2024 +0200
Ref #414: Add camel-barcode integration test (#415)
---
tests/features/camel-barcode/pom.xml | 40 ++
.../camel/test/CamelBarcodeRouteSupplier.java | 88 ++
.../karaf/camel/itest/CamelBarcodeITest.java | 55 ++
tests/features/pom.xml | 1 +
4 files changed, 184 insertions(+)
diff --git a/tests/features/camel-barcode/pom.xml
b/tests/features/camel-barcode/pom.xml
new file mode 100644
index ..885d5243
--- /dev/null
+++ b/tests/features/camel-barcode/pom.xml
@@ -0,0 +1,40 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.karaf
+camel-karaf-features-test
+4.6.0-SNAPSHOT
+
+
+camel-barcode-test
+Apache Camel :: Karaf :: Tests :: Features :: Barcode
+
+
+
+org.apache.camel
+camel-barcode
+${camel-version}
+
+
+
\ No newline at end of file
diff --git
a/tests/features/camel-barcode/src/main/java/org/apache/karaf/camel/test/CamelBarcodeRouteSupplier.java
b/tests/features/camel-barcode/src/main/java/org/apache/karaf/camel/test/CamelBarcodeRouteSupplier.java
new file mode 100644
index ..a87153e8
--- /dev/null
+++
b/tests/features/camel-barcode/src/main/java/org/apache/karaf/camel/test/CamelBarcodeRouteSupplier.java
@@ -0,0 +1,88 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.karaf.camel.test;
+
+import static org.apache.camel.builder.Builder.constant;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UncheckedIOException;
+import java.nio.file.Path;
+import java.util.function.Function;
+
+import javax.imageio.ImageIO;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.dataformat.barcode.BarcodeDataFormat;
+import org.apache.camel.dataformat.barcode.BarcodeImageType;
+import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.spi.DataFormat;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.BinaryBitmap;
+import com.google.zxing.client.j2se.BufferedImageLuminanceSource;
+import com.google.zxing.client.j2se.MatrixToImageWriter;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.common.HybridBinarizer;
+
+@Component(
+name = "karaf-camel-barcode-test",
+immediate = true,
+service = CamelBarcodeRouteSupplier.class
+)
+public class CamelBarcodeRouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
+
+@Override
+protected Function consumerRoute() {
+
+try (DataFormat code1 = new BarcodeDataFormat(200, 200,
BarcodeImageType.PNG, BarcodeFormat.CODE_39)) {
+return builder -> builder.from("timer://testTimer?repeatCount=1")
+.setBody(constant("OK"))
+.marshal(code1)
+.process(new Processor() {
+@Override
+public void process(Exchange exchange) throws
Exception {
+InputStream bis =
exchange.getIn().getBody(InputStream.class);
+BinaryBitmap bitmap =
+new BinaryBitmap(new HybridBinarizer(new
Re: [I] Add camel-barcode integration test [camel-karaf]
essobedo closed issue #414: Add camel-barcode integration test URL: https://github.com/apache/camel-karaf/issues/414 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Add camel-barcode integration test [camel-karaf]
essobedo merged PR #415: URL: https://github.com/apache/camel-karaf/pull/415 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Add camel-base64 integration test [camel-karaf]
stataru8 commented on code in PR #417:
URL: https://github.com/apache/camel-karaf/pull/417#discussion_r1670861572
##
tests/camel-integration-test/src/main/java/org/apache/karaf/camel/itests/AbstractCamelRouteWithBundleITest.java:
##
@@ -41,7 +43,8 @@ protected List installRequiredBundles() throws
Exception {
throw new IllegalArgumentException("The system property
project.version must be set to the version of the " +
"test bundle to install or the method getTestBundleVersion
must be overridden to provide the version");
}
-installBundle("file://%s/%s-%s.jar".formatted(getBaseDir(),
testBundleName, testBundleVersion), true);
+Path bundlePath = Paths.get("%s/%s-%s.jar".formatted(getBaseDir(),
testBundleName, testBundleVersion));
+installBundle(bundlePath.toUri().toString(), true);
Review Comment:
To fix this, I would need to use `file:///C:\Users...` instead of
`file://C:\Users...`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] Add camel-base64 integration test [camel-karaf]
stataru8 commented on code in PR #417:
URL: https://github.com/apache/camel-karaf/pull/417#discussion_r1670855311
##
tests/camel-integration-test/src/main/java/org/apache/karaf/camel/itests/AbstractCamelRouteWithBundleITest.java:
##
@@ -41,7 +43,8 @@ protected List installRequiredBundles() throws
Exception {
throw new IllegalArgumentException("The system property
project.version must be set to the version of the " +
"test bundle to install or the method getTestBundleVersion
must be overridden to provide the version");
}
-installBundle("file://%s/%s-%s.jar".formatted(getBaseDir(),
testBundleName, testBundleVersion), true);
+Path bundlePath = Paths.get("%s/%s-%s.jar".formatted(getBaseDir(),
testBundleName, testBundleVersion));
+installBundle(bundlePath.toUri().toString(), true);
Review Comment:
Before the changes I wasn't able to run some integration tests, for
instance, camel-weather:
```
[ERROR] org.apache.karaf.camel.itest.CamelWeatherITest.testResultMock --
Time elapsed: 16.89 s <<< ERROR!
org.osgi.framework.BundleException: Unable to cache bundle:
file://C:\Users\stataru\Documents\gitTalend\camel-karaf\tests\features\camel-weather\target/camel-weather-test-4.6
.0-SNAPSHOT.jar
at org.apache.felix.framework.Felix.installBundle(Felix.java:3258)
at
org.apache.felix.framework.BundleContextImpl.installBundle(BundleContextImpl.java:147)
at
org.apache.felix.framework.BundleContextImpl.installBundle(BundleContextImpl.java:120)
at
org.apache.karaf.itests.KarafTestSupport.installBundle(KarafTestSupport.java:772)
at
org.apache.karaf.camel.itests.AbstractCamelRouteWithBundleITest.installRequiredBundles(AbstractCamelRouteWithBundleITest.java:44)
at
org.apache.karaf.camel.itests.AbstractCamelRouteITest.init(AbstractCamelRouteITest.java:215)
at
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
at
java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.base/java.lang.reflect.Method.invoke(Method.java:568)
at
org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
at
org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
at
org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
at
org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:24)
at
org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
at org.junit.rules.TestWatcher$1.evaluate(TestWatcher.java:55)
at
org.apache.karaf.itests.KarafTestSupport$Retry$1.evaluate(KarafTestSupport.java:160)
at org.junit.rules.RunRules.evaluate(RunRules.java:20)
at
org.ops4j.pax.exam.invoker.junit.internal.ContainerTestRunner.runLeafWithRetry(ContainerTestRunner.java:97)
at
org.ops4j.pax.exam.invoker.junit.internal.ContainerTestRunner.runChildWithRetry(ContainerTestRunner.java:84)
at
org.ops4j.pax.exam.invoker.junit.internal.ContainerTestRunner.runChild(ContainerTestRunner.java:75)
at
org.ops4j.pax.exam.invoker.junit.internal.ContainerTestRunner.runChild(ContainerTestRunner.java:43)
at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
at org.junit.runner.JUnitCore.run(JUnitCore.java:115)
at
org.ops4j.pax.exam.invoker.junit.internal.JUnitProbeInvoker.invokeViaJUnit(JUnitProbeInvoker.java:124)
at
org.ops4j.pax.exam.invoker.junit.internal.JUnitProbeInvoker.findAndInvoke(JUnitProbeInvoker.java:97)
at
org.ops4j.pax.exam.invoker.junit.internal.JUnitProbeInvoker.call(JUnitProbeInvoker.java:73)
at
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
at
java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.base/java.lang.reflect.Method.invoke(Method.java:568)
at
org.ops4j.pax.exam.rbc.internal.RemoteBundleContextImpl.remoteCall(RemoteBundleContextImpl.java:92)
at
Re: [PR] Add camel-base64 integration test [camel-karaf]
stataru8 commented on code in PR #417:
URL: https://github.com/apache/camel-karaf/pull/417#discussion_r1670855311
##
tests/camel-integration-test/src/main/java/org/apache/karaf/camel/itests/AbstractCamelRouteWithBundleITest.java:
##
@@ -41,7 +43,8 @@ protected List installRequiredBundles() throws
Exception {
throw new IllegalArgumentException("The system property
project.version must be set to the version of the " +
"test bundle to install or the method getTestBundleVersion
must be overridden to provide the version");
}
-installBundle("file://%s/%s-%s.jar".formatted(getBaseDir(),
testBundleName, testBundleVersion), true);
+Path bundlePath = Paths.get("%s/%s-%s.jar".formatted(getBaseDir(),
testBundleName, testBundleVersion));
+installBundle(bundlePath.toUri().toString(), true);
Review Comment:
Before the changes I wasn't able to run some integration tests, for
instance, camel-weather:
[ERROR] org.apache.karaf.camel.itest.CamelWeatherITest.testResultMock --
Time elapsed: 16.89 s <<< ERROR!
org.osgi.framework.BundleException: Unable to cache bundle:
file://C:\Users\stataru\Documents\gitTalend\camel-karaf\tests\features\camel-weather\target/camel-weather-test-4.6
.0-SNAPSHOT.jar
at org.apache.felix.framework.Felix.installBundle(Felix.java:3258)
at
org.apache.felix.framework.BundleContextImpl.installBundle(BundleContextImpl.java:147)
at
org.apache.felix.framework.BundleContextImpl.installBundle(BundleContextImpl.java:120)
at
org.apache.karaf.itests.KarafTestSupport.installBundle(KarafTestSupport.java:772)
at
org.apache.karaf.camel.itests.AbstractCamelRouteWithBundleITest.installRequiredBundles(AbstractCamelRouteWithBundleITest.java:44)
at
org.apache.karaf.camel.itests.AbstractCamelRouteITest.init(AbstractCamelRouteITest.java:215)
at
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
at
java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.base/java.lang.reflect.Method.invoke(Method.java:568)
at
org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
at
org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
at
org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
at
org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:24)
at
org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
at org.junit.rules.TestWatcher$1.evaluate(TestWatcher.java:55)
at
org.apache.karaf.itests.KarafTestSupport$Retry$1.evaluate(KarafTestSupport.java:160)
at org.junit.rules.RunRules.evaluate(RunRules.java:20)
at
org.ops4j.pax.exam.invoker.junit.internal.ContainerTestRunner.runLeafWithRetry(ContainerTestRunner.java:97)
at
org.ops4j.pax.exam.invoker.junit.internal.ContainerTestRunner.runChildWithRetry(ContainerTestRunner.java:84)
at
org.ops4j.pax.exam.invoker.junit.internal.ContainerTestRunner.runChild(ContainerTestRunner.java:75)
at
org.ops4j.pax.exam.invoker.junit.internal.ContainerTestRunner.runChild(ContainerTestRunner.java:43)
at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
at org.junit.runner.JUnitCore.run(JUnitCore.java:115)
at
org.ops4j.pax.exam.invoker.junit.internal.JUnitProbeInvoker.invokeViaJUnit(JUnitProbeInvoker.java:124)
at
org.ops4j.pax.exam.invoker.junit.internal.JUnitProbeInvoker.findAndInvoke(JUnitProbeInvoker.java:97)
at
org.ops4j.pax.exam.invoker.junit.internal.JUnitProbeInvoker.call(JUnitProbeInvoker.java:73)
at
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
at
java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.base/java.lang.reflect.Method.invoke(Method.java:568)
at
org.ops4j.pax.exam.rbc.internal.RemoteBundleContextImpl.remoteCall(RemoteBundleContextImpl.java:92)
at
Re: [PR] Add camel-base64 integration test [camel-karaf]
f2par0 commented on code in PR #417:
URL: https://github.com/apache/camel-karaf/pull/417#discussion_r1670833456
##
tests/camel-integration-test/src/main/java/org/apache/karaf/camel/itests/AbstractCamelRouteWithBundleITest.java:
##
@@ -41,7 +43,8 @@ protected List installRequiredBundles() throws
Exception {
throw new IllegalArgumentException("The system property
project.version must be set to the version of the " +
"test bundle to install or the method getTestBundleVersion
must be overridden to provide the version");
}
-installBundle("file://%s/%s-%s.jar".formatted(getBaseDir(),
testBundleName, testBundleVersion), true);
+Path bundlePath = Paths.get("%s/%s-%s.jar".formatted(getBaseDir(),
testBundleName, testBundleVersion));
+installBundle(bundlePath.toUri().toString(), true);
Review Comment:
is there a behavior changed with this modification ?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
(camel) branch kafka-console updated (2278d78e660 -> 224b4d46b17)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch kafka-console
in repository https://gitbox.apache.org/repos/asf/camel.git
from 2278d78e660 CAMEL-20956: camel-kafka - Add dev console and jbang
command
add 224b4d46b17 CAMEL-20956: camel-kafka - Add dev console and jbang
command
No new revisions were added by this update.
Summary of changes:
.../generated/resources/org/apache/camel/catalog/dev-consoles.properties | 1 +
.../resources/org/apache/camel/catalog/dev-consoles}/kafka.json | 0
2 files changed, 1 insertion(+)
copy
{components/camel-kafka/src/generated/resources/META-INF/org/apache/camel/dev-console
=>
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dev-consoles}/kafka.json
(100%)
Re: [PR] Add camel-barcode integration test [camel-karaf]
essobedo commented on code in PR #415:
URL: https://github.com/apache/camel-karaf/pull/415#discussion_r1670742855
##
tests/features/camel-barcode/src/main/java/org/apache/karaf/camel/test/CamelBarcodeRouteSupplier.java:
##
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.karaf.camel.test;
+
+import static org.apache.camel.builder.Builder.constant;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Path;
+import java.util.function.Function;
+
+import javax.imageio.ImageIO;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.dataformat.barcode.BarcodeDataFormat;
+import org.apache.camel.dataformat.barcode.BarcodeImageType;
+import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.spi.DataFormat;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.BinaryBitmap;
+import com.google.zxing.client.j2se.BufferedImageLuminanceSource;
+import com.google.zxing.client.j2se.MatrixToImageWriter;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.common.HybridBinarizer;
+
+@Component(
+name = "karaf-camel-barcode-test",
+immediate = true,
+service = CamelBarcodeRouteSupplier.class
+)
+public class CamelBarcodeRouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
+
+@Override
+protected Function consumerRoute() {
+
+try (DataFormat code1 = new BarcodeDataFormat(200, 200,
BarcodeImageType.PNG, BarcodeFormat.CODE_39)) {
+return builder -> builder.from("timer://testTimer?repeatCount=1")
+.setBody(constant("OK"))
+.marshal(code1)
+.process(new Processor() {
+@Override
+public void process(Exchange exchange) throws
Exception {
+InputStream bis =
exchange.getIn().getBody(InputStream.class);
+BinaryBitmap bitmap =
+new BinaryBitmap(new HybridBinarizer(new
BufferedImageLuminanceSource(ImageIO.read(bis;
+BitMatrix blackMatrix = bitmap.getBlackMatrix();
+blackMatrix.rotate180();
+File file =
Path.of(System.getProperty("barcode.image")).toFile();
+FileOutputStream outputStream = new
FileOutputStream(file);
Review Comment:
We need to add a try-with-resources statement to close properly the file
##
tests/features/camel-barcode/src/test/java/org/apache/karaf/camel/itest/CamelBarcodeITest.java:
##
@@ -0,0 +1,55 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.karaf.camel.itest;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.apache.camel.component.mock.MockEndpoint;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteITest;
+import org.apache.karaf.camel.itests.CamelKarafTestHint;
+import org.apache.karaf.camel.itests.PaxExamWithExternalResource;
+import org.apache.karaf.camel.itests.TemporaryFile;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
+
Re: [PR] Add maven archetype for integration tests [camel-karaf]
essobedo merged PR #409: URL: https://github.com/apache/camel-karaf/pull/409 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Create a maven archetype to initialize test features [camel-karaf]
essobedo closed issue #408: Create a maven archetype to initialize test features URL: https://github.com/apache/camel-karaf/issues/408 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-karaf) branch main updated: Ref #408: Add maven archetype for integration tests (#409)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new d1c094d6 Ref #408: Add maven archetype for integration tests (#409)
d1c094d6 is described below
commit d1c094d6e932cf2c6dcedcd52d6fc38deee7f4cd
Author: François de Parscau <116000379+f2p...@users.noreply.github.com>
AuthorDate: Tue Jul 9 17:28:21 2024 +0200
Ref #408: Add maven archetype for integration tests (#409)
---
.../camel-karaf-test-feature-archetype/README.md | 17 +++
.../pom.xml| 33 +++--
.../META-INF/maven/archetype-metadata.xml | 43 +
.../main/resources/archetype-resources}/pom.xml| 27 ---
.../test/Camel__featureName__RouteSupplier.java| 54 ++
.../test/java/itest/Camel__featureName__ITest.java | 46 ++
tooling/pom.xml| 1 +
7 files changed, 189 insertions(+), 32 deletions(-)
diff --git a/tooling/camel-karaf-test-feature-archetype/README.md
b/tooling/camel-karaf-test-feature-archetype/README.md
new file mode 100644
index ..6a57aa05
--- /dev/null
+++ b/tooling/camel-karaf-test-feature-archetype/README.md
@@ -0,0 +1,17 @@
+# Apache Camel Karaf Integration Test Archetype
+
+### Introduction
+
+This archetype is to initialize a maven project to write an integration test
for a Camel Karaf feature using the
+framework provided by `org.apache.camel.karaf:camel-integration-test`.
+
+### Usage
+
+This tool is using maven archetype:generate plugin, for instance, to
+initialize an integration test for the component camel-atom, go to
`camel-karaf/tests/features/`, then run
+
+```shell
+mvn archetype:generate -DfeatureName=Atom
-DarchetypeGroupId=org.apache.camel.karaf
-DarchetypeArtifactId=camel-karaf-test-feature-archetype
-DarchetypeVersion=4.6.0-SNAPSHOT
+```
+
+Then rename the directory `camel-atom-test` to `camel-atom`, adapt the file
`pom.xml`, and finally fill in the supplier class and integration test.
diff --git a/tooling/pom.xml
b/tooling/camel-karaf-test-feature-archetype/pom.xml
similarity index 54%
copy from tooling/pom.xml
copy to tooling/camel-karaf-test-feature-archetype/pom.xml
index 23fc96d6..4c88b111 100644
--- a/tooling/pom.xml
+++ b/tooling/camel-karaf-test-feature-archetype/pom.xml
@@ -1,3 +1,4 @@
+
-http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd;>
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
4.0.0
-
org.apache.camel.karaf
-camel-karaf
+tooling
4.6.0-SNAPSHOT
-
-tooling
-pom
-Apache Camel :: Karaf :: Tooling
+
+camel-karaf-test-feature-archetype
+Apache Camel :: Karaf :: Tooling :: Integration Test Archetype
-3.9.8
+3.2.1
-
-camel-karaf-feature-maven-plugin
-camel-karaf-maven-plugin-integration-test
-camel-upgrade
-
-
+
+
+
+org.apache.maven.archetype
+archetype-packaging
+${maven-archetype-version}
+
+
+
+
\ No newline at end of file
diff --git
a/tooling/camel-karaf-test-feature-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
b/tooling/camel-karaf-test-feature-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
new file mode 100644
index ..586b703b
--- /dev/null
+++
b/tooling/camel-karaf-test-feature-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -0,0 +1,43 @@
+
+
+http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.1.0;>
+
+
+
+${featureName.toLowerCase()}
+
+
+org.apache.karaf.camel
+
+
+camel-${featureNameLower}-test
+
+
+4.6.0-SNAPSHOT
+
+
+
+
+src/main/java
+
+
+src/test/java
+
+
+
\ No newline at end of file
diff --git a/tooling/pom.xml
b/tooling/camel-karaf-test-feature-archetype/src/main/resources/archetype-resources/pom.xml
similarity index 56%
copy from tooling/pom.xml
copy to
tooling/camel-karaf-test-feature-archetype/src/main/resources/archetype-resources/pom.xml
index 23fc96d6..470dc6a2 100644
--- a/tooling/pom.xml
+++
b/tooling/camel-karaf-test-feature-archetype/src/main/resources/archetype-resources/pom.xml
@@ -1,4 +1,6 @@
+
-http://maven.apache.org/POM/4.0.0;
(camel) branch kafka-console updated (d508e620871 -> 2278d78e660)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch kafka-console in repository https://gitbox.apache.org/repos/asf/camel.git from d508e620871 CAMEL-20956: camel-kafka - Add dev console and jbang command add 2278d78e660 CAMEL-20956: camel-kafka - Add dev console and jbang command No new revisions were added by this update. Summary of changes: .../org/apache/camel/component/kafka/KafkaDevConsole.java | 7 ++- .../org/apache/camel/component/kafka/KafkaFetchRecords.java | 6 +++--- .../camel/dsl/jbang/core/commands/process/ListKafka.java| 13 - 3 files changed, 21 insertions(+), 5 deletions(-)
(camel) branch kafka-console updated (93e35f16f28 -> d508e620871)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch kafka-console in repository https://gitbox.apache.org/repos/asf/camel.git from 93e35f16f28 CAMEL-20956: camel-kafka - Add dev console and jbang command add d508e620871 CAMEL-20956: camel-kafka - Add dev console and jbang command No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/camel/component/kafka/KafkaDevConsole.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch kafka-console updated (12ab5a75c4f -> 93e35f16f28)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch kafka-console in repository https://gitbox.apache.org/repos/asf/camel.git from 12ab5a75c4f CAMEL-20956: camel-kafka - Add dev console and jbang command add 93e35f16f28 CAMEL-20956: camel-kafka - Add dev console and jbang command No new revisions were added by this update. Summary of changes: .../camel/component/kafka/consumer/support/ProcessingResult.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
(camel) branch kafka-console updated (9efff91135e -> 12ab5a75c4f)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch kafka-console in repository https://gitbox.apache.org/repos/asf/camel.git from 9efff91135e CAMEL-20956: camel-kafka - Add dev console and jbang command add 12ab5a75c4f CAMEL-20956: camel-kafka - Add dev console and jbang command No new revisions were added by this update. Summary of changes: .../org/apache/camel/component/kafka/KafkaFetchRecords.java | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-)
(camel) 03/03: CAMEL-20956: camel-kafka - Add dev console and jbang command
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch kafka-console
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9efff91135eaa0ca30f7dd5b873d1a2bb2e583a9
Author: Claus Ibsen
AuthorDate: Tue Jul 9 15:20:21 2024 +0200
CAMEL-20956: camel-kafka - Add dev console and jbang command
---
.../camel/component/kafka/KafkaDevConsole.java | 61
.../camel/component/kafka/KafkaFetchRecords.java | 57 +--
.../camel/cli/connector/LocalCliConnector.java | 14
.../dsl/jbang/core/commands/process/ListKafka.java | 83 +-
.../core/commands/process/ProcessWatchCommand.java | 6 +-
5 files changed, 214 insertions(+), 7 deletions(-)
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaDevConsole.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaDevConsole.java
index 0bbbac18b97..a0fb775759a 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaDevConsole.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaDevConsole.java
@@ -19,22 +19,39 @@ package org.apache.camel.component.kafka;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
import org.apache.camel.Route;
import org.apache.camel.spi.annotations.DevConsole;
import org.apache.camel.support.console.AbstractDevConsole;
+import org.apache.camel.util.StopWatch;
import org.apache.camel.util.json.JsonArray;
import org.apache.camel.util.json.JsonObject;
+import
org.apache.kafka.shaded.io.opentelemetry.proto.collector.logs.v1.LogsServiceGrpc;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@DevConsole(name = "kafka", displayName = "Kafka", description = "Apache
Kafka")
public class KafkaDevConsole extends AbstractDevConsole {
+private static final Logger LOG =
LoggerFactory.getLogger(KafkaDevConsole.class);
+
+private static final long COMMITTED_TIMEOUT = 1;
+
+/**
+ * Whether to include committed offset (sync operation to Kafka broker)
+ */
+public static final String COMMITTED = "committed";
+
public KafkaDevConsole() {
super("camel", "kafka", "Kafka", "Apache Kafka");
}
@Override
protected String doCallText(Map options) {
+final boolean committed =
"true".equals(options.getOrDefault(COMMITTED, "false"));
+
StringBuilder sb = new StringBuilder();
for (Route route : getCamelContext().getRoutes()) {
if (route.getConsumer() instanceof KafkaConsumer kc) {
@@ -58,6 +75,16 @@ public class KafkaDevConsole extends AbstractDevConsole {
sb.append(String.format("\nLast Partition:
%d", t.getLastRecord().partition()));
sb.append(String.format("\nLast Offset: %d",
t.getLastRecord().offset()));
}
+if (committed) {
+List l =
fetchCommitOffsets(kc, t);
+if (l != null) {
+for (KafkaFetchRecords.KafkaTopicPosition r : l) {
+sb.append(String.format("\nCommit
Topic: %s", r.topic()));
+sb.append(String.format("\nCommit
Partition: %s", r.partition()));
+sb.append(String.format("\nCommit
Offset: %s", r.offset()));
+}
+}
+}
}
sb.append("\n");
}
@@ -66,8 +93,26 @@ public class KafkaDevConsole extends AbstractDevConsole {
return sb.toString();
}
+private static List
fetchCommitOffsets(KafkaConsumer kc, KafkaFetchRecords task) {
+StopWatch watch = new StopWatch();
+
+CountDownLatch latch = task.fetchCommitRecords();
+long timeout =
Math.min(kc.getEndpoint().getConfiguration().getPollTimeoutMs(),
COMMITTED_TIMEOUT);
+try {
+latch.await(timeout, TimeUnit.MILLISECONDS);
+var answer = task.getCommitRecords();
+LOG.info("Fetching commit offsets took: {} ms", watch.taken());
+return answer;
+} catch (Exception e) {
+// ignore
+}
+return null;
+}
+
@Override
protected Map doCallJson(Map options) {
+final boolean committed =
"true".equals(options.getOrDefault(COMMITTED, "false"));
+
JsonObject root = new JsonObject();
List list = new ArrayList<>();
@@ -102,6 +147,22 @@ public class KafkaDevConsole extends AbstractDevConsole {
wo.put("lastPartition", t.getLastRecord().partition());
wo.put("lastOffset", t.getLastRecord().offset());
}
+
(camel) 02/03: CAMEL-20956: camel-kafka - Add dev console and jbang command
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch kafka-console
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c9e2aba93abd0c21ac19d3726495a85aabb4538c
Author: Claus Ibsen
AuthorDate: Tue Jul 9 12:41:38 2024 +0200
CAMEL-20956: camel-kafka - Add dev console and jbang command
---
.../camel/component/kafka/KafkaDevConsole.java | 5 -
.../camel/cli/connector/LocalCliConnector.java | 7 +
.../dsl/jbang/core/commands/CamelJBangMain.java| 1 +
.../dsl/jbang/core/commands/process/ListKafka.java | 223 +
4 files changed, 231 insertions(+), 5 deletions(-)
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaDevConsole.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaDevConsole.java
index 86631f915ac..0bbbac18b97 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaDevConsole.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaDevConsole.java
@@ -40,9 +40,6 @@ public class KafkaDevConsole extends AbstractDevConsole {
if (route.getConsumer() instanceof KafkaConsumer kc) {
sb.append(String.format("\nRoute Id: %s",
route.getRouteId()));
sb.append(String.format("\nFrom: %s",
route.getEndpoint().getEndpointUri()));
-sb.append(
-String.format("\nState: %s",
getCamelContext().getRouteController().getRouteStatus(route.getId(;
-sb.append(String.format("\nUptime: %s",
route.getUptime()));
for (KafkaFetchRecords t : kc.tasks()) {
sb.append(String.format("\nWorked Thread: %s",
t.getThreadId()));
sb.append(String.format("\nWorker State: %s",
t.getState()));
@@ -81,8 +78,6 @@ public class KafkaDevConsole extends AbstractDevConsole {
JsonObject jo = new JsonObject();
jo.put("routeId", route.getRouteId());
jo.put("uri", route.getEndpoint().getEndpointUri());
-jo.put("state",
getCamelContext().getRouteController().getRouteStatus(route.getId()));
-jo.put("uptime", route.getUptime());
JsonArray arr = new JsonArray();
jo.put("workers", arr);
diff --git
a/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java
b/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java
index d230f7fd06e..df0d35ad9d1 100644
---
a/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java
+++
b/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java
@@ -1016,6 +1016,13 @@ public class LocalCliConnector extends ServiceSupport
implements CliConnector, C
root.put("rests", json);
}
}
+DevConsole dc20 = dcr.resolveById("kafka");
+if (dc20 != null) {
+JsonObject json = (JsonObject)
dc20.call(DevConsole.MediaType.JSON);
+if (json != null && !json.isEmpty()) {
+root.put("kafka", json);
+}
+}
}
// various details
JsonObject mem = collectMemory();
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
index d39848eee04..8b74f5f5e93 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
@@ -102,6 +102,7 @@ public class CamelJBangMain implements Callable {
.addSubcommand("service", new CommandLine(new
ListService(main)))
.addSubcommand("rest", new CommandLine(new
ListRest(main)))
.addSubcommand("platform-http", new CommandLine(new
ListPlatformHttp(main)))
+.addSubcommand("kafka", new CommandLine(new
ListKafka(main)))
.addSubcommand("source", new CommandLine(new
CamelSourceAction(main)))
.addSubcommand("route-dump", new CommandLine(new
CamelRouteDumpAction(main)))
.addSubcommand("startup-recorder", new CommandLine(new
CamelStartupRecorderAction(main)))
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListKafka.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListKafka.java
Re: [PR] Kafka dev console and jbang command [camel]
github-actions[bot] commented on PR #14768: URL: https://github.com/apache/camel/pull/14768#issuecomment-2217966293 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) 01/03: CAMEL-20956: camel-kafka - Add dev console
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch kafka-console
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d88937d3f01221a9f9d41339a32161e2db242f96
Author: Claus Ibsen
AuthorDate: Tue Jul 9 12:09:15 2024 +0200
CAMEL-20956: camel-kafka - Add dev console
---
components/camel-kafka/pom.xml | 4 +
.../org/apache/camel/dev-console/kafka.json| 15 +++
.../services/org/apache/camel/dev-console/kafka| 2 +
.../org/apache/camel/dev-consoles.properties | 7 ++
.../camel/component/kafka/KafkaConsumer.java | 5 +
.../camel/component/kafka/KafkaDevConsole.java | 117 +
.../camel/component/kafka/KafkaFetchRecords.java | 47 -
.../component/kafka/consumer/CommitManager.java| 1 -
.../support/KafkaRecordProcessorFacade.java| 2 +-
.../kafka/consumer/support/ProcessingResult.java | 31 +-
.../kafka/consumer/support/TopicHelper.java| 3 +-
.../batching/KafkaRecordBatchingProcessor.java | 1 -
.../support/classic/ClassicRebalanceListener.java | 2 +-
.../classic/PartitionAssignmentAdapter.java| 3 +
.../support/resume/ResumeRebalanceListener.java| 2 +-
.../streaming/KafkaRecordStreamingProcessor.java | 7 +-
.../subcription/DefaultSubscribeAdapter.java | 2 +-
.../support/subcription/SubscribeAdapter.java | 2 +-
18 files changed, 238 insertions(+), 15 deletions(-)
diff --git a/components/camel-kafka/pom.xml b/components/camel-kafka/pom.xml
index 55b8986d86a..e64ee2bd4e6 100644
--- a/components/camel-kafka/pom.xml
+++ b/components/camel-kafka/pom.xml
@@ -42,6 +42,10 @@
org.apache.camel
camel-health
+
+org.apache.camel
+camel-console
+
diff --git
a/components/camel-kafka/src/generated/resources/META-INF/org/apache/camel/dev-console/kafka.json
b/components/camel-kafka/src/generated/resources/META-INF/org/apache/camel/dev-console/kafka.json
new file mode 100644
index 000..55e93212a3c
--- /dev/null
+++
b/components/camel-kafka/src/generated/resources/META-INF/org/apache/camel/dev-console/kafka.json
@@ -0,0 +1,15 @@
+{
+ "console": {
+"kind": "console",
+"group": "camel",
+"name": "kafka",
+"title": "Kafka",
+"description": "Apache Kafka",
+"deprecated": false,
+"javaType": "org.apache.camel.component.kafka.KafkaDevConsole",
+"groupId": "org.apache.camel",
+"artifactId": "camel-kafka",
+"version": "4.7.0-SNAPSHOT"
+ }
+}
+
diff --git
a/components/camel-kafka/src/generated/resources/META-INF/services/org/apache/camel/dev-console/kafka
b/components/camel-kafka/src/generated/resources/META-INF/services/org/apache/camel/dev-console/kafka
new file mode 100644
index 000..975921645c6
--- /dev/null
+++
b/components/camel-kafka/src/generated/resources/META-INF/services/org/apache/camel/dev-console/kafka
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.kafka.KafkaDevConsole
diff --git
a/components/camel-kafka/src/generated/resources/META-INF/services/org/apache/camel/dev-consoles.properties
b/components/camel-kafka/src/generated/resources/META-INF/services/org/apache/camel/dev-consoles.properties
new file mode 100644
index 000..3f7bbe40841
--- /dev/null
+++
b/components/camel-kafka/src/generated/resources/META-INF/services/org/apache/camel/dev-consoles.properties
@@ -0,0 +1,7 @@
+# Generated by camel build tools - do NOT edit this file!
+dev-consoles=kafka
+groupId=org.apache.camel
+artifactId=camel-kafka
+version=4.7.0-SNAPSHOT
+projectName=Camel :: Kafka
+projectDescription=Camel Kafka support
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
index f0c75bd3eb6..9ea0e1502ca 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.kafka;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Properties;
import java.util.UUID;
@@ -256,6 +257,10 @@ public class KafkaConsumer extends DefaultConsumer
return tasks.stream().allMatch(KafkaFetchRecords::isPaused);
}
+protected List tasks() {
+return Collections.unmodifiableList(tasks);
+}
+
@Override
public String adapterFactoryService() {
return "kafka-adapter-factory";
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaDevConsole.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaDevConsole.java
new file mode
[PR] Kafka dev console and jbang command [camel]
davsclaus opened a new pull request, #14768: URL: https://github.com/apache/camel/pull/14768 # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch kafka-console created (now 9efff91135e)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch kafka-console in repository https://gitbox.apache.org/repos/asf/camel.git at 9efff91135e CAMEL-20956: camel-kafka - Add dev console and jbang command This branch includes the following new commits: new d88937d3f01 CAMEL-20956: camel-kafka - Add dev console new c9e2aba93ab CAMEL-20956: camel-kafka - Add dev console and jbang command new 9efff91135e CAMEL-20956: camel-kafka - Add dev console and jbang command The 3 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.
Re: [PR] Add camel-barcode integration test [camel-karaf]
f2par0 commented on code in PR #415:
URL: https://github.com/apache/camel-karaf/pull/415#discussion_r1670678590
##
tests/features/camel-barcode/src/main/java/org/apache/karaf/camel/test/CamelBarcodeRouteSupplier.java:
##
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.karaf.camel.test;
+
+import static org.apache.camel.builder.Builder.constant;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.function.Function;
+
+import javax.imageio.ImageIO;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.dataformat.barcode.BarcodeDataFormat;
+import org.apache.camel.dataformat.barcode.BarcodeImageType;
+import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.spi.DataFormat;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.BinaryBitmap;
+import com.google.zxing.client.j2se.BufferedImageLuminanceSource;
+import com.google.zxing.client.j2se.MatrixToImageWriter;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.common.HybridBinarizer;
+
+@Component(
+name = "karaf-camel-barcode-test",
+immediate = true,
+service = CamelBarcodeRouteSupplier.class
+)
+public class CamelBarcodeRouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
+
+@Override
+protected Function consumerRoute() {
+
+try (DataFormat code1 = new BarcodeDataFormat(200, 200,
BarcodeImageType.PNG, BarcodeFormat.CODE_39)) {
+final Path testDirectory = Files.createTempFile("barcode", ".png");
Review Comment:
Yes, it's better because I can add assertion on the file size in the Itest
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] Add camel-barcode integration test [camel-karaf]
essobedo commented on code in PR #415:
URL: https://github.com/apache/camel-karaf/pull/415#discussion_r1670639730
##
tests/features/camel-barcode/src/main/java/org/apache/karaf/camel/test/CamelBarcodeRouteSupplier.java:
##
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.karaf.camel.test;
+
+import static org.apache.camel.builder.Builder.constant;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.function.Function;
+
+import javax.imageio.ImageIO;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.dataformat.barcode.BarcodeDataFormat;
+import org.apache.camel.dataformat.barcode.BarcodeImageType;
+import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.spi.DataFormat;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.BinaryBitmap;
+import com.google.zxing.client.j2se.BufferedImageLuminanceSource;
+import com.google.zxing.client.j2se.MatrixToImageWriter;
+import com.google.zxing.common.BitMatrix;
+import com.google.zxing.common.HybridBinarizer;
+
+@Component(
+name = "karaf-camel-barcode-test",
+immediate = true,
+service = CamelBarcodeRouteSupplier.class
+)
+public class CamelBarcodeRouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
+
+@Override
+protected Function consumerRoute() {
+
+try (DataFormat code1 = new BarcodeDataFormat(200, 200,
BarcodeImageType.PNG, BarcodeFormat.CODE_39)) {
+final Path testDirectory = Files.createTempFile("barcode", ".png");
Review Comment:
Please use a
[TemporaryFile](https://github.com/apache/camel-karaf/blob/main/tests/camel-integration-test/src/main/java/org/apache/karaf/camel/itests/TemporaryFile.java)
instead
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
(camel-karaf) branch main updated: Ref #410: Add camel-atom integration-test (#411)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new efdad808 Ref #410: Add camel-atom integration-test (#411)
efdad808 is described below
commit efdad808a1db2a2d7d938ed00584cb0417f18acd
Author: François de Parscau <116000379+f2p...@users.noreply.github.com>
AuthorDate: Tue Jul 9 16:28:48 2024 +0200
Ref #410: Add camel-atom integration-test (#411)
---
tests/features/camel-atom/pom.xml | 40 +++
.../karaf/camel/test/CamelAtomRouteSupplier.java | 43 +++
.../apache/karaf/camel/itest/CamelAtomITest.java | 66 +
.../camel-atom/src/test/resources/data/feed.atom | 316 +
tests/features/pom.xml | 3 +-
5 files changed, 467 insertions(+), 1 deletion(-)
diff --git a/tests/features/camel-atom/pom.xml
b/tests/features/camel-atom/pom.xml
new file mode 100644
index ..05562c0c
--- /dev/null
+++ b/tests/features/camel-atom/pom.xml
@@ -0,0 +1,40 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.karaf
+camel-karaf-features-test
+4.6.0-SNAPSHOT
+
+
+camel-atom-test
+Apache Camel :: Karaf :: Tests :: Features :: Atom
+
+
+
+org.apache.camel
+camel-atom
+${camel-version}
+
+
+
\ No newline at end of file
diff --git
a/tests/features/camel-atom/src/main/java/org/apache/karaf/camel/test/CamelAtomRouteSupplier.java
b/tests/features/camel-atom/src/main/java/org/apache/karaf/camel/test/CamelAtomRouteSupplier.java
new file mode 100644
index ..c146c7d2
--- /dev/null
+++
b/tests/features/camel-atom/src/main/java/org/apache/karaf/camel/test/CamelAtomRouteSupplier.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.karaf.camel.test;
+
+import java.util.function.Function;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.RouteDefinition;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+@Component(
+name = "karaf-camel-atom-test",
+immediate = true,
+service = CamelAtomRouteSupplier.class
+)
+public class CamelAtomRouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
+
+@Override
+protected Function consumerRoute() {
+return builder ->
+
builder.fromF("atom://file:%s/test-classes/data/feed.atom?delay=500",
System.getProperty("project.target"))
+.log("received message ${body}");
+}
+
+protected boolean producerEnabled() {
+return false;
+}
+}
+
diff --git
a/tests/features/camel-atom/src/test/java/org/apache/karaf/camel/itest/CamelAtomITest.java
b/tests/features/camel-atom/src/test/java/org/apache/karaf/camel/itest/CamelAtomITest.java
new file mode 100644
index ..1ad01eb1
--- /dev/null
+++
b/tests/features/camel-atom/src/test/java/org/apache/karaf/camel/itest/CamelAtomITest.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.karaf.camel.itest;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.List;
+
+import org.apache.camel.Exchange;
+import
Re: [I] Add camel-atom integration test [camel-karaf]
essobedo closed issue #410: Add camel-atom integration test URL: https://github.com/apache/camel-karaf/issues/410 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Add camel-atom integration-test [camel-karaf]
essobedo merged PR #411: URL: https://github.com/apache/camel-karaf/pull/411 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Add maven archetype for integration tests [camel-karaf]
essobedo commented on code in PR #409: URL: https://github.com/apache/camel-karaf/pull/409#discussion_r1670631233 ## tooling/camel-karaf-test-feature-archetype/pom.xml: ## @@ -0,0 +1,45 @@ + + +http://maven.apache.org/POM/4.0.0; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> +4.0.0 + +org.apache.camel.karaf +tooling +4.6.0-SNAPSHOT + + +camel-karaf-test-feature-archetype Review Comment: Please also add a name -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Add maven archetype for integration tests [camel-karaf]
essobedo commented on code in PR #409: URL: https://github.com/apache/camel-karaf/pull/409#discussion_r1670628078 ## tooling/camel-karaf-test-feature-archetype/README.md: ## @@ -0,0 +1,17 @@ +# Apache Camel Karaf Archetype Review Comment: ```suggestion # Apache Camel Karaf Integration Test Archetype ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Add camel-barcode integration test [camel-karaf]
f2par0 opened a new pull request, #415: URL: https://github.com/apache/camel-karaf/pull/415 Fixes #414 camel-barcode integration test -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Extracion of crypto-pgp and making crypto work on FIPS [camel-quarkus]
ppalaga commented on code in PR #6241:
URL: https://github.com/apache/camel-quarkus/pull/6241#discussion_r1670565370
##
extensions-support/bouncycastle/runtime/src/main/java/org/apache/camel/quarkus/support/bouncycastle/BouncyCastleRecorder.java:
##
@@ -35,11 +34,28 @@ public class BouncyCastleRecorder {
public void registerBouncyCastleProvider(List
cipherTransformations, ShutdownContext shutdownContext) {
Provider provider =
Security.getProvider(SecurityProviderUtils.BOUNCYCASTLE_PROVIDER_NAME);
+if (provider == null) {
+provider =
Security.getProvider(SecurityProviderUtils.BOUNCYCASTLE_FIPS_PROVIDER_NAME);
+}
if (provider == null) {
// TODO: Fix BuildStep execution order so that this is not required
// https://github.com/apache/camel-quarkus/issues/3472
-provider = new BouncyCastleProvider();
-Security.addProvider(provider);
+try {
+provider = (Provider)
Thread.currentThread().getContextClassLoader()
+
.loadClass(SecurityProviderUtils.BOUNCYCASTLE_PROVIDER_CLASS_NAME).getConstructor().newInstance();
+Security.addProvider(provider);
+} catch (Exception e) {
Review Comment:
> My idea is that any failure would cause RuntimeException with the message
`Neither BC nor BCFIPS provider can be registered` + exception message. Which
is correct also with i.e, NPE
Yeah, that's what the code currently does. My question is whether "any
failure" including NPEs inside the try block should be caught. If we want to
detect the availability of bcprov/bcfips by loading some of its classes, then
we should catch only exceptions related to classloading. Other exceptions
which may signal other unrelated error conditions in the code should IMO be
left uncaught so that users see the real issue including the stack trace. Note
that the stack traces of both exceptions are lost with the current
implementation. That's IMO fine for the classloading exceptions (because those
are kinda expected) but not fine for everything else.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] Add maven archetype for integration tests [camel-karaf]
f2par0 commented on code in PR #409: URL: https://github.com/apache/camel-karaf/pull/409#discussion_r1670547982 ## tooling/camel-karaf-test-feature-archetype/README.md: ## @@ -0,0 +1,17 @@ +# Apache Camel Karaf Archetype + +### Introduction + +This archetype is to initialize a maven project to test a camel-feature inside karaf using the +org.apache.camel.karaf:camel-integration-test Review Comment: it's the name of the maven artifact containing the code of the test framework, I rephrased it -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Add camel-atom integration-test [camel-karaf]
f2par0 commented on code in PR #411: URL: https://github.com/apache/camel-karaf/pull/411#discussion_r1670523296 ## tests/features/camel-atom/src/test/java/org/apache/karaf/camel/itest/CamelAtomITest.java: ## @@ -0,0 +1,68 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.karaf.camel.itest; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import java.util.List; + +import org.apache.camel.Exchange; +import org.apache.camel.component.mock.MockEndpoint; +import org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteITest; +import org.apache.karaf.camel.itests.CamelKarafTestHint; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.ops4j.pax.exam.junit.PaxExam; +import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; +import org.ops4j.pax.exam.spi.reactors.PerClass; + +import com.apptasticsoftware.rssreader.Item; + +@CamelKarafTestHint Review Comment: no, fixed -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Add camel-avro integration-test [camel-karaf]
f2par0 opened a new pull request, #413: URL: https://github.com/apache/camel-karaf/pull/413 Fixes #412 camel-avro integration-test -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[I] add the hability to set Jib registryMirrors [camel-k]
mcarbonneaux opened a new issue, #5691: URL: https://github.com/apache/camel-k/issues/5691 ### Requirement hability to set registryMirrors in maven jib plugin to abel to download image from mirror. ### Problem actualy you need to set proxy setting if camel-k is not connected to internet, event that, is you pull to much on repository like docker hub you take pull rate error... usualy you use repository mirror like "distibution" or "gohabor" to avoid that... you can easily do that on kubernetes, but when camel build they use docker less method in docker to do that and not k8s mecanisme... ### Proposal adding options in install phase to map file like maven settings (in config map) for jib json config file: https://github.com/GoogleContainerTools/jib/tree/master/jib-maven-plugin#global-jib-configuration ### Open questions _No response_ -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Extracion of crypto-pgp and making crypto work on FIPS [camel-quarkus]
JiriOndrusek commented on code in PR #6241:
URL: https://github.com/apache/camel-quarkus/pull/6241#discussion_r1670431880
##
extensions-support/bouncycastle/runtime/src/main/java/org/apache/camel/quarkus/support/bouncycastle/BouncyCastleRecorder.java:
##
@@ -35,11 +34,28 @@ public class BouncyCastleRecorder {
public void registerBouncyCastleProvider(List
cipherTransformations, ShutdownContext shutdownContext) {
Provider provider =
Security.getProvider(SecurityProviderUtils.BOUNCYCASTLE_PROVIDER_NAME);
+if (provider == null) {
+provider =
Security.getProvider(SecurityProviderUtils.BOUNCYCASTLE_FIPS_PROVIDER_NAME);
+}
if (provider == null) {
// TODO: Fix BuildStep execution order so that this is not required
// https://github.com/apache/camel-quarkus/issues/3472
-provider = new BouncyCastleProvider();
-Security.addProvider(provider);
+try {
+provider = (Provider)
Thread.currentThread().getContextClassLoader()
+
.loadClass(SecurityProviderUtils.BOUNCYCASTLE_PROVIDER_CLASS_NAME).getConstructor().newInstance();
+Security.addProvider(provider);
+} catch (Exception e) {
Review Comment:
My idea is that any failure would cause RuntimeException with the message
`Neither BC nor BCFIPS provider can be registered` + exception message. Which
is correct also with i.e, NPE
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
(camel-quarkus) branch main updated: Remove prefix from shell code snippets
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 330583843f Remove prefix from shell code snippets 330583843f is described below commit 330583843f34f50d05afa7e2601c34d0250c7245 Author: James Netherton AuthorDate: Tue Jul 9 10:07:39 2024 +0100 Remove prefix from shell code snippets --- .../create-jvm-only-extension.adoc | 4 +- .../contributor-guide/create-new-example.adoc | 4 +- .../contributor-guide/create-new-extension.adoc| 6 +- .../contributor-guide/extension-metadata.adoc | 2 +- .../ROOT/pages/contributor-guide/index.adoc| 10 +- .../contributor-guide/promote-jvm-to-native.adoc | 10 +- .../pages/contributor-guide/release-guide.adoc | 165 ++--- .../ROOT/pages/reference/extensions/cxf-soap.adoc | 2 +- .../ROOT/pages/reference/extensions/jfr.adoc | 4 +- .../ROOT/pages/user-guide/command-mode.adoc| 9 +- .../modules/ROOT/pages/user-guide/first-steps.adoc | 30 ++-- .../cxf-soap/runtime/src/main/doc/usage.adoc | 2 +- extensions/jfr/runtime/src/main/doc/usage.adoc | 4 +- 13 files changed, 123 insertions(+), 129 deletions(-) diff --git a/docs/modules/ROOT/pages/contributor-guide/create-jvm-only-extension.adoc b/docs/modules/ROOT/pages/contributor-guide/create-jvm-only-extension.adoc index a9e8047342..150397ffb0 100644 --- a/docs/modules/ROOT/pages/contributor-guide/create-jvm-only-extension.adoc +++ b/docs/modules/ROOT/pages/contributor-guide/create-jvm-only-extension.adoc @@ -28,8 +28,8 @@ for the following: + [source,shell] -$ cd camel-quarkus -$ mvn cq:create -N -Dcq.artifactIdBase=foo-abc -Dcq.nativeSupported=false +cd camel-quarkus +mvn cq:create -N -Dcq.artifactIdBase=foo-abc -Dcq.nativeSupported=false + * A basic integration test is generated for you. It just checks that the newly added Camel component can be loaded. diff --git a/docs/modules/ROOT/pages/contributor-guide/create-new-example.adoc b/docs/modules/ROOT/pages/contributor-guide/create-new-example.adoc index 264b5b..701d7fe634 100644 --- a/docs/modules/ROOT/pages/contributor-guide/create-new-example.adoc +++ b/docs/modules/ROOT/pages/contributor-guide/create-new-example.adoc @@ -18,8 +18,8 @@ This guide outlines how to contribute a new example project to https://github.co + [source,shell] -$ cd camel-quarkus-examples -$ mvn org.l2x6.cq:cq-maven-plugin:create-example -Dcq.artifactIdBase="yaml-to-log" -Dcq.exampleName="YAML To Log" -Dcq.exampleDescription="Shows how to use a YAML route with the log EIP" +cd camel-quarkus-examples +mvn org.l2x6.cq:cq-maven-plugin:create-example -Dcq.artifactIdBase="yaml-to-log" -Dcq.exampleName="YAML To Log" -Dcq.exampleDescription="Shows how to use a YAML route with the log EIP" + Where: diff --git a/docs/modules/ROOT/pages/contributor-guide/create-new-extension.adoc b/docs/modules/ROOT/pages/contributor-guide/create-new-extension.adoc index 208ab6f79b..e2e8aa7049 100644 --- a/docs/modules/ROOT/pages/contributor-guide/create-new-extension.adoc +++ b/docs/modules/ROOT/pages/contributor-guide/create-new-extension.adoc @@ -18,8 +18,8 @@ + [source,shell] -$ cd camel-quarkus -$ mvn cq:create -N -Dcq.artifactIdBase=foo-abc +cd camel-quarkus +mvn cq:create -N -Dcq.artifactIdBase=foo-abc + where: @@ -80,7 +80,7 @@ Check the xref:contributor-guide/extension-metadata.adoc[Extension metadata] pag + [source,shell] -$ mvn process-resources -Pformat +mvn process-resources -Pformat + The above command will perform the following tasks: diff --git a/docs/modules/ROOT/pages/contributor-guide/extension-metadata.adoc b/docs/modules/ROOT/pages/contributor-guide/extension-metadata.adoc index 95f192b5d2..8f5fb391c7 100644 --- a/docs/modules/ROOT/pages/contributor-guide/extension-metadata.adoc +++ b/docs/modules/ROOT/pages/contributor-guide/extension-metadata.adoc @@ -23,7 +23,7 @@ the source tree: [source,shell] -$ mvn -N cq:update-quarkus-metadata +mvn -N cq:update-quarkus-metadata The data comes from the following diff --git a/docs/modules/ROOT/pages/contributor-guide/index.adoc b/docs/modules/ROOT/pages/contributor-guide/index.adoc index a57f6842c6..2d4d4539a0 100644 --- a/docs/modules/ROOT/pages/contributor-guide/index.adoc +++ b/docs/modules/ROOT/pages/contributor-guide/index.adoc @@ -21,29 +21,29 @@ Checkout the code [source,shell] -$ git clone https://github.com/apache/camel-quarkus.git -$ cd camel-quarkus +git clone https://github.com/apache/camel-quarkus.git +cd camel-quarkus A fast build without tests and various checks: [source,shell] -$ mvn clean install -Dquickly +mvn clean install -Dquickly A build with integration tests in the JVM mode only:
Re: [PR] Remove prefix from shell code snippets [camel-quarkus]
jamesnetherton merged PR #6262: URL: https://github.com/apache/camel-quarkus/pull/6262 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Initial recipes for migration to Camel 4.0 and 4.4 [camel-upgrade-recipes]
JiriOndrusek commented on PR #1: URL: https://github.com/apache/camel-upgrade-recipes/pull/1#issuecomment-2217525072 Perhaps some CI would be helpful. (to run the tests on the PR) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Upgrade recipes based on openrewrite [camel]
JiriOndrusek commented on PR #14587: URL: https://github.com/apache/camel/pull/14587#issuecomment-2217516728 Superseded by https://github.com/apache/camel-upgrade-recipes/pull/1 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Upgrade recipes based on openrewrite [camel]
JiriOndrusek closed pull request #14587: Upgrade recipes based on openrewrite URL: https://github.com/apache/camel/pull/14587 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Initial recipes for migration to Camel 4.0 and 4.4 [camel-upgrade-recipes]
JiriOndrusek commented on PR #1: URL: https://github.com/apache/camel-upgrade-recipes/pull/1#issuecomment-2217515497 FYI @oscerd @davsclaus -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Extracion of crypto-pgp and making crypto work on FIPS [camel-quarkus]
JiriOndrusek commented on code in PR #6241:
URL: https://github.com/apache/camel-quarkus/pull/6241#discussion_r1670432626
##
extensions-support/bouncycastle/runtime/src/main/java/org/apache/camel/quarkus/support/bouncycastle/BouncyCastleRecorder.java:
##
@@ -35,11 +34,28 @@ public class BouncyCastleRecorder {
public void registerBouncyCastleProvider(List
cipherTransformations, ShutdownContext shutdownContext) {
Provider provider =
Security.getProvider(SecurityProviderUtils.BOUNCYCASTLE_PROVIDER_NAME);
+if (provider == null) {
+provider =
Security.getProvider(SecurityProviderUtils.BOUNCYCASTLE_FIPS_PROVIDER_NAME);
+}
if (provider == null) {
// TODO: Fix BuildStep execution order so that this is not required
// https://github.com/apache/camel-quarkus/issues/3472
-provider = new BouncyCastleProvider();
-Security.addProvider(provider);
+try {
+provider = (Provider)
Thread.currentThread().getContextClassLoader()
+
.loadClass(SecurityProviderUtils.BOUNCYCASTLE_PROVIDER_CLASS_NAME).getConstructor().newInstance();
+Security.addProvider(provider);
+} catch (Exception e) {
Review Comment:
(if provider is not loaded, the execution would fail in the next block of
code)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] Extracion of crypto-pgp and making crypto work on FIPS [camel-quarkus]
JiriOndrusek commented on code in PR #6241:
URL: https://github.com/apache/camel-quarkus/pull/6241#discussion_r1670431880
##
extensions-support/bouncycastle/runtime/src/main/java/org/apache/camel/quarkus/support/bouncycastle/BouncyCastleRecorder.java:
##
@@ -35,11 +34,28 @@ public class BouncyCastleRecorder {
public void registerBouncyCastleProvider(List
cipherTransformations, ShutdownContext shutdownContext) {
Provider provider =
Security.getProvider(SecurityProviderUtils.BOUNCYCASTLE_PROVIDER_NAME);
+if (provider == null) {
+provider =
Security.getProvider(SecurityProviderUtils.BOUNCYCASTLE_FIPS_PROVIDER_NAME);
+}
if (provider == null) {
// TODO: Fix BuildStep execution order so that this is not required
// https://github.com/apache/camel-quarkus/issues/3472
-provider = new BouncyCastleProvider();
-Security.addProvider(provider);
+try {
+provider = (Provider)
Thread.currentThread().getContextClassLoader()
+
.loadClass(SecurityProviderUtils.BOUNCYCASTLE_PROVIDER_CLASS_NAME).getConstructor().newInstance();
+Security.addProvider(provider);
+} catch (Exception e) {
Review Comment:
My idea is that any failure cause RuntimeException with the message `Neither
BC nor BCFIPS provider can be registered` + exception message. Which is correct
also with i.e, NPE
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
(camel-spring-boot) annotated tag camel-spring-boot-4.7.0 created (now 18c73cb2c63)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to annotated tag camel-spring-boot-4.7.0 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git at 18c73cb2c63 (tag) tagging 527319b5b3892daf1fc0dd060ffbf1058a552135 (commit) replaces camel-spring-boot-4.0.0-RC2 by Gregor Zurowski on Tue Jul 9 12:14:03 2024 + - Log - [maven-release-plugin] copy for tag camel-spring-boot-4.7.0 --- No new revisions were added by this update.
(camel-spring-boot) branch release/4.7.0 updated (a7455fd6aca -> 527319b5b38)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/4.7.0 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git from a7455fd6aca Regen new a7ef3d26f77 Target Camel 4.7.0 for release new 527319b5b38 [maven-release-plugin] prepare release camel-spring-boot-4.7.0 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: archetypes/camel-archetype-spring-boot/pom.xml | 2 +- archetypes/pom.xml | 2 +- catalog/camel-catalog-provider-springboot/pom.xml | 2 +- catalog/pom.xml| 2 +- components-starter/camel-activemq-starter/pom.xml | 2 +- components-starter/camel-activemq6-starter/pom.xml | 2 +- components-starter/camel-amqp-starter/pom.xml | 2 +- components-starter/camel-arangodb-starter/pom.xml | 2 +- components-starter/camel-as2-starter/pom.xml | 2 +- components-starter/camel-asn1-starter/pom.xml | 2 +- components-starter/camel-asterisk-starter/pom.xml | 2 +- .../camel-atmosphere-websocket-starter/pom.xml | 2 +- components-starter/camel-atom-starter/pom.xml | 2 +- components-starter/camel-avro-rpc-starter/pom.xml | 2 +- components-starter/camel-avro-starter/pom.xml | 2 +- .../camel-aws-bedrock-starter/pom.xml | 2 +- .../camel-aws-cloudtrail-starter/pom.xml | 2 +- .../camel-aws-config-starter/pom.xml | 2 +- .../camel-aws-secrets-manager-starter/pom.xml | 2 +- components-starter/camel-aws-xray-starter/pom.xml | 2 +- .../camel-aws2-athena-starter/pom.xml | 2 +- components-starter/camel-aws2-cw-starter/pom.xml | 2 +- components-starter/camel-aws2-ddb-starter/pom.xml | 2 +- components-starter/camel-aws2-ec2-starter/pom.xml | 2 +- components-starter/camel-aws2-ecs-starter/pom.xml | 2 +- components-starter/camel-aws2-eks-starter/pom.xml | 2 +- .../camel-aws2-eventbridge-starter/pom.xml | 2 +- components-starter/camel-aws2-iam-starter/pom.xml | 2 +- .../camel-aws2-kinesis-starter/pom.xml | 2 +- components-starter/camel-aws2-kms-starter/pom.xml | 2 +- .../camel-aws2-lambda-starter/pom.xml | 2 +- components-starter/camel-aws2-mq-starter/pom.xml | 2 +- components-starter/camel-aws2-msk-starter/pom.xml | 2 +- .../camel-aws2-redshift-starter/pom.xml| 2 +- components-starter/camel-aws2-s3-starter/pom.xml | 2 +- components-starter/camel-aws2-ses-starter/pom.xml | 2 +- components-starter/camel-aws2-sns-starter/pom.xml | 2 +- components-starter/camel-aws2-sqs-starter/pom.xml | 2 +- .../camel-aws2-step-functions-starter/pom.xml | 2 +- components-starter/camel-aws2-sts-starter/pom.xml | 2 +- .../camel-aws2-timestream-starter/pom.xml | 2 +- .../camel-aws2-translate-starter/pom.xml | 2 +- .../camel-azure-cosmosdb-starter/pom.xml | 2 +- .../camel-azure-eventhubs-starter/pom.xml | 2 +- .../camel-azure-files-starter/pom.xml | 2 +- .../camel-azure-key-vault-starter/pom.xml | 2 +- .../camel-azure-servicebus-starter/pom.xml | 2 +- .../camel-azure-storage-blob-starter/pom.xml | 2 +- .../camel-azure-storage-datalake-starter/pom.xml | 2 +- .../camel-azure-storage-queue-starter/pom.xml | 2 +- components-starter/camel-barcode-starter/pom.xml | 2 +- components-starter/camel-base64-starter/pom.xml| 2 +- components-starter/camel-bean-starter/pom.xml | 2 +- .../camel-bean-validator-starter/pom.xml | 2 +- components-starter/camel-beanio-starter/pom.xml| 2 +- components-starter/camel-bindy-starter/pom.xml | 2 +- components-starter/camel-bonita-starter/pom.xml| 2 +- components-starter/camel-box-starter/pom.xml | 2 +- components-starter/camel-braintree-starter/pom.xml | 2 +- components-starter/camel-browse-starter/pom.xml| 2 +- components-starter/camel-caffeine-starter/pom.xml | 2 +- .../camel-cassandraql-starter/pom.xml | 2 +- components-starter/camel-cbor-starter/pom.xml | 2 +- .../camel-chatscript-starter/pom.xml | 2 +- components-starter/camel-chunk-starter/pom.xml | 2 +- .../camel-cloudevents-starter/pom.xml | 2 +- components-starter/camel-cm-sms-starter/pom.xml| 2 +- components-starter/camel-coap-starter/pom.xml | 2 +- components-starter/camel-cometd-starter/pom.xml| 2 +- components-starter/camel-console-starter/pom.xml | 2 +- .../camel-consul-cluster-service-starter/pom.xml | 2 +- components-starter/camel-consul-starter/pom.xml| 2
(camel-spring-boot) 01/02: Target Camel 4.7.0 for release
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a commit to branch release/4.7.0 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit a7ef3d26f77e3b06d1257576d3745f4387d9da42 Author: Gregor Zurowski AuthorDate: Sun Jul 7 17:15:41 2024 + Target Camel 4.7.0 for release --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 78dae1ca0fe..5b7f4e5911b 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.camel camel-dependencies -4.7.0-SNAPSHOT +4.7.0 org.apache.camel.springboot @@ -111,7 +111,7 @@ 3.3.1 -4.7.0-SNAPSHOT +4.7.0 1.0.2.v20150114 @@ -450,7 +450,7 @@ dev -4.7.0-SNAPSHOT +4.7.0
Re: [PR] Add maven archetype for integration tests [camel-karaf]
essobedo commented on code in PR #409: URL: https://github.com/apache/camel-karaf/pull/409#discussion_r1670420564 ## tooling/camel-karaf-test-feature-archetype/README.md: ## @@ -0,0 +1,17 @@ +# Apache Camel Karaf Archetype + +### Introduction + +This archetype is to initialize a maven project to test a camel-feature inside karaf using the +org.apache.camel.karaf:camel-integration-test + +### Usage + +This tool is using maven archetype:generate plugin, for instance, to +initialize a test for camel-Atom , go to camel-karaf/tests/features/ , run + +```shell +mvn archetype:generate -DfeatureName=Atom -DarchetypeGroupId=org.apache.camel.karaf -DarchetypeArtifactId=camel-karaf-test-feature-archetype -DarchetypeVersion=4.6.0-SNAPSHOT +``` + +Then rename the directory camel-atom-test to camel-atom and adapt pom.xml, fill the supplier class and integration test. Review Comment: ```suggestion Then rename the directory `camel-atom-test` to `camel-atom`, adapt the file `pom.xml`, and finally fill in the supplier class and integration test. ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Add camel-atom integration-test [camel-karaf]
essobedo commented on code in PR #411: URL: https://github.com/apache/camel-karaf/pull/411#discussion_r1670411269 ## tests/features/camel-atom/src/main/java/org/apache/karaf/camel/test/CamelAtomRouteSupplier.java: ## @@ -0,0 +1,44 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.karaf.camel.test; + +import java.util.function.Function; + +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.model.RouteDefinition; +import org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier; +import org.osgi.service.component.annotations.Component; + + Review Comment: ```suggestion ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Add camel-atom integration-test [camel-karaf]
essobedo commented on code in PR #411:
URL: https://github.com/apache/camel-karaf/pull/411#discussion_r1670409322
##
tests/features/camel-atom/src/main/java/org/apache/karaf/camel/test/CamelAtomRouteSupplier.java:
##
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.karaf.camel.test;
+
+import java.util.function.Function;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.RouteDefinition;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+
+@Component(
+name = "karaf-camel-atom-test",
+immediate = true,
+service = CamelAtomRouteSupplier.class
+)
+public class CamelAtomRouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
+
+@Override
+protected Function consumerRoute() {
+return builder ->
+
builder.fromF("atom://file:%s/test-classes/data/feed.atom?delay=500",System.getProperty("project.target"))
Review Comment:
```suggestion
builder.fromF("atom://file:%s/test-classes/data/feed.atom?delay=500",
System.getProperty("project.target"))
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] Add camel-atom integration-test [camel-karaf]
essobedo commented on code in PR #411:
URL: https://github.com/apache/camel-karaf/pull/411#discussion_r1670408313
##
tests/features/camel-atom/src/test/java/org/apache/karaf/camel/itest/CamelAtomITest.java:
##
@@ -0,0 +1,68 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.karaf.camel.itest;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.List;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.component.mock.MockEndpoint;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteITest;
+import org.apache.karaf.camel.itests.CamelKarafTestHint;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
+
+import com.apptasticsoftware.rssreader.Item;
+
+@CamelKarafTestHint
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
+public class CamelAtomITest extends
AbstractCamelSingleFeatureResultMockBasedRouteITest {
+
+@Override
+public void configureMock(MockEndpoint mock) {
+mock.expectedMessageCount(7);
+List list = mock.getReceivedExchanges();
+String[] expectedTitles = {
+"Speaking at the Irish Java Technology Conference on Thursday
and Friday",
+"a great presentation on REST, JAX-WS and JSR 311",
+"my slides on ActiveMQ and Camel from last weeks Dublin
Conference",
+"webcast today on Apache ActiveMQ",
+"Feedback on my Camel talk at the IJTC conference",
+"More thoughts on RESTful Message Queues",
+"ActiveMQ webinar archive available" };
+int counter = 0;
+for (Exchange exchange : list) {
+Item entry = exchange.getIn().getBody(Item.class);
+assertNotNull( "No entry found for exchange: " + exchange,entry);
+
+String expectedTitle = expectedTitles[counter];
+String title = entry.getTitle().get();
+assertEquals(expectedTitle, title, "Title of message " + counter);
+
+counter++;
+}
+}
+
+@Test
+public void testResultMock() throws Exception {
+assertMockEndpointsSatisfied();
+}
+
Review Comment:
```suggestion
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] Add camel-atom integration-test [camel-karaf]
essobedo commented on code in PR #411: URL: https://github.com/apache/camel-karaf/pull/411#discussion_r1670407791 ## tests/features/camel-atom/src/test/java/org/apache/karaf/camel/itest/CamelAtomITest.java: ## @@ -0,0 +1,68 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.karaf.camel.itest; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import java.util.List; + +import org.apache.camel.Exchange; +import org.apache.camel.component.mock.MockEndpoint; +import org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteITest; +import org.apache.karaf.camel.itests.CamelKarafTestHint; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.ops4j.pax.exam.junit.PaxExam; +import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy; +import org.ops4j.pax.exam.spi.reactors.PerClass; + +import com.apptasticsoftware.rssreader.Item; + +@CamelKarafTestHint Review Comment: Is it really needed? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Add camel-atom integration-test [camel-karaf]
essobedo commented on code in PR #411:
URL: https://github.com/apache/camel-karaf/pull/411#discussion_r1670407161
##
tests/features/camel-atom/src/test/java/org/apache/karaf/camel/itest/CamelAtomITest.java:
##
@@ -0,0 +1,68 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.karaf.camel.itest;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.List;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.component.mock.MockEndpoint;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteITest;
+import org.apache.karaf.camel.itests.CamelKarafTestHint;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
+
+import com.apptasticsoftware.rssreader.Item;
+
+@CamelKarafTestHint
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
+public class CamelAtomITest extends
AbstractCamelSingleFeatureResultMockBasedRouteITest {
+
+@Override
+public void configureMock(MockEndpoint mock) {
+mock.expectedMessageCount(7);
+List list = mock.getReceivedExchanges();
+String[] expectedTitles = {
+"Speaking at the Irish Java Technology Conference on Thursday
and Friday",
+"a great presentation on REST, JAX-WS and JSR 311",
+"my slides on ActiveMQ and Camel from last weeks Dublin
Conference",
+"webcast today on Apache ActiveMQ",
+"Feedback on my Camel talk at the IJTC conference",
+"More thoughts on RESTful Message Queues",
+"ActiveMQ webinar archive available" };
+int counter = 0;
+for (Exchange exchange : list) {
+Item entry = exchange.getIn().getBody(Item.class);
+assertNotNull( "No entry found for exchange: " + exchange,entry);
Review Comment:
```suggestion
assertNotNull("No entry found for exchange: " + exchange, entry);
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] Extracion of crypto-pgp and making crypto work on FIPS [camel-quarkus]
ppalaga commented on code in PR #6241:
URL: https://github.com/apache/camel-quarkus/pull/6241#discussion_r1670407257
##
extensions-support/bouncycastle/runtime/src/main/java/org/apache/camel/quarkus/support/bouncycastle/BouncyCastleRecorder.java:
##
@@ -35,11 +34,28 @@ public class BouncyCastleRecorder {
public void registerBouncyCastleProvider(List
cipherTransformations, ShutdownContext shutdownContext) {
Provider provider =
Security.getProvider(SecurityProviderUtils.BOUNCYCASTLE_PROVIDER_NAME);
+if (provider == null) {
+provider =
Security.getProvider(SecurityProviderUtils.BOUNCYCASTLE_FIPS_PROVIDER_NAME);
+}
if (provider == null) {
// TODO: Fix BuildStep execution order so that this is not required
// https://github.com/apache/camel-quarkus/issues/3472
-provider = new BouncyCastleProvider();
-Security.addProvider(provider);
+try {
+provider = (Provider)
Thread.currentThread().getContextClassLoader()
+
.loadClass(SecurityProviderUtils.BOUNCYCASTLE_PROVIDER_CLASS_NAME).getConstructor().newInstance();
+Security.addProvider(provider);
+} catch (Exception e) {
Review Comment:
I wonder whether it would not be better to catch something more specific
here ClassNotFoundException or similar. Because Exception catches many other
exceptions, such as NPE that we perhaps want to bubble up?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] Add camel-atom integration-test [camel-karaf]
essobedo commented on code in PR #411:
URL: https://github.com/apache/camel-karaf/pull/411#discussion_r1670405481
##
tests/features/camel-atom/src/main/java/org/apache/karaf/camel/test/CamelAtomRouteSupplier.java:
##
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.karaf.camel.test;
+
+import java.util.function.Function;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.RouteDefinition;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+
+@Component(
+name = "karaf-camel-atom-test",
+immediate = true,
+service = CamelAtomRouteSupplier.class
+)
+public class CamelAtomRouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
+
+@Override
+protected Function consumerRoute() {
+return builder ->
+
builder.fromF("atom://file:%s/test-classes/data/feed.atom?delay=500",System.getProperty("project.target"))
+.log("received message ${body}");
+}
+
+protected boolean producerEnabled() {
+return false;
+}
+
+
Review Comment:
```suggestion
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] Add maven archetype for integration tests [camel-karaf]
essobedo commented on code in PR #409:
URL: https://github.com/apache/camel-karaf/pull/409#discussion_r1670376606
##
tooling/camel-karaf-test-feature-archetype/pom.xml:
##
@@ -0,0 +1,28 @@
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+org.apache.camel.karaf
+tooling
+4.6.0-SNAPSHOT
+
+
+camel-karaf-test-feature-archetype
+
+
+3.2.1
Review Comment:
Let's apply the naming convention for plugins so it should rather be
`maven-archetype-plugin-version`
##
tooling/camel-karaf-test-feature-archetype/pom.xml:
##
@@ -0,0 +1,28 @@
+
Review Comment:
License is missing
##
tooling/camel-karaf-test-feature-archetype/README.md:
##
@@ -0,0 +1,17 @@
+# Apache Camel Karaf Archetype
+
+### Introduction
+
+This archetype is to initialize a maven project to test a camel-feature inside
karaf using the
+org.apache.camel.karaf:camel-integration-test
Review Comment:
What does it represent exactly?
##
tooling/camel-karaf-test-feature-archetype/src/main/resources/archetype-resources/src/main/java/test/Camel__featureName__RouteSupplier.java:
##
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.karaf.camel.test;
+
+import static org.apache.camel.builder.Builder.constant;
+
+import java.util.function.Function;
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.RouteDefinition;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+
+@Component(
+name = "karaf-camel-${featureNameLower}-test",
+immediate = true,
+service = Camel${featureName}RouteSupplier.class
+)
+public class Camel${featureName}RouteSupplier extends
AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
+
+
+@Override
+public void configure(CamelContext context) {
+
+}
Review Comment:
Should be commented by default as it is not always needed
##
tooling/camel-karaf-test-feature-archetype/src/main/resources/archetype-resources/src/main/java/test/Camel__featureName__RouteSupplier.java:
##
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.karaf.camel.test;
+
+import static org.apache.camel.builder.Builder.constant;
+
+import java.util.function.Function;
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.RouteDefinition;
+import
org.apache.karaf.camel.itests.AbstractCamelSingleFeatureResultMockBasedRouteSupplier;
+import org.osgi.service.component.annotations.Component;
+
+
Review Comment:
```suggestion
```
##
tooling/camel-karaf-test-feature-archetype/README.md:
##
@@ -0,0 +1,17 @@
+# Apache Camel Karaf Archetype
Review Comment:
Should reflect that it is only for the integration tests
##
tooling/camel-karaf-test-feature-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml:
##
@@ -0,0 +1,25 @@
+http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.1.0;>
Review Comment:
License is missing
Re: [PR] feat(#5354): Allow adding toleration into builder pod [camel-k]
github-actions[bot] commented on PR #5667: URL: https://github.com/apache/camel-k/pull/5667#issuecomment-2217458106 :warning: Unit test coverage report - coverage decreased from 40% to 39.9% (**-0.1%**) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Possible to use Kafka keys and headers in db inserts? [camel-kafka-connector]
reidmeyer commented on issue #1653:
URL:
https://github.com/apache/camel-kafka-connector/issues/1653#issuecomment-2217437245
HI @davsclaus,
Perhaps I'm missing something super obvious, but I'm struggling to get it to
work.
I have a kafka message that:
has value:
```json
{
"message": "hello there reid"
}
```
has kafka headers:
```json
{
"myheader": "myheadervalue"
}
```
and has a key:
"some-key"
and I have a sql insert like:
`camel.kamelet.postgresql-sink.query: 'INSERT INTO mytable (message,other)
VALUES (:#message,:#${header.kafka.KEY})'`
this doesn't inject anything into header.kafka.KEY, weirdly.
I'm trying to do something like:
`camel.kamelet.postgresql-sink.query: 'INSERT INTO mytable
(message,mykey,myheader) VALUES
(:#message,:#${kafka.key},:#${kafka.header.myheader})'`, but no luck yet.
Do you know the solution here?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] Extracion of crypto-pgp and making crypto work on FIPS [camel-quarkus]
ppalaga commented on PR #6241: URL: https://github.com/apache/camel-quarkus/pull/6241#issuecomment-2217408150 > @ppalaga > > > It is still not clear to me what happens when bcprov is excluded from `crypto-pgp` and replaced with BCFIPS. Have you tried that by any chance? > > There might be more problems related to this question. The major one is that **bcpg** depends on **bcprov**. Class [BcKeyFingerprintCalculator](https://github.com/bcgit/bc-java/blob/main/pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcKeyFingerprintCalculator.java#L10) references [org.bouncycastle.crypto.Digest](https://github.com/bcgit/bc-java/blob/main/core/src/main/java/org/bouncycastle/crypto/Digest.java); The same class is not part of the **bcfips**. (I checked the jar downloaded by maven, and you can see it e.g in this [fork](https://github.com/tashiscool/bc-fips/tree/master/core/src/main/java/org/bouncycastle/crypto)) > > **Therefore it is not possible to replace bcprov with bcfips.** Good to know, thanks for the information! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Remove prefix from shell code snippets [camel-quarkus]
ppalaga commented on PR #6262: URL: https://github.com/apache/camel-quarkus/pull/6262#issuecomment-2217401371 Good to know. Let's get rid of the dollars then. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Add camel-atom integration-test [camel-karaf]
f2par0 opened a new pull request, #411: URL: https://github.com/apache/camel-karaf/pull/411 Fixes #410 Add camel-atom integration test based on apache camel test -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Add maven archetype for integration tests [camel-karaf]
f2par0 commented on code in PR #409: URL: https://github.com/apache/camel-karaf/pull/409#discussion_r1670261004 ## tooling/camel-karaf-test-feature-archetype/README.md: ## @@ -0,0 +1,17 @@ +# Apache Camel Karaf Archetype + +### Introduction + +This archetype is to initialize a maven project to test a camel-feature inside karaf using the +org.apache.camel.karaf:camel-integration-test + +### Usage + +This tool is using maven archetype:generate plugin, for instance, to +initialize a test for camel-Atom , go to camel-karaf/tests/features/ , run + +```shell +mvn archetype:generate -DfeatureName=Atom -DarchetypeGroupId=org.apache.camel.karaf -DarchetypeArtifactId=camel-karaf-test-feature-archetype -DarchetypeVersion=4.6.0-SNAPSHOT +``` + +Then rename the directory camel-atom-test to camel-atom and adapt pom.xml, fill the supplier class and integration test. Review Comment: this is necessary unless we rename all test directories to match their artifact id (or the other way around) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch main updated: CAMEL-20838: avoid using API methods for JUnit features
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new b8d073fd9c9 CAMEL-20838: avoid using API methods for JUnit features
b8d073fd9c9 is described below
commit b8d073fd9c9402da1caaab7981f3a20b29518939
Author: Otavio Rodolfo Piske
AuthorDate: Tue Jul 9 10:47:49 2024 +0200
CAMEL-20838: avoid using API methods for JUnit features
---
.../camel/component/slack/SlackConsumerTest.java | 24 --
1 file changed, 8 insertions(+), 16 deletions(-)
diff --git
a/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackConsumerTest.java
b/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackConsumerTest.java
index 432eb492968..3a97325ea2d 100644
---
a/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackConsumerTest.java
+++
b/components/camel-slack/src/test/java/org/apache/camel/component/slack/SlackConsumerTest.java
@@ -28,22 +28,19 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperties;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
+@EnabledIfSystemProperties({
+@EnabledIfSystemProperty(named = "SLACK_TOKEN", matches = ".*"),
+@EnabledIfSystemProperty(named = "SLACK_HOOK", matches = ".*")
+})
public class SlackConsumerTest extends CamelTestSupport {
-private String token;
-private String hook;
-
-@Override
-public void doPreSetup() {
-token = System.getProperty("SLACK_TOKEN");
-hook = System.getProperty("SLACK_HOOK");
-
-assumeCredentials();
-}
+private String token = System.getProperty("SLACK_TOKEN");
+private String hook = System.getProperty("SLACK_HOOK");
@Test
public void testConsumePrefixedMessages() throws Exception {
@@ -57,11 +54,6 @@ public class SlackConsumerTest extends CamelTestSupport {
MockEndpoint.assertIsSatisfied(context);
}
-private void assumeCredentials() {
-assumeTrue(token != null, "Please specify a Slack access token");
-assumeTrue(hook != null, "Please specify a Slack application webhook
URL");
-}
-
private void sendMessage(String message) throws IOException {
RequestBody requestBody
= RequestBody.create(MediaType.parse("application/json"),
String.format("{ 'text': '%s'}", message));
Re: [PR] CAMEL-20838: avoid using API methods for JUnit features [camel]
orpiske merged PR #14766: URL: https://github.com/apache/camel/pull/14766 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Remove prefix from shell code snippets [camel-quarkus]
jamesnetherton commented on PR #6262: URL: https://github.com/apache/camel-quarkus/pull/6262#issuecomment-2217215570 > it may or may not work in the same way in Camel custom UI Yes, there is no copy button support unfortunately https://github.com/apache/camel-website/issues/1137. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch dependabot/maven/bytebuddy-version-1.14.18 deleted (was 03f84d2e533)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/bytebuddy-version-1.14.18 in repository https://gitbox.apache.org/repos/asf/camel.git was 03f84d2e533 chore(deps): Bump bytebuddy-version from 1.14.17 to 1.14.18 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch main updated: chore(deps): Bump bytebuddy-version from 1.14.17 to 1.14.18 (#14764)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new f7e91f382ac chore(deps): Bump bytebuddy-version from 1.14.17 to 1.14.18 (#14764) f7e91f382ac is described below commit f7e91f382ac4ed11402f3b2dac593ed476411f4c Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jul 9 12:00:29 2024 +0200 chore(deps): Bump bytebuddy-version from 1.14.17 to 1.14.18 (#14764) Bumps `bytebuddy-version` from 1.14.17 to 1.14.18. Updates `net.bytebuddy:byte-buddy` from 1.14.17 to 1.14.18 - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.14.17...byte-buddy-1.14.18) Updates `net.bytebuddy:byte-buddy-agent` from 1.14.17 to 1.14.18 - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.14.17...byte-buddy-1.14.18) --- updated-dependencies: - dependency-name: net.bytebuddy:byte-buddy dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: net.bytebuddy:byte-buddy-agent dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 5e1acb65bea..74926f945e0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -85,7 +85,7 @@ 4.10.0 3.34.0 3.6.0 -1.14.17 +1.14.18 0.10.1 3.1.8 3.12.0
Re: [PR] chore(deps): Bump bytebuddy-version from 1.14.17 to 1.14.18 [camel]
oscerd merged PR #14764: URL: https://github.com/apache/camel/pull/14764 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Remove prefix from shell code snippets [camel-quarkus]
ppalaga commented on PR #6262: URL: https://github.com/apache/camel-quarkus/pull/6262#issuecomment-2217200616 `$` is nicer visually, because one sees, where a command starts, but you are right that it is not so nice when copying. I would not mind removing them, but I just stumbled across this piece of Antora docs: > Console blocks > The default UI also adds a clipboard button to all console blocks. A console block is either a literal paragraph that begins with a $ or a source block with the language console. > >The script provided by the default UI will automatically strip the $ prompt at the beginning of each line and join the lines with &&. https://docs.antora.org/antora-ui-default/code-blocks/#console-blocks It is a feature of default Antora UI, so it may or may not work in the same way in Camel custom UI. We should perhaps try to switch from `[source,shell]` to `[source,console]` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
