[camel] branch main updated (82bae503a78 -> cb14edd0e4f)
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 82bae503a78 (chores) camel-base-engine: fix misplaced comment new 94322d2c2b9 CAMEL-19060: avoid a potentially costly call to AtomicInteger.get() when notifying that the exchange had been created new cb14edd0e4f CAMEL-19058: use type checks instead of instance checks for handling event notifications 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/main/MainDurationEventNotifier.java | 36 -- 1 file changed, 20 insertions(+), 16 deletions(-)
[camel] 02/02: CAMEL-19058: use type checks instead of instance checks for handling event notifications
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit cb14edd0e4f4746333e3aed780d0f44dbb6696ca
Author: Otavio Rodolfo Piske
AuthorDate: Mon Feb 13 20:22:20 2023 +0100
CAMEL-19058: use type checks instead of instance checks for handling event
notifications
---
.../camel/main/MainDurationEventNotifier.java | 32 --
1 file changed, 17 insertions(+), 15 deletions(-)
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java
b/core/camel-main/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java
index 2e6ae1df989..f87a8f5c76d 100644
---
a/core/camel-main/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java
+++
b/core/camel-main/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java
@@ -23,10 +23,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.camel.CamelContext;
import org.apache.camel.spi.CamelEvent;
-import org.apache.camel.spi.CamelEvent.ExchangeCompletedEvent;
-import org.apache.camel.spi.CamelEvent.ExchangeCreatedEvent;
-import org.apache.camel.spi.CamelEvent.ExchangeFailedEvent;
-import org.apache.camel.spi.CamelEvent.RouteReloadedEvent;
import org.apache.camel.support.EventNotifierSupport;
import org.apache.camel.util.StopWatch;
import org.slf4j.Logger;
@@ -78,15 +74,13 @@ public class MainDurationEventNotifier extends
EventNotifierSupport {
}
}
-protected void doNotify(CamelEvent event) throws Exception {
+protected void doNotify(CamelEvent event) {
// ignore any event that is received if shutdown is in process
if (!shutdownStrategy.isRunAllowed()) {
return;
}
-boolean begin = event instanceof ExchangeCreatedEvent;
-boolean complete = event instanceof ExchangeCompletedEvent || event
instanceof ExchangeFailedEvent;
-boolean reloaded = event instanceof RouteReloadedEvent;
+final boolean reloaded = event.getType() ==
CamelEvent.Type.RouteReloaded;
if (reloaded) {
if (restartDuration) {
@@ -100,7 +94,10 @@ public class MainDurationEventNotifier extends
EventNotifierSupport {
return;
}
-if (maxMessages > 0 && complete) {
+boolean complete = false;
+if (maxMessages > 0) {
+complete = event.getType() == CamelEvent.Type.ExchangeCompleted ||
event.getType() == CamelEvent.Type.ExchangeFailed;
+
boolean result = doneMessages.incrementAndGet() >= maxMessages;
if (LOG.isTraceEnabled()) {
LOG.trace("Duration max messages check {} >= {} -> {}",
doneMessages.get(), maxMessages, result);
@@ -120,19 +117,24 @@ public class MainDurationEventNotifier extends
EventNotifierSupport {
}
}
+
// idle reacts on both incoming and complete messages
-if (maxIdleSeconds > 0 && (begin || complete)) {
-if (watch != null) {
-LOG.trace("Message activity so restarting stop watch");
-watch.restart();
+if (maxIdleSeconds > 0) {
+final boolean begin = event.getType() ==
CamelEvent.Type.ExchangeCreated;
+
+if (begin || complete) {
+if (watch != null) {
+LOG.trace("Message activity so restarting stop watch");
+watch.restart();
+}
}
}
}
@Override
public boolean isEnabled(CamelEvent event) {
-return event instanceof ExchangeCreatedEvent || event instanceof
ExchangeCompletedEvent
-|| event instanceof ExchangeFailedEvent || event instanceof
RouteReloadedEvent;
+return event.getType() == CamelEvent.Type.ExchangeCreated ||
event.getType() == CamelEvent.Type.ExchangeCreated
+|| event.getType() == CamelEvent.Type.ExchangeFailed ||
event.getType() == CamelEvent.Type.RouteReloaded;
}
@Override
[camel] 01/02: CAMEL-19060: avoid a potentially costly call to AtomicInteger.get() when notifying that the exchange had been created
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 94322d2c2b99ab2b98d1fc9474bdb0c31eace1e7
Author: Otavio Rodolfo Piske
AuthorDate: Wed Feb 22 15:57:09 2023 +0100
CAMEL-19060: avoid a potentially costly call to AtomicInteger.get() when
notifying that the exchange had been created
---
.../main/java/org/apache/camel/main/MainDurationEventNotifier.java| 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java
b/core/camel-main/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java
index 9dd78738ad0..2e6ae1df989 100644
---
a/core/camel-main/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java
+++
b/core/camel-main/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java
@@ -102,7 +102,9 @@ public class MainDurationEventNotifier extends
EventNotifierSupport {
if (maxMessages > 0 && complete) {
boolean result = doneMessages.incrementAndGet() >= maxMessages;
-LOG.trace("Duration max messages check {} >= {} -> {}",
doneMessages.get(), maxMessages, result);
+if (LOG.isTraceEnabled()) {
+LOG.trace("Duration max messages check {} >= {} -> {}",
doneMessages.get(), maxMessages, result);
+}
if (result && shutdownStrategy.isRunAllowed()) {
if ("shutdown".equalsIgnoreCase(action)) {
[GitHub] [camel] orpiske merged pull request #9433: CAMEL-19060 + CAMEL-19058: minor improvements
orpiske merged PR #9433: URL: https://github.com/apache/camel/pull/9433 -- 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 commented on issue #4597: Expand JDBC test coverage - XA
JiriOndrusek commented on issue #4597: URL: https://github.com/apache/camel-quarkus/issues/4597#issuecomment-1447723049 Similar test already exists in JTA test module - https://github.com/apache/camel-quarkus/blob/main/integration-tests/jta/src/test/java/org/apache/camel/quarkus/component/jta/it/JtaTest.java#L151 -- 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 closed issue #4597: Expand JDBC test coverage - XA
JiriOndrusek closed issue #4597: Expand JDBC test coverage - XA URL: https://github.com/apache/camel-quarkus/issues/4597 -- 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] commented on pull request #9433: CAMEL-19060 + CAMEL-19058: minor improvements
github-actions[bot] commented on PR #9433: URL: https://github.com/apache/camel/pull/9433#issuecomment-1447711854 :no_entry_sign: There are (likely) no components to be tested in this PR -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (82bae503a78 -> b86569124f6)
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 82bae503a78 (chores) camel-base-engine: fix misplaced comment 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 (b86569124f6) \ O -- O -- O (82bae503a78) 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: .../main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel] branch regen_bot updated (406dd0158fa -> 82bae503a78)
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 406dd0158fa Fixed RAT add b86569124f6 (chores) camel-base-engine: cleanup duplicated code add 82bae503a78 (chores) camel-base-engine: fix misplaced comment No new revisions were added by this update. Summary of changes: .../apache/camel/impl/engine/AdviceIterator.java | 39 ++ .../camel/impl/engine/CamelInternalProcessor.java | 14 +--- .../impl/engine/SharedCamelInternalProcessor.java | 14 +--- 3 files changed, 20 insertions(+), 47 deletions(-) copy components/camel-twitter/src/main/java/org/apache/camel/component/twitter/util/TwitterSorter.java => core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AdviceIterator.java (53%)
[GitHub] [camel] orpiske commented on pull request #9432: CAMEL-19058: fix a type check scability issue for Message types
orpiske commented on PR #9432: URL: https://github.com/apache/camel/pull/9432#issuecomment-1447696071 @davsclaus actually, let me try the alternative approach on this one. Let's put it on hold for now. -- 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: Micrometer test coverage - @Counted
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 011f67aea8 Micrometer test coverage - @Counted
011f67aea8 is described below
commit 011f67aea8bcc4e470ed0f30e0d3b4eccac94231
Author: JiriOndrusek
AuthorDate: Wed Feb 22 16:06:15 2023 +0100
Micrometer test coverage - @Counted
---
integration-tests/micrometer/pom.xml | 4 ++
.../micrometer/it/MicrometerResource.java | 41 +-
.../component/micrometer/it/MicrometerRoutes.java | 7 +++
.../component/micrometer/it/TestMetric.java| 64 ++
.../component/micrometer/it/MicrometerTest.java| 41 --
5 files changed, 140 insertions(+), 17 deletions(-)
diff --git a/integration-tests/micrometer/pom.xml
b/integration-tests/micrometer/pom.xml
index c5d9431836..4527e10381 100644
--- a/integration-tests/micrometer/pom.xml
+++ b/integration-tests/micrometer/pom.xml
@@ -43,6 +43,10 @@
org.apache.camel.quarkus
camel-quarkus-micrometer
+
+org.apache.camel.quarkus
+camel-quarkus-bean
+
io.micrometer
micrometer-registry-prometheus
diff --git
a/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerResource.java
b/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerResource.java
index 01c13213b3..d77c7bf321 100644
---
a/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerResource.java
+++
b/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerResource.java
@@ -42,6 +42,9 @@ public class MicrometerResource {
@Inject
MeterRegistry meterRegistry;
+@Inject
+TestMetric counter;
+
@Path("/metric/{type}/{name}")
@Produces(MediaType.APPLICATION_JSON)
@GET
@@ -62,20 +65,25 @@ public class MicrometerResource {
return Response.status(404).build();
}
-Response.ResponseBuilder response = Response.ok();
-if (type.equals("counter")) {
-response.entity(search.counter().count());
-} else if (type.equals("gauge")) {
-response.entity(search.gauge().value());
-} else if (type.equals("summary")) {
-response.entity(search.summary().max());
-} else if (type.equals("timer")) {
-response.entity(search.timer().totalTime(TimeUnit.MILLISECONDS));
-} else {
-throw new IllegalArgumentException("Unknown metric type: " + type);
-}
+try {
+Response.ResponseBuilder response = Response.ok();
+if (type.equals("counter")) {
+response.entity(search.counter().count());
+} else if (type.equals("gauge")) {
+response.entity(search.gauge().value());
+} else if (type.equals("summary")) {
+response.entity(search.summary().max());
+} else if (type.equals("timer")) {
+
response.entity(search.timer().totalTime(TimeUnit.MILLISECONDS));
+} else {
+throw new IllegalArgumentException("Unknown metric type: " +
type);
+}
-return response.build();
+return response.build();
+} catch (NullPointerException e) {
+//metric does not exist
+return Response.status(500).entity("Metric does not
exist").build();
+}
}
@Path("/counter")
@@ -105,4 +113,11 @@ public class MicrometerResource {
producerTemplate.requestBody("direct:log", (Object) null);
return Response.ok().build();
}
+
+@Path("/annotations/call/{number}")
+@GET
+public Response annotationsCall(@PathParam("number") int number) {
+producerTemplate.requestBodyAndHeader("direct:annotatedBean", (Object)
null, "number", number);
+return Response.ok().build();
+}
}
diff --git
a/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerRoutes.java
b/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerRoutes.java
index 068d2fda1e..8e8517e587 100644
---
a/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerRoutes.java
+++
b/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerRoutes.java
@@ -39,5 +39,12 @@ public class MicrometerRoutes extends RouteBuilder {
from("direct:log").routeId("log")
.log("Camel Quarkus Micrometer");
+
+from("direct:annotatedBean")
+.choice()
+
[GitHub] [camel-quarkus] jamesnetherton merged pull request #4600: Micrometer test coverage - @Counted
jamesnetherton merged PR #4600: URL: https://github.com/apache/camel-quarkus/pull/4600 -- 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 #4598: Micrometer test coverage - possible issue with @Counted annotation and metrics mandatory
jamesnetherton closed issue #4598: Micrometer test coverage - possible issue with @Counted annotation and metrics mandatory URL: https://github.com/apache/camel-quarkus/issues/4598 -- 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] orpiske commented on pull request #9432: CAMEL-19058: fix a type check scability issue for Message types
orpiske commented on PR #9432: URL: https://github.com/apache/camel/pull/9432#issuecomment-1447675277 > Hmm now we create a new object per message (the trait) only for fringe features like JMS external redelivery and dataType (not really much in use). Yeah. There's that, indeed - though the memory overhead is probably small. One alternative I considered is to have the traits as a bit mask. It would make the code a little bit more complex, but may consume less memory overall. What do you think? > > Also mind that PooledExchange has a reset that, see reset method on Message. You likely need to reset the trait or something. Thanks, noted. I'll take a look. -- 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 (d6c7e6b2979 -> 406dd0158fa)
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 d6c7e6b2979 CAMEL-19090: Remove deprecated apis in core add 406dd0158fa Fixed RAT No new revisions were added by this update. Summary of changes: components/camel-dhis2/camel-dhis2-api/pom.xml | 18 ++ components/camel-dhis2/camel-dhis2-component/pom.xml | 18 ++ components/camel-dhis2/pom.xml | 18 ++ 3 files changed, 54 insertions(+)
[camel] branch main updated: (chores) camel-base-engine: fix misplaced comment
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 82bae503a78 (chores) camel-base-engine: fix misplaced comment
82bae503a78 is described below
commit 82bae503a78abcb4a7939846a155cc0d3ed93bd4
Author: Otavio Rodolfo Piske
AuthorDate: Tue Feb 28 07:39:19 2023 +0100
(chores) camel-base-engine: fix misplaced comment
---
.../main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
index 14022ccf156..909045a74e7 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
@@ -801,10 +801,10 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor implements In
UnitOfWorkHelper.doneUow(uow, exchange);
}
+// after UoW is done lets pop the route context which must be done
on every existing UoW
if (route != null && existing != null) {
existing.popRoute();
}
-// after UoW is done lets pop the route context which must be done
on every existing UoW
}
protected UnitOfWork createUnitOfWork(Exchange exchange) {
[camel] branch main updated: (chores) camel-base-engine: cleanup duplicated code
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new b86569124f6 (chores) camel-base-engine: cleanup duplicated code
b86569124f6 is described below
commit b86569124f69b42a4b2e9041fda6df16e76c327c
Author: Otavio Rodolfo Piske
AuthorDate: Tue Feb 14 17:21:27 2023 +0100
(chores) camel-base-engine: cleanup duplicated code
---
.../apache/camel/impl/engine/AdviceIterator.java | 45 ++
.../camel/impl/engine/CamelInternalProcessor.java | 16 +---
.../impl/engine/SharedCamelInternalProcessor.java | 14 +--
3 files changed, 48 insertions(+), 27 deletions(-)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AdviceIterator.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AdviceIterator.java
new file mode 100644
index 000..4ec157d9af4
--- /dev/null
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AdviceIterator.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.impl.engine;
+
+import java.util.List;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.spi.CamelInternalProcessorAdvice;
+
+final class AdviceIterator {
+private AdviceIterator() {
+
+}
+
+static void runAfterTasks(List
advices, Object[] states, Exchange exchange) {
+for (int i = advices.size() - 1, j = states.length - 1; i >= 0; i--) {
+CamelInternalProcessorAdvice task = advices.get(i);
+Object state = null;
+if (task.hasState()) {
+state = states[j--];
+}
+try {
+task.after(exchange, state);
+} catch (Throwable e) {
+exchange.setException(e);
+// allow all advices to complete even if there was an exception
+}
+}
+}
+}
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
index 096585d5ff8..14022ccf156 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
@@ -245,19 +245,7 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor implements In
@SuppressWarnings("unchecked")
public void done(boolean doneSync) {
try {
-for (int i = advices.size() - 1, j = states.length - 1; i >=
0; i--) {
-CamelInternalProcessorAdvice task = advices.get(i);
-Object state = null;
-if (task.hasState()) {
-state = states[j--];
-}
-try {
-task.after(exchange, state);
-} catch (Throwable e) {
-exchange.setException(e);
-// allow all advices to complete even if there was an
exception
-}
-}
+AdviceIterator.runAfterTasks(advices, states, exchange);
} finally {
// --
// CAMEL END USER - DEBUG ME HERE +++ START +++
@@ -813,10 +801,10 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor implements In
UnitOfWorkHelper.doneUow(uow, exchange);
}
-// after UoW is done lets pop the route context which must be done
on every existing UoW
if (route != null && existing != null) {
existing.popRoute();
}
+// after UoW is done lets pop the route context which must be done
on every existing UoW
}
protected UnitOfWork createUnitOfWork(Exchange exchange) {
diff --git
[GitHub] [camel] orpiske merged pull request #9436: (chores) camel-base-engine: cleanup duplicated code
orpiske merged PR #9436: URL: https://github.com/apache/camel/pull/9436 -- 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] orpiske commented on a diff in pull request #9436: (chores) camel-base-engine: cleanup duplicated code
orpiske commented on code in PR #9436:
URL: https://github.com/apache/camel/pull/9436#discussion_r1119628376
##
core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java:
##
@@ -813,10 +801,10 @@ public void after(Exchange exchange, UnitOfWork uow)
throws Exception {
UnitOfWorkHelper.doneUow(uow, exchange);
}
-// after UoW is done lets pop the route context which must be done
on every existing UoW
if (route != null && existing != null) {
existing.popRoute();
}
+// after UoW is done lets pop the route context which must be done
on every existing UoW
Review Comment:
Oh, alright. I'll merge and then move it back in place!
--
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: Fixed RAT
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 406dd0158fa Fixed RAT 406dd0158fa is described below commit 406dd0158fa4d387a8d903a18ebb874b6a2ab6a1 Author: Claus Ibsen AuthorDate: Tue Feb 28 06:59:25 2023 +0100 Fixed RAT --- components/camel-dhis2/camel-dhis2-api/pom.xml | 18 ++ components/camel-dhis2/camel-dhis2-component/pom.xml | 18 ++ components/camel-dhis2/pom.xml | 18 ++ 3 files changed, 54 insertions(+) diff --git a/components/camel-dhis2/camel-dhis2-api/pom.xml b/components/camel-dhis2/camel-dhis2-api/pom.xml index 19f795057e3..25c01344cfb 100644 --- a/components/camel-dhis2/camel-dhis2-api/pom.xml +++ b/components/camel-dhis2/camel-dhis2-api/pom.xml @@ -1,4 +1,22 @@ + 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/maven-v4_0_0.xsd;> diff --git a/components/camel-dhis2/camel-dhis2-component/pom.xml b/components/camel-dhis2/camel-dhis2-component/pom.xml index 2b6bfbae35a..124a9220bd7 100644 --- a/components/camel-dhis2/camel-dhis2-component/pom.xml +++ b/components/camel-dhis2/camel-dhis2-component/pom.xml @@ -1,4 +1,22 @@ + 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/maven-v4_0_0.xsd;> diff --git a/components/camel-dhis2/pom.xml b/components/camel-dhis2/pom.xml index 17703399b23..6e15561a820 100644 --- a/components/camel-dhis2/pom.xml +++ b/components/camel-dhis2/pom.xml @@ -1,4 +1,22 @@ + 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/maven-v4_0_0.xsd;>
[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 bb4e85ce8e Updated CHANGELOG.md bb4e85ce8e is described below commit bb4e85ce8e1f0db58ce84d199e64be48406dec6e Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Feb 28 03:20:29 2023 + Updated CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index df6574003f..35dd93fb20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ - Improve documentation for Kubernetes [\#4520](https://github.com/apache/camel-quarkus/issues/4520) - mail test fails in native mode [\#4519](https://github.com/apache/camel-quarkus/issues/4519) - VertxWebsocketTest fails with "Path must start with /" on Camel 4 and Quarkus 3 [\#4518](https://github.com/apache/camel-quarkus/issues/4518) +- zendesk test cannot be compiled to native with Camel 4 and Quarkus 3 [\#4514](https://github.com/apache/camel-quarkus/issues/4514) - saxon test cannot be compiled to native with Camel 4 and Quarkus 3 [\#4512](https://github.com/apache/camel-quarkus/issues/4512) - quarkus-jackson-jq not ready for Quarkus 3 [\#4511](https://github.com/apache/camel-quarkus/issues/4511) - crypto test cannot be compiled to native with Camel 4 and Quarkus 3 [\#4510](https://github.com/apache/camel-quarkus/issues/4510) @@ -73,11 +74,13 @@ **Merged pull requests:** +- Remove workaround for quarkus.http.test-ssl-port being ignored by REST Assured [\#4604](https://github.com/apache/camel-quarkus/pull/4604) ([jamesnetherton](https://github.com/jamesnetherton)) - Generated sources regen for SBOM [\#4601](https://github.com/apache/camel-quarkus/pull/4601) ([github-actions[bot]](https://github.com/apps/github-actions)) - Upgrade quarkus-jackson-jq to 2.0.0.Alpha [\#4599](https://github.com/apache/camel-quarkus/pull/4599) ([jamesnetherton](https://github.com/jamesnetherton)) - Move Qute component camel-package-maven-plugin execution phase to process-classes [\#4595](https://github.com/apache/camel-quarkus/pull/4595) ([jamesnetherton](https://github.com/jamesnetherton)) - Upgrade to Quarkiverse CXF 2.0.0 [\#4594](https://github.com/apache/camel-quarkus/pull/4594) ([ppalaga](https://github.com/ppalaga)) - Minimize exclusions in the BOM, remove superfluous exclusions in extensions [\#4593](https://github.com/apache/camel-quarkus/pull/4593) ([ppalaga](https://github.com/ppalaga)) +- Zendesk test cannot be compiled to native with Camel 4 and Quarkus 3 [\#4592](https://github.com/apache/camel-quarkus/pull/4592) ([JiriOndrusek](https://github.com/JiriOndrusek)) - Upgrade github-api to 1.313 [\#4590](https://github.com/apache/camel-quarkus/pull/4590) ([jamesnetherton](https://github.com/jamesnetherton)) - Ref \#4393: Groovy DSL - Get rid of --report-unsupported-elements-at-runtime [\#4589](https://github.com/apache/camel-quarkus/pull/4589) ([essobedo](https://github.com/essobedo)) - Generated sources regen for SBOM [\#4587](https://github.com/apache/camel-quarkus/pull/4587) ([github-actions[bot]](https://github.com/apps/github-actions))
[camel-kamelets] 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-kamelets.git The following commit(s) were added to refs/heads/main by this push: new f39f47fa Updated CHANGELOG.md f39f47fa is described below commit f39f47fad515952acd16d05cd56688ec664b25d4 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Feb 28 03:11:44 2023 + Updated CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7660f034..5da937a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ **Closed issues:** +- Bind variables cannot be used for table names [\#1310](https://github.com/apache/camel-kamelets/issues/1310) +- Is there any kind of SMT available in camel-kamelets [\#1309](https://github.com/apache/camel-kamelets/issues/1309) +- jms-apache-activemq-sink-binding: error during trait customization: component not found for uri [\#1304](https://github.com/apache/camel-kamelets/issues/1304) - Add SBOM Generation and related Github Action [\#1292](https://github.com/apache/camel-kamelets/issues/1292) - Switch Main branch to Camel 4 [\#1287](https://github.com/apache/camel-kamelets/issues/1287) - Add an annotations to Kamelets to define the level of complexity [\#1267](https://github.com/apache/camel-kamelets/issues/1267)
[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 1a69a1e8f Updated CHANGELOG.md 1a69a1e8f is described below commit 1a69a1e8f902ca1968fb0c74943edf4d9c535c00 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Feb 28 03:10:38 2023 + Updated CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 79dd0c853..ae27a816d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ **Closed issues:** +- camel https sink connector 3.18.2 NoSuchMethodError [\#1509](https://github.com/apache/camel-kafka-connector/issues/1509) - Consume JSON string for Cassandra sink connector [\#1487](https://github.com/apache/camel-kafka-connector/issues/1487) **Merged pull requests:**
[camel-k-runtime] 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-runtime.git The following commit(s) were added to refs/heads/main by this push: new 69648790 Updated CHANGELOG.md 69648790 is described below commit 6964879021e811b269fafe2a05cba243b2430f26 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Feb 28 03:09:17 2023 + Updated CHANGELOG.md --- CHANGELOG.md | 8 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d32775c3..4ba004fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [Unreleased](https://github.com/apache/camel-k-runtime/tree/HEAD) + +[Full Changelog](https://github.com/apache/camel-k-runtime/compare/camel-k-runtime-project-1.17.0...HEAD) + +**Closed issues:** + +- Release 1.17.0 [\#951](https://github.com/apache/camel-k-runtime/issues/951) + ## [camel-k-runtime-project-1.17.0](https://github.com/apache/camel-k-runtime/tree/camel-k-runtime-project-1.17.0) (2023-02-20) [Full Changelog](https://github.com/apache/camel-k-runtime/compare/camel-k-runtime-project-1.16.0...camel-k-runtime-project-1.17.0)
[camel-k] branch dependabot/go_modules/github.com/container-tools/spectrum-0.6.1 created (now b880a7f12)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/go_modules/github.com/container-tools/spectrum-0.6.1 in repository https://gitbox.apache.org/repos/asf/camel-k.git at b880a7f12 chore(deps): bump github.com/container-tools/spectrum No new revisions were added by this update.
[GitHub] [camel-k] dependabot[bot] opened a new pull request, #4082: chore(deps): bump github.com/container-tools/spectrum from 0.6.0 to 0.6.1
dependabot[bot] opened a new pull request, #4082: URL: https://github.com/apache/camel-k/pull/4082 Bumps [github.com/container-tools/spectrum](https://github.com/container-tools/spectrum) from 0.6.0 to 0.6.1. Release notes Sourced from https://github.com/container-tools/spectrum/releases;>github.com/container-tools/spectrum's releases. v0.6.1 Changelog 98248f0 Bump github.com/stretchr/testify from 1.8.1 to 1.8.2 Docker images docker pull quay.io/container-tools/spectrum:v0.6.1 docker pull quay.io/container-tools/spectrum:v0.6 Commits https://github.com/container-tools/spectrum/commit/98248f01de24f29bd4a9e188a399defb44f08c36;>98248f0 Bump github.com/stretchr/testify from 1.8.1 to 1.8.2 See full diff in https://github.com/container-tools/spectrum/compare/v0.6.0...v0.6.1;>compare view [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-spring-boot] branch automatic-periodic-sync updated (ad5c8e42519 -> a9a27f4d5a9)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch automatic-periodic-sync in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git from ad5c8e42519 CAMEL-19090: Remove deprecated apis in core add a9a27f4d5a9 CAMEL-19090: Remove deprecated apis in core No new revisions were added by this update. Summary of changes: core/camel-spring-boot/src/main/docs/spring-boot.json | 8 .../apache/camel/spring/boot/CamelConfigurationProperties.java| 7 --- .../org/apache/camel/spring/boot/ThreadPoolConfigurationTest.java | 6 +++--- tooling/camel-spring-boot-dependencies/pom.xml| 5 - 4 files changed, 3 insertions(+), 23 deletions(-)
[GitHub] [camel-k] github-actions[bot] commented on pull request #3855: Added support for multi-arch building of Operator image
github-actions[bot] commented on PR #3855: URL: https://github.com/apache/camel-k/pull/3855#issuecomment-1447329127 This PR has been automatically marked as stale due to 90 days of inactivity. It will be closed if no further activity occurs within 15 days. If you think that’s incorrect or the issue should never stale, please simply write any comment. Thanks for your contributions! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] branch release-1.10.x updated: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-1.10.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-1.10.x by this push: new a30c62cc6 chore: changelog automatic update a30c62cc6 is described below commit a30c62cc6f8add6e90735ef4b4d9ea34623c9f20 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Mon Feb 27 23:42:37 2023 + chore: changelog automatic update --- CHANGELOG.md | 9 + 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 09e52a8c2..8c2f504c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## [Unreleased](https://github.com/apache/camel-k/tree/HEAD) + +[Full Changelog](https://github.com/apache/camel-k/compare/v1.12.0...HEAD) + +**Closed issues:** + +- Release 1.12.0 [\#4002](https://github.com/apache/camel-k/issues/4002) +- Rethink E2E execution flow [\#3847](https://github.com/apache/camel-k/issues/3847) + ## [v1.12.0](https://github.com/apache/camel-k/tree/v1.12.0) (2023-02-21) [Full Changelog](https://github.com/apache/camel-k/compare/pkg/apis/camel/v1.12.0...v1.12.0)
[camel-k] 01/02: chore: changelog automatic update
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 commit bfa142832d55f1f179933867e0debb94284e7508 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Mon Feb 27 23:40:01 2023 + chore: changelog automatic update --- CHANGELOG.md | 415 +-- 1 file changed, 234 insertions(+), 181 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e47312503..8c2f504c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,32 @@ ## [Unreleased](https://github.com/apache/camel-k/tree/HEAD) -[Full Changelog](https://github.com/apache/camel-k/compare/1.11.2-nightly...HEAD) +[Full Changelog](https://github.com/apache/camel-k/compare/v1.12.0...HEAD) + +**Closed issues:** + +- Release 1.12.0 [\#4002](https://github.com/apache/camel-k/issues/4002) +- Rethink E2E execution flow [\#3847](https://github.com/apache/camel-k/issues/3847) + +## [v1.12.0](https://github.com/apache/camel-k/tree/v1.12.0) (2023-02-21) + +[Full Changelog](https://github.com/apache/camel-k/compare/pkg/apis/camel/v1.12.0...v1.12.0) + +## [pkg/apis/camel/v1.12.0](https://github.com/apache/camel-k/tree/pkg/apis/camel/v1.12.0) (2023-02-21) + +[Full Changelog](https://github.com/apache/camel-k/compare/pkg/kamelet/repository/v1.12.0...pkg/apis/camel/v1.12.0) + +## [pkg/kamelet/repository/v1.12.0](https://github.com/apache/camel-k/tree/pkg/kamelet/repository/v1.12.0) (2023-02-21) + +[Full Changelog](https://github.com/apache/camel-k/compare/pkg/client/camel/v1.12.0...pkg/kamelet/repository/v1.12.0) + +## [pkg/client/camel/v1.12.0](https://github.com/apache/camel-k/tree/pkg/client/camel/v1.12.0) (2023-02-21) + +[Full Changelog](https://github.com/apache/camel-k/compare/camel-k-crds-1.12.0...pkg/client/camel/v1.12.0) + +## [camel-k-crds-1.12.0](https://github.com/apache/camel-k/tree/camel-k-crds-1.12.0) (2023-02-21) + +[Full Changelog](https://github.com/apache/camel-k/compare/1.11.2-nightly...camel-k-crds-1.12.0) **Closed issues:** @@ -33,9 +58,37 @@ - rethink configurations spec [\#1680](https://github.com/apache/camel-k/issues/1680) - Support for AWS ECR in kaniko builder in Operator [\#1031](https://github.com/apache/camel-k/issues/1031) +**Merged pull requests:** + +- Preparation of release 1.12.0 [\#4067](https://github.com/apache/camel-k/pull/4067) ([oscerd](https://github.com/oscerd)) +- Move pod's phase indexer to integration controller initialization [\#4064](https://github.com/apache/camel-k/pull/4064) ([lburgazzoli](https://github.com/lburgazzoli)) +- feat\(ci\): Camel-K-CRD java dependency [\#4062](https://github.com/apache/camel-k/pull/4062) ([squakez](https://github.com/squakez)) +- feature\(\#3903\): Support secret refresh through the existing addons - Docs update [\#4057](https://github.com/apache/camel-k/pull/4057) ([oscerd](https://github.com/oscerd)) +- feature\(\#3903\): Support secret refresh through the existing addons - Azure Key Vault [\#4056](https://github.com/apache/camel-k/pull/4056) ([oscerd](https://github.com/oscerd)) +- chore\(ci\): bump java crds [\#4054](https://github.com/apache/camel-k/pull/4054) ([squakez](https://github.com/squakez)) +- Minor adjustments to generated CRDs java package [\#4053](https://github.com/apache/camel-k/pull/4053) ([andreaTP](https://github.com/andreaTP)) +- fix - publish the jar with the generated classes [\#4052](https://github.com/apache/camel-k/pull/4052) ([andreaTP](https://github.com/andreaTP)) +- feature\(\#3903\): Support secret refresh through the existing addons - Google Secret Manager [\#4051](https://github.com/apache/camel-k/pull/4051) ([oscerd](https://github.com/oscerd)) +- feat\(cli\): promote dry run [\#4050](https://github.com/apache/camel-k/pull/4050) ([squakez](https://github.com/squakez)) +- feature\(\#3903\): Support secret refresh through the existing addons - AWS Secrets Manager [\#4047](https://github.com/apache/camel-k/pull/4047) ([oscerd](https://github.com/oscerd)) +- fix\(\#4044\): Fix Kamelet utils version in e2e tests [\#4046](https://github.com/apache/camel-k/pull/4046) ([christophd](https://github.com/christophd)) +- fix\(ci\): env in proper place [\#4045](https://github.com/apache/camel-k/pull/4045) ([squakez](https://github.com/squakez)) +- chore\(ci\): setting ASF snapshot credentials [\#4043](https://github.com/apache/camel-k/pull/4043) ([squakez](https://github.com/squakez)) +- chore\(dependencies\): prometheus 0.60.0 [\#4042](https://github.com/apache/camel-k/pull/4042) ([squakez](https://github.com/squakez)) +- chore\(deps\): bump golang.org/x/oauth2 from 0.4.0 to 0.5.0 [\#4041](https://github.com/apache/camel-k/pull/4041) ([dependabot[bot]](https://github.com/apps/dependabot)) +- fix\(ci\): settings directory [\#4039](https://github.com/apache/camel-k/pull/4039)
[camel-k] branch main updated (b1bc1fe88 -> 74874c399)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
from b1bc1fe88 chore(deps): k8s api to 0.25.6
new bfa142832 chore: changelog automatic update
new 74874c399 chore: nightly resource refresh
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:
CHANGELOG.md | 415 -
docs/antora.yml| 8 +-
pkg/resources/resources.go | 14 +-
...7.0.yaml => camel-catalog-1.18.0-SNAPSHOT.yaml} | 6 +-
4 files changed, 248 insertions(+), 195 deletions(-)
rename resources/{camel-catalog-1.17.0.yaml =>
camel-catalog-1.18.0-SNAPSHOT.yaml} (99%)
[camel-k] 02/02: chore: nightly resource refresh
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
commit 74874c399599e4fc826a426bef2246cdf3ee56e8
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Mon Feb 27 23:45:50 2023 +
chore: nightly resource refresh
---
docs/antora.yml| 8
pkg/resources/resources.go | 14 +++---
...alog-1.17.0.yaml => camel-catalog-1.18.0-SNAPSHOT.yaml} | 6 +++---
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 56e7f7467..1fe819cf8 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -30,9 +30,9 @@ asciidoc:
attributes:
requires: "'util=camel-website-util,ck=xref:js/ck.js'"
prerelease: true
-camel-kamelets-version: '0.10.0'
-camel-kamelets-docs-version: 0.10.x
-camel-k-runtime-version: 1.17.0-SNAPSHOT
+camel-kamelets-version: 'latest'
+camel-kamelets-docs-version: next
+camel-k-runtime-version: 1.18.0-SNAPSHOT
camel-api-versions: camel.apache.org/v1 camel.apache.org/v1alpha1 # from
Makefile BUNDLE_CAMEL_APIS
camel-version: 3.20.1
camel-docs-version: 3.20.x
@@ -42,7 +42,7 @@ asciidoc:
buildah-version: 1.23.3
kaniko-version: 0.17.1
kustomize-version: 4.5.4
-kubernetes-api-version: 0.25.2
+kubernetes-api-version: 0.25.6
operator-fwk-api-version: 0.13.0
knative-api-version: 0.35.3
service-binding-op-version: 1.3.3
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index 86b05c41f..a171c0de4 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -170,9 +170,9 @@ var assets = func() http.FileSystem {
"/manager/operator-deployment.yaml": Û°CompressedFileInfo{
name: "operator-deployment.yaml",
modTime: time.Time{},
- uncompressedSize: 2752,
+ uncompressedSize: 2749,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x56\x4d\x8f\xe2\x46\x10\xbd\xfb\x57\x3c\xe1\xcb\xae\x34\x98\x61\x4f\x2b\xe7\xe4\x0c\x4c\xd6\xca\xc6\x20\xcc\x66\xb4\xa7\xa8\x69\x17\x76\x8b\x76\xb7\xd3\xdd\x86\x25\xbf\x3e\x6a\x83\x19\x60\x3e\x92\x89\x46\x8a\x4f\xd8\x55\xf5\xea\xd5\x7b\xd5\x36\x21\x86\xef\x77\x05\x21\xbe\x0a\x4e\xca\x52\x01\xa7\xe1\x2a\x42\xd2\x30\x5e\x11\x72\xbd\x76\x3b\x66\x08\xf7\xba\x55\x05\x73\x42\x2b\x7c\x48\xf2\xfb\x8f\x68\x55\x41\x06\x5a\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x56\x4d\x8f\xe2\x46\x10\xbd\xfb\x57\x3c\xe1\xcb\xae\x34\x18\x66\x4f\x2b\xe7\xe4\x0c\x4c\xd6\xca\xc6\x20\xcc\x66\xb4\xa7\xa8\x69\x17\x76\x8b\x76\xb7\xd3\xdd\x86\x25\xbf\x3e\x6a\x83\x19\x60\x3e\x92\x89\x46\x8a\x4f\xd8\x55\xf5\xea\xd5\x7b\xd5\x36\x21\x86\xef\x77\x05\x21\xbe\x0a\x4e\xca\x52\x01\xa7\xe1\x2a\x42\xd2\x30\x5e\x11\x72\xbd\x76\x3b\x66\x08\xf7\xba\x55\x05\x73\x42\x2b\x7c\x48\xf2\xfb\x8f\x68\x55\x41\x06\x5a\x
[...]
},
"/manager/operator-service-account.yaml":
Û°CompressedFileInfo{
name: "operator-service-account.yaml",
@@ -601,12 +601,12 @@ var assets = func() http.FileSystem {
compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\xc1\x8e\xdb\x36\x14\xbc\xf3\x2b\x06\xd6\x25\x01\xd6\x72\xdb\x53\xe1\x9e\xdc\xcd\x6e\x2b\x34\xb0\x81\x95\xd3\x20\xc7\x67\xe9\x59\x7a\x58\x8a\x54\x1f\xa9\x55\xb6\x5f\x5f\x90\x96\xbb\x0e\xda\x63\x78\xb1\x05\x8d\xe6\xcd\xbc\x19\x16\x58\x7f\xbf\x63\x0a\x7c\x94\x86\x5d\xe0\x16\xd1\x23\xf6\x8c\xdd\x48\x4d\xcf\xa8\xfd\x39\xce\xa4\x8c\x47\x3f\xb9\x96\xa2\x78\x87\x77\xbb\xfa\xf1\x3d\x26\xd7\xb2\xc2\x3b\x86\x57\x0c\x5e\x
[...]
},
- "/camel-catalog-1.17.0.yaml": Û°CompressedFileInfo{
- name: "camel-catalog-1.17.0.yaml",
+ "/camel-catalog-1.18.0-SNAPSHOT.yaml":
Û°CompressedFileInfo{
+ name: "camel-catalog-1.18.0-SNAPSHOT.yaml",
modTime: time.Time{},
- uncompressedSize: 86745,
+ uncompressedSize: 86772,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\x4b\x77\xdb\xb8\xb2\xee\x3c\xbf\x82\xab\x33\x39\x67\xdd\x2d\x74\xb7\x7b\xdf\xdd\x77\xe5\x8e\x6c\x39\x4e\xec\xd8\x89\x13\x79\x27\xd9\x3d\xe9\x05\x91\x90\x04\x8b\x24\x68\x00\x94\xe5\xfc\xfa\xb3\x00\x82\x4f\x29\xc5\x87\x0b\x3e\x1e\x98\x14\x51\xf8\x0a\xf5\x01\xc4\x9b\x85\xd7\xc1\x0c\xef\xef\xd5\xeb\xe0\x9a\x87\x2c\x55\x2c\x0a\xb4\x08\xf4\x86\x05\xa7\x19\x0d\x37\x2c\x58\x88\x95\x7e\xa4\x92\x05\x17\x22\x4f\x23\xaa\x
[...]
+ compressedContent:
[GitHub] [camel] orpiske commented on a diff in pull request #9433: CAMEL-19060 + CAMEL-19058: minor improvements
orpiske commented on code in PR #9433:
URL: https://github.com/apache/camel/pull/9433#discussion_r1119322147
##
core/camel-main/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java:
##
@@ -100,9 +94,12 @@ protected void doNotify(CamelEvent event) throws Exception {
return;
}
+final boolean complete = event.getType() ==
CamelEvent.Type.ExchangeCompleted || event.getType() ==
CamelEvent.Type.ExchangeFailed;
Review Comment:
Good idea! I think I can. I will double check tomorrow.
--
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] orpiske commented on pull request #9436: (chores) camel-base-engine: cleanup duplicated code
orpiske commented on PR #9436: URL: https://github.com/apache/camel/pull/9436#issuecomment-1447083309 > I guess there is no noticable performance hit with the extra method call? The method is too big for the JVM to inlining Yeah, this one is probably too big for the inlining with the default JVM settings. The greatest benefit of consolidating this code is having nicer stack frames with the async profiler (and that makes it easier to rule out the parts that are performing nicely). -- 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 (504c1c2205f -> d6c7e6b2979)
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 504c1c2205f Regen for commit 4a3fe6aa91e001a2522fa02ade00e9c2905d3fc3 (#9441) add c74d9e04e9f (chores) camel-main: use log markers for a warning message add 9d6b5e6b434 (chores) camel-base-engine: delay checking if the exchange failed add 3ea27fdcbd0 Regen for commit 396b7b69bb707e2bcd9010b18b6c78ed5144f77f (#9442) add d6c7e6b2979 CAMEL-19090: Remove deprecated apis in core No new revisions were added by this update. Summary of changes: .../main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java | 3 +-- .../main/java/org/apache/camel/main/MainDurationEventNotifier.java | 2 +- docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc| 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-)
[camel-quarkus] branch main updated: Remove workaround for quarkus.http.test-ssl-port being ignored by REST Assured
This is an automated email from the ASF dual-hosted git repository.
ppalaga 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 b24512c649 Remove workaround for quarkus.http.test-ssl-port being
ignored by REST Assured
b24512c649 is described below
commit b24512c6498ab7b2072aa6fb7b122b11c8971f19
Author: James Netherton
AuthorDate: Mon Feb 27 11:41:44 2023 +
Remove workaround for quarkus.http.test-ssl-port being ignored by REST
Assured
---
poms/build-parent-it/pom.xml | 4
1 file changed, 4 deletions(-)
diff --git a/poms/build-parent-it/pom.xml b/poms/build-parent-it/pom.xml
index 042539efc0..4a0722b061 100644
--- a/poms/build-parent-it/pom.xml
+++ b/poms/build-parent-it/pom.xml
@@ -90,8 +90,6 @@
${test.http.port.native}
${test.https.port.native}
-
-
${test.https.port.native}
@@ -186,8 +184,6 @@
${test.http.port.jvm}
${test.https.port.jvm}
-
-
${test.https.port.jvm}
[GitHub] [camel-quarkus] ppalaga merged pull request #4604: Remove workaround for quarkus.http.test-ssl-port being ignored by REST Assured
ppalaga merged PR #4604: URL: https://github.com/apache/camel-quarkus/pull/4604 -- 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 (c74d9e04e9f -> 504c1c2205f)
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 c74d9e04e9f (chores) camel-main: use log markers for a warning message 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 (504c1c2205f) \ O -- O -- O (c74d9e04e9f) 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/main/MainDurationEventNotifier.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel-quarkus] branch main updated: Zendesk test cannot be compiled to native with Camel 4 and Quarkus 3 #4514
This is an automated email from the ASF dual-hosted git repository.
ppalaga 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 a92a48feed Zendesk test cannot be compiled to native with Camel 4 and
Quarkus 3 #4514
a92a48feed is described below
commit a92a48feed54f53c883c45caaf1c4314c430152d
Author: JiriOndrusek
AuthorDate: Mon Feb 20 16:02:33 2023 +0100
Zendesk test cannot be compiled to native with Camel 4 and Quarkus 3 #4514
---
.../ahc/deployment/SupportAhcProcessor.java| 6
extensions-support/ahc/runtime/pom.xml | 17 +
.../ahc/runtime/graal/AhcSubstitutions.java| 41 ++
pom.xml| 3 +-
poms/bom/pom.xml | 13 +++
poms/bom/src/main/generated/flattened-full-pom.xml | 15 +++-
.../src/main/generated/flattened-reduced-pom.xml | 15 +++-
.../generated/flattened-reduced-verbose-pom.xml| 15 +++-
8 files changed, 121 insertions(+), 4 deletions(-)
diff --git
a/extensions-support/ahc/deployment/src/main/java/org/apache/camel/quarkus/component/support/ahc/deployment/SupportAhcProcessor.java
b/extensions-support/ahc/deployment/src/main/java/org/apache/camel/quarkus/component/support/ahc/deployment/SupportAhcProcessor.java
index f9b9121237..d415b7612c 100644
---
a/extensions-support/ahc/deployment/src/main/java/org/apache/camel/quarkus/component/support/ahc/deployment/SupportAhcProcessor.java
+++
b/extensions-support/ahc/deployment/src/main/java/org/apache/camel/quarkus/component/support/ahc/deployment/SupportAhcProcessor.java
@@ -18,6 +18,7 @@ package
org.apache.camel.quarkus.component.support.ahc.deployment;
import java.util.stream.Stream;
+import io.netty.incubator.channel.uring.IOUringEventLoopGroup;
import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
@@ -40,6 +41,11 @@ class SupportAhcProcessor {
return new ExtensionSslNativeSupportBuildItem(FEATURE);
}
+@BuildStep
+RuntimeInitializedClassBuildItem runtimeInitializedClasses() {
+return new
RuntimeInitializedClassBuildItem(IOUringEventLoopGroup.class.getName());
+}
+
@BuildStep
void
runtimeInitializedClasses(BuildProducer
runtimeInitializedClass) {
Stream.of("org.asynchttpclient.netty.channel.ChannelManager",
diff --git a/extensions-support/ahc/runtime/pom.xml
b/extensions-support/ahc/runtime/pom.xml
index 017ecf206a..d314493e92 100644
--- a/extensions-support/ahc/runtime/pom.xml
+++ b/extensions-support/ahc/runtime/pom.xml
@@ -47,6 +47,23 @@
org.asynchttpclient
async-http-client
+
+netty-transport-classes-epoll
+io.netty
+
+
+netty-transport-classes-kqueue
+io.netty
+
+
+io.netty.incubator
+netty-incubator-transport-classes-io_uring
+
+
+org.graalvm.sdk
+graal-sdk
+provided
+
diff --git
a/extensions-support/ahc/runtime/src/main/java/org/apache/camel/quarkus/component/support/ahc/runtime/graal/AhcSubstitutions.java
b/extensions-support/ahc/runtime/src/main/java/org/apache/camel/quarkus/component/support/ahc/runtime/graal/AhcSubstitutions.java
new file mode 100644
index 00..9ccb42756d
--- /dev/null
+++
b/extensions-support/ahc/runtime/src/main/java/org/apache/camel/quarkus/component/support/ahc/runtime/graal/AhcSubstitutions.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.quarkus.component.support.ahc.runtime.graal;
+
+import java.util.concurrent.ThreadFactory;
+
+import com.oracle.svm.core.annotate.Substitute;
+import com.oracle.svm.core.annotate.TargetClass;
+import io.netty.incubator.channel.uring.IOUringEventLoopGroup;
+import io.netty.incubator.channel.uring.IOUringSocketChannel;
+
+final class AhcSubstitutions {
+}
+
[GitHub] [camel-quarkus] ppalaga merged pull request #4592: Zendesk test cannot be compiled to native with Camel 4 and Quarkus 3
ppalaga merged PR #4592: URL: https://github.com/apache/camel-quarkus/pull/4592 -- 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] ppalaga closed issue #4514: zendesk test cannot be compiled to native with Camel 4 and Quarkus 3
ppalaga closed issue #4514: zendesk test cannot be compiled to native with Camel 4 and Quarkus 3 URL: https://github.com/apache/camel-quarkus/issues/4514 -- 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 (9d6b5e6b434 -> c74d9e04e9f)
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 9d6b5e6b434 (chores) camel-base-engine: delay checking if the exchange failed 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 (c74d9e04e9f) \ O -- O -- O (9d6b5e6b434) 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/impl/engine/DefaultUnitOfWork.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
[camel] branch regen_bot updated (8c9d52531e6 -> 9d6b5e6b434)
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 8c9d52531e6 Regen for commit 396b7b69bb707e2bcd9010b18b6c78ed5144f77f add 504c1c2205f Regen for commit 4a3fe6aa91e001a2522fa02ade00e9c2905d3fc3 (#9441) add c74d9e04e9f (chores) camel-main: use log markers for a warning message add 9d6b5e6b434 (chores) camel-base-engine: delay checking if the exchange failed 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 (8c9d52531e6) \ N -- N -- N refs/heads/regen_bot (9d6b5e6b434) 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/impl/engine/DefaultUnitOfWork.java | 3 +-- .../src/main/java/org/apache/camel/main/MainDurationEventNotifier.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-)
[camel] branch main updated: CAMEL-19090: Remove deprecated apis in core
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 d6c7e6b2979 CAMEL-19090: Remove deprecated apis in core d6c7e6b2979 is described below commit d6c7e6b297966de4a4e07f84d737596bd7c16c19 Author: Claus Ibsen AuthorDate: Mon Feb 27 21:03:16 2023 +0100 CAMEL-19090: Remove deprecated apis in core --- docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc index 39af3cb1dde..278c79d286c 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc @@ -73,11 +73,11 @@ We have removed deprecated APIs such as the following: - Removed `org.apache.camel.spi.OnCamelContextStart`. Use `org.apache.camel.spi.OnCamelContextStarting` instead. - Removed `org.apache.camel.spi.OnCamelContextStop`. Use `org.apache.camel.spi.OnCamelContextStopping` instead. - Decoupled the `org.apache.camel.ExtendedCamelContext` from the `org.apache.camel.CamelContext`. --- Replaced `adapt()` from `org.apache.camel.CamelContext` with `getCamelContextExtension` +- Replaced `adapt()` from `org.apache.camel.CamelContext` with `getCamelContextExtension` - Decoupled the `org.apache.camel.ExtendedExchange` from the `org.apache.camel.Exchange`. --- Replaced `adapt()` from `org.apache.camel.ExtendedExchange` with `getExchangeExtension` +- Replaced `adapt()` from `org.apache.camel.ExtendedExchange` with `getExchangeExtension` - Exchange failure handling status has moved from being a property defined as `ExchangePropertyKey.FAILURE_HANDLED` to a member of the ExtendedExchange, accessible via `isFailureHandled()`method. - +- Removed `Discard` and `DiscardOldest` from `org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy`. == EIP Changes
[GitHub] [camel] davsclaus commented on pull request #9432: CAMEL-19058: fix a type check scability issue for Message types
davsclaus commented on PR #9432: URL: https://github.com/apache/camel/pull/9432#issuecomment-1446995864 Hmm now we create a new object per message (the trait) only for fringe features like JMS external redelivery and dataType (not really much in use). Also mind that PooledExchange has a reset that, see reset method on Message. You likely need to reset the trait or something. -- 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] davsclaus commented on a diff in pull request #9433: CAMEL-19060 + CAMEL-19058: minor improvements
davsclaus commented on code in PR #9433:
URL: https://github.com/apache/camel/pull/9433#discussion_r1119246555
##
core/camel-main/src/main/java/org/apache/camel/main/MainDurationEventNotifier.java:
##
@@ -100,9 +94,12 @@ protected void doNotify(CamelEvent event) throws Exception {
return;
}
+final boolean complete = event.getType() ==
CamelEvent.Type.ExchangeCompleted || event.getType() ==
CamelEvent.Type.ExchangeFailed;
Review Comment:
I wonder if you can optimize this to only compute complete and begin if
maxMessages > 0 and maxIdelSeconds > 0
--
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] davsclaus commented on a diff in pull request #9436: (chores) camel-base-engine: cleanup duplicated code
davsclaus commented on code in PR #9436:
URL: https://github.com/apache/camel/pull/9436#discussion_r1119241272
##
core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java:
##
@@ -813,10 +801,10 @@ public void after(Exchange exchange, UnitOfWork uow)
throws Exception {
UnitOfWorkHelper.doneUow(uow, exchange);
}
-// after UoW is done lets pop the route context which must be done
on every existing UoW
if (route != null && existing != null) {
existing.popRoute();
}
+// after UoW is done lets pop the route context which must be done
on every existing UoW
Review Comment:
this comment better belongs where it was before
--
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_3x updated (a56e08a728b -> 7602c7ccfbc)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_3x in repository https://gitbox.apache.org/repos/asf/camel.git omit a56e08a728b Regen for commit 77b20eab35b77a6b6afb34076978ee721dd7a2a1 add 7602c7ccfbc Regen for commit 77b20eab35b77a6b6afb34076978ee721dd7a2a1 (#9440) 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 (a56e08a728b) \ N -- N -- N refs/heads/regen_bot_3x (7602c7ccfbc) 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:
[camel] branch main updated: Regen for commit 396b7b69bb707e2bcd9010b18b6c78ed5144f77f (#9442)
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 3ea27fdcbd0 Regen for commit 396b7b69bb707e2bcd9010b18b6c78ed5144f77f (#9442) 3ea27fdcbd0 is described below commit 3ea27fdcbd08ee3e9d39386de732067e5adcb369 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Mon Feb 27 20:51:10 2023 +0100 Regen for commit 396b7b69bb707e2bcd9010b18b6c78ed5144f77f (#9442) Signed-off-by: GitHub Co-authored-by: davsclaus
[GitHub] [camel] davsclaus merged pull request #9442: Generated sources regen
davsclaus merged PR #9442: URL: https://github.com/apache/camel/pull/9442 -- 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 (c8ade4f4edd -> 8c9d52531e6)
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 c8ade4f4edd Regen for commit 4a3fe6aa91e001a2522fa02ade00e9c2905d3fc3 add e4abec465be Regen for commit b3a2978c915f1bd3a28b4c3e4ed0901ab45e60df (#9439) add 396b7b69bb7 Removed not in use code add 8c9d52531e6 Regen for commit 396b7b69bb707e2bcd9010b18b6c78ed5144f77f 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 (c8ade4f4edd) \ N -- N -- N refs/heads/regen_bot (8c9d52531e6) 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/support/ExchangeHelper.java | 1 - 1 file changed, 1 deletion(-)
[GitHub] [camel] github-actions[bot] opened a new pull request, #9442: Generated sources regen
github-actions[bot] opened a new pull request, #9442: URL: https://github.com/apache/camel/pull/9442 Regen bot :robot: found some uncommitted changes after running build on :camel: `main` branch. 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] orpiske merged pull request #9437: (chores) camel-base-engine: delay checking if the exchange failed
orpiske merged PR #9437: URL: https://github.com/apache/camel/pull/9437 -- 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 (504c1c2205f -> c74d9e04e9f)
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 504c1c2205f Regen for commit 4a3fe6aa91e001a2522fa02ade00e9c2905d3fc3 (#9441) add c74d9e04e9f (chores) camel-main: use log markers for a warning message No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/camel/main/MainDurationEventNotifier.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[GitHub] [camel] orpiske merged pull request #9435: (chores) camel-main: use log markers for a warning message
orpiske merged PR #9435: URL: https://github.com/apache/camel/pull/9435 -- 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: (chores) camel-base-engine: delay checking if the exchange failed
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 9d6b5e6b434 (chores) camel-base-engine: delay checking if the exchange
failed
9d6b5e6b434 is described below
commit 9d6b5e6b43483a9f2c6d95ed735b013850baec6e
Author: Otavio Rodolfo Piske
AuthorDate: Thu Feb 23 09:52:56 2023 +0100
(chores) camel-base-engine: delay checking if the exchange failed
---
.../src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
index 2d88b105264..58e4415b21f 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
@@ -217,8 +217,6 @@ public class DefaultUnitOfWork implements UnitOfWork {
log.trace("UnitOfWork done for ExchangeId: {} with {}",
exchange.getExchangeId(), exchange);
}
-boolean failed = exchange.isFailed();
-
// at first done the synchronizations
UnitOfWorkHelper.doneSynchronizations(exchange, synchronizations, log);
@@ -228,6 +226,7 @@ public class DefaultUnitOfWork implements UnitOfWork {
if
(context.getCamelContextExtension().isEventNotificationApplicable()) {
// then fire event to signal the exchange is done
try {
+final boolean failed = exchange.isFailed();
if (failed) {
EventHelper.notifyExchangeFailed(exchange.getContext(),
exchange);
} else {
[GitHub] [camel-kafka-connector] glew02 opened a new issue, #1513: NoSuchMethodError: org.apache.camel.util.StringHelper.replaceAll
glew02 opened a new issue, #1513: URL: https://github.com/apache/camel-kafka-connector/issues/1513 Hi, To get this error, I was using the 3.18.2 CAMEL-HTTPS-KAFKA-CONNECTOR SINK. I'm getting this error: ``` java.lang.NoSuchMethodError: 'java.lang.String org.apache.camel.util.StringHelper.replaceAll(java.lang.String, java.lang.String, java.lang.String)' at org.apache.camel.impl.DefaultCamelContext.doDumpRoutes(DefaultCamelContext.java:156) at org.apache.camel.impl.engine.AbstractCamelContext.doStartCamel(AbstractCamelContext.java:3293) at org.apache.camel.impl.engine.AbstractCamelContext.doStartContext(AbstractCamelContext.java:2951) at org.apache.camel.impl.engine.AbstractCamelContext.doStart(AbstractCamelContext.java:2902) at org.apache.camel.support.service.BaseService.start(BaseService.java:119) at org.apache.camel.impl.engine.AbstractCamelContext.start(AbstractCamelContext.java:2586) at org.apache.camel.impl.DefaultCamelContext.start(DefaultCamelContext.java:247) at org.apache.camel.main.SimpleMain.doStart(SimpleMain.java:43) at org.apache.camel.support.service.BaseService.start(BaseService.java:119) at org.apache.camel.kafkaconnector.CamelSinkTask.start(CamelSinkTask.java:152) at org.apache.kafka.connect.runtime.WorkerSinkTask.initializeAndStart(WorkerSinkTask.java:312) at org.apache.kafka.connect.runtime.WorkerTask.doRun(WorkerTask.java:186) at org.apache.kafka.connect.runtime.WorkerTask.run(WorkerTask.java:243) 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) ``` Looking at the camel-util-**3.18.2**.jar: https://jar-download.com/artifacts/org.apache.camel/camel-util/3.18.2/source-code/org/apache/camel/util/StringHelper.java The code in the StringHelper class no longer has the method replaceAll. Looking at the camel-util-**3.14.2**.jar: https://jar-download.com/artifacts/org.apache.camel/camel-util/3.14.0/source-code/org/apache/camel/util/StringHelper.java The code in the StringHelper class has this method. So the issue seems to be that the StringHelper.replaceAll method was removed from the latest package for being obsolete (since you guys want to use String.replace). But not all the calls to the method were removed. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: Regen for commit 4a3fe6aa91e001a2522fa02ade00e9c2905d3fc3 (#9441)
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 504c1c2205f Regen for commit 4a3fe6aa91e001a2522fa02ade00e9c2905d3fc3 (#9441) 504c1c2205f is described below commit 504c1c2205f63e9d7f0ee2bf8b97bc8c0d774b81 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Mon Feb 27 20:34:49 2023 +0100 Regen for commit 4a3fe6aa91e001a2522fa02ade00e9c2905d3fc3 (#9441) Signed-off-by: GitHub Co-authored-by: davsclaus --- .../src/main/java/org/apache/camel/impl/DefaultCamelContext.java| 2 -- .../src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java | 1 - .../src/main/java/org/apache/camel/model/ModelCamelContext.java | 2 -- .../java/org/apache/camel/main/MainSupervisingRouteControllerTest.java | 1 - 4 files changed, 6 deletions(-) diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java index b871278c21b..05d4f790825 100644 --- a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java +++ b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java @@ -36,8 +36,6 @@ import org.apache.camel.RouteTemplateContext; import org.apache.camel.StartupStep; import org.apache.camel.ValueHolder; import org.apache.camel.api.management.JmxSystemPropertyKeys; -import org.apache.camel.builder.AdviceWith; -import org.apache.camel.builder.AdviceWithRouteBuilder; import org.apache.camel.impl.engine.DefaultExecutorServiceManager; import org.apache.camel.impl.engine.RouteService; import org.apache.camel.impl.engine.SimpleCamelContext; diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java index 17d8ee7e391..d6604ca937b 100644 --- a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java +++ b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java @@ -49,7 +49,6 @@ import org.apache.camel.StartupListener; import org.apache.camel.StartupSummaryLevel; import org.apache.camel.TypeConverter; import org.apache.camel.ValueHolder; -import org.apache.camel.builder.AdviceWithRouteBuilder; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.model.DataFormatDefinition; import org.apache.camel.model.FaultToleranceConfigurationDefinition; diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/ModelCamelContext.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ModelCamelContext.java index 39e3c23f69d..a109a1122c6 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/ModelCamelContext.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/ModelCamelContext.java @@ -21,8 +21,6 @@ import java.util.List; import org.apache.camel.CamelContext; import org.apache.camel.Expression; import org.apache.camel.Predicate; -import org.apache.camel.builder.AdviceWithRouteBuilder; -import org.apache.camel.builder.RouteBuilder; import org.apache.camel.model.language.ExpressionDefinition; import org.apache.camel.model.transformer.TransformerDefinition; import org.apache.camel.model.validator.ValidatorDefinition; diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainSupervisingRouteControllerTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainSupervisingRouteControllerTest.java index 7e924059278..956a002d25b 100644 --- a/core/camel-main/src/test/java/org/apache/camel/main/MainSupervisingRouteControllerTest.java +++ b/core/camel-main/src/test/java/org/apache/camel/main/MainSupervisingRouteControllerTest.java @@ -21,7 +21,6 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.Consumer; import org.apache.camel.Endpoint; -import org.apache.camel.LoggingLevel; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint;
[GitHub] [camel] davsclaus merged pull request #9441: Generated sources regen
davsclaus merged PR #9441: URL: https://github.com/apache/camel/pull/9441 -- 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] glew02 closed issue #1509: camel https sink connector 3.18.2 NoSuchMethodError
glew02 closed issue #1509: camel https sink connector 3.18.2 NoSuchMethodError URL: https://github.com/apache/camel-kafka-connector/issues/1509 -- 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] glew02 commented on issue #1509: camel https sink connector 3.18.2 NoSuchMethodError
glew02 commented on issue #1509: URL: https://github.com/apache/camel-kafka-connector/issues/1509#issuecomment-1446938132 I was running two older versions of other camel connectors. That probably caused a java path issue for which jar to use. I no longer get the error when setting the camel-util to 3.18.2 for the other two older camel connectors. -- 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 (0cd32cb85c9 -> c8ade4f4edd)
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 0cd32cb85c9 Regen for commit b3a2978c915f1bd3a28b4c3e4ed0901ab45e60df add ef1a560b762 Regen for commit 23542fc5b65f33cde0f74f71876fe80d8c8c853f add fc8dcb7d99d CAMEL-19090: Remove deprecated apis in core add 4a3fe6aa91e CAMEL-19090: Remove deprecated apis in core add c8ade4f4edd Regen for commit 4a3fe6aa91e001a2522fa02ade00e9c2905d3fc3 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 (0cd32cb85c9) \ N -- N -- N refs/heads/regen_bot (c8ade4f4edd) 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: .../main/camel-main-configuration-metadata.json| 1 - .../org/apache/camel/impl/DefaultCamelContext.java | 7 -- .../camel/impl/lw/LightweightCamelContext.java | 6 - .../org/apache/camel/model/ModelCamelContext.java | 11 - .../MainConfigurationPropertiesConfigurer.java | 6 - .../camel-main-configuration-metadata.json | 1 - core/camel-main/src/main/docs/main.adoc| 3 +-- .../camel/main/DefaultConfigurationConfigurer.java | 3 --- .../camel/main/DefaultConfigurationProperties.java | 26 -- .../main/MainSupervisingRouteControllerTest.java | 3 +-- 10 files changed, 2 insertions(+), 65 deletions(-)
[GitHub] [camel] github-actions[bot] opened a new pull request, #9441: Generated sources regen
github-actions[bot] opened a new pull request, #9441: URL: https://github.com/apache/camel/pull/9441 Regen bot :robot: found some uncommitted changes after running build on :camel: `main` branch. 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 camel-3.x updated: Regen for commit 77b20eab35b77a6b6afb34076978ee721dd7a2a1 (#9440)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-3.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-3.x by this push: new 7602c7ccfbc Regen for commit 77b20eab35b77a6b6afb34076978ee721dd7a2a1 (#9440) 7602c7ccfbc is described below commit 7602c7ccfbc4e625d734cf5fd99bd0ed687b0e32 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Mon Feb 27 20:05:32 2023 +0100 Regen for commit 77b20eab35b77a6b6afb34076978ee721dd7a2a1 (#9440) Signed-off-by: GitHub Co-authored-by: davsclaus --- .../resources/org/apache/camel/catalog/schemas/camel-spring.xsd | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 5913bea9e8b..dc08089cb10 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 @@ -20897,8 +20897,9 @@ with XML payloads. Default value: false
[camel] branch main updated: Removed not in use code
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 396b7b69bb7 Removed not in use code
396b7b69bb7 is described below
commit 396b7b69bb707e2bcd9010b18b6c78ed5144f77f
Author: Claus Ibsen
AuthorDate: Mon Feb 27 20:06:07 2023 +0100
Removed not in use code
---
.../src/main/java/org/apache/camel/support/ExchangeHelper.java | 1 -
1 file changed, 1 deletion(-)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java
b/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java
index bcde55c69e1..8906d58e5fa 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java
@@ -575,7 +575,6 @@ public final class ExchangeHelper {
*/
public static boolean isFailureHandled(Exchange exchange) {
return exchange.getExchangeExtension().isFailureHandled();
-//return
exchange.getProperty(ExchangePropertyKey.FAILURE_HANDLED, false, Boolean.class);
}
/**
[camel] branch main updated: Regen for commit b3a2978c915f1bd3a28b4c3e4ed0901ab45e60df (#9439)
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 e4abec465be Regen for commit b3a2978c915f1bd3a28b4c3e4ed0901ab45e60df (#9439) e4abec465be is described below commit e4abec465be90ef8f2f041a893c2608b7e7e6ee4 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Mon Feb 27 20:05:21 2023 +0100 Regen for commit b3a2978c915f1bd3a28b4c3e4ed0901ab45e60df (#9439) Signed-off-by: GitHub Co-authored-by: davsclaus
[GitHub] [camel] davsclaus merged pull request #9439: Generated sources regen
davsclaus merged PR #9439: URL: https://github.com/apache/camel/pull/9439 -- 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] davsclaus merged pull request #9440: Generated sources regen (Camel 3)
davsclaus merged PR #9440: URL: https://github.com/apache/camel/pull/9440 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-spring-boot] branch main updated: CAMEL-19090: Remove deprecated apis in core
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-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new a9a27f4d5a9 CAMEL-19090: Remove deprecated apis in core
a9a27f4d5a9 is described below
commit a9a27f4d5a9503fa198d5bdd0b426f90ee7d74ba
Author: Claus Ibsen
AuthorDate: Mon Feb 27 20:05:05 2023 +0100
CAMEL-19090: Remove deprecated apis in core
---
core/camel-spring-boot/src/main/docs/spring-boot.json | 8
.../apache/camel/spring/boot/CamelConfigurationProperties.java| 7 ---
.../org/apache/camel/spring/boot/ThreadPoolConfigurationTest.java | 6 +++---
tooling/camel-spring-boot-dependencies/pom.xml| 5 -
4 files changed, 3 insertions(+), 23 deletions(-)
diff --git a/core/camel-spring-boot/src/main/docs/spring-boot.json
b/core/camel-spring-boot/src/main/docs/spring-boot.json
index f4c62426739..cd558d83b47 100644
--- a/core/camel-spring-boot/src/main/docs/spring-boot.json
+++ b/core/camel-spring-boot/src/main/docs/spring-boot.json
@@ -1631,14 +1631,6 @@
"type": "java.lang.Boolean",
"description": "Whether to enable Camel info.",
"defaultValue": true
-},
-{
- "name": "camel.springboot.route-controller-logging-level",
- "type": "org.apache.camel.LoggingLevel",
- "description": "Sets the logging level used for logging route activity
(such as starting and stopping routes). The default logging level is DEBUG.",
- "sourceType":
"org.apache.camel.spring.boot.CamelConfigurationProperties",
- "deprecated": true,
- "deprecation": {}
}
],
"hints": []
diff --git
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
index b53dd8e952d..7ea9a359e08 100644
---
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
+++
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
@@ -740,13 +740,6 @@ public class CamelConfigurationProperties extends
DefaultConfigurationProperties
*/
private String javaRoutesExcludePattern;
-/**
- * Sets the logging level used for logging route activity (such as
starting and stopping routes). The default
- * logging level is DEBUG.
- */
-@Deprecated
-private LoggingLevel routeControllerLoggingLevel;
-
/**
* To enable using supervising route controller which allows Camel to
startup
* and then the controller takes care of starting the routes in a safe
manner.
diff --git
a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/ThreadPoolConfigurationTest.java
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/ThreadPoolConfigurationTest.java
index 1dd1bd00c7d..cc5c989bcb6 100644
---
a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/ThreadPoolConfigurationTest.java
+++
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/ThreadPoolConfigurationTest.java
@@ -42,7 +42,7 @@ import
org.apache.camel.test.spring.junit5.CamelSpringBootTest;
"camel.threadpool.pool-size = 5",
"camel.threadpool.max-pool-size = 10",
"camel.threadpool.max-queue-size = 20",
-"camel.threadpool.rejected-policy = DiscardOldest",
+"camel.threadpool.rejected-policy = CallerRuns",
"camel.threadpool.config[smallPool].pool-size = 2",
"camel.threadpool.config[smallPool].rejected-policy = Abort",
"camel.threadpool.config[bigPool].pool-size = 20",
@@ -62,7 +62,7 @@ public class ThreadPoolConfigurationTest {
Assertions.assertEquals(5, dpp.getPoolSize().intValue());
Assertions.assertEquals(10, dpp.getMaxPoolSize().intValue());
Assertions.assertEquals(20, dpp.getMaxQueueSize().intValue());
-Assertions.assertEquals(ThreadPoolRejectedPolicy.DiscardOldest,
dpp.getRejectedPolicy());
+Assertions.assertEquals(ThreadPoolRejectedPolicy.CallerRuns,
dpp.getRejectedPolicy());
ThreadPoolProfile sp =
context.getExecutorServiceManager().getThreadPoolProfile("smallPool");
Assertions.assertNotNull(sp);
@@ -78,7 +78,7 @@ public class ThreadPoolConfigurationTest {
Assertions.assertEquals(20, bp.getPoolSize().intValue());
Assertions.assertEquals(50, bp.getMaxPoolSize().intValue());
Assertions.assertEquals(500, bp.getMaxQueueSize().intValue());
-Assertions.assertEquals(ThreadPoolRejectedPolicy.DiscardOldest,
bp.getRejectedPolicy());
+Assertions.assertEquals(ThreadPoolRejectedPolicy.CallerRuns,
bp.getRejectedPolicy());
}
// *
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
[GitHub] [camel] github-actions[bot] opened a new pull request, #9440: Generated sources regen (Camel 3)
github-actions[bot] opened a new pull request, #9440: URL: https://github.com/apache/camel/pull/9440 Regen bot :robot: found some uncommitted changes after running build on :camel: `camel-3` branch. 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_3x updated (5aa066ccf9c -> a56e08a728b)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_3x in repository https://gitbox.apache.org/repos/asf/camel.git from 5aa066ccf9c Regen for commit 4d03be827c40ebe6c9b6e66dcdecf3f72a1e9f28 add 77b20eab35b CAMEL-19094: Tokenizer ignores includeTokens add a56e08a728b Regen for commit 77b20eab35b77a6b6afb34076978ee721dd7a2a1 No new revisions were added by this update. Summary of changes: .../resources/org/apache/camel/catalog/languages/tokenize.json | 2 +- .../resources/org/apache/camel/catalog/models/tokenize.json | 2 +- .../resources/org/apache/camel/catalog/schemas/camel-spring.xsd | 5 +++-- .../resources/org/apache/camel/language/tokenizer/tokenize.json | 2 +- .../java/org/apache/camel/language/tokenizer/TokenizeLanguage.java | 3 +++ .../resources/org/apache/camel/model/language/tokenize.json | 2 +- .../java/org/apache/camel/model/language/TokenizerExpression.java| 3 ++- 7 files changed, 12 insertions(+), 7 deletions(-)
[camel] branch regen_bot updated (387975589d9 -> 0cd32cb85c9)
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 387975589d9 Regen for commit 23542fc5b65f33cde0f74f71876fe80d8c8c853f add b3a2978c915 CAMEL-19094: Tokenizer ignores includeTokens add 0cd32cb85c9 Regen for commit b3a2978c915f1bd3a28b4c3e4ed0901ab45e60df 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 (387975589d9) \ N -- N -- N refs/heads/regen_bot (0cd32cb85c9) 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: .../resources/org/apache/camel/catalog/languages/tokenize.json | 2 +- .../resources/org/apache/camel/catalog/models/tokenize.json | 2 +- .../resources/org/apache/camel/catalog/schemas/camel-spring.xsd | 5 +++-- .../resources/org/apache/camel/language/tokenizer/tokenize.json | 2 +- .../java/org/apache/camel/language/tokenizer/TokenizeLanguage.java | 3 +++ .../resources/org/apache/camel/model/language/tokenize.json | 2 +- .../java/org/apache/camel/model/language/TokenizerExpression.java| 3 ++- 7 files changed, 12 insertions(+), 7 deletions(-)
[GitHub] [camel] github-actions[bot] opened a new pull request, #9439: Generated sources regen
github-actions[bot] opened a new pull request, #9439: URL: https://github.com/apache/camel/pull/9439 Regen bot :robot: found some uncommitted changes after running build on :camel: `main` branch. 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] 02/02: CAMEL-19090: Remove deprecated apis in core
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 4a3fe6aa91e001a2522fa02ade00e9c2905d3fc3
Author: Claus Ibsen
AuthorDate: Mon Feb 27 19:43:51 2023 +0100
CAMEL-19090: Remove deprecated apis in core
---
.../apache/camel/catalog/main/camel-main-configuration-metadata.json | 1 -
.../resources/org/apache/camel/catalog/schemas/camel-spring.xsd | 5 +++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
index 0aedabb2e68..dac149fe578 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
@@ -78,7 +78,6 @@
{ "name": "camel.main.routeControllerExcludeRoutes", "description":
"Pattern for filtering routes to be excluded as supervised. The pattern is
matching on route id, and endpoint uri for the route. Multiple patterns can be
separated by comma. For example to exclude all JMS routes, you can say jms:.
And to exclude routes with specific route ids
mySpecialRoute,myOtherSpecialRoute. The pattern supports wildcards and uses the
matcher from org.apache.camel.support.PatternHelper#matchPatter [...]
{ "name": "camel.main.routeControllerIncludeRoutes", "description":
"Pattern for filtering routes to be included as supervised. The pattern is
matching on route id, and endpoint uri for the route. Multiple patterns can be
separated by comma. For example to include all kafka routes, you can say
kafka:. And to include routes with specific route ids myRoute,myOtherRoute. The
pattern supports wildcards and uses the matcher from
org.apache.camel.support.PatternHelper#matchPattern.", "sour [...]
{ "name": "camel.main.routeControllerInitialDelay", "description":
"Initial delay in milli seconds before the route controller starts, after
CamelContext has been started.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "integer",
"javaType": "long" },
-{ "name": "camel.main.routeControllerLoggingLevel", "description": "Sets
the logging level used for logging route activity (such as starting and
stopping routes). The default logging level is DEBUG.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "object",
"javaType": "org.apache.camel.LoggingLevel", "defaultValue": "DEBUG", "enum": [
"ERROR", "WARN", "INFO", "DEBUG", "TRACE", "OFF" ], "deprecated": true },
{ "name": "camel.main.routeControllerSuperviseEnabled", "description": "To
enable using supervising route controller which allows Camel to startup and
then the controller takes care of starting the routes in a safe manner. This
can be used when you want to startup Camel despite a route may otherwise fail
fast during startup and cause Camel to fail to startup as well. By delegating
the route startup to the supervising route controller then its manages the
startup using a background th [...]
{ "name": "camel.main.routeControllerThreadPoolSize", "description": "The
number of threads used by the route controller scheduled thread pool that are
used for restarting routes. The pool uses 1 thread by default, but you can
increase this to allow the controller to concurrently attempt to restart
multiple routes in case more than one route has problems starting.",
"sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type":
"integer", "javaType": "int" },
{ "name": "camel.main.routeControllerUnhealthyOnExhausted", "description":
"Whether to mark the route as unhealthy (down) when all restarting attempts
(backoff) have failed and the route is not successfully started and the route
manager is giving up. Setting this to true allows health checks to know about
this and can report the Camel application as DOWN. The default is false.",
"sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type":
"boolean", "javaType": "bool [...]
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 c51f68bd82d..204855e2afb 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
@@ -18317,8 +18317,9 @@ with XML payloads. Default value: false
[camel] branch main updated (ef1a560b762 -> 4a3fe6aa91e)
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 ef1a560b762 Regen for commit 23542fc5b65f33cde0f74f71876fe80d8c8c853f new fc8dcb7d99d CAMEL-19090: Remove deprecated apis in core new 4a3fe6aa91e CAMEL-19090: Remove deprecated apis in core 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: .../main/camel-main-configuration-metadata.json| 1 - .../apache/camel/catalog/schemas/camel-spring.xsd | 5 +++-- .../org/apache/camel/impl/DefaultCamelContext.java | 5 - .../camel/impl/lw/LightweightCamelContext.java | 5 - .../org/apache/camel/model/ModelCamelContext.java | 9 .../MainConfigurationPropertiesConfigurer.java | 6 - .../camel-main-configuration-metadata.json | 1 - core/camel-main/src/main/docs/main.adoc| 3 +-- .../camel/main/DefaultConfigurationConfigurer.java | 3 --- .../camel/main/DefaultConfigurationProperties.java | 26 -- .../main/MainSupervisingRouteControllerTest.java | 2 +- 11 files changed, 5 insertions(+), 61 deletions(-)
[camel] 01/02: CAMEL-19090: Remove deprecated apis in core
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 fc8dcb7d99dc752ce2844f314d935b75586c2873
Author: Claus Ibsen
AuthorDate: Mon Feb 27 19:21:07 2023 +0100
CAMEL-19090: Remove deprecated apis in core
---
.../org/apache/camel/impl/DefaultCamelContext.java | 5 -
.../camel/impl/lw/LightweightCamelContext.java | 5 -
.../org/apache/camel/model/ModelCamelContext.java | 9
.../MainConfigurationPropertiesConfigurer.java | 6 -
.../camel-main-configuration-metadata.json | 1 -
core/camel-main/src/main/docs/main.adoc| 3 +--
.../camel/main/DefaultConfigurationConfigurer.java | 3 ---
.../camel/main/DefaultConfigurationProperties.java | 26 --
.../main/MainSupervisingRouteControllerTest.java | 2 +-
9 files changed, 2 insertions(+), 58 deletions(-)
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index ca5adf8dc4a..b871278c21b 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -996,11 +996,6 @@ public class DefaultCamelContext extends
SimpleCamelContext implements ModelCame
return model.getModelReifierFactory().createPredicate(this,
definition);
}
-@Override
-public RouteDefinition adviceWith(RouteDefinition definition,
AdviceWithRouteBuilder builder) throws Exception {
-return AdviceWith.adviceWith(definition, this, builder);
-}
-
@Override
public void registerValidator(ValidatorDefinition def) {
if (model == null && isLightweight()) {
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java
index a035754b143..17d8ee7e391 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContext.java
@@ -1465,11 +1465,6 @@ public class LightweightCamelContext implements
CamelContext, CatalogCamelContex
return getModelCamelContext().createPredicate(definition);
}
-@Override
-public RouteDefinition adviceWith(RouteDefinition definition,
AdviceWithRouteBuilder builder) throws Exception {
-return getModelCamelContext().adviceWith(definition, builder);
-}
-
@Override
public void registerValidator(ValidatorDefinition validator) {
getModelCamelContext().registerValidator(validator);
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/ModelCamelContext.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/ModelCamelContext.java
index f08736d5699..39e3c23f69d 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/ModelCamelContext.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/ModelCamelContext.java
@@ -52,15 +52,6 @@ public interface ModelCamelContext extends CamelContext,
Model {
*/
Predicate createPredicate(ExpressionDefinition definition);
-/**
- * Advices the route model with the advice with builder and returns the
adviced route model
- *
- * @deprecated use
- * {@link
org.apache.camel.builder.AdviceWith#adviceWith(RouteDefinition, CamelContext,
RouteBuilder)}
- */
-@Deprecated
-RouteDefinition adviceWith(RouteDefinition definition,
AdviceWithRouteBuilder builder) throws Exception;
-
/**
* Registers the route input validator
*/
diff --git
a/core/camel-main/src/generated/java/org/apache/camel/main/MainConfigurationPropertiesConfigurer.java
b/core/camel-main/src/generated/java/org/apache/camel/main/MainConfigurationPropertiesConfigurer.java
index a29498b6ce3..b18dd20177e 100644
---
a/core/camel-main/src/generated/java/org/apache/camel/main/MainConfigurationPropertiesConfigurer.java
+++
b/core/camel-main/src/generated/java/org/apache/camel/main/MainConfigurationPropertiesConfigurer.java
@@ -153,8 +153,6 @@ public class MainConfigurationPropertiesConfigurer extends
org.apache.camel.supp
case "RouteControllerIncludeRoutes":
target.setRouteControllerIncludeRoutes(property(camelContext,
java.lang.String.class, value)); return true;
case "routecontrollerinitialdelay":
case "RouteControllerInitialDelay":
target.setRouteControllerInitialDelay(property(camelContext, long.class,
value)); return true;
-case "routecontrollerlogginglevel":
-case "RouteControllerLoggingLevel":
target.setRouteControllerLoggingLevel(property(camelContext,
[camel] branch main updated: Regen for commit 23542fc5b65f33cde0f74f71876fe80d8c8c853f
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 ef1a560b762 Regen for commit 23542fc5b65f33cde0f74f71876fe80d8c8c853f
ef1a560b762 is described below
commit ef1a560b762cd76c1945aefddf5bd98da2b6c833
Author: orpiske
AuthorDate: Mon Feb 27 18:15:14 2023 +
Regen for commit 23542fc5b65f33cde0f74f71876fe80d8c8c853f
Signed-off-by: GitHub
---
.../src/main/java/org/apache/camel/support/ExchangeHelper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java
b/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java
index 6c6e28fd084..bcde55c69e1 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/ExchangeHelper.java
@@ -575,7 +575,7 @@ public final class ExchangeHelper {
*/
public static boolean isFailureHandled(Exchange exchange) {
return exchange.getExchangeExtension().isFailureHandled();
-//return exchange.getProperty(ExchangePropertyKey.FAILURE_HANDLED,
false, Boolean.class);
+//return
exchange.getProperty(ExchangePropertyKey.FAILURE_HANDLED, false, Boolean.class);
}
/**
[GitHub] [camel] oscerd merged pull request #9438: Generated sources regen
oscerd merged PR #9438: URL: https://github.com/apache/camel/pull/9438 -- 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 (65eee38f909 -> 387975589d9)
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 65eee38f909 Regen for commit 0f25205251d05fb2e12eee1dc95b7ad43fddc350 add 676b282ba90 CAMEL-19091: camel-core - Remove Discard and DiscardOldest from thread pool policy add 56331d32320 CAMEL-19091: camel-core - Remove Discard and DiscardOldest from thread pool policy add c1cd97d1add CAMEL-19091: camel-core - Remove Discard and DiscardOldest from thread pool policy add 421206d2500 CAMEL-19060: move the isFailureHandled logic to a field in the ExchangeExtension to avoid costly operations add 23542fc5b65 CAMEL-19060 (camel-seda): cache queue reference to avoid costly operations in the hot path add 387975589d9 Regen for commit 23542fc5b65f33cde0f74f71876fe80d8c8c853f No new revisions were added by this update. Summary of changes: .../camel/catalog/models/threadPoolProfile.json| 2 +- .../org/apache/camel/catalog/models/threads.json | 2 +- .../apache/camel/component/seda/SedaEndpoint.java | 17 +++-- .../org/apache/camel/spring/xml/threadPool.json| 2 +- .../SpringCamelContextThreadPoolProfilesTest.java | 4 +- .../JmxInstrumentationWithConnectorTest.java | 58 .../rest/SpringFromRestIdAndDescriptionTest.xml| 2 +- .../SpringCamelContextThreadPoolProfilesTest.xml | 2 +- ...ontextThreadPoolProfilesWithPlaceholderTest.xml | 2 +- .../management/jmxInstrumentationWithConnector.xml | 71 --- .../ThreadsExternalThreadPoolFactoryBeanTest.xml | 2 +- .../src/main/java/org/apache/camel/Exchange.java | 1 + .../java/org/apache/camel/ExchangeExtension.java | 4 ++ .../java/org/apache/camel/ExchangePropertyKey.java | 2 - .../org/apache/camel/model/threadPoolProfile.json | 2 +- .../resources/org/apache/camel/model/threads.json | 2 +- .../camel/model/ThreadPoolProfileDefinition.java | 2 +- .../org/apache/camel/model/ThreadsDefinition.java | 2 +- .../camel/processor/OnCompletionProcessor.java | 6 +- .../apache/camel/processor/ThreadsProcessor.java | 5 -- .../ShareUnitOfWorkAggregationStrategy.java| 5 +- .../errorhandler/RedeliveryErrorHandler.java | 2 +- .../xml/AbstractCamelThreadPoolFactoryBean.java| 2 +- .../apache/camel/ThreadPoolRejectedPolicyTest.java | 80 -- .../camel/builder/ThreadPoolBuilderTest.java | 2 +- .../processor/ThreadsRejectedExecutionTest.java| 52 -- .../camel/processor/ThreadsRejectedPolicyTest.java | 6 +- .../org/apache/camel/main/MainThreadPoolTest.java | 12 ++-- .../org/apache/camel/support/AbstractExchange.java | 1 + .../org/apache/camel/support/ExchangeHelper.java | 5 +- .../camel/support/ExtendedExchangeExtension.java | 10 +++ .../RejectableScheduledThreadPoolExecutor.java | 6 +- .../concurrent/RejectableThreadPoolExecutor.java | 6 +- .../util/concurrent/ThreadPoolRejectedPolicy.java | 40 +-- .../ROOT/pages/camel-4-migration-guide.adoc| 2 + .../dsl/yaml/deserializers/ModelDeserializers.java | 4 +- .../generated/resources/schema/camel-yaml-dsl.json | 4 +- .../generated/resources/schema/camelYamlDsl.json | 4 +- 38 files changed, 77 insertions(+), 356 deletions(-) delete mode 100644 components/camel-spring-xml/src/test/java/org/apache/camel/spring/management/JmxInstrumentationWithConnectorTest.java delete mode 100644 components/camel-spring-xml/src/test/resources/org/apache/camel/spring/management/jmxInstrumentationWithConnector.xml
[camel-k] branch dependabot/go_modules/github.com/stretchr/testify-1.8.2 updated (b2a0748aa -> 6eea591e0)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch
dependabot/go_modules/github.com/stretchr/testify-1.8.2
in repository https://gitbox.apache.org/repos/asf/camel-k.git
omit b2a0748aa chore(deps): bump github.com/stretchr/testify from 1.8.1 to
1.8.2
add b135f7809 Releasing Helm Chart 0.13.0
add 0f80823da Release Helm Chart 0.13.0
add 91ec6b465 Next is 1.13.0
add 1961b51cb chore(ci): trigger native only when PR are labeled
add 9c62e6ce3 chore: move native checks as nightly process
add ec04f4b9a chore: matrix strategy
add 0bdf62451 chore: bump to 2.0.0
add 54a7378ea chore: test rearrange
add 9e8876974 chore(test): e2e folder reorganization
add 1c18a476d chore(ci): remove unused actions/wf
add 181855062 chore: remove upgrade action
add 657c9e8d1 chore(doc): explain the new structure
add 6dfa4175b fix: failing checks
add b8559713d fix(e2e): common wf fixes
add 782db9c3b chore: make knative faster
add 4ed20573d chore: knative tests
add aeeb397ff fix: remove local operator installation
add 099b08a24 chore: move kamelet repo test to advanced common
add 8c69ee7d3 fix: split common vs non-common
add d77675718 fix: promote route files
add 2c3941bc3 fix: some flakiness when getting integrations
add 90c831ddb fix: knative script call
add b0f7c9619 chore: move startup and teardown in support folder
add 4bd9833c0 fix: github raw example
add b0821066d chore: debug requires own namespace
add 67dc23a94 chore: rewrite log test
add b1bc1fe88 chore(deps): k8s api to 0.25.6
add 6eea591e0 chore(deps): bump github.com/stretchr/testify from 1.8.1 to
1.8.2
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 (b2a0748aa)
\
N -- N -- N
refs/heads/dependabot/go_modules/github.com/stretchr/testify-1.8.2 (6eea591e0)
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:
.github/actions/e2e-builder/exec-tests.sh | 2 +-
.github/actions/e2e-common/action.yml | 7 +-
.github/actions/e2e-common/exec-tests.sh | 13 +-
.github/actions/e2e-install/exec-tests.sh | 2 +-
.github/actions/e2e-knative/exec-tests.sh | 2 +-
.github/actions/e2e-local/action.yml | 49 ---
.../{e2e-install-native => e2e-native}/action.yml | 6 +-
.../exec-tests.sh | 4 +-
.github/actions/e2e-telemetry/exec-tests.sh| 2 +-
.github/actions/e2e-upgrade/exec-tests.sh | 2 +-
.../actions/kamel-config-cluster-ocp3/action.yml | 233 -
.github/workflows/build.yml| 2 +-
.github/workflows/builder.yml | 2 +-
.github/workflows/common.yml | 28 +-
.github/workflows/install.yml | 26 +-
.github/workflows/knative.yml | 8 +-
.github/workflows/native.yml | 30 +-
...c-updates.yml => nightly-automatic-updates.yml} | 14 +-
.../{local.yml => nightly-native-test.yml} | 62 ++--
.../workflows/{release.yml => nightly-release.yml} | 8 +-
.github/workflows/openshift.yml| 129 ---
.github/workflows/upgrade.yml | 93 -
.github/workflows/verify-generate.yml | 68
config/manager/operator-deployment.yaml| 6 +-
.../bases/camel-k.clusterserviceversion.yaml | 10 +-
config/manifests/kustomization.yaml| 2 +-
docs/charts/camel-k-0.13.0.tgz | Bin 0 -> 158006 bytes
docs/charts/index.yaml | 87 +++--
docs/modules/ROOT/pages/contributing/e2e.adoc | 28 +-
e2e/README.md | 48 +++
e2e/{global => }/builder/build_test.go | 0
e2e/{global => }/builder/files/groovy.groovy | 0
e2e/{global => }/builder/registry_test.go | 0
e2e/common/cli/bind_test.go| 65
.../cli/config_test.go}| 49 +--
.../common/cli/default.go | 12 +-
e2e/common/cli/delete_test.go | 79 +
e2e/common/cli/describe_test.go| 84 +
e2e/common/cli/dev_mode_test.go| 221
[GitHub] [camel] github-actions[bot] opened a new pull request, #9438: Generated sources regen
github-actions[bot] opened a new pull request, #9438: URL: https://github.com/apache/camel/pull/9438 Regen bot :robot: found some uncommitted changes after running build on :camel: `main` branch. 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 camel-3.x updated: CAMEL-19094: Tokenizer ignores includeTokens
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.x by this push:
new 77b20eab35b CAMEL-19094: Tokenizer ignores includeTokens
77b20eab35b is described below
commit 77b20eab35b77a6b6afb34076978ee721dd7a2a1
Author: Claus Ibsen
AuthorDate: Mon Feb 27 19:08:21 2023 +0100
CAMEL-19094: Tokenizer ignores includeTokens
---
.../resources/org/apache/camel/catalog/languages/tokenize.json | 2 +-
.../generated/resources/org/apache/camel/catalog/models/tokenize.json | 2 +-
.../resources/org/apache/camel/language/tokenizer/tokenize.json| 2 +-
.../java/org/apache/camel/language/tokenizer/TokenizeLanguage.java | 3 +++
.../generated/resources/org/apache/camel/model/language/tokenize.json | 2 +-
.../main/java/org/apache/camel/model/language/TokenizerExpression.java | 3 ++-
6 files changed, 9 insertions(+), 5 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/tokenize.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/tokenize.json
index 7a75b31f01f..88c34d842e5 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/tokenize.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/tokenize.json
@@ -21,7 +21,7 @@
"inheritNamespaceTagName": { "kind": "attribute", "displayName": "Inherit
Namespace Tag Name", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "To inherit namespaces from a root\/parent tag
name when using XML You can use simple language as the tag name to support
dynamic names." },
"regex": { "kind": "attribute", "displayName": "Regex", "label":
"advanced", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "If the token is a regular expression
pattern. The default value is false" },
"xml": { "kind": "attribute", "displayName": "Xml", "required": false,
"type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Whether the input is XML messages. This option must be set to true if working
with XML payloads." },
-"includeTokens": { "kind": "attribute", "displayName": "Include Tokens",
"required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "Whether to include the tokens in the parts when using
pairs The default value is false" },
+"includeTokens": { "kind": "attribute", "displayName": "Include Tokens",
"required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "Whether to include the tokens in the parts when using
pairs. When including tokens then the endToken property must also be configured
(to use pair mode). The default value is false" },
"group": { "kind": "attribute", "displayName": "Group", "label":
"advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "To group N parts together, for example to split big files into
chunks of 1000 lines. You can use simple language as the group to support
dynamic group sizes." },
"groupDelimiter": { "kind": "attribute", "displayName": "Group Delimiter",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the delimiter to use when grouping. If this has not been
set then token will be used as the delimiter." },
"skipFirst": { "kind": "attribute", "displayName": "Skip First", "label":
"advanced", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "To skip the very first element" },
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/tokenize.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/tokenize.json
index 4c8379a9151..72cad0509c2 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/tokenize.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/tokenize.json
@@ -18,7 +18,7 @@
"inheritNamespaceTagName": { "kind": "attribute", "displayName": "Inherit
Namespace Tag Name", "label": "advanced", "required":
[camel] branch main updated: CAMEL-19094: Tokenizer ignores includeTokens
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 b3a2978c915 CAMEL-19094: Tokenizer ignores includeTokens
b3a2978c915 is described below
commit b3a2978c915f1bd3a28b4c3e4ed0901ab45e60df
Author: Claus Ibsen
AuthorDate: Mon Feb 27 19:08:21 2023 +0100
CAMEL-19094: Tokenizer ignores includeTokens
---
.../resources/org/apache/camel/catalog/languages/tokenize.json | 2 +-
.../generated/resources/org/apache/camel/catalog/models/tokenize.json | 2 +-
.../resources/org/apache/camel/language/tokenizer/tokenize.json| 2 +-
.../java/org/apache/camel/language/tokenizer/TokenizeLanguage.java | 3 +++
.../generated/resources/org/apache/camel/model/language/tokenize.json | 2 +-
.../main/java/org/apache/camel/model/language/TokenizerExpression.java | 3 ++-
6 files changed, 9 insertions(+), 5 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/tokenize.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/tokenize.json
index 129a79f3f1e..4ca0c11aad4 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/tokenize.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/tokenize.json
@@ -21,7 +21,7 @@
"inheritNamespaceTagName": { "kind": "attribute", "displayName": "Inherit
Namespace Tag Name", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "To inherit namespaces from a root\/parent tag
name when using XML You can use simple language as the tag name to support
dynamic names." },
"regex": { "kind": "attribute", "displayName": "Regex", "label":
"advanced", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "If the token is a regular expression
pattern. The default value is false" },
"xml": { "kind": "attribute", "displayName": "Xml", "required": false,
"type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Whether the input is XML messages. This option must be set to true if working
with XML payloads." },
-"includeTokens": { "kind": "attribute", "displayName": "Include Tokens",
"required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "Whether to include the tokens in the parts when using
pairs The default value is false" },
+"includeTokens": { "kind": "attribute", "displayName": "Include Tokens",
"required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "Whether to include the tokens in the parts when using
pairs. When including tokens then the endToken property must also be configured
(to use pair mode). The default value is false" },
"group": { "kind": "attribute", "displayName": "Group", "label":
"advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "To group N parts together, for example to split big files into
chunks of 1000 lines. You can use simple language as the group to support
dynamic group sizes." },
"groupDelimiter": { "kind": "attribute", "displayName": "Group Delimiter",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the delimiter to use when grouping. If this has not been
set then token will be used as the delimiter." },
"skipFirst": { "kind": "attribute", "displayName": "Skip First", "label":
"advanced", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "To skip the very first element" },
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/tokenize.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/tokenize.json
index 4c8379a9151..72cad0509c2 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/tokenize.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/tokenize.json
@@ -18,7 +18,7 @@
"inheritNamespaceTagName": { "kind": "attribute", "displayName": "Inherit
Namespace Tag Name", "label": "advanced", "required": false,
[GitHub] [camel] github-actions[bot] commented on pull request #9437: (chores) camel-base-engine: delay checking if the exchange failed
github-actions[bot] commented on PR #9437: URL: https://github.com/apache/camel/pull/9437#issuecomment-1446808492 :no_entry_sign: There are (likely) no components to be tested in this PR -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] squakez merged pull request #4077: chore(deps): k8s api to 0.25.6
squakez merged PR #4077: URL: https://github.com/apache/camel-k/pull/4077 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] branch main updated (67dc23a94 -> b1bc1fe88)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git from 67dc23a94 chore: rewrite log test add b1bc1fe88 chore(deps): k8s api to 0.25.6 No new revisions were added by this update. Summary of changes: go.mod| 14 +++--- go.sum| 30 +++--- pkg/apis/camel/go.mod | 10 +- pkg/apis/camel/go.sum | 22 -- pkg/client/camel/go.mod | 16 pkg/client/camel/go.sum | 30 +++--- pkg/kamelet/repository/go.mod | 16 pkg/kamelet/repository/go.sum | 34 ++ script/Makefile | 2 +- script/get_catalog.sh | 1 + 10 files changed, 90 insertions(+), 85 deletions(-)
[GitHub] [camel] github-actions[bot] commented on pull request #9436: (chores) camel-base-engine: cleanup duplicated code
github-actions[bot] commented on PR #9436: URL: https://github.com/apache/camel/pull/9436#issuecomment-1446800964 :no_entry_sign: There are (likely) no components to be tested in this PR -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #9435: (chores) camel-main: use log markers for a warning message
github-actions[bot] commented on PR #9435: URL: https://github.com/apache/camel/pull/9435#issuecomment-1446774958 :no_entry_sign: There are (likely) no components to be tested in this PR -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #9426: (perf chores) camel-seda: cache queue reference to avoid costly operations in the hot path
github-actions[bot] commented on PR #9426: URL: https://github.com/apache/camel/pull/9426#issuecomment-1446755007 ### Components tested: | Total | Tested | Failed :x: | Passed :white_check_mark: | | --- | --- | --- | --- | | 5 | 5 | 1 | 5 | -- 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-19060 (camel-seda): cache queue reference to avoid costly operations in the hot path
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 23542fc5b65 CAMEL-19060 (camel-seda): cache queue reference to avoid
costly operations in the hot path
23542fc5b65 is described below
commit 23542fc5b65f33cde0f74f71876fe80d8c8c853f
Author: Otavio Rodolfo Piske
AuthorDate: Thu Feb 9 17:49:52 2023 +0100
CAMEL-19060 (camel-seda): cache queue reference to avoid costly operations
in the hot path
---
.../org/apache/camel/component/seda/SedaEndpoint.java | 17 +
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git
a/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
b/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
index a69cbf3ac2e..296e67c0071 100644
---
a/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
+++
b/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
@@ -100,6 +100,7 @@ public class SedaEndpoint extends DefaultEndpoint
implements AsyncEndpoint, Brow
private boolean discardIfNoConsumers;
private BlockingQueueFactory queueFactory;
+private volatile QueueReference ref;
public SedaEndpoint() {
queueFactory = new LinkedBlockingQueueFactory<>();
@@ -207,14 +208,22 @@ public class SedaEndpoint extends DefaultEndpoint
implements AsyncEndpoint, Brow
}
}
+@Override
+public void start() {
+super.start();
+
+final String key = getComponent().getQueueKey(getEndpointUri());
+if (ref == null) {
+ref = getComponent().getQueueReference(key);
+}
+}
+
/**
- * Get's the {@link QueueReference} for the this endpoint.
+ * Gets the {@link QueueReference} for this endpoint.
*
* @return the reference, or null if no queue reference exists.
*/
-public synchronized QueueReference getQueueReference() {
-String key = getComponent().getQueueKey(getEndpointUri());
-QueueReference ref = getComponent().getQueueReference(key);
+public QueueReference getQueueReference() {
return ref;
}
[GitHub] [camel] orpiske merged pull request #9426: (perf chores) camel-seda: cache queue reference to avoid costly operations in the hot path
orpiske merged PR #9426: URL: https://github.com/apache/camel/pull/9426 -- 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-19060: move the isFailureHandled logic to a field in the ExchangeExtension to avoid costly operations
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 421206d2500 CAMEL-19060: move the isFailureHandled logic to a field in
the ExchangeExtension to avoid costly operations
421206d2500 is described below
commit 421206d2500c06807b7791ff894827bf1863393c
Author: Otavio Rodolfo Piske
AuthorDate: Thu Feb 9 17:55:26 2023 +0100
CAMEL-19060: move the isFailureHandled logic to a field in the
ExchangeExtension to avoid costly operations
---
core/camel-api/src/main/java/org/apache/camel/Exchange.java| 1 +
.../src/main/java/org/apache/camel/ExchangeExtension.java | 4
.../src/main/java/org/apache/camel/ExchangePropertyKey.java| 2 --
.../java/org/apache/camel/processor/OnCompletionProcessor.java | 6 +++---
.../aggregate/ShareUnitOfWorkAggregationStrategy.java | 5 +
.../camel/processor/errorhandler/RedeliveryErrorHandler.java | 2 +-
.../main/java/org/apache/camel/support/AbstractExchange.java | 1 +
.../src/main/java/org/apache/camel/support/ExchangeHelper.java | 5 +++--
.../org/apache/camel/support/ExtendedExchangeExtension.java| 10 ++
.../modules/ROOT/pages/camel-4-migration-guide.adoc| 2 ++
10 files changed, 26 insertions(+), 12 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 782f50749e8..2f69e1adc25 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
@@ -123,6 +123,7 @@ public interface Exchange {
@Deprecated
String EXTERNAL_REDELIVERED = "CamelExternalRedelivered";
+@Deprecated
String FAILURE_HANDLED = "CamelFailureHandled";
String FAILURE_ENDPOINT = "CamelFailureEndpoint";
String FAILURE_ROUTE_ID = "CamelFailureRouteId";
diff --git
a/core/camel-api/src/main/java/org/apache/camel/ExchangeExtension.java
b/core/camel-api/src/main/java/org/apache/camel/ExchangeExtension.java
index 9443b435b37..9ce5fa7a014 100644
--- a/core/camel-api/src/main/java/org/apache/camel/ExchangeExtension.java
+++ b/core/camel-api/src/main/java/org/apache/camel/ExchangeExtension.java
@@ -240,4 +240,8 @@ public interface ExchangeExtension {
* This is only used when pooled exchange is enabled for optimization and
reducing object allocations.
*/
void setDefaultConsumerCallback(AsyncCallback callback);
+
+boolean isFailureHandled();
+
+void setFailureHandled(boolean failureHandled);
}
diff --git
a/core/camel-api/src/main/java/org/apache/camel/ExchangePropertyKey.java
b/core/camel-api/src/main/java/org/apache/camel/ExchangePropertyKey.java
index f254840d4f2..58b7ca6c215 100644
--- a/core/camel-api/src/main/java/org/apache/camel/ExchangePropertyKey.java
+++ b/core/camel-api/src/main/java/org/apache/camel/ExchangePropertyKey.java
@@ -137,8 +137,6 @@ public enum ExchangePropertyKey {
return EXCEPTION_HANDLED;
case Exchange.FAILURE_ENDPOINT:
return FAILURE_ENDPOINT;
-case Exchange.FAILURE_HANDLED:
-return FAILURE_HANDLED;
case Exchange.FAILURE_ROUTE_ID:
return FAILURE_ROUTE_ID;
case Exchange.FATAL_FALLBACK_ERROR_HANDLER:
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
index b4b2cf3265c..fbd69fd9dc5 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
@@ -167,7 +167,7 @@ public class OnCompletionProcessor extends
AsyncProcessorSupport implements Trac
// but keep the caused exception stored as a property
(Exchange.EXCEPTION_CAUGHT) on the exchange
boolean stop = exchange.isRouteStop();
exchange.setRouteStop(false);
-Object failureHandled =
exchange.removeProperty(ExchangePropertyKey.FAILURE_HANDLED);
+boolean failureHandled =
exchange.getExchangeExtension().isFailureHandled();
Boolean errorhandlerHandled =
exchange.getExchangeExtension().getErrorHandlerHandled();
exchange.getExchangeExtension().setErrorHandlerHandled(null);
boolean rollbackOnly = exchange.isRollbackOnly();
@@ -190,8 +190,8 @@ public class OnCompletionProcessor extends
AsyncProcessorSupport implements Trac
} finally {
// restore the options
exchange.setRouteStop(stop);
-if (failureHandled != null) {
-exchange.setProperty(ExchangePropertyKey.FAILURE_HANDLED,
failureHandled);
+if
[GitHub] [camel] orpiske merged pull request #9429: CAMEL-19060: move the isFailureHandled logic to a field in the ExchangeExtension to avoid costly operations
orpiske merged PR #9429: URL: https://github.com/apache/camel/pull/9429 -- 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] 13/19: fix: promote route files
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit d776757186933c7a7e90571ecb5bae9dc7214d6b
Author: Pasquale Congiusti
AuthorDate: Thu Feb 23 15:07:11 2023 +0100
fix: promote route files
---
.../cli => commonwithcustominstall}/files/promote-route-edited.groovy | 0
e2e/{common/cli => commonwithcustominstall}/files/promote-route.groovy | 0
.../cli => commonwithcustominstall}/files/timer-kamelet-usage.groovy| 0
e2e/knative/kamelet_test.go | 2 +-
4 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/e2e/common/cli/files/promote-route-edited.groovy
b/e2e/commonwithcustominstall/files/promote-route-edited.groovy
similarity index 100%
rename from e2e/common/cli/files/promote-route-edited.groovy
rename to e2e/commonwithcustominstall/files/promote-route-edited.groovy
diff --git a/e2e/common/cli/files/promote-route.groovy
b/e2e/commonwithcustominstall/files/promote-route.groovy
similarity index 100%
rename from e2e/common/cli/files/promote-route.groovy
rename to e2e/commonwithcustominstall/files/promote-route.groovy
diff --git a/e2e/common/cli/files/timer-kamelet-usage.groovy
b/e2e/commonwithcustominstall/files/timer-kamelet-usage.groovy
similarity index 100%
rename from e2e/common/cli/files/timer-kamelet-usage.groovy
rename to e2e/commonwithcustominstall/files/timer-kamelet-usage.groovy
diff --git a/e2e/knative/kamelet_test.go b/e2e/knative/kamelet_test.go
index 8c236ea0c..b78411b4d 100644
--- a/e2e/knative/kamelet_test.go
+++ b/e2e/knative/kamelet_test.go
@@ -83,7 +83,7 @@ func TestKameletChange(t *testing.T) {
Eventually(IntegrationPodPhase(ns, "timer-binding"),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
Eventually(IntegrationConditionStatus(ns, "timer-binding",
v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "display"),
TestTimeoutShort).Should(ContainSubstring("message is Hi"))
+ Eventually(IntegrationLogs(ns, "test-kamelet-display"),
TestTimeoutShort).Should(ContainSubstring("message is Hi"))
Eventually(KameletBindingCondition(ns, timerBinding,
v1alpha1.KameletBindingConditionReady), TestTimeoutMedium).
Should(And(
[camel-k] 10/19: fix: remove local operator installation
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit aeeb397ffcfd0f1f1a8638ad6e91e2bc7a306bf9
Author: Pasquale Congiusti
AuthorDate: Thu Feb 23 10:50:34 2023 +0100
fix: remove local operator installation
---
e2e/README.md | 48 +
e2e/knative/kamelet_test.go | 2 +-
e2e/knative/knative_test.go | 2 --
3 files changed, 49 insertions(+), 3 deletions(-)
diff --git a/e2e/README.md b/e2e/README.md
new file mode 100644
index 0..c38203b7c
--- /dev/null
+++ b/e2e/README.md
@@ -0,0 +1,48 @@
+# Camel K End To End tests
+
+This directory contains the suite of test that are run on a CI to ensure the
stability of the product and no regression are introduced at each PR. The full
documentation can be found at
https://camel.apache.org/camel-k/next/contributing/e2e.html
+
+## Structure of the directory
+
+NOTE: dear contributor, please, keep this organization as clean as you can,
updating any documentation if any change is done.
+
+* builder
+* common
+* commonwithcustominstall
+* install
+* knative
+* native
+* telemetry
+* yaks
+
+### Builder
+
+Contains a basic set of tests required to validate each builder strategy we
offer. Ideally we don't want to test complex features but only a few test to
validate any builder we offer is working correctly.
+
+### Common
+
+Full set of test to validate the main project feature. This test will assume
the presence of a namespaced operator (installation provided by the same test
execution suite). Insert here any test that has to validate any new feature
required.
+
+### Commonwithcustominstall
+
+Additional set of test that cover the main common features but that requires
some particular operator configuration. In this test suite you must take care
of installing the operator as well.
+
+### Install
+
+Test suite that cover the different installation procedures we offer and any
upgrade scenario.
+
+### KNative
+
+Test suite that cover the features associated with KNative. This test will
assume the presence of a namespaced operator (installation provided by the same
test execution suite) togheter with KNative operator configuration.
+
+### Native
+
+Test suite that cover the Quarkus Native build. As it is high resource
consuming, we just validate that a native build for the supported DSLs is
working.
+
+### Telemetry
+
+Test suite that cover the features associated with Telemetry feature. The test
execution takes care of installing the required configuration.
+
+### Yaks
+
+Test suite that cover certain KNative features togheter with YAKS operator.
diff --git a/e2e/knative/kamelet_test.go b/e2e/knative/kamelet_test.go
index 8e48a8710..8c236ea0c 100644
--- a/e2e/knative/kamelet_test.go
+++ b/e2e/knative/kamelet_test.go
@@ -70,7 +70,7 @@ func TestKameletChange(t *testing.T) {
Eventually(IntegrationPodPhase(ns, timerBinding),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
Eventually(IntegrationConditionStatus(ns, "timer-binding",
v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- Eventually(IntegrationLogs(ns, "display"),
TestTimeoutShort).Should(ContainSubstring("message is Hello"))
+ Eventually(IntegrationLogs(ns, "test-kamelet-display"),
TestTimeoutShort).Should(ContainSubstring("message is Hello"))
Eventually(KameletBindingCondition(ns, timerBinding,
v1alpha1.KameletBindingConditionReady), TestTimeoutMedium).Should(And(
WithTransform(KameletBindingConditionStatusExtract,
Equal(corev1.ConditionTrue)),
diff --git a/e2e/knative/knative_test.go b/e2e/knative/knative_test.go
index a9810564a..7bf04010f 100644
--- a/e2e/knative/knative_test.go
+++ b/e2e/knative/knative_test.go
@@ -42,8 +42,6 @@ func TestKnative(t *testing.T) {
knChannelWords := "words"
Expect(CreateKnativeChannel(ns, knChannelMessages)()).To(Succeed())
Expect(CreateKnativeChannel(ns, knChannelWords)()).To(Succeed())
- operatorID := fmt.Sprintf("camel-k-%s", ns)
- Expect(KamelInstallWithID(operatorID, ns, "--trait-profile",
"knative").Execute()).To(Succeed())
t.Run("Service combo", func(t *testing.T) {
Expect(KamelRunWithID(operatorID, ns,
"files/knative2.groovy").Execute()).To(Succeed())
[camel-k] 16/19: chore: move startup and teardown in support folder
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit b0f7c9619348cbac22e516065fa4631771e4d5c8
Author: Pasquale Congiusti
AuthorDate: Mon Feb 27 10:24:01 2023 +0100
chore: move startup and teardown in support folder
---
e2e/common/cli/get_test.go | 2 +-
e2e/common/cli/run_test.go | 4 ++--
e2e/common/{ => support}/startup_test.go | 2 +-
e2e/common/{ => support}/teardown_test.go | 2 +-
e2e/knative/{ => support}/startup_test.go | 2 +-
e2e/knative/{ => support}/teardown_test.go | 2 +-
script/Makefile| 8
script/get_catalog.sh | 2 +-
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/e2e/common/cli/get_test.go b/e2e/common/cli/get_test.go
index 1d404045e..78bb1d9a2 100644
--- a/e2e/common/cli/get_test.go
+++ b/e2e/common/cli/get_test.go
@@ -55,7 +55,7 @@ func TestKamelCLIGet(t *testing.T) {
Eventually(IntegrationPodPhase(ns, "yaml"),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
Eventually(IntegrationPodPhase(ns, "java"),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationKit(ns, "yajavaml")).ShouldNot(Equal(""))
+ Eventually(IntegrationKit(ns, "java")).ShouldNot(Equal(""))
Eventually(IntegrationKit(ns, "yaml")).ShouldNot(Equal(""))
kitName1 := IntegrationKit(ns, "java")()
kitName2 := IntegrationKit(ns, "yaml")()
diff --git a/e2e/common/cli/run_test.go b/e2e/common/cli/run_test.go
index 161223684..280e3430a 100644
--- a/e2e/common/cli/run_test.go
+++ b/e2e/common/cli/run_test.go
@@ -44,7 +44,7 @@ func TestKamelCLIRun(t *testing.T) {
t.Run("Examples from GitHub", func(t *testing.T) {
t.Run("Java", func(t *testing.T) {
Expect(KamelRunWithID(operatorID, ns,
-
"github:apache/camel-k-examples/blob/main/generic-examples/languages/Sample.java").Execute()).To(Succeed())
+
"github:apache/camel-k-examples/generic-examples/languages/Sample.java").Execute()).To(Succeed())
Eventually(IntegrationPodPhase(ns, "sample"),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
Eventually(IntegrationConditionStatus(ns, "sample",
v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
@@ -65,7 +65,7 @@ func TestKamelCLIRun(t *testing.T) {
t.Run("Java (branch)", func(t *testing.T) {
Expect(KamelRunWithID(operatorID, ns,
-
"github:apache/camel-k-examples/blob/main/generic-examples/languages/Sample.java?branch=main").Execute()).To(Succeed())
+
"github:apache/camel-k-examples/generic-examples/languages/Sample.java?branch=main").Execute()).To(Succeed())
Eventually(IntegrationPodPhase(ns, "sample"),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
Eventually(IntegrationConditionStatus(ns, "sample",
v1.IntegrationConditionReady), TestTimeoutShort).
Should(Equal(corev1.ConditionTrue))
diff --git a/e2e/common/startup_test.go b/e2e/common/support/startup_test.go
similarity index 99%
rename from e2e/common/startup_test.go
rename to e2e/common/support/startup_test.go
index c8a3ad9af..b1707383e 100644
--- a/e2e/common/startup_test.go
+++ b/e2e/common/support/startup_test.go
@@ -20,7 +20,7 @@ See the License for the specific language governing
permissions and
limitations under the License.
*/
-package common
+package support
import (
"testing"
diff --git a/e2e/common/teardown_test.go b/e2e/common/support/teardown_test.go
similarity index 98%
rename from e2e/common/teardown_test.go
rename to e2e/common/support/teardown_test.go
index fcc67b0f5..064b44777 100644
--- a/e2e/common/teardown_test.go
+++ b/e2e/common/support/teardown_test.go
@@ -20,7 +20,7 @@ See the License for the specific language governing
permissions and
limitations under the License.
*/
-package common
+package support
import (
"testing"
diff --git a/e2e/knative/startup_test.go b/e2e/knative/support/startup_test.go
similarity index 99%
rename from e2e/knative/startup_test.go
rename to e2e/knative/support/startup_test.go
index 4bab6ed40..6e1260f59 100644
--- a/e2e/knative/startup_test.go
+++ b/e2e/knative/support/startup_test.go
@@ -20,7 +20,7 @@ See the License for the specific language governing
permissions and
limitations under the License.
*/
-package knative
+package support
import (
"testing"
diff --git a/e2e/knative/teardown_test.go b/e2e/knative/support/teardown_test.go
similarity index 98%
rename from e2e/knative/teardown_test.go
rename to
[camel-k] 03/19: chore(ci): remove unused actions/wf
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 1c18a476d8ac389b81e455c21e23fb5c35e11b1d
Author: Pasquale Congiusti
AuthorDate: Wed Feb 22 12:24:00 2023 +0100
chore(ci): remove unused actions/wf
---
.github/actions/e2e-local/action.yml | 49 -
.../actions/kamel-config-cluster-ocp3/action.yml | 233 -
.github/workflows/local.yml| 68 --
.github/workflows/openshift.yml| 129
.github/workflows/verify-generate.yml | 68 --
5 files changed, 547 deletions(-)
diff --git a/.github/actions/e2e-local/action.yml
b/.github/actions/e2e-local/action.yml
deleted file mode 100644
index a2dc5..0
--- a/.github/actions/e2e-local/action.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-# ---
-# 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.
-# ---
-
-name: e2e-local
-description: 'End-to-End tests for local use-cases'
-
-runs:
- using: "composite"
-
- steps:
- - id: prepare-env
-name: Prepare Test Environment
-uses: ./.github/actions/kamel-prepare-env
-
- - id: build-kamel
-name: Build Kamel
-uses: ./.github/actions/kamel-build
-with:
- make-rules: 'build-kamel'
-
- - id: report-problematic
-name: List Tests Marked As Problematic
-uses: ./.github/actions/kamel-report-problematic
-with:
- test-suite: local
-
- - id: run-it
-name: Run IT
-shell: bash
-run: |
- # Configure staging repos
- export KAMEL_LOCAL_RUN_MAVEN_REPOSITORIES=$(make get-staging-repo)
-
- # Then run integration tests
- make test-local
diff --git a/.github/actions/kamel-config-cluster-ocp3/action.yml
b/.github/actions/kamel-config-cluster-ocp3/action.yml
deleted file mode 100644
index f87c87107..0
--- a/.github/actions/kamel-config-cluster-ocp3/action.yml
+++ /dev/null
@@ -1,233 +0,0 @@
-# ---
-# 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.
-# ---
-
-name: kamel-config-cluster-ocp3
-description: 'Provides configuration for making available kubernetes cluster
on ocp3'
-
-runs:
- using: "composite"
- steps:
-- name: Get OpenShift Client (oc)
- shell: bash
- if: ${{ env.CLUSTER_OCP3_CONFIGURED != 'true' }}
- run: |
-export OPENSHIFT_VERSION=v3.11.0
-export OPENSHIFT_COMMIT=0cbc58b
-export
MAVEN_OPTS=-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
-
-{{ env.SUDO }} rm -f /etc/resolv.conf
-{{ env.SUDO }} ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf
-{{ env.SUDO }} sh -c 'echo "DNS=8.8.8.8 4.4.4.4" >>
/etc/systemd/resolved.conf'
-{{ env.SUDO }} service systemd-resolved restart
-
-# set docker0 to promiscuous mode
-{{ env.SUDO }} ip link set docker0 promisc on
-
-# Download and install the oc binary
-{{ env.SUDO }} mount --make-shared /
-
-{{ env.SUDO }} service docker stop
-{{ env.SUDO }} echo '{"insecure-registries": ["172.30.0.0/16"]}' | {{
env.SUDO }} tee /etc/docker/daemon.json > /dev/null
-
[GitHub] [camel-k] squakez merged pull request #4072: chore(test): rearrange e2e structure folder
squakez merged PR #4072: URL: https://github.com/apache/camel-k/pull/4072 -- 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] 14/19: fix: some flakiness when getting integrations
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 2c3941bc3b82c6398d1e59b92ac160cb3d467cfd
Author: Pasquale Congiusti
AuthorDate: Thu Feb 23 17:26:47 2023 +0100
fix: some flakiness when getting integrations
---
e2e/common/cli/delete_test.go | 8
e2e/common/cli/get_test.go| 11 +++
e2e/common/cli/run_test.go| 26 +-
e2e/common/startup_test.go| 2 ++
e2e/common/teardown_test.go | 2 +-
e2e/knative/startup_test.go | 2 ++
e2e/knative/teardown_test.go | 2 +-
7 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/e2e/common/cli/delete_test.go b/e2e/common/cli/delete_test.go
index d0bc1cb3d..0ee289db0 100644
--- a/e2e/common/cli/delete_test.go
+++ b/e2e/common/cli/delete_test.go
@@ -50,14 +50,6 @@ func TestKamelCLIDelete(t *testing.T) {
Eventually(IntegrationPod(ns, "yaml"),
TestTimeoutLong).Should(BeNil())
})
- t.Run("delete integration from csv", func(t *testing.T) {
- Expect(KamelRunWithID(operatorID, ns,
"github:apache/camel-k/e2e/namespace/install/cli/files/yaml.yaml").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "yaml"),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Expect(Kamel("delete", "yaml", "-n",
ns).Execute()).To(Succeed())
- Eventually(Integration(ns, "yaml")).Should(BeNil())
- Eventually(IntegrationPod(ns, "yaml"),
TestTimeoutLong).Should(BeNil())
- })
-
t.Run("delete several integrations", func(t *testing.T) {
Expect(KamelRunWithID(operatorID, ns,
"files/yaml.yaml").Execute()).To(Succeed())
Expect(KamelRunWithID(operatorID, ns,
"files/Java.java").Execute()).To(Succeed())
diff --git a/e2e/common/cli/get_test.go b/e2e/common/cli/get_test.go
index b5e94a57c..1d404045e 100644
--- a/e2e/common/cli/get_test.go
+++ b/e2e/common/cli/get_test.go
@@ -40,8 +40,9 @@ func TestKamelCLIGet(t *testing.T) {
Expect(KamelRunWithID(operatorID, ns,
"files/yaml.yaml").Execute()).To(Succeed())
Eventually(IntegrationPodPhase(ns, "yaml"),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
// regex is used for the compatibility of tests between OC and
vanilla K8
- // kamel get may have different output depending og the platform
- kitName := Integration(ns, "yaml")().Status.IntegrationKit.Name
+ // kamel get may have different output depending on the platform
+ Eventually(IntegrationKit(ns, "yaml")).ShouldNot(Equal(""))
+ kitName := IntegrationKit(ns, "yaml")()
regex :=
fmt.Sprintf("^NAME\tPHASE\tKIT\n\\s*yaml\tRunning\t(%s/%s|%s)", ns, kitName,
kitName)
Expect(GetOutputString(Kamel("get", "-n",
ns))).To(MatchRegexp(regex))
@@ -54,8 +55,10 @@ func TestKamelCLIGet(t *testing.T) {
Eventually(IntegrationPodPhase(ns, "yaml"),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
Eventually(IntegrationPodPhase(ns, "java"),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
- kitName1 := Integration(ns, "java")().Status.IntegrationKit.Name
- kitName2 := Integration(ns, "yaml")().Status.IntegrationKit.Name
+ Eventually(IntegrationKit(ns, "yajavaml")).ShouldNot(Equal(""))
+ Eventually(IntegrationKit(ns, "yaml")).ShouldNot(Equal(""))
+ kitName1 := IntegrationKit(ns, "java")()
+ kitName2 := IntegrationKit(ns, "yaml")()
regex := fmt.Sprintf("^NAME\tPHASE\tKIT\n\\s*java\tRunning\t"+
"(%s/%s|%s)\n\\s*yaml\tRunning\t(%s/%s|%s)\n", ns,
kitName1, kitName1, ns, kitName2, kitName2)
Expect(GetOutputString(Kamel("get", "-n",
ns))).To(MatchRegexp(regex))
diff --git a/e2e/common/cli/run_test.go b/e2e/common/cli/run_test.go
index 235c856e7..161223684 100644
--- a/e2e/common/cli/run_test.go
+++ b/e2e/common/cli/run_test.go
@@ -44,32 +44,32 @@ func TestKamelCLIRun(t *testing.T) {
t.Run("Examples from GitHub", func(t *testing.T) {
t.Run("Java", func(t *testing.T) {
Expect(KamelRunWithID(operatorID, ns,
-
"github:apache/camel-k/e2e/namespace/install/files/Java.java").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns, "java"),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
- Eventually(IntegrationConditionStatus(ns, "java",
v1.IntegrationConditionReady), TestTimeoutShort).
+
"github:apache/camel-k-examples/blob/main/generic-examples/languages/Sample.java").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "sample"),
[camel-k] 08/19: chore: make knative faster
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 782db9c3b18493f8e8c2df97f4731396538a37c3
Author: Pasquale Congiusti
AuthorDate: Wed Feb 22 16:05:15 2023 +0100
chore: make knative faster
---
.github/actions/e2e-common/exec-tests.sh | 2 +-
e2e/common/startup_test.go | 2 +-
e2e/common/teardown_test.go| 2 +-
.../teardown_test.go => knative/default.go}| 22 +--
e2e/knative/kamelet_test.go| 102 +++--
e2e/knative/knative_platform_test.go | 91 ++--
e2e/knative/knative_test.go| 158 +++--
e2e/knative/openapi_test.go| 67 +++--
e2e/knative/pod_test.go| 25 ++--
e2e/{common => knative}/startup_test.go| 6 +-
e2e/{common => knative}/teardown_test.go | 4 +-
script/Makefile| 3 +
12 files changed, 218 insertions(+), 266 deletions(-)
diff --git a/.github/actions/e2e-common/exec-tests.sh
b/.github/actions/e2e-common/exec-tests.sh
index 507ca9f5c..c38482719 100755
--- a/.github/actions/e2e-common/exec-tests.sh
+++ b/.github/actions/e2e-common/exec-tests.sh
@@ -58,7 +58,7 @@ while getopts ":b:c:g:i:l:n:q:s:v:x:z:" opt; do
SAVE_FAILED_TEST_NS=${OPTARG}
;;
z)
- CUSTOM_INSTALL_TEST=${OPTARG}
+ CUSTOM_INSTALL_TEST="${OPTARG}"
;;
:)
echo "ERROR: Option -$OPTARG requires an argument"
diff --git a/e2e/common/startup_test.go b/e2e/common/startup_test.go
index 546c3b190..fa6558b7d 100644
--- a/e2e/common/startup_test.go
+++ b/e2e/common/startup_test.go
@@ -32,7 +32,7 @@ import (
v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
)
-func TestDefaultCamelKInstallStartup(t *testing.T) {
+func TestCommonCamelKInstallStartup(t *testing.T) {
RegisterTestingT(t)
ns := NewTestNamespace(false)
diff --git a/e2e/common/teardown_test.go b/e2e/common/teardown_test.go
index 682e6ffce..c990fbbfe 100644
--- a/e2e/common/teardown_test.go
+++ b/e2e/common/teardown_test.go
@@ -30,7 +30,7 @@ import (
. "github.com/apache/camel-k/e2e/support"
)
-func TestDefaultCamelKInstallTeardown(t *testing.T) {
+func TestCommonCamelKInstallTeardown(t *testing.T) {
RegisterTestingT(t)
ns := GetCIProcessID()
diff --git a/e2e/common/teardown_test.go b/e2e/knative/default.go
similarity index 64%
copy from e2e/common/teardown_test.go
copy to e2e/knative/default.go
index 682e6ffce..280d6c93f 100644
--- a/e2e/common/teardown_test.go
+++ b/e2e/knative/default.go
@@ -1,8 +1,6 @@
//go:build integration
// +build integration
-// To enable compilation of this file in Goland, go to "Settings -> Go ->
Vendoring & Build Tags -> Custom Tags" and add "integration"
-
/*
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -20,21 +18,9 @@ See the License for the specific language governing
permissions and
limitations under the License.
*/
-package common
-
-import (
- "testing"
-
- . "github.com/onsi/gomega"
-
- . "github.com/apache/camel-k/e2e/support"
-)
+package knative
-func TestDefaultCamelKInstallTeardown(t *testing.T) {
- RegisterTestingT(t)
+import "github.com/apache/camel-k/e2e/support"
- ns := GetCIProcessID()
- Expect(ns).ShouldNot(BeNil())
- Expect(DeleteNamespace(t, ns)).To(Succeed())
- DeleteCIProcessID()
-}
+var ns = support.GetCIProcessID()
+var operatorID = support.GetCIProcessID()
diff --git a/e2e/knative/kamelet_test.go b/e2e/knative/kamelet_test.go
index 811149ccb..6d9a6d583 100644
--- a/e2e/knative/kamelet_test.go
+++ b/e2e/knative/kamelet_test.go
@@ -39,61 +39,57 @@ import (
// Test that a KameletBinding can be changed and the changes are propagated to
the Integration
func TestKameletChange(t *testing.T) {
- WithNewTestNamespace(t, func(ns string) {
- operatorID := "camel-k-kamelet-change"
- timerSource := "my-timer-source"
-
- Expect(KamelInstallWithID(operatorID,
ns).Execute()).To(Succeed())
- Expect(CreateTimerKamelet(ns, timerSource)()).To(Succeed())
- Expect(CreateKnativeChannel(ns, "messages")()).To(Succeed())
-
- Expect(KamelRunWithID(operatorID, ns, "files/display.groovy",
"-w").Execute()).To(Succeed())
-
- from := corev1.ObjectReference{
- Kind: "Kamelet",
- APIVersion: v1alpha1.SchemeGroupVersion.String(),
- Name: timerSource,
- }
-
- to := corev1.ObjectReference{
- Kind: "InMemoryChannel",
- Name:
