(camel) branch regen_bot updated (4a75e5d1c61 -> 8334ef23444)
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 4a75e5d1c61 Filter out null pairs earlier in multicast processor add 207c35b961a Update camel-4x-upgrade-guide-4_7.adoc add 8334ef23444 Make EndpointRegistry extends Map (#14066) No new revisions were added by this update. Summary of changes: .../camel/component/rest/DefaultRestRegistry.java | 6 ++-- .../main/java/org/apache/camel/CamelContext.java | 2 +- .../org/apache/camel/spi/EndpointRegistry.java | 4 +-- .../camel/impl/engine/AbstractCamelContext.java| 35 ++ .../camel/impl/engine/DefaultEndpointRegistry.java | 7 +++-- .../impl/engine/ProvisionalEndpointRegistry.java | 7 +++-- .../camel/impl/engine/SimpleCamelContext.java | 4 +-- .../camel/impl/console/EndpointDevConsole.java | 4 +-- .../camel/impl/DefaultEndpointRegistryTest.java| 3 +- .../camel/impl/engine/DefaultCamelContextTest.java | 3 +- .../management/JmxManagementLifecycleStrategy.java | 2 +- .../management/mbean/ManagedEndpointRegistry.java | 6 ++-- .../mbean/ManagedRuntimeEndpointRegistry.java | 2 +- .../ROOT/pages/camel-4x-upgrade-guide-4_7.adoc | 3 ++ 14 files changed, 42 insertions(+), 46 deletions(-)
(camel) branch regen_bot updated (dacc078dcf0 -> 4a75e5d1c61)
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 dacc078dcf0 Rerun failing tests (#14144) add 8c0c9130230 Fix getter not returning the correct field add 740c3b1a023 Cleanup add f6b309eaa89 Fix jira double check locking add 2e2705228a5 Fix pinecone client double check locking add 036ec604589 Remove wrong optimization add c725911c2b0 Remove redundant initialization add 469a1fa8f42 Use enhanced for loops and instanceof pattern matching add b4b66d5b9dc Streamline SharedCamelInternalProcessor which was copied from CamelInternalProcessor but has a more limited scope add 8122b827d99 Various small code enhancements add 8aa4cabaccf Reuse the existing comparator instead of storing it add f7f39f0be56 Fix possible NPE in cloud configuration add 7fd055056ff Avoid cast warnings add 9d3577298fe Fix wrong isNotEmpty calls add 4a75e5d1c61 Filter out null pairs earlier in multicast processor No new revisions were added by this update. Summary of changes: .../camel/component/gson/GsonDataFormat.java | 2 +- .../apache/camel/component/jira/JiraEndpoint.java | 64 ++--- .../camel/component/master/MasterConsumer.java | 2 +- .../pinecone/PineconeVectorDbEndpoint.java | 23 + .../component/smpp/SmppConnectionFactory.java | 2 +- core/camel-base-engine/pom.xml | 13 +++ .../camel/impl/engine/AbstractCamelContext.java| 2 +- .../apache/camel/impl/engine/AdviceIterator.java | 16 ++-- .../camel/impl/engine/CamelInternalProcessor.java | 20 +--- .../engine/DefaultAsyncProcessorAwaitManager.java | 4 +- .../impl/engine/DefaultCamelContextExtension.java | 3 - .../impl/engine/InternalRouteStartupManager.java | 11 +-- .../camel/impl/engine/IntrospectionSupport.java| 19 ++-- .../impl/engine/SharedCamelInternalProcessor.java | 102 +--- .../camel/impl/engine/ArrayCopyBenchmark.java | 39 .../AbstractLocationPropertiesSource.java | 9 +- .../impl/cloud/ServiceCallProcessorFactory.java| 5 +- .../camel/impl/cluster/ClusteredRoutePolicy.java | 2 +- .../camel/impl/console/ConsumerDevConsole.java | 6 +- .../camel/catalog/impl/AbstractCamelCatalog.java | 11 ++- .../apache/camel/catalog/impl/CatalogHelper.java | 5 +- .../org/apache/camel/impl/DefaultCamelContext.java | 9 +- .../camel/impl/DefaultDumpRoutesStrategy.java | 1 + .../language/simple/SimplePredicateParser.java | 21 ++-- .../java/org/apache/camel/builder/AdviceWith.java | 9 +- .../org/apache/camel/builder/AdviceWithTasks.java | 2 +- .../org/apache/camel/builder/ExpressionClause.java | 2 +- .../camel/builder/FlexibleAggregationStrategy.java | 4 +- .../org/apache/camel/builder/RouteBuilder.java | 6 +- .../camel/model/ProcessorDefinitionHelper.java | 2 +- .../cloud/ServiceCallExpressionConfiguration.java | 21 ++-- ...erviceCallServiceLoadBalancerConfiguration.java | 18 ++-- .../processor/ClaimCheckAggregationStrategy.java | 4 +- .../apache/camel/processor/MulticastProcessor.java | 16 +--- .../camel/processor/RecipientListProcessor.java| 12 +-- .../java/org/apache/camel/processor/Splitter.java | 19 +--- .../errorhandler/DefaultErrorHandler.java | 10 -- .../errorhandler/RedeliveryErrorHandler.java | 58 +++ .../processor/resequencer/ResequencerEngine.java | 17 ++-- .../camel/processor/resequencer/Sequence.java | 20 ++-- .../org/apache/camel/reifier/CatchReifier.java | 12 +-- .../reifier/errorhandler/ErrorHandlerReifier.java | 6 +- .../rest/RestComponentVerifierExtensionTest.java | 2 +- .../component/rest/RestComponentVerifierTest.java | 2 +- ...rParallelWithIteratorThrowingExceptionTest.java | 34 --- .../DefaultManagementObjectStrategy.java | 106 - .../management/JmxManagementLifecycleStrategy.java | 4 +- .../mbean/ManagedStreamCachingStrategy.java| 34 +++ .../management/mbean/RouteCoverageXmlParser.java | 70 +++--- .../ManagedStreamCachingStrategyTest.java | 8 ++ .../camel/converter/stream/CachedOutputStream.java | 6 +- .../org/apache/camel/support/AbstractExchange.java | 1 + .../camel/support/DefaultHeaderFilterStrategy.java | 2 +- .../DefaultScheduledPollConsumerScheduler.java | 2 +- .../org/apache/camel/support/EndpointHelper.java | 2 +- .../apache/camel/support/GroupTokenIterator.java | 2 +- .../org/apache/camel/support/MessageHelper.java| 4 +- .../org/apache/camel/support/ObjectHelper.java | 18 ++-- .../camel/support/PropertyBindingSupport.java | 52 +- .../camel/support/ScheduledPollConsumer.java | 1 - .../builder/TokenPairExpressionIterator.java | 5
(camel) branch main updated: Make EndpointRegistry extends Map (#14066)
This is an automated email from the ASF dual-hosted git repository.
gnodet 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 8334ef23444 Make EndpointRegistry extends Map (#14066)
8334ef23444 is described below
commit 8334ef23444edb7a25ba62cad6998c5e096dca3b
Author: Guillaume Nodet
AuthorDate: Wed May 15 07:44:05 2024 +0200
Make EndpointRegistry extends Map (#14066)
---
.../camel/component/rest/DefaultRestRegistry.java | 6 ++--
.../main/java/org/apache/camel/CamelContext.java | 2 +-
.../org/apache/camel/spi/EndpointRegistry.java | 4 +--
.../camel/impl/engine/AbstractCamelContext.java| 35 ++
.../camel/impl/engine/DefaultEndpointRegistry.java | 7 +++--
.../impl/engine/ProvisionalEndpointRegistry.java | 7 +++--
.../camel/impl/engine/SimpleCamelContext.java | 4 +--
.../camel/impl/console/EndpointDevConsole.java | 4 +--
.../camel/impl/DefaultEndpointRegistryTest.java| 3 +-
.../camel/impl/engine/DefaultCamelContextTest.java | 3 +-
.../management/JmxManagementLifecycleStrategy.java | 2 +-
.../management/mbean/ManagedEndpointRegistry.java | 6 ++--
.../mbean/ManagedRuntimeEndpointRegistry.java | 2 +-
13 files changed, 39 insertions(+), 46 deletions(-)
diff --git
a/components/camel-rest/src/main/java/org/apache/camel/component/rest/DefaultRestRegistry.java
b/components/camel-rest/src/main/java/org/apache/camel/component/rest/DefaultRestRegistry.java
index 0e2f28d12bb..b4071655d07 100644
---
a/components/camel-rest/src/main/java/org/apache/camel/component/rest/DefaultRestRegistry.java
+++
b/components/camel-rest/src/main/java/org/apache/camel/component/rest/DefaultRestRegistry.java
@@ -33,7 +33,7 @@ import org.apache.camel.Service;
import org.apache.camel.ServiceStatus;
import org.apache.camel.StatefulService;
import org.apache.camel.StaticService;
-import org.apache.camel.ValueHolder;
+import org.apache.camel.spi.NormalizedEndpointUri;
import org.apache.camel.spi.RestConfiguration;
import org.apache.camel.spi.RestRegistry;
import org.apache.camel.support.LifecycleStrategySupport;
@@ -76,8 +76,8 @@ public class DefaultRestRegistry extends ServiceSupport
implements StaticService
if (apiProducer == null) {
Endpoint restApiEndpoint = null;
Endpoint restEndpoint = null;
-for (Map.Entry, Endpoint> entry :
camelContext.getEndpointRegistry().entrySet()) {
-String uri = entry.getKey().get();
+for (Map.Entry entry :
camelContext.getEndpointRegistry().entrySet()) {
+String uri = entry.getKey().getUri();
if (uri.startsWith("rest-api:")) {
restApiEndpoint = entry.getValue();
break;
diff --git a/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
b/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
index 8132380eef0..4a0812fbe25 100644
--- a/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
+++ b/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
@@ -395,7 +395,7 @@ public interface CamelContext extends
CamelContextLifecycle, RuntimeConfiguratio
/**
* Gets the {@link org.apache.camel.spi.EndpointRegistry}
*/
-EndpointRegistry> getEndpointRegistry();
+EndpointRegistry getEndpointRegistry();
/**
* Resolves the given name to an {@link Endpoint} of the specified type.
If the name has a singleton endpoint
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/EndpointRegistry.java
b/core/camel-api/src/main/java/org/apache/camel/spi/EndpointRegistry.java
index de1a26c263c..a4b844f2e99 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/EndpointRegistry.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/EndpointRegistry.java
@@ -36,10 +36,8 @@ import org.apache.camel.StaticService;
*
* The dynamic cache stores the endpoints that are created and used ad-hoc,
such as from custom Java code that creates
* new endpoints etc. The dynamic cache has an upper limit, that by default is
1000 entries.
- *
- * @param endpoint key
*/
-public interface EndpointRegistry extends Map, StaticService {
+public interface EndpointRegistry extends Map, StaticService {
/**
* Number of endpoints in the static registry.
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index e4a8196fb38..55445d737fd 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -133,6 +133,7 @@ import org.apache.camel.spi.ModelToXMLDumper;
import
Re: [PR] Make EndpointRegistry extends Map [camel]
gnodet merged PR #14066: URL: https://github.com/apache/camel/pull/14066 -- 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: Update camel-4x-upgrade-guide-4_7.adoc
This is an automated email from the ASF dual-hosted git repository. gnodet 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 207c35b961a Update camel-4x-upgrade-guide-4_7.adoc 207c35b961a is described below commit 207c35b961a21b77c1f7207bac91d17b7df63170 Author: Guillaume Nodet AuthorDate: Wed May 15 07:43:43 2024 +0200 Update camel-4x-upgrade-guide-4_7.adoc --- docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_7.adoc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_7.adoc b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_7.adoc index 19e9dd64d9a..14d8478abed 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_7.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_7.adoc @@ -10,6 +10,9 @@ from both 4.0 to 4.1 and 4.1 to 4.2. Add default values to `ThrottlingExceptionRoutePolicy` route policy. +The `EndpointRegistry` interface has been slightly changed to now directly extends `Map` +instead of being a parameterized type. This may cause some compilation failures if the code is declaring a variable for the registry. + === DSL The Load Balancer EIP has aligned naming and the following balancers has been renamed in XML and YAML DSL:
(camel) 11/14: Fix possible NPE in cloud configuration
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f7f39f0be56468844f1a7557456864f2468fea9b
Author: Guillaume Nodet
AuthorDate: Tue May 14 14:44:05 2024 +0200
Fix possible NPE in cloud configuration
---
.../cloud/ServiceCallExpressionConfiguration.java | 21 +
...ServiceCallServiceLoadBalancerConfiguration.java | 18 --
2 files changed, 17 insertions(+), 22 deletions(-)
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallExpressionConfiguration.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallExpressionConfiguration.java
index 188940f5a5b..873e3b45082 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallExpressionConfiguration.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallExpressionConfiguration.java
@@ -170,8 +170,7 @@ public class ServiceCallExpressionConfiguration extends
ServiceCallConfiguration
= CamelContextHelper.lookup(camelContext, factoryKey,
ServiceExpressionFactory.class);
if (factory != null) {
// If a factory is found in the registry do not re-configure it
-// as
-// it should be pre-configured.
+// as it should be pre-configured.
answer = factory.newInstance(camelContext);
} else {
@@ -179,20 +178,18 @@ public class ServiceCallExpressionConfiguration extends
ServiceCallConfiguration
try {
// Then use Service factory.
type = camelContext.getCamelContextExtension()
-
.getFactoryFinder(ServiceCallDefinitionConstants.RESOURCE_PATH).findClass(factoryKey).orElse(null);
+
.getFactoryFinder(ServiceCallDefinitionConstants.RESOURCE_PATH).findClass(factoryKey).orElseThrow();
} catch (Exception e) {
throw new
NoFactoryAvailableException(ServiceCallDefinitionConstants.RESOURCE_PATH +
factoryKey, e);
}
-if (type != null) {
-if (ServiceExpressionFactory.class.isAssignableFrom(type))
{
-factory = (ServiceExpressionFactory)
camelContext.getInjector().newInstance(type, false);
-} else {
-throw new IllegalArgumentException(
-"Resolving Expression: " + factoryKey
- + " detected type
conflict: Not a ExpressionFactory implementation. Found: "
- + type.getName());
-}
+if (ServiceExpressionFactory.class.isAssignableFrom(type)) {
+factory = (ServiceExpressionFactory)
camelContext.getInjector().newInstance(type, false);
+} else {
+throw new IllegalArgumentException(
+"Resolving Expression: " + factoryKey
+ + " detected type
conflict: Not a ExpressionFactory implementation. Found: "
+ + type.getName());
}
try {
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceLoadBalancerConfiguration.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceLoadBalancerConfiguration.java
index fc310f0da00..ac703982093 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceLoadBalancerConfiguration.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/ServiceCallServiceLoadBalancerConfiguration.java
@@ -100,20 +100,18 @@ public class ServiceCallServiceLoadBalancerConfiguration
extends ServiceCallConf
try {
// Then use Service factory.
type = camelContext.getCamelContextExtension()
-
.getFactoryFinder(ServiceCallDefinitionConstants.RESOURCE_PATH).findClass(factoryKey).orElse(null);
+
.getFactoryFinder(ServiceCallDefinitionConstants.RESOURCE_PATH).findClass(factoryKey).orElseThrow();
} catch (Exception e) {
throw new
NoFactoryAvailableException(ServiceCallDefinitionConstants.RESOURCE_PATH +
factoryKey, e);
}
-if (type != null) {
-if (ServiceLoadBalancerFactory.class.isAssignableFrom(type)) {
-factory = (ServiceLoadBalancerFactory)
camelContext.getInjector().newInstance(type, false);
-} else {
-throw new IllegalArgumentException(
-
(camel) 12/14: Avoid cast warnings
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7fd055056ff1ec1352c2f51bbc0b006538a36cca
Author: Guillaume Nodet
AuthorDate: Tue May 14 14:44:58 2024 +0200
Avoid cast warnings
---
.../DefaultManagementObjectStrategy.java | 106 -
1 file changed, 41 insertions(+), 65 deletions(-)
diff --git
a/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java
b/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java
index c2c38cb53ef..37c14529b9a 100644
---
a/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java
+++
b/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.management;
-import java.util.Iterator;
import java.util.concurrent.ThreadPoolExecutor;
import org.apache.camel.CamelContext;
@@ -111,33 +110,12 @@ import org.apache.camel.management.mbean.ManagedUnmarshal;
import org.apache.camel.management.mbean.ManagedValidate;
import org.apache.camel.management.mbean.ManagedWeightedLoadBalancer;
import org.apache.camel.management.mbean.ManagedWireTapProcessor;
-import org.apache.camel.model.AggregateDefinition;
-import org.apache.camel.model.CatchDefinition;
-import org.apache.camel.model.DynamicRouterDefinition;
-import org.apache.camel.model.EnrichDefinition;
import org.apache.camel.model.ExpressionNode;
-import org.apache.camel.model.FinallyDefinition;
-import org.apache.camel.model.IdempotentConsumerDefinition;
import org.apache.camel.model.LoadBalanceDefinition;
-import org.apache.camel.model.LoopDefinition;
-import org.apache.camel.model.MarshalDefinition;
-import org.apache.camel.model.PollEnrichDefinition;
import org.apache.camel.model.ProcessDefinition;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.RecipientListDefinition;
-import org.apache.camel.model.RoutingSlipDefinition;
-import org.apache.camel.model.ScriptDefinition;
-import org.apache.camel.model.SetBodyDefinition;
-import org.apache.camel.model.SetHeaderDefinition;
-import org.apache.camel.model.SetHeadersDefinition;
-import org.apache.camel.model.SetPropertyDefinition;
-import org.apache.camel.model.SetVariableDefinition;
-import org.apache.camel.model.SetVariablesDefinition;
-import org.apache.camel.model.SplitDefinition;
import org.apache.camel.model.TransformDefinition;
-import org.apache.camel.model.TryDefinition;
-import org.apache.camel.model.UnmarshalDefinition;
-import org.apache.camel.model.ValidateDefinition;
import org.apache.camel.model.loadbalancer.CustomLoadBalancerDefinition;
import org.apache.camel.processor.CatchProcessor;
import org.apache.camel.processor.ChoiceProcessor;
@@ -344,9 +322,8 @@ public class DefaultManagementObjectStrategy implements
ManagementObjectStrategy
if (definition instanceof RecipientListDefinition) {
// special for RecipientListDefinition, as the processor is
wrapped in a pipeline as last
Pipeline pipeline = (Pipeline) processor;
-Iterator it = pipeline.next().iterator();
-while (it.hasNext()) {
-processor = it.next();
+for (Processor value : pipeline.next()) {
+processor = value;
}
}
@@ -373,49 +350,49 @@ public class DefaultManagementObjectStrategy implements
ManagementObjectStrategy
answer = new ManagedDelayer(context, (Delayer) target,
definition);
} else if (target instanceof DisabledProcessor) {
answer = new ManagedDisabled(context, (DisabledProcessor)
target, definition);
-} else if (target instanceof TryProcessor) {
-answer = new ManagedDoTry(context, (TryProcessor) target,
(TryDefinition) definition);
+} else if (target instanceof TryProcessor tryProc) {
+answer = new ManagedDoTry(context, tryProc, cast(definition));
} else if (target instanceof CatchProcessor) {
-answer = new ManagedDoCatch(context, (CatchProcessor) target,
(CatchDefinition) definition);
+answer = new ManagedDoCatch(context, (CatchProcessor) target,
cast(definition));
} else if (target instanceof FinallyProcessor) {
-answer = new ManagedDoFinally(context, (FinallyProcessor)
target, (FinallyDefinition) definition);
+answer = new ManagedDoFinally(context, (FinallyProcessor)
target, cast(definition));
} else if (target instanceof Throttler) {
answer = new ManagedThrottler(context, (Throttler) target,
definition);
} else if (target instanceof DynamicRouter) {
-answer = new ManagedDynamicRouter(context,
(camel) 13/14: Fix wrong isNotEmpty calls
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9d3577298fe33eac1eb269bea5b5bebd4077d0c4
Author: Guillaume Nodet
AuthorDate: Tue May 14 14:45:16 2024 +0200
Fix wrong isNotEmpty calls
---
.../java/org/apache/camel/support/component/ApiMethodHelper.java | 8 ++--
.../src/main/java/org/apache/camel/support/jndi/JndiContext.java | 4 ++--
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/component/ApiMethodHelper.java
b/core/camel-support/src/main/java/org/apache/camel/support/component/ApiMethodHelper.java
index 05453887ccf..e11889f374b 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/component/ApiMethodHelper.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/component/ApiMethodHelper.java
@@ -104,18 +104,14 @@ public final class ApiMethodHelper &
ApiMethod> {
// add method name alias
String alias = matcher.replaceAll(aliasEntry.getValue());
// convert first character to lowercase
-ObjectHelper.isNotEmpty(alias);
+ObjectHelper.notNullOrEmpty(alias, "alias");
final char firstChar = alias.charAt(0);
if (!Character.isLowerCase(firstChar)) {
final StringBuilder builder = new StringBuilder();
builder.append(Character.toLowerCase(firstChar)).append(alias, 1,
alias.length());
alias = builder.toString();
}
-Set names = tmpAliasesMap.get(alias);
-if (names == null) {
-names = new HashSet<>();
-tmpAliasesMap.put(alias, names);
-}
+Set names = tmpAliasesMap.computeIfAbsent(alias, k
-> new HashSet<>());
names.add(name);
}
}
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/jndi/JndiContext.java
b/core/camel-support/src/main/java/org/apache/camel/support/jndi/JndiContext.java
index 36f28429ea4..f09c4ce3a6c 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/jndi/JndiContext.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/jndi/JndiContext.java
@@ -109,7 +109,7 @@ public class JndiContext implements Context, Serializable {
* (the names are suitably extended by the segment originally lopped off).
*/
protected Map internalBind(String name, Object value)
throws NamingException {
-org.apache.camel.util.ObjectHelper.isNotEmpty(name);
+org.apache.camel.util.ObjectHelper.notNullOrEmpty(name, "name");
org.apache.camel.util.ObjectHelper.notNull(frozen, "frozen");
Map newBindings = new HashMap<>();
@@ -122,7 +122,7 @@ public class JndiContext implements Context, Serializable {
newBindings.put(name, value);
} else {
String segment = name.substring(0, pos);
-org.apache.camel.util.ObjectHelper.isNotEmpty(segment);
+org.apache.camel.util.ObjectHelper.notNullOrEmpty(segment,
"segment");
Object o = treeBindings.get(segment);
if (o == null) {
o = newContext();
(camel) 04/14: Fix pinecone client double check locking
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2e2705228a58e0a825173a20075465eb99cac07c
Author: Guillaume Nodet
AuthorDate: Thu May 2 16:20:20 2024 +0200
Fix pinecone client double check locking
---
.../pinecone/PineconeVectorDbEndpoint.java | 23 +-
1 file changed, 5 insertions(+), 18 deletions(-)
diff --git
a/components/camel-pinecone/src/main/java/org/apache/camel/component/pinecone/PineconeVectorDbEndpoint.java
b/components/camel-pinecone/src/main/java/org/apache/camel/component/pinecone/PineconeVectorDbEndpoint.java
index 0dc108fddfa..5a648f13abb 100644
---
a/components/camel-pinecone/src/main/java/org/apache/camel/component/pinecone/PineconeVectorDbEndpoint.java
+++
b/components/camel-pinecone/src/main/java/org/apache/camel/component/pinecone/PineconeVectorDbEndpoint.java
@@ -51,10 +51,7 @@ public class PineconeVectorDbEndpoint extends
DefaultEndpoint {
@UriParam
private PineconeVectorDbConfiguration configuration;
-private final Object lock;
-
-private volatile boolean closeClient;
-private volatile io.pinecone.clients.Pinecone client;
+private Pinecone client;
public PineconeVectorDbEndpoint(
String endpointUri,
@@ -66,8 +63,6 @@ public class PineconeVectorDbEndpoint extends DefaultEndpoint
{
this.collection = collection;
this.configuration = configuration;
-
-this.lock = new Object();
}
public PineconeVectorDbConfiguration getConfiguration() {
@@ -80,19 +75,11 @@ public class PineconeVectorDbEndpoint extends
DefaultEndpoint {
public synchronized Pinecone getClient() {
if (this.client == null) {
-synchronized (this.lock) {
-if (this.client == null) {
-this.client = this.configuration.getClient();
-this.closeClient = false;
-
-if (this.client == null) {
-this.client = createClient();
-this.closeClient = true;
-}
-}
+this.client = this.configuration.getClient();
+if (this.client == null) {
+this.client = createClient();
}
}
-
return this.client;
}
@@ -118,7 +105,7 @@ public class PineconeVectorDbEndpoint extends
DefaultEndpoint {
private Pinecone createClient() {
-io.pinecone.clients.Pinecone pinecone = new
io.pinecone.clients.Pinecone.Builder(configuration.getToken()).build();
+Pinecone pinecone = new
Pinecone.Builder(configuration.getToken()).build();
return pinecone;
}
(camel) branch main updated (dacc078dcf0 -> 4a75e5d1c61)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from dacc078dcf0 Rerun failing tests (#14144) new 8c0c9130230 Fix getter not returning the correct field new 740c3b1a023 Cleanup new f6b309eaa89 Fix jira double check locking new 2e2705228a5 Fix pinecone client double check locking new 036ec604589 Remove wrong optimization new c725911c2b0 Remove redundant initialization new 469a1fa8f42 Use enhanced for loops and instanceof pattern matching new b4b66d5b9dc Streamline SharedCamelInternalProcessor which was copied from CamelInternalProcessor but has a more limited scope new 8122b827d99 Various small code enhancements new 8aa4cabaccf Reuse the existing comparator instead of storing it new f7f39f0be56 Fix possible NPE in cloud configuration new 7fd055056ff Avoid cast warnings new 9d3577298fe Fix wrong isNotEmpty calls new 4a75e5d1c61 Filter out null pairs earlier in multicast processor The 14 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/component/gson/GsonDataFormat.java | 2 +- .../apache/camel/component/jira/JiraEndpoint.java | 64 ++--- .../camel/component/master/MasterConsumer.java | 2 +- .../pinecone/PineconeVectorDbEndpoint.java | 23 + .../component/smpp/SmppConnectionFactory.java | 2 +- core/camel-base-engine/pom.xml | 13 +++ .../camel/impl/engine/AbstractCamelContext.java| 2 +- .../apache/camel/impl/engine/AdviceIterator.java | 16 ++-- .../camel/impl/engine/CamelInternalProcessor.java | 20 +--- .../engine/DefaultAsyncProcessorAwaitManager.java | 4 +- .../impl/engine/DefaultCamelContextExtension.java | 3 - .../impl/engine/InternalRouteStartupManager.java | 11 +-- .../camel/impl/engine/IntrospectionSupport.java| 19 ++-- .../impl/engine/SharedCamelInternalProcessor.java | 102 +--- .../camel/impl/engine/ArrayCopyBenchmark.java | 39 .../AbstractLocationPropertiesSource.java | 9 +- .../impl/cloud/ServiceCallProcessorFactory.java| 5 +- .../camel/impl/cluster/ClusteredRoutePolicy.java | 2 +- .../camel/impl/console/ConsumerDevConsole.java | 6 +- .../camel/catalog/impl/AbstractCamelCatalog.java | 11 ++- .../apache/camel/catalog/impl/CatalogHelper.java | 5 +- .../org/apache/camel/impl/DefaultCamelContext.java | 9 +- .../camel/impl/DefaultDumpRoutesStrategy.java | 1 + .../language/simple/SimplePredicateParser.java | 21 ++-- .../java/org/apache/camel/builder/AdviceWith.java | 9 +- .../org/apache/camel/builder/AdviceWithTasks.java | 2 +- .../org/apache/camel/builder/ExpressionClause.java | 2 +- .../camel/builder/FlexibleAggregationStrategy.java | 4 +- .../org/apache/camel/builder/RouteBuilder.java | 6 +- .../camel/model/ProcessorDefinitionHelper.java | 2 +- .../cloud/ServiceCallExpressionConfiguration.java | 21 ++-- ...erviceCallServiceLoadBalancerConfiguration.java | 18 ++-- .../processor/ClaimCheckAggregationStrategy.java | 4 +- .../apache/camel/processor/MulticastProcessor.java | 16 +--- .../camel/processor/RecipientListProcessor.java| 12 +-- .../java/org/apache/camel/processor/Splitter.java | 19 +--- .../errorhandler/DefaultErrorHandler.java | 10 -- .../errorhandler/RedeliveryErrorHandler.java | 58 +++ .../processor/resequencer/ResequencerEngine.java | 17 ++-- .../camel/processor/resequencer/Sequence.java | 20 ++-- .../org/apache/camel/reifier/CatchReifier.java | 12 +-- .../reifier/errorhandler/ErrorHandlerReifier.java | 6 +- .../rest/RestComponentVerifierExtensionTest.java | 2 +- .../component/rest/RestComponentVerifierTest.java | 2 +- ...rParallelWithIteratorThrowingExceptionTest.java | 34 --- .../DefaultManagementObjectStrategy.java | 106 - .../management/JmxManagementLifecycleStrategy.java | 4 +- .../mbean/ManagedStreamCachingStrategy.java| 34 +++ .../management/mbean/RouteCoverageXmlParser.java | 70 +++--- .../ManagedStreamCachingStrategyTest.java | 8 ++ .../camel/converter/stream/CachedOutputStream.java | 6 +- .../org/apache/camel/support/AbstractExchange.java | 1 + .../camel/support/DefaultHeaderFilterStrategy.java | 2 +- .../DefaultScheduledPollConsumerScheduler.java | 2 +- .../org/apache/camel/support/EndpointHelper.java | 2 +- .../apache/camel/support/GroupTokenIterator.java | 2 +- .../org/apache/camel/support/MessageHelper.java| 4 +- .../org/apache/camel/support/ObjectHelper.java | 18 ++--
Re: [PR] Code cleanup [camel]
gnodet merged PR #14056: URL: https://github.com/apache/camel/pull/14056 -- 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/14: Cleanup
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 740c3b1a0235356346e8ee9ca38d0596513ca425 Author: Guillaume Nodet AuthorDate: Mon May 6 11:26:34 2024 +0200 Cleanup --- .../camel/component/master/MasterConsumer.java | 2 +- .../component/smpp/SmppConnectionFactory.java | 2 +- .../camel/impl/engine/AbstractCamelContext.java| 2 +- .../camel/impl/engine/CamelInternalProcessor.java | 12 +--- .../engine/DefaultAsyncProcessorAwaitManager.java | 4 +- .../impl/engine/DefaultCamelContextExtension.java | 3 - .../impl/engine/InternalRouteStartupManager.java | 11 ++-- .../camel/impl/engine/IntrospectionSupport.java| 19 +++--- .../AbstractLocationPropertiesSource.java | 9 +-- .../impl/cloud/ServiceCallProcessorFactory.java| 5 +- .../camel/impl/cluster/ClusteredRoutePolicy.java | 2 +- .../camel/impl/console/ConsumerDevConsole.java | 6 +- .../camel/catalog/impl/AbstractCamelCatalog.java | 11 ++-- .../apache/camel/catalog/impl/CatalogHelper.java | 5 +- .../org/apache/camel/impl/DefaultCamelContext.java | 9 ++- .../java/org/apache/camel/builder/AdviceWith.java | 9 +-- .../org/apache/camel/builder/AdviceWithTasks.java | 2 +- .../org/apache/camel/builder/ExpressionClause.java | 2 +- .../camel/builder/FlexibleAggregationStrategy.java | 4 +- .../camel/model/ProcessorDefinitionHelper.java | 2 +- .../processor/ClaimCheckAggregationStrategy.java | 4 +- .../java/org/apache/camel/processor/Splitter.java | 19 +- .../errorhandler/DefaultErrorHandler.java | 10 .../errorhandler/RedeliveryErrorHandler.java | 58 -- .../processor/resequencer/ResequencerEngine.java | 9 +-- .../org/apache/camel/reifier/CatchReifier.java | 12 +--- .../reifier/errorhandler/ErrorHandlerReifier.java | 6 +- .../rest/RestComponentVerifierExtensionTest.java | 2 +- .../component/rest/RestComponentVerifierTest.java | 2 +- .../management/JmxManagementLifecycleStrategy.java | 4 +- .../mbean/ManagedStreamCachingStrategy.java| 34 +-- .../management/mbean/RouteCoverageXmlParser.java | 70 +++--- .../ManagedStreamCachingStrategyTest.java | 8 +++ .../camel/converter/stream/CachedOutputStream.java | 6 +- .../org/apache/camel/support/AbstractExchange.java | 1 + .../camel/support/DefaultHeaderFilterStrategy.java | 2 +- .../DefaultScheduledPollConsumerScheduler.java | 2 +- .../org/apache/camel/support/EndpointHelper.java | 2 +- .../apache/camel/support/GroupTokenIterator.java | 2 +- .../org/apache/camel/support/MessageHelper.java| 4 +- .../org/apache/camel/support/ObjectHelper.java | 18 +++--- .../camel/support/PropertyBindingSupport.java | 52 .../builder/TokenPairExpressionIterator.java | 5 +- .../apache/camel/support/cache/ServicePool.java| 21 ++- .../camel/support/cache/SimpleSoftCache.java | 2 + .../camel/support/component/ApiMethodParser.java | 2 +- .../org/apache/camel/support/jndi/JndiContext.java | 6 +- .../support/management/MBeanInfoAssembler.java | 16 +++-- .../camel/support/processor/CamelLogProcessor.java | 1 - .../camel/support/processor/RestBindingAdvice.java | 15 ++--- .../apache/camel/support/resume/AdapterHelper.java | 2 +- .../java/org/apache/camel/util/CamelURIParser.java | 4 -- .../main/java/org/apache/camel/util/FileUtil.java | 7 +-- .../main/java/org/apache/camel/util/HostUtils.java | 10 ++-- .../main/java/org/apache/camel/util/IOHelper.java | 2 +- .../java/org/apache/camel/util/ObjectHelper.java | 2 +- .../camel/util/OrderedLocationProperties.java | 2 +- .../java/org/apache/camel/util/StringHelper.java | 2 +- .../org/apache/camel/util/StringQuoteHelper.java | 5 +- .../java/org/apache/camel/util/URISupport.java | 2 +- .../concurrent/SynchronousExecutorService.java | 2 +- .../apache/camel/xml/io/util/XmlStreamReader.java | 2 +- .../java/org/apache/camel/xml/in/BaseParser.java | 10 ++-- .../java/org/apache/camel/xml/io/MXParser.java | 56 +++-- .../java/org/apache/camel/xml/jaxb/JaxbHelper.java | 12 ++-- .../converter/jaxp/XMLStreamReaderInputStream.java | 2 +- .../processor/validation/ValidatingProcessor.java | 7 +-- 67 files changed, 256 insertions(+), 389 deletions(-) diff --git a/components/camel-master/src/main/java/org/apache/camel/component/master/MasterConsumer.java b/components/camel-master/src/main/java/org/apache/camel/component/master/MasterConsumer.java index e6d884efbbd..2204e82e322 100644 --- a/components/camel-master/src/main/java/org/apache/camel/component/master/MasterConsumer.java +++ b/components/camel-master/src/main/java/org/apache/camel/component/master/MasterConsumer.java @@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory; * A consumer
(camel) 09/14: Various small code enhancements
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8122b827d9971f2ae49d305ba506e849a5151c26
Author: Guillaume Nodet
AuthorDate: Tue May 14 14:39:51 2024 +0200
Various small code enhancements
---
.../main/java/org/apache/camel/impl/DefaultDumpRoutesStrategy.java | 1 +
.../src/main/java/org/apache/camel/builder/RouteBuilder.java| 6 +++---
.../main/java/org/apache/camel/support/ScheduledPollConsumer.java | 1 -
core/camel-util/src/main/java/org/apache/camel/util/FileUtil.java | 1 +
core/camel-util/src/main/java/org/apache/camel/util/IOHelper.java | 1 +
.../src/main/java/org/apache/camel/xml/io/util/XmlStreamReader.java | 1 +
.../src/main/java/org/apache/camel/xml/io/MXParser.java | 3 +--
7 files changed, 8 insertions(+), 6 deletions(-)
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultDumpRoutesStrategy.java
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultDumpRoutesStrategy.java
index 3dcef35376d..81da7ca1925 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultDumpRoutesStrategy.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultDumpRoutesStrategy.java
@@ -542,6 +542,7 @@ public class DefaultDumpRoutesStrategy extends
ServiceSupport implements DumpRou
}
}
+@SuppressWarnings("ResultOfMethodCallIgnored")
protected void doDumpToDirectory(Resource resource, StringBuilder sbLocal,
String kind, String ext, Set files) {
if (output != null && !sbLocal.isEmpty()) {
// make sure directory exists
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
index ac284692b9e..08de3c7147e 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
@@ -77,7 +77,7 @@ public abstract class RouteBuilder extends BuilderSupport
implements RoutesBuild
private final List transformerBuilders = new
ArrayList<>();
private final List validatorBuilders = new ArrayList<>();
// XML and YAML DSL allows to define custom beans which we need to capture
-private final List beans = new ArrayList<>();
+private final List> beans = new ArrayList<>();
private RestsDefinition restCollection = new RestsDefinition();
private RestConfigurationDefinition restConfiguration;
@@ -928,7 +928,7 @@ public abstract class RouteBuilder extends BuilderSupport
implements RoutesBuild
CamelContext camelContext = notNullCamelContext();
Model model =
camelContext.getCamelContextExtension().getContextPlugin(Model.class);
-for (BeanFactoryDefinition def : beans) {
+for (BeanFactoryDefinition def : beans) {
// add to model
model.addCustomBean(def);
}
@@ -944,7 +944,7 @@ public abstract class RouteBuilder extends BuilderSupport
implements RoutesBuild
return getRestCollection();
}
-public List getBeans() {
+public List> getBeans() {
return beans;
}
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java
b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java
index 98e26fb6b26..6d02602c9c6 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java
@@ -186,7 +186,6 @@ public abstract class ScheduledPollConsumer extends
DefaultConsumer
while (!done) {
try {
-cause = null;
// eager assume we are done
done = true;
if (isPollAllowed()) {
diff --git a/core/camel-util/src/main/java/org/apache/camel/util/FileUtil.java
b/core/camel-util/src/main/java/org/apache/camel/util/FileUtil.java
index c5babf65459..b85832c4625 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/FileUtil.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/FileUtil.java
@@ -83,6 +83,7 @@ public final class FileUtil {
return IS_WINDOWS;
}
+@SuppressWarnings("ResultOfMethodCallIgnored")
public static File createTempFile(String prefix, String suffix, File
parentDir) throws IOException {
Objects.requireNonNull(parentDir);
diff --git a/core/camel-util/src/main/java/org/apache/camel/util/IOHelper.java
b/core/camel-util/src/main/java/org/apache/camel/util/IOHelper.java
index 925cc7cb32a..239b861de57 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/IOHelper.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/IOHelper.java
@@ -517,6 +517,7 @@
(camel) 05/14: Remove wrong optimization
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 036ec60458949addb12bd222f16a7d76e75b3f3f
Author: Guillaume Nodet
AuthorDate: Tue May 14 10:11:28 2024 +0200
Remove wrong optimization
The benchmark on JDK 22 gives me the following:
BenchmarkMode Cnt Score Error
Units
ArrayCopyBenchmark.arraysFill thrpt 25 272368248.021 ± 1420262.516
ops/s
ArrayCopyBenchmark.systemArrayCopy thrpt 25 169188743.936 ± 1923345.140
ops/s
See
http://psy-lob-saw.blogspot.com/2015/04/on-arraysfill-intrinsics-superword-and.html
for background information.
---
core/camel-base-engine/pom.xml | 13 ++
.../camel/impl/engine/CamelInternalProcessor.java | 8 +---
.../camel/impl/engine/ArrayCopyBenchmark.java | 50 ++
3 files changed, 65 insertions(+), 6 deletions(-)
diff --git a/core/camel-base-engine/pom.xml b/core/camel-base-engine/pom.xml
index e75720e2a50..7e562efbeb4 100644
--- a/core/camel-base-engine/pom.xml
+++ b/core/camel-base-engine/pom.xml
@@ -50,6 +50,19 @@
slf4j-api
+
+org.openjdk.jmh
+jmh-core
+1.37
+test
+
+
+org.openjdk.jmh
+jmh-generator-annprocess
+1.37
+test
+
+
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 f2b0faef125..56a061be2e8 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
@@ -17,6 +17,7 @@
package org.apache.camel.impl.engine;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
@@ -116,7 +117,6 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor implements In
private final ShutdownStrategy shutdownStrategy;
private final List> advices = new
ArrayList<>();
private byte statefulAdvices;
-private Object[] emptyStatefulStates;
private PooledObjectFactory taskFactory;
public CamelInternalProcessor(CamelContext camelContext) {
@@ -142,9 +142,6 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor implements In
int capacity =
camelContext.getCamelContextExtension().getExchangeFactory().getCapacity();
taskFactory.setCapacity(capacity);
LOG.trace("Using TaskFactory: {}", taskFactory);
-
-// create empty array we can use for reset
-emptyStatefulStates = new Object[statefulAdvices];
}
ServiceHelper.buildService(taskFactory, processor);
@@ -236,8 +233,7 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor implements In
@Override
public void reset() {
-// reset array by copying over from empty which is a very fast JVM
optimized operation
-System.arraycopy(emptyStatefulStates, 0, states, 0,
statefulAdvices);
+Arrays.fill(this.states, null);
this.exchange = null;
this.originalCallback = null;
}
diff --git
a/core/camel-base-engine/src/test/java/org/apache/camel/impl/engine/ArrayCopyBenchmark.java
b/core/camel-base-engine/src/test/java/org/apache/camel/impl/engine/ArrayCopyBenchmark.java
new file mode 100644
index 000..a727980cad0
--- /dev/null
+++
b/core/camel-base-engine/src/test/java/org/apache/camel/impl/engine/ArrayCopyBenchmark.java
@@ -0,0 +1,50 @@
+/*
+ * 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.Arrays;
+
+import org.openjdk.jmh.annotations.*;
+
+@State(Scope.Benchmark)
+public class ArrayCopyBenchmark {
+
+private static final int ARRAY_SIZE = 10; // Adjust as needed
+
(camel) 03/14: Fix jira double check locking
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f6b309eaa894327ae1c15303ad725286548869b2
Author: Guillaume Nodet
AuthorDate: Thu May 2 16:28:56 2024 +0200
Fix jira double check locking
---
.../apache/camel/component/jira/JiraEndpoint.java | 64 ++
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git
a/components/camel-jira/src/main/java/org/apache/camel/component/jira/JiraEndpoint.java
b/components/camel-jira/src/main/java/org/apache/camel/component/jira/JiraEndpoint.java
index 2be8eefcf14..f8da482ed8d 100644
---
a/components/camel-jira/src/main/java/org/apache/camel/component/jira/JiraEndpoint.java
+++
b/components/camel-jira/src/main/java/org/apache/camel/component/jira/JiraEndpoint.java
@@ -77,9 +77,7 @@ import static
org.apache.camel.component.jira.JiraConstants.JIRA_REST_CLIENT_FAC
category = { Category.DOCUMENT }, headersClass =
JiraConstants.class)
public class JiraEndpoint extends DefaultEndpoint {
-private static final transient Logger LOG =
LoggerFactory.getLogger(JiraEndpoint.class);
-
-private final Object lock = new Object();
+private static final Logger LOG =
LoggerFactory.getLogger(JiraEndpoint.class);
@UriPath
@Metadata(required = true)
@@ -118,43 +116,39 @@ public class JiraEndpoint extends DefaultEndpoint {
disconnect();
}
-public void connect() {
+public synchronized void connect() {
if (client == null) {
-synchronized (lock) {
-if (client == null) {
-Registry registry = getCamelContext().getRegistry();
-JiraRestClientFactory factory
-=
registry.lookupByNameAndType(JIRA_REST_CLIENT_FACTORY,
JiraRestClientFactory.class);
-if (factory == null) {
-factory = new OAuthAsynchronousJiraRestClientFactory();
-}
-final URI jiraServerUri =
URI.create(configuration.getJiraUrl());
-if (configuration.getUsername() != null) {
-LOG.debug("Connecting to JIRA with Basic
authentication with username/password");
-client =
factory.createWithBasicHttpAuthentication(jiraServerUri,
configuration.getUsername(),
-configuration.getPassword());
-} else if (configuration.getAccessToken() != null
-&& configuration.getVerificationCode() == null
-&& configuration.getPrivateKey() == null
-&& configuration.getConsumerKey() == null) {
-client = factory.create(jiraServerUri, builder -> {
-builder.setHeader("Authorization", "Bearer " +
configuration.getAccessToken());
-});
-} else {
-LOG.debug("Connecting to JIRA with OAuth
authentication");
-JiraOAuthAuthenticationHandler oAuthHandler = new
JiraOAuthAuthenticationHandler(
-configuration.getConsumerKey(),
-configuration.getVerificationCode(),
configuration.getPrivateKey(),
-configuration.getAccessToken(),
-configuration.getJiraUrl());
-client = factory.create(jiraServerUri, oAuthHandler);
-}
-}
+Registry registry = getCamelContext().getRegistry();
+JiraRestClientFactory factory
+= registry.lookupByNameAndType(JIRA_REST_CLIENT_FACTORY,
JiraRestClientFactory.class);
+if (factory == null) {
+factory = new OAuthAsynchronousJiraRestClientFactory();
+}
+final URI jiraServerUri = URI.create(configuration.getJiraUrl());
+if (configuration.getUsername() != null) {
+LOG.debug("Connecting to JIRA with Basic authentication with
username/password");
+client =
factory.createWithBasicHttpAuthentication(jiraServerUri,
configuration.getUsername(),
+configuration.getPassword());
+} else if (configuration.getAccessToken() != null
+&& configuration.getVerificationCode() == null
+&& configuration.getPrivateKey() == null
+&& configuration.getConsumerKey() == null) {
+client = factory.create(jiraServerUri, builder -> {
+builder.setHeader("Authorization", "Bearer " +
configuration.getAccessToken());
+});
+} else {
+LOG.debug("Connecting to JIRA with OAuth authentication");
+JiraOAuthAuthenticationHandler
(camel) 14/14: Filter out null pairs earlier in multicast processor
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4a75e5d1c61514f515adcde97ee4c06c6e7c5548
Author: Guillaume Nodet
AuthorDate: Tue May 14 14:43:41 2024 +0200
Filter out null pairs earlier in multicast processor
---
.../apache/camel/processor/MulticastProcessor.java | 16 ++
...rParallelWithIteratorThrowingExceptionTest.java | 34 --
2 files changed, 22 insertions(+), 28 deletions(-)
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java
index 89f946fa4e7..4f1fe2bdddb 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java
@@ -22,6 +22,7 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.Executor;
@@ -69,6 +70,7 @@ import org.apache.camel.support.PatternHelper;
import org.apache.camel.support.PluginHelper;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.CastUtils;
+import org.apache.camel.util.FilterIterator;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.StopWatch;
import org.apache.camel.util.concurrent.AsyncCompletionService;
@@ -407,7 +409,7 @@ public class MulticastProcessor extends
AsyncProcessorSupport
this.original = original;
this.pairs = pairs;
this.callback = callback;
-this.iterator = pairs.iterator();
+this.iterator = new FilterIterator<>(pairs.iterator(),
Objects::nonNull);
if (timeout > 0) {
timeoutTask = schedule(aggregateExecutorService,
this::timeout, timeout, TimeUnit.MILLISECONDS);
} else {
@@ -544,13 +546,7 @@ public class MulticastProcessor extends
AsyncProcessorSupport
ProcessorExchangePair pair = iterator.next();
boolean hasNext = iterator.hasNext();
-// some iterators may return true for hasNext() but then null
in next()
-if (pair == null && !hasNext) {
-doDone(result.get(), true);
-return;
-}
-// TODO looks like pair can still be null as the if above has
composite condition?
Exchange exchange = pair.getExchange();
int index = nbExchangeSent.getAndIncrement();
updateNewExchange(exchange, index, pairs, hasNext);
@@ -654,13 +650,7 @@ public class MulticastProcessor extends
AsyncProcessorSupport
ProcessorExchangePair pair = iterator.next();
boolean hasNext = iterator.hasNext();
-// some iterators may return true for hasNext() but then null in
next()
-if (pair == null && !hasNext) {
-doDone(result.get(), true);
-return false;
-}
-// TODO looks like pair can still be null as the if above has
composite condition?
Exchange exchange = pair.getExchange();
int index = nbExchangeSent.getAndIncrement();
updateNewExchange(exchange, index, pairs, hasNext);
diff --git
a/core/camel-core/src/test/java/org/apache/camel/issues/SplitterParallelWithIteratorThrowingExceptionTest.java
b/core/camel-core/src/test/java/org/apache/camel/issues/SplitterParallelWithIteratorThrowingExceptionTest.java
index 17ec46cdd4e..ccd568d9572 100644
---
a/core/camel-core/src/test/java/org/apache/camel/issues/SplitterParallelWithIteratorThrowingExceptionTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/issues/SplitterParallelWithIteratorThrowingExceptionTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.issues;
import java.util.Iterator;
-import java.util.function.Consumer;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
@@ -50,11 +49,27 @@ public class
SplitterParallelWithIteratorThrowingExceptionTest extends ContextTe
@Test
public void testIteratorThrowExceptionOnSecond() throws Exception {
+getMockEndpoint("mock:line").expectedMessageCount(0);
+getMockEndpoint("mock:end").expectedMessageCount(0);
+
+try {
+template.sendBody("direct:start", new MyIterator(2));
+fail("Should throw exception");
+} catch (Exception e) {
+IllegalArgumentException iae =
assertIsInstanceOf(IllegalArgumentException.class, e.getCause());
+assertEquals("Forced error", iae.getMessage());
+}
+
+
(camel) 01/14: Fix getter not returning the correct field
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8c0c9130230282662c014bdf94625c4932f04194
Author: Guillaume Nodet
AuthorDate: Thu May 2 16:11:19 2024 +0200
Fix getter not returning the correct field
---
.../src/main/java/org/apache/camel/component/gson/GsonDataFormat.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/components/camel-gson/src/main/java/org/apache/camel/component/gson/GsonDataFormat.java
b/components/camel-gson/src/main/java/org/apache/camel/component/gson/GsonDataFormat.java
index 294fd30e1b1..bbeaf5ee58e 100644
---
a/components/camel-gson/src/main/java/org/apache/camel/component/gson/GsonDataFormat.java
+++
b/components/camel-gson/src/main/java/org/apache/camel/component/gson/GsonDataFormat.java
@@ -256,7 +256,7 @@ public class GsonDataFormat extends ServiceSupport
}
public Type getUnmarshalGenericType() {
-return this.unmarshalType;
+return this.unmarshalGenericType;
}
public void setUnmarshalGenericType(Type unmarshalGenericType) {
(camel) 07/14: Use enhanced for loops and instanceof pattern matching
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 469a1fa8f426323f99aef2077e145a4ecd565a2b
Author: Guillaume Nodet
AuthorDate: Tue May 14 11:14:04 2024 +0200
Use enhanced for loops and instanceof pattern matching
---
.../org/apache/camel/processor/RecipientListProcessor.java | 12
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/RecipientListProcessor.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/RecipientListProcessor.java
index c12ea0b4873..c948c091208 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/RecipientListProcessor.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/RecipientListProcessor.java
@@ -200,18 +200,15 @@ public class RecipientListProcessor extends
MulticastProcessor {
// optimize for recipient without need for using delimiter
// (if its list/collection/array type)
-if (recipientList instanceof List) {
-List col = (List) recipientList;
+if (recipientList instanceof List col) {
int size = col.size();
List result = new ArrayList<>(size);
int index = 0;
-for (int i = 0; i < size; i++) {
-Object recipient = col.get(i);
+for (Object recipient : col) {
index = doCreateProcessorExchangePairs(exchange, recipient,
result, index);
}
return result;
-} else if (recipientList instanceof Collection) {
-Collection col = (Collection) recipientList;
+} else if (recipientList instanceof Collection col) {
int size = col.size();
List result = new ArrayList<>(size);
int index = 0;
@@ -224,8 +221,7 @@ public class RecipientListProcessor extends
MulticastProcessor {
int size = Array.getLength(recipientList);
List result = new ArrayList<>(size);
int index = 0;
-for (int i = 0; i < size; i++) {
-Object recipient = arr[i];
+for (Object recipient : arr) {
index = doCreateProcessorExchangePairs(exchange, recipient,
result, index);
}
return result;
(camel) 06/14: Remove redundant initialization
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c725911c2b01927e9420a198773e79694a2922f7
Author: Guillaume Nodet
AuthorDate: Tue May 14 11:02:37 2024 +0200
Remove redundant initialization
---
.../language/simple/SimplePredicateParser.java | 21 ++---
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
index 49695a93d8f..b7df246923b 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
@@ -664,13 +664,13 @@ public class SimplePredicateParser extends
BaseSimpleParser {
// based on the parameter types the binary operator support, we
need to set this state into
// the following booleans so we know how to proceed in the grammar
-boolean literalWithFunctionsSupported = false;
-boolean literalSupported = false;
-boolean functionSupported = false;
-boolean numericSupported = false;
-boolean booleanSupported = false;
-boolean nullSupported = false;
-boolean minusSupported = false;
+boolean literalWithFunctionsSupported;
+boolean literalSupported;
+boolean functionSupported;
+boolean numericSupported;
+boolean booleanSupported;
+boolean nullSupported;
+boolean minusSupported;
if (types == null || types.length == 0) {
literalWithFunctionsSupported = true;
// favor literal with functions over literals without functions
@@ -681,6 +681,13 @@ public class SimplePredicateParser extends
BaseSimpleParser {
nullSupported = true;
minusSupported = true;
} else {
+literalWithFunctionsSupported = false;
+literalSupported = false;
+functionSupported = false;
+numericSupported = false;
+booleanSupported = false;
+nullSupported = false;
+minusSupported = false;
for (BinaryOperatorType.ParameterType parameterType : types) {
literalSupported |= parameterType.isLiteralSupported();
literalWithFunctionsSupported |=
parameterType.isLiteralWithFunctionSupport();
(camel) 08/14: Streamline SharedCamelInternalProcessor which was copied from CamelInternalProcessor but has a more limited scope
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b4b66d5b9dc9ce44a5ed497076fd837c73b70b0c
Author: Guillaume Nodet
AuthorDate: Tue May 14 14:39:08 2024 +0200
Streamline SharedCamelInternalProcessor which was copied from
CamelInternalProcessor but has a more limited scope
---
.../apache/camel/impl/engine/AdviceIterator.java | 16 ++--
.../impl/engine/SharedCamelInternalProcessor.java | 102 +
2 files changed, 33 insertions(+), 85 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
index 02461653431..d89fdcc92f3 100644
---
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
@@ -36,12 +36,16 @@ final class AdviceIterator {
if (task.hasState()) {
state = states[stateIndex--];
}
-try {
-task.after(exchange, state);
-} catch (Exception e) {
-exchange.setException(e);
-// allow all advices to complete even if there was an exception
-}
+runAfterTask(task, state, exchange);
+}
+}
+
+static void runAfterTask(CamelInternalProcessorAdvice task, Object state,
Exchange exchange) {
+try {
+task.after(exchange, state);
+} catch (Exception 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/SharedCamelInternalProcessor.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SharedCamelInternalProcessor.java
index d64b2c174cb..5ab5b8ddf66 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SharedCamelInternalProcessor.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SharedCamelInternalProcessor.java
@@ -16,8 +16,7 @@
*/
package org.apache.camel.impl.engine;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Objects;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.RejectedExecutionException;
@@ -25,7 +24,6 @@ import org.apache.camel.AsyncCallback;
import org.apache.camel.AsyncProcessor;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
-import org.apache.camel.Ordered;
import org.apache.camel.Processor;
import org.apache.camel.spi.AsyncProcessorAwaitManager;
import org.apache.camel.spi.CamelInternalProcessorAdvice;
@@ -36,7 +34,6 @@ import org.apache.camel.spi.ShutdownStrategy;
import org.apache.camel.spi.Transformer;
import org.apache.camel.spi.UnitOfWork;
import org.apache.camel.support.AsyncCallbackToCompletableFutureAdapter;
-import org.apache.camel.support.OrderedComparator;
import org.apache.camel.support.PluginHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -66,37 +63,20 @@ import org.slf4j.LoggerFactory;
* Debugging tips: Camel end users whom want to debug their Camel
applications with the Camel source code, then
* make sure to read the source code of this class about the debugging tips,
which you can find in the
* {@link #process(Exchange, AsyncCallback, AsyncProcessor, Processor)} method.
- *
- * The added advices can implement {@link Ordered} to control in which order
the advices are executed.
*/
public class SharedCamelInternalProcessor implements SharedInternalProcessor {
private static final Logger LOG =
LoggerFactory.getLogger(SharedCamelInternalProcessor.class);
-private static final Object[] EMPTY_STATES = new Object[0];
private final ReactiveExecutor reactiveExecutor;
private final AsyncProcessorAwaitManager awaitManager;
private final ShutdownStrategy shutdownStrategy;
-private final List> advices;
-private byte statefulAdvices;
+private final CamelInternalProcessorAdvice advice;
-public SharedCamelInternalProcessor(CamelContext camelContext,
CamelInternalProcessorAdvice... advices) {
+public SharedCamelInternalProcessor(CamelContext camelContext,
CamelInternalProcessorAdvice advice) {
this.reactiveExecutor =
camelContext.getCamelContextExtension().getReactiveExecutor();
this.awaitManager =
PluginHelper.getAsyncProcessorAwaitManager(camelContext);
this.shutdownStrategy = camelContext.getShutdownStrategy();
-
-if (advices != null) {
-this.advices = new ArrayList<>(advices.length);
-for (CamelInternalProcessorAdvice advice : advices) {
-this.advices.add(advice);
-if (advice.hasState()) {
-
(camel) 10/14: Reuse the existing comparator instead of storing it
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8aa4cabaccfc5224fc4fe6b9bae125d403d838b0
Author: Guillaume Nodet
AuthorDate: Tue May 14 14:44:42 2024 +0200
Reuse the existing comparator instead of storing it
---
.../processor/resequencer/ResequencerEngine.java | 8
.../apache/camel/processor/resequencer/Sequence.java | 20 +---
2 files changed, 13 insertions(+), 15 deletions(-)
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
index fc8272ce697..dc7bed62ec9 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/resequencer/ResequencerEngine.java
@@ -187,8 +187,8 @@ public class ResequencerEngine {
Element element = new Element<>(o);
// validate the exchange has no problem
-if (!sequence.comparator().isValid(element)) {
-throw new IllegalArgumentException("Element cannot be used in
comparator: " + sequence.comparator());
+if (!sequence.seqComparator().isValid(element)) {
+throw new IllegalArgumentException("Element cannot be used in
comparator: " + sequence.seqComparator());
}
// validate the exchange shouldn't be 'rejected' (if applicable)
@@ -275,7 +275,7 @@ public class ResequencerEngine {
if (lastDelivered == null) {
return false;
}
-if (sequence.comparator().successor(element, lastDelivered)) {
+if (sequence.seqComparator().successor(element, lastDelivered)) {
return true;
}
return false;
@@ -291,7 +291,7 @@ public class ResequencerEngine {
if (lastDelivered == null) {
return false;
}
-if (sequence.comparator().compare(element, lastDelivered) < 0) {
+if (sequence.seqComparator().compare(element, lastDelivered) < 0) {
return true;
}
return false;
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/resequencer/Sequence.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/resequencer/Sequence.java
index 11b2d46b46f..f16c509536e 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/resequencer/Sequence.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/resequencer/Sequence.java
@@ -17,6 +17,7 @@
package org.apache.camel.processor.resequencer;
import java.io.Serial;
+import java.util.Objects;
import java.util.TreeSet;
/**
@@ -28,16 +29,13 @@ public class Sequence extends TreeSet {
private static final @Serial long serialVersionUID = 5647393631147741711L;
-private final SequenceElementComparator comparator;
-
/**
* Creates a new {@link Sequence} instance.
*
* @param comparator a strategy for comparing elements of this sequence.
*/
public Sequence(SequenceElementComparator comparator) {
-super(comparator);
-this.comparator = comparator;
+super(Objects.requireNonNull(comparator));
}
/**
@@ -52,7 +50,7 @@ public class Sequence extends TreeSet {
if (elem == null) {
return null;
}
-if (comparator.predecessor(elem, e)) {
+if (seqComparator().predecessor(elem, e)) {
return elem;
}
return null;
@@ -70,7 +68,7 @@ public class Sequence extends TreeSet {
if (elem == null) {
return null;
}
-if (comparator.successor(elem, e)) {
+if (seqComparator().successor(elem, e)) {
return elem;
}
return null;
@@ -81,9 +79,9 @@ public class Sequence extends TreeSet {
*
* @return this sequence's comparator.
*/
-@Override
-public SequenceElementComparator comparator() {
-return comparator;
+@SuppressWarnings("unchecked")
+public SequenceElementComparator seqComparator() {
+return Objects.requireNonNull((SequenceElementComparator)
super.comparator());
}
/**
@@ -102,7 +100,7 @@ public class Sequence extends TreeSet {
if (found) {
return current;
}
-if (comparator.compare(e, current) == 0) {
+if (seqComparator().compare(e, current) == 0) {
found = true;
}
}
@@ -122,7 +120,7 @@ public class Sequence extends TreeSet {
public E lower(E e) {
E last = null;
for (E current : this) {
-if (comparator.compare(e, current) == 0) {
+if (seqComparator().compare(e, current) == 0) {
(camel-kamelets) branch dependabot/maven/com.amazon.redshift-redshift-jdbc42-2.1.0.28 created (now 00ba887b)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/com.amazon.redshift-redshift-jdbc42-2.1.0.28 in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git at 00ba887b Bump com.amazon.redshift:redshift-jdbc42 from 2.1.0.27 to 2.1.0.28 No new revisions were added by this update.
[PR] Bump com.amazon.redshift:redshift-jdbc42 from 2.1.0.27 to 2.1.0.28 [camel-kamelets]
dependabot[bot] opened a new pull request, #2043: URL: https://github.com/apache/camel-kamelets/pull/2043 Bumps [com.amazon.redshift:redshift-jdbc42](https://github.com/aws/amazon-redshift-jdbc-driver) from 2.1.0.27 to 2.1.0.28. Release notes Sourced from https://github.com/aws/amazon-redshift-jdbc-driver/releases;>com.amazon.redshift:redshift-jdbc42's releases. v2.1.0.28 Release of driver version 2.1.0.28 Changelog Sourced from https://github.com/aws/amazon-redshift-jdbc-driver/blob/master/CHANGELOG.md;>com.amazon.redshift:redshift-jdbc42's changelog. v2.1.0.28 (2024-05-14) Security improvements (CVE-2024-32888) Consolidated SDK API calls for retrieving cluster credentials for serverless instances. Added logging of returned cluster identifiers during custom domain name resolution to aid debugging. Added Object IDentifier (OID) mappings for missing Redshift data types. Added null check for IsServerless property within IamHelper to address Dbeaver error (GitHub Issue https://redirect.github.com/aws/amazon-redshift-jdbc-driver/issues/114;>#114) Commits See full diff in https://github.com/aws/amazon-redshift-jdbc-driver/commits/v2.1.0.28;>compare view [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore 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
Re: [I] [CI] - Quarkus Main Branch Build Failure [camel-quarkus]
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-2111479064 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 9088984735-1483-9c70c5de-3c37-4d87-ab00-e9b65ff0ba67 * Camel Quarkus Commit: b47452b2e202bd3329baeab91c89f272cc4d7a78 * Quarkus Main Commit: 8952f9d0ea4a50b6bdfd19304c2f800fa22703d5 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/9088984735 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-kafka-connector) branch automatic-periodic-sync updated (0c7990d6ae -> 975aff7d60)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch automatic-periodic-sync in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git from 0c7990d6ae Bump actions/checkout from 4.1.4 to 4.1.5 (#1634) add 975aff7d60 Updated CHANGELOG.md No new revisions were added by this update. Summary of changes: CHANGELOG.md | 1 + 1 file changed, 1 insertion(+)
Re: [I] [CI] - Camel Main Branch Build Failure [camel-quarkus]
github-actions[bot] commented on issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927#issuecomment-2111373293 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 9087897708-1379-7e12f686-f8a5-4941-af51-a03d8ddbd810 * Camel Quarkus Commit: 1e98a7d90130cb6b8dd723a85763a3e4fafe1146 * Camel Main Commit: 8952f9d0ea4a50b6bdfd19304c2f800fa22703d5 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/9087897708 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) [camel-spring-boot]
github-actions[bot] closed pull request #1146: [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) URL: https://github.com/apache/camel-spring-boot/pull/1146 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-k) branch main updated: chore: nightly automatic updates
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/main by this push: new d05d4e4e7 chore: nightly automatic updates d05d4e4e7 is described below commit d05d4e4e7dee60e368006d176b7f720aed784755 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue May 14 23:46:05 2024 + chore: nightly automatic updates --- CHANGELOG.md | 2 + README.adoc | 2 +- badge.out | 2 +- coverage | 2 +- coverage.out | 212 +++--- docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 4 - 6 files changed, 111 insertions(+), 113 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d3426132..4c357982d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ **Merged pull requests:** +- Re evaluate golanci-lint exclusions \(execinquery,whitespace,wastedassign,tagliatelle,nolintlint,lll\)" [\#5502](https://github.com/apache/camel-k/pull/5502) ([lburgazzoli](https://github.com/lburgazzoli)) - feat\(lint\): enabe goconst linter [\#5499](https://github.com/apache/camel-k/pull/5499) ([lburgazzoli](https://github.com/lburgazzoli)) - feat\(lint\): enabe magic number detector \(mld\) [\#5496](https://github.com/apache/camel-k/pull/5496) ([lburgazzoli](https://github.com/lburgazzoli)) - chore\(tools\): update golangci-lint to v1.58.1 [\#5495](https://github.com/apache/camel-k/pull/5495) ([lburgazzoli](https://github.com/lburgazzoli)) @@ -39,6 +40,7 @@ - chore\(deps\): bump golang.org/x/text from 0.14.0 to 0.15.0 [\#5453](https://github.com/apache/camel-k/pull/5453) ([dependabot[bot]](https://github.com/apps/dependabot)) - Test fixes [\#5415](https://github.com/apache/camel-k/pull/5415) ([valdar](https://github.com/valdar)) - fix\(\#5292\): Simplify run cmd for archs other than amd64 [\#5403](https://github.com/apache/camel-k/pull/5403) ([tdiesler](https://github.com/tdiesler)) +- feat\(4893\) YAML DSL route configuration support [\#5369](https://github.com/apache/camel-k/pull/5369) ([realMartinez](https://github.com/realMartinez)) ## [2.3.2-nightly](https://github.com/apache/camel-k/tree/2.3.2-nightly) (2024-05-06) diff --git a/README.adoc b/README.adoc index f2280a98f..ae0d17f36 100644 --- a/README.adoc +++ b/README.adoc @@ -11,7 +11,7 @@ image:https://github.com/apache/camel-k/actions/workflows/common.yml/badge.svg[; image:https://github.com/apache/camel-k/workflows/knative/badge.svg["Knative;, link="https://github.com/apache/camel-k/actions/workflows/knative.yml;] image:https://github.com/apache/camel-k/actions/workflows/nightly-release.yml/badge.svg["Nightly releases", link="https://github.com/apache/camel-k/actions/workflows/nightly-release.yml;] image:https://github.com/apache/camel-k/actions/workflows/nightly-native-test.yml/badge.svg["Quarkus native", link="https://github.com/apache/camel-k/actions/workflows/nightly-native-test.yml;] -image:https://img.shields.io/badge/Coverage-38.1%25-yellow.svg["Go coverage", link="https://github.com/apache/camel-k/actions/workflows/nightly-coverage.yml;] +image:https://img.shields.io/badge/Coverage-38.2%25-yellow.svg["Go coverage", link="https://github.com/apache/camel-k/actions/workflows/nightly-coverage.yml;] image:https://img.shields.io/badge/zulip-join_chat-brightgreen.svg["Chat on Zulip", link="https://camel.zulipchat.com;] Apache Camel K is a lightweight integration framework built from **Apache Camel** that runs natively on Kubernetes and is specifically designed for serverless and microservice architectures. Users of `Camel K` can instantly run integration code written in Camel DSL on their preferred **Cloud** provider. diff --git a/badge.out b/badge.out index 853ac0979..1d40807be 100644 --- a/badge.out +++ b/badge.out @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/coverage b/coverage index ee8f20531..135c571ae 100644 --- a/coverage +++ b/coverage @@ -1 +1 @@ -38.1 +38.2 diff --git a/coverage.out b/coverage.out index fac44769e..1a36b8643 100644 --- a/coverage.out +++ b/coverage.out @@ -144,8 +144,8 @@ github.com/apache/camel-k/v2/pkg/apis/camel/v1/common_types_support.go:190: G github.com/apache/camel-k/v2/pkg/apis/camel/v1/common_types_support.go:203: SetAnnotation 0.0% github.com/apache/camel-k/v2/pkg/apis/camel/v1/common_types_support.go:215: IsEmpty
Re: [PR] Bump quarkiverse-pooled-jms.version from 2.3.1 to 2.4.0 [camel-quarkus]
github-actions[bot] commented on PR #6086: URL: https://github.com/apache/camel-quarkus/pull/6086#issuecomment-2111247357 :warning: :warning: :warning: Branch auto synchronized due to changes in generated files. New workflow run triggered: https://github.com/apache/camel-quarkus/actions/runs/9087021623 Please check the workflow result before merging. :warning: :warning: :warning: -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus) branch dependabot/maven/quarkiverse-pooled-jms.version-2.4.0 updated (8b30b3bf9f -> d5b2678a5f)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/quarkiverse-pooled-jms.version-2.4.0 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from 8b30b3bf9f Bump quarkiverse-pooled-jms.version from 2.3.1 to 2.4.0 add d5b2678a5f Auto generated changes for dependabot commit 8b30b3bf9faadb052568870bde1b1d8eb35ac692 No new revisions were added by this update. Summary of changes: poms/bom/src/main/generated/flattened-full-pom.xml| 4 ++-- poms/bom/src/main/generated/flattened-reduced-pom.xml | 4 ++-- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
[PR] CAMEL-20206: split overly complex method in ValidateMojo [camel]
4nt01ne opened a new pull request, #14147: URL: https://github.com/apache/camel/pull/14147 # Description Please review this PR. It's my second contribution. # Target - [ x] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [x ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ x] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Bump quarkiverse-pooled-jms.version from 2.3.1 to 2.4.0 [camel-quarkus]
dependabot[bot] opened a new pull request, #6086: URL: https://github.com/apache/camel-quarkus/pull/6086 Bumps `quarkiverse-pooled-jms.version` from 2.3.1 to 2.4.0. Updates `io.quarkiverse.messaginghub:quarkus-pooled-jms` from 2.3.1 to 2.4.0 Commits https://github.com/quarkiverse/quarkus-pooled-jms/commit/28bc919cc8bb97d502728b99447990d851e0ffc3;>28bc919 [maven-release-plugin] prepare release 2.4.0 https://github.com/quarkiverse/quarkus-pooled-jms/commit/b8e8040f0bc33ec948ced85ddff863514b48b3cd;>b8e8040 Update the latest release version 2.4.0 in documentation https://github.com/quarkiverse/quarkus-pooled-jms/commit/91010c667897e16b4ee7812bbce71ba33f89f80b;>91010c6 Release 2.4.0 (https://redirect.github.com/quarkiverse/quarkus-pooled-jms/issues/250;>#250) https://github.com/quarkiverse/quarkus-pooled-jms/commit/a190532e26aa93c20d60d9b4602c3bb0456fd0b3;>a190532 Update .github/workflows/build.yml to add 2.3.x https://github.com/quarkiverse/quarkus-pooled-jms/commit/f5c0d93920cf645728e8e60017b0fe2f8b6999d4;>f5c0d93 Fix https://redirect.github.com/quarkiverse/quarkus-pooled-jms/issues/248;>#248 to add clearAll (https://redirect.github.com/quarkiverse/quarkus-pooled-jms/issues/249;>#249) https://github.com/quarkiverse/quarkus-pooled-jms/commit/1bf1a524ef8a53496d142c547d9605143f2809fd;>1bf1a52 Bump quarkus.version from 3.9.4 to 3.10.0 (https://redirect.github.com/quarkiverse/quarkus-pooled-jms/issues/243;>#243) https://github.com/quarkiverse/quarkus-pooled-jms/commit/501afbbc521d0bf600955c288a7fc3f7253b414b;>501afbb Bump quarkus.version from 3.9.2 to 3.9.4 (https://redirect.github.com/quarkiverse/quarkus-pooled-jms/issues/242;>#242) https://github.com/quarkiverse/quarkus-pooled-jms/commit/c39f56f4f3081b99d17bfee0e6b43a340b408679;>c39f56f Bump io.quarkiverse.artemis:quarkus-artemis-bom from 3.2.1 to 3.3.0 (https://redirect.github.com/quarkiverse/quarkus-pooled-jms/issues/236;>#236) https://github.com/quarkiverse/quarkus-pooled-jms/commit/970b1df5811f1c48a596e20e5480235ff15d6da5;>970b1df Instead of only ignoring io.quarkus:quarkus-bom, ignore io.quarkus:* (https://redirect.github.com/quarkiverse/quarkus-pooled-jms/issues/238;>#238) https://github.com/quarkiverse/quarkus-pooled-jms/commit/24c7437231a526069598cab30994293b1f084872;>24c7437 Bump quarkus.version from 3.9.1 to 3.9.2 (https://redirect.github.com/quarkiverse/quarkus-pooled-jms/issues/233;>#233) Additional commits viewable in https://github.com/quarkiverse/quarkus-pooled-jms/compare/2.3.1...2.4.0;>compare view Updates `io.quarkiverse.messaginghub:quarkus-pooled-jms-deployment` from 2.3.1 to 2.4.0 Commits https://github.com/quarkiverse/quarkus-pooled-jms/commit/28bc919cc8bb97d502728b99447990d851e0ffc3;>28bc919 [maven-release-plugin] prepare release 2.4.0 https://github.com/quarkiverse/quarkus-pooled-jms/commit/b8e8040f0bc33ec948ced85ddff863514b48b3cd;>b8e8040 Update the latest release version 2.4.0 in documentation https://github.com/quarkiverse/quarkus-pooled-jms/commit/91010c667897e16b4ee7812bbce71ba33f89f80b;>91010c6 Release 2.4.0 (https://redirect.github.com/quarkiverse/quarkus-pooled-jms/issues/250;>#250) https://github.com/quarkiverse/quarkus-pooled-jms/commit/a190532e26aa93c20d60d9b4602c3bb0456fd0b3;>a190532 Update .github/workflows/build.yml to add 2.3.x https://github.com/quarkiverse/quarkus-pooled-jms/commit/f5c0d93920cf645728e8e60017b0fe2f8b6999d4;>f5c0d93 Fix https://redirect.github.com/quarkiverse/quarkus-pooled-jms/issues/248;>#248 to add clearAll (https://redirect.github.com/quarkiverse/quarkus-pooled-jms/issues/249;>#249) https://github.com/quarkiverse/quarkus-pooled-jms/commit/1bf1a524ef8a53496d142c547d9605143f2809fd;>1bf1a52 Bump quarkus.version from 3.9.4 to 3.10.0 (https://redirect.github.com/quarkiverse/quarkus-pooled-jms/issues/243;>#243) https://github.com/quarkiverse/quarkus-pooled-jms/commit/501afbbc521d0bf600955c288a7fc3f7253b414b;>501afbb Bump quarkus.version from 3.9.2 to 3.9.4 (https://redirect.github.com/quarkiverse/quarkus-pooled-jms/issues/242;>#242) https://github.com/quarkiverse/quarkus-pooled-jms/commit/c39f56f4f3081b99d17bfee0e6b43a340b408679;>c39f56f Bump io.quarkiverse.artemis:quarkus-artemis-bom from 3.2.1 to 3.3.0 (https://redirect.github.com/quarkiverse/quarkus-pooled-jms/issues/236;>#236) https://github.com/quarkiverse/quarkus-pooled-jms/commit/970b1df5811f1c48a596e20e5480235ff15d6da5;>970b1df Instead of only ignoring io.quarkus:quarkus-bom, ignore io.quarkus:* (https://redirect.github.com/quarkiverse/quarkus-pooled-jms/issues/238;>#238) https://github.com/quarkiverse/quarkus-pooled-jms/commit/24c7437231a526069598cab30994293b1f084872;>24c7437 Bump quarkus.version from 3.9.1 to 3.9.2 (https://redirect.github.com/quarkiverse/quarkus-pooled-jms/issues/233;>#233) Additional commits viewable in https://github.com/quarkiverse/quarkus-pooled-jms/compare/2.3.1...2.4.0;>compare view
(camel-quarkus) branch dependabot/maven/quarkiverse-pooled-jms.version-2.4.0 created (now 8b30b3bf9f)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/quarkiverse-pooled-jms.version-2.4.0 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git at 8b30b3bf9f Bump quarkiverse-pooled-jms.version from 2.3.1 to 2.4.0 No new revisions were added by this update.
(camel) branch regen_bot updated (914b19c90e4 -> dacc078dcf0)
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 914b19c90e4 Polished add dacc078dcf0 Rerun failing tests (#14144) No new revisions were added by this update. Summary of changes: parent/pom.xml | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-)
(camel) branch main updated (914b19c90e4 -> dacc078dcf0)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 914b19c90e4 Polished add dacc078dcf0 Rerun failing tests (#14144) No new revisions were added by this update. Summary of changes: parent/pom.xml | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-)
Re: [PR] Rerun failing tests [camel]
gnodet merged PR #14144: URL: https://github.com/apache/camel/pull/14144 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] camel-influxdb wrapper - integration test fix [camel-karaf]
ozgurkisir-qlik opened a new pull request, #283: URL: https://github.com/apache/camel-karaf/pull/283 Missing dependencies for camel-influxdb -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-karavan) branch main updated: Improved container management ui
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new e03347ed Improved container management ui
e03347ed is described below
commit e03347ed5bce88a9a5fc2f582a4f1d959cb40be4
Author: Marat Gubaidullin
AuthorDate: Tue May 14 15:24:49 2024 -0400
Improved container management ui
---
.../src/main/webui/src/project/DevModeToolbar.tsx | 29 +++---
1 file changed, 26 insertions(+), 3 deletions(-)
diff --git a/karavan-app/src/main/webui/src/project/DevModeToolbar.tsx
b/karavan-app/src/main/webui/src/project/DevModeToolbar.tsx
index 4cb70dea..fbfb682c 100644
--- a/karavan-app/src/main/webui/src/project/DevModeToolbar.tsx
+++ b/karavan-app/src/main/webui/src/project/DevModeToolbar.tsx
@@ -16,7 +16,18 @@
*/
import React, {useEffect, useState} from 'react';
-import {Badge, Button, Flex, FlexItem, Label, Switch, Tooltip,
TooltipPosition} from '@patternfly/react-core';
+import {
+Badge,
+Button,
+Flex,
+FlexItem,
+Label,
+Skeleton,
+Spinner,
+Switch,
+Tooltip,
+TooltipPosition
+} from '@patternfly/react-core';
import '../designer/karavan.css';
import RocketIcon from "@patternfly/react-icons/dist/esm/icons/rocket-icon";
import ReloadIcon from "@patternfly/react-icons/dist/esm/icons/bolt-icon";
@@ -39,6 +50,7 @@ export function DevModeToolbar(props: Props) {
const [project, refreshTrace] = useProjectStore((state) => [state.project,
state.refreshTrace], shallow)
const [containers] = useStatusesStore((state) => [state.containers],
shallow);
const [verbose, setVerbose] = useState(false);
+const [showSpinner, setShowSpinner] = useState(false);
const [setShowLog] = useLogStore((s) => [s.setShowLog], shallow);
const [currentContainerStatus, setCurrentContainerStatus] =
useState();
@@ -57,6 +69,14 @@ export function DevModeToolbar(props: Props) {
return () => clearInterval(interval);
}, [currentContainerStatus, containers]);
+useEffect(() => {
+if (showSpinner && currentContainerStatus === undefined &&
containerStatus === undefined) {
+setShowSpinner(false);
+// } else if (showSpinner && currentContainerStatus == undefined) {
+// setShowSpinner(false);
+}
+}, [currentContainerStatus]);
+
function refreshContainer(){
ProjectService.refreshContainerStatus(project.projectId,
config.environment);
ProjectService.refreshCamelStatus(project.projectId,
config.environment);
@@ -68,6 +88,9 @@ export function DevModeToolbar(props: Props) {
}
return (
+{showSpinner && inDevMode &&
+
+}
{containerStatus?.containerId &&
@@ -96,8 +119,8 @@ export function DevModeToolbar(props: Props) {
variant={"primary"}
icon={}
onClick={() => {
+setShowSpinner(true);
ProjectService.startDevModeContainer(project,
verbose);
-// setPoll(true);
}}>
{"Run"}
@@ -120,7 +143,7 @@ export function DevModeToolbar(props: Props) {
variant={"control"}
icon={}
onClick={() => {
-// setPoll(true);
+setShowSpinner(true);
ProjectService.deleteDevModeContainer(project);
}}>
(camel-karavan) 01/02: Log correct message for collectCamelStatuses if there is no port configured for the project
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
commit 11a74ad404c04ffa69aec0a030d29e146fdcc973
Author: Marat Gubaidullin
AuthorDate: Mon May 13 11:55:38 2024 -0400
Log correct message for collectCamelStatuses if there is no port configured
for the project
---
.../apache/camel/karavan/service/CamelService.java | 41 +-
1 file changed, 25 insertions(+), 16 deletions(-)
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/service/CamelService.java
b/karavan-app/src/main/java/org/apache/camel/karavan/service/CamelService.java
index 2668b76c..22217217 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/service/CamelService.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/service/CamelService.java
@@ -154,18 +154,22 @@ public class CamelService {
}
}
-public String getContainerAddressForStatus(ContainerStatus
containerStatus) {
+public String getContainerAddressForStatus(ContainerStatus
containerStatus) throws Exception {
if (ConfigService.inKubernetes()) {
return "http://; + containerStatus.getPodIP() + ":8080";
} else if (ConfigService.inDocker()) {
return "http://; + containerStatus.getContainerName() + ":8080";
} else {
Integer port =
projectService.getProjectPort(containerStatus.getContainerName());
-return "http://localhost:; + port;
+if (port != null) {
+return "http://localhost:; + port;
+} else {
+throw new Exception("No port configured for project " +
containerStatus.getContainerName());
+}
}
}
-public String getCamelStatus(ContainerStatus containerStatus,
CamelStatusValue.Name statusName) {
+public String getCamelStatus(ContainerStatus containerStatus,
CamelStatusValue.Name statusName) throws Exception {
String url = getContainerAddressForStatus(containerStatus) + "/q/dev/"
+ statusName.name();
try {
return getResult(url, 500);
@@ -177,20 +181,24 @@ public class CamelService {
@ConsumeEvent(value = CMD_COLLECT_CAMEL_STATUS, blocking = true, ordered =
true)
public void collectCamelStatuses(JsonObject data) {
-CamelStatusRequest dms =
data.getJsonObject("camelStatusRequest").mapTo(CamelStatusRequest.class);
-ContainerStatus containerStatus =
data.getJsonObject("containerStatus").mapTo(ContainerStatus.class);
-LOGGER.debug("Collect Camel Status for " +
containerStatus.getContainerName());
-String projectId = dms.getProjectId();
-String containerName = dms.getContainerName();
-List statuses = new ArrayList<>();
-Arrays.stream(CamelStatusValue.Name.values()).forEach(statusName -> {
-String status = getCamelStatus(containerStatus, statusName);
-if (status != null) {
-statuses.add(new CamelStatusValue(statusName, status));
+try {
+CamelStatusRequest dms =
data.getJsonObject("camelStatusRequest").mapTo(CamelStatusRequest.class);
+ContainerStatus containerStatus =
data.getJsonObject("containerStatus").mapTo(ContainerStatus.class);
+LOGGER.debug("Collect Camel Status for " +
containerStatus.getContainerName());
+String projectId = dms.getProjectId();
+String containerName = dms.getContainerName();
+List statuses = new ArrayList<>();
+for (CamelStatusValue.Name statusName :
CamelStatusValue.Name.values()) {
+String status = getCamelStatus(containerStatus, statusName);
+if (status != null) {
+statuses.add(new CamelStatusValue(statusName, status));
+}
}
-});
-CamelStatus cs = new CamelStatus(projectId, containerName, statuses,
environment);
-karavanCacheService.saveCamelStatus(cs);
+CamelStatus cs = new CamelStatus(projectId, containerName,
statuses, environment);
+karavanCacheService.saveCamelStatus(cs);
+} catch (Exception ex) {
+LOGGER.error("collectCamelStatuses " + (ex.getCause() != null ?
ex.getCause().getMessage() : ex.getMessage()));
+}
}
@CircuitBreaker(requestVolumeThreshold = 10, failureRatio = 0.5, delay =
1000)
@@ -203,6 +211,7 @@ public class CamelService {
return res.encodePrettily();
}
} catch (Exception ex) {
+LOGGER.error("getResult " + url);
LOGGER.error("getResult " + (ex.getCause() != null ?
ex.getCause().getMessage() : ex.getMessage()));
}
return null;
(camel-karavan) 02/02: Improved container management ui
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
commit d875aaf5718e0b602829ee660a9d6298940a5814
Author: Marat Gubaidullin
AuthorDate: Tue May 14 14:03:29 2024 -0400
Improved container management ui
---
karavan-app/pom.xml| 2 +-
.../camel/karavan/api/ContainerResource.java | 1 -
.../karavan/service/ContainerStatusService.java| 9 ++-
.../org/apache/camel/karavan/shared/Constants.java | 1 +
karavan-app/src/main/webui/src/api/KaravanApi.tsx | 9 +++
.../src/main/webui/src/api/NotificationService.ts | 4 +-
.../src/main/webui/src/api/ProjectService.ts | 17 ++
.../src/main/webui/src/editor/EditorToolbar.tsx| 1 -
karavan-app/src/main/webui/src/main/Main.tsx | 10 +---
.../src/main/webui/src/main/useMainHook.tsx| 24 +---
.../src/main/webui/src/project/BuildToolbar.tsx| 64 --
.../project/{devmode.css => DevModeToolbar.css}| 0
.../src/main/webui/src/project/DevModeToolbar.tsx | 49 -
.../src/main/webui/src/project/ProjectPage.tsx | 7 +--
.../src/main/webui/src/project/ProjectToolbar.tsx | 18 +-
15 files changed, 58 insertions(+), 158 deletions(-)
diff --git a/karavan-app/pom.xml b/karavan-app/pom.xml
index bb52d843..8cd13ba3 100644
--- a/karavan-app/pom.xml
+++ b/karavan-app/pom.xml
@@ -38,7 +38,7 @@
4.5.0
3.1.0
3.1.0
-2.3.6
+2.3.7
3.3.0
3.3.5
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/api/ContainerResource.java
b/karavan-app/src/main/java/org/apache/camel/karavan/api/ContainerResource.java
index 2cd59af9..3f13ae42 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/api/ContainerResource.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/api/ContainerResource.java
@@ -173,7 +173,6 @@ public class ContainerResource {
@Path("/{projectId}/{env}")
public List
getContainerStatusesByProjectAndEnv(@PathParam("projectId") String projectId,
@PathParam("env") String env) throws Exception {
return karavanCacheService.getContainerStatuses(projectId,
env).stream()
-.filter(podStatus -> Objects.equals(podStatus.getType(),
ContainerStatus.ContainerType.project))
.sorted(Comparator.comparing(ContainerStatus::getContainerName))
.collect(Collectors.toList());
}
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/service/ContainerStatusService.java
b/karavan-app/src/main/java/org/apache/camel/karavan/service/ContainerStatusService.java
index 69d52e6c..50d6c978 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/service/ContainerStatusService.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/service/ContainerStatusService.java
@@ -94,12 +94,17 @@ public class ContainerStatusService {
.filter(cs ->
!namesInDocker.contains(cs.getContainerName()))
.forEach(containerStatus -> {
eventBus.publish(ContainerStatusService.CONTAINER_DELETED,
JsonObject.mapFrom(containerStatus));
-
karavanCacheService.deleteContainerStatus(containerStatus);
-
karavanCacheService.deleteCamelStatuses(containerStatus.getProjectId(),
containerStatus.getEnv());
});
}
}
+@ConsumeEvent(value = CONTAINER_DELETED, blocking = true, ordered = true)
+public void cleanContainersStatus(JsonObject data) {
+ContainerStatus containerStatus = data.mapTo(ContainerStatus.class);
+karavanCacheService.deleteContainerStatus(containerStatus);
+
karavanCacheService.deleteCamelStatuses(containerStatus.getProjectId(),
containerStatus.getEnv());
+}
+
private boolean checkTransit(ContainerStatus cs) {
if (cs.getContainerId() == null && cs.getInTransit()) {
return Instant.parse(cs.getInitDate()).until(Instant.now(),
ChronoUnit.SECONDS) < 10;
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/shared/Constants.java
b/karavan-app/src/main/java/org/apache/camel/karavan/shared/Constants.java
index c2b9c1ac..55225dfa 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/shared/Constants.java
+++ b/karavan-app/src/main/java/org/apache/camel/karavan/shared/Constants.java
@@ -49,6 +49,7 @@ public class Constants {
public static final String NOTIFICATION_HEADER_CLASS_NAME = "className";
public static final String NOTIFICATION_EVENT_COMMIT = "commit";
+public static final String NOTIFICATION_EVENT_CONTAINER_STATUS =
"container_status";
public enum CamelRuntime {
CAMEL_MAIN("camel-main"),
diff --git a/karavan-app/src/main/webui/src/api/KaravanApi.tsx
b/karavan-app/src/main/webui/src/api/KaravanApi.tsx
index
(camel-karavan) branch main updated (4d37c857 -> d875aaf5)
This is an automated email from the ASF dual-hosted git repository.
marat pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
from 4d37c857 fix build script
new 11a74ad4 Log correct message for collectCamelStatuses if there is no
port configured for the project
new d875aaf5 Improved container management ui
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:
karavan-app/pom.xml| 2 +-
.../camel/karavan/api/ContainerResource.java | 1 -
.../apache/camel/karavan/service/CamelService.java | 41 --
.../karavan/service/ContainerStatusService.java| 9 ++-
.../org/apache/camel/karavan/shared/Constants.java | 1 +
karavan-app/src/main/webui/src/api/KaravanApi.tsx | 9 +++
.../src/main/webui/src/api/NotificationService.ts | 4 +-
.../src/main/webui/src/api/ProjectService.ts | 17 ++
.../src/main/webui/src/editor/EditorToolbar.tsx| 1 -
karavan-app/src/main/webui/src/main/Main.tsx | 10 +---
.../src/main/webui/src/main/useMainHook.tsx| 24 +---
.../src/main/webui/src/project/BuildToolbar.tsx| 64 --
.../project/{devmode.css => DevModeToolbar.css}| 0
.../src/main/webui/src/project/DevModeToolbar.tsx | 49 -
.../src/main/webui/src/project/ProjectPage.tsx | 7 +--
.../src/main/webui/src/project/ProjectToolbar.tsx | 18 +-
16 files changed, 83 insertions(+), 174 deletions(-)
delete mode 100644 karavan-app/src/main/webui/src/project/BuildToolbar.tsx
rename karavan-app/src/main/webui/src/project/{devmode.css =>
DevModeToolbar.css} (100%)
Re: [PR] Rerun failing tests [camel]
orpiske commented on code in PR #14144: URL: https://github.com/apache/camel/pull/14144#discussion_r1600285708 ## parent/pom.xml: ## @@ -3535,8 +3535,8 @@ false false alphabetical - -0 + +2 Review Comment: @gnodet I am fine with the current approach ... it will be great to have this flag working! Let's go ahead and merge it. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] (chores) camel-test: inital decoupling for CamelTestSupport [camel]
github-actions[bot] commented on PR #14146: URL: https://github.com/apache/camel/pull/14146#issuecomment-2110581893 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] (chores) camel-test: inital decoupling for CamelTestSupport [camel]
orpiske opened a new pull request, #14146: URL: https://github.com/apache/camel/pull/14146 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Rerun failing tests [camel]
gnodet commented on code in PR #14144: URL: https://github.com/apache/camel/pull/14144#discussion_r1600267343 ## parent/pom.xml: ## @@ -3535,8 +3535,8 @@ false false alphabetical - -0 + +2 Review Comment: @orpiske I don' really mind the default value, but I need the rerun to happen in GitHub. So if you prefer, I can revert the default value to 0 but keep it in the properties. Or just remove the line. It will have the same effect. Or use a `camel.surefire.rerunFailingTestsCount` as we have for some other properties... but that will need to adjust all the scripts / GitHub actions. If you're fine with the current state, I can simply merge :-) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20763: camel-support Handle special characters in REST templates [camel]
driseley commented on PR #14145: URL: https://github.com/apache/camel/pull/14145#issuecomment-2110513955 If this is accepted could it also be backported to the 4.4.x LTS release? As this was introduced in 4.2.0 - it is not required on the 4.0.x LTS release -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Rerun failing tests [camel]
gnodet commented on code in PR #14144: URL: https://github.com/apache/camel/pull/14144#discussion_r1600227218 ## parent/pom.xml: ## @@ -3535,8 +3535,8 @@ false false alphabetical - -0 + +2 Review Comment: > BTW, it may be necessary to do the same in a few more places (and also for the failsafe plugin). I looked briefly at the code and there's a few more places where this is set. > > Good catch!!! FWIW, the `rerunFailingTestsCount` is not explicitely set in the failsafe plugin config, so that one is not a problem and the `failsafe.rerunFailingTestsCount` system property should be honored. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20763: camel-support Handle special characters in REST templates [camel]
github-actions[bot] commented on PR #14145: URL: https://github.com/apache/camel/pull/14145#issuecomment-2110507498 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] CAMEL-20763: camel-support Handle special characters in REST templates [camel]
driseley opened a new pull request, #14145: URL: https://github.com/apache/camel/pull/14145 # Description Ensure that any hypens or underscores in parameters in REST templates are removed before being parsed into a regular expression The code will remove (using a regular expression match) any hyphens or underscores in REST template parameter names. This is required as the parameter name are parsed into regular expression named groups which support only letters and numbers as group names. # Target - [x] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [x] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). https://issues.apache.org/jira/browse/CAMEL-20763 # Apache Camel coding standards and style - [x] I checked that each commit in the pull request has a meaningful subject line and body. - [x] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Rerun failing tests [camel]
gnodet commented on code in PR #14144: URL: https://github.com/apache/camel/pull/14144#discussion_r1600210518 ## parent/pom.xml: ## @@ -3535,8 +3535,8 @@ false false alphabetical - -0 + +2 Review Comment: > @gnodet oh, so you mean this one is overriding the property we set manually? OMG. Yes, the properties used as default values for plugin configs are... defaults ;-) So if the plugin configuration specifically sets a value, the property won't be used. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Rerun failing tests [camel]
orpiske commented on code in PR #14144: URL: https://github.com/apache/camel/pull/14144#discussion_r1600200462 ## parent/pom.xml: ## @@ -3535,8 +3535,8 @@ false false alphabetical - -0 + +2 Review Comment: BTW, it may be necessary to do the same in a few more places (and also for the failsafe plugin). I looked briefly at the code and there's a few more places where this is set. Good catch!!! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Rerun failing tests [camel]
orpiske commented on code in PR #14144: URL: https://github.com/apache/camel/pull/14144#discussion_r1600196400 ## parent/pom.xml: ## @@ -3535,8 +3535,8 @@ false false alphabetical - -0 + +2 Review Comment: @gnodet oh, so you mean this one is overriding the property we set manually? OMG. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Rerun failing tests [camel]
gnodet commented on code in PR #14144:
URL: https://github.com/apache/camel/pull/14144#discussion_r1600191069
##
parent/pom.xml:
##
@@ -3535,8 +3535,8 @@
false
false
alphabetical
-
-0
+
+2
Review Comment:
I don't think the `surefire.rerunFailingTestsCount` system property is used,
because the plugin has a specific configuration set to 0 and the property is
only used as a default.
If we want the system property to take precedence, we need to remove the
line or use something like:
```
${surefire.rerunFailingTestsCount}
```
and eventually define it with a default value:
```
2
```
--
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) 01/01: Upgrade Quarkus to 3.11.0.CR1
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit b47452b2e202bd3329baeab91c89f272cc4d7a78
Author: James Netherton
AuthorDate: Wed Apr 24 16:02:20 2024 +0100
Upgrade Quarkus to 3.11.0.CR1
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index d26401f5fd..ccff9a5789 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
2.2.2
2.3.1
2.0.2
-3.10.0
+999-SNAPSHOT
4.0.0
2.6.1
@@ -104,7 +104,7 @@
23.1.2
jdk21
4.0.21
-1.62.2
+1.63.0
${hapi-version}
${hapi-base-version}
${hapi-fhir-version}
@@ -114,7 +114,7 @@
${icu4j-version}
2.9.3
${influx-java-driver-version}
-2.17.0
+2.17.1
${jakarta-jms-api-version}
${json-patch-version}
${jodatime2-version}
(camel-quarkus) branch quarkus-main updated (3095a23a76 -> b47452b2e2)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard 3095a23a76 Upgrade Quarkus to 3.11.0.CR1 add e51be75a61 Update license-maven-plugin to 4.5 add 55b35a6f58 Document available configuration methods for the Infinispan extension add 8952f9d0ea Add debugging to test-summary-report action new b47452b2e2 Upgrade Quarkus to 3.11.0.CR1 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (3095a23a76) \ N -- N -- N refs/heads/quarkus-main (b47452b2e2) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/actions/test-summary-report/action.yaml| 12 ++ .../pages/reference/extensions/infinispan.adoc | 57 ++-- .../runtime/src/main/doc/configuration.adoc| 28 .../infinispan/runtime/src/main/doc/usage.adoc | 63 integration-tests/main-xml-io/pom.xml | 12 ++ pom.xml| 160 +++-- 6 files changed, 218 insertions(+), 114 deletions(-) create mode 100644 extensions/infinispan/runtime/src/main/doc/usage.adoc
Re: [PR] (#5489) Groovy > Yaml [camel-k]
tdiesler commented on PR #5497: URL: https://github.com/apache/camel-k/pull/5497#issuecomment-2110450553 Ready to merge -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] fix(e2e): Tekton test permission failure with olm install command [camel-k]
gansheer commented on PR #5505: URL: https://github.com/apache/camel-k/pull/5505#issuecomment-2110448791 @squakez My feeling on the test is that we don't want to confirm so much that the pod can run the `kamel install` command than it can actually run a CLI command. Can you confirm my intuition? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] fix(e2e): Tekton test permission failure with olm install command [camel-k]
gansheer opened a new pull request, #5505: URL: https://github.com/apache/camel-k/pull/5505 ## Description When running on an OLM install on OCP the test fails with the following log from the Kamel Pod: ``` Error: OLM is available but current user has not enough permissions to create the operator. You can either ask your administrator to provide permissions (preferred) or run the install command with the '--olm=false' flag ``` **Release Note** ```release-note fix(e2e): Tekton test permission failure with olm install command ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Rerun failing tests [camel]
gnodet commented on code in PR #14144: URL: https://github.com/apache/camel/pull/14144#discussion_r1600178103 ## parent/pom.xml: ## @@ -3535,8 +3535,8 @@ false false alphabetical - -0 + +2 Review Comment: @orpiske I don't see tests being rerun in the following failed builds however: https://github.com/apache/camel/actions/runs/8925211751/job/24513370969?pr=14042 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Rerun failing tests [camel]
gnodet commented on code in PR #14144: URL: https://github.com/apache/camel/pull/14144#discussion_r1600178103 ## parent/pom.xml: ## @@ -3535,8 +3535,8 @@ false false alphabetical - -0 + +2 Review Comment: I don't see tests being rerun in the following failed builds however: https://github.com/apache/camel/actions/runs/8925211751/job/24513370969?pr=14042 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch dependabot/maven/org.jboss.logging-jboss-logging-3.6.0.Final deleted (was 10ed66feb98)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.jboss.logging-jboss-logging-3.6.0.Final in repository https://gitbox.apache.org/repos/asf/camel.git was 10ed66feb98 Bump org.jboss.logging:jboss-logging from 3.5.3.Final to 3.6.0.Final The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
Re: [PR] Rerun failing tests [camel]
orpiske commented on code in PR #14144: URL: https://github.com/apache/camel/pull/14144#discussion_r1600116679 ## parent/pom.xml: ## @@ -3535,8 +3535,8 @@ false false alphabetical - -0 + +2 Review Comment: Just for the record: both GH actions and ASF already do this by default (2 for unit tests and 1 for integration tests). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch dependabot/maven/com.dylibso.chicory-runtime-0.0.10 deleted (was 9b507a042ac)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/com.dylibso.chicory-runtime-0.0.10 in repository https://gitbox.apache.org/repos/asf/camel.git was 9b507a042ac Bump com.dylibso.chicory:runtime from 0.0.9 to 0.0.10 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch dependabot/maven/micrometer-version-1.13.0 deleted (was 907014f62d6)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/micrometer-version-1.13.0 in repository https://gitbox.apache.org/repos/asf/camel.git was 907014f62d6 Bump micrometer-version from 1.12.5 to 1.13.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch dependabot/maven/google-oauth-client-version-1.36.0 deleted (was f3c22fc5bd3)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/google-oauth-client-version-1.36.0 in repository https://gitbox.apache.org/repos/asf/camel.git was f3c22fc5bd3 Bump google-oauth-client-version from 1.35.0 to 1.36.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch dependabot/maven/huaweicloud-sdk-version-3.1.95 deleted (was a5856a143ae)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/huaweicloud-sdk-version-3.1.95 in repository https://gitbox.apache.org/repos/asf/camel.git was a5856a143ae Bump huaweicloud-sdk-version from 3.1.94 to 3.1.95 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch dependabot/maven/bytebuddy-version-1.14.15 deleted (was 0f9c2d437e5)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/bytebuddy-version-1.14.15 in repository https://gitbox.apache.org/repos/asf/camel.git was 0f9c2d437e5 Bump bytebuddy-version from 1.14.14 to 1.14.15 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch dependabot/maven/elasticsearch-java-client-version-8.13.4 deleted (was 6b8d693051b)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/elasticsearch-java-client-version-8.13.4 in repository https://gitbox.apache.org/repos/asf/camel.git was 6b8d693051b Bump elasticsearch-java-client-version from 8.13.3 to 8.13.4 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch dependabot/maven/aws-java-sdk2-version-2.25.51 deleted (was f333d0a8a8b)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/aws-java-sdk2-version-2.25.51 in repository https://gitbox.apache.org/repos/asf/camel.git was f333d0a8a8b Bump aws-java-sdk2-version from 2.25.50 to 2.25.51 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch dependabot/maven/com.google.api-client-google-api-client-2.5.0 deleted (was 908714caf1d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/com.google.api-client-google-api-client-2.5.0 in repository https://gitbox.apache.org/repos/asf/camel.git was 908714caf1d Bump com.google.api-client:google-api-client from 2.4.1 to 2.5.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch dependabot/maven/org.snmp4j-snmp4j-3.8.2 deleted (was d8ebbb20798)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.snmp4j-snmp4j-3.8.2 in repository https://gitbox.apache.org/repos/asf/camel.git was d8ebbb20798 Bump org.snmp4j:snmp4j from 3.8.1 to 3.8.2 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch dependabot/maven/com.box-box-java-sdk-4.9.0 deleted (was e9d829570c4)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/com.box-box-java-sdk-4.9.0 in repository https://gitbox.apache.org/repos/asf/camel.git was e9d829570c4 Bump com.box:box-java-sdk from 4.8.0 to 4.9.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch dependabot/maven/com.google.guava-guava-33.2.0-jre deleted (was f3c0e8b383e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/com.google.guava-guava-33.2.0-jre in repository https://gitbox.apache.org/repos/asf/camel.git was f3c0e8b383e Bump com.google.guava:guava from 33.1.0-jre to 33.2.0-jre The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
Re: [PR] fix(e2e): strengthen upgrade test scenario [camel-k]
squakez closed pull request #5501: fix(e2e): strengthen upgrade test scenario URL: https://github.com/apache/camel-k/pull/5501 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] fix(e2e): don't rollout Pods on operator upgrade [camel-k]
squakez opened a new pull request, #5504: URL: https://github.com/apache/camel-k/pull/5504 This PR is making sure that we use Integration status version and runtime version for environment variables. During upgrade process those parameter are not updated as the Integration digest is not changing either. We cannot move this yet on main branch as there are other changes there affecting Deployment that would require additional attention. **Release Note** ```release-note fix(e2e): don't rollout Pods on operator upgrade ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Rerun failing tests [camel]
github-actions[bot] commented on PR #14144: URL: https://github.com/apache/camel/pull/14144#issuecomment-2110198894 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Rerun failing tests [camel]
gnodet opened a new pull request, #14144: URL: https://github.com/apache/camel/pull/14144 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch regen_bot updated (dce0cabc7e8 -> 914b19c90e4)
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 dce0cabc7e8 Bump google-oauth-client-version from 1.35.0 to 1.36.0 (#14138) add 419134f9edb Bump com.google.api-client:google-api-client from 2.4.1 to 2.5.0 (#14143) add 914b19c90e4 Polished No new revisions were added by this update. Summary of changes: .../kotlin/org/apache/camel/dsl/kotlin/KotlinRoutesBuilderLoader.kt | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Re: [I] Custom reusable component [camel-karavan]
davsclaus closed issue #1277: Custom reusable component URL: https://github.com/apache/camel-karavan/issues/1277 -- 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: Polished
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 914b19c90e4 Polished
914b19c90e4 is described below
commit 914b19c90e48175f23546a5a24671c361475cd0b
Author: Claus Ibsen
AuthorDate: Tue May 14 15:01:45 2024 +0200
Polished
---
.../kotlin/org/apache/camel/dsl/kotlin/KotlinRoutesBuilderLoader.kt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/dsl/camel-kotlin-dsl/src/main/kotlin/org/apache/camel/dsl/kotlin/KotlinRoutesBuilderLoader.kt
b/dsl/camel-kotlin-dsl/src/main/kotlin/org/apache/camel/dsl/kotlin/KotlinRoutesBuilderLoader.kt
index db92705233e..04bbd26fe36 100644
---
a/dsl/camel-kotlin-dsl/src/main/kotlin/org/apache/camel/dsl/kotlin/KotlinRoutesBuilderLoader.kt
+++
b/dsl/camel-kotlin-dsl/src/main/kotlin/org/apache/camel/dsl/kotlin/KotlinRoutesBuilderLoader.kt
@@ -32,7 +32,7 @@ import
kotlin.script.experimental.jvmhost.createJvmCompilationConfigurationFromT
@Experimental
@ManagedResource(description = "Managed KotlinRoutesBuilderLoader")
@RoutesLoader(EXTENSION)
-class KotlinRoutesBuilderLoader :
org.apache.camel.endpointdsl.support.EndpointRouteBuilderLoaderSupport(EXTENSION)
{
+class KotlinRoutesBuilderLoader : EndpointRouteBuilderLoaderSupport(EXTENSION)
{
@Throws(Exception::class)
override fun doLoadEndpointRouteBuilder(reader: Reader, builder:
EndpointRouteBuilder) {
val host = BasicJvmScriptingHost()
Re: [PR] (#5489) Groovy > Yaml [camel-k]
github-actions[bot] commented on PR #5497: URL: https://github.com/apache/camel-k/pull/5497#issuecomment-2110150678 :warning: Unit test coverage report - coverage decreased from 38.2% to 38.1% (**-0.1%**) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-spring-boot) branch main updated: Regen
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 163087ba4b0 Regen
163087ba4b0 is described below
commit 163087ba4b0f7a47da7e37dca356c01e0ef1fb26
Author: Claus Ibsen
AuthorDate: Tue May 14 14:47:08 2024 +0200
Regen
---
.../camel/springboot/catalog/components/aws-bedrock.json | 4 ++--
tooling/camel-spring-boot-dependencies/pom.xml | 12 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-bedrock.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-bedrock.json
index 1c4a32c7760..fe1726c9071 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-bedrock.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-bedrock.json
@@ -25,7 +25,7 @@
"componentProperties": {
"configuration": { "index": 0, "kind": "property", "displayName":
"Configuration", "group": "producer", "label": "", "required": false, "type":
"object", "javaType":
"org.apache.camel.component.aws2.bedrock.runtime.BedrockConfiguration",
"deprecated": false, "autowired": false, "secret": false, "description":
"Component configuration" },
"lazyStartProducer": { "index": 1, "kind": "property", "displayName":
"Lazy Start Producer", "group": "producer", "label": "producer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Whether the producer should be started lazy (on the first message). By
starting lazy you can use this to allow CamelContext and routes to startup in
situations where a producer may otherwise fail [...]
-"modelId": { "index": 2, "kind": "property", "displayName": "Model Id",
"group": "producer", "label": "", "required": true, "type": "string",
"javaType": "java.lang.String", "enum": [ "amazon.titan-text-express-v1",
"amazon.titan-text-lite-v1", "amazon.titan-image-generator-v1",
"amazon.titan-embed-text-v1", "ai21.j2-ultra-v1", "ai21.j2-mid-v1",
"anthropic.claude-instant-v1", "anthropic.claude-v2", "anthropic.claude-v2:1",
"anthropic.claude-3-sonnet-20240229-v1:0", "anthropic.claude- [...]
+"modelId": { "index": 2, "kind": "property", "displayName": "Model Id",
"group": "producer", "label": "", "required": true, "type": "string",
"javaType": "java.lang.String", "enum": [ "amazon.titan-text-express-v1",
"amazon.titan-text-lite-v1", "amazon.titan-image-generator-v1",
"amazon.titan-embed-text-v1", "ai21.j2-ultra-v1", "ai21.j2-mid-v1",
"anthropic.claude-instant-v1", "anthropic.claude-v2", "anthropic.claude-v2:1",
"anthropic.claude-3-sonnet-20240229-v1:0", "anthropic.claude- [...]
"operation": { "index": 3, "kind": "property", "displayName": "Operation",
"group": "producer", "label": "", "required": true, "type": "object",
"javaType":
"org.apache.camel.component.aws2.bedrock.runtime.BedrockOperations", "enum": [
"invokeTextModel", "invokeImageModel", "invokeEmbeddingsModel" ], "deprecated":
false, "deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.bedrock.runtime.BedrockConfiguration",
"configurat [...]
"overrideEndpoint": { "index": 4, "kind": "property", "displayName":
"Override Endpoint", "group": "producer", "label": "", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.bedrock.runtime.BedrockConfiguration",
"configurationField": "configuration", "description": "Set the need for
overriding the endpoint. This option needs to be used in [...]
"pojoRequest": { "index": 5, "kind": "property", "displayName": "Pojo
Request", "group": "producer", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.bedrock.runtime.BedrockConfiguration",
"configurationField": "configuration", "description": "If we want to use a POJO
request as body or not" },
@@ -54,7 +54,7 @@
},
"properties": {
"label": { "index": 0, "kind": "path", "displayName": "Label", "group":
"producer", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.bedrock.runtime.BedrockConfiguration",
(camel) branch regen_bot updated (af93c0260ee -> dce0cabc7e8)
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 af93c0260ee Bump org.jboss.logging:jboss-logging from 3.5.3.Final to 3.6.0.Final (#14137) add dce0cabc7e8 Bump google-oauth-client-version from 1.35.0 to 1.36.0 (#14138) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch regen_bot updated (29ccb1c6932 -> af93c0260ee)
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 29ccb1c6932 Bump micrometer-version from 1.12.5 to 1.13.0 (#14140) add af93c0260ee Bump org.jboss.logging:jboss-logging from 3.5.3.Final to 3.6.0.Final (#14137) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch regen_bot updated (641bbb33b0b -> 29ccb1c6932)
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 641bbb33b0b Bump elasticsearch-java-client-version from 8.13.3 to 8.13.4 (#14135) add f43a3dd9b19 Bump org.snmp4j:snmp4j from 3.8.1 to 3.8.2 (#14141) add ea9fb268c35 Bump micrometer-version from 1.12.5 to 1.13.0 (#14140) add bf4e50d7ba3 Bump com.dylibso.chicory:runtime from 0.0.9 to 0.0.10 (#14142) add 305db174123 Bump com.box:box-java-sdk from 4.8.0 to 4.9.0 (#14136) add ea43a0d0e2e Bump com.google.guava:guava from 33.1.0-jre to 33.2.0-jre (#14139) add 29ccb1c6932 Bump micrometer-version from 1.12.5 to 1.13.0 (#14140) No new revisions were added by this update. Summary of changes: .../micrometer/prometheus/MicrometerPrometheus.java | 12 +++- parent/pom.xml | 10 +- 2 files changed, 12 insertions(+), 10 deletions(-)
(camel) branch main updated: Bump com.google.api-client:google-api-client from 2.4.1 to 2.5.0 (#14143)
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 419134f9edb Bump com.google.api-client:google-api-client from 2.4.1 to 2.5.0 (#14143) 419134f9edb is described below commit 419134f9edb284cf332736544901392f2dcc101b Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue May 14 14:26:55 2024 +0200 Bump com.google.api-client:google-api-client from 2.4.1 to 2.5.0 (#14143) Bumps [com.google.api-client:google-api-client](https://github.com/googleapis/google-api-java-client) from 2.4.1 to 2.5.0. - [Release notes](https://github.com/googleapis/google-api-java-client/releases) - [Changelog](https://github.com/googleapis/google-api-java-client/blob/main/CHANGELOG.md) - [Commits](https://github.com/googleapis/google-api-java-client/compare/v2.4.1...v2.5.0) --- updated-dependencies: - dependency-name: com.google.api-client:google-api-client dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 2bad4d06b33..3f7d750644a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -182,7 +182,7 @@ 4.0.5 3.0.2 1.23.0 -2.4.1 +2.5.0 v3-rev20240327-2.0.0 v3-rev20240419-2.0.0 v4-rev20240423-2.0.0
Re: [PR] Bump com.google.api-client:google-api-client from 2.4.1 to 2.5.0 [camel]
davsclaus merged PR #14143: URL: https://github.com/apache/camel/pull/14143 -- 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: Bump google-oauth-client-version from 1.35.0 to 1.36.0 (#14138)
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 dce0cabc7e8 Bump google-oauth-client-version from 1.35.0 to 1.36.0 (#14138) dce0cabc7e8 is described below commit dce0cabc7e8851f1cd35630781875244c9c5eef4 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue May 14 14:26:45 2024 +0200 Bump google-oauth-client-version from 1.35.0 to 1.36.0 (#14138) Bumps `google-oauth-client-version` from 1.35.0 to 1.36.0. Updates `com.google.oauth-client:google-oauth-client` from 1.35.0 to 1.36.0 - [Release notes](https://github.com/googleapis/google-oauth-java-client/releases) - [Changelog](https://github.com/googleapis/google-oauth-java-client/blob/main/CHANGELOG.md) - [Commits](https://github.com/googleapis/google-oauth-java-client/compare/v1.35.0...v1.36.0) Updates `com.google.oauth-client:google-oauth-client-jetty` from 1.35.0 to 1.36.0 - [Release notes](https://github.com/googleapis/google-oauth-java-client/releases) - [Changelog](https://github.com/googleapis/google-oauth-java-client/blob/main/CHANGELOG.md) - [Commits](https://github.com/googleapis/google-oauth-java-client/compare/v1.35.0...v1.36.0) --- updated-dependencies: - dependency-name: com.google.oauth-client:google-oauth-client dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.google.oauth-client:google-oauth-client-jetty dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 7306fc7be43..2bad4d06b33 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -187,7 +187,7 @@ v3-rev20240419-2.0.0 v4-rev20240423-2.0.0 v1-rev20240422-2.0.0 -1.35.0 +1.36.0 26.38.0 2.44.0 1.44.1
Re: [PR] Bump google-oauth-client-version from 1.35.0 to 1.36.0 [camel]
davsclaus merged PR #14138: URL: https://github.com/apache/camel/pull/14138 -- 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: Bump org.jboss.logging:jboss-logging from 3.5.3.Final to 3.6.0.Final (#14137)
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 af93c0260ee Bump org.jboss.logging:jboss-logging from 3.5.3.Final to 3.6.0.Final (#14137) af93c0260ee is described below commit af93c0260ee0f79bc90463cc1e87a0daeba49dc1 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue May 14 14:26:33 2024 +0200 Bump org.jboss.logging:jboss-logging from 3.5.3.Final to 3.6.0.Final (#14137) Bumps [org.jboss.logging:jboss-logging](https://github.com/jboss-logging/jboss-logging) from 3.5.3.Final to 3.6.0.Final. - [Release notes](https://github.com/jboss-logging/jboss-logging/releases) - [Commits](https://github.com/jboss-logging/jboss-logging/compare/3.5.3.Final...3.6.0.Final) --- updated-dependencies: - dependency-name: org.jboss.logging:jboss-logging dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index c7b7af2cbaf..7306fc7be43 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -264,7 +264,7 @@ 3.2.0 1.4.5 2.0.0.Final -3.5.3.Final +3.6.0.Final 1.4.10.Final 7.6.1.Final 3.3.8.Final
Re: [PR] Bump org.jboss.logging:jboss-logging from 3.5.3.Final to 3.6.0.Final [camel]
davsclaus merged PR #14137: URL: https://github.com/apache/camel/pull/14137 -- 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: Bump micrometer-version from 1.12.5 to 1.13.0 (#14140)
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 29ccb1c6932 Bump micrometer-version from 1.12.5 to 1.13.0 (#14140)
29ccb1c6932 is described below
commit 29ccb1c6932aa0646edae0245f4df41d19c844c5
Author: Claus Ibsen
AuthorDate: Tue May 14 14:25:45 2024 +0200
Bump micrometer-version from 1.12.5 to 1.13.0 (#14140)
---
.../micrometer/prometheus/MicrometerPrometheus.java | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git
a/components/camel-micrometer-prometheus/src/main/java/org/apache/camel/component/micrometer/prometheus/MicrometerPrometheus.java
b/components/camel-micrometer-prometheus/src/main/java/org/apache/camel/component/micrometer/prometheus/MicrometerPrometheus.java
index 3adf0b9fc16..833c7ba4cd1 100644
---
a/components/camel-micrometer-prometheus/src/main/java/org/apache/camel/component/micrometer/prometheus/MicrometerPrometheus.java
+++
b/components/camel-micrometer-prometheus/src/main/java/org/apache/camel/component/micrometer/prometheus/MicrometerPrometheus.java
@@ -27,9 +27,8 @@ import java.util.StringJoiner;
import io.micrometer.core.instrument.Meter;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.binder.MeterBinder;
-import io.micrometer.prometheus.PrometheusConfig;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
-import io.prometheus.client.exporter.common.TextFormat;
+import io.micrometer.prometheusmetrics.PrometheusConfig;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
import io.vertx.core.Handler;
import io.vertx.core.http.HttpMethod;
import io.vertx.ext.web.Route;
@@ -73,6 +72,9 @@ public class MicrometerPrometheus extends ServiceSupport
implements CamelMetrics
private static final Logger LOG =
LoggerFactory.getLogger(MicrometerPrometheus.class);
+private static final String CONTENT_TYPE_004 = "text/plain; version=0.0.4;
charset=utf-8";
+private static final String CONTENT_TYPE_100 =
"application/openmetrics-text; version=1.0.0; charset=utf-8";
+
private MainHttpServer server;
private VertxPlatformHttpRouter router;
private PlatformHttpComponent platformHttpComponent;
@@ -389,7 +391,7 @@ public class MicrometerPrometheus extends ServiceSupport
implements CamelMetrics
metrics.method(HttpMethod.GET);
final String format
-= "0.0.4".equals(textFormatVersion) ?
TextFormat.CONTENT_TYPE_004 : TextFormat.CONTENT_TYPE_OPENMETRICS_100;
+= "0.0.4".equals(textFormatVersion) ? CONTENT_TYPE_004 :
CONTENT_TYPE_100;
metrics.produces(format);
Handler handler = new Handler() {
@@ -399,7 +401,7 @@ public class MicrometerPrometheus extends ServiceSupport
implements CamelMetrics
// the client may ask for version 1.0.0 via accept header
String ah = ctx.request().getHeader("Accept");
if (ah != null && ah.contains("application/openmetrics-text"))
{
-ct = TextFormat.chooseContentType(ah);
+ct = CONTENT_TYPE_100;
}
ctx.response().putHeader("Content-Type", ct);
Re: [PR] Bump org.jboss.logging:jboss-logging from 3.5.3.Final to 3.6.0.Final [camel]
github-actions[bot] commented on PR #14137: URL: https://github.com/apache/camel/pull/14137#issuecomment-2110045716 :robot: The Apache Camel test robot will run the tests for you :+1: -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch regen_bot updated (19d0cad158d -> 641bbb33b0b)
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 19d0cad158d Bump huaweicloud-sdk-version from 3.1.94 to 3.1.95 (#14134) add 641bbb33b0b Bump elasticsearch-java-client-version from 8.13.3 to 8.13.4 (#14135) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Re: [PR] Bump org.jboss.logging:jboss-logging from 3.5.3.Final to 3.6.0.Final [camel]
davsclaus commented on PR #14137: URL: https://github.com/apache/camel/pull/14137#issuecomment-2110044868 /component-test camel-bean-validator -- 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 (8cd925564e6 -> 19d0cad158d)
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 8cd925564e6 Bump bytebuddy-version from 1.14.14 to 1.14.15 (#14133) add 19d0cad158d Bump huaweicloud-sdk-version from 3.1.94 to 3.1.95 (#14134) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch regen_bot updated (8c9d0e0ade3 -> 8cd925564e6)
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 8c9d0e0ade3 Bump aws-java-sdk2-version from 2.25.50 to 2.25.51 (#14132) add 8cd925564e6 Bump bytebuddy-version from 1.14.14 to 1.14.15 (#14133) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch main updated: Bump com.google.guava:guava from 33.1.0-jre to 33.2.0-jre (#14139)
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 ea43a0d0e2e Bump com.google.guava:guava from 33.1.0-jre to 33.2.0-jre (#14139) ea43a0d0e2e is described below commit ea43a0d0e2e8574377bdf46392f3a1442a27abf7 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue May 14 14:12:01 2024 +0200 Bump com.google.guava:guava from 33.1.0-jre to 33.2.0-jre (#14139) Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.1.0-jre to 33.2.0-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 4572fd41659..c7b7af2cbaf 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -203,7 +203,7 @@ 4.4.0 2.0.59.Final 2.10.1 -33.1.0-jre +33.2.0-jre 3.0 3.4.0 2.2
(camel) branch regen_bot updated (b46266f348f -> 8c9d0e0ade3)
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 b46266f348f Regen add 8c9d0e0ade3 Bump aws-java-sdk2-version from 2.25.50 to 2.25.51 (#14132) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Re: [PR] Bump com.google.guava:guava from 33.1.0-jre to 33.2.0-jre [camel]
davsclaus merged PR #14139: URL: https://github.com/apache/camel/pull/14139 -- 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
