[camel] branch camel-3.11.x updated: CAMEL-17049: camel-rest-openapi should avoid duplicate parameters if the param is a path param.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.11.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.11.x by this push:
new 71fafc3 CAMEL-17049: camel-rest-openapi should avoid duplicate
parameters if the param is a path param.
71fafc3 is described below
commit 71fafc3304bb178f4e55bfd2ee68587dae06cfe5
Author: Claus Ibsen
AuthorDate: Tue Oct 12 07:37:22 2021 +0200
CAMEL-17049: camel-rest-openapi should avoid duplicate parameters if the
param is a path param.
---
.../component/rest/openapi/RestOpenApiEndpoint.java| 18 +-
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpoint.java
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpoint.java
index 7c13e5f..330adb9 100644
---
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpoint.java
+++
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpoint.java
@@ -478,8 +478,7 @@ public final class RestOpenApiEndpoint extends
DefaultEndpoint {
parameters.put("consumes", determinedConsumes);
}
-// what we produce is what the API defined by OpenApi specification
-// consumes
+// what we produce is what the API defined by OpenApi specification
consumes
List specificationLevelProducers = new ArrayList<>();
if (openapi instanceof Oas20Document) {
@@ -493,7 +492,6 @@ public final class RestOpenApiEndpoint extends
DefaultEndpoint {
if (oas30Operation.requestBody != null &&
oas30Operation.requestBody.content != null) {
operationLevelProducers.addAll(oas30Operation.requestBody.content.keySet());
}
-
}
final String determinedProducers =
determineOption(specificationLevelProducers, operationLevelProducers,
@@ -528,7 +526,18 @@ public final class RestOpenApiEndpoint extends
DefaultEndpoint {
}
// Add rest endpoint parameters
-nestedParameters.putAll(this.parameters);
+if (this.parameters != null && operation.getParameters() != null) {
+for (Map.Entry entry : this.parameters.entrySet())
{
+for (OasParameter param : operation.getParameters()) {
+// skip parameters that are part of the operation as path
as otherwise
+// it will be duplicated as query parameter as well
+boolean clash = "path".equals(param.in) &&
entry.getKey().equals(param.getName());
+if (!clash) {
+nestedParameters.put(entry.getKey(), entry.getValue());
+}
+}
+}
+}
if (!nestedParameters.isEmpty()) {
// we're trying to set RestEndpoint.parameters['component']
@@ -742,7 +751,6 @@ public final class RestOpenApiEndpoint extends
DefaultEndpoint {
} else {
throw new IllegalStateException("We only support OpenApi 2.0
or 3.0 document here");
}
-
}
if (operation.getParameters() != null) {
[camel] branch main updated: CAMEL-17049: camel-rest-openapi should avoid duplicate parameters if the param is a path param.
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 94847d8 CAMEL-17049: camel-rest-openapi should avoid duplicate
parameters if the param is a path param.
94847d8 is described below
commit 94847d8c4a84e39be31c38ca30a5f4a3575ece29
Author: Claus Ibsen
AuthorDate: Tue Oct 12 07:37:22 2021 +0200
CAMEL-17049: camel-rest-openapi should avoid duplicate parameters if the
param is a path param.
---
.../component/rest/openapi/RestOpenApiEndpoint.java| 18 +-
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpoint.java
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpoint.java
index 7c13e5f..330adb9 100644
---
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpoint.java
+++
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpoint.java
@@ -478,8 +478,7 @@ public final class RestOpenApiEndpoint extends
DefaultEndpoint {
parameters.put("consumes", determinedConsumes);
}
-// what we produce is what the API defined by OpenApi specification
-// consumes
+// what we produce is what the API defined by OpenApi specification
consumes
List specificationLevelProducers = new ArrayList<>();
if (openapi instanceof Oas20Document) {
@@ -493,7 +492,6 @@ public final class RestOpenApiEndpoint extends
DefaultEndpoint {
if (oas30Operation.requestBody != null &&
oas30Operation.requestBody.content != null) {
operationLevelProducers.addAll(oas30Operation.requestBody.content.keySet());
}
-
}
final String determinedProducers =
determineOption(specificationLevelProducers, operationLevelProducers,
@@ -528,7 +526,18 @@ public final class RestOpenApiEndpoint extends
DefaultEndpoint {
}
// Add rest endpoint parameters
-nestedParameters.putAll(this.parameters);
+if (this.parameters != null && operation.getParameters() != null) {
+for (Map.Entry entry : this.parameters.entrySet())
{
+for (OasParameter param : operation.getParameters()) {
+// skip parameters that are part of the operation as path
as otherwise
+// it will be duplicated as query parameter as well
+boolean clash = "path".equals(param.in) &&
entry.getKey().equals(param.getName());
+if (!clash) {
+nestedParameters.put(entry.getKey(), entry.getValue());
+}
+}
+}
+}
if (!nestedParameters.isEmpty()) {
// we're trying to set RestEndpoint.parameters['component']
@@ -742,7 +751,6 @@ public final class RestOpenApiEndpoint extends
DefaultEndpoint {
} else {
throw new IllegalStateException("We only support OpenApi 2.0
or 3.0 document here");
}
-
}
if (operation.getParameters() != null) {
[camel] 02/02: Sync deps
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 418fd508ac43b39385f169e150426f92fb0a4210 Author: Andrea Cosentino AuthorDate: Tue Oct 12 07:31:37 2021 +0200 Sync deps --- camel-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 13caf0d..46455fc 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -275,7 +275,7 @@ 1.1 20090621 2.5.0 -2.21.7 +2.21.8 1.9.12 2.12.4 1.2.154_2
[camel] branch main updated (4fbe01b -> 418fd50)
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.git. from 4fbe01b Sync deps new f13ffd3 Upgrade Jackrabbit to version 2.21.8 new 418fd50 Sync deps 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: camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[camel] 01/02: Upgrade Jackrabbit to version 2.21.8
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit f13ffd394b8831caa57100f65578cc9682678ccd Author: Andrea Cosentino AuthorDate: Tue Oct 12 07:25:15 2021 +0200 Upgrade Jackrabbit to version 2.21.8 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index e69e6bc..87018be 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -256,7 +256,7 @@ 2.5.0 1.9.12 2.12.4 -2.21.7 +2.21.8 1.2.154_2 0.11 2.4.1.Final
[camel] branch regen_bot updated (1d78fb2 -> cc0e35f)
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 1d78fb2 CAMEL-17065: Fix cluster view release on all routes stop. Add autoStartup check before starting route. (#6238) add cc0e35f CAMEL-17068: Fix file cluster view exception handling. (#6243) No new revisions were added by this update. Summary of changes: .../file/cluster/FileLockClusterView.java | 41 +- 1 file changed, 24 insertions(+), 17 deletions(-)
[camel] 01/02: Upgrade AWS SDK v2 to version 2.17.57
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 74c28f69cbf372f71047739b5b5822aebe82b4ff Author: Andrea Cosentino AuthorDate: Tue Oct 12 06:37:16 2021 +0200 Upgrade AWS SDK v2 to version 2.17.57 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index f9bb075..e69e6bc 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -80,7 +80,7 @@ 1.10.2 1.10.2 4.1.0 -2.17.56 +2.17.57 2.6.1 1.2.14 1.0.3
[camel] 02/02: Sync deps
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 4fbe01b4c0e604952f53d48952a10450854fed9f Author: Andrea Cosentino AuthorDate: Tue Oct 12 07:21:49 2021 +0200 Sync deps --- camel-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 4a8b05a..13caf0d 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -66,7 +66,7 @@ 1.10.2 1.10.2 4.1.0 -2.17.56 +2.17.57 2.6.1 1.2.14 2.11.3
[camel] branch main updated (cc0e35f -> 4fbe01b)
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.git. from cc0e35f CAMEL-17068: Fix file cluster view exception handling. (#6243) new 74c28f69 Upgrade AWS SDK v2 to version 2.17.57 new 4fbe01b Sync deps 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: camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[camel] branch regen_bot updated (1665fa6 -> 1d78fb2)
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 1665fa6 CAMEL-17067 Not transforming body to String then bodyMT is
null (#6242)
add 1d78fb2 CAMEL-17065: Fix cluster view release on all routes stop. Add
autoStartup check before starting route. (#6238)
No new revisions were added by this update.
Summary of changes:
.../camel/impl/cluster/ClusteredRoutePolicy.java | 17 -
.../camel/cluster/ClusteredRoutePolicyTest.java| 27 +++
...redRoutePolicyUnmanagedClusterServiceTest.java} | 89 --
3 files changed, 58 insertions(+), 75 deletions(-)
copy
core/camel-core/src/test/java/org/apache/camel/cluster/{ClusteredRoutePolicyTest.java
=> ClusteredRoutePolicyUnmanagedClusterServiceTest.java} (58%)
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2926: [CI] - Quarkus Main Branch Build Failure
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-940669191 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 1331319587-537-4bde742b-412a-411e-9828-df6e448a0624 * Camel Quarkus Commit: 50e16548f154f87a25281625701e32cc21c63151 * Quarkus Main Commit: c71106e9a3b40f9e35ab04dcadd1354a949dff25 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/1331319587 -- 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-performance-tests] 03/04: SQL Kafka: Added 50000 rows script to pre-populate the database
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-performance-tests.git
commit b1519c9bdf7fbf65e9250d38ef9db02c6074597f
Author: Andrea Cosentino
AuthorDate: Tue Oct 12 06:49:46 2021 +0200
SQL Kafka: Added 5 rows script to pre-populate the database
---
profiling/sql-kafka/script/populate-5.sql | 7 +++
1 file changed, 7 insertions(+)
diff --git a/profiling/sql-kafka/script/populate-5.sql
b/profiling/sql-kafka/script/populate-5.sql
new file mode 100644
index 000..e548c52
--- /dev/null
+++ b/profiling/sql-kafka/script/populate-5.sql
@@ -0,0 +1,7 @@
+do $$
+BEGIN
+for r in 1..5 loop
+INSERT into accounts (username,city) VALUES ('John', 'New York');
+END loop;
+END;
+$$;
[camel-performance-tests] 01/04: SQL Kafka: Added 40000 rows script to pre-populate the database
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-performance-tests.git
commit c1edf19670a782435ebf1f0e8651aaff02501d49
Author: Andrea Cosentino
AuthorDate: Tue Oct 12 06:45:40 2021 +0200
SQL Kafka: Added 4 rows script to pre-populate the database
---
profiling/sql-kafka/script/populate-4.sql | 7 +++
1 file changed, 7 insertions(+)
diff --git a/profiling/sql-kafka/script/populate-4.sql
b/profiling/sql-kafka/script/populate-4.sql
new file mode 100644
index 000..b8e638e
--- /dev/null
+++ b/profiling/sql-kafka/script/populate-4.sql
@@ -0,0 +1,7 @@
+do $$
+BEGIN
+for r in 1..4 loop
+INSERT into accounts (username,city) VALUES ('John', 'New York');
+END loop;
+END;
+$$;
[camel-performance-tests] branch main updated (dc8c4fc -> cd2ed07)
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-performance-tests.git.
from dc8c4fc Kafka SQL Example: README improved
new c1edf19 SQL Kafka: Added 4 rows script to pre-populate the
database
new 9f06454 SQL to Kafka: Update README
new b1519c9 SQL Kafka: Added 5 rows script to pre-populate the
database
new cd2ed07 SQL to Kafka: Update README
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:
profiling/sql-kafka/README.md | 6 --
.../populate-3.sql => sql-kafka/script/populate-4.sql} | 2 +-
.../populate-3.sql => sql-kafka/script/populate-5.sql} | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
copy profiling/{sql-kafka-exchange-pooling/script/populate-3.sql =>
sql-kafka/script/populate-4.sql} (80%)
copy profiling/{sql-kafka-exchange-pooling/script/populate-3.sql =>
sql-kafka/script/populate-5.sql} (80%)
[camel-performance-tests] 02/04: SQL to Kafka: Update README
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-performance-tests.git commit 9f06454c81e9f92d482219c6c59819d751c8d97d Author: Andrea Cosentino AuthorDate: Tue Oct 12 06:46:37 2021 +0200 SQL to Kafka: Update README --- profiling/sql-kafka/README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/profiling/sql-kafka/README.md b/profiling/sql-kafka/README.md index a95bf8b..7ce47bb 100644 --- a/profiling/sql-kafka/README.md +++ b/profiling/sql-kafka/README.md @@ -8,9 +8,10 @@ docker run --name psql -e POSTGRES_PASSWORD=secret -d postgres Now you need to setup Database and collection: -There are two different scripts: +There are different scripts: - table.sql - - populate.sql + - populate-3.sql + - populate-4.sql And run the following scripts
[camel-performance-tests] 04/04: SQL to Kafka: Update README
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-performance-tests.git commit cd2ed076603b3108dd8298c70bd3f4c3088188c1 Author: Andrea Cosentino AuthorDate: Tue Oct 12 06:52:11 2021 +0200 SQL to Kafka: Update README --- profiling/sql-kafka/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/profiling/sql-kafka/README.md b/profiling/sql-kafka/README.md index 7ce47bb..9ada226 100644 --- a/profiling/sql-kafka/README.md +++ b/profiling/sql-kafka/README.md @@ -12,6 +12,7 @@ There are different scripts: - table.sql - populate-3.sql - populate-4.sql + - populate-5.sql And run the following scripts
[camel-performance-tests] branch more-populate created (now 0085bab)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch more-populate in repository https://gitbox.apache.org/repos/asf/camel-performance-tests.git. at 0085bab SQL to Kafka: Update README No new revisions were added by this update.
[GitHub] [camel-performance-tests] oscerd merged pull request #31: SQL Kafka: more scripts for populating db
oscerd merged pull request #31: URL: https://github.com/apache/camel-performance-tests/pull/31 -- 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
[GitHub] [camel-k] ReggieCarey commented on issue #1376: MicroK8s' built-in registry declared for the Camel K installation, but not used - integration installations fail
ReggieCarey commented on issue #1376: URL: https://github.com/apache/camel-k/issues/1376#issuecomment-940643758 I could not get integrations to work. Sent from my iPhone > On Oct 7, 2021, at 21:18, Tadayoshi Sato ***@***.***> wrote: > > > @ReggieCarey What happens if you run some example app with the operator? The original issue is when you run some app on MicroK8s. Thanks. > > — > You are receiving this because you were mentioned. > Reply to this email directly, view it on GitHub, or unsubscribe. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: CAMEL-17068: Fix file cluster view exception handling. (#6243)
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 cc0e35f CAMEL-17068: Fix file cluster view exception handling. (#6243)
cc0e35f is described below
commit cc0e35fae5cde093a3e267e672964ebf7fa30b79
Author: iliya-gr
AuthorDate: Tue Oct 12 07:18:24 2021 +0300
CAMEL-17068: Fix file cluster view exception handling. (#6243)
Handle and log all exceptions in tryLock.
Close lock file on failure and do not keep reference to channel.
---
.../file/cluster/FileLockClusterView.java | 41 +-
1 file changed, 24 insertions(+), 17 deletions(-)
diff --git
a/components/camel-file/src/main/java/org/apache/camel/component/file/cluster/FileLockClusterView.java
b/components/camel-file/src/main/java/org/apache/camel/component/file/cluster/FileLockClusterView.java
index 700996f..e9069aa 100644
---
a/components/camel-file/src/main/java/org/apache/camel/component/file/cluster/FileLockClusterView.java
+++
b/components/camel-file/src/main/java/org/apache/camel/component/file/cluster/FileLockClusterView.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.file.cluster;
+import java.io.IOException;
import java.io.RandomAccessFile;
-import java.nio.channels.FileChannel;
import java.nio.channels.FileLock;
import java.nio.channels.OverlappingFileLockException;
import java.nio.file.Files;
@@ -30,10 +30,8 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
-import org.apache.camel.RuntimeCamelException;
import org.apache.camel.cluster.CamelClusterMember;
import org.apache.camel.support.cluster.AbstractCamelClusterView;
-import org.apache.camel.util.IOHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,8 +40,7 @@ public class FileLockClusterView extends
AbstractCamelClusterView {
private final ClusterMember localMember;
private final Path path;
-private RandomAccessFile file;
-private FileChannel channel;
+private RandomAccessFile lockFile;
private FileLock lock;
private ScheduledFuture task;
@@ -76,7 +73,7 @@ public class FileLockClusterView extends
AbstractCamelClusterView {
@Override
protected void doStart() throws Exception {
-if (file != null) {
+if (lockFile != null) {
closeInternal();
fireLeadershipChangedEvent(Optional.empty());
@@ -86,9 +83,6 @@ public class FileLockClusterView extends
AbstractCamelClusterView {
Files.createDirectories(path.getParent());
}
-file = new RandomAccessFile(path.toFile(), "rw");
-channel = file.getChannel();
-
FileLockClusterService service =
getClusterService().unwrap(FileLockClusterService.class);
ScheduledExecutorService executor = service.getExecutor();
@@ -116,17 +110,24 @@ public class FileLockClusterView extends
AbstractCamelClusterView {
lock.release();
}
-if (file != null) {
-IOHelper.close(channel);
-IOHelper.close(file);
+closeLockFile();
+}
-channel = null;
-file = null;
+private void closeLockFile() {
+if (lockFile != null) {
+try {
+lockFile.close();
+} catch (Throwable ignore) {
+// Ignore
+}
+lockFile = null;
}
}
private void tryLock() {
if (isStarting() || isStarted()) {
+Exception reason = null;
+
try {
if (localMember.isLeader()) {
LOGGER.trace("Holding the lock on file {} (lock={})",
path, lock);
@@ -140,9 +141,10 @@ public class FileLockClusterView extends
AbstractCamelClusterView {
}
LOGGER.debug("Try to acquire a lock on {}", path);
+lockFile = new RandomAccessFile(path.toFile(), "rw");
lock = null;
-lock = channel.tryLock();
+lock = lockFile.getChannel().tryLock(0, Math.max(1,
lockFile.getChannel().size()), false);
if (lock != null) {
LOGGER.info("Lock on file {} acquired (lock={})",
path, lock);
@@ -152,9 +154,14 @@ public class FileLockClusterView extends
AbstractCamelClusterView {
}
}
} catch (OverlappingFileLockException e) {
-LOGGER.debug("Lock on file {} not acquired ", path);
+reason = new IOException(e);
} catch (Exception e) {
-throw new RuntimeCamelException(e);
+reason = e;
+}
+
+if (lock == null) {
+LOGGER.debug("Lock
[GitHub] [camel] davsclaus merged pull request #6243: CAMEL-17068: Fix file cluster view exception handling.
davsclaus merged pull request #6243: URL: https://github.com/apache/camel/pull/6243 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: CAMEL-17065: Fix cluster view release on all routes stop. Add autoStartup check before starting route. (#6238)
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 1d78fb2 CAMEL-17065: Fix cluster view release on all routes stop. Add
autoStartup check before starting route. (#6238)
1d78fb2 is described below
commit 1d78fb2958dd8e60662d5726de67eaa20a6053cf
Author: iliya-gr
AuthorDate: Tue Oct 12 07:16:57 2021 +0300
CAMEL-17065: Fix cluster view release on all routes stop. Add autoStartup
check before starting route. (#6238)
---
.../camel/impl/cluster/ClusteredRoutePolicy.java | 17 -
.../camel/cluster/ClusteredRoutePolicyTest.java| 27 +++
...redRoutePolicyUnmanagedClusterServiceTest.java} | 89 --
3 files changed, 58 insertions(+), 75 deletions(-)
diff --git
a/core/camel-cluster/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java
b/core/camel-cluster/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java
index 9d57b71..bcbcf05 100644
---
a/core/camel-cluster/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java
+++
b/core/camel-cluster/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicy.java
@@ -53,6 +53,7 @@ public final class ClusteredRoutePolicy extends
RoutePolicySupport implements Ca
private static final Logger LOG =
LoggerFactory.getLogger(ClusteredRoutePolicy.class);
private final AtomicBoolean leader;
+private final Set autoStartupRoutes;
private final Set startedRoutes;
private final Set stoppedRoutes;
private final ReferenceCount refCount;
@@ -84,6 +85,7 @@ public final class ClusteredRoutePolicy extends
RoutePolicySupport implements Ca
this.stoppedRoutes = new HashSet<>();
this.startedRoutes = new HashSet<>();
+this.autoStartupRoutes = new HashSet<>();
this.leader = new AtomicBoolean();
this.contextStarted = new AtomicBoolean();
this.initialDelay = Duration.ofMillis(0);
@@ -178,6 +180,10 @@ public final class ClusteredRoutePolicy extends
RoutePolicySupport implements Ca
this.refCount.retain();
+if (route.isAutoStartup()) {
+autoStartupRoutes.add(route);
+}
+
if (camelContext.isStarted() && isLeader()) {
// when camel context is already started, and we add new routes
// then let the route controller start the route as usual (no need
to mark as auto startup false)
@@ -214,7 +220,12 @@ public final class ClusteredRoutePolicy extends
RoutePolicySupport implements Ca
}
@Override
-public void doShutdown() throws Exception {
+public void onRemove(Route route) {
+autoStartupRoutes.remove(route);
+}
+
+@Override
+public void onStop(Route route) {
this.refCount.release();
}
@@ -266,7 +277,9 @@ public final class ClusteredRoutePolicy extends
RoutePolicySupport implements Ca
try {
for (Route route : stoppedRoutes) {
ServiceStatus status = getStatus(route);
-if (status != null && status.isStartable()) {
+boolean autostart = autoStartupRoutes.contains(route);
+
+if (status != null && status.isStartable() && autostart) {
LOG.debug("Starting route '{}'", route.getId());
camelContext.getRouteController().startRoute(route.getId());
diff --git
a/core/camel-core/src/test/java/org/apache/camel/cluster/ClusteredRoutePolicyTest.java
b/core/camel-core/src/test/java/org/apache/camel/cluster/ClusteredRoutePolicyTest.java
index e8b8fa4..97c92d8 100644
---
a/core/camel-core/src/test/java/org/apache/camel/cluster/ClusteredRoutePolicyTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/cluster/ClusteredRoutePolicyTest.java
@@ -31,6 +31,7 @@ import
org.apache.camel.support.cluster.AbstractCamelClusterView;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
public class ClusteredRoutePolicyTest extends ContextTestSupport {
@@ -67,6 +68,23 @@ public class ClusteredRoutePolicyTest extends
ContextTestSupport {
}
@Test
+public void testClusteredRoutePolicyStopAllRoutes() throws Exception {
+cs.getView().setLeader(true);
+
+context.getRouteController().stopRoute("foo");
+context.getRouteController().stopRoute("baz");
+
+assertFalse(cs.getView().isRunning());
+}
+
+@Test
+public void testClusteredRoutePolicyDontStartAutoStartFalseRoutes() throws
Exception {
+cs.getView().setLeader(true);
+
+assertEquals(ServiceStatus.Stopped,
context.getRouteController().getRouteStatus("baz"));
+}
+
+@Test
public void testClusteredRoutePolicyAddRoute() throws Exception {
[GitHub] [camel] davsclaus merged pull request #6238: CAMEL-17065: Fix cluster view release on all routes stop. Add autoStartup check before starting route.
davsclaus merged pull request #6238: URL: https://github.com/apache/camel/pull/6238 -- 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: Updated CHANGELOG.md
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-quarkus.git The following commit(s) were added to refs/heads/main by this push: new ea1ad4e Updated CHANGELOG.md ea1ad4e is described below commit ea1ad4e4e0999b4361541314a75340821c061016 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Oct 12 03:11:35 2021 + Updated CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7c467f..b062938 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ **Closed issues:** +- OpenAPI Java integration tests fail with Camel 3.13.0-SNAPSHOT [\#3171](https://github.com/apache/camel-quarkus/issues/3171) - AWS S3 tests should delete all buckets they create [\#3167](https://github.com/apache/camel-quarkus/issues/3167) - Aws2S3Test could fail with real AWS S3 service caused by bucket name conflicts [\#3163](https://github.com/apache/camel-quarkus/issues/3163) - Split package usage warning with camel-quarkus [\#3159](https://github.com/apache/camel-quarkus/issues/3159)
[camel-k] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/main by this push: new 1691601 Updated CHANGELOG.md 1691601 is described below commit 169160179141b4dc0a57cceb6e0754f367bb38b7 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Oct 12 03:10:11 2021 + Updated CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e4e5cb..d18c3e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,7 @@ **Merged pull requests:** +- feat: Comprehensive Integration error status [\#2682](https://github.com/apache/camel-k/pull/2682) ([astefanutti](https://github.com/astefanutti)) - fix\(cli\): apply --registry\* flags even on OpenShift for kamel install [\#2681](https://github.com/apache/camel-k/pull/2681) ([tadayosi](https://github.com/tadayosi)) - feat: Add active-deadline-seconds and backoff-limit options to cron trait [\#2678](https://github.com/apache/camel-k/pull/2678) ([astefanutti](https://github.com/astefanutti)) - feat: Add progress-deadline-seconds option to deployment trait [\#2677](https://github.com/apache/camel-k/pull/2677) ([astefanutti](https://github.com/astefanutti))
[camel-kafka-connector] branch main updated: Updated CHANGELOG.md
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-kafka-connector.git The following commit(s) were added to refs/heads/main by this push: new b110eac Updated CHANGELOG.md b110eac is described below commit b110eac05a0f67d1a6fd68a11db5b85cf45d2b34 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Oct 12 03:03:34 2021 + Updated CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 581c6df..c262e23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ **Merged pull requests:** +- Update try-it-out-locally.adoc [\#1270](https://github.com/apache/camel-kafka-connector/pull/1270) ([duanasq](https://github.com/duanasq)) - \[Github Actions\] Periodic Sync Camel-kafka-connector main Branch [\#1267](https://github.com/apache/camel-kafka-connector/pull/1267) ([github-actions[bot]](https://github.com/apps/github-actions)) - \[Github Actions\] Periodic Sync Camel-kafka-connector main Branch [\#1260](https://github.com/apache/camel-kafka-connector/pull/1260) ([github-actions[bot]](https://github.com/apps/github-actions)) - \[Github Actions\] Periodic Sync Camel-kafka-connector main Branch [\#1259](https://github.com/apache/camel-kafka-connector/pull/1259) ([github-actions[bot]](https://github.com/apps/github-actions))
[GitHub] [camel-quarkus] zhfeng commented on pull request #3176: Fix #3169 to add S3 KMS encryption test
zhfeng commented on pull request #3176: URL: https://github.com/apache/camel-quarkus/pull/3176#issuecomment-940611076 It could conflict with https://github.com/apache/camel-quarkus/pull/3175/ to fix the quarkus-client test running in real AWS. So we should make #3175 get merged at first. -- 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
[GitHub] [camel-quarkus] zhfeng opened a new pull request #3176: Fix #3169 to add S3 KMS encryption test
zhfeng opened a new pull request #3176: URL: https://github.com/apache/camel-quarkus/pull/3176 -- 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-website] branch asf-site updated (9670bea -> 007073f)
This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/camel-website.git.
discard 9670bea Website updated to f8648728ad675927cd602cab211a2ea4a4b0d938
discard 825dfaf Website updated to 325e929157412b27394080f4d4dba3d821476ddf
new 4f42ef1 Website updated to 325e929157412b27394080f4d4dba3d821476ddf
new 007073f Website updated to f8648728ad675927cd602cab211a2ea4a4b0d938
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 (9670bea)
\
N -- N -- N refs/heads/asf-site (007073f)
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 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:
.../eips/_images/eip}/message_flow_in_route.png| Bin
components/latest/eips/customLoadBalancer-eip.html | 17 +-
components/latest/eips/loadBalance-eip.html|2 +-
components/latest/eips/multicast-eip.html |2 +-
components/latest/eips/point-to-point-channel.html |2 +-
components/latest/eips/polling-consumer.html | 60 +-
components/latest/eips/process-eip.html| 40 +-
components/latest/eips/process-manager.html|2 +-
.../latest/eips/publish-subscribe-channel.html | 28 +-
components/latest/eips/random-eip.html | 15 +-
components/latest/eips/recipientList-eip.html | 106 +-
components/latest/eips/removeHeader-eip.html | 10 +-
components/latest/eips/removeHeaders-eip.html | 16 +-
components/latest/eips/removeProperties-eip.html | 26 +-
components/latest/eips/removeProperty-eip.html | 20 +-
components/latest/eips/roundRobin-eip.html | 14 +-
components/latest/eips/sticky-eip.html | 16 +-
components/latest/eips/topic-eip.html | 14 +-
components/latest/eips/weighted-eip.html | 24 +-
...http-protocol-headers-in-the-camel-message.html |2 -
sitemap-camel-k.xml| 390 +-
sitemap-camel-kafka-connector.xml | 2176
sitemap-camel-kamelets.xml | 272 +-
sitemap-camel-karaf.xml| 56 +-
sitemap-camel-quarkus.xml | 1376 ++---
sitemap-camel-spring-boot.xml | 46 +-
sitemap-components.xml | 5540 ++--
sitemap-manual.xml | 380 +-
28 files changed, 5329 insertions(+), 5323 deletions(-)
copy {manual/latest/_images =>
components/latest/eips/_images/eip}/message_flow_in_route.png (100%)
[GitHub] [camel] iliya-gr opened a new pull request #6243: CAMEL-17068: Fix file cluster view exception handling.
iliya-gr opened a new pull request #6243: URL: https://github.com/apache/camel/pull/6243 Handle and log all exceptions in tryLock. Close lock file on failure and do not keep reference to channel. -- 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 (c8ba69f -> 1665fa6)
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. omit c8ba69f Regen for commit 71666a24bc5bf961845a27a0ff7378e9849fa2f1 add 1665fa6 CAMEL-17067 Not transforming body to String then bodyMT is null (#6242) 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 (c8ba69f) \ N -- N -- N refs/heads/regen_bot (1665fa6) 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. No new revisions were added by this update. Summary of changes: .../language/datasonnet/DatasonnetExpression.java |2 +- .../language/datasonnet/CamelDatasonnetTest.java | 22 + .../camel/language.datasonnet/camel-context.xml| 14 +- .../sql/stored/template/generated/SSPTParser.java | 833 ++--- .../template/generated/SSPTParserConstants.java| 110 +- .../template/generated/SSPTParserTokenManager.java | 1222 ++-- 6 files changed, 1127 insertions(+), 1076 deletions(-)
[camel] branch camel-3.11.x updated: CAMEL-17067 Not transforming body to String then bodyMT is null (#6242)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.11.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.11.x by this push:
new b200430 CAMEL-17067 Not transforming body to String then bodyMT is
null (#6242)
b200430 is described below
commit b200430eb2909fd11398a475002cdff3d70c96fb
Author: henka-rl <67908385+henka...@users.noreply.github.com>
AuthorDate: Mon Oct 11 21:40:55 2021 +0200
CAMEL-17067 Not transforming body to String then bodyMT is null (#6242)
---
.../language/datasonnet/DatasonnetExpression.java | 2 +-
.../language/datasonnet/CamelDatasonnetTest.java | 22 ++
.../camel/language.datasonnet/camel-context.xml| 14 +++---
3 files changed, 34 insertions(+), 4 deletions(-)
diff --git
a/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/DatasonnetExpression.java
b/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/DatasonnetExpression.java
index 846229b..76a969b 100644
---
a/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/DatasonnetExpression.java
+++
b/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/DatasonnetExpression.java
@@ -113,7 +113,7 @@ public class DatasonnetExpression extends ExpressionAdapter
implements Expressio
Document body;
if (exchange.getMessage().getBody() instanceof Document) {
body = (Document) exchange.getMessage().getBody();
-} else if (MediaTypes.APPLICATION_JAVA.equalsTypeAndSubtype(bodyMT)) {
+} else if (MediaTypes.APPLICATION_JAVA.equalsTypeAndSubtype(bodyMT) ||
bodyMT == null) {
body = new DefaultDocument<>(exchange.getMessage().getBody());
} else {
body = new
DefaultDocument<>(MessageHelper.extractBodyAsString(exchange.getMessage()),
bodyMT);
diff --git
a/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/CamelDatasonnetTest.java
b/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/CamelDatasonnetTest.java
index 6006648..5963796 100644
---
a/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/CamelDatasonnetTest.java
+++
b/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/CamelDatasonnetTest.java
@@ -118,6 +118,28 @@ public class CamelDatasonnetTest extends
CamelSpringTestSupport {
}
@Test
+public void testReadJavaDatasonnetHeader() throws Exception {
+Gizmo theGizmo = new Gizmo();
+theGizmo.setName("gizmo");
+theGizmo.setQuantity(123);
+theGizmo.setInStock(true);
+theGizmo.setColors(Arrays.asList("red", "white", "blue"));
+
+Manufacturer manufacturer = new Manufacturer();
+manufacturer.setManufacturerName("ACME Corp.");
+manufacturer.setManufacturerCode("ACME123");
+theGizmo.setManufacturer(manufacturer);
+
+SimpleDateFormat df = new SimpleDateFormat("-MM-dd");
+df.setTimeZone(TimeZone.getTimeZone("UTC"));
+theGizmo.setDate(df.parse("2020-01-06"));
+
+runCamelTest(theGizmo,
+loadResourceAsString("javaTest.json"),
+"direct:readJavaDatasonnetHeader");
+}
+
+@Test
public void testWriteJava() throws Exception {
Gizmo theGizmo = new Gizmo();
theGizmo.setName("gizmo");
diff --git
a/components/camel-datasonnet/src/test/resources/org/apache/camel/language.datasonnet/camel-context.xml
b/components/camel-datasonnet/src/test/resources/org/apache/camel/language.datasonnet/camel-context.xml
index 0a9cac1..5575245 100644
---
a/components/camel-datasonnet/src/test/resources/org/apache/camel/language.datasonnet/camel-context.xml
+++
b/components/camel-datasonnet/src/test/resources/org/apache/camel/language.datasonnet/camel-context.xml
@@ -98,10 +98,10 @@
-
-
+
+
-
+
+
+
+
+resource:classpath:readJavaTest.ds
+
+
+
+
[camel] branch main updated: CAMEL-17067 Not transforming body to String then bodyMT is null (#6242)
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 1665fa6 CAMEL-17067 Not transforming body to String then bodyMT is
null (#6242)
1665fa6 is described below
commit 1665fa69e685e6f5e147d3a3d84da130ceb0096d
Author: henka-rl <67908385+henka...@users.noreply.github.com>
AuthorDate: Mon Oct 11 21:40:55 2021 +0200
CAMEL-17067 Not transforming body to String then bodyMT is null (#6242)
---
.../language/datasonnet/DatasonnetExpression.java | 2 +-
.../language/datasonnet/CamelDatasonnetTest.java | 22 ++
.../camel/language.datasonnet/camel-context.xml| 14 +++---
3 files changed, 34 insertions(+), 4 deletions(-)
diff --git
a/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/DatasonnetExpression.java
b/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/DatasonnetExpression.java
index 846229b..76a969b 100644
---
a/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/DatasonnetExpression.java
+++
b/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/DatasonnetExpression.java
@@ -113,7 +113,7 @@ public class DatasonnetExpression extends ExpressionAdapter
implements Expressio
Document body;
if (exchange.getMessage().getBody() instanceof Document) {
body = (Document) exchange.getMessage().getBody();
-} else if (MediaTypes.APPLICATION_JAVA.equalsTypeAndSubtype(bodyMT)) {
+} else if (MediaTypes.APPLICATION_JAVA.equalsTypeAndSubtype(bodyMT) ||
bodyMT == null) {
body = new DefaultDocument<>(exchange.getMessage().getBody());
} else {
body = new
DefaultDocument<>(MessageHelper.extractBodyAsString(exchange.getMessage()),
bodyMT);
diff --git
a/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/CamelDatasonnetTest.java
b/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/CamelDatasonnetTest.java
index 6006648..5963796 100644
---
a/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/CamelDatasonnetTest.java
+++
b/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/CamelDatasonnetTest.java
@@ -118,6 +118,28 @@ public class CamelDatasonnetTest extends
CamelSpringTestSupport {
}
@Test
+public void testReadJavaDatasonnetHeader() throws Exception {
+Gizmo theGizmo = new Gizmo();
+theGizmo.setName("gizmo");
+theGizmo.setQuantity(123);
+theGizmo.setInStock(true);
+theGizmo.setColors(Arrays.asList("red", "white", "blue"));
+
+Manufacturer manufacturer = new Manufacturer();
+manufacturer.setManufacturerName("ACME Corp.");
+manufacturer.setManufacturerCode("ACME123");
+theGizmo.setManufacturer(manufacturer);
+
+SimpleDateFormat df = new SimpleDateFormat("-MM-dd");
+df.setTimeZone(TimeZone.getTimeZone("UTC"));
+theGizmo.setDate(df.parse("2020-01-06"));
+
+runCamelTest(theGizmo,
+loadResourceAsString("javaTest.json"),
+"direct:readJavaDatasonnetHeader");
+}
+
+@Test
public void testWriteJava() throws Exception {
Gizmo theGizmo = new Gizmo();
theGizmo.setName("gizmo");
diff --git
a/components/camel-datasonnet/src/test/resources/org/apache/camel/language.datasonnet/camel-context.xml
b/components/camel-datasonnet/src/test/resources/org/apache/camel/language.datasonnet/camel-context.xml
index 0a9cac1..5575245 100644
---
a/components/camel-datasonnet/src/test/resources/org/apache/camel/language.datasonnet/camel-context.xml
+++
b/components/camel-datasonnet/src/test/resources/org/apache/camel/language.datasonnet/camel-context.xml
@@ -98,10 +98,10 @@
-
-
+
+
-
+
+
+
+
+resource:classpath:readJavaTest.ds
+
+
+
+
[GitHub] [camel] davsclaus merged pull request #6242: CAMEL-17067 Not transforming body to String then bodyMT is null
davsclaus merged pull request #6242: URL: https://github.com/apache/camel/pull/6242 -- 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
[GitHub] [camel-k] oscerd commented on issue #2684: Unable to access MongoDB
oscerd commented on issue #2684: URL: https://github.com/apache/camel-k/issues/2684#issuecomment-940355641 Kamelets are working. They have been tested for 1.6 by the way I'll try to reproduce. On minikube at least i don't see this -- 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
[GitHub] [camel-k] bthj commented on issue #2684: Unable to access MongoDB
bthj commented on issue #2684: URL: https://github.com/apache/camel-k/issues/2684#issuecomment-940310492 Thanks @squakez, the [quarkus.mongodb...](https://camel.apache.org/camel-quarkus/latest/reference/extensions/mongodb.html) properties is what I was missing; I was stuck at https://camel.apache.org/components/3.12.x/mongodb-component.html but never reached this document without your help: https://camel.apache.org/camel-quarkus/latest/reference/extensions/mongodb.html The kamelets didn't work on my end; does that mean they are also not setting those properties correctly, or did I somehow fail to deploy them correctly? - example above. -- 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
[GitHub] [camel] oscerd closed pull request #6241: Generated sources regen
oscerd closed pull request #6241: URL: https://github.com/apache/camel/pull/6241 -- 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 (6ec23f7 -> c8ba69f)
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. omit 6ec23f7 Regen for commit b36857eb4919b18453fe5797c6999bfdafc38092 add 71666a2 CAMEL-16861: Cleanup and update EIP docs add c8ba69f Regen for commit 71666a24bc5bf961845a27a0ff7378e9849fa2f1 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 (6ec23f7) \ N -- N -- N refs/heads/regen_bot (c8ba69f) 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. No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/camel/Exchange.java | 4 +- .../docs/modules/eips/pages/removeHeader-eip.adoc | 9 ++- .../docs/modules/eips/pages/removeHeaders-eip.adoc | 11 +++- .../modules/eips/pages/removeProperties-eip.adoc | 72 -- .../modules/eips/pages/removeProperty-eip.adoc | 40 ++-- ...http-protocol-headers-in-the-camel-message.adoc | 2 - 6 files changed, 92 insertions(+), 46 deletions(-)
[GitHub] [camel] github-actions[bot] opened a new pull request #6241: Generated sources regen
github-actions[bot] opened a new pull request #6241: URL: https://github.com/apache/camel/pull/6241 Regen bot :robot: found some uncommited changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- 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
[GitHub] [camel] oscerd closed pull request #6240: Generated sources regen
oscerd closed pull request #6240: URL: https://github.com/apache/camel/pull/6240 -- 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] 07/08: fix: Race condition when observing integration first readiness metric
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit fd743b7fe69f52834568eeef636ccdbeac5eb7c0
Author: Antonin Stefanutti
AuthorDate: Mon Oct 11 09:45:24 2021 +0200
fix: Race condition when observing integration first readiness metric
---
pkg/controller/integration/integration_controller.go | 17 +
pkg/controller/integration/monitor.go| 10 --
2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/pkg/controller/integration/integration_controller.go
b/pkg/controller/integration/integration_controller.go
index 2501740..cb67e53 100644
--- a/pkg/controller/integration/integration_controller.go
+++ b/pkg/controller/integration/integration_controller.go
@@ -83,13 +83,22 @@ func add(mgr manager.Manager, c client.Client, r
reconcile.Reconciler) error {
For({}, builder.WithPredicates(
predicate.Funcs{
UpdateFunc: func(e event.UpdateEvent) bool {
- oldIntegration :=
e.ObjectOld.(*v1.Integration)
- newIntegration :=
e.ObjectNew.(*v1.Integration)
+ old := e.ObjectOld.(*v1.Integration)
+ it := e.ObjectNew.(*v1.Integration)
+ // Observe the time to first readiness
metric
+ previous :=
old.Status.GetCondition(v1.IntegrationConditionReady)
+ if next :=
it.Status.GetCondition(v1.IntegrationConditionReady); (previous == nil ||
previous.Status != corev1.ConditionTrue && (previous.FirstTruthyTime == nil ||
previous.FirstTruthyTime.IsZero())) &&
+ next != nil && next.Status ==
corev1.ConditionTrue && next.FirstTruthyTime != nil &&
!next.FirstTruthyTime.IsZero() {
+ duration :=
next.FirstTruthyTime.Time.Sub(it.Status.InitializationTimestamp.Time)
+
Log.WithValues("request-namespace", it.Namespace, "request-name", it.Name).
+
ForIntegration(it).Infof("First readiness after %s", duration)
+
timeToFirstReadiness.Observe(duration.Seconds())
+ }
// Ignore updates to the integration
status in which case metadata.Generation does not change,
// or except when the integration phase
changes as it's used to transition from one phase
// to another.
- return oldIntegration.Generation !=
newIntegration.Generation ||
- oldIntegration.Status.Phase !=
newIntegration.Status.Phase
+ return old.Generation != it.Generation
||
+ old.Status.Phase !=
it.Status.Phase
},
DeleteFunc: func(e event.DeleteEvent) bool {
// Evaluates to false if the object has
been confirmed deleted
diff --git a/pkg/controller/integration/monitor.go
b/pkg/controller/integration/monitor.go
index 990aa6b..cd5300d 100644
--- a/pkg/controller/integration/monitor.go
+++ b/pkg/controller/integration/monitor.go
@@ -153,21 +153,11 @@ func (action *monitorAction) Handle(ctx context.Context,
integration *v1.Integra
return integration, nil
}
- previous :=
integration.Status.GetCondition(v1.IntegrationConditionReady)
-
err = action.updateIntegrationPhaseAndReadyCondition(ctx, integration,
pendingPods.Items, runningPods.Items)
if err != nil {
return nil, err
}
- if next :=
integration.Status.GetCondition(v1.IntegrationConditionReady); (previous == nil
|| previous.FirstTruthyTime == nil || previous.FirstTruthyTime.IsZero()) &&
- next != nil && next.Status == corev1.ConditionTrue &&
!(next.FirstTruthyTime == nil || next.FirstTruthyTime.IsZero()) {
- // Observe the time to first readiness metric
- duration :=
next.FirstTruthyTime.Time.Sub(integration.Status.InitializationTimestamp.Time)
- action.L.Infof("First readiness after %s", duration)
- timeToFirstReadiness.Observe(duration.Seconds())
- }
-
return integration, nil
}
[camel-k] branch main updated (f62e640 -> 11f43db)
This is an automated email from the ASF dual-hosted git repository. astefanutti pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git. from f62e640 Updated CHANGELOG.md new 38122e2 feat: Comprehensive integration error status new 8c5fd78 fix: Fix perserve condition first truthy time new 8bc854e chore: Apply master and threescale traits during error phase new 67d653d chore: Watch for Knative Services conditionally new c16b6b2 chore: Do not account for deleting Pods in Integration status new 0a20787 fix: Mark transition from deploying to running phase new fd743b7 fix: Race condition when observing integration first readiness metric new 11f43db fix(e2e): Use JSON merge patch to scale integrations The 8 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: addons/master/master.go| 5 +- addons/threescale/3scale.go| 6 +- config/rbac/operator-role.yaml | 6 +- e2e/support/test_support.go| 27 ++- pkg/apis/camel/v1/integration_types.go | 22 +- pkg/apis/camel/v1/integration_types_support.go | 32 +-- pkg/cmd/operator/operator.go | 18 +- .../integration/integration_controller.go | 58 - pkg/controller/integration/monitor.go | 257 +++-- pkg/resources/resources.go | 4 +- pkg/util/kubernetes/conditions.go | 125 +++--- pkg/util/kubernetes/discovery.go | 5 +- pkg/util/kubernetes/permission.go | 5 +- 13 files changed, 336 insertions(+), 234 deletions(-)
[camel-k] 08/08: fix(e2e): Use JSON merge patch to scale integrations
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 11f43db48794415b433005ea2b66044fd8c4b68a
Author: Antonin Stefanutti
AuthorDate: Mon Oct 11 14:38:05 2021 +0200
fix(e2e): Use JSON merge patch to scale integrations
---
e2e/support/test_support.go | 27 ++-
1 file changed, 22 insertions(+), 5 deletions(-)
diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go
index e2d1e68..604adcf 100644
--- a/e2e/support/test_support.go
+++ b/e2e/support/test_support.go
@@ -31,7 +31,7 @@ import (
"io"
"io/ioutil"
"os"
- exec "os/exec"
+ "os/exec"
"reflect"
"strings"
"testing"
@@ -622,17 +622,34 @@ func KitPhase(ns, name string) func()
v1.IntegrationKitPhase {
}
}
-func UpdateIntegration(ns string, name string, upd func(it *v1.Integration))
error {
+func UpdateIntegration(ns string, name string, mutate func(it
*v1.Integration)) error {
it := Integration(ns, name)()
if it == nil {
return fmt.Errorf("no integration named %s found", name)
}
- upd(it)
- return TestClient().Update(TestContext, it)
+ target := it.DeepCopy()
+ mutate(target)
+ return TestClient().Update(TestContext, target)
+}
+
+func PatchIntegration(ns string, name string, mutate func(it *v1.Integration))
error {
+ it := Integration(ns, name)()
+ if it == nil {
+ return fmt.Errorf("no integration named %s found", name)
+ }
+ target := it.DeepCopy()
+ mutate(target)
+ p, err := patch.PositiveMergePatch(it, target)
+ if err != nil {
+ return err
+ } else if len(p) == 0 {
+ return nil
+ }
+ return TestClient().Patch(TestContext, target,
ctrl.RawPatch(types.MergePatchType, p))
}
func ScaleIntegration(ns string, name string, replicas int32) error {
- return UpdateIntegration(ns, name, func(it *v1.Integration) {
+ return PatchIntegration(ns, name, func(it *v1.Integration) {
it.Spec.Replicas =
})
}
[camel-k] 05/08: chore: Do not account for deleting Pods in Integration status
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit c16b6b2b00d5ecbc77fe4419f5fa4b40afc04b4a
Author: Antonin Stefanutti
AuthorDate: Thu Oct 7 17:56:03 2021 +0200
chore: Do not account for deleting Pods in Integration status
---
pkg/controller/integration/monitor.go | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pkg/controller/integration/monitor.go
b/pkg/controller/integration/monitor.go
index 320ef69..3ab6791 100644
--- a/pkg/controller/integration/monitor.go
+++ b/pkg/controller/integration/monitor.go
@@ -280,6 +280,9 @@ func (action *monitorAction)
updateIntegrationPhaseAndReadyCondition(ctx context
}
// Check running container statuses
for _, pod := range runningPods {
+ if pod.DeletionTimestamp != nil {
+ continue
+ }
containers := append(pod.Status.InitContainerStatuses,
pod.Status.ContainerStatuses...)
for _, container := range containers {
// Check the container state
[camel-k] 01/08: feat: Comprehensive integration error status
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 38122e26eb0af82edb8ab37805a531d1af797217
Author: Antonin Stefanutti
AuthorDate: Thu Oct 7 15:32:39 2021 +0200
feat: Comprehensive integration error status
---
config/rbac/operator-role.yaml | 6 +-
pkg/apis/camel/v1/integration_types.go | 22 +-
pkg/apis/camel/v1/integration_types_support.go | 30 +--
pkg/cmd/operator/operator.go | 18 +-
.../integration/integration_controller.go | 10 +
pkg/controller/integration/monitor.go | 247 -
pkg/resources/resources.go | 4 +-
pkg/util/kubernetes/conditions.go | 125 +++
8 files changed, 264 insertions(+), 198 deletions(-)
diff --git a/config/rbac/operator-role.yaml b/config/rbac/operator-role.yaml
index fda70ff..e619bbf 100644
--- a/config/rbac/operator-role.yaml
+++ b/config/rbac/operator-role.yaml
@@ -83,8 +83,6 @@ rules:
- apps
resources:
- deployments
- - replicasets
- - statefulsets
verbs:
- create
- delete
@@ -108,9 +106,9 @@ rules:
- update
- watch
- apiGroups:
- - apps
+ - batch
resources:
- - daemonsets
+ - jobs
verbs:
- get
- list
diff --git a/pkg/apis/camel/v1/integration_types.go
b/pkg/apis/camel/v1/integration_types.go
index 3a6ea29..b30b66b 100644
--- a/pkg/apis/camel/v1/integration_types.go
+++ b/pkg/apis/camel/v1/integration_types.go
@@ -182,14 +182,24 @@ const (
IntegrationConditionJolokiaAvailableReason string = "JolokiaAvailable"
// IntegrationConditionProbesAvailableReason --
IntegrationConditionProbesAvailableReason string = "ProbesAvailable"
- // IntegrationConditionErrorReason --
- IntegrationConditionErrorReason string = "Error"
+
+ // IntegrationConditionKnativeServiceReadyReason --
+ IntegrationConditionKnativeServiceReadyReason string =
"KnativeServiceReady"
+ // IntegrationConditionDeploymentReadyReason --
+ IntegrationConditionDeploymentReadyReason string = "DeploymentReady"
+ // IntegrationConditionDeploymentProgressingReason --
+ IntegrationConditionDeploymentProgressingReason string =
"DeploymentProgressing"
// IntegrationConditionCronJobCreatedReason --
IntegrationConditionCronJobCreatedReason string = "CronJobCreated"
- // IntegrationConditionReplicaSetReadyReason --
- IntegrationConditionReplicaSetReadyReason string = "ReplicaSetReady"
- // IntegrationConditionReplicaSetNotReadyReason --
- IntegrationConditionReplicaSetNotReadyReason string =
"ReplicaSetNotReady"
+ // IntegrationConditionCronJobActiveReason --
+ IntegrationConditionCronJobActiveReason string = "CronJobActive"
+ // IntegrationConditionLastJobSucceededReason --
+ IntegrationConditionLastJobSucceededReason string = "LastJobSucceeded"
+ // IntegrationConditionLastJobFailedReason --
+ IntegrationConditionLastJobFailedReason string = "LastJobFailed"
+ // IntegrationConditionErrorReason --
+ IntegrationConditionErrorReason string = "Error"
+
// IntegrationConditionUnsupportedLanguageReason --
IntegrationConditionUnsupportedLanguageReason string =
"UnsupportedLanguage"
diff --git a/pkg/apis/camel/v1/integration_types_support.go
b/pkg/apis/camel/v1/integration_types_support.go
index 345a1c9..0aff087 100644
--- a/pkg/apis/camel/v1/integration_types_support.go
+++ b/pkg/apis/camel/v1/integration_types_support.go
@@ -28,7 +28,6 @@ import (
const IntegrationLabel = "camel.apache.org/integration"
-// NewIntegration --
func NewIntegration(namespace string, name string) Integration {
return Integration{
TypeMeta: metav1.TypeMeta{
@@ -42,7 +41,6 @@ func NewIntegration(namespace string, name string)
Integration {
}
}
-// NewIntegrationList --
func NewIntegrationList() IntegrationList {
return IntegrationList{
TypeMeta: metav1.TypeMeta{
@@ -81,27 +79,22 @@ func (in *Integration) Resources() []ResourceSpec {
return resources
}
-// AddSource --
func (in *IntegrationSpec) AddSource(name string, content string, language
Language) {
in.Sources = append(in.Sources, NewSourceSpec(name, content, language))
}
-// AddSources --
func (in *IntegrationSpec) AddSources(sources ...SourceSpec) {
in.Sources = append(in.Sources, sources...)
}
-// AddResources --
func (in *IntegrationSpec) AddResources(resources ...ResourceSpec) {
in.Resources = append(in.Resources, resources...)
}
-// AddFlows --
func (in *IntegrationSpec) AddFlows(flows ...Flow) {
in.Flows = append(in.Flows, flows...)
}
-// AddConfiguration --
func (in *IntegrationSpec) AddConfiguration(confType string, confValue string)
{
[camel-k] 02/08: fix: Fix perserve condition first truthy time
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 8c5fd7865df790a35e50f782308170682be8d6a0
Author: Antonin Stefanutti
AuthorDate: Thu Oct 7 15:33:58 2021 +0200
fix: Fix perserve condition first truthy time
---
pkg/apis/camel/v1/integration_types_support.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkg/apis/camel/v1/integration_types_support.go
b/pkg/apis/camel/v1/integration_types_support.go
index 0aff087..7e2e6f7 100644
--- a/pkg/apis/camel/v1/integration_types_support.go
+++ b/pkg/apis/camel/v1/integration_types_support.go
@@ -377,7 +377,7 @@ func (in *IntegrationStatus) SetConditions(conditions
...IntegrationCondition) {
// Do not update LastTransitionTime if the
status of the condition doesn't change
condition.LastTransitionTime =
currentCond.LastTransitionTime
}
- if !(currentCond.FirstTruthyTime != nil ||
currentCond.FirstTruthyTime.IsZero()) {
+ if currentCond.FirstTruthyTime != nil &&
!currentCond.FirstTruthyTime.IsZero() {
// Preserve FirstTruthyTime
condition.FirstTruthyTime =
currentCond.FirstTruthyTime.DeepCopy()
}
[camel-k] 04/08: chore: Watch for Knative Services conditionally
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 67d653da789b1590984817707ff973bf3f139b78
Author: Antonin Stefanutti
AuthorDate: Thu Oct 7 17:55:18 2021 +0200
chore: Watch for Knative Services conditionally
---
.../integration/integration_controller.go | 35 --
pkg/util/kubernetes/discovery.go | 5 ++--
pkg/util/kubernetes/permission.go | 5 ++--
3 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/pkg/controller/integration/integration_controller.go
b/pkg/controller/integration/integration_controller.go
index 3872828..2501740 100644
--- a/pkg/controller/integration/integration_controller.go
+++ b/pkg/controller/integration/integration_controller.go
@@ -19,6 +19,8 @@ package integration
import (
"context"
+ "reflect"
+ "time"
appsv1 "k8s.io/api/apps/v1"
batchv1beta1 "k8s.io/api/batch/v1beta1"
@@ -38,6 +40,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/source"
+ "knative.dev/serving/pkg/apis/serving"
servingv1 "knative.dev/serving/pkg/apis/serving/v1"
v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
@@ -45,6 +48,7 @@ import (
camelevent "github.com/apache/camel-k/pkg/event"
"github.com/apache/camel-k/pkg/platform"
"github.com/apache/camel-k/pkg/util/digest"
+ "github.com/apache/camel-k/pkg/util/kubernetes"
"github.com/apache/camel-k/pkg/util/log"
"github.com/apache/camel-k/pkg/util/monitoring"
)
@@ -54,7 +58,7 @@ func Add(mgr manager.Manager) error {
if err != nil {
return err
}
- return add(mgr, newReconciler(mgr, c))
+ return add(mgr, c, newReconciler(mgr, c))
}
func newReconciler(mgr manager.Manager, c client.Client) reconcile.Reconciler {
@@ -72,8 +76,8 @@ func newReconciler(mgr manager.Manager, c client.Client)
reconcile.Reconciler {
)
}
-func add(mgr manager.Manager, r reconcile.Reconciler) error {
- return builder.ControllerManagedBy(mgr).
+func add(mgr manager.Manager, c client.Client, r reconcile.Reconciler) error {
+ b := builder.ControllerManagedBy(mgr).
Named("integration-controller").
// Watch for changes to primary resource Integration
For({}, builder.WithPredicates(
@@ -110,7 +114,7 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error
{
if !platform.IsCurrentOperatorGlobal() {
opts = append(opts,
ctrl.InNamespace(kit.Namespace))
}
- if err :=
mgr.GetClient().List(context.Background(), list, opts...); err != nil {
+ if err := c.List(context.Background(), list,
opts...); err != nil {
log.Error(err, "Failed to retrieve
integration list")
return requests
}
@@ -152,7 +156,7 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error
{
opts = append(opts,
ctrl.InNamespace(p.Namespace))
}
- if err :=
mgr.GetClient().List(context.Background(), list, opts...); err != nil {
+ if err := c.List(context.Background(),
list, opts...); err != nil {
log.Error(err, "Failed to list
integrations")
return requests
}
@@ -174,8 +178,6 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error
{
})).
// Watch for the owned Deployments
Owns({}).
- // Watch for the owned Knative Services
- Owns({}).
// Watch for the owned CronJobs
Owns({}).
// Watch for the Integration Pods
@@ -190,8 +192,23 @@ func add(mgr manager.Manager, r reconcile.Reconciler)
error {
},
},
}
- })).
- Complete(r)
+ }))
+
+ // Watch for the owned Knative Services conditionally
+ if ok, err := kubernetes.IsAPIResourceInstalled(c,
servingv1.SchemeGroupVersion.String(),
reflect.TypeOf(servingv1.Service{}).Name()); err != nil {
+ return err
+ } else if ok {
+ // Check for permission to watch the ConsoleCLIDownload resource
+ ctx, cancel := context.WithTimeout(context.Background(),
[camel-k] 03/08: chore: Apply master and threescale traits during error phase
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 8bc854e8b57fddeafc2514e4f533c9ef2b015d42
Author: Antonin Stefanutti
AuthorDate: Thu Oct 7 15:36:00 2021 +0200
chore: Apply master and threescale traits during error phase
---
addons/master/master.go | 5 ++---
addons/threescale/3scale.go | 6 +++---
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/addons/master/master.go b/addons/master/master.go
index 119cf85..8d56e48 100644
--- a/addons/master/master.go
+++ b/addons/master/master.go
@@ -85,7 +85,7 @@ func (t *masterTrait) Configure(e *trait.Environment) (bool,
error) {
return false, nil
}
- if !e.IntegrationInPhase(v1.IntegrationPhaseInitialization,
v1.IntegrationPhaseDeploying, v1.IntegrationPhaseRunning) {
+ if !e.IntegrationInPhase(v1.IntegrationPhaseInitialization) &&
!e.IntegrationInRunningPhases() {
return false, nil
}
@@ -157,7 +157,6 @@ func (t *masterTrait) Configure(e *trait.Environment)
(bool, error) {
}
func (t *masterTrait) Apply(e *trait.Environment) error {
-
if e.IntegrationInPhase(v1.IntegrationPhaseInitialization) {
util.StringSliceUniqueAdd(,
v1.CapabilityMaster)
@@ -166,7 +165,7 @@ func (t *masterTrait) Apply(e *trait.Environment) error {
util.StringSliceUniqueAdd(, dep)
}
- } else if e.IntegrationInPhase(v1.IntegrationPhaseDeploying,
v1.IntegrationPhaseRunning) {
+ } else if e.IntegrationInRunningPhases() {
serviceAccount := e.Integration.Spec.ServiceAccountName
if serviceAccount == "" {
serviceAccount = "default"
diff --git a/addons/threescale/3scale.go b/addons/threescale/3scale.go
index 41c6b45..d05fcb6 100644
--- a/addons/threescale/3scale.go
+++ b/addons/threescale/3scale.go
@@ -20,9 +20,9 @@ package threescale
import (
"strconv"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/apache/camel-k/pkg/trait"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+ "github.com/apache/camel-k/pkg/trait"
)
// The 3scale trait can be used to automatically create annotations that allow
@@ -85,7 +85,7 @@ func (t *threeScaleTrait) Configure(e *trait.Environment)
(bool, error) {
return false, nil
}
- if !e.IntegrationInPhase(v1.IntegrationPhaseDeploying) {
+ if !e.IntegrationInRunningPhases() {
return false, nil
}
[camel-k] 06/08: fix: Mark transition from deploying to running phase
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 0a20787562986eeb5c4b02250c3f63a398ba071d
Author: Antonin Stefanutti
AuthorDate: Fri Oct 8 12:55:38 2021 +0200
fix: Mark transition from deploying to running phase
---
pkg/controller/integration/monitor.go | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pkg/controller/integration/monitor.go
b/pkg/controller/integration/monitor.go
index 3ab6791..990aa6b 100644
--- a/pkg/controller/integration/monitor.go
+++ b/pkg/controller/integration/monitor.go
@@ -148,6 +148,9 @@ func (action *monitorAction) Handle(ctx context.Context,
integration *v1.Integra
// Reconcile Integration phase
if integration.Status.Phase == v1.IntegrationPhaseDeploying {
integration.Status.Phase = v1.IntegrationPhaseRunning
+ // let's return to mark the transition and wait for another
reconciliation cycle
+ // so that caches have more time to catch-up
+ return integration, nil
}
previous :=
integration.Status.GetCondition(v1.IntegrationConditionReady)
[GitHub] [camel-k] astefanutti merged pull request #2682: feat: Comprehensive Integration error status
astefanutti merged pull request #2682: URL: https://github.com/apache/camel-k/pull/2682 -- 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 (457d98d -> 6ec23f7)
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. omit 457d98d Regen for commit 67f3d2cb6707e9222ec088adddc91645ed85a9a9 add b36857e CAMEL-16861: Cleanup and update EIP docs add 6ec23f7 Regen for commit b36857eb4919b18453fe5797c6999bfdafc38092 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 (457d98d) \ N -- N -- N refs/heads/regen_bot (6ec23f7) 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. No new revisions were added by this update. Summary of changes: .../docs/modules/eips/pages/removeHeader-eip.adoc | 18 --- .../docs/modules/eips/pages/removeHeaders-eip.adoc | 55 +- 2 files changed, 64 insertions(+), 9 deletions(-)
[GitHub] [camel] github-actions[bot] opened a new pull request #6240: Generated sources regen
github-actions[bot] opened a new pull request #6240: URL: https://github.com/apache/camel/pull/6240 Regen bot :robot: found some uncommited changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: CAMEL-16861: Cleanup and update EIP docs
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 71666a2 CAMEL-16861: Cleanup and update EIP docs
71666a2 is described below
commit 71666a24bc5bf961845a27a0ff7378e9849fa2f1
Author: Claus Ibsen
AuthorDate: Mon Oct 11 17:11:29 2021 +0200
CAMEL-16861: Cleanup and update EIP docs
---
.../src/main/java/org/apache/camel/Exchange.java | 4 +-
.../docs/modules/eips/pages/removeHeader-eip.adoc | 9 ++-
.../docs/modules/eips/pages/removeHeaders-eip.adoc | 11 +++-
.../modules/eips/pages/removeProperties-eip.adoc | 72 --
.../modules/eips/pages/removeProperty-eip.adoc | 40 ++--
...http-protocol-headers-in-the-camel-message.adoc | 2 -
6 files changed, 92 insertions(+), 46 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/Exchange.java
b/core/camel-api/src/main/java/org/apache/camel/Exchange.java
index 3c6639d..5f34c55 100644
--- a/core/camel-api/src/main/java/org/apache/camel/Exchange.java
+++ b/core/camel-api/src/main/java/org/apache/camel/Exchange.java
@@ -388,7 +388,7 @@ public interface Exchange {
Object removeProperty(String name);
/**
- * Remove all of the properties associated with the exchange matching a
specific pattern
+ * Remove all the properties associated with the exchange matching a
specific pattern
*
* @param pattern pattern of names
* @return boolean whether any properties matched
@@ -397,7 +397,7 @@ public interface Exchange {
/**
* Removes the properties from this exchange that match the given
pattern, except for the ones matching one
- * ore more excludePatterns
+ * or more excludePatterns
*
* @param pattern pattern of names that should be removed
* @param excludePatterns one or more pattern of properties names that
should be excluded (= preserved)
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/removeHeader-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/removeHeader-eip.adoc
index b065c0c..81ad38f 100644
---
a/core/camel-core-engine/src/main/docs/modules/eips/pages/removeHeader-eip.adoc
+++
b/core/camel-core-engine/src/main/docs/modules/eips/pages/removeHeader-eip.adoc
@@ -5,7 +5,7 @@
:since:
:supportlevel: Stable
-The Remove Header EIP allows you to remove a header from the
xref:message.adoc[Message].
+The Remove Header EIP allows you to remove a single header from the
xref:message.adoc[Message].
== Options
@@ -37,4 +37,9 @@ And in XML:
== See Also
-If you need to remove multiple headers or by pattern, then use
xref:removeHeaders-eip.adoc[Remove Headers].
\ No newline at end of file
+Camel provides the following EIPs for removing headers or exchange properties:
+
+- xref:removeHeader-eip.adoc[Remove Header] - To remove a single header
+- xref:removeHeaders-eip.adoc[Remove Headers] - To remove one or more message
headers
+- xref:removeProperty-eip.adoc[Remove Property] - To remove a single exchange
property
+- xref:removeProperties-eip.adoc[Remove Properties] - To remove one or more
exchange properties
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/removeHeaders-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/removeHeaders-eip.adoc
index e43374e..408df19 100644
---
a/core/camel-core-engine/src/main/docs/modules/eips/pages/removeHeaders-eip.adoc
+++
b/core/camel-core-engine/src/main/docs/modules/eips/pages/removeHeaders-eip.adoc
@@ -40,7 +40,7 @@ And in XML:
-
+
@@ -62,11 +62,16 @@ And in XML:
-
+
== See Also
-To remove a single header, then you can use xref:removeHeader-eip.adoc[Remove
Header].
\ No newline at end of file
+Camel provides the following EIPs for removing headers or exchange properties:
+
+- xref:removeHeader-eip.adoc[Remove Header] - To remove a single header
+- xref:removeHeaders-eip.adoc[Remove Headers] - To remove one or more message
headers
+- xref:removeProperty-eip.adoc[Remove Property] - To remove a single exchange
property
+- xref:removeProperties-eip.adoc[Remove Properties] - To remove one or more
exchange properties
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/removeProperties-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/removeProperties-eip.adoc
index 11f392d..a202802 100644
---
a/core/camel-core-engine/src/main/docs/modules/eips/pages/removeProperties-eip.adoc
+++
b/core/camel-core-engine/src/main/docs/modules/eips/pages/removeProperties-eip.adoc
@@ -5,7 +5,8 @@
:since:
:supportlevel: Stable
-The RemoveProperties EIP allows you to remove Properties from you exchange.
+The Remove Properties EIP allows you to remove one or more `Exchange`
properties,
+based on pattern
[camel] branch main updated (67f3d2c -> b36857e)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. from 67f3d2c Regen for commit 1410dea38615fbeb6bc1b88be582cba7c6d370bb add b36857e CAMEL-16861: Cleanup and update EIP docs No new revisions were added by this update. Summary of changes: .../docs/modules/eips/pages/removeHeader-eip.adoc | 18 --- .../docs/modules/eips/pages/removeHeaders-eip.adoc | 55 +- 2 files changed, 64 insertions(+), 9 deletions(-)
[GitHub] [camel] oscerd closed pull request #6239: Generated sources regen
oscerd closed pull request #6239: URL: https://github.com/apache/camel/pull/6239 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus-examples] branch err-registry created (now 06a1cc0)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch err-registry in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git. at 06a1cc0 Added sample for checking error This branch includes the following new commits: new 06a1cc0 Added sample for checking error 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.
[camel-quarkus-examples] 01/01: Added sample for checking error
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch err-registry
in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git
commit 06a1cc01f15e37ef33d9c8ba0e354c28e492f7a0
Author: Andrea Cosentino
AuthorDate: Mon Oct 11 16:53:38 2021 +0200
Added sample for checking error
---
kafka-sample/kafka-registry-prod/README.adoc | 10 +
.../kubefiles/secret-example.yml | 28 ++
kafka-sample/kafka-registry-prod/pom.xml | 379 +++
.../src/main/docker/Dockerfile.jvm | 71
.../src/main/docker/Dockerfile.native | 44 +++
.../src/main/java/org/acme/kafka/Routes.java | 39 ++
.../src/main/java/org/acme/kafka/User.java | 418 +
.../src/main/resources/application.properties | 99 +
kafka-sample/kafka-registry-prod/user.avsc | 15 +
9 files changed, 1103 insertions(+)
diff --git a/kafka-sample/kafka-registry-prod/README.adoc
b/kafka-sample/kafka-registry-prod/README.adoc
new file mode 100644
index 000..5db5c90
--- /dev/null
+++ b/kafka-sample/kafka-registry-prod/README.adoc
@@ -0,0 +1,10 @@
+== Camel Quarkus Kafka with Service Registry
+
+1. Populate correctly the credentials in application.properties after creating
kafka instance and registry instance
+2. mvn clean package
+3. java -jar target/quarkus-app/quarkus-run.jar
+
+Error:
+
+2021-10-11 16:50:21,197 WARN [org.apa.cam.com.tim.TimerConsumer] (Camel
(camel-1) thread #0 - timer://foo) Error processing exchange.
Exchange[57AD50F0C45CD89-]. Caused by:
[io.apicurio.registry.rest.client.exception.ArtifactNotFoundException - No
artifact with ID 'test-value' in group 'null' was found.]:
io.apicurio.registry.rest.client.exception.ArtifactNotFoundException: No
artifact with ID 'test-value' in group 'null' was found.
+
diff --git a/kafka-sample/kafka-registry-prod/kubefiles/secret-example.yml
b/kafka-sample/kafka-registry-prod/kubefiles/secret-example.yml
new file mode 100644
index 000..72499b2
--- /dev/null
+++ b/kafka-sample/kafka-registry-prod/kubefiles/secret-example.yml
@@ -0,0 +1,28 @@
+#
+# 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.
+#
+
+apiVersion: v1
+kind: Secret
+metadata:
+ name: camel-kafka
+ namespace: test
+type: Opaque
+stringData:
+ brokers: ""
+ id: ""
+ secret: ""
+ token: ""
\ No newline at end of file
diff --git a/kafka-sample/kafka-registry-prod/pom.xml
b/kafka-sample/kafka-registry-prod/pom.xml
new file mode 100644
index 000..051f0a0
--- /dev/null
+++ b/kafka-sample/kafka-registry-prod/pom.xml
@@ -0,0 +1,379 @@
+
+
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+camel-quarkus-examples-kafka-prod
+org.apache.camel.quarkus.examples
+2.3.0
+
+Camel Quarkus :: Examples :: Kafka
+Camel Quarkus Example :: Kafka
+
+
+2.3.0.Final
+
${quarkus.platform.version}
+
+
io.quarkus.platform
+
quarkus-bom
+
${quarkus.platform.group-id}
+
quarkus-camel-bom
+
+UTF-8
+
UTF-8
+11
+11
+
${maven.compiler.target}
+
${maven.compiler.source}
+
+2.11.0
+1.3.2
+3.8.0
+3.2.0
+3.1.0
+2.22.2
+3.0
+0.7.2
+
+
+
+
+
+
+${quarkus.platform.group-id}
+${quarkus.platform.artifact-id}
+${quarkus.platform.version}
+pom
+import
+
+
+${camel-quarkus.platform.group-id}
+${camel-quarkus.platform.artifact-id}
+${camel-quarkus.platform.version}
+pom
+import
+
+
+io.strimzi
+kafka-oauth-client
+${kafka-oauth-client.version}
+
+
+
+
+
+
+org.apache.camel.quarkus
+camel-quarkus-microprofile-health
+
+
[camel] branch regen_bot updated (377ce22 -> 457d98d)
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. omit 377ce22 Regen for commit 1410dea38615fbeb6bc1b88be582cba7c6d370bb add 5f89924 Regen for commit 0231a1cecb933ae0a6781b732f43d13e39ef22c4 add 67f3d2c Regen for commit 1410dea38615fbeb6bc1b88be582cba7c6d370bb add 457d98d Regen for commit 67f3d2cb6707e9222ec088adddc91645ed85a9a9 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 (377ce22) \ N -- N -- N refs/heads/regen_bot (457d98d) 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. No new revisions were added by this update. Summary of changes: .../sql/stored/template/generated/SSPTParser.java | 833 +++-- .../template/generated/SSPTParserConstants.java| 110 +- .../template/generated/SSPTParserTokenManager.java | 1222 ++-- 3 files changed, 1072 insertions(+), 1093 deletions(-)
[GitHub] [camel] github-actions[bot] opened a new pull request #6239: Generated sources regen
github-actions[bot] opened a new pull request #6239: URL: https://github.com/apache/camel/pull/6239 Regen bot :robot: found some uncommited changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- 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
[GitHub] [camel] iliya-gr opened a new pull request #6238: CAMEL-17065: Fix cluster view release on all routes stop. Add autoStartup check before starting route.
iliya-gr opened a new pull request #6238: URL: https://github.com/apache/camel/pull/6238 Release ref counter on `onStop` instead of `onShutdown` so when all routes get stopped the counter release handler will be called and corresponded cluster view get released. Save autoStartup route flag on init and check it before starting route when leader 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
[GitHub] [camel-k] k0pper commented on issue #2397: Delete knative warning when Knative is not installed
k0pper commented on issue #2397:
URL: https://github.com/apache/camel-k/issues/2397#issuecomment-940074582
Getting this error when trying to deploy a KameletBinding onto a minikube
cluster with the Camel K Operator running in the same namespace. The creation
of the integrations fails and periodically prints out this message.
>
{"level":"info","ts":1633961666.2383604,"logger":"camel-k.controller.kameletbinding","msg":"Reconciling
KameletBinding","request-namespace":"default","request-name":"chuck-norris-telegram-binding"}
>
{"level":"info","ts":1633961666.2408755,"logger":"camel-k.controller.kameletbinding","msg":"Invoking
action
monitor","request-namespace":"default","request-name":"chuck-norris-telegram-binding","api-version":"camel.apache.org/v1alpha1","kind":"KameletBinding","ns":"default","name":"chuck-norris-telegram-binding"}
> {"level":"info","ts":1633961666.2700589,"logger":"camel-k","msg":"could
not find any knative type in namespace default, last error was:
services.serving.knative.dev is forbidden: User
\"system:serviceaccount:default:camel-k-operator\" cannot list resource
\"services\" in API group \"serving.knative.dev\" in the namespace \"default\""}
Any possible fixes for this one?
--
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
[GitHub] [camel-k] joes opened a new issue #2685: Building with buildah not working
joes opened a new issue #2685:
URL: https://github.com/apache/camel-k/issues/2685
I have installed camel-k operator as follows on a microk8s cluster:
```bash
microk8s kubectl -n camel-k-operator-system create secret docker-registry
gitlab-regcred --docker-server=gitlab.somewhere.com:5050
--docker-username=redacted --docker-password=redacted
kamel install -n camel-k-operator-system --olm=false --cluster-type
kubernetes --registry gitlab.somewhere.com:5050 --registry-secret
gitlab-regcred --registry-insecure --organization
integrations/camel-k/camel-k-builder-images --build-publish-strategy=Buildah
```
I then test the integration platform as follows with the `hello.groovy`
example:
```bash
./kamel-bin/v1.6.0/kamel run -n camel-k-operator-system hello.groovy'
./kamel run -n camel-k-operator-system hello.groovy
```
However, the build fails.
These are the logs from container `buildah` in pod
`camel-k-kit-c5i39nueu3p4lqk7jg90-builder`:
```plain
time="2021-10-11T13:03:34Z" level=warning msg="The cgroups manager is set to
systemd but there is no systemd user session available"
time="2021-10-11T13:03:34Z" level=warning msg="For using systemd, you may
need to login using an user session"
time="2021-10-11T13:03:34Z" level=warning msg="Alternatively, you can enable
lingering with: `loginctl enable-linger 0` (possibly as root)"
time="2021-10-11T13:03:34Z" level=warning msg="Falling back to
--cgroup-manager=cgroupfs"
STEP 1: FROM adoptopenjdk/openjdk11:slim
Getting image source signatures
Copying blob
sha256:2136d49ac7f49a8cc79cc781c36b7484abc98dcec596cc3416bd22af8c67df40
Copying blob
sha256:35807b77a593c1147d13dc926a91dcc3015616ff7307cc30442c5a8e07546283
Copying blob
sha256:e24c25e8b19657017e6353caba3d02f77379337c951e3b244b85ee052a7ed425
Copying blob
sha256:8b8b474be7903f3839424fa2b2585e8a94407f7f6e46617af5bc1f56a6d8e258
Copying config
sha256:c7bb7c58c34f33fef5f47c4f47de229c0e716c37ec1ae23e84fec006debf6363
Writing manifest to image destination
Storing signatures
level=error msg="Error while applying layer: ApplyLayer exit status 1
stdout: stderr: permission denied"
error creating build container: The following failures happened while trying
to pull image specified by "adoptopenjdk/openjdk11:slim" based on search
registries in /etc/containers/registries.conf:
* "localhost/adoptopenjdk/openjdk11:slim": Error initializing source
docker://localhost/adoptopenjdk/openjdk11:slim: error pinging docker registry
localhost: Get http://localhost/v2/: dial tcp [::1]:80: connect: connection
refused
* "docker.io/adoptopenjdk/openjdk11:slim": Error committing the finished
image: error adding layer with blob
"sha256:35807b77a593c1147d13dc926a91dcc3015616ff7307cc30442c5a8e07546283":
ApplyLayer exit status 1 stdout: stderr: permission denied
* "registry.fedoraproject.org/adoptopenjdk/openjdk11:slim": Error
initializing source
docker://registry.fedoraproject.org/adoptopenjdk/openjdk11:slim: Error reading
manifest slim in registry.fedoraproject.org/adoptopenjdk/openjdk11: manifest
unknown: manifest unknown
* "registry.access.redhat.com/adoptopenjdk/openjdk11:slim": Error
initializing source
docker://registry.access.redhat.com/adoptopenjdk/openjdk11:slim: Error reading
manifest slim in registry.access.redhat.com/adoptopenjdk/openjdk11: name
unknown: Repo not found
* "registry.centos.org/adoptopenjdk/openjdk11:slim": Error initializing
source docker://registry.centos.org/adoptopenjdk/openjdk11:slim: Error reading
manifest slim in registry.centos.org/adoptopenjdk/openjdk11: manifest unknown:
manifest unknown
* "quay.io/adoptopenjdk/openjdk11:slim": Error initializing source
docker://quay.io/adoptopenjdk/openjdk11:slim: Error reading manifest slim in
quay.io/adoptopenjdk/openjdk11: unauthorized: access to the requested resource
is not authorized
level=error msg="exit status 1"
```
Output of `kubectl get integrationplatform -o yaml -n
camel-k-operator-system`:
```yaml
apiVersion: v1
items:
- apiVersion: camel.apache.org/v1
kind: IntegrationPlatform
metadata:
creationTimestamp: "2021-10-11T12:57:30Z"
generation: 1
labels:
app: camel-k
managedFields:
- apiVersion: camel.apache.org/v1
fieldsType: FieldsV1
fieldsV1:
f:metadata:
f:labels:
.: {}
f:app: {}
f:spec:
.: {}
f:build:
.: {}
f:maven:
.: {}
f:settings: {}
f:publishStrategy: {}
f:registry:
.: {}
f:address: {}
f:insecure: {}
f:organization: {}
f:secret: {}
f:cluster: {}
f:kamelet: {}
f:resources: {}
[camel] branch main updated: Regen for commit 1410dea38615fbeb6bc1b88be582cba7c6d370bb
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 67f3d2c Regen for commit 1410dea38615fbeb6bc1b88be582cba7c6d370bb 67f3d2c is described below commit 67f3d2cb6707e9222ec088adddc91645ed85a9a9 Author: davsclaus AuthorDate: Mon Oct 11 13:45:06 2021 + Regen for commit 1410dea38615fbeb6bc1b88be582cba7c6d370bb Signed-off-by: GitHub --- .../resources/org/apache/camel/catalog/models/recipientList.json| 2 +- .../resources/org/apache/camel/catalog/schemas/camel-spring.xsd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/recipientList.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/recipientList.json index 16b38be..c0b03e8 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/recipientList.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/recipientList.json @@ -3,7 +3,7 @@ "kind": "model", "name": "recipientList", "title": "Recipient List", -"description": "Route messages to a number of dynamically specified recipients (dynamic to)", +"description": "Route messages to a number of dynamically specified recipients", "deprecated": false, "label": "eip,routing", "javaType": "org.apache.camel.model.RecipientListDefinition", diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd index 14dbfc0..2366148 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd @@ -1058,7 +1058,7 @@ The destination endpoints are selected by random.
[GitHub] [camel] oscerd merged pull request #6237: Generated sources regen
oscerd merged pull request #6237: URL: https://github.com/apache/camel/pull/6237 -- 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 (6bf51f7 -> 377ce22)
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. omit 6bf51f7 Regen for commit 0231a1cecb933ae0a6781b732f43d13e39ef22c4 add b6c7cd5 CAMEL-16861: Cleanup and update EIP docs add 1410dea CAMEL-16861: Cleanup and update EIP docs add 377ce22 Regen for commit 1410dea38615fbeb6bc1b88be582cba7c6d370bb 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 (6bf51f7) \ N -- N -- N refs/heads/regen_bot (377ce22) 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. No new revisions were added by this update. Summary of changes: .../apache/camel/catalog/models/recipientList.json | 2 +- .../apache/camel/catalog/schemas/camel-spring.xsd | 2 +- .../docs/modules/eips/pages/multicast-eip.adoc | 2 +- .../docs/modules/eips/pages/recipientList-eip.adoc | 336 ++--- .../org/apache/camel/model/recipientList.json | 2 +- .../camel/model/RecipientListDefinition.java | 2 +- .../org/apache/camel/support/ObjectHelper.java | 1 - 7 files changed, 170 insertions(+), 177 deletions(-)
[GitHub] [camel] github-actions[bot] opened a new pull request #6237: Generated sources regen
github-actions[bot] opened a new pull request #6237: URL: https://github.com/apache/camel/pull/6237 Regen bot :robot: found some uncommited changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- 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
[GitHub] [camel-quarkus] JiriOndrusek opened a new pull request #3175: AWS Aws2DdbQuarkusClientTest fails with real AWS #3174
JiriOndrusek opened a new pull request #3175: URL: https://github.com/apache/camel-quarkus/pull/3175 fixes https://github.com/apache/camel-quarkus/issues/3174 -- 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
[GitHub] [camel-quarkus] JiriOndrusek opened a new issue #3174: AWS Aws2DdbQuarkusClientTest fails with real AWS
JiriOndrusek opened a new issue #3174: URL: https://github.com/apache/camel-quarkus/issues/3174 Test `Aws2DdbQuarkusClientTest` from `integration-test-groups/aws2-quarkus-client/aws2-ddb/` fail;s in JVM and native mode with real AWS account. Here is the log: ``` at io.quarkus.test.common.TestResourceManager.start(TestResourceManager.java:136) ... 48 more Caused by: java.util.concurrent.ExecutionException: java.lang.RuntimeException: Unable to start Quarkus test resource org.apache.camel.quarkus.test.support.aws2.Aws2TestResource@3d9796ed at java.base/java.util.concurrent.FutureTask.report(FutureTask.java:122) at java.base/java.util.concurrent.FutureTask.get(FutureTask.java:191) at io.quarkus.test.common.TestResourceManager.waitForAllFutures(TestResourceManager.java:149) ... 49 more Caused by: java.lang.RuntimeException: Unable to start Quarkus test resource org.apache.camel.quarkus.test.support.aws2.Aws2TestResource@3d9796ed at io.quarkus.test.common.TestResourceManager.lambda$start$1(TestResourceManager.java:130) at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:515) at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264) at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128) at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628) at java.base/java.lang.Thread.run(Thread.java:829) Caused by: java.lang.NullPointerException at java.base/java.util.concurrent.ConcurrentHashMap.putVal(ConcurrentHashMap.java:1011) at java.base/java.util.concurrent.ConcurrentHashMap.putAll(ConcurrentHashMap.java:1089) at io.quarkus.test.common.TestResourceManager.lambda$start$1(TestResourceManager.java:127) ... 5 more ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: Regen for commit 0231a1cecb933ae0a6781b732f43d13e39ef22c4
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 5f89924 Regen for commit 0231a1cecb933ae0a6781b732f43d13e39ef22c4 5f89924 is described below commit 5f8992485948f7a405f9709d08b928d0812886fb Author: davsclaus AuthorDate: Mon Oct 11 12:52:31 2021 + Regen for commit 0231a1cecb933ae0a6781b732f43d13e39ef22c4 Signed-off-by: GitHub --- .../generated/resources/org/apache/camel/catalog/models/random.json | 2 +- .../resources/org/apache/camel/catalog/models/roundRobin.json | 2 +- .../resources/org/apache/camel/catalog/schemas/camel-spring.xsd | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/random.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/random.json index 9dda75d..4280356 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/random.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/random.json @@ -3,7 +3,7 @@ "kind": "model", "name": "random", "title": "Random", -"description": "A random endpoint is selected for each exchange.", +"description": "The destination endpoints are selected by random.", "deprecated": false, "label": "eip,routing", "javaType": "org.apache.camel.model.loadbalancer.RandomLoadBalancerDefinition", diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/roundRobin.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/roundRobin.json index 52b5cd9..da29615 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/roundRobin.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/roundRobin.json @@ -3,7 +3,7 @@ "kind": "model", "name": "roundRobin", "title": "Round Robin", -"description": "The exchanges are selected in a round robin fashion. This is a well known and classic policy, which spreads the load evenly.", +"description": "The destination endpoints are selected in a round-robin fashion. This is a well known and classic policy, which spreads the load evenly.", "deprecated": false, "label": "eip,routing", "javaType": "org.apache.camel.model.loadbalancer.RoundRobinLoadBalancerDefinition", diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd index eb5375a..14dbfc0 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd @@ -1050,7 +1050,7 @@ Rest PUT command @@ -1226,8 +1226,8 @@ Forces a rollback by stopping routing the message
[GitHub] [camel] oscerd merged pull request #6236: Generated sources regen
oscerd merged pull request #6236: URL: https://github.com/apache/camel/pull/6236 -- 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
[GitHub] [camel] github-actions[bot] opened a new pull request #6236: Generated sources regen
github-actions[bot] opened a new pull request #6236: URL: https://github.com/apache/camel/pull/6236 Regen bot :robot: found some uncommited changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- 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 (68db2e5 -> 6bf51f7)
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 68db2e5 CAMEL-16861: Cleanup and update EIP docs add dcb33f0 CAMEL-16861: Cleanup and update EIP docs add b19b1c3 CAMEL-16861: Cleanup and update EIP docs add 0231a1c CAMEL-16861: Cleanup and update EIP docs add 6bf51f7 Regen for commit 0231a1cecb933ae0a6781b732f43d13e39ef22c4 No new revisions were added by this update. Summary of changes: .../org/apache/camel/catalog/models/random.json| 2 +- .../apache/camel/catalog/models/roundRobin.json| 2 +- .../apache/camel/catalog/schemas/camel-spring.xsd | 6 +- .../modules/eips/pages/customLoadBalancer-eip.adoc | 17 +++--- .../docs/modules/eips/pages/loadBalance-eip.adoc | 4 +- .../modules/eips/pages/point-to-point-channel.adoc | 2 + .../docs/modules/eips/pages/process-manager.adoc | 21 --- .../eips/pages/publish-subscribe-channel.adoc | 69 +++--- .../main/docs/modules/eips/pages/random-eip.adoc | 37 +++- .../docs/modules/eips/pages/roundRobin-eip.adoc| 35 +++ .../main/docs/modules/eips/pages/sticky-eip.adoc | 21 --- .../main/docs/modules/eips/pages/topic-eip.adoc| 17 -- .../main/docs/modules/eips/pages/weighted-eip.adoc | 34 +++ .../apache/camel/model/loadbalancer/random.json| 2 +- .../camel/model/loadbalancer/roundRobin.json | 2 +- .../loadbalancer/RandomLoadBalancerDefinition.java | 2 +- .../RoundRobinLoadBalancerDefinition.java | 4 +- 17 files changed, 178 insertions(+), 99 deletions(-)
[camel] 01/02: CAMEL-16861: Cleanup and update EIP docs
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit b6c7cd5cf5550de9524e9fb51ed4cc227b7d2027 Author: Claus Ibsen AuthorDate: Mon Oct 11 14:13:11 2021 +0200 CAMEL-16861: Cleanup and update EIP docs --- .../src/main/docs/modules/eips/pages/recipientList-eip.adoc | 2 +- .../src/generated/resources/org/apache/camel/model/recipientList.json | 2 +- .../src/main/java/org/apache/camel/model/RecipientListDefinition.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/recipientList-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/recipientList-eip.adoc index 41637a1..83d2abe 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/recipientList-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/recipientList-eip.adoc @@ -1,7 +1,7 @@ = Recipient List EIP :doctitle: Recipient List :shortname: recipientList -:description: Route messages to a number of dynamically specified recipients (dynamic to) +:description: Route messages to a number of dynamically specified recipients :since: :supportlevel: Stable diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/recipientList.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/recipientList.json index 16b38be..c0b03e8 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/recipientList.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/recipientList.json @@ -3,7 +3,7 @@ "kind": "model", "name": "recipientList", "title": "Recipient List", -"description": "Route messages to a number of dynamically specified recipients (dynamic to)", +"description": "Route messages to a number of dynamically specified recipients", "deprecated": false, "label": "eip,routing", "javaType": "org.apache.camel.model.RecipientListDefinition", diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/RecipientListDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RecipientListDefinition.java index 3af87d1..e381dd1 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/RecipientListDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/RecipientListDefinition.java @@ -33,7 +33,7 @@ import org.apache.camel.model.language.ExpressionDefinition; import org.apache.camel.spi.Metadata; /** - * Route messages to a number of dynamically specified recipients (dynamic to) + * Route messages to a number of dynamically specified recipients */ @Metadata(label = "eip,routing") @XmlRootElement(name = "recipientList")
[camel] 02/02: CAMEL-16861: Cleanup and update EIP docs
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1410dea38615fbeb6bc1b88be582cba7c6d370bb
Author: Claus Ibsen
AuthorDate: Mon Oct 11 14:43:42 2021 +0200
CAMEL-16861: Cleanup and update EIP docs
---
.../docs/modules/eips/pages/multicast-eip.adoc | 2 +-
.../docs/modules/eips/pages/recipientList-eip.adoc | 334 ++---
.../org/apache/camel/support/ObjectHelper.java | 1 -
3 files changed, 165 insertions(+), 172 deletions(-)
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/multicast-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/multicast-eip.adoc
index fe33060..bc18439 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/multicast-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/multicast-eip.adoc
@@ -29,7 +29,7 @@ The following properties are set on each Exchange that are
multicasted:
|===
| Property | Type | Description
| `CamelMulticastIndex` | `int` | An index counter that increases for each
Exchange being multicasted. The counter starts from 0.
-| `MULTICAST_COMPLETE` | `boolean` |Whether or not this Exchange is the last.
+| `CamelMulticastComplete` | `boolean` | Whether this Exchange is the last.
|===
== Using Multicast
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/recipientList-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/recipientList-eip.adoc
index 83d2abe..e0c6e13 100644
---
a/core/camel-core-engine/src/main/docs/modules/eips/pages/recipientList-eip.adoc
+++
b/core/camel-core-engine/src/main/docs/modules/eips/pages/recipientList-eip.adoc
@@ -5,11 +5,15 @@
:since:
:supportlevel: Stable
-image::eip/RecipientList.gif[image]
+Camel supports the
+https://www.enterpriseintegrationpatterns.com/RecipientList.html[Recipient
List]
+from the xref:enterprise-integration-patterns.adoc[EIP patterns].
-The recipients will receive a copy of the *same* Exchange, and Camel will
execute them sequentially.
+How do we route a message to a list of dynamically specified recipients?
-TIP: See the `cacheSize` option for more details on _how much cache_ to use
depending on how many or few unique endpoints are used.
+image::eip/RecipientList.gif[image]
+
+Define a channel for each recipient. Then use a Recipient List to inspect an
incoming message, determine the list of desired recipients, and forward the
message to all channels associated with the recipients in the list.
== Options
@@ -18,39 +22,63 @@ include::partial$eip-options.adoc[]
// eip options: END
-[TIP]
-
-You can use the RecipientList Annotation on a POJO to create a Dynamic
Recipient List. For more details see the Bean Integration.
-
+TIP: See the `cacheSize` option for more details on _how much cache_ to use
depending on how many or few unique endpoints are used.
+
+== Exchange properties
-== Static Recipient List
-The following example shows how to route a request from an input *queue:a*
endpoint to a static list of destinations
+The following properties are set on each Exchange that are sent by the
recipient list:
+
+[width="100%",cols="3,1m,6",options="header"]
+|===
+| Property | Type | Description
+| `CamelRecipientListEndpoint` | `String` | Uri of the `Endpoint` that the
message was sent to.
+|===
+
+== Using Recipient List
+
+The Recipient List EIP allows to route *the same* message to a number of
xref:latest@manual:ROOT:endpoint.adoc[endpoints]
+and process them in a different way.
+
+There can be 1 or more destinations, and Camel will execute them sequentially
(by default).
+However, a parallel mode exists which allows processing messages concurrently.
+
+The Recipient List EIP has many features and is based on the
xref:multicast-eip.adoc[Multicast] EIP.
+For example the Recipient List EIP is capable of aggregating each message into
a single
+_response_ message as the result after the Recipient List EIP.
+
+=== Using static Recipient List
+
+The following example shows how to route a request from an input queue:a
endpoint
+to a static list of destinations, using `constant`:
[source,java]
from("jms:queue:a")
-.recipientList(constant("direct:b,direct:c,direct:d"));
+.recipientList(constant("seda:x,seda:y,seda:z"));
And in XML:
[source,xml]
-http://camel.apache.org/schema/spring;>
-
-
-
-direct:b,direct:c,direct:d
-
-
-
+
+
+
+seda:x,seda:y,seda:z
+
+
-== Dynamic Recipient List
+=== Using dynamic Recipient List
+
Usually one of the main
[camel] branch main updated (0231a1c -> 1410dea)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. from 0231a1c CAMEL-16861: Cleanup and update EIP docs new b6c7cd5 CAMEL-16861: Cleanup and update EIP docs new 1410dea CAMEL-16861: Cleanup and update EIP docs 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: .../docs/modules/eips/pages/multicast-eip.adoc | 2 +- .../docs/modules/eips/pages/recipientList-eip.adoc | 336 ++--- .../org/apache/camel/model/recipientList.json | 2 +- .../camel/model/RecipientListDefinition.java | 2 +- .../org/apache/camel/support/ObjectHelper.java | 1 - 5 files changed, 168 insertions(+), 175 deletions(-)
[GitHub] [camel-quarkus] jamesnetherton opened a new issue #3173: [Quarkus 2.4.0] Messaging tests fail with ambiguous dependencies for `org.apache.camel.quarkus.component.messaging.it.util.scheme.Comp
jamesnetherton opened a new issue #3173: URL: https://github.com/apache/camel-quarkus/issues/3173 Maybe something changed recently in Quarkus that has started causing this error. What confuses me is that the nightly Quarkus platform builds with 999-SNAPSHOT & CQ 2.3.0 are passing. I'd expect to see the same failure. ``` 2021-10-11T03:31:18.4927883Z java.lang.RuntimeException: 2021-10-11T03:31:18.4935938Z java.lang.RuntimeException: io.quarkus.builder.BuildException: Build failure: Build failed due to errors 2021-10-11T03:31:18.4948543Z [error]: Build step io.quarkus.arc.deployment.ArcProcessor#validate threw an exception: javax.enterprise.inject.spi.DeploymentException: Found 14 deployment problems: 2021-10-11T03:31:18.4960185Z [1] Ambiguous dependencies for type org.apache.camel.quarkus.component.messaging.it.util.scheme.ComponentScheme and qualifiers [@Default] 2021-10-11T03:31:18.4970629Z - java member: org.apache.camel.quarkus.component.messaging.it.MessagingCommonResource#componentScheme 2021-10-11T03:31:18.4989377Z - declared on CLASS bean [types=[org.apache.camel.quarkus.component.messaging.it.MessagingCommonResource, java.lang.Object], qualifiers=[@Default, @Any], target=org.apache.camel.quarkus.component.messaging.it.MessagingCommonResource] 2021-10-11T03:31:18.4994409Z - available beans: 2021-10-11T03:31:18.5106045Z - PRODUCER METHOD bean [types=[org.apache.camel.quarkus.component.messaging.it.util.scheme.ComponentScheme, java.lang.Object], qualifiers=[@Default, @Any], target=org.apache.camel.quarkus.component.messaging.it.util.scheme.ComponentScheme getMessagingComponentScheme(org.apache.camel.CamelContext camelContext), declaringBean=org.apache.camel.quarkus.component.messaging.it.util.scheme.MessagingComponentSchemeProducer] 2021-10-11T03:31:18.5142671Z - PRODUCER METHOD bean [types=[org.apache.camel.quarkus.component.messaging.it.util.scheme.ComponentScheme, java.lang.Object], qualifiers=[@Default, @Any], target=org.apache.camel.quarkus.component.messaging.it.util.scheme.ComponentScheme getMessagingComponentScheme(org.apache.camel.CamelContext camelContext), declaringBean=org.apache.camel.quarkus.component.messaging.it.util.scheme.MessagingComponentSchemeProducer] ``` -- 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] 02/02: CAMEL-16861: Cleanup and update EIP docs
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0231a1cecb933ae0a6781b732f43d13e39ef22c4
Author: Claus Ibsen
AuthorDate: Mon Oct 11 14:00:53 2021 +0200
CAMEL-16861: Cleanup and update EIP docs
---
.../modules/eips/pages/customLoadBalancer-eip.adoc | 17 ++-
.../main/docs/modules/eips/pages/sticky-eip.adoc | 21 -
.../main/docs/modules/eips/pages/topic-eip.adoc| 17 +++
.../main/docs/modules/eips/pages/weighted-eip.adoc | 34 +-
4 files changed, 56 insertions(+), 33 deletions(-)
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/customLoadBalancer-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/customLoadBalancer-eip.adoc
index 89d5dd5..33b1935 100644
---
a/core/camel-core-engine/src/main/docs/modules/eips/pages/customLoadBalancer-eip.adoc
+++
b/core/camel-core-engine/src/main/docs/modules/eips/pages/customLoadBalancer-eip.adoc
@@ -20,7 +20,10 @@ An example using Java DSL:
from("direct:start")
// using our custom load balancer
.loadBalance(new MyLoadBalancer())
-.to("mock:x", "mock:y", "mock:z");
+.to("seda:x")
+.to("seda:y")
+.to("seda:z")
+.end();
And the same example using XML DSL:
@@ -28,18 +31,18 @@ And the same example using XML DSL:
[source,xml]
-
+
http://camel.apache.org/schema/spring;>
-
-
-
-
-
+
+
+
+
+
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/sticky-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/sticky-eip.adoc
index d64bfda..7f733ed 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/sticky-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/sticky-eip.adoc
@@ -5,7 +5,10 @@
:since:
:supportlevel: Stable
-Sticky Load Balancer. Sticky load balancing uses an Expression to calculate a
correlation key to perform the sticky load balancing.
+Sticky mode for the xref:loadBalance-eip.adoc[Load Balancer] EIP.
+
+A stick mode means that a correlation key (calculated as
xref:latest@manual:ROOT:expression.adoc[Expression])
+is used to determine the destination. This allows to route all messages with
the same key to the same destination.
== Options
@@ -15,29 +18,33 @@ include::partial$eip-options.adoc[]
== Examples
-In this case we are using the header test as correlation expression:
+In this case we are using the header myKey as correlation expression:
[source,java]
from("direct:start")
-.loadBalance()
-.sticky(header("test"))
-.to("seda:x", "seda:y", "seda:z");
+.loadBalance().sticky(header("myKey"))
+.to("seda:x")
+.to("seda:y")
+.to("seda:z")
+.end();
-In XML you'll have a route like this
+In XML you'll have a route like this:
[source,xml]
+
- test
+ myKey
+
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/topic-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/topic-eip.adoc
index a4898f8..1d40bff 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/topic-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/topic-eip.adoc
@@ -5,7 +5,8 @@
:since:
:supportlevel: Stable
-Topic Load Balancer, with this policy you'll get a Topic behavior by sending
to all destinations.
+Topic mode for the xref:loadBalance-eip.adoc[Load Balancer] EIP.
+With this policy then all destination is selected.
== Options
@@ -15,20 +16,23 @@ include::partial$eip-options.adoc[]
== Examples
-In this case we are using the header test as correlation expression:
+In this example we send the message to all three endpoints:
[source,java]
from("direct:start")
-.loadBalance()
-.topic()
-.to("seda:x", "seda:y", "seda:z");
+.loadBalance().topic()
+.to("seda:x")
+.to("seda:y")
+.to("seda:z")
+.end();
-In XML you'll have a route like this
+In XML you'll have a route like this:
[source,xml]
+
@@ -36,4 +40,5 @@ In XML you'll have a route like this
+
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/weighted-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/weighted-eip.adoc
index d4c2d17..df7c433 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/weighted-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/weighted-eip.adoc
@@ -5,7 +5,8 @@
:since:
:supportlevel: Stable
-Weighted Load Balancer, with this policy in case of failures the exchange will
be tried
[camel] branch main updated (dcb33f0 -> 0231a1c)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. from dcb33f0 CAMEL-16861: Cleanup and update EIP docs new b19b1c3 CAMEL-16861: Cleanup and update EIP docs new 0231a1c CAMEL-16861: Cleanup and update EIP docs 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: .../modules/eips/pages/customLoadBalancer-eip.adoc | 17 ++ .../docs/modules/eips/pages/loadBalance-eip.adoc | 4 +-- .../main/docs/modules/eips/pages/random-eip.adoc | 37 +- .../docs/modules/eips/pages/roundRobin-eip.adoc| 35 .../main/docs/modules/eips/pages/sticky-eip.adoc | 21 .../main/docs/modules/eips/pages/topic-eip.adoc| 17 ++ .../main/docs/modules/eips/pages/weighted-eip.adoc | 34 .../apache/camel/model/loadbalancer/random.json| 2 +- .../camel/model/loadbalancer/roundRobin.json | 2 +- .../loadbalancer/RandomLoadBalancerDefinition.java | 2 +- .../RoundRobinLoadBalancerDefinition.java | 4 +-- 11 files changed, 121 insertions(+), 54 deletions(-)
[camel] 01/02: CAMEL-16861: Cleanup and update EIP docs
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b19b1c3eeabb91d1d06cd814c131cd712edf665d
Author: Claus Ibsen
AuthorDate: Mon Oct 11 13:46:59 2021 +0200
CAMEL-16861: Cleanup and update EIP docs
---
.../docs/modules/eips/pages/loadBalance-eip.adoc | 4 +--
.../main/docs/modules/eips/pages/random-eip.adoc | 37 +-
.../docs/modules/eips/pages/roundRobin-eip.adoc| 35
.../apache/camel/model/loadbalancer/random.json| 2 +-
.../camel/model/loadbalancer/roundRobin.json | 2 +-
.../loadbalancer/RandomLoadBalancerDefinition.java | 2 +-
.../RoundRobinLoadBalancerDefinition.java | 4 +--
7 files changed, 65 insertions(+), 21 deletions(-)
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/loadBalance-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/loadBalance-eip.adoc
index 3133c48..146e337 100644
---
a/core/camel-core-engine/src/main/docs/modules/eips/pages/loadBalance-eip.adoc
+++
b/core/camel-core-engine/src/main/docs/modules/eips/pages/loadBalance-eip.adoc
@@ -16,8 +16,8 @@ Camel provides the following policies out-of-the-box:
| Policy | Description
| xref:customLoadBalancer-eip.adoc[Custom Load Balancer] | To use a custom
load balancer implementation.
| xref:failover-eip.adoc[Failover Load Balancer] | In case of failures the
exchange will be tried on the next endpoint.
-| xref:roundRobin-eip.adoc[Round Robin Load Balancer] | The exchanges are
selected in a round robin fashion. This is a well known and classic policy,
which spreads the load evenly.
-| xref:random-eip.adoc[Random Load Balancer] | A random endpoint is selected
for each exchange.
+| xref:roundRobin-eip.adoc[Round Robin Load Balancer] | The destination
endpoints are selected in a round-robin fashion. This is a well known and
classic policy, which spreads the load evenly.
+| xref:random-eip.adoc[Random Load Balancer] | The destination endpoints are
selected by random.
| xref:sticky-eip.adoc[Sticky Load Balancer] | Sticky load balancing using an
xref:latest@manual:ROOT:expression.adoc[Expression] to calculate a correlation
key to perform the sticky load balancing.
| xref:topic-eip.adoc[Topic Load Balancer] | Topic which sends to all
destinations.
| xref:weighted-eip.adoc[Weighted Loader Balancer] | Uses a weighted load
distribution ratio for each server with respect to others.
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/random-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/random-eip.adoc
index 1bfcd1e..a3be019 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/random-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/random-eip.adoc
@@ -1,11 +1,46 @@
= Random EIP
:doctitle: Random
:shortname: random
-:description: A random endpoint is selected for each exchange.
+:description: The destination endpoints are selected by random.
:since:
:supportlevel: Stable
+Random mode for the xref:loadBalance-eip.adoc[Load Balancer] EIP.
+
+The destination endpoints are selected by random.
+This is a well known and classic policy, which spreads the load randomly.
// eip options: START
include::partial$eip-options.adoc[]
// eip options: END
+
+== Example
+
+We want to load balance between three endpoints in random mode.
+
+This is done as follows in Java DSL:
+
+[source,java]
+
+from("direct:start")
+.loadBalance().ramdom()
+.to("seda:x")
+.to("seda:y")
+.to("seda:z")
+.end();
+
+
+In XML you'll have a route like this:
+
+[source,xml]
+
+
+
+
+
+
+
+
+
+
+
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/roundRobin-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/roundRobin-eip.adoc
index ab441a3..2586dd7 100644
---
a/core/camel-core-engine/src/main/docs/modules/eips/pages/roundRobin-eip.adoc
+++
b/core/camel-core-engine/src/main/docs/modules/eips/pages/roundRobin-eip.adoc
@@ -1,11 +1,14 @@
= Round Robin EIP
:doctitle: Round Robin
:shortname: roundRobin
-:description: The exchanges are selected in a round robin fashion. This is a
well known and classic policy, which spreads the load evenly.
+:description: The destination endpoints are selected in a round-robin fashion.
This is a well known and classic policy, which spreads the load evenly.
:since:
:supportlevel: Stable
-Round Robin Load Balancer. With this Load Balancing policy, a random endpoint
is selected for each exchange.
+Round Robin mode for the xref:loadBalance-eip.adoc[Load Balancer] EIP.
+
+The exchanges are selected in a round-robin fashion.
+This is a well known and classic policy, which spreads the load evenly.
== Options
@@ -13,27 +16,33 @@ Round Robin Load Balancer. With this Load Balancing policy,
[GitHub] [camel-quarkus] zbendhiba commented on a change in pull request #3170: Aws sqs test fix
zbendhiba commented on a change in pull request #3170:
URL: https://github.com/apache/camel-quarkus/pull/3170#discussion_r726048183
##
File path:
integration-test-groups/aws2/aws2-sqs-sns/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsSnsTest.java
##
@@ -65,10 +96,12 @@ public void sqs() {
@Test
public void sqsDeleteMessage() {
final String qName = getPredefinedQueueName();
-final String msg = sendSingleMessageToQueue(qName);
+sendSingleMessageToQueue(qName);
final String receipt = receiveReceiptOfMessageFromQueue(qName);
+final String msg = sendSingleMessageToQueue(qName);
deleteMessageFromQueue(qName, receipt);
-Assertions.assertNotEquals(receiveMessageFromQueue(qName), msg);
+awaitMessageWithExpectedContentFromQueue(msg, qName);
Review comment:
thansk @VratislavHais Can you check the failing 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
[camel] branch regen_bot updated (dcb33f0 -> 68db2e5)
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. omit dcb33f0 CAMEL-16861: Cleanup and update EIP docs This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/regen_bot (68db2e5) \ O -- O -- O (dcb33f0) Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../modules/eips/pages/point-to-point-channel.adoc | 2 - .../docs/modules/eips/pages/process-manager.adoc | 21 +++ .../eips/pages/publish-subscribe-channel.adoc | 69 +++--- 3 files changed, 40 insertions(+), 52 deletions(-)
[camel] branch regen_bot updated (fa6b2c9 -> dcb33f0)
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 fa6b2c9 CAMEL-16861: Cleanup and update EIP docs
add 68db2e5 CAMEL-16861: Cleanup and update EIP docs
add dcb33f0 CAMEL-16861: Cleanup and update EIP docs
No new revisions were added by this update.
Summary of changes:
.../src/main/java/org/apache/camel/Processor.java | 1 +
.../eips/images/eip}/message_flow_in_route.png | Bin
.../modules/eips/pages/point-to-point-channel.adoc | 2 +
.../main/docs/modules/eips/pages/process-eip.adoc | 119 +
.../docs/modules/eips/pages/process-manager.adoc | 21 ++--
.../eips/pages/publish-subscribe-channel.adoc | 69 ++--
6 files changed, 128 insertions(+), 84 deletions(-)
copy {docs/user-manual/modules/ROOT/assets/images =>
core/camel-core-engine/src/main/docs/modules/eips/images/eip}/message_flow_in_route.png
(100%)
[camel] branch regen_bot updated (bbab707 -> fa6b2c9)
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 bbab707 Sync deps add 9cf24b4 ArangoDB Test Infra: Use 3.8.1 instead of latest add fa6b2c9 CAMEL-16861: Cleanup and update EIP docs No new revisions were added by this update. Summary of changes: .../docs/modules/eips/pages/polling-consumer.adoc | 422 +++-- .../org/apache/camel/support/DefaultEndpoint.java | 2 +- .../infra/arangodb/services/ArangoDbContainer.java | 2 +- 3 files changed, 51 insertions(+), 375 deletions(-)
[camel] branch main updated: CAMEL-16861: Cleanup and update EIP docs
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 dcb33f0 CAMEL-16861: Cleanup and update EIP docs dcb33f0 is described below commit dcb33f089d14793a897dd4b738821793410e9e82 Author: Claus Ibsen AuthorDate: Mon Oct 11 12:23:43 2021 +0200 CAMEL-16861: Cleanup and update EIP docs --- .../modules/eips/pages/point-to-point-channel.adoc | 2 + .../docs/modules/eips/pages/process-manager.adoc | 21 --- .../eips/pages/publish-subscribe-channel.adoc | 69 +++--- 3 files changed, 52 insertions(+), 40 deletions(-) diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/point-to-point-channel.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/point-to-point-channel.adoc index 2643815..92a9347 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/point-to-point-channel.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/point-to-point-channel.adoc @@ -21,6 +21,8 @@ The Point to Point Channel is supported in Camel by messaging based xref:compone There are also messaging based in the cloud from cloud providers such as Amazon, Google and Azure. +TIP: See also the related xref:publish-subscribe-channel.adoc[Publish Scribe Channel] EIP + == Example The following example demonstrates point to point messaging using diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/process-manager.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/process-manager.adoc index af6ceed..60a06d0 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/process-manager.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/process-manager.adoc @@ -4,12 +4,6 @@ Camel supports the https://www.enterpriseintegrationpatterns.com/patterns/messaging/ProcessManager.html[Process Manager] from the xref:enterprise-integration-patterns.adoc[EIP patterns] book. -The xref:routingSlip-eip.adoc[Routing Slip] demonstrates how a message can be routed through a dynamic series of processing steps. -The solution of the Routing Slip is based on two key assumptions: the sequence of processing steps has -to be determined up-front and the sequence is linear. In many cases, these assumptions may not be fulfilled. -For example, routing decisions might have to be made based on intermediate results. -Or, the processing steps may not be sequential, but multiple steps might be executed in parallel. - How do we route a message through multiple processing steps when the required steps may not be known at design-time and may not be sequential? @@ -18,7 +12,20 @@ image::eip/ProcessManager.gif[image] Use a central processing unit, a Process Manager, to maintain the state of the sequence and determine the next processing step based on intermediate results. -With Camel this pattern is implemented by using the xref:dynamicRouter-eip.adoc[Dynamic Router] pattern. +With Camel this pattern is implemented by using the xref:dynamicRouter-eip.adoc[Dynamic Router] EIP. Camel's implementation of the dynamic router maintains the state of the sequence, and allows to determine the next processing step based dynamically. +== Routing Slip vs Dynamic Router + +On the other hand the xref:routingSlip-eip.adoc[Routing Slip] EIP demonstrates how a message can be routed +through a dynamic series of processing steps. The solution of the Routing Slip is based on two key assumptions: + +- the sequence of processing steps has to be determined up-front +- and the sequence is linear. + +In many cases, these assumptions may not be fulfilled. +For example, routing decisions might have to be made based on intermediate results. +Or, the processing steps may not be sequential, but multiple steps might be executed in parallel. + + diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/publish-subscribe-channel.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/publish-subscribe-channel.adoc index 8e8c774..aeead0b 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/publish-subscribe-channel.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/publish-subscribe-channel.adoc @@ -1,53 +1,56 @@ = Publish Subscribe Channel Camel supports the -http://www.enterpriseintegrationpatterns.com/PublishSubscribeChannel.html[Publish -Subscribe Channel] from the -xref:enterprise-integration-patterns.adoc[EIP patterns] using for -example the following components: - -* xref:components::jms-component.adoc[JMS] for working with JMS Topics for high performance, -clustering and load balancing -* xref:components::xmpp-component.adoc[XMPP] when using rooms for group communication -* xref:components::seda-component.adoc[SEDA] for working with SEDA in the same
[camel] branch main updated: CAMEL-16861: Cleanup and update EIP docs
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 68db2e5 CAMEL-16861: Cleanup and update EIP docs
68db2e5 is described below
commit 68db2e58039825ac51b14934a6f60e01a9e1391b
Author: Claus Ibsen
AuthorDate: Mon Oct 11 12:10:45 2021 +0200
CAMEL-16861: Cleanup and update EIP docs
---
.../src/main/java/org/apache/camel/Processor.java | 1 +
.../eips/images/eip/message_flow_in_route.png | Bin 0 -> 13415 bytes
.../main/docs/modules/eips/pages/process-eip.adoc | 119 +
3 files changed, 76 insertions(+), 44 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/Processor.java
b/core/camel-api/src/main/java/org/apache/camel/Processor.java
index 8cbc1d8..11ddc12 100644
--- a/core/camel-api/src/main/java/org/apache/camel/Processor.java
+++ b/core/camel-api/src/main/java/org/apache/camel/Processor.java
@@ -26,6 +26,7 @@ package org.apache.camel;
* thread-safe way, as the Camel routes can potentially be executed by
concurrent threads, and therefore multiple
* threads can call the same {@link Processor} instance.
*/
+@FunctionalInterface
public interface Processor {
/**
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/images/eip/message_flow_in_route.png
b/core/camel-core-engine/src/main/docs/modules/eips/images/eip/message_flow_in_route.png
new file mode 100644
index 000..07b4637
Binary files /dev/null and
b/core/camel-core-engine/src/main/docs/modules/eips/images/eip/message_flow_in_route.png
differ
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/process-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/process-eip.adoc
index 5cf894b..7b0aa0a 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/process-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/process-eip.adoc
@@ -5,19 +5,52 @@
:since:
:supportlevel: Stable
-The
http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/Processor.html[Processor]
interface is used to implement consumers of message exchanges or to implement
a xref:message-translator.adoc[Message Translator]
+The
http://camel.apache.org/maven/current/camel-core/apidocs/org/apache/camel/Processor.html[Processor]
+is used for processing message
xref:latest@manual:ROOT:exchange.adoc[Exchanges].
-== Options
+The processor is a core Camel concept that represents a node capable of using,
creating,
+or modifying an incoming exchange. During routing, exchanges flow from one
processor
+to another; as such, you can think of a route as a graph having specialized
processors
+as the nodes, and lines that connect the output of one processor to the input
of another.
+Processors could be implementations of EIPs, producers for specific
components, or
+your own custom creation. The figure below shows the flow between processors.
-// eip options: START
-include::partial$eip-options.adoc[]
-// eip options: END
+image::eip/message_flow_in_route.png[image]
-== Samples
+A route first starts with a consumer (think `from` in the DSL) that populates
the initial
+exchange. At each processor step, the out message from the previous step is
the in
+message of the next. In many cases, processors don’t set an out message, so in
this case
+the in message is reused. At the end of a route, the
xref:latest@manual:ROOT:exchange-pattern.adoc[Messageg Exchange Pattern] (MEP)
+of the exchange determines whether a reply needs to be sent back to the caller
of the route. If the MEP is `InOnly`,
+no reply will be sent back. If it’s `InOut`, Camel will take the out message
from the last
+step and return it.
+
+== Processor API
+
+The `Processor` interface is a central API in Camel.
+Its API is purposely designed to be both simple and flexible in the form of a
single functional method:
+
+[source,java]
+
+@FunctionalInterface
+public interface Processor {
+
+/**
+ * Processes the message exchange
+ *
+ * @param exchange the message exchange
+ * @throws Exception if an internal processing error has occurred.
+ */
+void process(Exchange exchange) throws Exception;
+}
+
+
+The `Processor` is used heavily internally in Camel, such as the base for all
implementations of
+the xref:enterprise-integration-patterns.adoc[EIP patterns].
=== Using a processor in a route
-Once you have written a class which implements processor like this...
+Once you have written a class which implements `Processor` like this:
[source,java]
@@ -28,43 +61,54 @@ public class MyProcessor implements Processor {
}
-You can then easily use this inside a route by declaring the bean in
-Spring, say via the XML (or registering it in JNDI if that is your
-xref:latest@manual:ROOT:registry.adoc[Registry])
+Then in
[camel] branch main updated: CAMEL-16861: Cleanup and update EIP docs
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 fa6b2c9 CAMEL-16861: Cleanup and update EIP docs fa6b2c9 is described below commit fa6b2c942fdcd8316bf970a58d9379d6ef29734a Author: Claus Ibsen AuthorDate: Mon Oct 11 11:26:50 2021 +0200 CAMEL-16861: Cleanup and update EIP docs --- .../docs/modules/eips/pages/polling-consumer.adoc | 422 +++-- .../org/apache/camel/support/DefaultEndpoint.java | 2 +- 2 files changed, 50 insertions(+), 374 deletions(-) diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/polling-consumer.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/polling-consumer.adoc index aa863cf..603c6ec 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/polling-consumer.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/polling-consumer.adoc @@ -3,15 +3,42 @@ Camel supports implementing the http://www.enterpriseintegrationpatterns.com/PollingConsumer.html[Polling Consumer] from the xref:enterprise-integration-patterns.adoc[EIP -patterns] using the +patterns]. + +An application needs to consume Messages, but it wants to control when it consumes each message. + +How can an application consume a message when the application is ready? + +image::eip/PollingConsumerSolution.gif[image] + +The application should use a Polling Consumer, one that explicitly makes a call when it wants to receive a message. + +In Camel the `PollingConsumer` is represented by the https://github.com/apache/camel/blob/main/core/camel-api/src/main/java/org/apache/camel/PollingConsumer.java[PollingConsumer] -interface which can be created via the +interface. + +You can get hold of a `PollingConsumer` in several ways in Camel: + +- Use xref:pollEnrich-eip.adoc[Poll Enrich] EIP + +- Create a `PollingConsumer` instance via the https://github.com/apache/camel/blob/main/core/camel-api/src/main/java/org/apache/camel/Endpoint.java[Endpoint.createPollingConsumer()] method. -image::eip/PollingConsumerSolution.gif[image] +- Use the xref:latest@manual:ROOT:consumertemplate.adoc[ConsumerTemplate] to poll on demand. + +== Using Polling Consumer -In Java: +If you need to use Polling Consumer from within a route, then the xref:pollEnrich-eip.adoc[Poll Enrich] EIP can be used. + +On the other hand if you need to use Polling Consumer programmatically, +then using xref:latest@manual:ROOT:consumertemplate.adoc[ConsumerTemplate] is a good choice. + +And if you want to use the lower level Camel APIs then you can create the `PollingConsumer` instance to be used. + +=== Using Polling Consumer from Java + +You can programmatically create an instance of `PollingConsumer` from any endpoint as shown below: [source,java] @@ -20,54 +47,47 @@ PollingConsumer consumer = endpoint.createPollingConsumer(); Exchange exchange = consumer.receive(); -The *`ConsumerTemplate`* (discussed below) is also available. +=== PollingConsumer API There are three main polling methods on -https://github.com/apache/camel/blob/main/core/camel-api/src/main/java/org/apache/camel/PollingConsumer.java[PollingConsumer] +https://github.com/apache/camel/blob/main/core/camel-api/src/main/java/org/apache/camel/PollingConsumer.java[PollingConsumer]: [width="100%",cols="50%,50%",options="header",] |=== |Method name |Description |https://github.com/apache/camel/blob/main/core/camel-api/src/main/java/org/apache/camel/PollingConsumer.java[PollingConsumer.receive()] -|Waits until a message is available and then returns it; potentially -blocking forever +|Waits until a message is available and then returns it; potentially blocking forever |https://github.com/apache/camel/blob/main/core/camel-api/src/main/java/org/apache/camel/PollingConsumer.java[PollingConsumer.receive(long)] -|Attempts to receive a message exchange, waiting up to the given timeout -and returning null if no message exchange could be received within the -time available +|Attempts to receive a message exchange, waiting up to the given timeout and returning null if no message exchange could be received within the time available |https://github.com/apache/camel/blob/main/core/camel-api/src/main/java/org/apache/camel/PollingConsumer.java[PollingConsumer.receiveNoWait()] -|Attempts to receive a message exchange immediately without waiting and -returning null if a message exchange is not available yet +|Attempts to receive a message exchange immediately without waiting and returning null if a message exchange is not available yet |=== -[[PollingConsumer-EventDrivenPollingConsumerOptions]] -== EventDrivenPollingConsumer Options +=== Two kinds of Polling
[GitHub] [camel-k] squakez commented on issue #2684: Unable to access MongoDB
squakez commented on issue #2684:
URL: https://github.com/apache/camel-k/issues/2684#issuecomment-939798018
The problem is that in Camel K we support the default Camel Quarkus MongoDB
client named `camelMongoClient`.
This is the one we used internally in Camel K, and, in order to override its
default property (which are that `127.0.0.1` you see logged), we must use a
property. Your integration will work renaming the route as something like:
```
.routeId("java")
.to("mongodb:camelMongoClient?database=z=z=getDbStats")
.to("log:info");
```
And then, executing the Integration with:
```
kamel run /tmp/MongoDBTest.java --dev -p
quarkus.mongodb.connection-string=mongodb://1.2.3.4:27017/
```
See
[documentation](https://camel.apache.org/camel-quarkus/latest/reference/extensions/mongodb.html)
for more details about how to configure the properties to store the values you
need.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[camel] branch main updated: ArangoDB Test Infra: Use 3.8.1 instead of latest
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 9cf24b4 ArangoDB Test Infra: Use 3.8.1 instead of latest
9cf24b4 is described below
commit 9cf24b4be1bfb17268dbbf82964d20123fb206ea
Author: Andrea Cosentino
AuthorDate: Mon Oct 11 10:05:06 2021 +0200
ArangoDB Test Infra: Use 3.8.1 instead of latest
---
.../apache/camel/test/infra/arangodb/services/ArangoDbContainer.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/test-infra/camel-test-infra-arangodb/src/test/java/org/apache/camel/test/infra/arangodb/services/ArangoDbContainer.java
b/test-infra/camel-test-infra-arangodb/src/test/java/org/apache/camel/test/infra/arangodb/services/ArangoDbContainer.java
index 8ddfeae..3646f87 100644
---
a/test-infra/camel-test-infra-arangodb/src/test/java/org/apache/camel/test/infra/arangodb/services/ArangoDbContainer.java
+++
b/test-infra/camel-test-infra-arangodb/src/test/java/org/apache/camel/test/infra/arangodb/services/ArangoDbContainer.java
@@ -24,7 +24,7 @@ import org.testcontainers.containers.wait.strategy.Wait;
public class ArangoDbContainer extends GenericContainer {
public static final Integer PORT_DEFAULT = 8529;
-public static final String ARANGO_IMAGE = "arangodb:latest";
+public static final String ARANGO_IMAGE = "arangodb:3.8.1";
private static final Logger LOGGER =
LoggerFactory.getLogger(ArangoDbContainer.class);
private static final String CONTAINER_NAME = "arango";
[GitHub] [camel-k] astefanutti commented on a change in pull request #2683: Fix #1943: allow multiple operators to reconcile label filtered resources
astefanutti commented on a change in pull request #2683:
URL: https://github.com/apache/camel-k/pull/2683#discussion_r725870535
##
File path: pkg/controller/integration/integration_controller.go
##
@@ -73,7 +72,7 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
Named("integration-controller").
// Watch for changes to primary resource Integration
For({}, builder.WithPredicates(
- predicate.Funcs{
+ platform.FilteringFuncs{
Review comment:
Ah right, that makes sense. For some resources like Kamelets, we would
want the union which is not trivial.
--
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
[GitHub] [camel-k] astefanutti commented on pull request #2443: chore: Polish Integration Error phase reconciliation
astefanutti commented on pull request #2443: URL: https://github.com/apache/camel-k/pull/2443#issuecomment-939774705 Superseded by #2682. -- 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
[GitHub] [camel-k] astefanutti closed pull request #2443: chore: Polish Integration Error phase reconciliation
astefanutti closed pull request #2443: URL: https://github.com/apache/camel-k/pull/2443 -- 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
[GitHub] [camel-kafka-connector] oscerd commented on issue #1268: java.lang.NullPointerException in kinesis sink connector if headers not present
oscerd commented on issue #1268: URL: https://github.com/apache/camel-kafka-connector/issues/1268#issuecomment-939739627 Yes, ckc is camel on Kafka connect. So you can use smt -- 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
[GitHub] [camel-kafka-connector] duanasq commented on issue #1268: java.lang.NullPointerException in kinesis sink connector if headers not present
duanasq commented on issue #1268: URL: https://github.com/apache/camel-kafka-connector/issues/1268#issuecomment-939731187 ok [there is advice here](https://github.com/apache/camel-kafka-connector/pull/1262#issuecomment-93367) to create an SMT, which is actually [part of the Connect framework](https://docs.confluent.io/platform/current/connect/transforms/overview.html), not Camel. -- 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
[GitHub] [camel-quarkus] VratislavHais commented on a change in pull request #3170: Aws sqs test fix
VratislavHais commented on a change in pull request #3170:
URL: https://github.com/apache/camel-quarkus/pull/3170#discussion_r725819531
##
File path:
integration-test-groups/aws2/aws2-sqs-sns/src/test/java/org/apache/camel/quarkus/component/aws2/sqs/it/Aws2SqsSnsTest.java
##
@@ -65,10 +96,12 @@ public void sqs() {
@Test
public void sqsDeleteMessage() {
final String qName = getPredefinedQueueName();
-final String msg = sendSingleMessageToQueue(qName);
+sendSingleMessageToQueue(qName);
final String receipt = receiveReceiptOfMessageFromQueue(qName);
+final String msg = sendSingleMessageToQueue(qName);
deleteMessageFromQueue(qName, receipt);
-Assertions.assertNotEquals(receiveMessageFromQueue(qName), msg);
+awaitMessageWithExpectedContentFromQueue(msg, qName);
Review comment:
@zbendhiba I have changed it according to my previous comment + added
description in the code. Thank you for your feedback
--
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 (9ed1c90 -> bbab707)
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 9ed1c90 Sync deps add d5464bb Upgrade Minio to version 8.3.1 add bbab707 Sync deps No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[GitHub] [camel-quarkus] jamesnetherton commented on issue #3171: OpenAPI Java integration tests fail with Camel 3.13.0-SNAPSHOT
jamesnetherton commented on issue #3171: URL: https://github.com/apache/camel-quarkus/issues/3171#issuecomment-939713994 Seems this is fixed already. -- 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
[GitHub] [camel-quarkus] jamesnetherton closed issue #3171: OpenAPI Java integration tests fail with Camel 3.13.0-SNAPSHOT
jamesnetherton closed issue #3171: URL: https://github.com/apache/camel-quarkus/issues/3171 -- 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
