(camel) branch regen_bot updated (be75a1c1904 -> b38966f1d02)
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.git from be75a1c1904 Configuration of languages should be consistent (part 1) (#12980) add b38966f1d02 CAMEL-20380: fixed incomplete batching on poll timeout No new revisions were added by this update. Summary of changes: .../batching/KafkaRecordBatchingProcessor.java | 42 +++--- .../batching/BatchingProcessingITSupport.java | 5 +-- 2 files changed, 41 insertions(+), 6 deletions(-)
(camel) branch main updated: CAMEL-20380: fixed incomplete batching on poll timeout
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 b38966f1d02 CAMEL-20380: fixed incomplete batching on poll timeout
b38966f1d02 is described below
commit b38966f1d027c62cfe54f06ff67ba643f1863ea1
Author: Otavio Rodolfo Piske
AuthorDate: Fri Feb 2 15:28:21 2024 +0100
CAMEL-20380: fixed incomplete batching on poll timeout
---
.../batching/KafkaRecordBatchingProcessor.java | 42 +++---
.../batching/BatchingProcessingITSupport.java | 5 +--
2 files changed, 41 insertions(+), 6 deletions(-)
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/batching/KafkaRecordBatchingProcessor.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/batching/KafkaRecordBatchingProcessor.java
index 082b80d7db9..d9f00d86db4 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/batching/KafkaRecordBatchingProcessor.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/batching/KafkaRecordBatchingProcessor.java
@@ -31,6 +31,7 @@ import
org.apache.camel.component.kafka.consumer.support.KafkaRecordProcessor;
import org.apache.camel.component.kafka.consumer.support.ProcessingResult;
import org.apache.camel.spi.ExceptionHandler;
import org.apache.camel.spi.Synchronization;
+import org.apache.camel.util.StopWatch;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.apache.kafka.clients.consumer.ConsumerRecords;
import org.apache.kafka.common.TopicPartition;
@@ -43,6 +44,9 @@ final class KafkaRecordBatchingProcessor extends
KafkaRecordProcessor {
private final KafkaConfiguration configuration;
private final Processor processor;
private final CommitManager commitManager;
+private final StopWatch watch = new StopWatch();
+private List exchangeList;
+
private final class CommitSynchronization implements Synchronization {
private final ExceptionHandler exceptionHandler;
@@ -107,17 +111,47 @@ final class KafkaRecordBatchingProcessor extends
KafkaRecordProcessor {
}
public ProcessingResult processExchange(KafkaConsumer camelKafkaConsumer,
ConsumerRecords consumerRecords) {
+LOG.debug("There's {} records to process ... max poll is set to {}",
consumerRecords.count(), configuration.getMaxPollRecords());
// Aggregate all consumer records in a single exchange
-List exchangeList = new ArrayList<>(consumerRecords.count());
+if (exchangeList == null) {
+exchangeList = new ArrayList<>(configuration.getMaxPollRecords());
+watch.takenAndRestart();
+}
+
+if (hasExpiredRecords(consumerRecords)) {
+LOG.debug("The polling timeout has expired with {} records in
cache. Dispatching the incomplete batch for processing",
+exchangeList.size());
+
+// poll timeout has elapsed, so check for expired records
+processBatch(camelKafkaConsumer);
+exchangeList = null;
+
+return ProcessingResult.newUnprocessed();
+}
-// Create an inner exchange for every consumer record retrieved
for (ConsumerRecord consumerRecord : consumerRecords) {
TopicPartition tp = new TopicPartition(consumerRecord.topic(),
consumerRecord.partition());
-Exchange exchange = toExchange(camelKafkaConsumer, tp,
consumerRecord);
+Exchange childExchange = toExchange(camelKafkaConsumer, tp,
consumerRecord);
+
+exchangeList.add(childExchange);
-exchangeList.add(exchange);
+if (exchangeList.size() == configuration.getMaxPollRecords()) {
+processBatch(camelKafkaConsumer);
+exchangeList = null;
+}
}
+// None of the states provided by the processing result are relevant
for batch processing. We can simply return the
+// default state
+return ProcessingResult.newUnprocessed();
+
+}
+
+private boolean hasExpiredRecords(ConsumerRecords
consumerRecords) {
+return !exchangeList.isEmpty() && consumerRecords.isEmpty() &&
watch.taken() >= configuration.getPollTimeoutMs();
+}
+
+private ProcessingResult processBatch(KafkaConsumer camelKafkaConsumer) {
// Create the bundle exchange
final Exchange exchange = camelKafkaConsumer.createExchange(false);
final Message message = exchange.getMessage();
diff --git
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/batching/BatchingProcessingITSupport.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/batching/BatchingProcessingITSupport.java
Re: [PR] CAMEL-20380: fixed incomplete batching on poll timeout [camel]
orpiske merged PR #12982: URL: https://github.com/apache/camel/pull/12982 -- 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 20377] *IT tests should be run with failsafe instead of surefire [camel]
orpiske commented on code in PR #12966:
URL: https://github.com/apache/camel/pull/12966#discussion_r1477006645
##
pom.xml:
##
@@ -409,13 +410,22 @@
org.apache.maven.plugins
-maves-surefire-plugin
+maven-surefire-plugin
${maven-surefire-plugin-version}
+
+
+**/*Test.java
+
+
+**/*IT.java
+**/*IntegrationTest.java
+
+
Review Comment:
This change, if necessary, should be done on the parent pom.
--
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] [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-1925050810 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 7763835731-1381-0e15f0cc-3cb0-4a0c-980a-6cc651fda180 * Camel Quarkus Commit: 31302278b9669bbd11baaae8ce7eefcaa6df4aa7 * Quarkus Main Commit: 212e996be9b49dfaac451d76d7a2b5421178f22c * Link to build: https://github.com/apache/camel-quarkus/actions/runs/7763835731 -- 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] [CI] - Quarkus Main Branch Build Failure [camel-quarkus]
jamesnetherton opened a new issue, #2926: URL: https://github.com/apache/camel-quarkus/issues/2926 This is a placeholder issue used by the [nightly sync workflow](https://github.com/apache/camel-quarkus/actions/workflows/quarkus-master-cron.yaml) for the [`quarkus-main`](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch. -- 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
(camel-quarkus) 01/01: Upgrade Quarkus to 3.9.0.CR1
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit d8a711e007f1faa6f9fce4a94648c8125e7435b7
Author: James Netherton
AuthorDate: Wed Jan 31 08:43:18 2024 +
Upgrade Quarkus to 3.9.0.CR1
---
docs/antora.yml | 2 +-
pom.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 89e15e20de..65c71cf09d 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -31,7 +31,7 @@ asciidoc:
camel-version: 4.3.0 # replace ${camel.version}
camel-docs-version: next
camel-quarkus-version: 3.8.0 # replace ${camel-quarkus.version}
-quarkus-version: 3.7.1 # replace ${quarkus.version}
+quarkus-version: 999-SNAPSHOT # replace ${quarkus.version}
graalvm-version: 23.0.1 # replace ${graalvm.version}
graalvm-docs-version: jdk21 # replace ${graalvm-docs.version}
mapstruct-version: 1.5.5.Final # replace ${mapstruct.version}
diff --git a/pom.xml b/pom.xml
index 4fa880179e..3e1e5d1a79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
2.2.1
2.3.0
2.0.2
-3.7.1
+999-SNAPSHOT
4.0.0
2.5.0
@@ -75,7 +75,7 @@
1.11.3
2.23.0
0.29.2
-3.25.1
+3.25.2
1.11.714
${azure-sdk-bom-version}
1.45.1
(camel-quarkus) branch quarkus-main updated (471f5fdd0d -> d8a711e007)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard 471f5fdd0d Upgrade Quarkus to 3.9.0.CR1 add 4c7cbd4c7f Bump quarkiverse-jsch.version from 3.0.5 to 3.0.6 (#5710) add 212e996be9 Fix #573 to add manual saga tests (#5714) new d8a711e007 Upgrade Quarkus to 3.9.0.CR1 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (471f5fdd0d) \ N -- N -- N refs/heads/quarkus-main (d8a711e007) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 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: integration-tests/lra/pom.xml | 17 + .../quarkus/component/lra/it/LraResource.java | 25 +++ .../camel/quarkus/component/lra/it/LraRoutes.java | 28 ++ .../camel/quarkus/component/lra/it/LraTest.java| 17 + pom.xml| 4 ++-- poms/bom/src/main/generated/flattened-full-pom.xml | 6 ++--- .../src/main/generated/flattened-reduced-pom.xml | 6 ++--- .../generated/flattened-reduced-verbose-pom.xml| 6 ++--- 8 files changed, 98 insertions(+), 11 deletions(-)
Re: [I] MULTIPART_FORM_DATA media type [camel-karavan]
samar-elsayed closed issue #1095: MULTIPART_FORM_DATA media type URL: https://github.com/apache/camel-karavan/issues/1095 -- 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: autogenerated project resource 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 f25e22c5f chore: autogenerated project resource update
f25e22c5f is described below
commit f25e22c5f9ecf39fde53f86022070a518ea234b0
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Sat Feb 3 00:38:54 2024 +
chore: autogenerated project resource update
---
pkg/resources/resources.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index 19295612e..373c1585c 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -753,9 +753,9 @@ var assets = func() http.FileSystem {
"/traits.yaml": &vfsgen۰CompressedFileInfo{
name: "traits.yaml",
modTime: time.Time{},
- uncompressedSize: 73382,
+ uncompressedSize: 73512,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\x6b\x73\x1c\xb9\x91\x00\xf8\x5d\xbf\x02\xd1\x73\x1b\x24\x75\xfd\xa0\xc6\x6b\xef\x2c\xd7\xf2\x1e\x47\xa3\xb1\x69\xbd\x78\x22\x67\xbc\x0e\x9d\xc2\x8d\xae\x42\x77\x43\xac\x06\x6a\x00\x14\xa9\x9e\xdb\xfb\xef\x17\xc8\x4c\x3c\xaa\xba\x9a\xdd\x94\x48\xd9\xda\xf5\x6e\x84\x47\x24\x0b\x40\x22\x91\x48\xe4\x3b\xbf\x61\xa3\xfb\xfb\xbf\x47\xdf\xb0\x97\xb2\x10\xca\x8a\x92\x39\xcd\xdc\x52\xb0\xd3\x9a\x17\x4b\xc1\x2e\xf4\xdc\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\xfd\x73\x1c\xb9\x91\x28\xf8\xbb\xfe\x0a\x44\xcf\xbd\x20\xa9\xeb\x0f\x6a\xfc\xec\x9d\xe5\x5a\xde\xe3\x68\x34\x63\x7a\x24\x8a\x27\x72\x66\x9e\x43\xa7\x70\xa3\xab\xd0\xdd\x18\x56\x03\x65\x00\x45\xaa\xe7\xf6\xfe\xf7\x0b\x64\x26\x3e\xaa\xba\x9a\xdd\x94\x48\xd9\x7a\xeb\xdd\x08\x8f\x48\x16\x80\x44\x22\x91\xc8\xef\xfc\x8a\x8d\x1e\xee\xff\x9e\x7c\xc5\x5e\xc9\x42\x28\x2b\x4a\xe6\x34\x73\x4b\xc1\x4e\x6b\x5e\x2c\x05\xbb\x
[...]
},
}
fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{
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-1924942641 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 7763006214-1277-ce74467c-9da2-4552-a4ff-074f0136578f * Camel Quarkus Commit: 7abfce4cde906eb32c0198179afa3ab382ad95fa * Camel Main Commit: 212e996be9b49dfaac451d76d7a2b5421178f22c * Link to build: https://github.com/apache/camel-quarkus/actions/runs/7763006214 -- 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] User should be able to select placeholder example [camel-karavan]
mgubaidullin closed issue #1098: User should be able to select placeholder example URL: https://github.com/apache/camel-karavan/issues/1098 -- 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-karavan) 01/02: COmponent properties #1098
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
commit cb23be36f7c2b5b7b868aefc5075244c6b39df3a
Author: Marat Gubaidullin
AuthorDate: Fri Feb 2 19:04:49 2024 -0500
COmponent properties #1098
---
.../property/property/ComponentPropertyField.tsx | 10 +--
.../property/property/DslPropertyField.tsx | 2 +-
...ropdown.css => PropertyPlaceholderDropdown.css} | 0
...ropdown.tsx => PropertyPlaceholderDropdown.tsx} | 73 --
.../property/property/ComponentPropertyField.tsx | 2 +-
.../ComponentPropertyPlaceholderDropdown.tsx | 69 ++--
.../property/property/ComponentPropertyField.tsx | 2 +-
.../ComponentPropertyPlaceholderDropdown.tsx | 69 ++--
8 files changed, 163 insertions(+), 64 deletions(-)
diff --git
a/karavan-designer/src/designer/property/property/ComponentPropertyField.tsx
b/karavan-designer/src/designer/property/property/ComponentPropertyField.tsx
index 1287c18a..e32a4fb9 100644
--- a/karavan-designer/src/designer/property/property/ComponentPropertyField.tsx
+++ b/karavan-designer/src/designer/property/property/ComponentPropertyField.tsx
@@ -27,7 +27,7 @@ import {
InputGroupItem,
TextInputGroup,
TextVariants,
-Text,
+Text
} from '@patternfly/react-core';
import {
Select,
@@ -54,7 +54,7 @@ import {shallow} from "zustand/shallow";
import {KubernetesIcon} from "../../icons/ComponentIcons";
import EditorIcon from "@patternfly/react-icons/dist/js/icons/code-icon";
import {ModalEditor} from "./ModalEditor";
-import {ComponentPropertyPlaceholderDropdown} from
"./ComponentPropertyPlaceholderDropdown";
+import {PropertyPlaceholderDropdown} from "./PropertyPlaceholderDropdown";
const prefix = "parameters";
const beanPrefix = "#bean:";
@@ -267,7 +267,7 @@ export function ComponentPropertyField(props: Props) {
}
-
+
}
@@ -287,7 +287,7 @@ export function ComponentPropertyField(props: Props) {
}}/>
-
+
)
@@ -345,7 +345,7 @@ export function ComponentPropertyField(props: Props) {
/>
-
+
)
diff --git
a/karavan-designer/src/designer/property/property/DslPropertyField.tsx
b/karavan-designer/src/designer/property/property/DslPropertyField.tsx
index 5907..e5f4cec0 100644
--- a/karavan-designer/src/designer/property/property/DslPropertyField.tsx
+++ b/karavan-designer/src/designer/property/property/DslPropertyField.tsx
@@ -74,7 +74,7 @@ import {
import {TemplateApi} from "karavan-core/lib/api/TemplateApi";
import {KubernetesIcon} from "../../icons/ComponentIcons";
import {BeanProperties} from "./BeanProperties";
-import {ComponentPropertyPlaceholderDropdown} from
"./ComponentPropertyPlaceholderDropdown";
+import {PropertyPlaceholderDropdown} from "./PropertyPlaceholderDropdown";
interface Props {
property: PropertyMeta,
diff --git
a/karavan-designer/src/designer/property/property/ComponentPropertyPlaceholderDropdown.css
b/karavan-designer/src/designer/property/property/PropertyPlaceholderDropdown.css
similarity index 100%
rename from
karavan-designer/src/designer/property/property/ComponentPropertyPlaceholderDropdown.css
rename to
karavan-designer/src/designer/property/property/PropertyPlaceholderDropdown.css
diff --git
a/karavan-designer/src/designer/property/property/ComponentPropertyPlaceholderDropdown.tsx
b/karavan-designer/src/designer/property/property/PropertyPlaceholderDropdown.tsx
similarity index 70%
rename from
karavan-designer/src/designer/property/property/ComponentPropertyPlaceholderDropdown.tsx
rename to
karavan-designer/src/designer/property/property/PropertyPlaceholderDropdown.tsx
index 136f90fb..85899749 100644
---
a/karavan-designer/src/designer/property/property/ComponentPropertyPlaceholderDropdown.tsx
+++
b/karavan-designer/src/designer/property/property/PropertyPlaceholderDropdown.tsx
@@ -19,10 +19,19 @@ import {
Dropdown,
MenuToggleElement,
MenuToggle,
-DropdownList, DropdownItem, Popover, Badge, TextVariants, Text, Flex,
TextInput, FormGroup, Form, Button, FlexItem
+DropdownList,
+DropdownItem,
+Popover,
+Flex,
+TextInput,
+FormGroup,
+Form,
+Button,
+FlexItem,
+DropdownGroup, Divider
} from '@patternfly/react-core';
import '../../karavan.css';
-import './ComponentPropertyPlaceholderDropdown.css';
+import './PropertyPlaceholderDropdown.css';
import "@patternfly/patternfly/patternfly.css";
import {ComponentProperty} from "karavan-core/lib/model/ComponentModels";
import {RouteTo
(camel-karavan) branch main updated (a4620125 -> 4da2d8b7)
This is an automated email from the ASF dual-hosted git repository.
marat pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
from a4620125 Fix #1097
new cb23be36 COmponent properties #1098
new 4da2d8b7 Dsl properties #1098
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:
.../property/property/ComponentPropertyField.tsx | 10 +--
.../property/property/DslPropertyField.tsx | 5 +-
...ropdown.css => PropertyPlaceholderDropdown.css} | 0
...ropdown.tsx => PropertyPlaceholderDropdown.tsx} | 91 +++---
.../property/property/ComponentPropertyField.tsx | 10 +--
.../ComponentPropertyPlaceholderDropdown.tsx | 69 +++-
.../property/property/DslPropertyField.tsx | 5 +-
.../property/PropertyPlaceholderDropdown.css | 0
.../property/PropertyPlaceholderDropdown.tsx | 91 +++---
.../property/property/ComponentPropertyField.tsx | 10 +--
.../ComponentPropertyPlaceholderDropdown.tsx | 69 +++-
.../property/property/DslPropertyField.tsx | 5 +-
.../property/PropertyPlaceholderDropdown.css | 0
...ropdown.tsx => PropertyPlaceholderDropdown.tsx} | 91 +++---
14 files changed, 324 insertions(+), 132 deletions(-)
copy
karavan-designer/src/designer/property/property/{ComponentPropertyPlaceholderDropdown.css
=> PropertyPlaceholderDropdown.css} (100%)
rename
karavan-designer/src/designer/property/property/{ComponentPropertyPlaceholderDropdown.tsx
=> PropertyPlaceholderDropdown.tsx} (63%)
copy
karavan-designer/src/designer/property/property/ComponentPropertyPlaceholderDropdown.css
=>
karavan-space/src/designer/property/property/PropertyPlaceholderDropdown.css
(100%)
copy
karavan-web/karavan-app/src/main/webui/src/designer/property/property/ComponentPropertyPlaceholderDropdown.tsx
=>
karavan-space/src/designer/property/property/PropertyPlaceholderDropdown.tsx
(63%)
rename
karavan-designer/src/designer/property/property/ComponentPropertyPlaceholderDropdown.css
=>
karavan-web/karavan-app/src/main/webui/src/designer/property/property/PropertyPlaceholderDropdown.css
(100%)
copy
karavan-web/karavan-app/src/main/webui/src/designer/property/property/{ComponentPropertyPlaceholderDropdown.tsx
=> PropertyPlaceholderDropdown.tsx} (63%)
(camel-karavan) 02/02: Dsl properties #1098
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
commit 4da2d8b740ec08e1a7a5d66a1de03d50b5e06de4
Author: Marat Gubaidullin
AuthorDate: Fri Feb 2 19:24:09 2024 -0500
Dsl properties #1098
---
.../property/property/ComponentPropertyField.tsx | 6 ++--
.../property/property/DslPropertyField.tsx | 3 ++
.../property/PropertyPlaceholderDropdown.tsx | 20
.../property/property/ComponentPropertyField.tsx | 8 ++---
.../property/property/DslPropertyField.tsx | 5 ++-
.../property/PropertyPlaceholderDropdown.css | 37 ++
.../property/PropertyPlaceholderDropdown.tsx | 20
.../property/property/ComponentPropertyField.tsx | 8 ++---
.../property/property/DslPropertyField.tsx | 5 ++-
.../property/PropertyPlaceholderDropdown.css | 37 ++
.../property/PropertyPlaceholderDropdown.tsx | 20
11 files changed, 135 insertions(+), 34 deletions(-)
diff --git
a/karavan-designer/src/designer/property/property/ComponentPropertyField.tsx
b/karavan-designer/src/designer/property/property/ComponentPropertyField.tsx
index e32a4fb9..3798c4e4 100644
--- a/karavan-designer/src/designer/property/property/ComponentPropertyField.tsx
+++ b/karavan-designer/src/designer/property/property/ComponentPropertyField.tsx
@@ -267,7 +267,7 @@ export function ComponentPropertyField(props: Props) {
}
-
+
}
@@ -287,7 +287,7 @@ export function ComponentPropertyField(props: Props) {
}}/>
-
+
)
@@ -345,7 +345,7 @@ export function ComponentPropertyField(props: Props) {
/>
-
+
)
diff --git
a/karavan-designer/src/designer/property/property/DslPropertyField.tsx
b/karavan-designer/src/designer/property/property/DslPropertyField.tsx
index e5f4cec0..923b0e26 100644
--- a/karavan-designer/src/designer/property/property/DslPropertyField.tsx
+++ b/karavan-designer/src/designer/property/property/DslPropertyField.tsx
@@ -423,6 +423,9 @@ export function DslPropertyField(props: Props) {
onChange={(_, v) => propertyChanged(property.name, v)}
/>
+
+
+
)
}
diff --git
a/karavan-designer/src/designer/property/property/PropertyPlaceholderDropdown.tsx
b/karavan-designer/src/designer/property/property/PropertyPlaceholderDropdown.tsx
index 85899749..066e8b04 100644
---
a/karavan-designer/src/designer/property/property/PropertyPlaceholderDropdown.tsx
+++
b/karavan-designer/src/designer/property/property/PropertyPlaceholderDropdown.tsx
@@ -34,13 +34,14 @@ import '../../karavan.css';
import './PropertyPlaceholderDropdown.css';
import "@patternfly/patternfly/patternfly.css";
import {ComponentProperty} from "karavan-core/lib/model/ComponentModels";
-import {RouteToCreate} from "../../utils/CamelUi";
import {usePropertiesHook} from "../usePropertiesHook";
import {useDesignerStore} from "../../DesignerStore";
import {shallow} from "zustand/shallow";
import EllipsisVIcon from
"@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon";
import AddIcon from "@patternfly/react-icons/dist/js/icons/plus-icon";
import {InfrastructureAPI} from "../../utils/InfrastructureAPI";
+import {PropertyMeta} from "karavan-core/lib/model/CamelMetadata";
+import {RouteToCreate} from "../../utils/CamelUi";
const SYNTAX_EXAMPLES = [
{key: 'property:', value: 'group.property', description: 'Application
property'},
@@ -50,13 +51,14 @@ const SYNTAX_EXAMPLES = [
]
interface Props {
-property: ComponentProperty,
-value: any
+property: ComponentProperty | PropertyMeta,
+value: any,
+onDslPropertyChange?: (fieldId: string, value: string | number | boolean |
any, newRoute?: RouteToCreate) => void,
+onComponentPropertyChange?: (parameter: string, value: string | number |
boolean | any, pathParameter?: boolean, newRoute?: RouteToCreate) => void
}
export function PropertyPlaceholderDropdown(props: Props) {
-const {onParametersChange} = usePropertiesHook();
const [propertyPlaceholders, setPropertyPlaceholders] =
useDesignerStore((s) =>
[s.propertyPlaceholders, s.setPropertyPlaceholders], shallow)
const [isOpenPlaceholdersDropdown, setOpenPlaceholdersDropdown] =
useState(false);
@@ -78,8 +80,12 @@ export function PropertyPlaceholderDropdown(props: Props) {
const hasPlaceholders = (propertyPlaceholders &&
propertyPlaceholders.length > 0
Re: [I] [0.11.5] RabbitMQ Source Connector JSON config ends up converting kebab-case to camelCase [camel-kafka-connector]
dshma commented on issue #1577:
URL:
https://github.com/apache/camel-kafka-connector/issues/1577#issuecomment-1924910290
Hello there,
Had recently a chance to debug the issue and came across the following place:
camel/core/camel-util/src/main/java/org/apache/camel/util/StringHelper:dashToCamelCase
```
/**
* Converts the string from dash format into camel case
(hello-great-world -> helloGreatWorld)
*
* @param text the string
* @return the string camel cased
*/
public static String dashToCamelCase(String text) {
if (text == null) {
return null;
}
int length = text.length();
if (length == 0) {
return text;
}
if (text.indexOf('-') == -1) {
return text;
}
// there is at least 1 dash so the capacity can be shorter
StringBuilder sb = new StringBuilder(length - 1);
boolean upper = false;
for (int i = 0; i < length; i++) {
char c = text.charAt(i);
if (c == '-') {
upper = true;
} else {
if (upper) {
c = Character.toUpperCase(c);
}
sb.append(c);
upper = false;
}
}
return sb.toString();
}
```
This is what trims dashes for the property and format mentioned above:
`
"camel.component.rabbitmq.args[queue.x-queue-type]": "quorum"
`
We've applied a temporal fix that doesn't execute the logic within the
method for the specific property, but this might be smth to keep in mind in
newer versions.
fyi: @oscerd
--
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-runtime) branch main updated: chore: update changelog
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-runtime.git The following commit(s) were added to refs/heads/main by this push: new 6f50bb2b chore: update changelog 6f50bb2b is described below commit 6f50bb2b85e1c6e75076987ba033e8f509496e34 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Fri Feb 2 23:34:08 2024 + chore: update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2aebaa7..a96b0ca5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ **Merged pull requests:** +- feat\(ci\): Add nightly deploy for main and recent release branches [\#1164](https://github.com/apache/camel-k-runtime/pull/1164) ([gansheer](https://github.com/gansheer)) - Removed CulpritsRecipientProvider and use DevelopersRecipientProvider… [\#1163](https://github.com/apache/camel-k-runtime/pull/1163) ([oscerd](https://github.com/oscerd)) - Fix: add classifier field to the maven artifact abstraction [\#1161](https://github.com/apache/camel-k-runtime/pull/1161) ([claudio4j](https://github.com/claudio4j)) - build\(deps\): bump org.assertj:assertj-core from 3.25.1 to 3.25.2 [\#1158](https://github.com/apache/camel-k-runtime/pull/1158) ([dependabot[bot]](https://github.com/apps/dependabot))
(camel-karavan) 03/04: Wizard file selector #1097
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
commit f6a7d87a63a9386e5477510cf151fb0622843ef3
Author: Marat Gubaidullin
AuthorDate: Fri Feb 2 17:38:12 2024 -0500
Wizard file selector #1097
---
.../src/main/webui/src/api/ProjectService.ts | 1 -
.../webui/src/project/beans/BeanFilesDropdown.css | 29 +
.../webui/src/project/beans/BeanFilesDropdown.tsx | 85
.../main/webui/src/project/beans/BeanWizard.tsx| 145 -
4 files changed, 198 insertions(+), 62 deletions(-)
diff --git a/karavan-web/karavan-app/src/main/webui/src/api/ProjectService.ts
b/karavan-web/karavan-app/src/main/webui/src/api/ProjectService.ts
index 0876b506..9f9891f4 100644
--- a/karavan-web/karavan-app/src/main/webui/src/api/ProjectService.ts
+++ b/karavan-web/karavan-app/src/main/webui/src/api/ProjectService.ts
@@ -30,7 +30,6 @@ import {
import {ProjectEventBus} from './ProjectEventBus';
import {EventBus} from "../designer/utils/EventBus";
import {KameletApi} from "karavan-core/lib/api/KameletApi";
-import {AxiosResponse} from "axios";
export class ProjectService {
diff --git
a/karavan-web/karavan-app/src/main/webui/src/project/beans/BeanFilesDropdown.css
b/karavan-web/karavan-app/src/main/webui/src/project/beans/BeanFilesDropdown.css
new file mode 100644
index ..d035c7e8
--- /dev/null
+++
b/karavan-web/karavan-app/src/main/webui/src/project/beans/BeanFilesDropdown.css
@@ -0,0 +1,29 @@
+/*
+ * 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.
+ */
+
+.bean-wizard .bean-wizard-toggle {
+padding-left: 6px;
+padding-right: 6px;
+}
+
+.bean-wizard .bean-wizard-toggle .pf-v5-c-button__icon.pf-m-start {
+margin-inline-end: 0;
+}
+
+.bean-wizard .bean-wizard-toggle .pf-v5-c-menu-toggle__controls {
+display: none;
+}
diff --git
a/karavan-web/karavan-app/src/main/webui/src/project/beans/BeanFilesDropdown.tsx
b/karavan-web/karavan-app/src/main/webui/src/project/beans/BeanFilesDropdown.tsx
new file mode 100644
index ..92dbc396
--- /dev/null
+++
b/karavan-web/karavan-app/src/main/webui/src/project/beans/BeanFilesDropdown.tsx
@@ -0,0 +1,85 @@
+/*
+ * 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.
+ */
+import React, {useState} from 'react';
+import {
+Dropdown,
+MenuToggleElement,
+MenuToggle,
+DropdownList, DropdownItem
+} from '@patternfly/react-core';
+import './BeanFilesDropdown.css';
+import "@patternfly/patternfly/patternfly.css";
+import {shallow} from "zustand/shallow";
+import EllipsisVIcon from
"@patternfly/react-icons/dist/esm/icons/ellipsis-v-icon";
+import {useFilesStore} from "../../api/ProjectStore";
+
+const CAMEL_YAML_EXT = ".camel.yaml";
+
+interface Props {
+onSelect: (filename: string, event?: React.MouseEvent) => void;
+}
+
+export function BeanFilesDropdown(props: Props) {
+
+const [files] = useFilesStore((s) => [s.files], shallow);
+const [isOpenDropdown, setIsOpenDropdown] = useState(false);
+
+function onMenuToggleClick() {
+setIsOpenDropdown(!isOpenDropdown)
+}
+
+function getToggle(toggleRef: React.Ref) {
+return (
+ onMenuToggleClick()}
+isExpanded={isOpenDropdown}
+>
+
+
+)
+}
+
+const camelYamlFiles = files.filter(f =>
f.name.endsWith(CAMEL_YAML_EXT)).map(f
(camel-karavan) 02/04: Wizard #1097
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
commit be1aeed6dd10ab80124354a1981aae78d7390026
Author: Marat Gubaidullin
AuthorDate: Fri Feb 2 15:32:44 2024 -0500
Wizard #1097
---
.../main/webui/src/project/beans/BeanWizard.tsx| 173 ++---
1 file changed, 148 insertions(+), 25 deletions(-)
diff --git
a/karavan-web/karavan-app/src/main/webui/src/project/beans/BeanWizard.tsx
b/karavan-web/karavan-app/src/main/webui/src/project/beans/BeanWizard.tsx
index 1adc5d0f..55bbc040 100644
--- a/karavan-web/karavan-app/src/main/webui/src/project/beans/BeanWizard.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/project/beans/BeanWizard.tsx
@@ -16,54 +16,132 @@
*/
import React, {useEffect, useMemo, useState} from 'react';
import {
-Badge,
capitalize,
Flex,
-Form, FormGroup,
+Form, FormGroup, FormHelperText, HelperText, HelperTextItem,
Modal,
ModalVariant,
Radio, Text, TextInput,
Wizard,
-WizardHeader,
WizardStep
} from '@patternfly/react-core';
import {KaravanApi} from "../../api/KaravanApi";
import {RegistryBeanDefinition} from "karavan-core/lib/model/CamelDefinition";
import {CodeUtils} from "../../util/CodeUtils";
-import {ProjectFile, ProjectType} from "../../api/ProjectModels";
-import {useWizardStore} from "../../api/ProjectStore";
+import {ProjectFile} from "../../api/ProjectModels";
+import {useFilesStore, useFileStore, useProjectStore, useWizardStore} from
"../../api/ProjectStore";
import {shallow} from "zustand/shallow";
+import ExclamationCircleIcon from
'@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
+import {useForm} from "react-hook-form";
+import {yupResolver} from "@hookform/resolvers/yup";
+import * as yup from "yup";
import {ProjectService} from "../../api/ProjectService";
+import {EventBus} from "../../designer/utils/EventBus";
+import {useResponseErrorHandler} from
"../../shared/error/UseResponseErrorHandler";
+import {Beans, Integration} from
"karavan-core/lib/model/IntegrationDefinition";
+import {CamelDefinitionYaml} from "karavan-core/lib/api/CamelDefinitionYaml";
+const CAMEL_YAML_EXT = ".camel.yaml";
+const EMPTY_BEAN = "empty";
const BEAN_TEMPLATE_SUFFIX_FILENAME = "-bean-template.camel.yaml";
export function BeanWizard() {
+const formValidationSchema = yup.object().shape({
+filename: yup
+.string()
+.matches(/^[a-zA-Z0-9_\-.]+$/, 'Incorrect filename')
+.required("File name is required"),
+});
+
+const {
+register,
+setError,
+handleSubmit,
+formState: { errors },
+reset
+} = useForm({
+resolver: yupResolver(formValidationSchema),
+mode: "onChange",
+defaultValues: {filename: ''}
+});
+
+const responseToFormErrorFields = new Map([
+["filename", "filename"]
+]);
+
+const [project] = useProjectStore((s) => [s.project], shallow);
+const [operation, setFile, designerTab] = useFileStore((s) =>
[s.operation, s.setFile, s.designerTab], shallow);
+const [files] = useFilesStore((s) => [s.files], shallow);
const [showWizard, setShowWizard] = useWizardStore((s) => [s.showWizard,
s.setShowWizard], shallow)
-const [files, setFiles] = useState([]);
+const [templateFiles, setTemplateFiles] = useState([]);
const [templateNames, setTemplateNames] = useState([]);
const [templateName, setTemplateName] = useState('');
+const [templateBeanName, setTemplateBeanName] = useState('');
+const [bean, setBean] = useState();
+const [filename, setFilename] = useState('');
const [beanName, setBeanName] = useState('');
+const [globalErrors, registerResponseErrors, resetGlobalErrors] =
useResponseErrorHandler(
+responseToFormErrorFields,
+setError
+);
+
+function handleOnFormSubmitSuccess (file: ProjectFile) {
+const message = "File successfully created.";
+EventBus.sendAlert( "Success", message, "success");
+ProjectService.refreshProjectData(file.projectId);
+setFile('select', file, designerTab);
+setShowWizard(false);
+}
+
+function handleFormSubmit() {
+console.log("!!!", bean)
+let code = '{}';
+if (bean !== undefined && templateName !== EMPTY_BEAN) {
+const i = Integration.createNew("temp");
+i.spec.flows?.push(new Beans({beans: [bean]}))
+code = CamelDefinitionYaml.integrationToYaml(i);
+}
+const fullFileName = filename + CAMEL_YAML_EXT;
+const file = new ProjectFile(fullFileName, project.projectId, code,
Date.now());
+return ProjectService.createFile(file)
+.then(() => handleOnFormSubmitSuccess(file))
+.catch((error) => registerResponseErrors(error));
+}
+
useEffect(() => {
(camel-karavan) 01/04: Bean config wizard
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
commit 9df8d7da7e673f5a4abd6302f2cefd644eb1cf62
Author: Marat Gubaidullin
AuthorDate: Thu Feb 1 20:00:51 2024 -0500
Bean config wizard
---
.../camel/karavan/api/ProjectFileResource.java | 13 ++-
.../org/apache/camel/karavan/code/CodeService.java | 12 ++-
.../camel/karavan/service/ProjectService.java | 9 ++
.../snippets/database-bean-template.camel.yaml | 22
.../snippets/messaging-bean-template.camel.yaml| 9 ++
.../src/main/webui/src/api/KaravanApi.tsx | 11 ++
.../src/main/webui/src/api/ProjectStore.ts | 13 +++
.../src/main/webui/src/designer/DesignerStore.ts | 2 +-
.../src/main/webui/src/project/ProjectPanel.tsx| 30 +++---
.../main/webui/src/project/beans/BeanWizard.tsx| 118 +
10 files changed, 223 insertions(+), 16 deletions(-)
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectFileResource.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectFileResource.java
index 6f6c..41b78850 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectFileResource.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectFileResource.java
@@ -21,6 +21,7 @@ import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import org.apache.camel.karavan.code.CodeService;
import org.apache.camel.karavan.infinispan.InfinispanService;
+import org.apache.camel.karavan.infinispan.model.Project;
import org.apache.camel.karavan.infinispan.model.ProjectFile;
import org.apache.camel.karavan.validation.project.ProjectFileCreateValidator;
@@ -46,13 +47,21 @@ public class ProjectFileResource {
@GET
@Produces(MediaType.APPLICATION_JSON)
@Path("/{projectId}")
-public List get(@HeaderParam("username") String username,
- @PathParam("projectId") String projectId)
throws Exception {
+public List get(@PathParam("projectId") String projectId)
throws Exception {
return infinispanService.getProjectFiles(projectId).stream()
.sorted(Comparator.comparing(ProjectFile::getName))
.collect(Collectors.toList());
}
+@GET
+@Produces(MediaType.APPLICATION_JSON)
+@Path("/templates/beans")
+public List getBeanTemplates() throws Exception {
+return codeService.getBeanTemplateNames().stream()
+.map(s ->
infinispanService.getProjectFile(Project.Type.templates.name(), s))
+.toList();
+}
+
@POST
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/CodeService.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/CodeService.java
index e519b5a4..12644148 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/CodeService.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/CodeService.java
@@ -58,6 +58,7 @@ public class CodeService {
private static final Logger LOGGER =
Logger.getLogger(CodeService.class.getName());
public static final String APPLICATION_PROPERTIES_FILENAME =
"application.properties";
public static final String BUILD_SCRIPT_FILENAME = "build.sh";
+public static final String BEAN_TEMPLATE_SUFFIX_FILENAME =
"-bean-template.camel.yaml";
public static final String DEV_SERVICES_FILENAME = "devservices.yaml";
public static final String PROJECT_COMPOSE_FILENAME =
"docker-compose.yaml";
public static final String MARKDOWN_EXTENSION = ".md";
@@ -86,6 +87,7 @@ public class CodeService {
@Inject
Vertx vertx;
+List beansTemplates = List.of("database", "messaging");
List targets = List.of("openshift", "kubernetes", "docker");
List interfaces =
List.of("org.apache.camel.AggregationStrategy.java",
"org.apache.camel.Processor.java");
@@ -185,6 +187,10 @@ public class CodeService {
return null;
}
+public List getBeanTemplateNames(){
+return beansTemplates.stream().map(name -> name +
BEAN_TEMPLATE_SUFFIX_FILENAME).toList();
+}
+
public Map getTemplates() {
Map result = new HashMap<>();
@@ -192,10 +198,14 @@ public class CodeService {
files.addAll(targets.stream().map(target -> target + "-" +
APPLICATION_PROPERTIES_FILENAME).toList());
files.addAll(targets.stream().map(target -> target + "-" +
BUILD_SCRIPT_FILENAME).toList());
+files.addAll(getBeanTemplateNames());
+
files.forEach(file -> {
String templatePath = SNIPPETS_PATH + file;
String templateText = getResourceFile(templatePath);
-result.put(file, templateText
(camel-karavan) 04/04: Fix #1097
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
commit a4620125151544a5502c5bb7cd0c03b89bb2b627
Author: Marat Gubaidullin
AuthorDate: Fri Feb 2 17:41:55 2024 -0500
Fix #1097
---
.../karavan-app/src/main/webui/src/project/beans/BeanWizard.tsx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/karavan-web/karavan-app/src/main/webui/src/project/beans/BeanWizard.tsx
b/karavan-web/karavan-app/src/main/webui/src/project/beans/BeanWizard.tsx
index fa7dff0e..896dbe12 100644
--- a/karavan-web/karavan-app/src/main/webui/src/project/beans/BeanWizard.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/project/beans/BeanWizard.tsx
@@ -239,12 +239,12 @@ export function BeanWizard() {
}}
/>
-
+{templateName !== EMPTY_BEAN &&
{
setFilename(fn);
setValue('filename', fn,
{shouldValidate: true});
}}/>
-
+}
{!!errors.filename && (
(camel-karavan) branch main updated (31ddb809 -> a4620125)
This is an automated email from the ASF dual-hosted git repository.
marat pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
from 31ddb809 Fix #1094
new 9df8d7da Bean config wizard
new be1aeed6 Wizard #1097
new f6a7d87a Wizard file selector #1097
new a4620125 Fix #1097
The 4 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:
.../camel/karavan/api/ProjectFileResource.java | 13 +-
.../org/apache/camel/karavan/code/CodeService.java | 12 +-
.../camel/karavan/service/ProjectService.java | 9 +
.../snippets/database-bean-template.camel.yaml | 22 ++
.../snippets/messaging-bean-template.camel.yaml| 9 +
.../src/main/webui/src/api/KaravanApi.tsx | 11 +
.../src/main/webui/src/api/ProjectService.ts | 1 -
.../src/main/webui/src/api/ProjectStore.ts | 13 +
.../src/main/webui/src/designer/DesignerStore.ts | 2 +-
.../src/main/webui/src/project/ProjectPanel.tsx| 30 ++-
.../beans/BeanFilesDropdown.css} | 20 +-
.../webui/src/project/beans/BeanFilesDropdown.tsx | 85 +++
.../main/webui/src/project/beans/BeanWizard.tsx| 264 +
13 files changed, 464 insertions(+), 27 deletions(-)
create mode 100644
karavan-web/karavan-app/src/main/resources/snippets/database-bean-template.camel.yaml
create mode 100644
karavan-web/karavan-app/src/main/resources/snippets/messaging-bean-template.camel.yaml
copy karavan-web/karavan-app/src/main/webui/src/{containers/ContainerPage.css
=> project/beans/BeanFilesDropdown.css} (75%)
create mode 100644
karavan-web/karavan-app/src/main/webui/src/project/beans/BeanFilesDropdown.tsx
create mode 100644
karavan-web/karavan-app/src/main/webui/src/project/beans/BeanWizard.tsx
Re: [I] Integrations fail with Jib publish strategy [camel-k]
hernanDatgDev commented on issue #5007: URL: https://github.com/apache/camel-k/issues/5007#issuecomment-1924811235 @gansheer I tried applying your fix to 2.1.0 and the Jib strategy is working as expected. I believe that the logging in 2.1.0 w/ Jib simply was not detailed enough so the errors I was getting were hiding the fact that there was an issue with the container registry. I'm willing to make a PR for patching 2.1.0 but I must admit I'm not sure what the patching process looks like. -- 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 dependabot/maven/quarkiverse-minio.version-3.7.1 updated (24b2783fa4 -> 226216ede6)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/quarkiverse-minio.version-3.7.1 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from 24b2783fa4 Bump quarkiverse-minio.version from 3.3.1 to 3.7.1 add 226216ede6 Auto generated changes for dependabot commit 24b2783fa4000c2febcc47d60d6bad65d94c248e No new revisions were added by this update. Summary of changes: pom.xml | 2 +- poms/bom/src/main/generated/flattened-full-pom.xml| 10 +- poms/bom/src/main/generated/flattened-reduced-pom.xml | 6 +++--- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-)
Re: [PR] Bump quarkiverse-minio.version from 3.3.1 to 3.7.1 [camel-quarkus]
github-actions[bot] commented on PR #5716: URL: https://github.com/apache/camel-quarkus/pull/5716#issuecomment-1924723294 Branch auto synchronized due to changes in generated files. New workflow run triggered: https://github.com/apache/camel-quarkus/actions/runs/7761708539 -- 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] Bump quarkiverse-minio.version from 3.3.1 to 3.7.1 [camel-quarkus]
dependabot[bot] opened a new pull request, #5716: URL: https://github.com/apache/camel-quarkus/pull/5716 Bumps `quarkiverse-minio.version` from 3.3.1 to 3.7.1. Updates `io.quarkiverse.minio:quarkus-minio` from 3.3.1 to 3.7.1 Updates `io.quarkiverse.minio:quarkus-minio-deployment` from 3.3.1 to 3.7.1 Updates `io.quarkiverse.minio:quarkus-minio-native` from 3.3.1 to 3.7.1 Updates `io.quarkiverse.minio:quarkus-minio-native-deployment` from 3.3.1 to 3.7.1 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 this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) -- 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 dependabot/maven/quarkiverse-minio.version-3.7.1 created (now 24b2783fa4)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/quarkiverse-minio.version-3.7.1 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git at 24b2783fa4 Bump quarkiverse-minio.version from 3.3.1 to 3.7.1 No new revisions were added by this update.
Re: [PR] Enhancement add classifier field to the MavenArtifact struct [camel-k]
claudio4j commented on code in PR #5126:
URL: https://github.com/apache/camel-k/pull/5126#discussion_r1476701427
##
pkg/apis/camel/v1/maven_types_support.go:
##
@@ -24,7 +24,11 @@ import (
func (in *MavenArtifact) GetDependencyID() string {
switch {
case in.Version == "":
- return "mvn:" + in.GroupID + ":" + in.ArtifactID
+ if in.Classifier == "" {
+ return "mvn:" + in.GroupID + ":" + in.ArtifactID
+ } else {
+ return "mvn:" + in.GroupID + ":" + in.ArtifactID + ":"
+ in.Type + ":" + in.Classifier
Review Comment:
I clarified the behavior and added more testing.
##
pkg/apis/camel/v1/maven_types_support.go:
##
@@ -24,7 +24,11 @@ import (
func (in *MavenArtifact) GetDependencyID() string {
switch {
case in.Version == "":
- return "mvn:" + in.GroupID + ":" + in.ArtifactID
+ if in.Classifier == "" {
+ return "mvn:" + in.GroupID + ":" + in.ArtifactID
+ } else {
+ return "mvn:" + in.GroupID + ":" + in.ArtifactID + ":"
+ in.Type + ":" + in.Classifier
Review Comment:
I clarified the behavior and added more tests.
--
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] Enhancement add classifier field to the MavenArtifact struct [camel-k]
claudio4j commented on code in PR #5126:
URL: https://github.com/apache/camel-k/pull/5126#discussion_r1476701427
##
pkg/apis/camel/v1/maven_types_support.go:
##
@@ -24,7 +24,11 @@ import (
func (in *MavenArtifact) GetDependencyID() string {
switch {
case in.Version == "":
- return "mvn:" + in.GroupID + ":" + in.ArtifactID
+ if in.Classifier == "" {
+ return "mvn:" + in.GroupID + ":" + in.ArtifactID
+ } else {
+ return "mvn:" + in.GroupID + ":" + in.ArtifactID + ":"
+ in.Type + ":" + in.Classifier
Review Comment:
I changed the behavior and added more testing.
--
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 20377] *IT tests should be run with failsafe instead of surefire [camel]
orpiske commented on code in PR #12966:
URL: https://github.com/apache/camel/pull/12966#discussion_r1476513291
##
pom.xml:
##
@@ -915,5 +925,37 @@
+
+integration-test
+
+
+
+
+
+org.apache.maven.plugins
+maven-failsafe-plugin
+${maven-failsafe-plugin-version}
+
+
+
+integration-test
+verify
+
+
+
+
+false
+
+**/*IT.java
+**/*IntegrationTest.java
+
+
+**/*Test.java
+
+
+
+
+
+
Review Comment:
You should use: `mvn verify` [to run the
tests](https://maven.apache.org/surefire/maven-failsafe-plugin/) (unit +
integration).
--
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 20377] *IT tests should be run with failsafe instead of surefire [camel]
orpiske commented on code in PR #12966:
URL: https://github.com/apache/camel/pull/12966#discussion_r1476517267
##
pom.xml:
##
@@ -915,5 +925,37 @@
+
+integration-test
+
+
+
+
+
+org.apache.maven.plugins
+maven-failsafe-plugin
+${maven-failsafe-plugin-version}
+
+
+
+integration-test
+verify
+
+
+
+
+false
+
+**/*IT.java
+**/*IntegrationTest.java
+
+
+**/*Test.java
+
+
+
+
+
+
Review Comment:
My workflow (and I guess, the same for other committers) is just:
```
cd path/to/project
# Build with Maven Daemon, for quicker build (just once, unless I am working
on core changes also)
mvnd -Dquickly clean install
# Go to whatever you are working on (i.e.; camel-kafka)
cd components/camel-kafka
# Run the tests
mvn verify
```
Done.
--
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 20377] *IT tests should be run with failsafe instead of surefire [camel]
orpiske commented on code in PR #12966:
URL: https://github.com/apache/camel/pull/12966#discussion_r1476517267
##
pom.xml:
##
@@ -915,5 +925,37 @@
+
+integration-test
+
+
+
+
+
+org.apache.maven.plugins
+maven-failsafe-plugin
+${maven-failsafe-plugin-version}
+
+
+
+integration-test
+verify
+
+
+
+
+false
+
+**/*IT.java
+**/*IntegrationTest.java
+
+
+**/*Test.java
+
+
+
+
+
+
Review Comment:
My workflow (and I guess, the same for other committers) is just:
```
cd path/to/project
# Build with Maven Daemon, for quicker build
mvnd -Dquickly clean install
# Go to whatever you are working on (i.e.; camel-kafka)
cd components/camel-kafka
# Run the tests
mvn verify
```
Done.
--
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 20377] *IT tests should be run with failsafe instead of surefire [camel]
orpiske commented on code in PR #12966:
URL: https://github.com/apache/camel/pull/12966#discussion_r1476517267
##
pom.xml:
##
@@ -915,5 +925,37 @@
+
+integration-test
+
+
+
+
+
+org.apache.maven.plugins
+maven-failsafe-plugin
+${maven-failsafe-plugin-version}
+
+
+
+integration-test
+verify
+
+
+
+
+false
+
+**/*IT.java
+**/*IntegrationTest.java
+
+
+**/*Test.java
+
+
+
+
+
+
Review Comment:
My (and I guess, the same for other committers) is just:
```
cd path/to/project
# Build with Maven Daemon, for quicker build
mvnd -Dquickly clean install
# Go to whatever you are working on (i.e.; camel-kafka)
cd components/camel-kafka
# Run the tests
mvn verify
```
Done.
--
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 20377] *IT tests should be run with failsafe instead of surefire [camel]
orpiske commented on code in PR #12966:
URL: https://github.com/apache/camel/pull/12966#discussion_r1476513291
##
pom.xml:
##
@@ -915,5 +925,37 @@
+
+integration-test
+
+
+
+
+
+org.apache.maven.plugins
+maven-failsafe-plugin
+${maven-failsafe-plugin-version}
+
+
+
+integration-test
+verify
+
+
+
+
+false
+
+**/*IT.java
+**/*IntegrationTest.java
+
+
+**/*Test.java
+
+
+
+
+
+
Review Comment:
You should use: `mvn verify` to run the tests (unit + integration).
--
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 20377] *IT tests should be run with failsafe instead of surefire [camel]
cziesman commented on code in PR #12966:
URL: https://github.com/apache/camel/pull/12966#discussion_r1476489604
##
pom.xml:
##
@@ -915,5 +925,37 @@
+
+integration-test
+
+
+
+
+
+org.apache.maven.plugins
+maven-failsafe-plugin
+${maven-failsafe-plugin-version}
+
+
+
+integration-test
+verify
+
+
+
+
+false
+
+**/*IT.java
+**/*IntegrationTest.java
+
+
+**/*Test.java
+
+
+
+
+
+
Review Comment:
Has anybody else tried to run integration tests lately? When I run `mvn
failsafe:verify` against `main`, I get dozens of these errors:
```
[WARNING] The POM for
org.apache.maven.plugins:maves-surefire-plugin:jar:3.2.5 is missing, no
dependency information available
[WARNING] Failed to retrieve plugin descriptor for
org.apache.maven.plugins:maves-surefire-plugin:3.2.5: Plugin
org.apache.maven.plugins:maves-surefire-plugin:3.2.5 or one of its dependencies
could not be resolved: The following artifacts could not be resolved:
org.apache.maven.plugins:maves-surefire-plugin:jar:3.2.5 (absent):
org.apache.maven.plugins:maves-surefire-plugin:jar:3.2.5 was not found in
https://repo.maven.apache.org/maven2 during a previous attempt. This failure
was cached in the local repository and resolution is not reattempted until the
update interval of central has elapsed or updates are forced
```
It turns out that this line in `pom.xml`
`maves-surefire-plugin`
should be this:
`maven-surefire-plugin`
When I fix that, no integration tests are executed. Maybe there is a magic
combination of properties and profiles that enables integration tests to run,
but I couldn't figure it out.
You make a very good point about reducing complexity, but I think maybe
there needs to be a separate effort to refactor the POM structure. Things seem
to have gotten so complicated that tests can't even run reliably. In the
meantime, after days of trying, the profile that I created is the only way I
could find to run integration tests.
--
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] Integrations fail with Jib publish strategy [camel-k]
hernanDatgDev commented on issue #5007: URL: https://github.com/apache/camel-k/issues/5007#issuecomment-1924400415 @gansheer What would it look like to take the 2.2.0 fix RE this issue and patch it for v2.1.x? Could it really be as simple as taking the authentication refactoring you did and applying it to 2.1? My only concern is that the fix you made applies to errors seen w/ 2.2.0 and not with 2.1.0. I'm bringing this up again because my team and I tried using the JIB publishing strategy with a fresh Azure cluster and camel-k 2.1.0 and got similar errors with Jib as I did when I logged this ticket. -- 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 20377] *IT tests should be run with failsafe instead of surefire [camel]
orpiske commented on code in PR #12966:
URL: https://github.com/apache/camel/pull/12966#discussion_r1476463946
##
pom.xml:
##
@@ -409,13 +410,22 @@
org.apache.maven.plugins
-maves-surefire-plugin
+maven-surefire-plugin
${maven-surefire-plugin-version}
+
+
+**/*Test.java
+
+
+**/*IT.java
+**/*IntegrationTest.java
+
+
org.apache.maven.plugins
maven-failsafe-plugin
-${maven-surefire-plugin-version}
+${maven-failsafe-plugin-version}
Review Comment:
Yeah, I think this is OK.
--
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 20377] *IT tests should be run with failsafe instead of surefire [camel]
cziesman commented on code in PR #12966:
URL: https://github.com/apache/camel/pull/12966#discussion_r1476443510
##
pom.xml:
##
@@ -409,13 +410,22 @@
org.apache.maven.plugins
-maves-surefire-plugin
+maven-surefire-plugin
${maven-surefire-plugin-version}
+
+
+**/*Test.java
+
+
+**/*IT.java
+**/*IntegrationTest.java
+
+
org.apache.maven.plugins
maven-failsafe-plugin
-${maven-surefire-plugin-version}
+${maven-failsafe-plugin-version}
Review Comment:
The versions are the same today, but that may not always be the case. Or,
there may be a bug in one of the plugins that requires reverting to a previous
version. Finally, just for clarity, the version property name should match the
artifact ID.
--
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 20377] *IT tests should be run with failsafe instead of surefire [camel]
cziesman commented on code in PR #12966:
URL: https://github.com/apache/camel/pull/12966#discussion_r1476428491
##
pom.xml:
##
@@ -409,13 +410,22 @@
org.apache.maven.plugins
-maves-surefire-plugin
+maven-surefire-plugin
${maven-surefire-plugin-version}
+
+
+**/*Test.java
+
+
+**/*IT.java
+**/*IntegrationTest.java
+
+
Review Comment:
Surefire doesn't automatically exclude the pattern `*IntegrationTest.java`.
I added all of the combinations just for completeness.
--
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] build(deps): bump actions/setup-java from 3 to 4 in automatic-updates [camel-k-runtime]
claudio4j opened a new pull request, #1165: URL: https://github.com/apache/camel-k-runtime/pull/1165 **Release Note** ```release-note NONE ``` -- 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-runtime) 01/01: build(deps): bump actions/setup-java from 3 to 4 in automatic-updates
This is an automated email from the ASF dual-hosted git repository. claudio4j pushed a commit to branch claudio4j-patch-1 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git commit beac0e68661cf2170ce91fdcd9a302a33030c071 Author: Claudio Miranda AuthorDate: Fri Feb 2 14:12:22 2024 -0300 build(deps): bump actions/setup-java from 3 to 4 in automatic-updates --- .github/actions/automatic-updates/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/automatic-updates/action.yml b/.github/actions/automatic-updates/action.yml index e2010615..b33d1d1f 100644 --- a/.github/actions/automatic-updates/action.yml +++ b/.github/actions/automatic-updates/action.yml @@ -57,7 +57,7 @@ runs: git add CHANGELOG.md && git commit -m 'chore: update changelog' && echo "changelog=1" >> $GITHUB_ENV || echo "No changes to CHANGELOG.md" - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 17
(camel-k-runtime) branch claudio4j-patch-1 created (now beac0e68)
This is an automated email from the ASF dual-hosted git repository. claudio4j pushed a change to branch claudio4j-patch-1 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git at beac0e68 build(deps): bump actions/setup-java from 3 to 4 in automatic-updates This branch includes the following new commits: new beac0e68 build(deps): bump actions/setup-java from 3 to 4 in automatic-updates The 1 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: [I] Add a manual saga test in camel-quarkus-lra [camel-quarkus]
zhfeng closed issue #5713: Add a manual saga test in camel-quarkus-lra URL: https://github.com/apache/camel-quarkus/issues/5713 -- 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: Fix #573 to add manual saga tests (#5714)
This is an automated email from the ASF dual-hosted git repository.
zhfeng 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 212e996be9 Fix #573 to add manual saga tests (#5714)
212e996be9 is described below
commit 212e996be9b49dfaac451d76d7a2b5421178f22c
Author: Zheng Feng
AuthorDate: Sat Feb 3 00:37:39 2024 +0800
Fix #573 to add manual saga tests (#5714)
---
integration-tests/lra/pom.xml | 17 +
.../quarkus/component/lra/it/LraResource.java | 25 +++
.../camel/quarkus/component/lra/it/LraRoutes.java | 28 ++
.../camel/quarkus/component/lra/it/LraTest.java| 17 +
4 files changed, 87 insertions(+)
diff --git a/integration-tests/lra/pom.xml b/integration-tests/lra/pom.xml
index f1bb77d4fd..1f26196b9b 100644
--- a/integration-tests/lra/pom.xml
+++ b/integration-tests/lra/pom.xml
@@ -47,6 +47,10 @@
org.apache.camel.quarkus
camel-quarkus-lra
+
+org.apache.camel.quarkus
+camel-quarkus-mock
+
io.quarkus
quarkus-resteasy
@@ -180,6 +184,19 @@
+
+org.apache.camel.quarkus
+camel-quarkus-mock-deployment
+${project.version}
+pom
+test
+
+
+*
+*
+
+
+
diff --git
a/integration-tests/lra/src/main/java/org/apache/camel/quarkus/component/lra/it/LraResource.java
b/integration-tests/lra/src/main/java/org/apache/camel/quarkus/component/lra/it/LraResource.java
index 34539f08e0..45089dceeb 100644
---
a/integration-tests/lra/src/main/java/org/apache/camel/quarkus/component/lra/it/LraResource.java
+++
b/integration-tests/lra/src/main/java/org/apache/camel/quarkus/component/lra/it/LraResource.java
@@ -27,7 +27,9 @@ import jakarta.ws.rs.Produces;
import jakarta.ws.rs.QueryParam;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
+import org.apache.camel.CamelContext;
import org.apache.camel.FluentProducerTemplate;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.quarkus.component.lra.it.service.CreditService;
import org.apache.camel.quarkus.component.lra.it.service.OrderManagerService;
@@ -38,6 +40,9 @@ public class LraResource {
@Inject
FluentProducerTemplate producerTemplate;
+@Inject
+CamelContext context;
+
@Inject
CreditService creditService;
@@ -73,4 +78,24 @@ public class LraResource {
public int getAvailableCredit() {
return creditService.getCredit();
}
+
+@Path("/manual")
+@POST
+@Produces(MediaType.TEXT_PLAIN)
+public String manualSaga(@QueryParam("id") String id, String body) throws
Exception {
+String name = body.equals("fail") || body.equals("timeout") ?
"compensate" : "complete";
+MockEndpoint mockEndpoint = context.getEndpoint("mock:" + name,
MockEndpoint.class);
+mockEndpoint.reset();
+mockEndpoint.expectedMessageCount(1);
+mockEndpoint.expectedHeaderReceived("id", id);
+
+producerTemplate.to("direct:manualSaga")
+.withHeader("myid", id)
+.withBody(body)
+.send();
+
+mockEndpoint.assertIsSatisfied(5000);
+return
mockEndpoint.getReceivedExchanges().get(0).getMessage().getBody(String.class);
+}
+
}
diff --git
a/integration-tests/lra/src/main/java/org/apache/camel/quarkus/component/lra/it/LraRoutes.java
b/integration-tests/lra/src/main/java/org/apache/camel/quarkus/component/lra/it/LraRoutes.java
index 7438b51cd2..c97179ffb5 100644
---
a/integration-tests/lra/src/main/java/org/apache/camel/quarkus/component/lra/it/LraRoutes.java
+++
b/integration-tests/lra/src/main/java/org/apache/camel/quarkus/component/lra/it/LraRoutes.java
@@ -16,10 +16,13 @@
*/
package org.apache.camel.quarkus.component.lra.it;
+import java.util.concurrent.TimeUnit;
+
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.SagaCompletionMode;
import org.apache.camel.model.SagaPropagation;
import org.apache.camel.quarkus.component.lra.it.service.CreditService;
import org.apache.camel.quarkus.component.lra.it.service.OrderManagerService;
@@ -82,5 +85,30 @@ public class LraRoutes extends RouteBuilder {
throw new Exception("fail");
})
.end();
+
+// ManualSaga
+from("direct:manualS
Re: [PR] Add manual saga tests [camel-quarkus]
zhfeng merged PR #5714: URL: https://github.com/apache/camel-quarkus/pull/5714 -- 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] file: migrate batch test to non flaky harness #3584 [camel-quarkus]
aldettinger opened a new pull request, #5715: URL: https://github.com/apache/camel-quarkus/pull/5715 -- 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 regen_bot updated (f3c5605aab2 -> be75a1c1904)
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.git from f3c5605aab2 Bump huaweicloud-sdk-version from 3.1.79 to 3.1.80 (#12978) add be75a1c1904 Configuration of languages should be consistent (part 1) (#12980) No new revisions were added by this update. Summary of changes: .../apache/camel/language/bean/BeanLanguage.java | 191 ++- .../language/datasonnet/DatasonnetLanguage.java| 64 ++- .../apache/camel/language/joor/JavaLanguage.java | 25 ++- .../org/apache/camel/language/jq/JqLanguage.java | 18 +- .../apache/camel/jsonpath/JsonPathLanguage.java| 58 +++--- .../camel/jsonpath/JsonPathLanguageTest.java | 14 +- .../camel/language/xquery/XQueryLanguage.java | 3 + .../xtokenizer/XMLTokenExpressionIterator.java | 8 + .../language/xtokenizer/XMLTokenizeLanguage.java | 139 ++ .../apache/camel/language/wasm/WasmExpression.java | 4 + .../apache/camel/language/wasm/WasmLanguage.java | 37 ++-- .../apache/camel/language/xpath/XPathLanguage.java | 14 -- .../camel/language/tokenizer/TokenizeLanguage.java | 211 +++-- .../org/apache/camel/builder/ExpressionClause.java | 4 +- .../camel/builder/ExpressionClauseSupport.java | 76 +--- .../language/MethodCallExpressionReifier.java | 2 +- .../reifier/language/WasmExpressionReifier.java| 2 +- .../org/apache/camel/language/TokenizerTest.java | 37 ++-- .../org/apache/camel/support/CustomizersTest.java | 114 --- .../camel/support/SingleInputLanguageSupport.java | 1 + .../ROOT/pages/camel-4x-upgrade-guide-4_4.adoc | 5 + .../dsl/kotlin/KotlinRoutesBuilderLoaderTest.kt| 8 +- .../routes/routes-with-languages-configuration.kts | 6 +- 23 files changed, 271 insertions(+), 770 deletions(-)
(camel) branch main updated: Configuration of languages should be consistent (part 1) (#12980)
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 be75a1c1904 Configuration of languages should be consistent (part 1)
(#12980)
be75a1c1904 is described below
commit be75a1c190462a3c9e4858f099574350ece6216a
Author: Claus Ibsen
AuthorDate: Fri Feb 2 15:39:47 2024 +0100
Configuration of languages should be consistent (part 1) (#12980)
CAMEL-20378: Languages should be thread-safe and be configured only via
properties array, all in the same way.
---
.../apache/camel/language/bean/BeanLanguage.java | 191 ++-
.../language/datasonnet/DatasonnetLanguage.java| 64 ++-
.../apache/camel/language/joor/JavaLanguage.java | 25 ++-
.../org/apache/camel/language/jq/JqLanguage.java | 18 +-
.../apache/camel/jsonpath/JsonPathLanguage.java| 58 +++---
.../camel/jsonpath/JsonPathLanguageTest.java | 14 +-
.../camel/language/xquery/XQueryLanguage.java | 3 +
.../xtokenizer/XMLTokenExpressionIterator.java | 8 +
.../language/xtokenizer/XMLTokenizeLanguage.java | 139 ++
.../apache/camel/language/wasm/WasmExpression.java | 4 +
.../apache/camel/language/wasm/WasmLanguage.java | 37 ++--
.../apache/camel/language/xpath/XPathLanguage.java | 14 --
.../camel/language/tokenizer/TokenizeLanguage.java | 211 +++--
.../org/apache/camel/builder/ExpressionClause.java | 4 +-
.../camel/builder/ExpressionClauseSupport.java | 76 +---
.../language/MethodCallExpressionReifier.java | 2 +-
.../reifier/language/WasmExpressionReifier.java| 2 +-
.../org/apache/camel/language/TokenizerTest.java | 37 ++--
.../org/apache/camel/support/CustomizersTest.java | 114 ---
.../camel/support/SingleInputLanguageSupport.java | 1 +
.../ROOT/pages/camel-4x-upgrade-guide-4_4.adoc | 5 +
.../dsl/kotlin/KotlinRoutesBuilderLoaderTest.kt| 8 +-
.../routes/routes-with-languages-configuration.kts | 6 +-
23 files changed, 271 insertions(+), 770 deletions(-)
diff --git
a/components/camel-bean/src/main/java/org/apache/camel/language/bean/BeanLanguage.java
b/components/camel-bean/src/main/java/org/apache/camel/language/bean/BeanLanguage.java
index 2a3d3f5fb47..785dddb5204 100644
---
a/components/camel-bean/src/main/java/org/apache/camel/language/bean/BeanLanguage.java
+++
b/components/camel-bean/src/main/java/org/apache/camel/language/bean/BeanLanguage.java
@@ -64,56 +64,11 @@ public class BeanLanguage extends TypedLanguageSupport
implements ScriptingLangu
private volatile ParameterMappingStrategy parameterMappingStrategy;
private volatile Language simple;
-private Object bean;
-private Class beanType;
-private String ref;
-private String method;
-private BeanScope scope = BeanScope.Singleton;
private boolean validate = true;
public BeanLanguage() {
}
-public Object getBean() {
-return bean;
-}
-
-public void setBean(Object bean) {
-this.bean = bean;
-}
-
-public Class getBeanType() {
-return beanType;
-}
-
-public void setBeanType(Class beanType) {
-this.beanType = beanType;
-}
-
-public String getRef() {
-return ref;
-}
-
-public void setRef(String ref) {
-this.ref = ref;
-}
-
-public String getMethod() {
-return method;
-}
-
-public void setMethod(String method) {
-this.method = method;
-}
-
-public BeanScope getScope() {
-return scope;
-}
-
-public void setScope(BeanScope scope) {
-this.scope = scope;
-}
-
public boolean isValidate() {
return validate;
}
@@ -128,22 +83,6 @@ public class BeanLanguage extends TypedLanguageSupport
implements ScriptingLangu
throw new IllegalStateException("Can only configure our own
instance !");
}
switch (ignoreCase ? name.toLowerCase() : name) {
-case "bean":
-setBean(PropertyConfigurerSupport.property(camelContext,
Object.class, value));
-return true;
-case "beantype":
-case "beanType":
-setBeanType(PropertyConfigurerSupport.property(camelContext,
Class.class, value));
-return true;
-case "ref":
-setRef(PropertyConfigurerSupport.property(camelContext,
String.class, value));
-return true;
-case "method":
-setMethod(PropertyConfigurerSupport.property(camelContext,
String.class, value));
-return true;
-case "scope":
-setScope(PropertyConfigurerSupport.property(camelContext,
BeanScope.class, value));
-return true;
case "validate":
setValidate(Proper
(camel) branch lang2 deleted (was 2e8e8a4ed84)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch lang2 in repository https://gitbox.apache.org/repos/asf/camel.git was 2e8e8a4ed84 CAMEL-20378: Languages should be thread-safe and be configured only via properties array, all in the same way. 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] Configuration of languages should be consistent (part 1) [camel]
davsclaus merged PR #12980: URL: https://github.com/apache/camel/pull/12980 -- 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-20380: fixed incomplete batching on poll timeout [camel]
github-actions[bot] commented on PR #12982: URL: https://github.com/apache/camel/pull/12982#issuecomment-1924001521 :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-20380: fixed incomplete batching on poll timeout [camel]
orpiske opened a new pull request, #12982: URL: https://github.com/apache/camel/pull/12982 (no comment) -- 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] Karavan on minikube on macos does not start [camel-karavan]
arheom commented on issue #1096: URL: https://github.com/apache/camel-karavan/issues/1096#issuecomment-1923930270 Thats great to know it works on macos (I have M1). Do you have any suggestion what to try? I used this guide here: https://github.com/apache/camel-karavan/blob/main/docs/WEB_KUBERNETES.md with some exceptions, like I could not install hyperkit: > hyperkit: The x86_64 architecture is required for this software. > Error: hyperkit: An unsatisfied requirement failed this build. Thanks! -- 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] Karavan on minikube on macos does not start [camel-karavan]
mgubaidullin commented on issue #1096: URL: https://github.com/apache/camel-karavan/issues/1096#issuecomment-1923833974 I use MacOS with M2 to develop Karavan. Works well both Docker and Minikube -- 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-kamelets) branch regen_bot updated (e534f2fd -> cea53825)
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-kamelets.git from e534f2fd Kafka Batch Not Secured Source: Expose also maxPollIntervalMs option add 274e2f94 Kafka Batch Apicurio Not Secured Source: Expose also maxPollIntervalMs option add 607a8446 Kafka Batch Apicurio Not Secured Source: Expose also maxPollIntervalMs option add 5794ddc7 Kafka Batch Azure Source: Expose also maxPollIntervalMs option add 1a9243f5 Kafka Batch Azure Source: Expose also maxPollIntervalMs option add 43b23b7d Kafka Batch Scram Source: Expose also maxPollIntervalMs option add eb6ae21b Kafka Batch Scram Source: Expose also maxPollIntervalMs option add 27674b67 Kafka Batch Source: Expose also maxPollIntervalMs option add ab6a197d Kafka Batch Source: Expose also maxPollIntervalMs option add 32cb0c05 Kafka Batch SSL: Expose also maxPollIntervalMs option add cea53825 Kafka Batch SSL: Expose also maxPollIntervalMs option No new revisions were added by this update. Summary of changes: .../kafka-batch-apicurio-registry-not-secured-source.kamelet.yaml| 5 + kamelets/kafka-batch-azure-schema-registry-source.kamelet.yaml | 5 + kamelets/kafka-batch-scram-source.kamelet.yaml | 5 + kamelets/kafka-batch-source.kamelet.yaml | 5 + kamelets/kafka-batch-ssl-source.kamelet.yaml | 5 + .../kafka-batch-apicurio-registry-not-secured-source.kamelet.yaml| 5 + .../kamelets/kafka-batch-azure-schema-registry-source.kamelet.yaml | 5 + .../main/resources/kamelets/kafka-batch-scram-source.kamelet.yaml| 5 + .../src/main/resources/kamelets/kafka-batch-source.kamelet.yaml | 5 + .../src/main/resources/kamelets/kafka-batch-ssl-source.kamelet.yaml | 5 + 10 files changed, 50 insertions(+)
Re: [PR] CAMEL-20387: tracing-headers should be case insensitive [camel]
github-actions[bot] commented on PR #12981: URL: https://github.com/apache/camel/pull/12981#issuecomment-1923801379 :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-kamelets) branch kafka-maxInterval deleted (was 824c6678)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch kafka-maxInterval in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git was 824c6678 Kafka Batch SSL: Expose also maxPollIntervalMs option 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-kamelets) 08/10: Kafka Batch Source: Expose also maxPollIntervalMs option
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-kamelets.git
commit ab6a197da3b2025a42f5b9945c21f06e72cfd3d6
Author: Andrea Cosentino
AuthorDate: Fri Feb 2 14:16:07 2024 +0100
Kafka Batch Source: Expose also maxPollIntervalMs option
Signed-off-by: Andrea Cosentino
---
.../src/main/resources/kamelets/kafka-batch-source.kamelet.yaml | 5 +
1 file changed, 5 insertions(+)
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-source.kamelet.yaml
index 853e05bb..1e952363 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-source.kamelet.yaml
@@ -128,6 +128,10 @@ spec:
description: The timeout used when polling the KafkaConsumer
type: int
default: 5000
+ maxPollIntervalMs:
+title: Max Poll Interval
+description: The maximum delay between invocations of poll() when
using consumer group management
+type: int
dependencies:
- "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT"
- "camel:core"
@@ -155,6 +159,7 @@ spec:
groupId: "{{?consumerGroup}}"
maxPollRecords: "{{batchSize}}"
pollTimeoutMs: "{{pollTimeout}}"
+maxPollIntervalMs: "{{?maxPollIntervalMs}}"
batching: true
kafkaManualCommitFactory: "#bean:{{manualCommitFactory}}"
steps:
[I] Karavan on minikube on macos does not start [camel-karavan]
arheom opened a new issue, #1096: URL: https://github.com/apache/camel-karavan/issues/1096 As context, I have a macOS with arm, and I try to install the latest karavan (4.3.0) on a minikube on it. I followed the instructions from github, and also including with colima and it does not work. I managed to make it working with colima on docker, but not on minikube. All pods start, except the karavan one, with the error: > exec /__cacert_entrypoint.sh: exec format error which I understood comes from the fact it tries to run on arm. Anyone experimented with minikube on macos? Do you have any hint to try it out? Thanks! -- 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
(camel-kamelets) branch main updated (e534f2fd -> cea53825)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git from e534f2fd Kafka Batch Not Secured Source: Expose also maxPollIntervalMs option new 274e2f94 Kafka Batch Apicurio Not Secured Source: Expose also maxPollIntervalMs option new 607a8446 Kafka Batch Apicurio Not Secured Source: Expose also maxPollIntervalMs option new 5794ddc7 Kafka Batch Azure Source: Expose also maxPollIntervalMs option new 1a9243f5 Kafka Batch Azure Source: Expose also maxPollIntervalMs option new 43b23b7d Kafka Batch Scram Source: Expose also maxPollIntervalMs option new eb6ae21b Kafka Batch Scram Source: Expose also maxPollIntervalMs option new 27674b67 Kafka Batch Source: Expose also maxPollIntervalMs option new ab6a197d Kafka Batch Source: Expose also maxPollIntervalMs option new 32cb0c05 Kafka Batch SSL: Expose also maxPollIntervalMs option new cea53825 Kafka Batch SSL: Expose also maxPollIntervalMs option The 10 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: .../kafka-batch-apicurio-registry-not-secured-source.kamelet.yaml| 5 + kamelets/kafka-batch-azure-schema-registry-source.kamelet.yaml | 5 + kamelets/kafka-batch-scram-source.kamelet.yaml | 5 + kamelets/kafka-batch-source.kamelet.yaml | 5 + kamelets/kafka-batch-ssl-source.kamelet.yaml | 5 + .../kafka-batch-apicurio-registry-not-secured-source.kamelet.yaml| 5 + .../kamelets/kafka-batch-azure-schema-registry-source.kamelet.yaml | 5 + .../main/resources/kamelets/kafka-batch-scram-source.kamelet.yaml| 5 + .../src/main/resources/kamelets/kafka-batch-source.kamelet.yaml | 5 + .../src/main/resources/kamelets/kafka-batch-ssl-source.kamelet.yaml | 5 + 10 files changed, 50 insertions(+)
[PR] CAMEL-20387: tracing-headers should be case insensitive [camel]
dbregio opened a new pull request, #12981: URL: https://github.com/apache/camel/pull/12981 # Description See https://camel.zulipchat.com/#narrow/stream/257298-camel/topic/Micrometer.20Observation # 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-kamelets) 09/10: Kafka Batch SSL: Expose also maxPollIntervalMs option
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-kamelets.git
commit 32cb0c059c43ed8a9710ac63829494b01c80feaf
Author: Andrea Cosentino
AuthorDate: Fri Feb 2 14:18:11 2024 +0100
Kafka Batch SSL: Expose also maxPollIntervalMs option
Signed-off-by: Andrea Cosentino
---
kamelets/kafka-batch-ssl-source.kamelet.yaml | 5 +
1 file changed, 5 insertions(+)
diff --git a/kamelets/kafka-batch-ssl-source.kamelet.yaml
b/kamelets/kafka-batch-ssl-source.kamelet.yaml
index 5d6f4ad8..1c2dd340 100644
--- a/kamelets/kafka-batch-ssl-source.kamelet.yaml
+++ b/kamelets/kafka-batch-ssl-source.kamelet.yaml
@@ -152,6 +152,10 @@ spec:
description: The timeout used when polling the KafkaConsumer
type: int
default: 5000
+ maxPollIntervalMs:
+title: Max Poll Interval
+description: The maximum delay between invocations of poll() when
using consumer group management
+type: int
dependencies:
- "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT"
- "camel:core"
@@ -183,6 +187,7 @@ spec:
saslJaasConfig: '{{?saslJaasConfig}}'
maxPollRecords: "{{batchSize}}"
pollTimeoutMs: "{{pollTimeout}}"
+ maxPollIntervalMs: "{{?maxPollIntervalMs}}"
batching: true
kafkaManualCommitFactory: "#bean:{{manualCommitFactory}}"
type: '#class:org.apache.camel.component.kafka.KafkaConfiguration'
(camel-kamelets) 06/10: Kafka Batch Scram Source: Expose also maxPollIntervalMs option
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-kamelets.git
commit eb6ae21bb3860a040b483f3c8dd7598a6d07d7ba
Author: Andrea Cosentino
AuthorDate: Fri Feb 2 14:14:29 2024 +0100
Kafka Batch Scram Source: Expose also maxPollIntervalMs option
Signed-off-by: Andrea Cosentino
---
.../main/resources/kamelets/kafka-batch-scram-source.kamelet.yaml| 5 +
1 file changed, 5 insertions(+)
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-scram-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-scram-source.kamelet.yaml
index 0d5e6580..3a07972e 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-scram-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-scram-source.kamelet.yaml
@@ -128,6 +128,10 @@ spec:
description: The timeout used when polling the KafkaConsumer
type: int
default: 5000
+ maxPollIntervalMs:
+title: Max Poll Interval
+description: The maximum delay between invocations of poll() when
using consumer group management
+type: int
dependencies:
- "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT"
- "camel:core"
@@ -155,6 +159,7 @@ spec:
groupId: "{{?consumerGroup}}"
maxPollRecords: "{{batchSize}}"
pollTimeoutMs: "{{pollTimeout}}"
+maxPollIntervalMs: "{{?maxPollIntervalMs}}"
batching: true
kafkaManualCommitFactory: "#bean:{{manualCommitFactory}}"
steps:
(camel-kamelets) 07/10: Kafka Batch Source: Expose also maxPollIntervalMs option
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-kamelets.git
commit 27674b671791f5794ba8ed05941fe76512bd9452
Author: Andrea Cosentino
AuthorDate: Fri Feb 2 14:15:17 2024 +0100
Kafka Batch Source: Expose also maxPollIntervalMs option
Signed-off-by: Andrea Cosentino
---
kamelets/kafka-batch-source.kamelet.yaml | 5 +
1 file changed, 5 insertions(+)
diff --git a/kamelets/kafka-batch-source.kamelet.yaml
b/kamelets/kafka-batch-source.kamelet.yaml
index 853e05bb..1e952363 100644
--- a/kamelets/kafka-batch-source.kamelet.yaml
+++ b/kamelets/kafka-batch-source.kamelet.yaml
@@ -128,6 +128,10 @@ spec:
description: The timeout used when polling the KafkaConsumer
type: int
default: 5000
+ maxPollIntervalMs:
+title: Max Poll Interval
+description: The maximum delay between invocations of poll() when
using consumer group management
+type: int
dependencies:
- "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT"
- "camel:core"
@@ -155,6 +159,7 @@ spec:
groupId: "{{?consumerGroup}}"
maxPollRecords: "{{batchSize}}"
pollTimeoutMs: "{{pollTimeout}}"
+maxPollIntervalMs: "{{?maxPollIntervalMs}}"
batching: true
kafkaManualCommitFactory: "#bean:{{manualCommitFactory}}"
steps:
(camel-kamelets) 10/10: Kafka Batch SSL: Expose also maxPollIntervalMs option
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-kamelets.git
commit cea538253156d6f1a9d6a5ec253d2216ddf5ca43
Author: Andrea Cosentino
AuthorDate: Fri Feb 2 14:20:59 2024 +0100
Kafka Batch SSL: Expose also maxPollIntervalMs option
Signed-off-by: Andrea Cosentino
---
.../src/main/resources/kamelets/kafka-batch-ssl-source.kamelet.yaml | 5 +
1 file changed, 5 insertions(+)
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-ssl-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-ssl-source.kamelet.yaml
index 5d6f4ad8..1c2dd340 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-ssl-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-ssl-source.kamelet.yaml
@@ -152,6 +152,10 @@ spec:
description: The timeout used when polling the KafkaConsumer
type: int
default: 5000
+ maxPollIntervalMs:
+title: Max Poll Interval
+description: The maximum delay between invocations of poll() when
using consumer group management
+type: int
dependencies:
- "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT"
- "camel:core"
@@ -183,6 +187,7 @@ spec:
saslJaasConfig: '{{?saslJaasConfig}}'
maxPollRecords: "{{batchSize}}"
pollTimeoutMs: "{{pollTimeout}}"
+ maxPollIntervalMs: "{{?maxPollIntervalMs}}"
batching: true
kafkaManualCommitFactory: "#bean:{{manualCommitFactory}}"
type: '#class:org.apache.camel.component.kafka.KafkaConfiguration'
(camel-kamelets) 05/10: Kafka Batch Scram Source: Expose also maxPollIntervalMs option
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-kamelets.git
commit 43b23b7dadbdbc035aba60542cdf30f6e3d8c53c
Author: Andrea Cosentino
AuthorDate: Fri Feb 2 14:13:59 2024 +0100
Kafka Batch Scram Source: Expose also maxPollIntervalMs option
Signed-off-by: Andrea Cosentino
---
kamelets/kafka-batch-scram-source.kamelet.yaml | 5 +
1 file changed, 5 insertions(+)
diff --git a/kamelets/kafka-batch-scram-source.kamelet.yaml
b/kamelets/kafka-batch-scram-source.kamelet.yaml
index 0d5e6580..3a07972e 100644
--- a/kamelets/kafka-batch-scram-source.kamelet.yaml
+++ b/kamelets/kafka-batch-scram-source.kamelet.yaml
@@ -128,6 +128,10 @@ spec:
description: The timeout used when polling the KafkaConsumer
type: int
default: 5000
+ maxPollIntervalMs:
+title: Max Poll Interval
+description: The maximum delay between invocations of poll() when
using consumer group management
+type: int
dependencies:
- "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT"
- "camel:core"
@@ -155,6 +159,7 @@ spec:
groupId: "{{?consumerGroup}}"
maxPollRecords: "{{batchSize}}"
pollTimeoutMs: "{{pollTimeout}}"
+maxPollIntervalMs: "{{?maxPollIntervalMs}}"
batching: true
kafkaManualCommitFactory: "#bean:{{manualCommitFactory}}"
steps:
(camel-kamelets) 01/10: Kafka Batch Apicurio Not Secured Source: Expose also maxPollIntervalMs option
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-kamelets.git
commit 274e2f94501a2ca3b721cf330172abda61d9b94b
Author: Andrea Cosentino
AuthorDate: Fri Feb 2 14:10:55 2024 +0100
Kafka Batch Apicurio Not Secured Source: Expose also maxPollIntervalMs
option
Signed-off-by: Andrea Cosentino
---
.../kafka-batch-apicurio-registry-not-secured-source.kamelet.yaml| 5 +
1 file changed, 5 insertions(+)
diff --git
a/kamelets/kafka-batch-apicurio-registry-not-secured-source.kamelet.yaml
b/kamelets/kafka-batch-apicurio-registry-not-secured-source.kamelet.yaml
index 7b4c787a..0e5e43c3 100644
--- a/kamelets/kafka-batch-apicurio-registry-not-secured-source.kamelet.yaml
+++ b/kamelets/kafka-batch-apicurio-registry-not-secured-source.kamelet.yaml
@@ -115,6 +115,10 @@ spec:
description: The timeout used when polling the KafkaConsumer
type: int
default: 5000
+ maxPollIntervalMs:
+title: Max Poll Interval
+description: The maximum delay between invocations of poll() when
using consumer group management
+type: int
dependencies:
- "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT"
- "camel:kafka"
@@ -143,6 +147,7 @@ spec:
additionalProperties.apicurio.registry.avro-datum-provider:
"{{avroDatumProvider}}"
maxPollRecords: "{{batchSize}}"
pollTimeoutMs: "{{pollTimeout}}"
+maxPollIntervalMs: "{{?maxPollIntervalMs}}"
batching: true
kafkaManualCommitFactory: "#bean:{{manualCommitFactory}}"
steps:
(camel-kamelets) 03/10: Kafka Batch Azure Source: Expose also maxPollIntervalMs option
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-kamelets.git
commit 5794ddc7f81239785b5538b5852068dd9b76beca
Author: Andrea Cosentino
AuthorDate: Fri Feb 2 14:12:30 2024 +0100
Kafka Batch Azure Source: Expose also maxPollIntervalMs option
Signed-off-by: Andrea Cosentino
---
kamelets/kafka-batch-azure-schema-registry-source.kamelet.yaml | 5 +
1 file changed, 5 insertions(+)
diff --git a/kamelets/kafka-batch-azure-schema-registry-source.kamelet.yaml
b/kamelets/kafka-batch-azure-schema-registry-source.kamelet.yaml
index a83ad6ed..82d21574 100644
--- a/kamelets/kafka-batch-azure-schema-registry-source.kamelet.yaml
+++ b/kamelets/kafka-batch-azure-schema-registry-source.kamelet.yaml
@@ -135,6 +135,10 @@ spec:
description: The timeout used when polling the KafkaConsumer
type: int
default: 5000
+ maxPollIntervalMs:
+title: Max Poll Interval
+description: The maximum delay between invocations of poll() when
using consumer group management
+type: int
dependencies:
- "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT"
- "camel:kafka"
@@ -169,6 +173,7 @@ spec:
valueDeserializer: "{{valueDeserializer}}"
maxPollRecords: "{{batchSize}}"
pollTimeoutMs: "{{pollTimeout}}"
+maxPollIntervalMs: "{{?maxPollIntervalMs}}"
batching: true
kafkaManualCommitFactory: "#bean:{{manualCommitFactory}}"
additionalProperties.schema.registry.url: "{{azureRegistryUrl}}"
(camel-kamelets) 04/10: Kafka Batch Azure Source: Expose also maxPollIntervalMs option
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-kamelets.git
commit 1a9243f5b629f35a6d91e0bcbc4bddeb20cd47b9
Author: Andrea Cosentino
AuthorDate: Fri Feb 2 14:13:07 2024 +0100
Kafka Batch Azure Source: Expose also maxPollIntervalMs option
Signed-off-by: Andrea Cosentino
---
.../kamelets/kafka-batch-azure-schema-registry-source.kamelet.yaml | 5 +
1 file changed, 5 insertions(+)
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-azure-schema-registry-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-azure-schema-registry-source.kamelet.yaml
index a83ad6ed..82d21574 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-azure-schema-registry-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-azure-schema-registry-source.kamelet.yaml
@@ -135,6 +135,10 @@ spec:
description: The timeout used when polling the KafkaConsumer
type: int
default: 5000
+ maxPollIntervalMs:
+title: Max Poll Interval
+description: The maximum delay between invocations of poll() when
using consumer group management
+type: int
dependencies:
- "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT"
- "camel:kafka"
@@ -169,6 +173,7 @@ spec:
valueDeserializer: "{{valueDeserializer}}"
maxPollRecords: "{{batchSize}}"
pollTimeoutMs: "{{pollTimeout}}"
+maxPollIntervalMs: "{{?maxPollIntervalMs}}"
batching: true
kafkaManualCommitFactory: "#bean:{{manualCommitFactory}}"
additionalProperties.schema.registry.url: "{{azureRegistryUrl}}"
(camel-kamelets) 02/10: Kafka Batch Apicurio Not Secured Source: Expose also maxPollIntervalMs option
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-kamelets.git
commit 607a8446e53e35070426c6e5ea8f8995fb9b8779
Author: Andrea Cosentino
AuthorDate: Fri Feb 2 14:11:38 2024 +0100
Kafka Batch Apicurio Not Secured Source: Expose also maxPollIntervalMs
option
Signed-off-by: Andrea Cosentino
---
.../kafka-batch-apicurio-registry-not-secured-source.kamelet.yaml| 5 +
1 file changed, 5 insertions(+)
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-apicurio-registry-not-secured-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-apicurio-registry-not-secured-source.kamelet.yaml
index 7b4c787a..0e5e43c3 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-apicurio-registry-not-secured-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-apicurio-registry-not-secured-source.kamelet.yaml
@@ -115,6 +115,10 @@ spec:
description: The timeout used when polling the KafkaConsumer
type: int
default: 5000
+ maxPollIntervalMs:
+title: Max Poll Interval
+description: The maximum delay between invocations of poll() when
using consumer group management
+type: int
dependencies:
- "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT"
- "camel:kafka"
@@ -143,6 +147,7 @@ spec:
additionalProperties.apicurio.registry.avro-datum-provider:
"{{avroDatumProvider}}"
maxPollRecords: "{{batchSize}}"
pollTimeoutMs: "{{pollTimeout}}"
+maxPollIntervalMs: "{{?maxPollIntervalMs}}"
batching: true
kafkaManualCommitFactory: "#bean:{{manualCommitFactory}}"
steps:
Re: [PR] Kafka Batch Source Kamelets: Expose also maxPollIntervalMs option [camel-kamelets]
oscerd merged PR #1870: URL: https://github.com/apache/camel-kamelets/pull/1870 -- 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] Kafka Batch Source Kamelets: Expose also maxPollIntervalMs option [camel-kamelets]
oscerd opened a new pull request, #1870: URL: https://github.com/apache/camel-kamelets/pull/1870 (no comment) -- 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-kamelets) 03/10: Kafka Batch Azure Source: Expose also maxPollIntervalMs option
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch kafka-maxInterval
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit af418be784afac060dcd1bee0b3d4b1984f76335
Author: Andrea Cosentino
AuthorDate: Fri Feb 2 14:12:30 2024 +0100
Kafka Batch Azure Source: Expose also maxPollIntervalMs option
Signed-off-by: Andrea Cosentino
---
kamelets/kafka-batch-azure-schema-registry-source.kamelet.yaml | 5 +
1 file changed, 5 insertions(+)
diff --git a/kamelets/kafka-batch-azure-schema-registry-source.kamelet.yaml
b/kamelets/kafka-batch-azure-schema-registry-source.kamelet.yaml
index a83ad6ed..82d21574 100644
--- a/kamelets/kafka-batch-azure-schema-registry-source.kamelet.yaml
+++ b/kamelets/kafka-batch-azure-schema-registry-source.kamelet.yaml
@@ -135,6 +135,10 @@ spec:
description: The timeout used when polling the KafkaConsumer
type: int
default: 5000
+ maxPollIntervalMs:
+title: Max Poll Interval
+description: The maximum delay between invocations of poll() when
using consumer group management
+type: int
dependencies:
- "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT"
- "camel:kafka"
@@ -169,6 +173,7 @@ spec:
valueDeserializer: "{{valueDeserializer}}"
maxPollRecords: "{{batchSize}}"
pollTimeoutMs: "{{pollTimeout}}"
+maxPollIntervalMs: "{{?maxPollIntervalMs}}"
batching: true
kafkaManualCommitFactory: "#bean:{{manualCommitFactory}}"
additionalProperties.schema.registry.url: "{{azureRegistryUrl}}"
(camel-kamelets) 07/10: Kafka Batch Source: Expose also maxPollIntervalMs option
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch kafka-maxInterval
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit 72dcae61657428b694129a3379411f69455f52e1
Author: Andrea Cosentino
AuthorDate: Fri Feb 2 14:15:17 2024 +0100
Kafka Batch Source: Expose also maxPollIntervalMs option
Signed-off-by: Andrea Cosentino
---
kamelets/kafka-batch-source.kamelet.yaml | 5 +
1 file changed, 5 insertions(+)
diff --git a/kamelets/kafka-batch-source.kamelet.yaml
b/kamelets/kafka-batch-source.kamelet.yaml
index 853e05bb..1e952363 100644
--- a/kamelets/kafka-batch-source.kamelet.yaml
+++ b/kamelets/kafka-batch-source.kamelet.yaml
@@ -128,6 +128,10 @@ spec:
description: The timeout used when polling the KafkaConsumer
type: int
default: 5000
+ maxPollIntervalMs:
+title: Max Poll Interval
+description: The maximum delay between invocations of poll() when
using consumer group management
+type: int
dependencies:
- "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT"
- "camel:core"
@@ -155,6 +159,7 @@ spec:
groupId: "{{?consumerGroup}}"
maxPollRecords: "{{batchSize}}"
pollTimeoutMs: "{{pollTimeout}}"
+maxPollIntervalMs: "{{?maxPollIntervalMs}}"
batching: true
kafkaManualCommitFactory: "#bean:{{manualCommitFactory}}"
steps:
(camel-kamelets) 05/10: Kafka Batch Scram Source: Expose also maxPollIntervalMs option
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch kafka-maxInterval
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit 16768af6102ac5f98d6084232ecfa623d8e2b63e
Author: Andrea Cosentino
AuthorDate: Fri Feb 2 14:13:59 2024 +0100
Kafka Batch Scram Source: Expose also maxPollIntervalMs option
Signed-off-by: Andrea Cosentino
---
kamelets/kafka-batch-scram-source.kamelet.yaml | 5 +
1 file changed, 5 insertions(+)
diff --git a/kamelets/kafka-batch-scram-source.kamelet.yaml
b/kamelets/kafka-batch-scram-source.kamelet.yaml
index 0d5e6580..3a07972e 100644
--- a/kamelets/kafka-batch-scram-source.kamelet.yaml
+++ b/kamelets/kafka-batch-scram-source.kamelet.yaml
@@ -128,6 +128,10 @@ spec:
description: The timeout used when polling the KafkaConsumer
type: int
default: 5000
+ maxPollIntervalMs:
+title: Max Poll Interval
+description: The maximum delay between invocations of poll() when
using consumer group management
+type: int
dependencies:
- "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT"
- "camel:core"
@@ -155,6 +159,7 @@ spec:
groupId: "{{?consumerGroup}}"
maxPollRecords: "{{batchSize}}"
pollTimeoutMs: "{{pollTimeout}}"
+maxPollIntervalMs: "{{?maxPollIntervalMs}}"
batching: true
kafkaManualCommitFactory: "#bean:{{manualCommitFactory}}"
steps:
(camel-kamelets) 02/10: Kafka Batch Apicurio Not Secured Source: Expose also maxPollIntervalMs option
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch kafka-maxInterval
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit 8d189ecac588e5f88c9c11b20bbc0b03a1df50ab
Author: Andrea Cosentino
AuthorDate: Fri Feb 2 14:11:38 2024 +0100
Kafka Batch Apicurio Not Secured Source: Expose also maxPollIntervalMs
option
Signed-off-by: Andrea Cosentino
---
.../kafka-batch-apicurio-registry-not-secured-source.kamelet.yaml| 5 +
1 file changed, 5 insertions(+)
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-apicurio-registry-not-secured-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-apicurio-registry-not-secured-source.kamelet.yaml
index 7b4c787a..0e5e43c3 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-apicurio-registry-not-secured-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-apicurio-registry-not-secured-source.kamelet.yaml
@@ -115,6 +115,10 @@ spec:
description: The timeout used when polling the KafkaConsumer
type: int
default: 5000
+ maxPollIntervalMs:
+title: Max Poll Interval
+description: The maximum delay between invocations of poll() when
using consumer group management
+type: int
dependencies:
- "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT"
- "camel:kafka"
@@ -143,6 +147,7 @@ spec:
additionalProperties.apicurio.registry.avro-datum-provider:
"{{avroDatumProvider}}"
maxPollRecords: "{{batchSize}}"
pollTimeoutMs: "{{pollTimeout}}"
+maxPollIntervalMs: "{{?maxPollIntervalMs}}"
batching: true
kafkaManualCommitFactory: "#bean:{{manualCommitFactory}}"
steps:
(camel-kamelets) 06/10: Kafka Batch Scram Source: Expose also maxPollIntervalMs option
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch kafka-maxInterval
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit 75420c067b33eeb39941621b1c459cb8678cc377
Author: Andrea Cosentino
AuthorDate: Fri Feb 2 14:14:29 2024 +0100
Kafka Batch Scram Source: Expose also maxPollIntervalMs option
Signed-off-by: Andrea Cosentino
---
.../main/resources/kamelets/kafka-batch-scram-source.kamelet.yaml| 5 +
1 file changed, 5 insertions(+)
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-scram-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-scram-source.kamelet.yaml
index 0d5e6580..3a07972e 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-scram-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-scram-source.kamelet.yaml
@@ -128,6 +128,10 @@ spec:
description: The timeout used when polling the KafkaConsumer
type: int
default: 5000
+ maxPollIntervalMs:
+title: Max Poll Interval
+description: The maximum delay between invocations of poll() when
using consumer group management
+type: int
dependencies:
- "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT"
- "camel:core"
@@ -155,6 +159,7 @@ spec:
groupId: "{{?consumerGroup}}"
maxPollRecords: "{{batchSize}}"
pollTimeoutMs: "{{pollTimeout}}"
+maxPollIntervalMs: "{{?maxPollIntervalMs}}"
batching: true
kafkaManualCommitFactory: "#bean:{{manualCommitFactory}}"
steps:
(camel-kamelets) 08/10: Kafka Batch Source: Expose also maxPollIntervalMs option
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch kafka-maxInterval
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit 090c9f06570957280af3c987049f17c1c58b3d7b
Author: Andrea Cosentino
AuthorDate: Fri Feb 2 14:16:07 2024 +0100
Kafka Batch Source: Expose also maxPollIntervalMs option
Signed-off-by: Andrea Cosentino
---
.../src/main/resources/kamelets/kafka-batch-source.kamelet.yaml | 5 +
1 file changed, 5 insertions(+)
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-source.kamelet.yaml
index 853e05bb..1e952363 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-source.kamelet.yaml
@@ -128,6 +128,10 @@ spec:
description: The timeout used when polling the KafkaConsumer
type: int
default: 5000
+ maxPollIntervalMs:
+title: Max Poll Interval
+description: The maximum delay between invocations of poll() when
using consumer group management
+type: int
dependencies:
- "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT"
- "camel:core"
@@ -155,6 +159,7 @@ spec:
groupId: "{{?consumerGroup}}"
maxPollRecords: "{{batchSize}}"
pollTimeoutMs: "{{pollTimeout}}"
+maxPollIntervalMs: "{{?maxPollIntervalMs}}"
batching: true
kafkaManualCommitFactory: "#bean:{{manualCommitFactory}}"
steps:
(camel-kamelets) 04/10: Kafka Batch Azure Source: Expose also maxPollIntervalMs option
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch kafka-maxInterval
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit a68cfc0dcba6f37091b6218e371f98466bcdd111
Author: Andrea Cosentino
AuthorDate: Fri Feb 2 14:13:07 2024 +0100
Kafka Batch Azure Source: Expose also maxPollIntervalMs option
Signed-off-by: Andrea Cosentino
---
.../kamelets/kafka-batch-azure-schema-registry-source.kamelet.yaml | 5 +
1 file changed, 5 insertions(+)
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-azure-schema-registry-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-azure-schema-registry-source.kamelet.yaml
index a83ad6ed..82d21574 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-azure-schema-registry-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-azure-schema-registry-source.kamelet.yaml
@@ -135,6 +135,10 @@ spec:
description: The timeout used when polling the KafkaConsumer
type: int
default: 5000
+ maxPollIntervalMs:
+title: Max Poll Interval
+description: The maximum delay between invocations of poll() when
using consumer group management
+type: int
dependencies:
- "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT"
- "camel:kafka"
@@ -169,6 +173,7 @@ spec:
valueDeserializer: "{{valueDeserializer}}"
maxPollRecords: "{{batchSize}}"
pollTimeoutMs: "{{pollTimeout}}"
+maxPollIntervalMs: "{{?maxPollIntervalMs}}"
batching: true
kafkaManualCommitFactory: "#bean:{{manualCommitFactory}}"
additionalProperties.schema.registry.url: "{{azureRegistryUrl}}"
(camel-kamelets) 01/10: Kafka Batch Apicurio Not Secured Source: Expose also maxPollIntervalMs option
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch kafka-maxInterval
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit 73464f34564e2d0a745a7b6818401a79fa1674b1
Author: Andrea Cosentino
AuthorDate: Fri Feb 2 14:10:55 2024 +0100
Kafka Batch Apicurio Not Secured Source: Expose also maxPollIntervalMs
option
Signed-off-by: Andrea Cosentino
---
.../kafka-batch-apicurio-registry-not-secured-source.kamelet.yaml| 5 +
1 file changed, 5 insertions(+)
diff --git
a/kamelets/kafka-batch-apicurio-registry-not-secured-source.kamelet.yaml
b/kamelets/kafka-batch-apicurio-registry-not-secured-source.kamelet.yaml
index 7b4c787a..0e5e43c3 100644
--- a/kamelets/kafka-batch-apicurio-registry-not-secured-source.kamelet.yaml
+++ b/kamelets/kafka-batch-apicurio-registry-not-secured-source.kamelet.yaml
@@ -115,6 +115,10 @@ spec:
description: The timeout used when polling the KafkaConsumer
type: int
default: 5000
+ maxPollIntervalMs:
+title: Max Poll Interval
+description: The maximum delay between invocations of poll() when
using consumer group management
+type: int
dependencies:
- "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT"
- "camel:kafka"
@@ -143,6 +147,7 @@ spec:
additionalProperties.apicurio.registry.avro-datum-provider:
"{{avroDatumProvider}}"
maxPollRecords: "{{batchSize}}"
pollTimeoutMs: "{{pollTimeout}}"
+maxPollIntervalMs: "{{?maxPollIntervalMs}}"
batching: true
kafkaManualCommitFactory: "#bean:{{manualCommitFactory}}"
steps:
(camel-kamelets) 09/10: Kafka Batch SSL: Expose also maxPollIntervalMs option
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch kafka-maxInterval
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit 47093120a5831c823522212d2cfaa76e9c3d492b
Author: Andrea Cosentino
AuthorDate: Fri Feb 2 14:18:11 2024 +0100
Kafka Batch SSL: Expose also maxPollIntervalMs option
Signed-off-by: Andrea Cosentino
---
kamelets/kafka-batch-ssl-source.kamelet.yaml | 5 +
1 file changed, 5 insertions(+)
diff --git a/kamelets/kafka-batch-ssl-source.kamelet.yaml
b/kamelets/kafka-batch-ssl-source.kamelet.yaml
index 5d6f4ad8..1c2dd340 100644
--- a/kamelets/kafka-batch-ssl-source.kamelet.yaml
+++ b/kamelets/kafka-batch-ssl-source.kamelet.yaml
@@ -152,6 +152,10 @@ spec:
description: The timeout used when polling the KafkaConsumer
type: int
default: 5000
+ maxPollIntervalMs:
+title: Max Poll Interval
+description: The maximum delay between invocations of poll() when
using consumer group management
+type: int
dependencies:
- "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT"
- "camel:core"
@@ -183,6 +187,7 @@ spec:
saslJaasConfig: '{{?saslJaasConfig}}'
maxPollRecords: "{{batchSize}}"
pollTimeoutMs: "{{pollTimeout}}"
+ maxPollIntervalMs: "{{?maxPollIntervalMs}}"
batching: true
kafkaManualCommitFactory: "#bean:{{manualCommitFactory}}"
type: '#class:org.apache.camel.component.kafka.KafkaConfiguration'
(camel-kamelets) branch kafka-maxInterval created (now 824c6678)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch kafka-maxInterval in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git at 824c6678 Kafka Batch SSL: Expose also maxPollIntervalMs option This branch includes the following new commits: new 73464f34 Kafka Batch Apicurio Not Secured Source: Expose also maxPollIntervalMs option new 8d189eca Kafka Batch Apicurio Not Secured Source: Expose also maxPollIntervalMs option new af418be7 Kafka Batch Azure Source: Expose also maxPollIntervalMs option new a68cfc0d Kafka Batch Azure Source: Expose also maxPollIntervalMs option new 16768af6 Kafka Batch Scram Source: Expose also maxPollIntervalMs option new 75420c06 Kafka Batch Scram Source: Expose also maxPollIntervalMs option new 72dcae61 Kafka Batch Source: Expose also maxPollIntervalMs option new 090c9f06 Kafka Batch Source: Expose also maxPollIntervalMs option new 47093120 Kafka Batch SSL: Expose also maxPollIntervalMs option new 824c6678 Kafka Batch SSL: Expose also maxPollIntervalMs option The 10 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.
(camel-kamelets) 10/10: Kafka Batch SSL: Expose also maxPollIntervalMs option
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch kafka-maxInterval
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit 824c6678dc96ef0dddf3b5b4df1ff71cab5c3585
Author: Andrea Cosentino
AuthorDate: Fri Feb 2 14:20:59 2024 +0100
Kafka Batch SSL: Expose also maxPollIntervalMs option
Signed-off-by: Andrea Cosentino
---
.../src/main/resources/kamelets/kafka-batch-ssl-source.kamelet.yaml | 5 +
1 file changed, 5 insertions(+)
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-ssl-source.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-ssl-source.kamelet.yaml
index 5d6f4ad8..1c2dd340 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-ssl-source.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/kafka-batch-ssl-source.kamelet.yaml
@@ -152,6 +152,10 @@ spec:
description: The timeout used when polling the KafkaConsumer
type: int
default: 5000
+ maxPollIntervalMs:
+title: Max Poll Interval
+description: The maximum delay between invocations of poll() when
using consumer group management
+type: int
dependencies:
- "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT"
- "camel:core"
@@ -183,6 +187,7 @@ spec:
saslJaasConfig: '{{?saslJaasConfig}}'
maxPollRecords: "{{batchSize}}"
pollTimeoutMs: "{{pollTimeout}}"
+ maxPollIntervalMs: "{{?maxPollIntervalMs}}"
batching: true
kafkaManualCommitFactory: "#bean:{{manualCommitFactory}}"
type: '#class:org.apache.camel.component.kafka.KafkaConfiguration'
Re: [PR] Add manual saga tests [camel-quarkus]
zhfeng commented on code in PR #5714: URL: https://github.com/apache/camel-quarkus/pull/5714#discussion_r1476053867 ## integration-tests/lra/pom.xml: ## @@ -47,6 +47,10 @@ org.apache.camel.quarkus camel-quarkus-lra + +org.apache.camel.quarkus +camel-quarkus-mock Review Comment: When I run `mvn process-resources -Pformat -N` to regenerate. ``` [ERROR] Failed to execute goal org.l2x6.cq:cq-maven-plugin:4.4.7:format (sort-poms) on project camel-quarkus: Unable to parse configuration of mojo org.l2x6.cq:cq-maven-plugin:4.4.7:format for parameter updateVirtualDependencies: Cannot set 'updateVirtualDependencies' in class org.l2x6.cq.maven.FormatPomsMojo: Type org.apache.maven.shared.utils.io.DirectoryScanner not present -> [Help 1] ``` @ppalaga is it an issue with cq-maven-plugin? -- 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 manual saga tests [camel-quarkus]
zhfeng commented on code in PR #5714: URL: https://github.com/apache/camel-quarkus/pull/5714#discussion_r1476039740 ## integration-tests/lra/pom.xml: ## @@ -47,6 +47,10 @@ org.apache.camel.quarkus camel-quarkus-lra + +org.apache.camel.quarkus +camel-quarkus-mock Review Comment: Nice catch! -- 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 manual saga tests [camel-quarkus]
jamesnetherton commented on code in PR #5714: URL: https://github.com/apache/camel-quarkus/pull/5714#discussion_r1476027745 ## integration-tests/lra/pom.xml: ## @@ -47,6 +47,10 @@ org.apache.camel.quarkus camel-quarkus-lra + +org.apache.camel.quarkus +camel-quarkus-mock Review Comment: Please also add to the `virtualDependencies` profile. -- 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] Enhancement add classifier field to the MavenArtifact struct [camel-k]
squakez commented on code in PR #5126:
URL: https://github.com/apache/camel-k/pull/5126#discussion_r1476009977
##
pkg/apis/camel/v1/maven_types_support.go:
##
@@ -24,7 +24,11 @@ import (
func (in *MavenArtifact) GetDependencyID() string {
switch {
case in.Version == "":
- return "mvn:" + in.GroupID + ":" + in.ArtifactID
+ if in.Classifier == "" {
+ return "mvn:" + in.GroupID + ":" + in.ArtifactID
+ } else {
+ return "mvn:" + in.GroupID + ":" + in.ArtifactID + ":"
+ in.Type + ":" + in.Classifier
Review Comment:
Then we need to enforce a check to verify that both classifier and type are
present. Something like: `if in.Classifier != "" && in.Type != ""` in order to
avoid to have a possible runtime value such as "mvn:gid:art::classif". We may
even see if an error return value makes sense.
--
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 manual saga tests [camel-quarkus]
zhfeng opened a new pull request, #5714: URL: https://github.com/apache/camel-quarkus/pull/5714 Fix #5713 -- 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 a manual saga test in camel-quarkus-lra [camel-quarkus]
zhfeng opened a new issue, #5713: URL: https://github.com/apache/camel-quarkus/issues/5713 ### Describe the feature here It could leverage `LRAManualIT` from camel core and test with complete or compensate saga transaction manually. -- 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] Enhancement add classifier field to the MavenArtifact struct [camel-k]
claudio4j commented on code in PR #5126:
URL: https://github.com/apache/camel-k/pull/5126#discussion_r1476002653
##
pkg/apis/camel/v1/maven_types_support.go:
##
@@ -24,7 +24,11 @@ import (
func (in *MavenArtifact) GetDependencyID() string {
switch {
case in.Version == "":
- return "mvn:" + in.GroupID + ":" + in.ArtifactID
+ if in.Classifier == "" {
+ return "mvn:" + in.GroupID + ":" + in.ArtifactID
+ } else {
+ return "mvn:" + in.GroupID + ":" + in.ArtifactID + ":"
+ in.Type + ":" + in.Classifier
Review Comment:
The definition of the full dependency is:
``
However the dependency regex and the other checkers were not handling the
`type` field, and I didn't want to spend too much time finding the right regex
to handle the type or the classifier in isolation, because doing so would
require to change the dependency spec to allow either
`::` or `::`, but the
`type` and `classifier` may be any word, so we would have to determine a way
to set both cases.
Then, the solution I found at this moment is if the `classifier` is set,
then the `type` is a required field.
I suggest to open a new issue to better investigate this particular issue.
--
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] Enhancement add classifier field to the MavenArtifact struct [camel-k]
squakez commented on code in PR #5126:
URL: https://github.com/apache/camel-k/pull/5126#discussion_r1475979381
##
pkg/apis/camel/v1/maven_types_support.go:
##
@@ -24,7 +24,11 @@ import (
func (in *MavenArtifact) GetDependencyID() string {
switch {
case in.Version == "":
- return "mvn:" + in.GroupID + ":" + in.ArtifactID
+ if in.Classifier == "" {
+ return "mvn:" + in.GroupID + ":" + in.ArtifactID
+ } else {
+ return "mvn:" + in.GroupID + ":" + in.ArtifactID + ":"
+ in.Type + ":" + in.Classifier
Review Comment:
Maybe we should check the presence of the type as well, is 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
(camel) branch lang2 updated (4fb8a1e8298 -> 2e8e8a4ed84)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch lang2 in repository https://gitbox.apache.org/repos/asf/camel.git from 4fb8a1e8298 CAMEL-20378: Languages should be thread-safe and be configured only via properties array, all in the same way. add 2e8e8a4ed84 CAMEL-20378: Languages should be thread-safe and be configured only via properties array, all in the same way. No new revisions were added by this update. Summary of changes: .../apache/camel/jsonpath/JsonPathLanguage.java| 118 +++-- 1 file changed, 112 insertions(+), 6 deletions(-)
(camel-quarkus) branch 3.2.x updated: CXF-SOAP: Cover possible regression prior CXF fix causing hang of the client
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 3.2.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/3.2.x by this push:
new bf89a77086 CXF-SOAP: Cover possible regression prior CXF fix causing
hang of the client
bf89a77086 is described below
commit bf89a770869c09f9131164a8752217b4e21b8349
Author: JiriOndrusek
AuthorDate: Fri Jan 26 13:42:45 2024 +0100
CXF-SOAP: Cover possible regression prior CXF fix causing hang of the client
---
.../cxf-soap/cxf-soap-ws-security-client/pom.xml | 46 +
.../src/main/resources/application.properties | 2 +-
.../src/main/resources/wsdl/HelloWorld.wsdl| 109 +
.../soap/wss/client/it/CxfSoapWssClientTest.java | 62
integration-tests/cxf-soap-grouped/pom.xml | 22 +
5 files changed, 240 insertions(+), 1 deletion(-)
diff --git
a/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/pom.xml
b/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/pom.xml
index 1cf06afb25..a04e9ab7e8 100644
--- a/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/pom.xml
+++ b/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/pom.xml
@@ -81,6 +81,11 @@
quarkus-junit4-mock
test
+
+org.awaitility
+awaitility
+test
+
@@ -178,6 +183,47 @@
true
+
+full
+
+
+!quickly
+
+
+
+
+
+org.codehaus.mojo
+keytool-maven-plugin
+
+password
+365
+RSA
+password
+
+
+
+generate-alice-wrong-keypair
+generate-sources
+
+clean
+generateKeyPair
+
+
+alice_wrong
+CN=alice_wrong, OU=eng,
O=apache.org
+
+
IssuerAlternativeName=DNS:NOT-FOR-PRODUCTION-USE
+
SubjectAlternativeName=DNS:localhost,IP:127.0.0.1
+
+
${project.build.outputDirectory}/alice_wrong.jks
+
+
+
+
+
+
+
diff --git
a/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/main/resources/application.properties
b/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/main/resources/application.properties
index 3b313fc38d..672c8456bf 100644
---
a/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/main/resources/application.properties
+++
b/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/main/resources/application.properties
@@ -19,7 +19,7 @@ quarkus.cxf.path=/soapservice
quarkus.native.resources.includes = wsdl/*.wsdl
# do everything with named parameter sets so that it works in the grouped
module
-quarkus.cxf.codegen.wsdl2java.security-client.includes =
wsdl/WssCalculatorService.wsdl
+quarkus.cxf.codegen.wsdl2java.security-client.includes =
wsdl/WssCalculatorService.wsdl,wsdl/HelloWorld.wsdl
quarkus.cxf.codegen.wsdl2java.security-client.additional-params =
-wsdlLocation,classpath:wsdl/WssCalculatorService.wsdl
# Workaround heap OOMs on GitHub actions
diff --git
a/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/main/resources/wsdl/HelloWorld.wsdl
b/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/main/resources/wsdl/HelloWorld.wsdl
new file mode 100644
index 00..76e6f30add
--- /dev/null
+++
b/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/main/resources/wsdl/HelloWorld.wsdl
@@ -0,0 +1,109 @@
+
+
+http://www.w3.org/2001/XMLSchema";
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
+
xmlns:tns="http://www.apache.org/camel/quarkus/components/cxf/soap/wss/client/helloWorld";
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
+ name="ContactService"
+
targetNamespace="http://www.apache.org/camel/quarkus/components/cxf/soap/wss/client/helloWorld";
+ xmlns:wsp="http://www.w3.org/ns/ws-policy";
+
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity
Re: [PR] CXF-SOAP: Cover possible regression of indefinitive hang [camel-quarkus]
jamesnetherton merged PR #5712: URL: https://github.com/apache/camel-quarkus/pull/5712 -- 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] Configuration of languages should be consistent (part 1) [camel]
github-actions[bot] commented on PR #12980: URL: https://github.com/apache/camel/pull/12980#issuecomment-1923625085 :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] Configuration of languages should be consistent (part 1) [camel]
davsclaus opened a new pull request, #12980: URL: https://github.com/apache/camel/pull/12980 # 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) 10/13: CAMEL-20378: Languages should be thread-safe and be configured only via properties array, all in the same way.
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch lang2 in repository https://gitbox.apache.org/repos/asf/camel.git commit 07b1d3505fd61b6004a61bea733cb2c7fb47bb2c Author: Claus Ibsen AuthorDate: Fri Feb 2 11:31:11 2024 +0100 CAMEL-20378: Languages should be thread-safe and be configured only via properties array, all in the same way. --- .../org/apache/camel/reifier/language/MethodCallExpressionReifier.java | 2 +- .../java/org/apache/camel/reifier/language/WasmExpressionReifier.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/MethodCallExpressionReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/MethodCallExpressionReifier.java index 70bbbf58757..2269903b5c6 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/MethodCallExpressionReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/MethodCallExpressionReifier.java @@ -36,7 +36,7 @@ public class MethodCallExpressionReifier extends TypedExpressionReifier
(camel) 04/13: CAMEL-20378: Languages should be thread-safe and be configured only via properties array, all in the same way.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch lang2
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b7a28a434634dfa8fed84ac35cd2871c1519eadc
Author: Claus Ibsen
AuthorDate: Fri Feb 2 10:42:36 2024 +0100
CAMEL-20378: Languages should be thread-safe and be configured only via
properties array, all in the same way.
---
.../apache/camel/jsonpath/JsonPathLanguage.java| 162 -
.../camel/jsonpath/JsonPathLanguageTest.java | 14 +-
.../camel/builder/ExpressionClauseSupport.java | 76 +++---
3 files changed, 85 insertions(+), 167 deletions(-)
diff --git
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathLanguage.java
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathLanguage.java
index b8879cfcbec..6732297483f 100644
---
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathLanguage.java
+++
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathLanguage.java
@@ -21,125 +21,63 @@ import java.util.List;
import com.jayway.jsonpath.JsonPath;
import com.jayway.jsonpath.Option;
-import org.apache.camel.CamelContext;
import org.apache.camel.Expression;
import org.apache.camel.Predicate;
import org.apache.camel.jsonpath.easypredicate.EasyPredicateParser;
-import org.apache.camel.spi.PropertyConfigurer;
import org.apache.camel.spi.annotations.Language;
+import org.apache.camel.support.ExpressionToPredicateAdapter;
import org.apache.camel.support.SingleInputTypedLanguageSupport;
-import org.apache.camel.support.component.PropertyConfigurerSupport;
@Language("jsonpath")
-public class JsonPathLanguage extends SingleInputTypedLanguageSupport
implements PropertyConfigurer {
-
-private boolean suppressExceptions;
-private boolean allowSimple = true;
-private boolean allowEasyPredicate = true;
-private boolean writeAsString;
-private boolean unpackArray;
-private Option[] options;
-
-public boolean isSuppressExceptions() {
-return suppressExceptions;
-}
-
-public void setSuppressExceptions(boolean suppressExceptions) {
-this.suppressExceptions = suppressExceptions;
-}
-
-public boolean isAllowSimple() {
-return allowSimple;
-}
-
-public void setAllowSimple(boolean allowSimple) {
-this.allowSimple = allowSimple;
-}
-
-public boolean isAllowEasyPredicate() {
-return allowEasyPredicate;
-}
-
-public void setAllowEasyPredicate(boolean allowEasyPredicate) {
-this.allowEasyPredicate = allowEasyPredicate;
-}
-
-public boolean isWriteAsString() {
-return writeAsString;
-}
-
-public void setWriteAsString(boolean writeAsString) {
-this.writeAsString = writeAsString;
-}
-
-public boolean isUnpackArray() {
-return unpackArray;
-}
-
-public void setUnpackArray(boolean unpackArray) {
-this.unpackArray = unpackArray;
-}
-
-public Option[] getOptions() {
-return options;
-}
-
-public void setOptions(Option... options) {
-this.options = options;
-}
+public class JsonPathLanguage extends SingleInputTypedLanguageSupport {
@Override
public Predicate createPredicate(String expression) {
-JsonPathExpression answer = (JsonPathExpression)
createExpression(expression);
-answer.setPredicate(true);
-return answer;
+return
ExpressionToPredicateAdapter.toPredicate(createExpression(expression));
}
@Override
public Expression createExpression(String expression) {
-JsonPathExpression answer = new JsonPathExpression(expression);
-answer.setResultType(getResultType());
-answer.setSuppressExceptions(suppressExceptions);
-answer.setAllowSimple(allowSimple);
-answer.setAllowEasyPredicate(allowEasyPredicate);
-answer.setWriteAsString(writeAsString);
-answer.setUnpackArray(unpackArray);
-answer.setVariableName(getVariableName());
-answer.setHeaderName(getHeaderName());
-answer.setPropertyName(getPropertyName());
-answer.setOptions(options);
-answer.init(getCamelContext());
-return answer;
+return createExpression(expression, null);
}
@Override
public Predicate createPredicate(String expression, Object[] properties) {
-JsonPathExpression json = (JsonPathExpression)
createExpression(expression, properties);
-json.setPredicate(true);
-return json;
+return
ExpressionToPredicateAdapter.toPredicate(doCreateJsonPathExpression(expression,
properties, true));
}
@Override
public Expression createExpression(String expression, Object[] properties)
{
+return doCreateJsonPathExpression(expression, properties, false);
+}
+
+protected Expression doCreateJsonPathExpression(String e
(camel) 09/13: CAMEL-20378: Languages should be thread-safe and be configured only via properties array, all in the same way.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch lang2
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2702e9cc1af008225b090f72c76deae518074d55
Author: Claus Ibsen
AuthorDate: Fri Feb 2 11:25:53 2024 +0100
CAMEL-20378: Languages should be thread-safe and be configured only via
properties array, all in the same way.
---
.../apache/camel/language/joor/JavaLanguage.java | 25 ++
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git
a/components/camel-joor/src/main/java/org/apache/camel/language/joor/JavaLanguage.java
b/components/camel-joor/src/main/java/org/apache/camel/language/joor/JavaLanguage.java
index 9dd7b5b3d88..057222b1dfa 100644
---
a/components/camel-joor/src/main/java/org/apache/camel/language/joor/JavaLanguage.java
+++
b/components/camel-joor/src/main/java/org/apache/camel/language/joor/JavaLanguage.java
@@ -117,28 +117,25 @@ public class JavaLanguage extends TypedLanguageSupport
implements ScriptingLangu
@Override
public Expression createExpression(String expression) {
-JoorExpression exp = new JoorExpression(expression);
-exp.setCompiler(compiler);
-exp.setResultType(getResultType());
-exp.setSingleQuotes(singleQuotes);
-exp.init(getCamelContext());
-return exp;
+return createExpression(expression, null);
}
@Override
public Predicate createPredicate(String expression, Object[] properties) {
-return (JoorExpression) createExpression(expression, properties);
+return
ExpressionToPredicateAdapter.toPredicate(createExpression(expression,
properties));
}
@Override
public Expression createExpression(String expression, Object[] properties)
{
-JoorExpression exp = new JoorExpression(expression);
-exp.setCompiler(compiler);
-exp.setPreCompile(property(boolean.class, properties, 0, preCompile));
-exp.setResultType(property(Class.class, properties, 1,
getResultType()));
-exp.setSingleQuotes(property(boolean.class, properties, 2,
singleQuotes));
-exp.init(getCamelContext());
-return exp;
+JoorExpression answer = new JoorExpression(expression);
+answer.setCompiler(compiler);
+answer.setPreCompile(property(boolean.class, properties, 0,
preCompile));
+answer.setResultType(property(Class.class, properties, 1,
getResultType()));
+answer.setSingleQuotes(property(boolean.class, properties, 2,
singleQuotes));
+if (getCamelContext() != null) {
+answer.init(getCamelContext());
+}
+return answer;
}
@Override
(camel) 12/13: CAMEL-20378: Languages should be thread-safe and be configured only via properties array, all in the same way.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch lang2
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4376d513660df2d181ef8495d815ae9a0b31cf67
Author: Claus Ibsen
AuthorDate: Fri Feb 2 12:14:07 2024 +0100
CAMEL-20378: Languages should be thread-safe and be configured only via
properties array, all in the same way.
---
.../src/main/java/org/apache/camel/language/bean/BeanLanguage.java| 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/components/camel-bean/src/main/java/org/apache/camel/language/bean/BeanLanguage.java
b/components/camel-bean/src/main/java/org/apache/camel/language/bean/BeanLanguage.java
index e34cef7caf4..ba3e84fbde2 100644
---
a/components/camel-bean/src/main/java/org/apache/camel/language/bean/BeanLanguage.java
+++
b/components/camel-bean/src/main/java/org/apache/camel/language/bean/BeanLanguage.java
@@ -148,7 +148,9 @@ public class BeanLanguage extends TypedLanguageSupport
implements ScriptingLangu
answer.setBeanComponent(beanComponent);
answer.setParameterMappingStrategy(parameterMappingStrategy);
answer.setSimple(simple);
-answer.init(getCamelContext());
+if (getCamelContext() != null) {
+answer.init(getCamelContext());
+}
return answer;
}
