From 487c71373edb1ccdac34afa3947983b89c2b64c7 Mon Sep 17 00:00:00 2001 From: Andrea Cosentino Date: Thu, 6 Oct 2022 10:56:51 +0200 Subject: [PATCH 1/3] AWS SQS Source Kamelet: Add greedy parameter --- kamelets/aws-sqs-source.kamelet.yaml | 10 +++++++++- .../resources/kamelets/aws-sqs-source.kamelet.yaml | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/kamelets/aws-sqs-source.kamelet.yaml b/kamelets/aws-sqs-source.kamelet.yaml index 6dbe48fbd..c59f0c4f8 100644 --- a/kamelets/aws-sqs-source.kamelet.yaml +++ b/kamelets/aws-sqs-source.kamelet.yaml @@ -129,6 +129,13 @@ spec: description: The number of milliseconds before the next poll of the selected stream type: integer default: 500 + greedy: + title: Greedy Scheduler + description: If greedy is enabled, then the polling will happen immediately again, if the previous run polled 1 or more messages. + type: boolean + x-descriptors: + - 'urn:alm:descriptor:com.tectonic.ui:checkbox' + default: false dependencies: - "camel:aws2-sqs" - "camel:kamelet" @@ -146,6 +153,7 @@ spec: useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}" uriEndpointOverride: "{{?uriEndpointOverride}}" overrideEndpoint: "{{overrideEndpoint}}" - delay: "{{delay}}" + delay: "{{delay}}" + greedy: "{{greedy}}" steps: - to: "kamelet:sink" diff --git a/library/camel-kamelets/src/main/resources/kamelets/aws-sqs-source.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/aws-sqs-source.kamelet.yaml index 6dbe48fbd..609ebf29d 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/aws-sqs-source.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/aws-sqs-source.kamelet.yaml @@ -146,6 +146,6 @@ spec: useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}" uriEndpointOverride: "{{?uriEndpointOverride}}" overrideEndpoint: "{{overrideEndpoint}}" - delay: "{{delay}}" + delay: "{{delay}}" steps: - to: "kamelet:sink" From 78d67bf39ad79d8fda646eb6532b08bc54dae2e1 Mon Sep 17 00:00:00 2001 From: Andrea Cosentino Date: Thu, 6 Oct 2022 10:57:58 +0200 Subject: [PATCH 2/3] AWS SQS Source Kamelet: Add greedy parameter --- .../resources/kamelets/aws-sqs-source.kamelet.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/library/camel-kamelets/src/main/resources/kamelets/aws-sqs-source.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/aws-sqs-source.kamelet.yaml index 609ebf29d..c59f0c4f8 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/aws-sqs-source.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/aws-sqs-source.kamelet.yaml @@ -129,6 +129,13 @@ spec: description: The number of milliseconds before the next poll of the selected stream type: integer default: 500 + greedy: + title: Greedy Scheduler + description: If greedy is enabled, then the polling will happen immediately again, if the previous run polled 1 or more messages. + type: boolean + x-descriptors: + - 'urn:alm:descriptor:com.tectonic.ui:checkbox' + default: false dependencies: - "camel:aws2-sqs" - "camel:kamelet" @@ -146,6 +153,7 @@ spec: useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}" uriEndpointOverride: "{{?uriEndpointOverride}}" overrideEndpoint: "{{overrideEndpoint}}" - delay: "{{delay}}" + delay: "{{delay}}" + greedy: "{{greedy}}" steps: - to: "kamelet:sink" From 04e2f6f1d2971f6653c139b37ba9b9efeeda3c1a Mon Sep 17 00:00:00 2001 From: Andrea Cosentino Date: Thu, 6 Oct 2022 11:02:27 +0200 Subject: [PATCH 3/3] AWS SQS Source Kamelet: Add greedy parameter --- .../org/apache/camel/kamelets/catalog/KameletsCatalogTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java b/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java index 2eff5cde6..31d21bbb1 100644 --- a/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java +++ b/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java @@ -54,7 +54,7 @@ void testGetKamelets() throws Exception { @Test void testGetKameletsDefinition() throws Exception { JSONSchemaProps props = catalog.getKameletDefinition("aws-sqs-source"); - assertEquals(13, props.getProperties().keySet().size()); + assertEquals(14, props.getProperties().keySet().size()); assertTrue(props.getProperties().keySet().contains("queueNameOrArn")); }