(camel) branch main updated: [CAMEL-20829] Streamline ServicePool synchronization (#14312)
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 3fe53e0894a [CAMEL-20829] Streamline ServicePool synchronization
(#14312)
3fe53e0894a is described below
commit 3fe53e0894a1e31dac44d3ac03ac615830612d3c
Author: Guillaume Nodet
AuthorDate: Tue Jun 4 08:09:44 2024 +0200
[CAMEL-20829] Streamline ServicePool synchronization (#14312)
---
.../apache/camel/support/cache/ServicePool.java| 74 +++---
1 file changed, 22 insertions(+), 52 deletions(-)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/cache/ServicePool.java
b/core/camel-support/src/main/java/org/apache/camel/support/cache/ServicePool.java
index de7b5b513e1..72373c96031 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/cache/ServicePool.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/cache/ServicePool.java
@@ -17,11 +17,12 @@
package org.apache.camel.support.cache;
import java.util.ArrayList;
-import java.util.List;
+import java.util.Deque;
import java.util.Map;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedDeque;
import java.util.concurrent.ConcurrentMap;
import java.util.function.Function;
@@ -53,8 +54,6 @@ abstract class ServicePool extends
ServiceSupport implements
private final ConcurrentMap> singlePoolEvicted = new
ConcurrentHashMap<>();
private final int capacity;
private final Map cache;
-// synchronizes access only to cache
-private final Object cacheLock;
private interface Pool {
S acquire() throws Exception;
@@ -75,11 +74,10 @@ abstract class ServicePool extends
ServiceSupport implements
this.getEndpoint = getEndpoint;
this.capacity = capacity;
this.cache = capacity > 0 ? LRUCacheFactory.newLRUCache(capacity,
this::onEvict) : null;
-this.cacheLock = capacity > 0 ? new Object() : null;
}
/**
- * This callback is invoked by LRUCache from a separate background cleanup
thread. Therefore we mark the entries to
+ * This callback is invoked by LRUCache from a separate background cleanup
thread. Therefore, we mark the entries to
* be evicted from this thread only, and then let SinglePool and MultiPool
handle the evictions (stop the
* producer/consumer safely) when they are acquiring/releases
producers/consumers. If we stop the producer/consumer
* from the LRUCache background thread we can have a race condition with a
pooled producer may have been acquired at
@@ -117,15 +115,7 @@ abstract class ServicePool extends
ServiceSupport implements
}
S s = getOrCreatePool(endpoint).acquire();
if (s != null && cache != null) {
-if (isStoppingOrStopped()) {
-// during stopping then access to the cache is synchronized
-synchronized (cacheLock) {
-cache.putIfAbsent(s, s);
-}
-} else {
-// optimize for normal operation
-cache.putIfAbsent(s, s);
-}
+cache.putIfAbsent(s, s);
}
return s;
}
@@ -182,10 +172,8 @@ abstract class ServicePool extends
ServiceSupport implements
pool.values().forEach(Pool::stop);
pool.clear();
if (cache != null) {
-synchronized (cacheLock) {
-cache.values().forEach(ServicePool::stop);
-cache.clear();
-}
+cache.values().forEach(ServicePool::stop);
+cache.clear();
}
singlePoolEvicted.values().forEach(Pool::stop);
singlePoolEvicted.clear();
@@ -295,29 +283,19 @@ abstract class ServicePool extends
ServiceSupport implements
* thread at any given time.
*/
private class MultiplePool implements Pool {
-private final Object lock = new Object();
private final Endpoint endpoint;
private final BlockingQueue queue;
-private final List evicts;
+private final Deque evicts;
MultiplePool(Endpoint endpoint) {
this.endpoint = endpoint;
this.queue = new ArrayBlockingQueue<>(capacity);
-this.evicts = new ArrayList<>();
+this.evicts = new ConcurrentLinkedDeque<>();
}
private void cleanupEvicts() {
-if (!evicts.isEmpty()) {
-synchronized (lock) {
-if (!evicts.isEmpty()) {
-for (S evict : evicts) {
-queue.remove(evict);
-// stop the service after having removed it from
queue
(camel) 05/05: Fix unneeded code in ServicePool
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 5f72cef67cba815824c56c7e4160346d6aa5ca56
Author: Guillaume Nodet
AuthorDate: Wed May 22 13:53:14 2024 +0200
Fix unneeded code in ServicePool
The service is always in a started state. The problem was caused by the
field being set (while holding the lock) to the newly created service before it
was actually started, so that another thread could see the non started service.
---
.../apache/camel/support/cache/ServicePool.java| 41 ++
1 file changed, 2 insertions(+), 39 deletions(-)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/cache/ServicePool.java
b/core/camel-support/src/main/java/org/apache/camel/support/cache/ServicePool.java
index 3596bd4d8ec..de7b5b513e1 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/cache/ServicePool.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/cache/ServicePool.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.support.cache;
-import java.time.Duration;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -29,14 +28,9 @@ import java.util.function.Function;
import org.apache.camel.Endpoint;
import org.apache.camel.NonManagedService;
import org.apache.camel.Service;
-import org.apache.camel.StatefulService;
import org.apache.camel.support.LRUCache;
import org.apache.camel.support.LRUCacheFactory;
import org.apache.camel.support.service.ServiceSupport;
-import org.apache.camel.support.task.BlockingTask;
-import org.apache.camel.support.task.Tasks;
-import org.apache.camel.support.task.budget.Budgets;
-import org.apache.camel.support.task.budget.IterationBoundedBudget;
import org.apache.camel.util.function.ThrowingFunction;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -136,24 +130,6 @@ abstract class ServicePool extends
ServiceSupport implements
return s;
}
-private void waitForService(StatefulService service) {
-BlockingTask task =
Tasks.foregroundTask().withBudget(Budgets.iterationTimeBudget()
-.withMaxIterations(IterationBoundedBudget.UNLIMITED_ITERATIONS)
-.withMaxDuration(Duration.ofMillis(3))
-.withInterval(Duration.ofMillis(5))
-.build())
-.build();
-
-if (!task.run(service::isStarting)) {
-LOG.warn("The producer: {} did not finish starting in {} ms",
service, 3);
-}
-
-if (LOG.isDebugEnabled()) {
-LOG.debug("Waited {} ms for producer to finish starting: {} state:
{}", task.elapsed().toMillis(), service,
-service.getStatus());
-}
-}
-
/**
* Releases the producer/consumer back to the pool
*
@@ -249,13 +225,6 @@ abstract class ServicePool extends
ServiceSupport implements
S tempS = creator.apply(endpoint);
endpoint.getCamelContext().addService(tempS, true,
true);
s = tempS;
-
-if (s instanceof StatefulService ss) {
-if (ss.isStarting()) {
-LOG.trace("Waiting for producer to finish
starting: {}", s);
-waitForService(ss);
-}
-}
}
}
}
@@ -342,8 +311,9 @@ abstract class ServicePool extends
ServiceSupport implements
synchronized (lock) {
if (!evicts.isEmpty()) {
for (S evict : evicts) {
-doStop(evict);
queue.remove(evict);
+// stop the service after having removed it from
queue
+doStop(evict);
}
evicts.clear();
}
@@ -361,13 +331,6 @@ abstract class ServicePool extends
ServiceSupport implements
if (s == null) {
s = creator.apply(endpoint);
s.start();
-
-if (s instanceof StatefulService ss) {
-if (ss.isStarting()) {
-LOG.trace("Waiting for producer to finish
starting: {}", s);
-waitForService(ss);
-}
-}
}
}
return s;
(camel) 01/05: Fix visibility problems
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 5eb89c8c05ba97d6fd66b7052af21559629e4410
Author: Guillaume Nodet
AuthorDate: Tue May 21 10:32:54 2024 +0200
Fix visibility problems
---
.../main/java/org/apache/camel/impl/engine/DurationRoutePolicy.java | 2 +-
.../main/java/org/apache/camel/impl/converter/CachingInjector.java | 2 +-
.../main/java/org/apache/camel/model/dataformat/FhirDataformat.java | 2 +-
.../apache/camel/model/dataformat/UniVocityAbstractDataFormat.java | 2 +-
.../java/org/apache/camel/model/language/ExpressionDefinition.java | 2 +-
.../org/apache/camel/model/language/NamespaceAwareExpression.java | 2 +-
.../org/apache/camel/processor/ConcurrentRequestsThrottler.java | 2 +-
.../java/org/apache/camel/processor/TotalRequestsThrottler.java | 2 +-
.../src/main/java/org/apache/camel/main/PropertyOptionKey.java | 4 ++--
.../src/main/java/org/apache/camel/xml/in/BaseParser.java | 6 +++---
10 files changed, 13 insertions(+), 13 deletions(-)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DurationRoutePolicy.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DurationRoutePolicy.java
index 0cfce32eaee..fe627dc23f8 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DurationRoutePolicy.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DurationRoutePolicy.java
@@ -46,7 +46,7 @@ public class DurationRoutePolicy extends
org.apache.camel.support.RoutePolicySup
private static final Logger LOG =
LoggerFactory.getLogger(DurationRoutePolicy.class);
-enum Action {
+public enum Action {
STOP_CAMEL_CONTEXT,
STOP_ROUTE,
SUSPEND_ROUTE,
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/converter/CachingInjector.java
b/core/camel-base/src/main/java/org/apache/camel/impl/converter/CachingInjector.java
index 03058bf3c8a..fa2de813848 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/converter/CachingInjector.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/converter/CachingInjector.java
@@ -21,7 +21,7 @@ import org.apache.camel.spi.TypeConverterRegistry;
/**
* A caching proxy
*/
-class CachingInjector {
+public class CachingInjector {
private final TypeConverterRegistry repository;
private final Class type;
private T instance;
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FhirDataformat.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FhirDataformat.java
index d3c371b0c8c..9e301d104fd 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FhirDataformat.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/FhirDataformat.java
@@ -477,7 +477,7 @@ public abstract class FhirDataformat extends
DataFormatDefinition implements Con
*/
@XmlTransient
@SuppressWarnings("unchecked")
-abstract static class AbstractBuilder, F
extends FhirDataformat>
+protected abstract static class AbstractBuilder, F extends FhirDataformat>
implements DataFormatBuilder {
private String fhirContext;
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java
index 217f927336b..6fc5657164c 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/UniVocityAbstractDataFormat.java
@@ -287,7 +287,7 @@ public abstract class UniVocityAbstractDataFormat extends
DataFormatDefinition {
*/
@XmlTransient
@SuppressWarnings("unchecked")
-abstract static class AbstractBuilder, F
extends UniVocityAbstractDataFormat>
+protected abstract static class AbstractBuilder, F extends UniVocityAbstractDataFormat>
implements DataFormatBuilder {
private String nullValue;
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java
index bc9d5da4af5..9ac98e65c51 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java
@@ -274,7 +274,7 @@ public class ExpressionDefinition
*/
@XmlTransient
@SuppressWarnings("unchecked")
-abstract static class AbstractBuilder, E
extends ExpressionDefinition>
+protected abs
(camel) 03/05: Avoid busy-loop in aggregator 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 e0a7a34a9fac477db51946486ea0505e4df07369
Author: Guillaume Nodet
AuthorDate: Tue May 21 21:21:41 2024 +0200
Avoid busy-loop in aggregator processor
---
.../processor/aggregate/AggregateProcessor.java| 52 --
1 file changed, 49 insertions(+), 3 deletions(-)
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
index fae1fa6a712..2c75f512b54 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
@@ -28,6 +28,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.locks.AbstractQueuedSynchronizer;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
@@ -124,6 +125,7 @@ public class AggregateProcessor extends
AsyncProcessorSupport
private Map closedCorrelationKeys;
private final Set batchConsumerCorrelationKeys = new
ConcurrentSkipListSet<>();
private final Set inProgressCompleteExchanges =
ConcurrentHashMap.newKeySet();
+private final WaitableInteger inProgressCount = new WaitableInteger();
private final Set unconfirmedCompleteExchanges =
ConcurrentHashMap.newKeySet();
private final Set inProgressCompleteExchangesForRecoveryTask =
ConcurrentHashMap.newKeySet();
private final Map redeliveryState = new
ConcurrentHashMap<>();
@@ -836,6 +838,7 @@ public class AggregateProcessor extends
AsyncProcessorSupport
LOG.debug("Aggregation complete for correlation key {} sending
aggregated exchange: {}", key, exchange);
// add this as in progress before we submit the task
+inProgressCount.increment();
inProgressCompleteExchanges.add(exchange.getExchangeId());
if (recoveryInProgress.get()) {
inProgressCompleteExchangesForRecoveryTask.add(exchange.getExchangeId());
@@ -1219,6 +1222,7 @@ public class AggregateProcessor extends
AsyncProcessorSupport
// must remember to remove in progress when we failed
inProgressCompleteExchanges.remove(exchangeId);
+inProgressCount.decrement();
// do not remove redelivery state as we need it when we redeliver
again later
}
@@ -1244,6 +1248,7 @@ public class AggregateProcessor extends
AsyncProcessorSupport
} finally {
// must remember to remove in progress when we are complete
inProgressCompleteExchanges.remove(exchangeId);
+inProgressCount.decrement();
}
}
@@ -1698,15 +1703,14 @@ public class AggregateProcessor extends
AsyncProcessorSupport
int expected = forceCompletionOfAllGroups();
StopWatch watch = new StopWatch();
-while (!inProgressCompleteExchanges.isEmpty()) {
+if (!inProgressCompleteExchanges.isEmpty()) {
LOG.trace("Waiting for {} inflight exchanges to complete",
getInProgressCompleteExchanges());
try {
-Thread.sleep(100);
+inProgressCount.await();
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
// break out as we got interrupted such as the JVM terminating
LOG.warn("Interrupted while waiting for {} inflight exchanges
to complete.", getInProgressCompleteExchanges());
-break;
}
}
@@ -1723,6 +1727,7 @@ public class AggregateProcessor extends
AsyncProcessorSupport
// cleanup when shutting down
inProgressCompleteExchanges.clear();
+inProgressCount.reset();
if (shutdownExecutorService) {
camelContext.getExecutorServiceManager().shutdownNow(executorService);
@@ -1877,4 +1882,45 @@ public class AggregateProcessor extends
AsyncProcessorSupport
return total;
}
+/**
+ * Synchronization class to avoid busy-loop when waiting for exchanges to
be processed during shutdown.
+ */
+protected static final class WaitableInteger extends
AbstractQueuedSynchronizer {
+
+// await for this integer to be equal to zero
+public void await() throws InterruptedException {
+acquireSharedInterruptibly(0); // the arg is not used, see below
+}
+
+// decrement the integer
+public void decrement() {
+releaseShar
(camel) 04/05: Disable busy-warning warning on shutdown strategy
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 6939b4ed78736d4ae24867ec59edc83993c633e8
Author: Guillaume Nodet
AuthorDate: Wed May 22 09:58:02 2024 +0200
Disable busy-warning warning on shutdown strategy
---
.../java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java | 3 +++
1 file changed, 3 insertions(+)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java
index d99a0bc1344..c22432843c0 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java
@@ -566,6 +566,9 @@ public class DefaultShutdownStrategy extends ServiceSupport
implements ShutdownS
this.logInflightExchangesOnTimeout = logInflightExchangesOnTimeout;
}
+// Disable BusyWait as we're only waiting on seconds increment, so any
other
+// strategy would not be much more efficient
+@SuppressWarnings("BusyWait")
@Override
public void run() {
// the strategy in this run method is to
(camel) branch main updated (5b2bdf0efbc -> 5f72cef67cb)
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 5b2bdf0efbc Openstack 3.12 (#14231) new 5eb89c8c05b Fix visibility problems new 12e7338a5c1 Fix busy-wait loops new e0a7a34a9fa Avoid busy-loop in aggregator processor new 6939b4ed787 Disable busy-warning warning on shutdown strategy new 5f72cef67cb Fix unneeded code in ServicePool The 5 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/impl/engine/DefaultShutdownStrategy.java | 3 ++ .../camel/impl/engine/DurationRoutePolicy.java | 2 +- .../camel/impl/converter/CachingInjector.java | 2 +- .../camel/model/dataformat/FhirDataformat.java | 2 +- .../dataformat/UniVocityAbstractDataFormat.java| 2 +- .../camel/model/language/ExpressionDefinition.java | 2 +- .../model/language/NamespaceAwareExpression.java | 2 +- .../processor/ConcurrentRequestsThrottler.java | 2 +- .../apache/camel/processor/StreamResequencer.java | 18 .../camel/processor/TotalRequestsThrottler.java| 2 +- .../processor/aggregate/AggregateProcessor.java| 52 -- .../errorhandler/RedeliveryErrorHandler.java | 1 + .../processor/resequencer/ResequencerEngine.java | 49 +++- .../org/apache/camel/main/PropertyOptionKey.java | 4 +- .../apache/camel/support/cache/ServicePool.java| 41 + .../java/org/apache/camel/xml/in/BaseParser.java | 6 +-- 16 files changed, 124 insertions(+), 66 deletions(-)
(camel) 02/05: Fix busy-wait loops
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 12e7338a5c1cafbb3ea3bca7d5d67332f9ce462f
Author: Guillaume Nodet
AuthorDate: Thu May 16 18:10:20 2024 +0200
Fix busy-wait loops
---
.../apache/camel/processor/StreamResequencer.java | 18
.../errorhandler/RedeliveryErrorHandler.java | 1 +
.../processor/resequencer/ResequencerEngine.java | 49 +-
3 files changed, 57 insertions(+), 11 deletions(-)
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/StreamResequencer.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/StreamResequencer.java
index 2771df6c9fb..efc951df726 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/StreamResequencer.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/StreamResequencer.java
@@ -239,16 +239,14 @@ public class StreamResequencer extends
AsyncProcessorSupport
@Override
public boolean process(Exchange exchange, AsyncCallback callback) {
-while (engine.size() >= capacity) {
-try {
-Thread.sleep(getTimeout());
-} catch (InterruptedException e) {
-Thread.currentThread().interrupt();
-// we were interrupted so break out
-exchange.setException(e);
-callback.done(true);
-return true;
-}
+try {
+engine.waitUntil(s -> s.size() < capacity);
+} catch (InterruptedException e) {
+Thread.currentThread().interrupt();
+// we were interrupted so break out
+exchange.setException(e);
+callback.done(true);
+return true;
}
try {
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
index 462980cdb45..164958fb736 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/errorhandler/RedeliveryErrorHandler.java
@@ -1530,6 +1530,7 @@ public abstract class RedeliveryErrorHandler extends
ErrorHandlerSupport
* This task is for the synchronous blocking. If using async delayed
then a scheduled thread pool is used for
* sleeping and trigger redeliveries.
*/
+@SuppressWarnings("BusyWait")
public boolean sleep() throws InterruptedException {
// for small delays then just sleep
if (redeliveryDelay < 1000) {
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 dc7bed62ec9..ff66e58a3b7 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
@@ -16,7 +16,11 @@
*/
package org.apache.camel.processor.resequencer;
+import java.util.HashMap;
+import java.util.Map;
import java.util.Timer;
+import java.util.concurrent.CountDownLatch;
+import java.util.function.Predicate;
import org.apache.camel.util.concurrent.ThreadHelper;
@@ -78,6 +82,12 @@ public class ResequencerEngine {
*/
private Boolean rejectOld;
+/**
+ * List containing wait conditions to be evaluated whenever the sequence
is modified. Access to this field should be
+ * done inside a {@code synchronized(this)} block.
+ */
+private Map>> waitConditions = new
HashMap<>();
+
/**
* Creates a new resequencer instance with a default timeout of 2000
milliseconds.
*
@@ -110,6 +120,37 @@ public class ResequencerEngine {
return sequence.size();
}
+/**
+ * Wait for the following condition to happen. Do not call this method
while holding a lock on the resequencer
+ * engine, as it will deadlock. The predicate will be evaluated while
holding a lock on the resequencer engine.
+ *
+ * @param pred the condition to wait for
+ * @throws InterruptedException if the thread is interrupted
+ */
+public void waitUntil(Predicate> pred) throws
InterruptedException {
+CountDownLatch latch;
+synchronized (this) {
+if (pred.test(sequence)) {
+return;
+}
+latch = new CountDownLatch(1);
+waitConditions.put(latch, pred);
+}
+latch.await();
+}
+
(camel) branch main updated: Clean up smpp reconnect methods
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 b85d39ddb95 Clean up smpp reconnect methods
b85d39ddb95 is described below
commit b85d39ddb95d3760e939e89fb4dbd042914c6029
Author: Guillaume Nodet
AuthorDate: Wed May 22 14:01:00 2024 +0200
Clean up smpp reconnect methods
---
.../main/java/org/apache/camel/component/smpp/SmppConsumer.java| 7 ---
.../main/java/org/apache/camel/component/smpp/SmppProducer.java| 7 ---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java
index d2502aa163f..0184cba8b00 100644
---
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java
+++
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConsumer.java
@@ -80,7 +80,7 @@ public class SmppConsumer extends DefaultConsumer {
? "Session to {} was unbound - trying to reconnect" :
"Lost connection to: {} - trying to reconnect...",
getEndpoint().getConnectionString());
closeSession();
-reconnect(configuration.getInitialReconnectDelay());
+reconnect();
}
};
this.messageReceiverListener
@@ -185,9 +185,10 @@ public class SmppConsumer extends DefaultConsumer {
}
}
-private void reconnect(final long initialReconnectDelay) {
+private void reconnect() {
if (reconnectLock.tryLock()) {
-BlockingTask task = newReconnectTask(reconnectService,
RECONNECT_TASK_NAME, initialReconnectDelay,
+BlockingTask task = newReconnectTask(reconnectService,
RECONNECT_TASK_NAME,
+configuration.getInitialReconnectDelay(),
configuration.getReconnectDelay(),
configuration.getMaxReconnect());
diff --git
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java
index b8841fad205..4e130ce783b 100644
---
a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java
+++
b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppProducer.java
@@ -76,7 +76,7 @@ public class SmppProducer extends DefaultProducer {
? "Session to {} was unbound - trying to reconnect" :
"Lost connection to: {} - trying to reconnect...",
getEndpoint().getConnectionString());
closeSession();
-reconnect(configuration.getInitialReconnectDelay());
+reconnect();
}
};
}
@@ -205,9 +205,10 @@ public class SmppProducer extends DefaultProducer {
}
}
-private void reconnect(final long initialReconnectDelay) {
+private void reconnect() {
if (connectLock.tryLock()) {
-BlockingTask task = newReconnectTask(reconnectService,
RECONNECT_TASK_NAME, initialReconnectDelay,
+BlockingTask task = newReconnectTask(reconnectService,
RECONNECT_TASK_NAME,
+configuration.getInitialReconnectDelay(),
configuration.getReconnectDelay(),
configuration.getMaxReconnect());
try {
(camel) 02/04: Fix wrong synchronization pattern
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 f8f4ebcfa9da6665e2d0de77abcba3b3b92fc7cd
Author: Guillaume Nodet
AuthorDate: Wed May 15 17:34:25 2024 +0200
Fix wrong synchronization pattern
---
.../apache/camel/support/component/AbstractApiEndpoint.java | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/component/AbstractApiEndpoint.java
b/core/camel-support/src/main/java/org/apache/camel/support/component/AbstractApiEndpoint.java
index 0192468d239..5901086ce03 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/component/AbstractApiEndpoint.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/component/AbstractApiEndpoint.java
@@ -74,7 +74,7 @@ public abstract class AbstractApiEndpoint
private List candidates;
// cached Executor service
-private ExecutorService executorService;
+private volatile ExecutorService executorService;
// cached property names and values
private Set endpointPropertyNames;
@@ -337,13 +337,14 @@ public abstract class AbstractApiEndpoint
}
public final ExecutorService getExecutorService() {
-if (this.executorService == null) {
-// synchronize on class to avoid creating duplicate class level
executors
-synchronized (getClass()) {
-this.executorService = getExecutorService(getClass(),
getCamelContext(), getThreadProfileName());
+if (executorService == null) {
+synchronized (this) {
+if (executorService == null) {
+executorService = getExecutorService(getClass(),
getCamelContext(), getThreadProfileName());
+}
}
}
-return this.executorService;
+return executorService;
}
/**
(camel) 04/04: Remove unwanted warning for regex
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 86de8cb26208aab8b35d7fee58978199f502742b
Author: Guillaume Nodet
AuthorDate: Thu May 16 09:25:44 2024 +0200
Remove unwanted warning for regex
---
core/camel-util/src/main/java/org/apache/camel/util/URISupport.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
b/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
index 15908b52b6d..c8afdcb6f12 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/URISupport.java
@@ -50,6 +50,7 @@ public final class URISupport {
// Match any key-value pair in the URI query string whose key contains
// "passphrase" or "password" or secret key (case-insensitive).
// First capture group is the key, second is the value.
+@SuppressWarnings("RegExpUnnecessaryNonCapturingGroup")
private static final Pattern ALL_SECRETS = Pattern.compile(
"([?&][^=]*(?:" + SensitiveUtils.getSensitivePattern() +
")[^=]*)=(RAW(([{][^}]*[}])|([(][^)]*[)]))|[^&]*)",
Pattern.CASE_INSENSITIVE);
(camel) 01/04: Make model field final in DefaultCamelContext, deprecate the disposeModel method which was used with the lightweight mode
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 84838b5e1a54f4333a6080b7086d80af297c094d
Author: Guillaume Nodet
AuthorDate: Wed May 15 17:33:00 2024 +0200
Make model field final in DefaultCamelContext, deprecate the disposeModel
method which was used with the lightweight mode
---
.../src/main/java/org/apache/camel/ExtendedCamelContext.java | 3 +++
.../java/org/apache/camel/impl/engine/AbstractCamelContext.java | 1 +
.../apache/camel/impl/engine/DefaultCamelContextExtension.java| 1 -
.../src/main/java/org/apache/camel/impl/DefaultCamelContext.java | 8 +---
4 files changed, 5 insertions(+), 8 deletions(-)
diff --git
a/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
b/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
index 75f351bd165..318d50a5743 100644
--- a/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
+++ b/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
@@ -441,7 +441,10 @@ public interface ExtendedCamelContext {
* Danger!!! This will dispose the route model from the {@link
CamelContext} which is used for lightweight mode.
* This means afterwards no new routes can be dynamically added. Any
operations on the
* org.apache.camel.model.ModelCamelContext will return null or be a noop
operation.
+ *
+ * @deprecated noop, do not use
*/
+@Deprecated
void disposeModel();
/**
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 55445d737fd..763c09d8738 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
@@ -4085,6 +4085,7 @@ public abstract class AbstractCamelContext extends
BaseService
public abstract Processor createErrorHandler(Route route, Processor
processor) throws Exception;
+@Deprecated
public abstract void disposeModel();
public abstract String getTestExcludeRoutes();
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java
index cd84505f92e..d0f5036c2a8 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java
@@ -950,7 +950,6 @@ class DefaultCamelContextExtension implements
ExtendedCamelContext {
@Override
public void disposeModel() {
-camelContext.disposeModel();
}
@Override
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index 01ae79b13c0..b0493d5d4c9 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -105,7 +105,7 @@ public class DefaultCamelContext extends SimpleCamelContext
implements ModelCame
private static final Logger LOG =
LoggerFactory.getLogger(DefaultCamelContext.class);
private static final UuidGenerator UUID = new SimpleUuidGenerator();
-private Model model = new DefaultModel(this);
+private final Model model = new DefaultModel(this);
/**
* Creates the {@link ModelCamelContext} using {@link
org.apache.camel.support.DefaultRegistry} as registry.
@@ -231,12 +231,6 @@ public class DefaultCamelContext extends
SimpleCamelContext implements ModelCame
return resolver;
}
-@Override
-public void disposeModel() {
-LOG.debug("Disposing Model on CamelContext");
-model = null;
-}
-
@Override
public void addModelLifecycleStrategy(ModelLifecycleStrategy
modelLifecycleStrategy) {
model.addModelLifecycleStrategy(modelLifecycleStrategy);
(camel) branch main updated (17fa7056b88 -> 86de8cb2620)
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 17fa7056b88 Fix multicast iterator to be lazy again (#14169) new 84838b5e1a5 Make model field final in DefaultCamelContext, deprecate the disposeModel method which was used with the lightweight mode new f8f4ebcfa9d Fix wrong synchronization pattern new 11427c11b9b Do not synchronize on non final fields new 86de8cb2620 Remove unwanted warning for regex The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../main/java/org/apache/camel/ExtendedCamelContext.java | 3 +++ .../apache/camel/impl/engine/AbstractCamelContext.java| 1 + .../camel/impl/engine/DefaultCamelContextExtension.java | 1 - .../java/org/apache/camel/impl/DefaultCamelContext.java | 8 +--- .../camel/support/component/AbstractApiEndpoint.java | 13 +++-- .../processor/idempotent/FileIdempotentRepository.java| 15 --- .../processor/idempotent/MemoryIdempotentRepository.java | 9 + .../support/processor/state/FileStateRepository.java | 10 ++ .../src/main/java/org/apache/camel/util/URISupport.java | 1 + 9 files changed, 32 insertions(+), 29 deletions(-)
(camel) 03/04: Do not synchronize on non final fields
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 11427c11b9be4fae8ccc641882dbf432ade3e017
Author: Guillaume Nodet
AuthorDate: Wed May 15 18:31:31 2024 +0200
Do not synchronize on non final fields
---
.../processor/idempotent/FileIdempotentRepository.java| 15 ---
.../processor/idempotent/MemoryIdempotentRepository.java | 9 +
.../support/processor/state/FileStateRepository.java | 10 ++
3 files changed, 19 insertions(+), 15 deletions(-)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/processor/idempotent/FileIdempotentRepository.java
b/core/camel-support/src/main/java/org/apache/camel/support/processor/idempotent/FileIdempotentRepository.java
index 30d0d203df8..818a8d95c58 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/processor/idempotent/FileIdempotentRepository.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/processor/idempotent/FileIdempotentRepository.java
@@ -64,6 +64,7 @@ public class FileIdempotentRepository extends ServiceSupport
implements Idempote
private final AtomicBoolean init = new AtomicBoolean();
private Map cache;
+private final Object cacheAndStoreLock = new Object();
@Metadata(description = "The maximum size of the 1st-level in-memory
cache", defaultValue = "1000")
private int cacheSize;
@@ -80,9 +81,9 @@ public class FileIdempotentRepository extends ServiceSupport
implements Idempote
public FileIdempotentRepository() {
}
-public FileIdempotentRepository(File fileStore, Map set) {
+public FileIdempotentRepository(File fileStore, Map cache)
{
this.fileStore = fileStore;
-this.cache = set;
+this.cache = cache;
}
/**
@@ -133,7 +134,7 @@ public class FileIdempotentRepository extends
ServiceSupport implements Idempote
@Override
@ManagedOperation(description = "Adds the key to the store")
public boolean add(String key) {
-synchronized (cache) {
+synchronized (cacheAndStoreLock) {
if (cache.containsKey(key)) {
return false;
} else {
@@ -165,7 +166,7 @@ public class FileIdempotentRepository extends
ServiceSupport implements Idempote
@Override
@ManagedOperation(description = "Does the store contain the given key")
public boolean contains(String key) {
-synchronized (cache) {
+synchronized (cacheAndStoreLock) {
// check 1st-level first and then fallback to check the actual file
return cache.containsKey(key) || containsStore(key);
}
@@ -175,7 +176,7 @@ public class FileIdempotentRepository extends
ServiceSupport implements Idempote
@ManagedOperation(description = "Remove the key from the store")
public boolean remove(String key) {
boolean answer;
-synchronized (cache) {
+synchronized (cacheAndStoreLock) {
answer = cache.remove(key) != null;
// remove from file cache also
removeFromStore(key);
@@ -192,7 +193,7 @@ public class FileIdempotentRepository extends
ServiceSupport implements Idempote
@Override
@ManagedOperation(description = "Clear the store (danger this removes all
entries)")
public void clear() {
-synchronized (cache) {
+synchronized (cacheAndStoreLock) {
cache.clear();
if (cache instanceof LRUCache lruCache) {
lruCache.cleanUp();
@@ -279,7 +280,7 @@ public class FileIdempotentRepository extends
ServiceSupport implements Idempote
*/
@ManagedOperation(description = "Reset and reloads the file store")
public synchronized void reset() throws IOException {
-synchronized (cache) {
+synchronized (cacheAndStoreLock) {
// run the cleanup task first
if (cache instanceof LRUCache lruCache) {
lruCache.cleanUp();
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/processor/idempotent/MemoryIdempotentRepository.java
b/core/camel-support/src/main/java/org/apache/camel/support/processor/idempotent/MemoryIdempotentRepository.java
index cc1f9522619..e39c08d38f3 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/processor/idempotent/MemoryIdempotentRepository.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/processor/idempotent/MemoryIdempotentRepository.java
@@ -44,6 +44,7 @@ public class MemoryIdempotentRepository extends
ServiceSupport implements Idempo
private static final int MAX_CACHE_SIZE = 1000;
private Map cache;
+private final Object cacheAndStoreLock = new Object();
@Metadata(description = "Maximum elements that can be stored in-memory",
(camel) branch main updated: Fix multicast iterator to be lazy again (#14169)
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 17fa7056b88 Fix multicast iterator to be lazy again (#14169)
17fa7056b88 is described below
commit 17fa7056b886f29b890fb75c34e321f9ac5f2d0e
Author: Guillaume Nodet
AuthorDate: Fri May 17 08:22:13 2024 +0200
Fix multicast iterator to be lazy again (#14169)
If the last element of the iterable is null, the last message will not
contain the final informations such as splitter-size, multicast-complete
---
.../apache/camel/processor/MulticastProcessor.java | 22 ++
.../java/org/apache/camel/processor/Splitter.java | 2 +-
...rParallelWithIteratorThrowingExceptionTest.java | 4 ++--
3 files changed, 17 insertions(+), 11 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 4f1fe2bdddb..78560ad781a 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
@@ -70,7 +70,6 @@ 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;
@@ -313,6 +312,8 @@ public class MulticastProcessor extends
AsyncProcessorSupport
try {
pairs = createProcessorExchangePairs(exchange);
if (pairs instanceof Collection) {
+pairs = ((Collection) pairs)
+.stream().filter(Objects::nonNull).toList();
size = ((Collection) pairs).size();
}
} catch (Exception e) {
@@ -409,7 +410,7 @@ public class MulticastProcessor extends
AsyncProcessorSupport
this.original = original;
this.pairs = pairs;
this.callback = callback;
-this.iterator = new FilterIterator<>(pairs.iterator(),
Objects::nonNull);
+this.iterator = pairs.iterator();
if (timeout > 0) {
timeoutTask = schedule(aggregateExecutorService,
this::timeout, timeout, TimeUnit.MILLISECONDS);
} else {
@@ -535,16 +536,13 @@ public class MulticastProcessor extends
AsyncProcessorSupport
return;
}
-// Check if the iterator is empty
-// This can happen the very first time we check the existence
-// of an item before queuing the run.
-// or some iterators may return true for hasNext() but then
null in next()
-if (!iterator.hasNext()) {
+// Get next processor exchange pair to sent, skipping null ones
+ProcessorExchangePair pair = getNextProcessorExchangePair();
+if (pair == null) {
doDone(result.get(), true);
return;
}
-ProcessorExchangePair pair = iterator.next();
boolean hasNext = iterator.hasNext();
Exchange exchange = pair.getExchange();
@@ -605,6 +603,14 @@ public class MulticastProcessor extends
AsyncProcessorSupport
doDone(null, false);
}
}
+
+private ProcessorExchangePair getNextProcessorExchangePair() {
+ProcessorExchangePair tpair = null;
+while (tpair == null && iterator.hasNext()) {
+tpair = iterator.next();
+}
+return tpair;
+}
}
/**
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/Splitter.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/Splitter.java
index 72c557ccbe2..0b513472ee0 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/Splitter.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/Splitter.java
@@ -295,7 +295,7 @@ public class Splitter extends MulticastProcessor implements
AsyncProcessor, Trac
protected void updateNewExchange(Exchange exchange, int index,
Iterable allPairs, boolean hasNext) {
exchange.setProperty(ExchangePropertyKey.SPLIT_INDEX, index);
if (allPairs instanceof Collection) {
-// non streaming mode, so we know the total size already
+// non-streaming mode, so we know the total size already
exchange.setProperty(ExchangePropertyKey.SPLIT_SI
(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.ModelToXM
(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 {
-
(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/ObjectH
(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
(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 i
(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 {
(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.getC
(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
(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
(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(-)
(camel) branch main updated: Add @Serial annotation
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 83e8f4ceef5 Add @Serial annotation 83e8f4ceef5 is described below commit 83e8f4ceef520382fb59d9ae4b0f1dde39a11999 Author: Guillaume Nodet AuthorDate: Mon May 6 16:50:09 2024 +0200 Add @Serial annotation --- .../src/main/java/org/apache/camel/CamelExchangeException.java| 4 +++- .../src/main/java/org/apache/camel/RuntimeCamelException.java | 4 +++- .../org/apache/camel/spi/OptimisticLockingAggregationRepository.java | 4 +++- .../src/main/java/org/apache/camel/spi/ThreadPoolProfile.java | 3 ++- .../main/java/org/apache/camel/impl/event/AbstractContextEvent.java | 3 ++- .../main/java/org/apache/camel/impl/event/AbstractExchangeEvent.java | 3 ++- .../src/main/java/org/apache/camel/impl/event/AbstractRouteEvent.java | 3 ++- .../src/main/java/org/apache/camel/impl/event/AbstractStepEvent.java | 4 +++- .../org/apache/camel/impl/event/CamelContextInitializedEvent.java | 4 +++- .../org/apache/camel/impl/event/CamelContextInitializingEvent.java| 4 +++- .../org/apache/camel/impl/event/CamelContextReloadFailureEvent.java | 4 +++- .../java/org/apache/camel/impl/event/CamelContextReloadedEvent.java | 4 +++- .../java/org/apache/camel/impl/event/CamelContextReloadingEvent.java | 4 +++- .../org/apache/camel/impl/event/CamelContextResumeFailureEvent.java | 4 +++- .../java/org/apache/camel/impl/event/CamelContextResumedEvent.java| 4 +++- .../java/org/apache/camel/impl/event/CamelContextResumingEvent.java | 4 +++- .../org/apache/camel/impl/event/CamelContextRoutesStartedEvent.java | 4 +++- .../org/apache/camel/impl/event/CamelContextRoutesStartingEvent.java | 4 +++- .../org/apache/camel/impl/event/CamelContextRoutesStoppedEvent.java | 4 +++- .../org/apache/camel/impl/event/CamelContextRoutesStoppingEvent.java | 4 +++- .../java/org/apache/camel/impl/event/CamelContextStartedEvent.java| 4 +++- .../java/org/apache/camel/impl/event/CamelContextStartingEvent.java | 4 +++- .../org/apache/camel/impl/event/CamelContextStartupFailureEvent.java | 4 +++- .../org/apache/camel/impl/event/CamelContextStopFailureEvent.java | 4 +++- .../java/org/apache/camel/impl/event/CamelContextStoppedEvent.java| 4 +++- .../java/org/apache/camel/impl/event/CamelContextStoppingEvent.java | 4 +++- .../java/org/apache/camel/impl/event/CamelContextSuspendedEvent.java | 4 +++- .../java/org/apache/camel/impl/event/CamelContextSuspendingEvent.java | 4 +++- .../apache/camel/impl/event/ExchangeAsyncProcessingStartedEvent.java | 4 +++- .../main/java/org/apache/camel/impl/event/ExchangeCompletedEvent.java | 4 +++- .../main/java/org/apache/camel/impl/event/ExchangeCreatedEvent.java | 4 +++- .../main/java/org/apache/camel/impl/event/ExchangeFailedEvent.java| 4 +++- .../java/org/apache/camel/impl/event/ExchangeFailureHandledEvent.java | 4 +++- .../org/apache/camel/impl/event/ExchangeFailureHandlingEvent.java | 4 +++- .../java/org/apache/camel/impl/event/ExchangeRedeliveryEvent.java | 4 +++- .../main/java/org/apache/camel/impl/event/ExchangeSendingEvent.java | 4 +++- .../src/main/java/org/apache/camel/impl/event/ExchangeSentEvent.java | 4 +++- .../src/main/java/org/apache/camel/impl/event/RouteAddedEvent.java| 4 +++- .../src/main/java/org/apache/camel/impl/event/RouteReloadedEvent.java | 4 +++- .../src/main/java/org/apache/camel/impl/event/RouteRemovedEvent.java | 4 +++- .../src/main/java/org/apache/camel/impl/event/RouteStartedEvent.java | 4 +++- .../src/main/java/org/apache/camel/impl/event/RouteStartingEvent.java | 4 +++- .../src/main/java/org/apache/camel/impl/event/RouteStoppedEvent.java | 4 +++- .../src/main/java/org/apache/camel/impl/event/RouteStoppingEvent.java | 4 +++- .../java/org/apache/camel/impl/event/ServiceStartupFailureEvent.java | 3 ++- .../java/org/apache/camel/impl/event/ServiceStopFailureEvent.java | 3 ++- .../camel/language/simple/types/SimpleIllegalSyntaxException.java | 4 +++- .../org/apache/camel/language/simple/types/SimpleParserException.java | 4 +++- .../apache/camel/processor/ThrottlerRejectedExecutionException.java | 3 ++- .../camel/processor/aggregate/AbstractListAggregationStrategy.java| 3 ++- .../camel/processor/aggregate/ClosedCorrelationKeyException.java | 4 +++- .../org/apache/camel/processor/errorhandler/RedeliveryPolicy.java | 3 ++- .../org/apache/camel/processor/idempotent/NoMessageIdException.java | 4 +++- .../apache/camel/processor/resequencer/MessageRejectedException.java | 4 +++- .../main/java/org/apache/camel/processor/resequencer/Sequence.java| 3 ++- .../src/main/java/org/apache/camel/support/DefaultExchangeHolder.java | 3 ++- .../src/main/java/org/apache/camel/support/jndi/JndiContext.java
(camel) 06/07: Reduce complexity
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 f0cbc2eb246d4b0edb0c646da9e5d91da7980e4c
Author: Guillaume Nodet
AuthorDate: Fri Apr 26 13:55:00 2024 +0200
Reduce complexity
---
.../org/apache/camel/impl/console/RouteDevConsole.java| 15 +--
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git
a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java
b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java
index a6cb3354b04..27ad2f51fe4 100644
---
a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java
+++
b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java
@@ -301,16 +301,11 @@ public class RouteDevConsole extends AbstractDevConsole {
return;
}
-// sort by index
-List mps = new ArrayList<>();
-for (String id : ids) {
-ManagedProcessorMBean mp = mcc.getManagedProcessor(id);
-if (mp != null) {
-mps.add(mp);
-}
-}
-// sort processors by index
-mps.sort(Comparator.comparingInt(ManagedProcessorMBean::getIndex));
+List mps =
ids.stream().map(mcc::getManagedProcessor)
+.filter(Objects::nonNull)
+// sort processors by index
+
.sorted(Comparator.comparingInt(ManagedProcessorMBean::getIndex))
+.toList();
for (ManagedProcessorMBean mp : mps) {
JsonObject jo = new JsonObject();
(camel) 07/07: Split to reduce complexity
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 ee83ff5dd05f8881916332e0526e9b8c21bbcedb
Author: Guillaume Nodet
AuthorDate: Fri Apr 26 13:56:11 2024 +0200
Split to reduce complexity
---
.../impl/engine/CamelPostProcessorHelper.java | 112 -
1 file changed, 64 insertions(+), 48 deletions(-)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java
index f77caac62f4..deb27fc3825 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java
@@ -277,8 +277,7 @@ public class CamelPostProcessorHelper implements
CamelContextAware {
}
public Object getInjectionPropertyValue(
-Class type, Type genericType, String propertyName, String
propertyDefaultValue, String separator,
-String injectionPointName, Object bean, String beanName) {
+Class type, Type genericType, String propertyName, String
propertyDefaultValue, String separator) {
try {
String key;
String prefix = PropertiesComponent.PREFIX_TOKEN;
@@ -321,59 +320,77 @@ public class CamelPostProcessorHelper implements
CamelContextAware {
CamelContext camelContext, Class type, Type genericType,
String value, String separator)
throws NoTypeConversionAvailableException {
-String[] arr = value.split(separator);
-
if (type.isArray()) {
-Object[] values = new Object[arr.length];
-Class ct = type.getComponentType();
-for (int i = 0; i < arr.length; i++) {
-String v = arr[i].trim(); // trim values as user may have
whitespace noise
-values[i] =
camelContext.getTypeConverter().mandatoryConvertTo(ct, v);
-}
-return values;
+return convertArrayUsingSeparator(camelContext, type, value,
separator);
} else if (Collection.class.isAssignableFrom(type)) {
-Class ct = Object.class;
-if (genericType != null) {
-String name = StringHelper.between(genericType.getTypeName(),
"<", ">");
-if (name != null) {
-Class clazz =
camelContext.getClassResolver().resolveClass(name.trim());
-if (clazz != null) {
-ct = clazz;
-}
-}
-}
-boolean set = type.isAssignableFrom(Set.class);
-Collection values = set ? new LinkedHashSet() : new ArrayList();
-for (int i = 0; i < arr.length; i++) {
-String v = arr[i].trim(); // trim values as user may have
whitespace noise
-
values.add(camelContext.getTypeConverter().mandatoryConvertTo(ct, v));
-}
-return values;
+return convertCollectionUsingSeparator(camelContext, type,
genericType, value, separator);
} else if (Map.class.isAssignableFrom(type)) {
-Class ct = Object.class;
-if (genericType != null) {
-String name = StringHelper.between(genericType.getTypeName(),
"<", ">");
-name = StringHelper.afterLast(name, ",");
-if (name != null) {
-Class clazz =
camelContext.getClassResolver().resolveClass(name.trim());
-if (clazz != null) {
-ct = clazz;
-}
+return convertMapUsingSeparator(camelContext, genericType, value,
separator);
+} else {
+return null;
+}
+}
+
+private static Map convertMapUsingSeparator(
+CamelContext camelContext, Type genericType, String value, String
separator)
+throws NoTypeConversionAvailableException {
+Class ct = Object.class;
+if (genericType != null) {
+String name = StringHelper.between(genericType.getTypeName(), "<",
">");
+name = StringHelper.afterLast(name, ",");
+if (name != null) {
+Class clazz =
camelContext.getClassResolver().resolveClass(name.trim());
+if (clazz != null) {
+ct = clazz;
}
}
-Map values = new LinkedHashMap<>();
-for (int i = 0; i < arr.length; i++) {
-String v = arr[i].trim(); // trim values as user may have
whitespace noise
-if (v.contains("=")) {
-
(camel) 04/07: Remove public constructors on abstract classes
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 6e8c9ef9f64c048c614dc45abbe39ccbfa0e9769
Author: Guillaume Nodet
AuthorDate: Fri Apr 26 13:40:17 2024 +0200
Remove public constructors on abstract classes
---
.../src/main/java/org/apache/camel/model/NoOutputDefinition.java | 4 ++--
.../java/org/apache/camel/model/OptionalIdentifiedDefinition.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/NoOutputDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/NoOutputDefinition.java
index 92dc058a088..bb31077e962 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/NoOutputDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/NoOutputDefinition.java
@@ -29,10 +29,10 @@ public abstract class NoOutputDefinition>
return Collections.emptyList();
}
-public NoOutputDefinition() {
+protected NoOutputDefinition() {
}
-protected NoOutputDefinition(NoOutputDefinition source) {
+protected NoOutputDefinition(NoOutputDefinition source) {
super(source);
}
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
index 767f40181b4..59d87e7f734 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/OptionalIdentifiedDefinition.java
@@ -45,10 +45,10 @@ public abstract class OptionalIdentifiedDefinition
source) {
this.camelContext = source.camelContext;
this.id = source.id;
this.customId = source.customId;
(camel) 05/07: Deprecate camel-catalog-maven and minor fixes to 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 9109d389894d4ec3b611f57a943fd1a909eb3fd1
Author: Guillaume Nodet
AuthorDate: Fri Apr 26 13:49:33 2024 +0200
Deprecate camel-catalog-maven and minor fixes to it
---
.../catalog/maven/ComponentArtifactHelper.java | 24 +
.../maven/DefaultMavenArtifactProvider.java| 41 +++---
.../camel/catalog/maven/MavenArtifactProvider.java | 4 +++
.../maven/MavenArtifactProviderManualTest.java | 1 +
.../camel/tooling/maven/MavenDownloader.java | 4 ++-
5 files changed, 38 insertions(+), 36 deletions(-)
diff --git
a/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/ComponentArtifactHelper.java
b/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/ComponentArtifactHelper.java
index 70d88f1c7fb..645f6c7bda8 100644
---
a/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/ComponentArtifactHelper.java
+++
b/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/ComponentArtifactHelper.java
@@ -19,6 +19,8 @@ package org.apache.camel.catalog.maven;
import java.io.InputStream;
import java.util.Properties;
+import org.slf4j.Logger;
+
import static org.apache.camel.catalog.impl.CatalogHelper.loadText;
/**
@@ -30,7 +32,7 @@ public final class ComponentArtifactHelper {
private ComponentArtifactHelper() {
}
-public static Properties loadComponentProperties(boolean log, ClassLoader
classLoader) {
+public static Properties loadComponentProperties(ClassLoader classLoader,
Logger logger) {
Properties answer = new Properties();
try {
// load the component files using the recommended way by a
component.properties file
@@ -39,15 +41,12 @@ public final class ComponentArtifactHelper {
answer.load(is);
}
} catch (Exception e) {
-if (log) {
-System.out.println("WARN: Error loading
META-INF/services/org/apache/camel/component.properties file due "
- + e.getMessage());
-}
+logger.warn("Error loading
META-INF/services/org/apache/camel/component.properties file due {}",
e.getMessage(), e);
}
return answer;
}
-public static String extractComponentJavaType(boolean log, ClassLoader
classLoader, String scheme) {
+public static String extractComponentJavaType(ClassLoader classLoader,
String scheme, Logger logger) {
try {
InputStream is =
classLoader.getResourceAsStream("META-INF/services/org/apache/camel/component/"
+ scheme);
if (is != null) {
@@ -56,20 +55,17 @@ public final class ComponentArtifactHelper {
return (String) props.get("class");
}
} catch (Exception e) {
-if (log) {
-System.out.println("WARN: Error loading
META-INF/services/org/apache/camel/component/" + scheme + " file due "
- + e.getMessage());
-}
+logger.warn("Error loading
META-INF/services/org/apache/camel/component/{} file due {}", scheme,
e.getMessage(), e);
}
return null;
}
-public static String loadComponentJSonSchema(boolean log, ClassLoader
classLoader, String scheme) {
+public static String loadComponentJSonSchema(ClassLoader classLoader,
String scheme, Logger logger) {
String answer = null;
String path = null;
-String javaType = extractComponentJavaType(log, classLoader, scheme);
+String javaType = extractComponentJavaType(classLoader, scheme,
logger);
if (javaType != null) {
int pos = javaType.lastIndexOf('.');
path = javaType.substring(0, pos);
@@ -84,9 +80,7 @@ public final class ComponentArtifactHelper {
answer = loadText(is);
}
} catch (Exception e) {
-if (log) {
-System.out.println("WARN: Error loading " + path + " file
due " + e.getMessage());
-}
+logger.warn("Error loading {} file due {}", path,
e.getMessage(), e);
}
}
diff --git
a/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
b/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
index e3029b321fa..a896252593f 100644
---
a/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
+++
b/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/
(camel) branch main updated (80ac25e0e33 -> ee83ff5dd05)
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 80ac25e0e33 CAMEL-20514: camel-model - Add support for bean constructors for beans in route templates or kamelets (#14040) new 2a28eb0a97f Various small code cleanup new 5ef33f94a11 Fix deprecation notices new f5891d942b4 Remove unused params new 6e8c9ef9f64 Remove public constructors on abstract classes new 9109d389894 Deprecate camel-catalog-maven and minor fixes to it new f0cbc2eb246 Reduce complexity new ee83ff5dd05 Split to reduce complexity The 7 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/catalog/console/CatalogConsole.java | 1 + .../catalog/lucene/LuceneSuggestionStrategy.java | 2 +- .../catalog/maven/ComponentArtifactHelper.java | 24 ++--- .../maven/DefaultMavenArtifactProvider.java| 41 .../camel/catalog/maven/MavenArtifactProvider.java | 6 +- .../camel/catalog/maven/MavenVersionManager.java | 7 +- .../maven/MavenArtifactProviderManualTest.java | 1 + .../org/apache/camel/catalog/CamelCatalog.java | 67 .../apache/camel/catalog/DefaultCamelCatalog.java | 48 ++--- .../java/org/apache/camel/maven/GenerateMojo.java | 7 -- .../org/apache/camel/maven/RouteCoverageMojo.java | 79 --- .../java/org/apache/camel/maven/ValidateMojo.java | 19 ++-- .../org/apache/camel/parser/java/MyNettyTest.java | 4 +- .../camel/parser/java/MyRouteDuplicateIdTest.java | 9 +- .../camel/parser/java/MyRouteEmptyUriTest.java | 4 +- .../org/apache/camel/parser/java/MyRouteTest.java | 4 +- .../camel/component/as2/api/AS2ClientManager.java | 1 + .../component/asterisk/AsteriskConsumerTest.java | 3 + .../apache/camel/language/bean/BeanExpression.java | 14 +-- .../apache/camel/catalog/SuggestionStrategy.java | 2 +- .../impl/engine/CamelPostProcessorHelper.java | 112 - .../impl/engine/DefaultCamelBeanPostProcessor.java | 12 +-- .../apache/camel/impl/console/RouteDevConsole.java | 15 +-- .../org/apache/camel/model/NoOutputDefinition.java | 4 +- .../camel/model/OptionalIdentifiedDefinition.java | 4 +- .../org/apache/camel/model/RouteDefinition.java| 39 --- .../AbstractCamelRedeliveryPolicyFactoryBean.java | 1 + .../impl/engine/CamelPostProcessorHelperTest.java | 28 ++ .../jbang/core/commands/catalog/CatalogDoc.java| 25 ++--- .../injection/AnnotationDependencyInjection.java | 6 +- .../camel/main/util/SuggestSimilarHelper.java | 2 +- .../camel/tooling/maven/MavenDownloader.java | 4 +- 32 files changed, 281 insertions(+), 314 deletions(-)
(camel) 03/07: Remove unused params
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 f5891d942b4485d71a9e7a267b2dcef70d16035b
Author: Guillaume Nodet
AuthorDate: Fri Apr 26 13:38:01 2024 +0200
Remove unused params
---
.../impl/engine/CamelPostProcessorHelper.java | 4 ++--
.../impl/engine/DefaultCamelBeanPostProcessor.java | 12 +-
.../impl/engine/CamelPostProcessorHelperTest.java | 28 +-
.../injection/AnnotationDependencyInjection.java | 6 ++---
4 files changed, 21 insertions(+), 29 deletions(-)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java
index 30b2d3a353e..f77caac62f4 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelPostProcessorHelper.java
@@ -546,8 +546,8 @@ public class CamelPostProcessorHelper implements
CamelContextAware {
if (ann.annotationType() == PropertyInject.class) {
PropertyInject pi = (PropertyInject) ann;
Object result
-= getInjectionPropertyValue(type, genericType,
pi.value(), pi.defaultValue(), pi.separator(),
-null, null, null);
+= getInjectionPropertyValue(type, genericType,
pi.value(), pi.defaultValue(), pi.separator()
+);
parameters[i] = result;
} else if (ann.annotationType() == BeanConfigInject.class)
{
BeanConfigInject pi = (BeanConfigInject) ann;
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java
index 45d6e1e1011..dfd82d1e7b2 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java
@@ -270,7 +270,7 @@ public class DefaultCamelBeanPostProcessor implements
CamelBeanPostProcessor, Ca
PropertyInject propertyInject =
field.getAnnotation(PropertyInject.class);
if (propertyInject != null) {
injectFieldProperty(field, propertyInject.value(),
propertyInject.defaultValue(), propertyInject.separator(),
-bean, beanName);
+bean);
}
BeanInject beanInject = field.getAnnotation(BeanInject.class);
@@ -329,11 +329,11 @@ public class DefaultCamelBeanPostProcessor implements
CamelBeanPostProcessor, Ca
public void injectFieldProperty(
Field field, String propertyName, String propertyDefaultValue,
String propertySeparator,
-Object bean, String beanName) {
+Object bean) {
ReflectionHelper.setField(field, bean,
getPostProcessorHelper().getInjectionPropertyValue(field.getType(),
field.getGenericType(), propertyName,
propertyDefaultValue,
-propertySeparator, field.getName(), bean, beanName));
+propertySeparator));
}
protected void injectMethods(final Object bean, final String beanName,
Function, Boolean> accept) {
@@ -429,7 +429,7 @@ public class DefaultCamelBeanPostProcessor implements
CamelBeanPostProcessor, Ca
PropertyInject propertyInject =
method.getAnnotation(PropertyInject.class);
if (propertyInject != null) {
setterPropertyInjection(method, propertyInject.value(),
propertyInject.defaultValue(), propertyInject.separator(),
-bean, beanName);
+bean);
}
BeanInject beanInject = method.getAnnotation(BeanInject.class);
@@ -467,7 +467,7 @@ public class DefaultCamelBeanPostProcessor implements
CamelBeanPostProcessor, Ca
public void setterPropertyInjection(
Method method, String propertyValue, String propertyDefaultValue,
String propertySeparator,
-Object bean, String beanName) {
+Object bean) {
Class[] parameterTypes = method.getParameterTypes();
if (parameterTypes.length != 1) {
LOG.warn("Ignoring badly annotated method for injection due to
incorrect number of parameters: {}", method);
@@ -476,7 +476,7 @@ public class DefaultCamelBeanPostProcessor implements
CamelBeanPostProcessor, Ca
Class type = parameterTypes[0];
Type genericType = method.getGenericParameterTypes()[0];
(camel) 01/07: Various small code 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 2a28eb0a97f7ce7425d1071a7fc82bef071fa557
Author: Guillaume Nodet
AuthorDate: Fri Apr 26 11:06:43 2024 +0200
Various small code cleanup
---
.../camel/catalog/console/CatalogConsole.java | 1 +
.../catalog/lucene/LuceneSuggestionStrategy.java | 2 +-
.../camel/catalog/maven/MavenArtifactProvider.java | 2 +-
.../camel/catalog/maven/MavenVersionManager.java | 7 +-
.../org/apache/camel/catalog/CamelCatalog.java | 67 ++
.../apache/camel/catalog/DefaultCamelCatalog.java | 48 +++--
.../java/org/apache/camel/maven/GenerateMojo.java | 7 --
.../org/apache/camel/maven/RouteCoverageMojo.java | 79 +++---
.../java/org/apache/camel/maven/ValidateMojo.java | 19 +++---
.../org/apache/camel/parser/java/MyNettyTest.java | 4 +-
.../camel/parser/java/MyRouteDuplicateIdTest.java | 9 ++-
.../camel/parser/java/MyRouteEmptyUriTest.java | 4 +-
.../org/apache/camel/parser/java/MyRouteTest.java | 4 +-
.../camel/component/as2/api/AS2ClientManager.java | 1 +
.../component/asterisk/AsteriskConsumerTest.java | 3 +
.../apache/camel/language/bean/BeanExpression.java | 14 ++--
.../apache/camel/catalog/SuggestionStrategy.java | 2 +-
.../AbstractCamelRedeliveryPolicyFactoryBean.java | 1 +
.../jbang/core/commands/catalog/CatalogDoc.java| 25 +++
.../camel/main/util/SuggestSimilarHelper.java | 2 +-
20 files changed, 128 insertions(+), 173 deletions(-)
diff --git
a/catalog/camel-catalog-console/src/main/java/org/apache/camel/catalog/console/CatalogConsole.java
b/catalog/camel-catalog-console/src/main/java/org/apache/camel/catalog/console/CatalogConsole.java
index 97475eab8c6..828752ec0ad 100644
---
a/catalog/camel-catalog-console/src/main/java/org/apache/camel/catalog/console/CatalogConsole.java
+++
b/catalog/camel-catalog-console/src/main/java/org/apache/camel/catalog/console/CatalogConsole.java
@@ -30,6 +30,7 @@ import org.apache.camel.tooling.model.OtherModel;
import org.apache.camel.util.json.JsonObject;
@DevConsole(name = "catalog", description = "Information about used Camel
artifacts")
+@SuppressWarnings("java:S2160")
public class CatalogConsole extends AbstractDevConsole {
private static final String CP = System.getProperty("java.class.path");
diff --git
a/catalog/camel-catalog-lucene/src/main/java/org/apache/camel/catalog/lucene/LuceneSuggestionStrategy.java
b/catalog/camel-catalog-lucene/src/main/java/org/apache/camel/catalog/lucene/LuceneSuggestionStrategy.java
index 55ffd816c1f..1f16a49db90 100644
---
a/catalog/camel-catalog-lucene/src/main/java/org/apache/camel/catalog/lucene/LuceneSuggestionStrategy.java
+++
b/catalog/camel-catalog-lucene/src/main/java/org/apache/camel/catalog/lucene/LuceneSuggestionStrategy.java
@@ -64,7 +64,7 @@ public class LuceneSuggestionStrategy implements
SuggestionStrategy {
// ignore
}
-return null;
+return new String[0];
}
}
diff --git
a/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenArtifactProvider.java
b/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenArtifactProvider.java
index 915395aba17..c4fb3674674 100644
---
a/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenArtifactProvider.java
+++
b/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenArtifactProvider.java
@@ -28,7 +28,7 @@ public interface MavenArtifactProvider {
/**
* Configures the directory for the download cache.
*
- * The default folder is USER_HOME/.groovy/grape
+ * The default directory is provider dependant.
*
* @param directory the directory.
*/
diff --git
a/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
b/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
index d4c9657c707..b69ece33d9a 100644
---
a/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
+++
b/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.catalog.maven;
-import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
@@ -47,7 +46,7 @@ import org.slf4j.LoggerFactory;
*
* This implementation uses Maven Resolver to download the Maven JARs.
*/
-public class MavenVersionManager implements VersionManager, Closeable {
+public class MavenVersionManager implements VersionManager {
private static final Logger LOGGER =
LoggerFactory.getLogger(MavenVersionManager.class);
@@ -262,8 +261,4 @@ pub
(camel) 02/07: Fix deprecation notices
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 5ef33f94a1105d897e052382c754a75133db887a
Author: Guillaume Nodet
AuthorDate: Fri Apr 26 13:35:55 2024 +0200
Fix deprecation notices
---
.../org/apache/camel/model/RouteDefinition.java| 39 +-
1 file changed, 23 insertions(+), 16 deletions(-)
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinition.java
index bd1079609e7..9d0737f062c 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinition.java
@@ -326,9 +326,10 @@ public class RouteDefinition extends
OutputDefinition
/**
* Disable stream caching for this route.
*
- * @return the builder
+ * @return the builder
+ * @deprecated use {@link #streamCache(String)}
*/
-@Deprecated
+@Deprecated(since = "4.6.0")
public RouteDefinition noStreamCaching() {
setStreamCache("false");
return this;
@@ -337,9 +338,10 @@ public class RouteDefinition extends
OutputDefinition
/**
* Enable stream caching for this route.
*
- * @return the builder
+ * @return the builder
+ * @deprecated use {@link #streamCache(String)}
*/
-@Deprecated
+@Deprecated(since = "4.6.0")
public RouteDefinition streamCaching() {
setStreamCache("true");
return this;
@@ -352,7 +354,7 @@ public class RouteDefinition extends
OutputDefinition
* @return the builder
* @deprecated use {@link #streamCache(String)}
*/
-@Deprecated
+@Deprecated(since = "4.6.0")
public RouteDefinition streamCaching(String streamCache) {
setStreamCache(streamCache);
return this;
@@ -372,9 +374,10 @@ public class RouteDefinition extends
OutputDefinition
/**
* Disable tracing for this route.
*
- * @return the builder
+ * @return the builder
+ * @deprecated use {@link #trace(String)}
*/
-@Deprecated
+@Deprecated(since = "4.6.0")
public RouteDefinition noTracing() {
setTrace("false");
return this;
@@ -383,9 +386,10 @@ public class RouteDefinition extends
OutputDefinition
/**
* Enable tracing for this route.
*
- * @return the builder
+ * @return the builder
+ * @deprecated use {@link #trace(String)}
*/
-@Deprecated
+@Deprecated(since = "4.6.0")
public RouteDefinition tracing() {
setTrace("true");
return this;
@@ -394,10 +398,11 @@ public class RouteDefinition extends
OutputDefinition
/**
* Enable tracing for this route.
*
- * @param tracing whether to use tracing (true or false), the value can
be a property placeholder
- * @return the builder
+ * @param tracing whether to use tracing (true or false), the value
can be a property placeholder
+ * @return the builder
+ * @deprecated use {@link #trace(String)}
*/
-@Deprecated
+@Deprecated(since = "4.6.0")
public RouteDefinition tracing(String tracing) {
setTrace(tracing);
return this;
@@ -482,9 +487,10 @@ public class RouteDefinition extends
OutputDefinition
/**
* Disable message history for this route.
*
- * @return the builder
+ * @return the builder
+ * @deprecated use {@link #messageHistory(boolean)}
*/
-@Deprecated
+@Deprecated(since = "4.6.0")
public RouteDefinition noMessageHistory() {
setMessageHistory("false");
return this;
@@ -493,9 +499,10 @@ public class RouteDefinition extends
OutputDefinition
/**
* Disable delayer for this route.
*
- * @return the builder
+ * @return the builder
+ * @deprecated use {@link #delayer(long)}
*/
-@Deprecated
+@Deprecated(since = "4.6.0")
public RouteDefinition noDelayer() {
setDelayer("0");
return this;
(camel) 02/02: [CAMEL-20546] Regen
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 6f5469a701464a88fc169be32cec906e42589602
Author: Guillaume Nodet
AuthorDate: Tue Apr 23 11:18:41 2024 +0200
[CAMEL-20546] Regen
---
.../resources/{ => META-INF}/org/apache/camel/dataformat/asn1/asn1.json | 0
.../resources/{ => META-INF}/org/apache/camel/dataformat/avro/avro.json | 0
.../{ => META-INF}/org/apache/camel/dataformat/barcode/barcode.json | 0
.../{ => META-INF}/org/apache/camel/dataformat/base64/base64.json | 0
.../resources/{ => META-INF}/org/apache/camel/language/bean/bean.json | 0
.../{ => META-INF}/org/apache/camel/dataformat/beanio/beanio.json | 0
.../{ => META-INF}/org/apache/camel/dataformat/bindy/csv/bindyCsv.json | 0
.../org/apache/camel/dataformat/bindy/fixed/bindyFixed.json | 0
.../{ => META-INF}/org/apache/camel/dataformat/bindy/kvp/bindyKvp.json | 0
.../resources/{ => META-INF}/org/apache/camel/component/cbor/cbor.json | 0
.../{ => META-INF}/org/apache/camel/converter/crypto/crypto.json| 0
.../resources/{ => META-INF}/org/apache/camel/converter/crypto/pgp.json | 0
.../resources/{ => META-INF}/org/apache/camel/dataformat/csv/csv.json | 0
.../{ => META-INF}/org/apache/camel/language/datasonnet/datasonnet.json | 0
.../{ => META-INF}/org/apache/camel/component/fastjson/fastjson.json| 0
.../{ => META-INF}/org/apache/camel/component/fhir/fhirJson.json| 0
.../{ => META-INF}/org/apache/camel/component/fhir/fhirXml.json | 0
.../{ => META-INF}/org/apache/camel/dataformat/flatpack/flatpack.json | 0
.../resources/{ => META-INF}/org/apache/camel/component/grok/grok.json | 0
.../{ => META-INF}/org/apache/camel/language/groovy/groovy.json | 0
.../resources/{ => META-INF}/org/apache/camel/component/gson/gson.json | 0
.../resources/{ => META-INF}/org/apache/camel/component/hl7/hl7.json| 0
.../{ => META-INF}/org/apache/camel/component/hl7/hl7terser.json| 0
.../resources/{ => META-INF}/org/apache/camel/component/ical/ical.json | 0
.../org/apache/camel/component/jackson/avro/avroJackson.json| 0
.../org/apache/camel/component/jackson/protobuf/protobufJackson.json| 0
.../{ => META-INF}/org/apache/camel/component/jackson/jackson.json | 0
.../org/apache/camel/component/jacksonxml/jacksonXml.json | 0
.../resources/{ => META-INF}/org/apache/camel/language/js/js.json | 0
.../resources/{ => META-INF}/org/apache/camel/converter/jaxb/jaxb.json | 0
.../resources/{ => META-INF}/org/apache/camel/language/joor/java.json | 0
.../resources/{ => META-INF}/org/apache/camel/language/joor/joor.json | 0
.../resources/{ => META-INF}/org/apache/camel/language/jq/jq.json | 0
.../{ => META-INF}/org/apache/camel/component/jsonapi/jsonApi.json | 0
.../{ => META-INF}/org/apache/camel/component/jsonb/jsonb.json | 0
.../resources/{ => META-INF}/org/apache/camel/jsonpath/jsonpath.json| 0
.../resources/{ => META-INF}/org/apache/camel/dataformat/lzf/lzf.json | 0
.../org/apache/camel/dataformat/mime/multipart/mimeMultipart.json | 0
.../resources/{ => META-INF}/org/apache/camel/language/mvel/mvel.json | 0
.../resources/{ => META-INF}/org/apache/camel/language/ognl/ognl.json | 0
.../org/apache/camel/dataformat/parquet/avro/parquetAvro.json | 0
.../{ => META-INF}/org/apache/camel/dataformat/protobuf/protobuf.json | 0
.../{ => META-INF}/org/apache/camel/language/python/python.json | 0
.../resources/{ => META-INF}/org/apache/camel/dataformat/rss/rss.json | 0
.../{ => META-INF}/org/apache/camel/language/xquery/xquery.json | 0
.../{ => META-INF}/org/apache/camel/component/snakeyaml/snakeYaml.json | 0
.../resources/{ => META-INF}/org/apache/camel/dataformat/soap/soap.json | 0
.../resources/{ => META-INF}/org/apache/camel/language/spel/spel.json | 0
.../{ => META-INF}/org/apache/camel/language/xtokenizer/xtokenize.json | 0
.../{ => META-INF}/org/apache/camel/dataformat/swift/mt/swiftMt.json| 0
.../{ => META-INF}/org/apache/camel/dataformat/swift/mx/swiftMx.json| 0
.../{ => META-INF}/org/apache/camel/component/syslog/syslog.json| 0
.../{ => META-INF}/org/apache/camel/dataformat/tarfile/tarFile.json | 0
.../{ => META-INF}/org/apache/camel/dataformat/thrift/thrift.json | 0
.../org/apache/camel/dataformat/univocity/univocityCsv.json | 0
.../org/apache/camel/dataformat/univocity/univocityFixed.json | 0
.../org/apache/camel/dataformat/univocity/univocityTsv.json | 0
.../resources/{ => META-INF}/org/apache/camel/language/wasm/wasm.json | 0
.../org/apache/camel/dataformat/xmlsecurity/xmlSecurity.json
(camel) branch main updated (af400399ad3 -> 6f5469a7014)
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 af400399ad3 Bump jakarta.json.bind:jakarta.json.bind-api from 3.0.0 to
3.0.1 (#13913)
new 815d0f7a8ce [CAMEL-20546] Move schemas in META-INF/camel
new 6f5469a7014 [CAMEL-20546] Regen
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:
.../{ => META-INF}/org/apache/camel/dataformat/asn1/asn1.json | 0
.../{ => META-INF}/org/apache/camel/dataformat/avro/avro.json | 0
.../org/apache/camel/dataformat/barcode/barcode.json | 0
.../org/apache/camel/dataformat/base64/base64.json | 0
.../{ => META-INF}/org/apache/camel/language/bean/bean.json| 0
.../org/apache/camel/dataformat/beanio/beanio.json | 0
.../org/apache/camel/dataformat/bindy/csv/bindyCsv.json| 0
.../org/apache/camel/dataformat/bindy/fixed/bindyFixed.json| 0
.../org/apache/camel/dataformat/bindy/kvp/bindyKvp.json| 0
.../{ => META-INF}/org/apache/camel/component/cbor/cbor.json | 0
.../org/apache/camel/converter/crypto/crypto.json | 0
.../{ => META-INF}/org/apache/camel/converter/crypto/pgp.json | 0
.../{ => META-INF}/org/apache/camel/dataformat/csv/csv.json| 0
.../org/apache/camel/language/datasonnet/datasonnet.json | 0
.../org/apache/camel/component/fastjson/fastjson.json | 0
.../org/apache/camel/component/fhir/fhirJson.json | 0
.../org/apache/camel/component/fhir/fhirXml.json | 0
.../org/apache/camel/dataformat/flatpack/flatpack.json | 0
.../{ => META-INF}/org/apache/camel/component/grok/grok.json | 0
.../org/apache/camel/language/groovy/groovy.json | 0
.../{ => META-INF}/org/apache/camel/component/gson/gson.json | 0
.../{ => META-INF}/org/apache/camel/component/hl7/hl7.json | 0
.../org/apache/camel/component/hl7/hl7terser.json | 0
.../{ => META-INF}/org/apache/camel/component/ical/ical.json | 0
.../org/apache/camel/component/jackson/avro/avroJackson.json | 0
.../camel/component/jackson/protobuf/protobufJackson.json | 0
.../org/apache/camel/component/jackson/jackson.json| 0
.../org/apache/camel/component/jacksonxml/jacksonXml.json | 0
.../{ => META-INF}/org/apache/camel/language/js/js.json| 0
.../{ => META-INF}/org/apache/camel/converter/jaxb/jaxb.json | 0
.../{ => META-INF}/org/apache/camel/language/joor/java.json| 0
.../{ => META-INF}/org/apache/camel/language/joor/joor.json| 0
.../{ => META-INF}/org/apache/camel/language/jq/jq.json| 0
.../org/apache/camel/component/jsonapi/jsonApi.json| 0
.../{ => META-INF}/org/apache/camel/component/jsonb/jsonb.json | 0
.../{ => META-INF}/org/apache/camel/jsonpath/jsonpath.json | 0
.../{ => META-INF}/org/apache/camel/dataformat/lzf/lzf.json| 0
.../apache/camel/dataformat/mime/multipart/mimeMultipart.json | 0
.../{ => META-INF}/org/apache/camel/language/mvel/mvel.json| 0
.../{ => META-INF}/org/apache/camel/language/ognl/ognl.json| 0
.../org/apache/camel/dataformat/parquet/avro/parquetAvro.json | 0
.../org/apache/camel/dataformat/protobuf/protobuf.json | 0
.../org/apache/camel/language/python/python.json | 0
.../{ => META-INF}/org/apache/camel/dataformat/rss/rss.json| 0
.../org/apache/camel/language/xquery/xquery.json | 0
.../org/apache/camel/component/snakeyaml/snakeYaml.json| 0
.../{ => META-INF}/org/apache/camel/dataformat/soap/soap.json | 0
.../{ => META-INF}/org/apache/camel/language/spel/spel.json| 0
.../org/apache/camel/language/xtokenizer/xtokenize.json| 0
.../org/apache/camel/dataformat/swift/mt/swiftMt.json | 0
.../org/apache/camel/dataformat/swift/mx/swiftMx.json | 0
.../org/apache/camel/component/syslog/syslog.json | 0
.../org/apache/camel/dataformat/tarfile/tarFile.json | 0
.../org/apache/camel/dataformat/thrift/thrift.json | 0
.../org/apache/camel/dataformat/univocity/univocityCsv.json| 0
.../org/apache/camel/dataformat/univocity/univocityFixed.json | 0
.../org/apache/camel/dataformat/univocity/univocityTsv.json| 0
.../{ => META-INF}/org/apache/camel/language/wasm/wasm.json| 0
.../org/apache/camel/dataformat/xmlsecurity/xmlSecurity.json | 0
.../{ => META-INF}/org/apache/camel/language/xpath/xpath.json | 0
.../org/apache/camel/dataformat/deflater/gzipDeflater.json | 0
.../org/apache/camel/dataformat/deflater/zipDeflater.json
(camel) 01/02: [CAMEL-20546] Move schemas in META-INF/camel
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 815d0f7a8ce2d2c9f7a81f5a4195ae526d7b3537
Author: Guillaume Nodet
AuthorDate: Tue Apr 23 11:18:24 2024 +0200
[CAMEL-20546] Move schemas in META-INF/camel
---
docs/gulpfile.js | 10 +-
.../apache/camel/maven/packaging/PackageDataFormatMojo.java| 2 +-
.../org/apache/camel/maven/packaging/PackageLanguageMojo.java | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/docs/gulpfile.js b/docs/gulpfile.js
index 7858f78442b..c7c18df9a45 100644
--- a/docs/gulpfile.js
+++ b/docs/gulpfile.js
@@ -127,8 +127,8 @@ const sources = {
},
json: {
source: [
-
'../components/{*,*/*,*/*/*}/src/generated/resources/org/apache/camel/**/*.json',
-
'../core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/*.json',
+
'../components/{*,*/*,*/*/*}/src/generated/resources/META-INF/org/apache/camel/**/*.json',
+
'../core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/*.json',
],
destination: 'components/modules/dataformats/examples/json',
filter: (content) => JSON.parse(content).dataformat, // check if there
is a "dataformat" key at the root
@@ -147,9 +147,9 @@ const sources = {
},
json: {
source: [
-
'../components/{*,*/*,*/*/*}/src/generated/resources/org/apache/camel/*/**/*.json',
-
'../core/camel-core-languages/src/generated/resources/org/apache/camel/language/**/*.json',
-
'../core/camel-core-model/src/generated/resources/org/apache/camel/model/language/*.json',
+
'../components/{*,*/*,*/*/*}/src/generated/resources/META-INF/org/apache/camel/*/**/*.json',
+
'../core/camel-core-languages/src/generated/resources/META-INF/org/apache/camel/language/**/*.json',
+
'../core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/language/*.json',
],
destination: 'components/modules/languages/examples/json',
filter: (content) => JSON.parse(content).language, // check if there is
a "language" key at the root
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
index a6a26d85d01..807f2824443 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
@@ -493,7 +493,7 @@ public class PackageDataFormatMojo extends
AbstractGeneratorMojo {
private static String schemaSubDirectory(String javaType) {
int idx = javaType.lastIndexOf('.');
String pckName = javaType.substring(0, idx);
-return pckName.replace('.', '/');
+return "META-INF/" + pckName.replace('.', '/');
}
private List parseConfigurationSource(MavenProject
project, String className)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
index c097ab7d7fb..3a7d4eb9d37 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
@@ -323,7 +323,7 @@ public class PackageLanguageMojo extends
AbstractGeneratorMojo {
private static String schemaSubDirectory(String javaType) {
int idx = javaType.lastIndexOf('.');
String pckName = javaType.substring(0, idx);
-return pckName.replace('.', '/');
+return "META-INF/" + pckName.replace('.', '/');
}
}
(camel) branch main updated (b0c87e991e6 -> f0998dc2e68)
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 b0c87e991e6 Regen add f0998dc2e68 Regen No new revisions were added by this update. Summary of changes: .../component/dsl/GoogleSheetsComponentBuilderFactory.java | 9 - 1 file changed, 4 insertions(+), 5 deletions(-)
(camel) 01/02: Fix endpoint builders
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 71355cb4c8b112f7a057f5efa0ded3a8bacf0774
Author: Guillaume Nodet
AuthorDate: Wed Apr 17 07:52:32 2024 +0200
Fix endpoint builders
---
.../builder/endpoint/StaticEndpointBuilders.java | 22 ++--
.../camel/maven/packaging/EndpointDslMojo.java | 2 +-
.../main/resources/velocity/endpoint-builder.vm| 39 ++
.../resources/velocity/endpoint-static-builders.vm | 6 ++--
4 files changed, 32 insertions(+), 37 deletions(-)
diff --git
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
index d4e21493c6f..22fb4e2cfdc 100644
---
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
+++
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
@@ -2605,7 +2605,7 @@ public class StaticEndpointBuilders {
* @return the dsl builder
*/
public static CoAPEndpointBuilderFactory.CoAPEndpointBuilder
coapTcp(String path) {
-return coapTcp("coap+tcp", path);
+return coap("coap+tcp", path);
}
/**
* CoAP (Secure) (camel-coap)
@@ -2624,7 +2624,7 @@ public class StaticEndpointBuilders {
* @return the dsl builder
*/
public static CoAPEndpointBuilderFactory.CoAPEndpointBuilder coaps(String
path) {
-return coaps("coaps", path);
+return coap("coaps", path);
}
/**
* CoAP (camel-coap)
@@ -2643,7 +2643,7 @@ public class StaticEndpointBuilders {
* @return the dsl builder
*/
public static CoAPEndpointBuilderFactory.CoAPEndpointBuilder
coapsTcp(String path) {
-return coapsTcp("coaps+tcp", path);
+return coap("coaps+tcp", path);
}
/**
* CometD (camel-cometd)
@@ -2726,7 +2726,7 @@ public class StaticEndpointBuilders {
* @return the dsl builder
*/
public static CometdEndpointBuilderFactory.CometdEndpointBuilder
cometds(String path) {
-return cometds("cometds", path);
+return cometd("cometds", path);
}
/**
* Consul (camel-consul)
@@ -6319,7 +6319,7 @@ public class StaticEndpointBuilders {
* @return the dsl builder
*/
public static HttpEndpointBuilderFactory.HttpEndpointBuilder https(String
path) {
-return https("https", path);
+return http("https", path);
}
/**
* Huawei Distributed Message Service (DMS) (camel-huaweicloud-dms)
@@ -7047,7 +7047,7 @@ public class StaticEndpointBuilders {
* @return the dsl builder
*/
public static MailEndpointBuilderFactory.MailEndpointBuilder imaps(String
path) {
-return imaps("imaps", path);
+return imap("imaps", path);
}
/**
* Infinispan (camel-infinispan)
@@ -11547,7 +11547,7 @@ public class StaticEndpointBuilders {
* @return the dsl builder
*/
public static MailEndpointBuilderFactory.MailEndpointBuilder pop3(String
path) {
-return pop3("pop3", path);
+return imap("pop3", path);
}
/**
* POP3S (camel-mail)
@@ -11569,7 +11569,7 @@ public class StaticEndpointBuilders {
* @return the dsl builder
*/
public static MailEndpointBuilderFactory.MailEndpointBuilder pop3s(String
path) {
-return pop3s("pop3s", path);
+return imap("pop3s", path);
}
/**
* PubNub (camel-pubnub)
@@ -13012,7 +13012,7 @@ public class StaticEndpointBuilders {
* @return the dsl builder
*/
public static SmppEndpointBuilderFactory.SmppEndpointBuilder smpps(String
path) {
-return smpps("smpps", path);
+return smpp("smpps", path);
}
/**
* SMTP (camel-mail)
@@ -13034,7 +13034,7 @@ public class StaticEndpointBuilders {
* @return the dsl builder
*/
public static MailEndpointBuilderFactory.MailEndpointBuilder smtp(String
path) {
-return smtp("smtp", path);
+return imap("smtp", path);
}
/**
* SMTPS (camel-mail)
@@ -13056,7 +13056,7 @@ public class StaticEndpointBuilders {
* @return the dsl builder
*/
public static MailEndpointBuilderFactory.MailEndpointBuilder smtps(String
path) {
-return smtps("smtps", path);
+return imap("smtps", path);
}
/**
* SNMP (camel-snmp)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
b/tooling/maven/camel-p
(camel) branch main updated (7a9cf4781c7 -> b0c87e991e6)
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 7a9cf4781c7 Regen new 71355cb4c8b Fix endpoint builders new b0c87e991e6 Regen 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: .../org/apache/camel/catalog/components.properties | 5 + .../apache/camel/catalog/components}/knative.json | 0 .../apache/camel/catalog/components}/olingo2.json | 0 .../apache/camel/catalog/components}/olingo4.json | 0 .../camel/catalog/components}/salesforce.json | 0 .../camel/catalog/components}/servicenow.json | 0 .../apache/camel/catalog/main/sensitive-keys.json | 4 + .../org/apache/camel/main/components.properties| 5 + .../java/org/apache/camel/util/SensitiveUtils.java | 10 +- .../builder/endpoint/StaticEndpointBuilders.java | 22 +- .../endpoint/dsl/AMQPEndpointBuilderFactory.java | 821 +--- .../endpoint/dsl/AS2EndpointBuilderFactory.java| 421 +-- .../dsl/AWS2EC2EndpointBuilderFactory.java | 71 +- .../endpoint/dsl/AWS2S3EndpointBuilderFactory.java | 484 ++-- .../dsl/AWSConfigEndpointBuilderFactory.java | 71 +- .../dsl/ActiveMQEndpointBuilderFactory.java| 829 ++--- .../dsl/ArangoDbEndpointBuilderFactory.java| 35 +- .../dsl/AsteriskEndpointBuilderFactory.java| 43 +- .../dsl/Athena2EndpointBuilderFactory.java | 116 +-- .../AtmosphereWebsocketEndpointBuilderFactory.java | 210 +++--- .../endpoint/dsl/AtomEndpointBuilderFactory.java | 111 ++- .../endpoint/dsl/AvroEndpointBuilderFactory.java | 84 +-- .../endpoint/dsl/BeanEndpointBuilderFactory.java | 20 +- .../dsl/BeanValidatorEndpointBuilderFactory.java | 38 +- .../dsl/BedrockAgentEndpointBuilderFactory.java| 308 .../BedrockAgentRuntimeEndpointBuilderFactory.java | 73 +- .../dsl/BedrockEndpointBuilderFactory.java | 71 +- .../endpoint/dsl/BlobEndpointBuilderFactory.java | 372 + .../endpoint/dsl/BonitaEndpointBuilderFactory.java | 15 +- .../endpoint/dsl/BoxEndpointBuilderFactory.java| 160 ++-- .../dsl/BraintreeEndpointBuilderFactory.java | 40 +- .../endpoint/dsl/BrowseEndpointBuilderFactory.java | 21 +- .../endpoint/dsl/CMEndpointBuilderFactory.java | 18 +- .../dsl/CaffeineCacheEndpointBuilderFactory.java | 59 +- .../CaffeineLoadCacheEndpointBuilderFactory.java | 59 +- .../dsl/CassandraEndpointBuilderFactory.java | 201 +++-- .../dsl/ChatScriptEndpointBuilderFactory.java | 12 +- .../endpoint/dsl/ChunkEndpointBuilderFactory.java | 30 +- .../endpoint/dsl/CinderEndpointBuilderFactory.java | 25 +- .../endpoint/dsl/ClassEndpointBuilderFactory.java | 20 +- .../endpoint/dsl/ClientEndpointBuilderFactory.java | 237 +++--- .../dsl/CloudtrailEndpointBuilderFactory.java | 152 ++-- .../endpoint/dsl/CoAPEndpointBuilderFactory.java | 143 ++-- .../endpoint/dsl/CometdEndpointBuilderFactory.java | 139 ++-- .../endpoint/dsl/ConsulEndpointBuilderFactory.java | 219 +++--- .../dsl/ControlBusEndpointBuilderFactory.java | 23 +- .../dsl/CosmosDbEndpointBuilderFactory.java| 271 +++ .../dsl/CouchDbEndpointBuilderFactory.java | 64 +- .../dsl/CouchbaseEndpointBuilderFactory.java | 217 +++--- .../endpoint/dsl/CronEndpointBuilderFactory.java | 18 +- .../endpoint/dsl/Cw2EndpointBuilderFactory.java| 75 +- .../endpoint/dsl/CxfEndpointBuilderFactory.java| 372 + .../endpoint/dsl/CxfRsEndpointBuilderFactory.java | 291 .../endpoint/dsl/DJLEndpointBuilderFactory.java| 11 +- .../endpoint/dsl/DMSEndpointBuilderFactory.java| 76 +- .../dsl/DataFormatEndpointBuilderFactory.java | 5 +- .../dsl/DataLakeEndpointBuilderFactory.java| 490 ++-- .../dsl/DataSetEndpointBuilderFactory.java | 94 ++- .../dsl/DataSetTestEndpointBuilderFactory.java | 68 +- .../endpoint/dsl/Ddb2EndpointBuilderFactory.java | 92 ++- .../dsl/Ddb2StreamEndpointBuilderFactory.java | 154 ++-- .../dsl/DebeziumDb2EndpointBuilderFactory.java | 242 +++--- .../dsl/DebeziumMongodbEndpointBuilderFactory.java | 235 +++--- .../dsl/DebeziumMySqlEndpointBuilderFactory.java | 340 - .../dsl/DebeziumOracleEndpointBuilderFactory.java | 381 +- .../DebeziumPostgresEndpointBuilderFactory.java| 319 .../DebeziumSqlserverEndpointBuilderFactory.java | 271 --- .../endpoint/dsl/Dhis2EndpointBuilderFactory.java | 138 ++-- .../dsl/DigitalOceanEndpointBuilderFactory.java| 39 +- .../DigitalSignatureEndpointBuilderFactory.java| 67 +- .../endpoint/dsl/DirectEndpointBuild
(camel) branch main updated (08e6f734d6e -> 3d19fa07839)
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 08e6f734d6e (chores) camel-core: removed unused operations in tests new fb57f363db6 [CAMEL-19779] Refactor code generators to use velocity templates new 3d19fa07839 [CAMEL-19779] Regen 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: .../org/apache/camel/catalog/components.properties |5 - .../apache/camel/catalog/components/knative.json | 70 - .../apache/camel/catalog/components/olingo2.json | 93 - .../apache/camel/catalog/components/olingo4.json | 89 - .../camel/catalog/components/salesforce.json | 221 - .../camel/catalog/components/servicenow.json | 188 - .../apache/camel/catalog/main/sensitive-keys.json |4 - .../component/dummy/DummyComponentConfigurer.java |2 + .../component/dummy/DummyEndpointConfigurer.java |2 + .../component/dummy/DummyEndpointUriFactory.java |2 + .../activemq/ActiveMQComponentConfigurer.java |2 + .../activemq/ActiveMQEndpointConfigurer.java |2 + .../activemq/ActiveMQEndpointUriFactory.java |2 + .../converter/ActiveMQConverterLoader.java |5 +- .../converter/ActiveMQMessageConverterLoader.java |5 +- .../chatscript/ChatScriptComponentConfigurer.java |2 + .../chatscript/ChatScriptEndpointConfigurer.java |2 + .../chatscript/ChatScriptEndpointUriFactory.java |2 + .../component/djl/DJLComponentConfigurer.java |2 + .../camel/component/djl/DJLEndpointConfigurer.java |2 + .../camel/component/djl/DJLEndpointUriFactory.java |2 + .../chat/LangChain4jChatComponentConfigurer.java |2 + .../LangChain4jChatConfigurationConfigurer.java|2 + .../chat/LangChain4jChatEndpointConfigurer.java|2 + .../chat/LangChain4jChatEndpointUriFactory.java|2 + .../LangChain4jEmbeddingsComponentConfigurer.java |2 + ...ngChain4jEmbeddingsConfigurationConfigurer.java |2 + .../LangChain4jEmbeddingsConverterLoader.java |6 +- .../LangChain4jEmbeddingsEndpointConfigurer.java |2 + .../LangChain4jEmbeddingsEndpointUriFactory.java |2 + .../component/amqp/AMQPComponentConfigurer.java|2 + .../component/amqp/AMQPEndpointConfigurer.java |3 +- .../component/amqp/AMQPEndpointUriFactory.java |2 + .../arangodb/ArangoDbComponentConfigurer.java |2 + .../arangodb/ArangoDbEndpointConfigurer.java |2 + .../arangodb/ArangoDbEndpointUriFactory.java |2 + ...ientManagerEndpointConfigurationConfigurer.java |2 + .../component/as2/AS2ComponentConfigurer.java | 10 +- .../component/as2/AS2ConfigurationConfigurer.java |2 + .../camel/component/as2/AS2EndpointConfigurer.java | 82 +- .../camel/component/as2/AS2EndpointUriFactory.java |2 + ...rverManagerEndpointConfigurationConfigurer.java |2 + .../as2/converter/ContentTypeConverterLoader.java |6 +- .../dataformat/asn1/ASN1DataFormatConfigurer.java |2 + .../asterisk/AsteriskComponentConfigurer.java |2 + .../asterisk/AsteriskEndpointConfigurer.java |2 + .../asterisk/AsteriskEndpointUriFactory.java |2 + .../websocket/WebsocketComponentConfigurer.java|2 + .../websocket/WebsocketEndpointConfigurer.java |2 + .../websocket/WebsocketEndpointUriFactory.java |2 + .../component/atom/AtomComponentConfigurer.java|2 + .../camel/component/atom/AtomConverterLoader.java |6 +- .../component/atom/AtomEndpointConfigurer.java |2 + .../component/atom/AtomEndpointUriFactory.java |2 + .../attachment/AttachmentConverterLoader.java |6 +- .../component/avro/AvroComponentConfigurer.java|2 + .../component/avro/AvroEndpointConfigurer.java |2 + .../component/avro/AvroEndpointUriFactory.java |2 + .../dataformat/avro/AvroDataFormatConfigurer.java |2 + .../agent/BedrockAgentComponentConfigurer.java |2 + .../agent/BedrockAgentEndpointConfigurer.java |2 + .../agent/BedrockAgentEndpointUriFactory.java |2 + .../BedrockAgentRuntimeComponentConfigurer.java|2 + .../BedrockAgentRuntimeEndpointConfigurer.java |2 + .../BedrockAgentRuntimeEndpointUriFactory.java |2 + .../runtime/BedrockComponentConfigurer.java|2 + .../bedrock/runtime/BedrockEndpointConfigurer.java |2 + .../bedrock/runtime/BedrockEndpointUriFactory.java |2 + .../cloudtrail/CloudtrailComponentConfigurer.java |2 + .../cloudtrail/CloudtrailEndpointConfigurer.java |2 + .../cloudtrail/CloudtrailEndpointUriFactory.java |
(camel-spring-boot) 01/02: [CAMEL-20524] Remove unused variable
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-spring-boot.git
commit c227f4ed04475d2f4f525705c5d0a76aa3d8ded5
Author: Guillaume Nodet
AuthorDate: Wed Mar 20 15:45:47 2024 +0100
[CAMEL-20524] Remove unused variable
---
.../org/apache/camel/springboot/maven/SpringBootConfigGeneratorMojo.java | 1 -
1 file changed, 1 deletion(-)
diff --git
a/tooling/camel-spring-boot-config-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootConfigGeneratorMojo.java
b/tooling/camel-spring-boot-config-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootConfigGeneratorMojo.java
index c002a17cc05..24fd9fbb938 100644
---
a/tooling/camel-spring-boot-config-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootConfigGeneratorMojo.java
+++
b/tooling/camel-spring-boot-config-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootConfigGeneratorMojo.java
@@ -72,7 +72,6 @@ public class SpringBootConfigGeneratorMojo extends
AbstractMojo {
@Override
public void execute() throws MojoExecutionException {
try {
-List props = new ArrayList<>();
getLog().info("Loading config from " + sourceClassFile);
String classFile = Files.readString(Paths.get(sourceClassFile));
JavaClass inputClass = (JavaClass)
Roaster.parse(classFile);
(camel-spring-boot) branch main updated (ef979632725 -> cf6ac6cee6f)
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-spring-boot.git from ef979632725 [CAMEL-20577] Test for avoid rest dupes new c227f4ed044 [CAMEL-20524] Remove unused variable new cf6ac6cee6f Use the release compiler flag to validate JDK methods signatures 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: pom.xml| 3 +-- .../apache/camel/springboot/maven/SpringBootConfigGeneratorMojo.java | 1 - 2 files changed, 1 insertion(+), 3 deletions(-)
(camel-spring-boot) 02/02: Use the release compiler flag to validate JDK methods signatures
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-spring-boot.git
commit cf6ac6cee6f9dbdc8d1b4ccbcd33db5f8190ed89
Author: Guillaume Nodet
AuthorDate: Wed Mar 20 15:46:29 2024 +0100
Use the release compiler flag to validate JDK methods signatures
---
pom.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1a8f7dc3064..cd32752499e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -169,8 +169,7 @@
maven-compiler-plugin
${maven-compiler-plugin-version}
-${jdk.version}
-${jdk.version}
+${jdk.version}
512M
${compiler.fork}
(camel) 01/02: Clean up updateResource usage
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 0fb5aa31ae590eb042a1664ff18b6d5c44acc5c4
Author: Guillaume Nodet
AuthorDate: Thu Mar 14 08:10:29 2024 +0100
Clean up updateResource usage
---
.../maven/packaging/AbstractGenerateConfigurerMojo.java | 4 ++--
.../apache/camel/maven/packaging/AllDslKotlinMojo.java | 17 ++---
.../apache/camel/maven/packaging/ComponentDslMojo.java | 15 +++
.../camel/maven/packaging/PrepareComponentMojo.java | 4 ++--
4 files changed, 13 insertions(+), 27 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
index 5e6eb68deda..96ba2caf708 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
@@ -450,7 +450,7 @@ public abstract class AbstractGenerateConfigurerMojo
extends AbstractGeneratorMo
String fileName = pn.replace('.', '/') + "/" + cn + ".java";
outputDir.mkdirs();
-boolean updated = updateResource(buildContext,
outputDir.toPath().resolve(fileName), source);
+boolean updated = updateResource(outputDir.toPath(), fileName, source);
if (updated) {
getLog().info("Updated " + fileName);
}
@@ -464,7 +464,7 @@ public abstract class AbstractGenerateConfigurerMojo
extends AbstractGeneratorMo
w.append("# ").append(GENERATED_MSG).append("\n");
w.append("class=").append(pn).append(".").append(en).append("Configurer").append("\n");
String fileName = "META-INF/services/org/apache/camel/configurer/"
+ fqn;
-boolean updated = updateResource(buildContext,
resourcesOutputDir.toPath().resolve(fileName), w.toString());
+boolean updated = updateResource(resourcesOutputDir.toPath(),
fileName, w.toString());
if (updated) {
getLog().info("Updated " + fileName);
}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AllDslKotlinMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AllDslKotlinMojo.java
index ffe32a07567..8a023d157b4 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AllDslKotlinMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AllDslKotlinMojo.java
@@ -501,21 +501,8 @@ public class AllDslKotlinMojo extends
AbstractGeneratorMojo {
}
String code = codeBuilder.toString();
String filePath = packageName.replace('.', '/') + "/" + fileName +
".kt";
-Path fullPath = sourcesOutputDir.toPath().resolve(filePath);
-boolean update = true;
-try {
-if (Files.exists(fullPath)) {
-String existingCode = Files.readString(fullPath);
-if (existingCode.equals(code)) {
-update = false;
-}
-}
-} catch (IOException e) {
-throw new MojoFailureException(e);
-}
-if (update) {
-getLog().info("Updating " + what);
-updateResource(sourcesOutputDir.toPath(), filePath,
postProcessing.apply(code));
+if (updateResource(sourcesOutputDir.toPath(), filePath,
postProcessing.apply(code))) {
+getLog().info("Updated " + what);
}
}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
index 6167d936bbd..6a2673aeb46 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
@@ -19,6 +19,7 @@ package org.apache.camel.maven.packaging;
import java.io.File;
import java.io.InputStream;
import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
@@ -200,8 +201,8 @@ public class ComponentDslMojo extends AbstractGeneratorMojo
{
final ComponentDslBuilderFactoryGenerator
componentDslBuilderFactoryGenerator = ComponentDs
(camel) branch main updated (da4848cba96 -> 1e214d825cb)
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 da4848cba96 Camel-Milvus: Improve headers (#13535) new 0fb5aa31ae5 Clean up updateResource usage new 1e214d825cb Fix code style 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: .../packaging/AbstractGenerateConfigurerMojo.java | 4 ++-- .../apache/camel/maven/packaging/AllDslKotlinMojo.java | 17 ++--- .../apache/camel/maven/packaging/ComponentDslMojo.java | 18 ++ .../camel/maven/packaging/PrepareComponentMojo.java| 4 ++-- 4 files changed, 16 insertions(+), 27 deletions(-)
(camel) 02/02: Fix code style
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 1e214d825cb3c2cb7b967f420b83145c9c517a8b
Author: Guillaume Nodet
AuthorDate: Tue Mar 19 10:23:49 2024 +0100
Fix code style
---
.../java/org/apache/camel/maven/packaging/ComponentDslMojo.java | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
index 6a2673aeb46..e52afb88dbb 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
@@ -19,7 +19,6 @@ package org.apache.camel.maven.packaging;
import java.io.File;
import java.io.InputStream;
import java.nio.file.Path;
-import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
@@ -202,7 +201,10 @@ public class ComponentDslMojo extends
AbstractGeneratorMojo {
.generateClass(componentModel, getProjectClassLoader(),
componentsDslPackageName);
boolean updated =
writeSourceIfChanged(componentDslBuilderFactoryGenerator.printClassAsString(),
componentsDslFactoriesPackageName.replace('.', '/') + "/"
-+ componentDslBuilderFactoryGenerator.getGeneratedClassName()
+ ".java", sourcesOutputDir);
+
+ componentDslBuilderFactoryGenerator
+
.getGeneratedClassName()
+
+ ".java",
+sourcesOutputDir);
if (updated) {
getLog().info("Updated ComponentDsl: " +
componentModel.getScheme());
@@ -230,7 +232,8 @@ public class ComponentDslMojo extends AbstractGeneratorMojo
{
final ComponentsBuilderFactoryGenerator
componentsBuilderFactoryGenerator = ComponentsBuilderFactoryGenerator
.generateClass(componentCachedModels, getProjectClassLoader(),
componentsDslPackageName);
boolean updated =
writeSourceIfChanged(componentsBuilderFactoryGenerator.printClassAsString(),
-componentsDslPackageName.replace('.', '/') + "/" +
componentsBuilderFactoryGenerator.getGeneratedClassName() + ".java",
+componentsDslPackageName.replace('.', '/') + "/" +
componentsBuilderFactoryGenerator.getGeneratedClassName()
+
+ ".java",
sourcesOutputDir);
if (updated) {
(camel) branch main updated: Add new camel-quarkus release
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 cab567fcc79 Add new camel-quarkus release
cab567fcc79 is described below
commit cab567fcc797cf3349fb3582e4c6a56373932d8f
Author: Guillaume Nodet
AuthorDate: Thu Feb 29 08:07:21 2024 +0100
Add new camel-quarkus release
---
.../org/apache/camel/catalog/releases/camel-quarkus-releases.json| 5 +
1 file changed, 5 insertions(+)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-quarkus-releases.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-quarkus-releases.json
index 48061f0b9d6..0fd976c5256 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-quarkus-releases.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-quarkus-releases.json
@@ -225,5 +225,10 @@
"version": "3.7.0",
"date": "2024-01-31",
"jdk": "17"
+},
+{
+"version": "3.8.0",
+"date": "2024-02-28",
+"jdk": "17,21"
}
]
(camel) 01/02: Perform a full regen during PR build
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 38e00673e41e5213804b9fd7e27f12b5ce86e34a
Author: Guillaume Nodet
AuthorDate: Tue Feb 27 07:19:39 2024 +0100
Perform a full regen during PR build
---
.github/workflows/pr-build-main.yml | 2 +-
docs/gulpfile.js| 8
docs/pom.xml| 2 +-
dsl/camel-endpointdsl/pom.xml | 14 -
etc/scripts/regen.sh| 40 -
5 files changed, 23 insertions(+), 43 deletions(-)
diff --git a/.github/workflows/pr-build-main.yml
b/.github/workflows/pr-build-main.yml
index 13752ab9ac3..3571d9a123b 100644
--- a/.github/workflows/pr-build-main.yml
+++ b/.github/workflows/pr-build-main.yml
@@ -55,7 +55,7 @@ jobs:
java-version: ${{ matrix.java }}
cache: 'maven'
- name: maven build
-run: ./mvnw -l build.log -Dquickly install
+run: ./etc/scripts/regen.sh > build.log 2>&1
- name: archive logs
uses: actions/upload-artifact@v4
if: always()
diff --git a/docs/gulpfile.js b/docs/gulpfile.js
index b1c95e2e1b2..7858f78442b 100644
--- a/docs/gulpfile.js
+++ b/docs/gulpfile.js
@@ -114,7 +114,7 @@ const sources = {
},
json: {
source: [
-
'../components/{*,*/*,*/*/*}/src/generated/resources/org/apache/camel/**/*.json',
+
'../components/{*,*/*,*/*/*}/src/generated/resources/META-INF/org/apache/camel/**/*.json',
],
destination: 'components/modules/ROOT/examples/json',
filter: (content) => JSON.parse(content).component, // check if there is
a "component" key at the root
@@ -194,7 +194,7 @@ const sources = {
},
json: {
source: [
-
'../core/camel-core-model/src/generated/resources/org/apache/camel/model/**/*.json',
+
'../core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/**/*.json',
],
destination:
'../core/camel-core-engine/src/main/docs/modules/eips/examples/json',
filter: (content) => {
@@ -271,7 +271,7 @@ const tasks = Array.from(sourcesMap).flatMap(([type,
definition]) => {
// by default that's only index.adoc, index.adoc is not symlinked
// so we don't want to remove it
const clean = (destination, keep) => {
-const deleteAry = [`${destination}/*`] // files in destination needs to be
deleted
+const deleteAry = [`${destination}/*`] // files in destination needs to be
deleted */
// append any exceptions, i.e. files to keep at the destination
deleteAry.push(...(keep || ['index.adoc']).map((file) =>
`!${destination}/${file}`))
return deleteAsync(deleteAry, {
@@ -346,7 +346,7 @@ const tasks = Array.from(sourcesMap).flatMap(([type,
definition]) => {
// creates symlinks from source to destination for every example
// file referenced from .adoc file in the source maintaining the
- // basedir from the file path, i.e. symlinking from a deep hiearchy
+ // basedir from the file path, i.e. symlinking from a deep hierarchy
const createExampleSymlinks = (source, destination) => {
const extractExamples = function (file, enc, done) {
const asciidoc = file.contents.toString()
diff --git a/docs/pom.xml b/docs/pom.xml
index 393b574c18d..5f15fbfbae5 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -93,7 +93,7 @@
-full
+regen
!quickly
diff --git a/dsl/camel-endpointdsl/pom.xml b/dsl/camel-endpointdsl/pom.xml
index a18e39da1b6..0374dfb1073 100644
--- a/dsl/camel-endpointdsl/pom.xml
+++ b/dsl/camel-endpointdsl/pom.xml
@@ -185,7 +185,7 @@
-full
+regen
!quickly
@@ -207,6 +207,18 @@
+
+
+
+
+full
+
+
+!quickly
+
+
+
+
org.apache.maven.plugins
maven-surefire-plugin
diff --git a/etc/scripts/regen.sh b/etc/scripts/regen.sh
index 31da1e11452..1693627e08f 100755
--- a/etc/scripts/regen.sh
+++ b/etc/scripts/regen.sh
@@ -16,46 +16,14 @@
# limitations under the License.
#
-if [ "${BASH_VERSINFO[0]}" -lt 4 ]; then
-echo "Error: Bash 4 or higher is required to run this script, but found
${BASH_VERSINFO}"
-exit 1
-fi
-
-shopt -s globstar
-
-CAMEL_DIR=$(cd `dirname "$0"`/../..; pwd)
-cd $CAMEL_DIR
+# Move to top directory
+cd `dirname "$0"`/../..
# Force clean
git clean -fdx
rm -Rf **/src/generated/
# Regenerate ev
(camel) branch main updated (f7259281e72 -> eb5f038bece)
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 f7259281e72 Camel-AWS-Bedrock - Fixed artifact name (#13330) new 38e00673e41 Perform a full regen during PR build new eb5f038bece Regen 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: .github/workflows/pr-build-main.yml| 2 +- .../modules/eips/examples/json/batchConfig.json| 1 + .../modules/eips/examples/json/contextScan.json| 1 - .../eips/examples/json/customLoadBalancer.json | 1 + .../docs/modules/eips/examples/json/doCatch.json | 1 - .../docs/modules/eips/examples/json/doFinally.json | 1 - .../docs/modules/eips/examples/json/doTry.json | 1 - .../modules/eips/examples/json/errorHandler.json | 1 - .../docs/modules/eips/examples/json/failover.json | 1 + .../modules/eips/examples/json/globalOption.json | 1 - .../modules/eips/examples/json/globalOptions.json | 1 - .../docs/modules/eips/examples/json/inputType.json | 1 - .../docs/modules/eips/examples/json/intercept.json | 1 - .../modules/eips/examples/json/interceptFrom.json | 1 - .../examples/json/interceptSendToEndpoint.json | 1 - .../docs/modules/eips/examples/json/marshal.json | 1 - .../modules/eips/examples/json/onCompletion.json | 1 - .../modules/eips/examples/json/onException.json| 1 - .../examples/json/optimisticLockRetryPolicy.json | 1 - .../modules/eips/examples/json/outputType.json | 1 - .../modules/eips/examples/json/packageScan.json| 1 - .../docs/modules/eips/examples/json/policy.json| 1 - .../docs/modules/eips/examples/json/property.json | 1 - .../eips/examples/json/propertyExpression.json | 1 - .../docs/modules/eips/examples/json/random.json| 1 + .../eips/examples/json/redeliveryPolicy.json | 1 - .../modules/eips/examples/json/restContextRef.json | 1 - .../modules/eips/examples/json/roundRobin.json | 1 + .../docs/modules/eips/examples/json/route.json | 1 - .../modules/eips/examples/json/routeBuilder.json | 1 - .../eips/examples/json/routeConfiguration.json | 1 - .../json/routeConfigurationContextRef.json | 1 - .../eips/examples/json/routeConfigurations.json| 1 - .../eips/examples/json/routeContextRef.json| 1 - .../modules/eips/examples/json/routeTemplate.json | 1 - .../examples/json/routeTemplateContextRef.json | 1 - .../modules/eips/examples/json/routeTemplates.json | 1 - .../docs/modules/eips/examples/json/routes.json| 1 - .../modules/eips/examples/json/serviceCall.json| 1 + .../eips/examples/json/setExchangePattern.json | 1 - .../docs/modules/eips/examples/json/sticky.json| 1 + .../modules/eips/examples/json/streamConfig.json | 1 + .../modules/eips/examples/json/templateBean.json | 1 - .../eips/examples/json/templateParameter.json | 1 - .../modules/eips/examples/json/templatedRoute.json | 1 - .../eips/examples/json/templatedRouteBean.json | 1 - .../examples/json/templatedRouteParameter.json | 1 - .../eips/examples/json/templatedRoutes.json| 1 - .../eips/examples/json/threadPoolProfile.json | 1 - .../modules/eips/examples/json/throwException.json | 1 - .../docs/modules/eips/examples/json/topic.json | 1 + .../modules/eips/examples/json/transacted.json | 1 - .../docs/modules/eips/examples/json/unmarshal.json | 1 - .../docs/modules/eips/examples/json/value.json | 1 - .../docs/modules/eips/examples/json/weighted.json | 1 + .../eips/examples/json/whenSkipSendToEndpoint.json | 1 - docs/.yarn/install-state.gz| Bin 502984 -> 503000 bytes .../json/application-cloudevents-json.json | 1 - .../ROOT/examples/json/application-json.json | 1 - .../examples/json/application-x-java-object.json | 1 - .../ROOT/examples/json/application-x-struct.json | 1 - .../modules/ROOT/examples/json/avro-binary.json| 1 - .../ROOT/examples/json/avro-x-java-object.json | 1 - .../modules/ROOT/examples/json/avro-x-struct.json | 1 - .../aws-cloudtrail-application-cloudevents.json| 1 - .../examples/json/aws2-ddb-application-json.json | 1 - .../aws2-ddbstream-application-cloudevents.json| 1 - .../json/aws2-kinesis-application-cloudevents.json | 1 - .../json/aws2-s3-application-cloudevents.json | 1 - .../json/aws2-sqs-application-cloudevents.json | 1 - .../azure-cosmosdb-application-cloudevents.json| 1 - .../azure-eventhubs-application-cloudevents.json | 1 - .../json/azure-files-application-cloudevents.j
(camel) 02/02: Regen
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 eb5f038bece844c9eeb9e24737d370e3dc36bed9 Author: Guillaume Nodet AuthorDate: Tue Feb 27 12:34:15 2024 +0100 Regen --- .../modules/eips/examples/json/batchConfig.json| 1 + .../modules/eips/examples/json/contextScan.json| 1 - .../eips/examples/json/customLoadBalancer.json | 1 + .../docs/modules/eips/examples/json/doCatch.json | 1 - .../docs/modules/eips/examples/json/doFinally.json | 1 - .../docs/modules/eips/examples/json/doTry.json | 1 - .../modules/eips/examples/json/errorHandler.json | 1 - .../docs/modules/eips/examples/json/failover.json | 1 + .../modules/eips/examples/json/globalOption.json | 1 - .../modules/eips/examples/json/globalOptions.json | 1 - .../docs/modules/eips/examples/json/inputType.json | 1 - .../docs/modules/eips/examples/json/intercept.json | 1 - .../modules/eips/examples/json/interceptFrom.json | 1 - .../examples/json/interceptSendToEndpoint.json | 1 - .../docs/modules/eips/examples/json/marshal.json | 1 - .../modules/eips/examples/json/onCompletion.json | 1 - .../modules/eips/examples/json/onException.json| 1 - .../examples/json/optimisticLockRetryPolicy.json | 1 - .../modules/eips/examples/json/outputType.json | 1 - .../modules/eips/examples/json/packageScan.json| 1 - .../docs/modules/eips/examples/json/policy.json| 1 - .../docs/modules/eips/examples/json/property.json | 1 - .../eips/examples/json/propertyExpression.json | 1 - .../docs/modules/eips/examples/json/random.json| 1 + .../eips/examples/json/redeliveryPolicy.json | 1 - .../modules/eips/examples/json/restContextRef.json | 1 - .../modules/eips/examples/json/roundRobin.json | 1 + .../docs/modules/eips/examples/json/route.json | 1 - .../modules/eips/examples/json/routeBuilder.json | 1 - .../eips/examples/json/routeConfiguration.json | 1 - .../json/routeConfigurationContextRef.json | 1 - .../eips/examples/json/routeConfigurations.json| 1 - .../eips/examples/json/routeContextRef.json| 1 - .../modules/eips/examples/json/routeTemplate.json | 1 - .../examples/json/routeTemplateContextRef.json | 1 - .../modules/eips/examples/json/routeTemplates.json | 1 - .../docs/modules/eips/examples/json/routes.json| 1 - .../modules/eips/examples/json/serviceCall.json| 1 + .../eips/examples/json/setExchangePattern.json | 1 - .../docs/modules/eips/examples/json/sticky.json| 1 + .../modules/eips/examples/json/streamConfig.json | 1 + .../modules/eips/examples/json/templateBean.json | 1 - .../eips/examples/json/templateParameter.json | 1 - .../modules/eips/examples/json/templatedRoute.json | 1 - .../eips/examples/json/templatedRouteBean.json | 1 - .../examples/json/templatedRouteParameter.json | 1 - .../eips/examples/json/templatedRoutes.json| 1 - .../eips/examples/json/threadPoolProfile.json | 1 - .../modules/eips/examples/json/throwException.json | 1 - .../docs/modules/eips/examples/json/topic.json | 1 + .../modules/eips/examples/json/transacted.json | 1 - .../docs/modules/eips/examples/json/unmarshal.json | 1 - .../docs/modules/eips/examples/json/value.json | 1 - .../docs/modules/eips/examples/json/weighted.json | 1 + .../eips/examples/json/whenSkipSendToEndpoint.json | 1 - docs/.yarn/install-state.gz| Bin 502984 -> 503000 bytes .../json/application-cloudevents-json.json | 1 - .../ROOT/examples/json/application-json.json | 1 - .../examples/json/application-x-java-object.json | 1 - .../ROOT/examples/json/application-x-struct.json | 1 - .../modules/ROOT/examples/json/avro-binary.json| 1 - .../ROOT/examples/json/avro-x-java-object.json | 1 - .../modules/ROOT/examples/json/avro-x-struct.json | 1 - .../aws-cloudtrail-application-cloudevents.json| 1 - .../examples/json/aws2-ddb-application-json.json | 1 - .../aws2-ddbstream-application-cloudevents.json| 1 - .../json/aws2-kinesis-application-cloudevents.json | 1 - .../json/aws2-s3-application-cloudevents.json | 1 - .../json/aws2-sqs-application-cloudevents.json | 1 - .../azure-cosmosdb-application-cloudevents.json| 1 - .../azure-eventhubs-application-cloudevents.json | 1 - .../json/azure-files-application-cloudevents.json | 1 - .../azure-servicebus-application-cloudevents.json | 1 - ...azure-storage-blob-application-cloudevents.json | 1 - ...zure-storage-queue-application-cloudevents.json | 1 - .../ROOT/examples/json/beanPostProcessor.json | 1 - .../modules/ROOT/examples/json/camelContext.json | 1 - .../ROOT/examples/json/consumerTemplate.json |
(camel) branch main updated: Register the os-maven-plugin only once as an extension
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 2544bf0d95e Register the os-maven-plugin only once as an extension
2544bf0d95e is described below
commit 2544bf0d95ee407705915940dde578677ebdaaac
Author: Guillaume Nodet
AuthorDate: Tue Feb 20 21:13:28 2024 +0100
Register the os-maven-plugin only once as an extension
---
.mvn/extensions.xml | 5 +
components/camel-grpc/pom.xml| 9 -
components/camel-kudu/pom.xml| 12
components/camel-netty/pom.xml | 10 --
components/camel-protobuf/pom.xml| 9 -
.../camel-salesforce/camel-salesforce-component/pom.xml | 7 ---
parent/pom.xml | 1 -
7 files changed, 5 insertions(+), 48 deletions(-)
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index 5e6c8cc5845..c4932a89f0d 100644
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -5,4 +5,9 @@
cq-alias-fastinstall-quickly-extension
4.4.10
+
+kr.motd.maven
+os-maven-plugin
+1.7.1
+
diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml
index 66c5824852d..2489d6de81e 100644
--- a/components/camel-grpc/pom.xml
+++ b/components/camel-grpc/pom.xml
@@ -147,15 +147,6 @@
-
-
-
-kr.motd.maven
-os-maven-plugin
-${os-maven-plugin-version}
-
-
-
-
-kr.motd.maven
-os-maven-plugin
-${os-maven-plugin-version}
-
-
-
diff --git a/components/camel-netty/pom.xml b/components/camel-netty/pom.xml
index 4a700e532ed..7a7a5bf3e96 100644
--- a/components/camel-netty/pom.xml
+++ b/components/camel-netty/pom.xml
@@ -123,16 +123,6 @@
-
-
-
-kr.motd.maven
-os-maven-plugin
-${os-maven-plugin-version}
-
-
-
-
leaks
diff --git a/components/camel-protobuf/pom.xml
b/components/camel-protobuf/pom.xml
index bc1a797b454..30f70070cdb 100644
--- a/components/camel-protobuf/pom.xml
+++ b/components/camel-protobuf/pom.xml
@@ -68,15 +68,6 @@
-
-
-
-kr.motd.maven
-os-maven-plugin
-${os-maven-plugin-version}
-
-
-
(camel) branch main updated: Fix runtime catalog
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 7796b3225c0 Fix runtime catalog
7796b3225c0 is described below
commit 7796b3225c07fac01d923d2620071802e0c4de9e
Author: Guillaume Nodet
AuthorDate: Tue Feb 27 10:25:28 2024 +0100
Fix runtime catalog
---
.../src/main/java/org/apache/camel/support/CamelContextHelper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/CamelContextHelper.java
b/core/camel-support/src/main/java/org/apache/camel/support/CamelContextHelper.java
index f6277be2870..4b9f8a27ec5 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/CamelContextHelper.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/CamelContextHelper.java
@@ -44,7 +44,7 @@ import static org.apache.camel.util.ObjectHelper.isNotEmpty;
*/
public final class CamelContextHelper {
-public static final String MODEL_DOCUMENTATION_PREFIX =
"org/apache/camel/model/";
+public static final String MODEL_DOCUMENTATION_PREFIX =
"META-INF/org/apache/camel/model/";
/**
* Utility classes should not have a public constructor.
(camel) branch main updated: [CAMEL-20422] Fix model not found at runtime
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 3773942b30e [CAMEL-20422] Fix model not found at runtime
3773942b30e is described below
commit 3773942b30eaea50012e982529666a301ea8bfb7
Author: Guillaume Nodet
AuthorDate: Tue Feb 27 06:56:50 2024 +0100
[CAMEL-20422] Fix model not found at runtime
---
.../main/java/org/apache/camel/impl/engine/AbstractCamelContext.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 7ef38a1326a..3cccdf8340f 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
@@ -1385,7 +1385,7 @@ public abstract class AbstractCamelContext extends
BaseService
private static String toResourcePath(Package clazz, String languageName) {
String packageName = clazz.getName();
packageName = packageName.replace('.', '/');
-return packageName + "/" + languageName + ".json";
+return "META-INF/" + packageName + "/" + languageName + ".json";
}
private String doLoadResource(String resourceName, String path, String
resourceType) throws IOException {
(camel) branch main updated: Remove backport as a git module
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 914c2e76e0b Remove backport as a git module 914c2e76e0b is described below commit 914c2e76e0b267c9a889e70bf5b9d00e00b2f4bd Author: Guillaume Nodet AuthorDate: Tue Feb 27 07:12:54 2024 +0100 Remove backport as a git module Related commit: d79c9f9 --- .gitmodules | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6d6303adbe3..e10cc9959c1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule ".github/actions/backport"] - path = .github/actions/backport - url = https://github.com/tibdex/backport [submodule ".github/actions/create-or-update-comment"] path = .github/actions/create-or-update-comment url = https://github.com/peter-evans/create-or-update-comment.git
[camel] branch main updated: Remove duplicated dependency
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 9fd7e64d598 Remove duplicated dependency 9fd7e64d598 is described below commit 9fd7e64d598d74ffa5ff2b00d536e4095f79708d Author: Guillaume Nodet AuthorDate: Fri Sep 1 15:01:57 2023 +0200 Remove duplicated dependency --- components/camel-dhis2/camel-dhis2-component/pom.xml | 5 - 1 file changed, 5 deletions(-) diff --git a/components/camel-dhis2/camel-dhis2-component/pom.xml b/components/camel-dhis2/camel-dhis2-component/pom.xml index d0336efebcf..b3ef4571845 100644 --- a/components/camel-dhis2/camel-dhis2-component/pom.xml +++ b/components/camel-dhis2/camel-dhis2-component/pom.xml @@ -55,11 +55,6 @@ - -org.apache.camel -camel-jackson -test - org.testcontainers postgresql
[camel] branch main updated: [CAMEL-18305] Support writing all OptionalIdentifiedDefinition
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 452915ef143 [CAMEL-18305] Support writing all
OptionalIdentifiedDefinition
452915ef143 is described below
commit 452915ef143f92f4e28d46c03a219abfb1ef228e
Author: Guillaume Nodet
AuthorDate: Thu Feb 9 09:17:56 2023 +0100
[CAMEL-18305] Support writing all OptionalIdentifiedDefinition
---
.../java/org/apache/camel/xml/out/ModelWriter.java | 101 -
.../org/apache/camel/xml/LwModelToXMLDumper.java | 11 +--
.../packaging/ModelXmlWriterGeneratorMojo.java | 13 ++-
3 files changed, 109 insertions(+), 16 deletions(-)
diff --git
a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java
b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java
index 074f96a8d56..a371d2e4679 100644
---
a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java
+++
b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java
@@ -1009,6 +1009,9 @@ public class ModelWriter extends BaseWriter {
throws IOException {
doWriteValidatorsDefinition("validators", def);
}
+public void
writeOptionalIdentifiedDefinitionRef(OptionalIdentifiedDefinition def) throws
IOException {
+doWriteOptionalIdentifiedDefinitionRef(null, def);
+}
protected void doWriteAggregateDefinition(
String name,
AggregateDefinition def)
@@ -4681,6 +4684,100 @@ public class ModelWriter extends BaseWriter {
}
}
}
+protected void doWriteOptionalIdentifiedDefinitionRef(
+String n,
+OptionalIdentifiedDefinition v)
+throws IOException {
+if (v != null) {
+switch (v.getClass().getSimpleName()) {
+case "AggregateDefinition" ->
doWriteAggregateDefinition("aggregate", (AggregateDefinition) v);
+case "BeanDefinition" -> doWriteBeanDefinition("bean",
(BeanDefinition) v);
+case "CatchDefinition" -> doWriteCatchDefinition("doCatch",
(CatchDefinition) v);
+case "ChoiceDefinition" -> doWriteChoiceDefinition("choice",
(ChoiceDefinition) v);
+case "CircuitBreakerDefinition" ->
doWriteCircuitBreakerDefinition("circuitBreaker", (CircuitBreakerDefinition) v);
+case "ClaimCheckDefinition" ->
doWriteClaimCheckDefinition("claimCheck", (ClaimCheckDefinition) v);
+case "ConvertBodyDefinition" ->
doWriteConvertBodyDefinition("convertBodyTo", (ConvertBodyDefinition) v);
+case "DelayDefinition" -> doWriteDelayDefinition("delay",
(DelayDefinition) v);
+case "DynamicRouterDefinition" ->
doWriteDynamicRouterDefinition("dynamicRouter", (DynamicRouterDefinition) v);
+case "EnrichDefinition" -> doWriteEnrichDefinition("enrich",
(EnrichDefinition) v);
+case "FilterDefinition" -> doWriteFilterDefinition("filter",
(FilterDefinition) v);
+case "FinallyDefinition" ->
doWriteFinallyDefinition("doFinally", (FinallyDefinition) v);
+case "FromDefinition" -> doWriteFromDefinition("from",
(FromDefinition) v);
+case "IdempotentConsumerDefinition" ->
doWriteIdempotentConsumerDefinition("idempotentConsumer",
(IdempotentConsumerDefinition) v);
+case "InOnlyDefinition" -> doWriteInOnlyDefinition("inOnly",
(InOnlyDefinition) v);
+case "InOutDefinition" -> doWriteInOutDefinition("inOut",
(InOutDefinition) v);
+case "InputTypeDefinition" ->
doWriteInputTypeDefinition("inputType", (InputTypeDefinition) v);
+case "InterceptDefinition" ->
doWriteInterceptDefinition("intercept", (InterceptDefinition) v);
+case "InterceptFromDefinition" ->
doWriteInterceptFromDefinition("interceptFrom", (InterceptFromDefinition) v);
+case "InterceptSendToEndpointDefinition" ->
doWriteInterceptSendToEndpointDefinition("interceptSendToEndpoint",
(InterceptSendToEndpointDefinition) v);
+case "KameletDefinition" ->
doWriteKameletDefinition("kamelet", (KameletDefinition) v);
+case "LoadBalanceDefinition" ->
doWriteLoadBalanceDefinition("loadBalance&quo
[camel] branch main updated: Update camel-4-migration-guide.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 cc46f7dd620 Update camel-4-migration-guide.adoc cc46f7dd620 is described below commit cc46f7dd6207df7bb57ff0afe84c7d19bad5b5c9 Author: Guillaume Nodet AuthorDate: Thu Feb 9 09:15:38 2023 +0100 Update camel-4-migration-guide.adoc --- docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc | 5 + 1 file changed, 5 insertions(+) diff --git a/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc b/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc index c65d6101564..e20e66a42e2 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-4-migration-guide.adoc @@ -60,6 +60,11 @@ The option `backlogTracing=true` now automatic enabled the tracer on startup. Th was _surprisingly_ that the tracer was only made available, and had to be manually enabled afterwards. The old behavior can be archived by setting `backlogTracingStandby=true`. +== XML serialization + +The default xml serialization using `ModelToXMLDumper` has been improved and now uses a generated xml +serializer located in the `camel-xml-io` module instead of the JAXB based one from `camel-jaxb`. + == Component changes === camel-caffeine
[camel] branch main updated: [CAMEL-18305] Support writing rests definitions
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 936598bb9a6 [CAMEL-18305] Support writing rests definitions
936598bb9a6 is described below
commit 936598bb9a676f870c3252b17f7467541aaf94dd
Author: Guillaume Nodet
AuthorDate: Thu Feb 9 08:15:40 2023 +0100
[CAMEL-18305] Support writing rests definitions
---
.../src/main/java/org/apache/camel/xml/LwModelToXMLDumper.java | 6 ++
1 file changed, 6 insertions(+)
diff --git
a/core/camel-xml-io/src/main/java/org/apache/camel/xml/LwModelToXMLDumper.java
b/core/camel-xml-io/src/main/java/org/apache/camel/xml/LwModelToXMLDumper.java
index 3e6d9b25685..167b0de40ec 100644
---
a/core/camel-xml-io/src/main/java/org/apache/camel/xml/LwModelToXMLDumper.java
+++
b/core/camel-xml-io/src/main/java/org/apache/camel/xml/LwModelToXMLDumper.java
@@ -40,6 +40,8 @@ import org.apache.camel.model.RoutesDefinition;
import org.apache.camel.model.SendDefinition;
import org.apache.camel.model.ToDynamicDefinition;
import org.apache.camel.model.language.ExpressionDefinition;
+import org.apache.camel.model.rest.RestDefinition;
+import org.apache.camel.model.rest.RestsDefinition;
import org.apache.camel.spi.ModelToXMLDumper;
import org.apache.camel.spi.NamespaceAware;
import org.apache.camel.spi.annotations.JdkService;
@@ -175,6 +177,10 @@ public class LwModelToXMLDumper implements
ModelToXMLDumper {
} else if (definition instanceof RouteDefinition route) {
extractor.accept(route);
writer.writeRouteDefinition(route);
+} else if (definition instanceof RestsDefinition rests) {
+writer.writeRestsDefinition(rests);
+} else if (definition instanceof RestDefinition rest) {
+writer.writeRestDefinition(rest);
}
return buffer.toString();
[camel] branch main updated (7ee18e2f325 -> 701a15a2094)
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 7ee18e2f325 CAMEL-18131 - camel-health - Do not register Producer Health Check until CAMEL-18992 will be completed - Translate new 4f30108127e [CAMEL-18305] Generate a lightweight xml writer new 701a15a2094 [CAMEL-18305] New lightweight ModelToXMLDumper The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../camel/model/CircuitBreakerDefinition.java |2 +- .../apache/camel/model/PropertyDefinitions.java|7 +- .../org/apache/camel/model/SagaDefinition.java |5 + .../camel/model/dataformat/BindyDataFormat.java| 54 +- .../model/rest/ResponseMessageDefinition.java |2 +- core/camel-core/pom.xml|4 + core/camel-xml-io/pom.xml |2 + .../java/org/apache/camel/xml/in/ModelParser.java |4 +- .../java/org/apache/camel/xml/out/ModelWriter.java | 4973 .../services/org/apache/camel/modelxml-dumper |2 + .../org/apache/camel/xml/LwModelToXMLDumper.java | 268 ++ .../java/org/apache/camel/xml/io/XMLWriter.java| 328 ++ .../java/org/apache/camel/xml/out/BaseWriter.java | 54 + .../org/apache/camel/xml/out/ModelWriterTest.java | 224 + .../dsl/yaml/deserializers/ModelDeserializers.java |2 +- .../packaging/ModelXmlWriterGeneratorMojo.java | 849 16 files changed, 6741 insertions(+), 39 deletions(-) create mode 100644 core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java create mode 100644 core/camel-xml-io/src/generated/resources/META-INF/services/org/apache/camel/modelxml-dumper create mode 100644 core/camel-xml-io/src/main/java/org/apache/camel/xml/LwModelToXMLDumper.java create mode 100644 core/camel-xml-io/src/main/java/org/apache/camel/xml/io/XMLWriter.java create mode 100644 core/camel-xml-io/src/main/java/org/apache/camel/xml/out/BaseWriter.java create mode 100644 core/camel-xml-io/src/test/java/org/apache/camel/xml/out/ModelWriterTest.java create mode 100644 tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelXmlWriterGeneratorMojo.java
[camel] 02/02: [CAMEL-18305] New lightweight ModelToXMLDumper
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 701a15a2094116836c6fe49fc46f946086c8bb0c
Author: Guillaume Nodet
AuthorDate: Wed Feb 8 16:12:53 2023 +0100
[CAMEL-18305] New lightweight ModelToXMLDumper
---
core/camel-core/pom.xml| 4 +
.../java/org/apache/camel/xml/out/ModelWriter.java | 173 +++--
.../services/org/apache/camel/modelxml-dumper | 2 +
.../org/apache/camel/xml/LwModelToXMLDumper.java | 268 +
.../java/org/apache/camel/xml/io/XMLWriter.java| 49 +---
.../java/org/apache/camel/xml/out/BaseWriter.java | 6 +-
.../packaging/ModelXmlWriterGeneratorMojo.java | 15 ++
7 files changed, 405 insertions(+), 112 deletions(-)
diff --git a/core/camel-core/pom.xml b/core/camel-core/pom.xml
index 7ed136fd9f0..d8ccffda633 100644
--- a/core/camel-core/pom.xml
+++ b/core/camel-core/pom.xml
@@ -146,6 +146,10 @@
org.apache.camel
camel-xslt
+
+org.apache.camel
+camel-xml-io
+
org.apache.camel
camel-xml-jaxb
diff --git
a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java
b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java
index 3f89b8b860e..074f96a8d56 100644
---
a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java
+++
b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java
@@ -1059,14 +1059,14 @@ public class ModelWriter extends BaseWriter {
doWriteOptionalIdentifiedDefinitionElements(def);
endElement();
}
-void doWriteBeanFactoryDefinitionAttributes(
+protected void doWriteBeanFactoryDefinitionAttributes(
BeanFactoryDefinition def)
throws IOException {
doWriteAttribute("name", def.getName());
doWriteAttribute("type", def.getType());
doWriteAttribute("beanType", def.getBeanType());
}
-void doWriteBeanFactoryDefinitionElements(
+protected void doWriteBeanFactoryDefinitionElements(
BeanFactoryDefinition def)
throws IOException {
doWriteElement("script", def.getScript(), this::doWriteString);
@@ -1154,7 +1154,7 @@ public class ModelWriter extends BaseWriter {
doWriteOptionalIdentifiedDefinitionElements(def);
endElement();
}
-void doWriteDataFormatDefinitionAttributes(
+protected void doWriteDataFormatDefinitionAttributes(
DataFormatDefinition def)
throws IOException {
doWriteIdentifiedTypeAttributes(def);
@@ -1234,10 +1234,14 @@ public class ModelWriter extends BaseWriter {
});
endElement();
}
-void doWriteExpressionNodeAttributes(ExpressionNode def) throws
IOException {
+protected void doWriteExpressionNodeAttributes(
+ExpressionNode def)
+throws IOException {
doWriteProcessorDefinitionAttributes(def);
}
-void doWriteExpressionNodeElements(ExpressionNode def) throws IOException {
+protected void doWriteExpressionNodeElements(
+ExpressionNode def)
+throws IOException {
doWriteOptionalIdentifiedDefinitionElements(def);
doWriteElement(null, def.getExpression(),
this::doWriteExpressionDefinitionRef);
}
@@ -1258,7 +1262,7 @@ public class ModelWriter extends BaseWriter {
doWriteElement(null, def.getExpressionType(),
this::doWriteExpressionDefinitionRef);
endElement();
}
-void doWriteFaultToleranceConfigurationCommonAttributes(
+protected void doWriteFaultToleranceConfigurationCommonAttributes(
FaultToleranceConfigurationCommon def)
throws IOException {
doWriteIdentifiedTypeAttributes(def);
@@ -1353,7 +1357,9 @@ public class ModelWriter extends BaseWriter {
doWriteOutputExpressionNodeElements(def);
endElement();
}
-void doWriteIdentifiedTypeAttributes(IdentifiedType def) throws
IOException {
+protected void doWriteIdentifiedTypeAttributes(
+IdentifiedType def)
+throws IOException {
doWriteAttribute("id", def.getId());
}
protected void doWriteIdentifiedType(
@@ -1393,12 +1399,12 @@ public class ModelWriter extends BaseWriter {
doWriteOptionalIdentifiedDefinitionElements(def);
endElement();
}
-void doWriteInterceptDefinitionAttributes(
+protected void doWriteInterceptDefinitionAttributes(
InterceptDefinition def)
throws IOException {
doWriteProcessorDefinitionAttributes(def);
}
-void doWriteInterceptDefinitionElements(
+protected void doWriteInterceptDefinitionElements(
Interc
[camel] 02/02: Ensure the resource is read only once, the stream closed and add missing 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 898d95035604a0df4a76b7f69b379c3403867398
Author: Guillaume Nodet
AuthorDate: Fri Feb 3 13:38:40 2023 +0100
Ensure the resource is read only once, the stream closed and add missing
calls
---
.../org/apache/camel/support/CachedResource.java | 65 ++
.../camel/dsl/xml/io/XmlRoutesBuilderLoader.java | 57 +--
2 files changed, 91 insertions(+), 31 deletions(-)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/CachedResource.java
b/core/camel-support/src/main/java/org/apache/camel/support/CachedResource.java
new file mode 100644
index 000..6104132a99f
--- /dev/null
+++
b/core/camel-support/src/main/java/org/apache/camel/support/CachedResource.java
@@ -0,0 +1,65 @@
+/*
+ * 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.support;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+
+import org.apache.camel.spi.Resource;
+
+/**
+ * A resource which will cache the content of the input stream on first read.
+ */
+public class CachedResource extends ResourceSupport {
+
+private final Resource delegate;
+private byte[] data;
+
+public CachedResource(Resource delegate) {
+super("cached:" + delegate.getScheme(), delegate.getLocation());
+this.delegate = delegate;
+}
+
+@Override
+public boolean exists() {
+return delegate.exists();
+}
+
+@Override
+public URI getURI() {
+return delegate.getURI();
+}
+
+@Override
+public URL getURL() throws MalformedURLException {
+return delegate.getURL();
+}
+
+@Override
+public InputStream getInputStream() throws IOException {
+if (data == null) {
+try (InputStream is = delegate.getInputStream()) {
+data = is.readAllBytes();
+}
+}
+return new ByteArrayInputStream(data);
+}
+}
diff --git
a/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoader.java
b/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoader.java
index 397844b78e3..a8ffe061bbf 100644
---
a/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoader.java
+++
b/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoader.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.dsl.xml.io;
+import java.util.List;
+
import org.apache.camel.CamelContextAware;
import org.apache.camel.api.management.ManagedResource;
import org.apache.camel.builder.RouteBuilder;
@@ -28,6 +30,7 @@ import org.apache.camel.model.RouteDefinition;
import org.apache.camel.model.RoutesDefinition;
import org.apache.camel.spi.Resource;
import org.apache.camel.spi.annotations.RoutesLoader;
+import org.apache.camel.support.CachedResource;
import org.apache.camel.xml.in.ModelParser;
@ManagedResource(description = "Managed XML RoutesBuilderLoader")
@@ -35,51 +38,43 @@ import org.apache.camel.xml.in.ModelParser;
public class XmlRoutesBuilderLoader extends RouteBuilderLoaderSupport {
public static final String EXTENSION = "xml";
public static final String NAMESPACE =
"http://camel.apache.org/schema/spring;;
+private static final List NAMESPACES = List.of("", NAMESPACE);
public XmlRoutesBuilderLoader() {
super(EXTENSION);
}
@Override
-public RouteBuilder doLoadRouteBuilder(Resource resource) throws Exception
{
+public RouteBuilder doLoadRouteBuilder(Resource input) throws Exception {
return new RouteConfigurationBuilder() {
+final Resource resource = new CachedResource(input);
+
@Override
public void configure() throws Exception {
// we use configure to load the routes (with namespace and
withou
[camel] branch main updated (74a33b26ff6 -> 898d9503560)
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 74a33b26ff6 CAMEL-18980: Fix snmp V1 new 8fded3794a4 Remove deprecated XmlRoutesDefinitionLoader new 898d9503560 Ensure the resource is read only once, the stream closed and add missing calls 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: components/camel-openapi-java/pom.xml | 4 ++ .../openapi/jmx/JmxRestDefinitionsResolver.java| 9 ++-- .../org/apache/camel/ExtendedCamelContext.java | 14 -- .../camel/spi/XMLRoutesDefinitionLoader.java | 50 --- .../camel/impl/engine/AbstractCamelContext.java| 22 .../camel/impl/engine/SimpleCamelContext.java | 17 --- .../camel/impl/ExtendedCamelContextConfigurer.java | 6 --- .../camel/impl/lw/LightweightCamelContext.java | 11 .../impl/lw/LightweightRuntimeCamelContext.java| 11 .../org/apache/camel/support/CachedResource.java | 55 ++-- .../services/org/apache/camel/xmlroutes-loader | 2 - .../camel/dsl/xml/io/XmlRoutesBuilderLoader.java | 57 ++--- .../dsl/xml/io/XmlRoutesDefinitionLoader.java | 58 -- .../jaxb/definition/CreateModelFromXmlTest.java| 6 +-- .../xml/jaxb/definition/LoadRestFromXmlTest.java | 9 ++-- .../xml/jaxb/definition/LoadRouteFromXmlTest.java | 9 ++-- .../LoadRouteFromXmlWithInterceptTest.java | 10 ++-- .../LoadRouteFromXmlWithNamespaceTest.java | 10 ++-- .../LoadRouteFromXmlWithOnExceptionTest.java | 10 ++-- .../definition/LoadRouteFromXmlWithPolicyTest.java | 10 ++-- .../definition/RouteTemplateLoadFromXmlTest.java | 15 ++ .../jaxb/spring/CamelLoadRoutesFromXMLTest.java| 19 +++ .../services/org/apache/camel/xmlroutes-loader | 2 - .../xml/jaxb/JaxbXmlRoutesDefinitionLoader.java| 54 24 files changed, 100 insertions(+), 370 deletions(-) delete mode 100644 core/camel-api/src/main/java/org/apache/camel/spi/XMLRoutesDefinitionLoader.java copy components/camel-resourceresolver-github/src/main/java/org/apache/camel/github/GistResource.java => core/camel-support/src/main/java/org/apache/camel/support/CachedResource.java (54%) delete mode 100644 dsl/camel-xml-io-dsl/src/generated/resources/META-INF/services/org/apache/camel/xmlroutes-loader delete mode 100644 dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlRoutesDefinitionLoader.java delete mode 100644 dsl/camel-xml-jaxb-dsl/src/generated/resources/META-INF/services/org/apache/camel/xmlroutes-loader delete mode 100644 dsl/camel-xml-jaxb-dsl/src/main/java/org/apache/camel/dsl/xml/jaxb/JaxbXmlRoutesDefinitionLoader.java
[camel] 01/02: Remove deprecated XmlRoutesDefinitionLoader
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 8fded3794a460c62b75de796ade25a4f41e2d721
Author: Guillaume Nodet
AuthorDate: Tue Jan 31 14:23:10 2023 +0100
Remove deprecated XmlRoutesDefinitionLoader
---
components/camel-openapi-java/pom.xml | 4 ++
.../openapi/jmx/JmxRestDefinitionsResolver.java| 9 ++--
.../org/apache/camel/ExtendedCamelContext.java | 14 --
.../camel/spi/XMLRoutesDefinitionLoader.java | 50 ---
.../camel/impl/engine/AbstractCamelContext.java| 22
.../camel/impl/engine/SimpleCamelContext.java | 17 ---
.../camel/impl/ExtendedCamelContextConfigurer.java | 6 ---
.../camel/impl/lw/LightweightCamelContext.java | 11
.../impl/lw/LightweightRuntimeCamelContext.java| 11
.../services/org/apache/camel/xmlroutes-loader | 2 -
.../dsl/xml/io/XmlRoutesDefinitionLoader.java | 58 --
.../jaxb/definition/CreateModelFromXmlTest.java| 6 +--
.../xml/jaxb/definition/LoadRestFromXmlTest.java | 9 ++--
.../xml/jaxb/definition/LoadRouteFromXmlTest.java | 9 ++--
.../LoadRouteFromXmlWithInterceptTest.java | 10 ++--
.../LoadRouteFromXmlWithNamespaceTest.java | 10 ++--
.../LoadRouteFromXmlWithOnExceptionTest.java | 10 ++--
.../definition/LoadRouteFromXmlWithPolicyTest.java | 10 ++--
.../definition/RouteTemplateLoadFromXmlTest.java | 15 ++
.../jaxb/spring/CamelLoadRoutesFromXMLTest.java| 19 +++
.../services/org/apache/camel/xmlroutes-loader | 2 -
.../xml/jaxb/JaxbXmlRoutesDefinitionLoader.java| 54
22 files changed, 45 insertions(+), 313 deletions(-)
diff --git a/components/camel-openapi-java/pom.xml
b/components/camel-openapi-java/pom.xml
index 8e533d4f658..17b11ba7e2d 100644
--- a/components/camel-openapi-java/pom.xml
+++ b/components/camel-openapi-java/pom.xml
@@ -48,6 +48,10 @@
org.apache.camel
camel-core-engine
+
+org.apache.camel
+camel-xml-io
+
diff --git
a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/jmx/JmxRestDefinitionsResolver.java
b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/jmx/JmxRestDefinitionsResolver.java
index 5eb4def5992..90f6cd56a60 100644
---
a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/jmx/JmxRestDefinitionsResolver.java
+++
b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/jmx/JmxRestDefinitionsResolver.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.openapi.jmx;
-import java.io.InputStream;
import java.lang.management.ManagementFactory;
import java.util.ArrayList;
import java.util.List;
@@ -31,7 +30,9 @@ import org.apache.camel.model.rest.RestDefinition;
import org.apache.camel.model.rest.RestsDefinition;
import org.apache.camel.openapi.RestDefinitionsResolver;
import org.apache.camel.openapi.RestOpenApiSupport;
+import org.apache.camel.spi.Resource;
import org.apache.camel.spi.annotations.JdkService;
+import org.apache.camel.xml.in.ModelParser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -66,10 +67,10 @@ public class JmxRestDefinitionsResolver implements
RestDefinitionsResolver {
new String[] { "boolean" });
if (xml != null) {
LOG.debug("DumpRestAsXml:\n{}", xml);
-InputStream xmlis =
camelContext.getTypeConverter().convertTo(InputStream.class, xml);
+
ExtendedCamelContext ecc =
camelContext.adapt(ExtendedCamelContext.class);
-RestsDefinition rests
-= (RestsDefinition)
ecc.getXMLRoutesDefinitionLoader().loadRestsDefinition(camelContext, xmlis);
+Resource resource =
ecc.getResourceLoader().resolveResource("mem:" + xml);
+RestsDefinition rests = new
ModelParser(resource).parseRestsDefinition().orElse(null);
if (rests != null) {
return rests.getRests();
}
diff --git
a/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
b/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
index 91022688999..62774876223 100644
--- a/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
+++ b/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
@@ -74,7 +74,6 @@ import org.apache.camel.spi.RoutesLoader;
import org.apache.camel.spi.StartupStepRecorder;
import org.apache.camel.spi.UnitOfWorkFactory;
import org.apache.camel.spi.UriFactoryResolver;
-import org.apache.camel.spi.XMLRoutesDefinitionLoader;
/**
* Extended {@link CamelContext} which contains the methods and APIs that are
not primary intended for Cam
[camel] 02/02: Regen
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 f588b86577df07cb1afe2484ad62645b349b6390
Author: Guillaume Nodet
AuthorDate: Wed Jan 11 11:54:53 2023 +0100
Regen
---
.../resources/org/apache/camel/catalog/others.properties | 8
.../org/apache/camel/catalog/others/componentdsl.json | 15 +++
.../org/apache/camel/catalog/others/endpointdsl.json | 15 +++
.../org/apache/camel/catalog/others/groovy-dsl.json | 15 +++
.../resources/org/apache/camel/catalog/others/js-dsl.json | 15 +++
.../org/apache/camel/catalog/others/jsh-dsl.json | 15 +++
.../org/apache/camel/catalog/others/kamelet-main.json | 15 +++
.../org/apache/camel/catalog/others/swagger-java.json | 15 +++
.../org/apache/camel/catalog/others/yaml-dsl.json | 15 +++
9 files changed, 128 insertions(+)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
index 4586b3ca4e0..9d4d2f6ad73 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
@@ -8,18 +8,24 @@ cli-connector
cloud
cloudevents
cluster
+componentdsl
console
csimple-joor
debug
dsl-modeline
dsl-support
elytron
+endpointdsl
+groovy-dsl
headersmap
health
jasypt
java-joor-dsl
jfr
+js-dsl
+jsh-dsl
jta
+kamelet-main
leveldb
lra
mail-microsoft-oauth
@@ -43,6 +49,7 @@ shiro
spring-main
spring-security
spring-xml
+swagger-java
test-junit5
test-spring-junit5
threadpoolfactory-vertx
@@ -51,4 +58,5 @@ undertow-spring-security
wal
xml-io-dsl
xml-jaxb-dsl
+yaml-dsl
zipkin
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/componentdsl.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/componentdsl.json
new file mode 100644
index 000..3799e772735
--- /dev/null
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/componentdsl.json
@@ -0,0 +1,15 @@
+{
+ "other": {
+"kind": "other",
+"name": "componentdsl",
+"title": "Java Component DSL",
+"description": "The Camel Component DSL",
+"deprecated": false,
+"firstVersion": "3.1.0",
+"label": "dsl",
+"supportLevel": "Stable",
+"groupId": "org.apache.camel",
+"artifactId": "camel-componentdsl",
+"version": "4.0.0-SNAPSHOT"
+ }
+}
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/endpointdsl.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/endpointdsl.json
new file mode 100644
index 000..cea1951ad69
--- /dev/null
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/endpointdsl.json
@@ -0,0 +1,15 @@
+{
+ "other": {
+"kind": "other",
+"name": "endpointdsl",
+"title": "Java Endpoint DSL",
+"description": "The Camel Endpoint DSL",
+"deprecated": false,
+"firstVersion": "3.0.0",
+"label": "dsl",
+"supportLevel": "Stable",
+"groupId": "org.apache.camel",
+"artifactId": "camel-endpointdsl",
+"version": "4.0.0-SNAPSHOT"
+ }
+}
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/groovy-dsl.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/groovy-dsl.json
new file mode 100644
index 000..05aba580247
--- /dev/null
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/groovy-dsl.json
@@ -0,0 +1,15 @@
+{
+ "other": {
+"kind": "other",
+"name": "groovy-dsl",
+"title": "Groovy Dsl",
+"description": "Camel DSL with Groovy",
+"deprecated": false,
+"firstVersion": "3.9.0",
+"label": "dsl",
+"supportLevel": "Experimental",
+"groupId": "org.apache.camel",
+"artifactId": "camel-groovy-dsl",
+"version": "4.0.0-SNAPSHOT"
+ }
+}
diff --git
a/catalog/camel-catalog/src/gen
[camel] 01/02: Enable camel-swagger-java
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 93e9df9168e748cdb538c64d1ab1aed589ec68bc
Author: Guillaume Nodet
AuthorDate: Wed Jan 11 11:54:46 2023 +0100
Enable camel-swagger-java
---
.../META-INF/services/org/apache/camel/other.properties | 7 +++
.../src/generated/resources/swagger-java.json | 15 +++
components/pom.xml| 2 +-
3 files changed, 23 insertions(+), 1 deletion(-)
diff --git
a/components/camel-swagger-java/src/generated/resources/META-INF/services/org/apache/camel/other.properties
b/components/camel-swagger-java/src/generated/resources/META-INF/services/org/apache/camel/other.properties
new file mode 100644
index 000..f4820270ba9
--- /dev/null
+++
b/components/camel-swagger-java/src/generated/resources/META-INF/services/org/apache/camel/other.properties
@@ -0,0 +1,7 @@
+# Generated by camel build tools - do NOT edit this file!
+name=swagger-java
+groupId=org.apache.camel
+artifactId=camel-swagger-java
+version=4.0.0-SNAPSHOT
+projectName=Camel :: Swagger Java (deprecated)
+projectDescription=Rest-dsl support for using swagger api-doc
diff --git
a/components/camel-swagger-java/src/generated/resources/swagger-java.json
b/components/camel-swagger-java/src/generated/resources/swagger-java.json
new file mode 100644
index 000..2dfc53f9356
--- /dev/null
+++ b/components/camel-swagger-java/src/generated/resources/swagger-java.json
@@ -0,0 +1,15 @@
+{
+ "other": {
+"kind": "other",
+"name": "swagger-java",
+"title": "Swagger Java",
+"description": "Rest-dsl support for using swagger api-doc",
+"deprecated": true,
+"firstVersion": "2.16.0",
+"label": "rest,api",
+"supportLevel": "Stable",
+"groupId": "org.apache.camel",
+"artifactId": "camel-swagger-java",
+"version": "4.0.0-SNAPSHOT"
+ }
+}
diff --git a/components/pom.xml b/components/pom.xml
index 867b4e14f54..52b6d92ee65 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -308,7 +308,7 @@
camel-stream
camel-stringtemplate
camel-stitch
-
+camel-swagger-java
camel-swift
camel-openapi-java
camel-syslog
[camel] branch main updated (888287d6760 -> f588b86577d)
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 888287d6760 Revert "Other fixes"
new 93e9df9168e Enable camel-swagger-java
new f588b86577d Regen
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:
.../resources/org/apache/camel/catalog/others.properties | 8
.../org/apache/camel/catalog/others}/componentdsl.json| 0
.../org/apache/camel/catalog/others}/endpointdsl.json | 0
.../org/apache/camel/catalog/others}/groovy-dsl.json | 0
.../org/apache/camel/catalog/others}/js-dsl.json | 0
.../org/apache/camel/catalog/others}/jsh-dsl.json | 0
.../org/apache/camel/catalog/others}/kamelet-main.json| 0
.../org/apache/camel/catalog/others/swagger-java.json | 15 +++
.../org/apache/camel/catalog/others}/yaml-dsl.json| 0
.../META-INF/services/org/apache/camel/other.properties | 7 +++
.../src/generated/resources/swagger-java.json | 15 +++
components/pom.xml| 2 +-
12 files changed, 46 insertions(+), 1 deletion(-)
copy {dsl/camel-componentdsl/src/generated/resources =>
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others}/componentdsl.json
(100%)
copy {dsl/camel-endpointdsl/src/generated/resources =>
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others}/endpointdsl.json
(100%)
copy {dsl/camel-groovy-dsl/camel-groovy-dsl/src/generated/resources =>
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others}/groovy-dsl.json
(100%)
copy {dsl/camel-js-dsl/src/generated/resources =>
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others}/js-dsl.json
(100%)
copy {dsl/camel-jsh-dsl/src/generated/resources =>
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others}/jsh-dsl.json
(100%)
copy {dsl/camel-kamelet-main/src/generated/resources =>
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others}/kamelet-main.json
(100%)
create mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/swagger-java.json
copy {dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources =>
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others}/yaml-dsl.json
(100%)
create mode 100644
components/camel-swagger-java/src/generated/resources/META-INF/services/org/apache/camel/other.properties
create mode 100644
components/camel-swagger-java/src/generated/resources/swagger-java.json
[camel] branch main updated: Revert "Other fixes"
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 888287d6760 Revert "Other fixes" 888287d6760 is described below commit 888287d67603243c25123458a546d6dc83b5c8dd Author: Guillaume Nodet AuthorDate: Wed Jan 11 11:12:37 2023 +0100 Revert "Other fixes" This reverts commit 0e8a0024eb44bbe89d67f4e3826b6c9e24c814e6. --- parent/pom.xml | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 276e687ac76..06d361e2c5e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -386,9 +386,9 @@ 3.3.1 4.2.14 1.10.2 -3.0.2 -5.0.0 - 4.0.2 +2.0.1 +3.0.1 + 3.0 0.6.8 31.1-jre 2.1.6 @@ -477,10 +477,10 @@ 1.7.36 1.7.36 4.3.5 -3.1.1 -5.0.0-RC2 -4.0.1 - 6.1.0 +2.12.0 +3.0.5 +3.3.0 + 5.6.0 1.33 2.3 2.6.3_1
[camel] branch main updated: Re-disable jms tests
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 448798a36fe Re-disable jms tests 448798a36fe is described below commit 448798a36febb18763eeaadb919d2392ac5df0d4 Author: Guillaume Nodet AuthorDate: Wed Jan 11 11:05:13 2023 +0100 Re-disable jms tests --- components/camel-jms/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/camel-jms/pom.xml b/components/camel-jms/pom.xml index 0d5e0792f2f..524da6b019f 100644 --- a/components/camel-jms/pom.xml +++ b/components/camel-jms/pom.xml @@ -140,7 +140,7 @@ - +src/test/dummy org.apache.maven.plugins
[camel] 16/20: Migration to Jetty 11
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 90390b7e0faf426c7aa968fc5be272d09b2c6ced
Author: Vladimir V. Bychkov
AuthorDate: Mon Nov 14 09:56:27 2022 +0100
Migration to Jetty 11
(cherry picked from commit 5e57bb6cc86bfdbc474f91fc2c152cb0fc03a9ff)
(cherry picked from commit 4dd107e0f8f0946105506aa43d187e70fefb3f9c)
(cherry picked from commit a77b3b898a52caa6bef69b51e58050d44ce98999)
---
.../org/apache/camel/catalog/components/jetty.json | 4 +-
.../camel/component/cometd/CometdComponent.java| 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/jetty-common.json | 2 +-
.../component/jetty/CamelContinuationServlet.java | 70 +++---
.../camel/component/jetty/JettyHttpComponent.java | 23 ++-
.../camel/component/jetty/MultiPartFilter.java | 2 +-
.../JettyHttp11EndpointUriFactory.java}| 4 +-
.../JettyHttpComponent11Configurer.java} | 8 +--
.../JettyHttpEndpoint11Configurer.java}| 8 +--
.../services/org/apache/camel/component/jetty | 2 +-
.../org/apache/camel/configurer/jetty-component| 2 +-
.../org/apache/camel/configurer/jetty-endpoint | 2 +-
.../services/org/apache/camel/send-dynamic/jetty | 2 +-
.../org/apache/camel/urifactory/jetty-endpoint | 2 +-
.../camel/component/{jetty9 => jetty11}/jetty.json | 4 +-
.../camel-jetty/src/main/docs/jetty-component.adoc | 4 +-
.../{jetty9 => jetty11}/AttachmentHttpBinding.java | 11 ++--
.../CamelInputStreamContentProvider.java | 2 +-
.../{jetty9 => jetty11}/HttpSendDynamicAware.java | 2 +-
.../JettyContentExchange11.java} | 6 +-
.../JettyHttpComponent11.java} | 10 ++--
.../JettyHttpEndpoint11.java} | 12 ++--
.../jetty/JettyComponentMuteExceptionTest.java | 6 +-
.../jetty/JettyHttpEndpointDisconnectTest.java | 5 +-
.../jetty/TwoCamelContextWithJettyRouteTest.java | 10 ++--
.../async/JettyAsyncContinuationTimeoutTest.java | 2 +-
.../jetty/JettyComponentSpringConfiguredTest.xml | 2 +-
.../apache/camel/component/jetty/jetty-https.xml | 2 +-
.../tracing/decorators/JettySpanDecorator.java | 2 +-
.../component/websocket/WebsocketComponent.java| 2 +-
.../component/ComponentsBuilderFactory.java| 2 +-
.../dsl/JettyComponentBuilderFactory.java | 6 +-
.../src/generated/resources/metadata.json | 2 +-
.../builder/endpoint/StaticEndpointBuilders.java | 4 +-
.../dsl/JettyHttpEndpointBuilderFactory.java | 8 +--
.../infra/jetty/services/JettyEmbeddedService.java | 2 +-
37 files changed, 130 insertions(+), 111 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jetty.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jetty.json
index 0396e9744b1..4172a0f0f5d 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jetty.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jetty.json
@@ -3,12 +3,12 @@
"kind": "component",
"name": "jetty",
"title": "Jetty",
-"description": "Expose HTTP endpoints using Jetty 9.",
+"description": "Expose HTTP endpoints using Jetty 11.",
"deprecated": false,
"deprecationNote": "",
"firstVersion": "1.2.0",
"label": "http",
-"javaType": "org.apache.camel.component.jetty9.JettyHttpComponent9",
+"javaType": "org.apache.camel.component.jetty11.JettyHttpComponent9",
"supportLevel": "Stable",
"groupId": "org.apache.camel",
"artifactId": "camel-jetty",
diff --git
a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
index 12f5338d5d3..f0d61e77b52 100644
---
a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
+++
b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
@@ -233,7 +233,7 @@ public class CometdComponent extends DefaultComponent
implements SSLContextParam
sslParams = retrieveGlobalSslContextParameters();
}
-SslContextFactory sslContextFactory = new SslContextFactory();
+SslContextFactory.Server sslContextFactory = new
SslContextFactory.Server();
sslContextFactory.setEndpointIdentificationAlgorithm(null);
[camel] 18/20: Additional fixes
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 d9510b128834cf4ef678246c147766531b13a230
Author: Guillaume Nodet
AuthorDate: Tue Jan 3 16:29:45 2023 +0100
Additional fixes
(cherry picked from commit 034027ac8b8fd040fe1c1eaa2ae6dc951c07c42d)
(cherry picked from commit 6d9ff02a6f390017f3f92a8f8f05671a9357d572)
---
.../src/main/resources/META-INF/beans.xml | 2 +-
...ion => jakarta.enterprise.inject.spi.Extension} | 0
components/camel-grpc/pom.xml | 6 +-
components/camel-jackson/pom.xml | 2 +-
.../jackson/JacksonJAXBAnnotationTest.java | 4 +-
.../converter/JacksonConversionsPojoTest.java | 4 +-
components/camel-jacksonxml/pom.xml| 2 +-
.../component/jacksonxml/JacksonXMLDataFormat.java | 4 +-
.../jaxb/mapper/DefaultNamespacePrefixMapper.java | 2 +-
components/camel-jms/pom.xml | 12 --
components/camel-jsonpath/pom.xml | 2 +-
.../camel/spring/rmi/RmiRegistryFactoryBean.java | 239 +
.../management/jmxInstrumentationWithConnector.xml | 2 +-
components/pom.xml | 2 +-
parent/pom.xml | 2 +-
.../test/resources/SpringBootRestController.txt| 4 +-
.../test/resources/SpringBootRestController.txt| 4 +-
17 files changed, 261 insertions(+), 32 deletions(-)
diff --git a/components/camel-cdi/src/main/resources/META-INF/beans.xml
b/components/camel-cdi/src/main/resources/META-INF/beans.xml
index 0e3dd95de90..d2712729ec5 100644
--- a/components/camel-cdi/src/main/resources/META-INF/beans.xml
+++ b/components/camel-cdi/src/main/resources/META-INF/beans.xml
@@ -21,7 +21,7 @@
-
+
diff --git
a/components/camel-cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
b/components/camel-cdi/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
similarity index 100%
rename from
components/camel-cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
rename to
components/camel-cdi/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml
index 44d74208baf..1f95daacac5 100644
--- a/components/camel-grpc/pom.xml
+++ b/components/camel-grpc/pom.xml
@@ -142,9 +142,11 @@
+
-jakarta.annotation
-jakarta.annotation-api
+javax.annotation
+javax.annotation-api
+1.3.2
test
diff --git a/components/camel-jackson/pom.xml b/components/camel-jackson/pom.xml
index 70495cef642..d5d695db0cb 100644
--- a/components/camel-jackson/pom.xml
+++ b/components/camel-jackson/pom.xml
@@ -50,7 +50,7 @@
com.fasterxml.jackson.module
-jackson-module-jaxb-annotations
+jackson-module-jakarta-xmlbind-annotations
test
diff --git
a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonJAXBAnnotationTest.java
b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonJAXBAnnotationTest.java
index 8fc84f17c76..00eec75b8af 100644
---
a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonJAXBAnnotationTest.java
+++
b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonJAXBAnnotationTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.jackson;
-import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule;
+import
com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationModule;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
@@ -58,7 +58,7 @@ public class JacksonJAXBAnnotationTest extends
CamelTestSupport {
from("direct:back").unmarshal(format).to("mock:reverse");
JacksonDataFormat formatPojo = new
JacksonDataFormat(TestJAXBPojo.class);
-
formatPojo.setModuleClassNames(JaxbAnnotationModule.class.getName());
+
formatPojo.setModuleClassNames(JakartaXmlBindAnnotationModule.class.getName());
from("direct:inPojo").marshal(formatPojo);
from("direct:backPojo").unmarshal(formatPojo).to("mock:reversePojo");
diff --git
a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/converter/JacksonConversionsPojoTest.java
b/components/camel-jackson/src/test/java/org/apache/camel/component/ja
[camel] 02/20: Reenable git commands
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 564d8d1dff4b60a63f45d90bfb679abb6d6e4aa0
Author: Guillaume Nodet
AuthorDate: Thu Dec 8 14:01:19 2022 +0100
Reenable git commands
---
jakarta/rewrite.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/jakarta/rewrite.java b/jakarta/rewrite.java
index bc55ad48238..a8232d0f842 100755
--- a/jakarta/rewrite.java
+++ b/jakarta/rewrite.java
@@ -33,9 +33,10 @@ class rewrite implements Callable {
@Override
public Integer call() throws Exception {
// Rebase on top of main
-// exec("git", "checkout", "jakarta-rewrite");
+exec("git", "checkout", "jakarta/rewrite");
+exec("git", "rebase", "origin/main");
// Create/reset branch 'rewritten'
-// exec("git", "checkout", "-B", "jakarta-rewritten",
"jakarta-rewrite");
+exec("git", "checkout", "-B", "jakarta/rewritten", "jakarta/rewrite");
// Switch version to 4.0.0-SNAPSHOT
System.out.println("Switch version to 4.0.0-SNAPSHOT");
[camel] 13/20: Merge remote-tracking branch 'origin/main' into jakarta/jms
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 340313f6f0ed6e53e106f893e325213465eb1f3a Merge: d41e5972072 dab36222143 Author: Guillaume Nodet AuthorDate: Wed Jan 11 10:34:28 2023 +0100 Merge remote-tracking branch 'origin/main' into jakarta/jms # Conflicts: # components/camel-jms/src/test/java/org/apache/camel/component/jms/ActiveMQOriginalDestinationTest.java # components/camel-sjms/pom.xml # components/camel-sjms/src/test/java/org/apache/camel/component/sjms/producer/QueueProducerQoSTest.java # test-infra/camel-test-infra-artemis/src/test/java/org/apache/camel/test/infra/artemis/services/AbstractArtemisEmbeddedService.java # test-infra/camel-test-infra-artemis/src/test/java/org/apache/camel/test/infra/artemis/services/ArtemisService.java # test-infra/camel-test-infra-artemis/src/test/java/org/apache/camel/test/infra/artemis/services/ArtemisServiceFactory.java .github/workflows/pr-build.yml |1 + camel-dependencies/pom.xml | 1132 ++-- .../camel/catalog/components/elasticsearch.json|2 +- .../org/apache/camel/catalog/components/jpa.json |2 +- .../apache/camel/catalog/components/rabbitmq.json |2 +- .../main/camel-main-configuration-metadata.json|2 - .../org/apache/camel/catalog/models/param.json |1 + .../apache/camel/catalog/schemas/camel-spring.xsd | 10 +- .../camel/component/aws2/s3/AWS2S3Producer.java|8 +- components/camel-aws/camel-aws2-ses/pom.xml| 18 + .../camel/component/aws2/ses/Ses2Component.java|2 - .../aws2/ses/Ses2ComponentVerifierExtension.java | 94 -- .../camel/component/aws2/ses/Ses2Endpoint.java | 19 + .../camel/component/aws2/ses/Ses2HealthCheck.java | 71 ++ .../aws2/ses/Ses2HealthCheckProfileCredsTest.java | 97 ++ .../aws2/ses/Ses2HealthCheckStaticCredsTest.java | 96 ++ .../ses/SesComponentVerifierExtensionTest.java | 90 -- .../azure/key/vault/KeyVaultComponent.java |4 - .../azure/key/vault/KeyVaultProducer.java |5 - .../azure/servicebus/ServiceBusComponent.java |5 - .../azure/storage/queue/QueueComponent.java|5 - components/camel-braintree/README.md |2 +- .../braintree/BraintreeConfiguration.java |6 - .../caffeine/cache/CaffeineCacheComponent.java |5 - .../caffeine/load/CaffeineLoadCacheComponent.java |4 - .../loadcache/CaffeineLoadCacheProducerTest.java |5 +- .../TransactionalJtaTransactionPolicy.java |4 +- .../camel/component/consul/ConsulRegistry.java |7 +- .../consul/cluster/ConsulClusterService.java |4 - .../apache/camel/component/cron/CronHelper.java|4 - .../camel/converter/crypto/PGPDataFormatUtil.java | 13 +- .../component/cxf/jaxws/DefaultCxfBinding.java |2 +- .../cxf/jaxws/HybridSourceDataBinding.java |6 - .../digitalocean/DigitalOceanComponent.java|5 - .../camel/component/dropbox/DropboxComponent.java |5 - .../dynamicrouter/DynamicRouterConstants.java |6 +- .../camel/component/ehcache/EhcacheEndpoint.java |5 - .../apache/camel/component/es/elasticsearch.json |2 +- .../component/es/ElasticsearchConfiguration.java |3 +- .../camel/component/es/ElasticsearchProducer.java | 11 +- .../es/integration/ElasticsearchTestSupport.java |2 +- .../component/fastjson/FastjsonDataFormat.java |2 +- .../camel/component/file/remote/FtpOperations.java | 14 +- .../RemoteFilePollingConsumerPollStrategy.java | 12 +- .../apache/camel/component/RepositoryFactory.java |9 +- .../git/consumer/AbstractGitConsumer.java |5 - .../google/drive/GoogleDriveConsumer.java |5 - .../functions/GoogleCloudFunctionsProducer.java|4 - .../google/mail/BatchGoogleMailClientFactory.java |3 - .../sheets/stream/GoogleSheetsStreamConsumer.java |5 - .../apache/camel/component/gora/GoraConsumer.java |2 +- .../hashicorp/vault/HashicorpVaultComponent.java |5 - .../hashicorp/vault/HashicorpVaultProducer.java|5 - .../iam/models/ClientConfigurations.java |4 - .../CredentialDefinitionsServiceHandler.java | 33 +- .../cluster/InfinispanEmbeddedClusterService.java |4 - .../apache/camel/component/irc/IrcProducer.java|2 +- .../camel/converter/jaxb/JaxbDataFormat.java |2 +- .../jbpm/workitem/AbstractCamelCommand.java|4 - .../component/jcache/JCacheEntryEventFilters.java |6 +- .../apache/camel/component/jdbc/JdbcProducer.java | 10 +- .../jgroups/raft/JGroupsRaftComponent.java |4 - .../jira/producer/AttachFileProducer.java |5 - .../jms/reply
[camel] 17/20: Fix salesforce component
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 bf2d2ebbaf0e918c7e1865a4cd5addf7e1add5fa
Author: Guillaume Nodet
AuthorDate: Wed Dec 7 11:46:38 2022 +0100
Fix salesforce component
(cherry picked from commit eda15c498fb3834996924607e353ecb1e37cffcc)
(cherry picked from commit 2ff288739cfc15e112fb47c21c29c9e8a05933e6)
---
.../salesforce/codegen/AbstractSalesforceExecution.java | 2 +-
.../camel-salesforce/camel-salesforce-component/pom.xml | 12 +---
.../camel/component/salesforce/SalesforceComponent.java | 6 +++---
.../camel/component/salesforce/SalesforceConsumer.java | 6 --
.../component/salesforce/SalesforceHttpClient.java | 13 ++---
.../salesforce/internal/client/AbstractClientBase.java | 9 +
.../internal/client/DefaultAnalyticsApiClient.java | 2 +-
.../internal/client/DefaultBulkApiClient.java | 2 +-
.../internal/client/DefaultBulkApiV2Client.java | 2 +-
.../internal/client/DefaultCompositeApiClient.java | 2 +-
.../DefaultCompositeSObjectCollectionsApiClient.java| 2 +-
.../salesforce/internal/client/DefaultRawClient.java| 4 ++--
.../salesforce/internal/client/DefaultRestClient.java | 2 +-
.../internal/client/SalesforceSecurityHandler.java | 17 +
.../salesforce/internal/streaming/ReplayExtension.java | 4 ++--
.../internal/streaming/SubscriptionHelper.java | 13 +
.../component/salesforce/BulkApiIntegrationTest.java| 10 --
.../component/salesforce/HttpProxyIntegrationTest.java | 10 --
.../component/salesforce/RestApiIntegrationTest.java| 17 +
.../component/salesforce/SalesforceConsumerTest.java| 6 --
.../salesforce/internal/SessionIntegrationTest.java | 2 +-
.../internal/client/AbstractClientBaseTest.java | 4 ++--
22 files changed, 80 insertions(+), 67 deletions(-)
diff --git
a/components/camel-salesforce/camel-salesforce-codegen/src/main/java/org/apache/camel/component/salesforce/codegen/AbstractSalesforceExecution.java
b/components/camel-salesforce/camel-salesforce-codegen/src/main/java/org/apache/camel/component/salesforce/codegen/AbstractSalesforceExecution.java
index db6eeb356a3..a7cf151ebb3 100644
---
a/components/camel-salesforce/camel-salesforce-codegen/src/main/java/org/apache/camel/component/salesforce/codegen/AbstractSalesforceExecution.java
+++
b/components/camel-salesforce/camel-salesforce-codegen/src/main/java/org/apache/camel/component/salesforce/codegen/AbstractSalesforceExecution.java
@@ -203,7 +203,7 @@ public abstract class AbstractSalesforceExecution {
// set ssl context parameters
try {
-final SslContextFactory sslContextFactory = new
SslContextFactory();
+final SslContextFactory.Client sslContextFactory = new
SslContextFactory.Client();
sslContextFactory.setSslContext(sslContextParameters.createSSLContext(camelContext));
SecurityUtils.adaptToIBMCipherNames(sslContextFactory);
diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml
b/components/camel-salesforce/camel-salesforce-component/pom.xml
index ba5cd7ed55c..fd92b08a72f 100644
--- a/components/camel-salesforce/camel-salesforce-component/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-component/pom.xml
@@ -108,18 +108,8 @@
org.cometd.java
-cometd-java-client-websocket-jetty
+cometd-java-client-http-jetty
${cometd-java-client-version}
-
-
-org.eclipse.jetty
-*
-
-
-org.slf4j
-slf4j-api
-
-
org.apache.commons
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
index 6fac729d865..8659ba42e1a 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
@@ -391,7 +391,7 @@ public class SalesforceComponent extends DefaultComponent
implements SSLContextP
.orElseGet(() ->
Optional.ofNullable(retrieveGlobalSslContextParameters())
.orElseGet(() -> new SSLContextParameters()));
-final SslContextFactory sslContextFactory = new
SslContextFactory();
+
[camel] 12/20: Fix commit message
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 d4a23ee765d9c236afb285226469c79825128fc1
Author: Guillaume Nodet
AuthorDate: Wed Jan 11 10:07:44 2023 +0100
Fix commit message
---
jakarta/rewrite.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jakarta/rewrite.java b/jakarta/rewrite.java
index e3223a51c83..22fc8407415 100755
--- a/jakarta/rewrite.java
+++ b/jakarta/rewrite.java
@@ -38,7 +38,7 @@ class rewrite implements Callable {
// Create/reset branch 'rewritten'
exec("git", "checkout", "-B", "jakarta/rewritten", "jakarta/rewrite");
// Merge jms
-exec("git", "merge", "jakarta/jms", "-m", "Merge jakarta/jms");
+exec("git", "merge", "jakarta/jms", "-m", "\"Merge jakarta/jms\"");
// Switch version to 4.0.0-SNAPSHOT
System.out.println("Switch version to 4.0.0-SNAPSHOT");
[camel] 08/20: Merge jms
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 0cc29ccf3d52d0e1176e209fa06c92b79880ef99
Author: Guillaume Nodet
AuthorDate: Fri Jan 6 08:35:43 2023 +0100
Merge jms
---
jakarta/rewrite.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/jakarta/rewrite.java b/jakarta/rewrite.java
index 6f9c17ac87b..28b057ce3da 100755
--- a/jakarta/rewrite.java
+++ b/jakarta/rewrite.java
@@ -37,6 +37,8 @@ class rewrite implements Callable {
exec("git", "rebase", "origin/main");
// Create/reset branch 'rewritten'
exec("git", "checkout", "-B", "jakarta/rewritten", "jakarta/rewrite");
+// Merge jms
+exec("git", "merge", "jakarta/jms", "-m", "Merge jakarta/jms");
// Switch version to 4.0.0-SNAPSHOT
System.out.println("Switch version to 4.0.0-SNAPSHOT");
@@ -531,8 +533,6 @@ class rewrite implements Callable {
exec("git", "cherry-pick", "-x",
"4dd107e0f8f0946105506aa43d187e70fefb3f9c");
// Salesforce migration
exec("git", "cherry-pick", "-x",
"eda15c498fb3834996924607e353ecb1e37cffcc");
-// JMS migration
-exec("git", "cherry-pick", "-x",
"d41e59720725c2268b03a94b7416ad06f348fb57");
// Other fixes
exec("git", "cherry-pick", "-x",
"034027ac8b8fd040fe1c1eaa2ae6dc951c07c42d");
[camel] 09/20: Disable unused mock-javamail_1.7
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 4a0b19452a21caef76053dbfc459a6968cb5561e
Author: Guillaume Nodet
AuthorDate: Fri Jan 6 11:58:14 2023 +0100
Disable unused mock-javamail_1.7
---
jakarta/rewrite.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/jakarta/rewrite.java b/jakarta/rewrite.java
index 28b057ce3da..d7aa1478946 100755
--- a/jakarta/rewrite.java
+++ b/jakarta/rewrite.java
@@ -71,6 +71,7 @@ class rewrite implements Callable {
));
}
regex(Paths.get("components/camel-jasypt/pom.xml"),
".*?\\s*", "");
+regex(Paths.get("tests/test-bundles/pom.xml"),
"mock-javamail_1.7",
"");
// Switch to javax.annotation.processing.Generated
System.out.println("Switch to javax.annotation.processing.Generated");
@@ -536,7 +537,7 @@ class rewrite implements Callable {
// Other fixes
exec("git", "cherry-pick", "-x",
"034027ac8b8fd040fe1c1eaa2ae6dc951c07c42d");
-// rm -Rf **\/src/generated target **\/target && mvn source:jar
install -DskipTests
+// rm -Rf **\/src/generated && mvn clean && mvn source:jar install
-DskipTests
return 0;
}
[camel] 20/20: Other fixes
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 0e8a0024eb44bbe89d67f4e3826b6c9e24c814e6 Author: Guillaume Nodet AuthorDate: Wed Jan 11 09:43:59 2023 +0100 Other fixes --- components/camel-jms/pom.xml | 2 +- .../org/apache/camel/component/jms/JmsComponentTest.java | 2 +- .../camel/component/jms/JmsEndpointConfigurationTest.java | 2 +- .../component/jms/JmsFormatDateHeadersToIso8601Test.java | 2 +- parent/pom.xml | 14 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/components/camel-jms/pom.xml b/components/camel-jms/pom.xml index 524da6b019f..0d5e0792f2f 100644 --- a/components/camel-jms/pom.xml +++ b/components/camel-jms/pom.xml @@ -140,7 +140,7 @@ -src/test/dummy + org.apache.maven.plugins diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentTest.java index d7328d7982d..984d881029e 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsComponentTest.java @@ -20,8 +20,8 @@ import jakarta.jms.ConnectionFactory; import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.infra.activemq.common.ConnectionFactoryHelper; import org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker; +import org.apache.camel.test.infra.artemis.common.ConnectionFactoryHelper; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java index 2ff46acf998..61728a30db1 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java @@ -19,7 +19,7 @@ package org.apache.camel.component.jms; import jakarta.jms.ConnectionFactory; import jakarta.jms.DeliveryMode; -import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; import org.apache.camel.BindToRegistry; import org.apache.camel.LoggingLevel; import org.apache.camel.Processor; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFormatDateHeadersToIso8601Test.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFormatDateHeadersToIso8601Test.java index 38276873afa..1e4c15b8d1b 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFormatDateHeadersToIso8601Test.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFormatDateHeadersToIso8601Test.java @@ -23,7 +23,7 @@ import jakarta.jms.ConnectionFactory; import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.infra.activemq.common.ConnectionFactoryHelper; +import org.apache.camel.test.infra.artemis.common.ConnectionFactoryHelper; import org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; diff --git a/parent/pom.xml b/parent/pom.xml index 06d361e2c5e..276e687ac76 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -386,9 +386,9 @@ 3.3.1 4.2.14 1.10.2 -2.0.1 -3.0.1 - 3.0 +3.0.2 +5.0.0 + 4.0.2 0.6.8 31.1-jre 2.1.6 @@ -477,10 +477,10 @@ 1.7.36 1.7.36 4.3.5 -2.12.0 -3.0.5 -3.3.0 - 5.6.0 +3.1.1 +5.0.0-RC2 +4.0.1 + 6.1.0 1.33 2.3 2.6.3_1
[camel] 10/20: Fix commits sha
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 732ef20d7d89eb0a27fe707d3806ed5c0c1b8583
Author: Guillaume Nodet
AuthorDate: Fri Jan 6 12:06:52 2023 +0100
Fix commits sha
---
jakarta/rewrite.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/jakarta/rewrite.java b/jakarta/rewrite.java
index d7aa1478946..ed7fb6527e4 100755
--- a/jakarta/rewrite.java
+++ b/jakarta/rewrite.java
@@ -531,11 +531,11 @@ class rewrite implements Callable {
exec("git", "commit", "-a", "-m", "Switch to jakarta namespace");
// Jetty 9 -> 11 migration
-exec("git", "cherry-pick", "-x",
"4dd107e0f8f0946105506aa43d187e70fefb3f9c");
+exec("git", "cherry-pick", "-x",
"a77b3b898a52caa6bef69b51e58050d44ce98999");
// Salesforce migration
-exec("git", "cherry-pick", "-x",
"eda15c498fb3834996924607e353ecb1e37cffcc");
+exec("git", "cherry-pick", "-x",
"2ff288739cfc15e112fb47c21c29c9e8a05933e6");
// Other fixes
-exec("git", "cherry-pick", "-x",
"034027ac8b8fd040fe1c1eaa2ae6dc951c07c42d");
+exec("git", "cherry-pick", "-x",
"6d9ff02a6f390017f3f92a8f8f05671a9357d572");
// rm -Rf **\/src/generated && mvn clean && mvn source:jar install
-DskipTests
[camel] 14/20: "Merge jakarta/jms"
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 44b4f324fe0720edba901b942c8851ac54acb969 Merge: d4a23ee765d 340313f6f0e Author: Guillaume Nodet AuthorDate: Wed Jan 11 10:34:47 2023 +0100 "Merge jakarta/jms" .../infra/artemis/services/ArtemisTCPService.java | 62 ++ 1 file changed, 62 insertions(+)
[camel] 01/20: Rewrite script
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 94dce43d2b1e73c9452ee7e2100605dc2df14e9b
Author: Guillaume Nodet
AuthorDate: Wed Nov 30 19:08:41 2022 +0100
Rewrite script
---
jakarta/rewrite.java | 568 +++
1 file changed, 568 insertions(+)
diff --git a/jakarta/rewrite.java b/jakarta/rewrite.java
new file mode 100755
index 000..bc55ad48238
--- /dev/null
+++ b/jakarta/rewrite.java
@@ -0,0 +1,568 @@
+///usr/bin/env jbang "$0" "$@" ; exit $?
+//DEPS info.picocli:picocli:4.5.0
+
+import java.io.IOError;
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.nio.charset.MalformedInputException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.Callable;
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
+
+import picocli.CommandLine;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Option;
+import picocli.CommandLine.Parameters;
+
+@Command(name = "rewrite")
+class rewrite implements Callable {
+
+public static void main(String... args) throws Exception {
+int exitCode = new CommandLine(new rewrite()).execute(args);
+System.exit(exitCode);
+}
+
+
+@Override
+public Integer call() throws Exception {
+// Rebase on top of main
+// exec("git", "checkout", "jakarta-rewrite");
+// Create/reset branch 'rewritten'
+// exec("git", "checkout", "-B", "jakarta-rewritten",
"jakarta-rewrite");
+
+// Switch version to 4.0.0-SNAPSHOT
+System.out.println("Switch version to 4.0.0-SNAPSHOT");
+try (Stream files = Files.walk(Paths.get("."))) {
+files.forEach(p -> {
+String name = p.getFileName().toString();
+if (name.equals("pom.xml")) {
+regex(p, "3\\.20\\.0-SNAPSHOT",
"4.0.0-SNAPSHOT");
+} else if (p.toString().contains("/src/generated/resources/"))
{
+if (name.endsWith(".properties")) {
+regex(p, "version=3.20.0-SNAPSHOT",
"version=4.0.0-SNAPSHOT");
+} else if (name.endsWith(".json")) {
+regex(p, "\"version\": \"3\\.20\\.0-SNAPSHOT\"",
"\"version\": \"4.0.0-SNAPSHOT\"");
+}
+}
+});
+}
+
+// Remove OSGi support
+System.out.println("Remove OSGi support");
+try (Stream files = Files.walk(Paths.get("."))) {
+files
+.filter(p -> p.getFileName().toString().equals("pom.xml"))
+.forEach(p -> regex(p,
+" *<([^>]+-version-range)>[^<]+ *\n", "",
+" *<(camel\\.osgi\\.[^>]+)(>[^<]+| *\\/>) *\n",
"",
+" * *\n", "",
+"
*<(plugin|pluginExecutionFilter)>\\s*org.apache.camel\\s*camel-bundle-plugin[\\s\\S]*?
*\n", "",
+" *init *\n", ""
+));
+}
+regex(Paths.get("components/camel-jasypt/pom.xml"),
".*?\\s*", "");
+
+// Switch to javax.annotation.processing.Generated
+System.out.println("Switch to javax.annotation.processing.Generated");
+try (Stream files = Files.walk(Paths.get("."))) {
+files
+.filter(p -> {
+String name = p.getFileName().toString();
+return name.endsWith(".java") || name.endsWith(".txt") ||
name.endsWith(".vm");
+})
+.forEach(p -> regex(p,
+"javax.annotation.Generated",
"javax.annotation.processing.Generated"
+));
+}
+
+// Add support for jakarta in checkstyle
+System.out.println("Add support for jakarta in checkstyle");
+try (Stream files = Stream.of(
+"pom.xml",
+"etc/pom.xml",
+
"buildingtools/src/main/resources/camel-checkstyle.xml").map(Paths::get)) {
+files.forEach(p -> regex(p,
+
[camel] 03/20: Fix jetty cherry-pick
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 7c22b3b62aa1189e0cb8beabce4c15fcb067a8c5
Author: Guillaume Nodet
AuthorDate: Mon Jan 2 10:48:51 2023 +0100
Fix jetty cherry-pick
---
jakarta/rewrite.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jakarta/rewrite.java b/jakarta/rewrite.java
index a8232d0f842..d5cfa9a876e 100755
--- a/jakarta/rewrite.java
+++ b/jakarta/rewrite.java
@@ -525,7 +525,7 @@ class rewrite implements Callable {
exec("git", "commit", "-a", "-m", "Switch to jakarta namespace");
// Jetty 9 -> 11 migration
-exec("git", "cherry-pick", "-x",
"5e57bb6cc86bfdbc474f91fc2c152cb0fc03a9ff");
+exec("git", "cherry-pick", "-x",
"4dd107e0f8f0946105506aa43d187e70fefb3f9c");
// Salesforce migration
exec("git", "cherry-pick", "-x",
"eda15c498fb3834996924607e353ecb1e37cffcc");
[camel] 06/20: Upgrade arquillian to latest
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 ec82d3c9460a6cf2d20cf70458db3e8b7e76f24b
Author: Guillaume Nodet
AuthorDate: Mon Jan 2 16:57:07 2023 +0100
Upgrade arquillian to latest
---
jakarta/rewrite.java | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/jakarta/rewrite.java b/jakarta/rewrite.java
index 0b4f665c6f2..01f42c28055 100755
--- a/jakarta/rewrite.java
+++ b/jakarta/rewrite.java
@@ -355,7 +355,10 @@ class rewrite implements Callable {
// RestEasy
"<(resteasy-version)>.*?", "<$1>6.2.1.Final",
"
*\\s*org.jboss.resteasy\\s*resteasy-spring\\s*test\\s*",
"",
-
"com.fasterxml.jackson.jaxrs(\\s*)jackson-jaxrs-json-provider",
"com.fasterxml.jackson.jakarta.rs$1jackson-jakarta-rs-json-provider"
+
"com.fasterxml.jackson.jaxrs(\\s*)jackson-jaxrs-json-provider",
"com.fasterxml.jackson.jakarta.rs$1jackson-jakarta-rs-json-provider",
+// Arquillian
+"<(arquillian-version)>.*?",
"<$1>1.7.0.Alpha13",
+"<(arquillian-weld-embedded-version)>.*?",
"<$1>3.0.2.Final"
));
}
[camel] 04/20: Use cxf 4.0.0
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 460636c6eda10870306f53866d3a4bd266634df0
Author: Guillaume Nodet
AuthorDate: Mon Jan 2 12:03:05 2023 +0100
Use cxf 4.0.0
---
jakarta/rewrite.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/jakarta/rewrite.java b/jakarta/rewrite.java
index d5cfa9a876e..120b3f77c32 100755
--- a/jakarta/rewrite.java
+++ b/jakarta/rewrite.java
@@ -312,8 +312,8 @@ class rewrite implements Callable {
"<(jakarta-servlet-api-version)>.*?",
"<$1>6.0.0",
"(org\\.eclipse\\.jetty\\.websocket\\s*websocket)-(client|server|api)()",
"$1-jakarta-$2$3",
"(\\s*)javax\\.servlet(\\s*)javax\\.servlet-api",
"$1jakarta.servlet$2jakarta.servlet-api",
-"<(cxf-version)>.*?", "<$1>4.0.0-SNAPSHOT",
-"<(cxf-codegen-plugin-version)>.*?",
"<$1>4.0.0-SNAPSHOT",
+"<(cxf-version)>.*?", "<$1>4.0.0",
+"<(cxf-codegen-plugin-version)>.*?",
"<$1>4.0.0",
"<(cxf-xjc-plugin-version)>.*?", "<$1>4.0.0",
"<(cxf-xjc-utils-version)>.*?", "<$1>4.0.0",
"jaxws21",
"jaxws",
[camel] 05/20: Update wrt to 3.21.0-SNAPSHOT version
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 8b3b48880b56b85b1c5509e8112fa77b109041d6
Author: Guillaume Nodet
AuthorDate: Mon Jan 2 16:56:52 2023 +0100
Update wrt to 3.21.0-SNAPSHOT version
---
jakarta/rewrite.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/jakarta/rewrite.java b/jakarta/rewrite.java
index 120b3f77c32..0b4f665c6f2 100755
--- a/jakarta/rewrite.java
+++ b/jakarta/rewrite.java
@@ -44,12 +44,12 @@ class rewrite implements Callable {
files.forEach(p -> {
String name = p.getFileName().toString();
if (name.equals("pom.xml")) {
-regex(p, "3\\.20\\.0-SNAPSHOT",
"4.0.0-SNAPSHOT");
+regex(p, "3\\.21\\.0-SNAPSHOT",
"4.0.0-SNAPSHOT");
} else if (p.toString().contains("/src/generated/resources/"))
{
if (name.endsWith(".properties")) {
-regex(p, "version=3.20.0-SNAPSHOT",
"version=4.0.0-SNAPSHOT");
+regex(p, "version=3.21.0-SNAPSHOT",
"version=4.0.0-SNAPSHOT");
} else if (name.endsWith(".json")) {
-regex(p, "\"version\": \"3\\.20\\.0-SNAPSHOT\"",
"\"version\": \"4.0.0-SNAPSHOT\"");
+regex(p, "\"version\": \"3\\.21\\.0-SNAPSHOT\"",
"\"version\": \"4.0.0-SNAPSHOT\"");
}
}
});
[camel] 11/20: Fix the regen step to make sure it always works
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 26211b67e8a92416cc609309400758f48efed6da
Author: Guillaume Nodet
AuthorDate: Fri Jan 6 17:29:24 2023 +0100
Fix the regen step to make sure it always works
---
jakarta/rewrite.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/jakarta/rewrite.java b/jakarta/rewrite.java
index ed7fb6527e4..e3223a51c83 100755
--- a/jakarta/rewrite.java
+++ b/jakarta/rewrite.java
@@ -537,7 +537,8 @@ class rewrite implements Callable {
// Other fixes
exec("git", "cherry-pick", "-x",
"6d9ff02a6f390017f3f92a8f8f05671a9357d572");
-// rm -Rf **\/src/generated && mvn clean && mvn source:jar install
-DskipTests
+// find . \( -path "*/src/generated" -o -name "target" \) -exec rm -Rf
{} \;
+// mvn source:jar install -DskipTests
return 0;
}
[camel] 07/20: Cherry-pick jms
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 ca67595c4679dcbaae026f047bb39de5ee2c8446
Author: Guillaume Nodet
AuthorDate: Fri Jan 6 08:30:19 2023 +0100
Cherry-pick jms
---
jakarta/rewrite.java | 4
1 file changed, 4 insertions(+)
diff --git a/jakarta/rewrite.java b/jakarta/rewrite.java
index 01f42c28055..6f9c17ac87b 100755
--- a/jakarta/rewrite.java
+++ b/jakarta/rewrite.java
@@ -531,6 +531,10 @@ class rewrite implements Callable {
exec("git", "cherry-pick", "-x",
"4dd107e0f8f0946105506aa43d187e70fefb3f9c");
// Salesforce migration
exec("git", "cherry-pick", "-x",
"eda15c498fb3834996924607e353ecb1e37cffcc");
+// JMS migration
+exec("git", "cherry-pick", "-x",
"d41e59720725c2268b03a94b7416ad06f348fb57");
+// Other fixes
+exec("git", "cherry-pick", "-x",
"034027ac8b8fd040fe1c1eaa2ae6dc951c07c42d");
// rm -Rf **\/src/generated target **\/target && mvn source:jar
install -DskipTests
[camel] 04/05: Fix salesforce component
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch jakarta/fixes
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2ff288739cfc15e112fb47c21c29c9e8a05933e6
Author: Guillaume Nodet
AuthorDate: Wed Dec 7 11:46:38 2022 +0100
Fix salesforce component
(cherry picked from commit eda15c498fb3834996924607e353ecb1e37cffcc)
---
.../salesforce/codegen/AbstractSalesforceExecution.java | 2 +-
.../camel-salesforce/camel-salesforce-component/pom.xml | 12 +---
.../camel/component/salesforce/SalesforceComponent.java | 6 +++---
.../camel/component/salesforce/SalesforceConsumer.java | 6 --
.../component/salesforce/SalesforceHttpClient.java | 13 ++---
.../salesforce/internal/client/AbstractClientBase.java | 9 +
.../internal/client/DefaultAnalyticsApiClient.java | 2 +-
.../internal/client/DefaultBulkApiClient.java | 2 +-
.../internal/client/DefaultBulkApiV2Client.java | 2 +-
.../internal/client/DefaultCompositeApiClient.java | 2 +-
.../DefaultCompositeSObjectCollectionsApiClient.java| 2 +-
.../salesforce/internal/client/DefaultRawClient.java| 4 ++--
.../salesforce/internal/client/DefaultRestClient.java | 2 +-
.../internal/client/SalesforceSecurityHandler.java | 17 +
.../salesforce/internal/streaming/ReplayExtension.java | 4 ++--
.../internal/streaming/SubscriptionHelper.java | 13 +
.../component/salesforce/BulkApiIntegrationTest.java| 10 --
.../component/salesforce/HttpProxyIntegrationTest.java | 10 --
.../component/salesforce/RestApiIntegrationTest.java| 17 +
.../component/salesforce/SalesforceConsumerTest.java| 6 --
.../salesforce/internal/SessionIntegrationTest.java | 2 +-
.../internal/client/AbstractClientBaseTest.java | 4 ++--
22 files changed, 80 insertions(+), 67 deletions(-)
diff --git
a/components/camel-salesforce/camel-salesforce-codegen/src/main/java/org/apache/camel/component/salesforce/codegen/AbstractSalesforceExecution.java
b/components/camel-salesforce/camel-salesforce-codegen/src/main/java/org/apache/camel/component/salesforce/codegen/AbstractSalesforceExecution.java
index db6eeb356a3..a7cf151ebb3 100644
---
a/components/camel-salesforce/camel-salesforce-codegen/src/main/java/org/apache/camel/component/salesforce/codegen/AbstractSalesforceExecution.java
+++
b/components/camel-salesforce/camel-salesforce-codegen/src/main/java/org/apache/camel/component/salesforce/codegen/AbstractSalesforceExecution.java
@@ -203,7 +203,7 @@ public abstract class AbstractSalesforceExecution {
// set ssl context parameters
try {
-final SslContextFactory sslContextFactory = new
SslContextFactory();
+final SslContextFactory.Client sslContextFactory = new
SslContextFactory.Client();
sslContextFactory.setSslContext(sslContextParameters.createSSLContext(camelContext));
SecurityUtils.adaptToIBMCipherNames(sslContextFactory);
diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml
b/components/camel-salesforce/camel-salesforce-component/pom.xml
index ba5cd7ed55c..fd92b08a72f 100644
--- a/components/camel-salesforce/camel-salesforce-component/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-component/pom.xml
@@ -108,18 +108,8 @@
org.cometd.java
-cometd-java-client-websocket-jetty
+cometd-java-client-http-jetty
${cometd-java-client-version}
-
-
-org.eclipse.jetty
-*
-
-
-org.slf4j
-slf4j-api
-
-
org.apache.commons
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
index 6fac729d865..8659ba42e1a 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
@@ -391,7 +391,7 @@ public class SalesforceComponent extends DefaultComponent
implements SSLContextP
.orElseGet(() ->
Optional.ofNullable(retrieveGlobalSslContextParameters())
.orElseGet(() -> new SSLContextParameters()));
-final SslContextFactory sslContextFactory = new
SslContextFactory();
+final SslContextFactory.Client sslContextFactory = new
SslContextFactory.
[camel] 03/05: Migration to Jetty 11
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch jakarta/fixes
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a77b3b898a52caa6bef69b51e58050d44ce98999
Author: Vladimir V. Bychkov
AuthorDate: Mon Nov 14 09:56:27 2022 +0100
Migration to Jetty 11
(cherry picked from commit 5e57bb6cc86bfdbc474f91fc2c152cb0fc03a9ff)
(cherry picked from commit 4dd107e0f8f0946105506aa43d187e70fefb3f9c)
---
.../org/apache/camel/catalog/components/jetty.json | 4 +-
.../camel/component/cometd/CometdComponent.java| 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/jetty-common.json | 2 +-
.../component/jetty/CamelContinuationServlet.java | 70 +++---
.../camel/component/jetty/JettyHttpComponent.java | 23 ++-
.../camel/component/jetty/MultiPartFilter.java | 2 +-
.../JettyHttp11EndpointUriFactory.java}| 4 +-
.../JettyHttpComponent11Configurer.java} | 8 +--
.../JettyHttpEndpoint11Configurer.java}| 8 +--
.../services/org/apache/camel/component/jetty | 2 +-
.../org/apache/camel/configurer/jetty-component| 2 +-
.../org/apache/camel/configurer/jetty-endpoint | 2 +-
.../services/org/apache/camel/send-dynamic/jetty | 2 +-
.../org/apache/camel/urifactory/jetty-endpoint | 2 +-
.../camel/component/{jetty9 => jetty11}/jetty.json | 4 +-
.../camel-jetty/src/main/docs/jetty-component.adoc | 4 +-
.../{jetty9 => jetty11}/AttachmentHttpBinding.java | 11 ++--
.../CamelInputStreamContentProvider.java | 2 +-
.../{jetty9 => jetty11}/HttpSendDynamicAware.java | 2 +-
.../JettyContentExchange11.java} | 6 +-
.../JettyHttpComponent11.java} | 10 ++--
.../JettyHttpEndpoint11.java} | 12 ++--
.../jetty/JettyComponentMuteExceptionTest.java | 6 +-
.../jetty/JettyHttpEndpointDisconnectTest.java | 5 +-
.../jetty/TwoCamelContextWithJettyRouteTest.java | 10 ++--
.../async/JettyAsyncContinuationTimeoutTest.java | 2 +-
.../jetty/JettyComponentSpringConfiguredTest.xml | 2 +-
.../apache/camel/component/jetty/jetty-https.xml | 2 +-
.../tracing/decorators/JettySpanDecorator.java | 2 +-
.../component/websocket/WebsocketComponent.java| 2 +-
.../component/ComponentsBuilderFactory.java| 2 +-
.../dsl/JettyComponentBuilderFactory.java | 6 +-
.../src/generated/resources/metadata.json | 2 +-
.../builder/endpoint/StaticEndpointBuilders.java | 4 +-
.../dsl/JettyHttpEndpointBuilderFactory.java | 8 +--
.../infra/jetty/services/JettyEmbeddedService.java | 2 +-
37 files changed, 130 insertions(+), 111 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jetty.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jetty.json
index 0396e9744b1..4172a0f0f5d 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jetty.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jetty.json
@@ -3,12 +3,12 @@
"kind": "component",
"name": "jetty",
"title": "Jetty",
-"description": "Expose HTTP endpoints using Jetty 9.",
+"description": "Expose HTTP endpoints using Jetty 11.",
"deprecated": false,
"deprecationNote": "",
"firstVersion": "1.2.0",
"label": "http",
-"javaType": "org.apache.camel.component.jetty9.JettyHttpComponent9",
+"javaType": "org.apache.camel.component.jetty11.JettyHttpComponent9",
"supportLevel": "Stable",
"groupId": "org.apache.camel",
"artifactId": "camel-jetty",
diff --git
a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
index 12f5338d5d3..f0d61e77b52 100644
---
a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
+++
b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
@@ -233,7 +233,7 @@ public class CometdComponent extends DefaultComponent
implements SSLContextParam
sslParams = retrieveGlobalSslContextParameters();
}
-SslContextFactory sslContextFactory = new SslContextFactory();
+SslContextFactory.Server sslContextFactory = new
SslContextFactory.Server();
sslContextFactory.setEndpointIdentificationAlgorithm(null);
if (sslParams != null) {
sslContextFac
[camel] 05/05: Additional fixes
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch jakarta/fixes
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6d9ff02a6f390017f3f92a8f8f05671a9357d572
Author: Guillaume Nodet
AuthorDate: Tue Jan 3 16:29:45 2023 +0100
Additional fixes
(cherry picked from commit 034027ac8b8fd040fe1c1eaa2ae6dc951c07c42d)
---
.../src/main/resources/META-INF/beans.xml | 2 +-
...ion => jakarta.enterprise.inject.spi.Extension} | 0
components/camel-grpc/pom.xml | 6 +-
components/camel-jackson/pom.xml | 2 +-
.../jackson/JacksonJAXBAnnotationTest.java | 4 +-
.../converter/JacksonConversionsPojoTest.java | 4 +-
components/camel-jacksonxml/pom.xml| 2 +-
.../component/jacksonxml/JacksonXMLDataFormat.java | 4 +-
.../jaxb/mapper/DefaultNamespacePrefixMapper.java | 2 +-
components/camel-jms/pom.xml | 12 --
components/camel-jsonpath/pom.xml | 2 +-
.../camel/spring/rmi/RmiRegistryFactoryBean.java | 239 +
.../management/jmxInstrumentationWithConnector.xml | 2 +-
components/pom.xml | 2 +-
parent/pom.xml | 2 +-
.../test/resources/SpringBootRestController.txt| 4 +-
.../test/resources/SpringBootRestController.txt| 4 +-
17 files changed, 261 insertions(+), 32 deletions(-)
diff --git a/components/camel-cdi/src/main/resources/META-INF/beans.xml
b/components/camel-cdi/src/main/resources/META-INF/beans.xml
index 0e3dd95de90..d2712729ec5 100644
--- a/components/camel-cdi/src/main/resources/META-INF/beans.xml
+++ b/components/camel-cdi/src/main/resources/META-INF/beans.xml
@@ -21,7 +21,7 @@
-
+
diff --git
a/components/camel-cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
b/components/camel-cdi/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
similarity index 100%
rename from
components/camel-cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
rename to
components/camel-cdi/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml
index 44d74208baf..1f95daacac5 100644
--- a/components/camel-grpc/pom.xml
+++ b/components/camel-grpc/pom.xml
@@ -142,9 +142,11 @@
+
-jakarta.annotation
-jakarta.annotation-api
+javax.annotation
+javax.annotation-api
+1.3.2
test
diff --git a/components/camel-jackson/pom.xml b/components/camel-jackson/pom.xml
index 70495cef642..d5d695db0cb 100644
--- a/components/camel-jackson/pom.xml
+++ b/components/camel-jackson/pom.xml
@@ -50,7 +50,7 @@
com.fasterxml.jackson.module
-jackson-module-jaxb-annotations
+jackson-module-jakarta-xmlbind-annotations
test
diff --git
a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonJAXBAnnotationTest.java
b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonJAXBAnnotationTest.java
index 8fc84f17c76..00eec75b8af 100644
---
a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonJAXBAnnotationTest.java
+++
b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonJAXBAnnotationTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.component.jackson;
-import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule;
+import
com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationModule;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
@@ -58,7 +58,7 @@ public class JacksonJAXBAnnotationTest extends
CamelTestSupport {
from("direct:back").unmarshal(format).to("mock:reverse");
JacksonDataFormat formatPojo = new
JacksonDataFormat(TestJAXBPojo.class);
-
formatPojo.setModuleClassNames(JaxbAnnotationModule.class.getName());
+
formatPojo.setModuleClassNames(JakartaXmlBindAnnotationModule.class.getName());
from("direct:inPojo").marshal(formatPojo);
from("direct:backPojo").unmarshal(formatPojo).to("mock:reversePojo");
diff --git
a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/converter/JacksonConversionsPojoTest.java
b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/converter/JacksonConversionsPojoTest.java
index 95d810d810e..085a46
[camel] 01/05: Merge jakarta/jms
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch jakarta/fixes in repository https://gitbox.apache.org/repos/asf/camel.git commit 8f23777fa86fa78b7fc616ce740af6ef5d22ae20 Merge: 5931a244859 d41e5972072 Author: Guillaume Nodet AuthorDate: Fri Jan 6 12:01:27 2023 +0100 Merge jakarta/jms components/camel-amqp/pom.xml | 15 +- .../apache/camel/component/amqp/AMQPRouteTest.java | 24 +--- .../component/amqp/AMQPRouteTraceFrameTest.java| 26 +--- .../camel/component/amqp/AMQPTestSupport.java} | 22 +-- .../component/amqp/AMQPToDSendDynamicTest.java | 23 +-- .../apache/camel/component/amqp/AMQPToDTest.java | 23 +-- .../amqp/artemis/AMQPEmbeddedBrokerTest.java | 44 +- components/camel-jms/pom.xml | 8 ++ .../camel/component/jms/AbstractJMSTest.java | 10 +- .../component/jms/AbstractPersistentJMSTest.java | 8 +- .../jms/ActiveMQOriginalDestinationTest.java | 29 ++-- .../jms/ConsumerTemplateJmsSelectorTest.java | 2 +- .../jms/JmsAllowAdditionalHeadersTest.java | 4 +- .../component/jms/JmsAsyncStartListenerTest.java | 2 +- .../jms/JmsAsyncStartStopListenerTest.java | 8 +- .../component/jms/JmsAsyncStopListenerTest.java| 4 +- .../jms/JmsCustomHeaderFilterStrategyTest.java | 4 +- .../jms/JmsDefaultTaskExecutorTypeTest.java| 10 +- .../component/jms/JmsDestinationResolverTest.java | 4 +- .../jms/JmsErrorHandlerLogStackTraceTest.java | 4 +- .../component/jms/JmsHeaderFilteringTest.java | 4 +- ...ToDisabledButJMSReplyToHeaderPreservedTest.java | 3 +- .../jms/JmsInOnlyWithReplyToHeaderTest.java| 2 +- .../jms/JmsInOnlyWithReplyToHeaderTopicTest.java | 2 +- .../component/jms/JmsInOutBeanReturnNullTest.java | 7 +- .../jms/JmsInOutTransferExchangeTest.java | 2 +- .../jms/JmsIncludeAllJMSXPropertiesTest.java | 4 +- .../component/jms/JmsLoadBalanceFailoverTest.java | 10 +- ...ailoverWithForceSendOriginalJmsMessageTest.java | 6 +- .../JmsMessageCreatedStrategyComponentTest.java| 4 +- .../jms/JmsMessageIDNotOverridenAMQTest.java | 4 +- .../jms/JmsNotIncludeAllJMSXPropertiesTest.java| 4 +- .../jms/JmsProducerWithJMSHeaderTest.java | 8 +- ...sRequestReplyExclusiveReplyToComponentTest.java | 4 +- .../JmsRequestReplyFixedReplyToInEndpointTest.java | 8 +- .../jms/JmsRequestReplyManualReplyTest.java| 2 +- .../JmsRequestReplyManualWithJMSReplyToTest.java | 7 +- .../jms/JmsRequestReplyReplyToOverrideTest.java| 6 +- .../jms/JmsRouteDeliveryModePreserveQoSTest.java | 3 + .../jms/JmsRouteTimeoutCheckerIntervalTest.java| 4 +- .../JmsRouteWithCustomKeyFormatStrategyTest.java | 25 ++-- ...sRouteWithPassThroughKeyFormatStrategyTest.java | 3 + .../camel/component/jms/JmsSelectorInTest.java | 15 +- .../jms/JmsSimpleRequestCustomReplyToTest.java | 4 +- .../jms/JmsSimpleRequestLateReplyTest.java | 4 +- .../JmsStreamMessageTypeNoStreamCachingTest.java | 4 +- .../component/jms/JmsStreamMessageTypeTest.java| 4 +- .../jms/JmsThrottlingInflightRoutePolicyTest.java | 2 +- .../component/jms/JmsTransferExchangeTest.java | 6 +- .../component/jms/ManagedJmsEndpointTest.java | 6 +- ...RequestReplyCorrelatedWithCustomHeaderTest.java | 4 +- .../component/jms/TwoConsumerOnSameQueueTest.java | 3 + .../ActiveMQConsumeWildcardQueuesTest.java | 19 ++- .../jms/issues/ActiveMQPropagateHeadersTest.java | 2 +- .../ActiveMQPropagateSerializableHeadersTest.java | 2 +- .../jms/issues/JmsAnotherCustomJMSReplyToTest.java | 8 +- .../issues/JmsConcurrentConsumerInOnlyTest.java| 6 +- .../jms/issues/JmsCustomJMSReplyToIssueTest.java | 10 +- .../JmsInOutExclusiveTopicRecipientListTest.java | 4 +- .../jms/issues/JmsInOutExclusiveTopicTest.java | 2 + .../JmsPassThroughtJmsKeyFormatStrategyTest.java | 4 +- ...KeyFormatStrategyUsingJmsConfigurationTest.java | 4 +- ...etterChannelHandlerRollbackOnExceptionTest.java | 10 +- ...erChannelNotHandlerRollbackOnExceptionTest.java | 2 +- ...ansactedOnExceptionRollbackOnExceptionTest.java | 13 +- .../component/jms/issues/TempReplyToIssueTest.java | 2 +- components/camel-sjms/pom.xml | 13 +- .../camel/component/sjms/CamelJmsTestHelper.java | 29 ++-- .../component/sjms/SimpleJmsComponentTest.java | 2 +- .../component/sjms/SjmsComponentRestartTest.java | 9 +- .../sjms/SjmsEndpointConnectionSettingsTest.java | 2 +- .../sjms/SjmsEndpointNameOverrideTest.java | 2 +- .../camel/component/sjms/SjmsEndpointTest.java | 2 +- .../sjms/consumer/AsyncConsumerFalseTest.java | 10 +- .../sjms/consumer/AsyncConsumerInOutTest.java | 10 +- .../consumer/InOnlyTopicDurableConsumerTest.java | 6
[camel] branch jakarta/fixes created (now 6d9ff02a6f3)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to branch jakarta/fixes in repository https://gitbox.apache.org/repos/asf/camel.git at 6d9ff02a6f3 Additional fixes This branch includes the following new commits: new 8f23777fa86 Merge jakarta/jms new b97b2bd7519 Switch to jakarta namespace new a77b3b898a5 Migration to Jetty 11 new 2ff288739cf Fix salesforce component new 6d9ff02a6f3 Additional fixes The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel] branch jakarta/rewrite updated (3d55ef54f31 -> 491610e68df)
This is an automated email from the ASF dual-hosted git repository. gnodet pushed a change to branch jakarta/rewrite in repository https://gitbox.apache.org/repos/asf/camel.git discard 3d55ef54f31 Use cxf 4.0.0 discard f51d22804db Fix jetty cherry-pick discard 01aeb3e54d8 Reenable git commands discard 611c58aa182 Rewrite script add 821959a6556 Upgrade to apache 29 parent add 93d71b6e803 CAMEL-18841: camel-kafka: producer idempotence is not enabled by default add 92bfc653449 CAMEL-18825: Make XML parser/transformers more secure out of the box. add 343f04cb98a CAMEL-18825: Fix https://github.com/apache/camel/security/code-scanning/36 add 6dcdfb748f8 CAMEL-18825: Fix https://github.com/apache/camel/security/code-scanning/49 add e319d4d52e6 CAMEL-18825: Remove trace logging of input value in type converter to help with https://github.com/apache/camel/security/code-scanning/5414. add dccf8f96340 CAMEL-18852: camel-atom/camel-rss - Deprecate basic auth add 9e71b2096b8 CAMEL-18852: camel-atom/camel-rss - Deprecate basic auth add 2c6b3acfc0f [CAMEL-5963] camel-smpp: add Transceiver (TRX) support (#8955) add d0d70750cf4 Regen add 175985f5ec1 Regen add 80b35743c4a CAMEL-18853: camel-swagger-java - Deprecate add 50dcd8b88ae Regen for commit 175985f5ec1e216d5cc4250be60b32f8741afda3 (#8963) add ee22cb46489 2022 -> 2023 add dfd50e67eed (chores) camel-arangodb: avoid risky unboxing add 1a087cd3349 (chores) camel-aws: avoid risky unboxing add db62a9eb200 CAMEL-18854: x-queue-type was set with x-single-active-consumer value. (#8965) add 3ea089b2fe3 camel-plc4x: Connection now established in doStart() of Producer/Consumer instead of constructors (#8967) add 52b528ceca1 camel-plc4x: Added timeout to future in process() method of Plc4XProducer and fixed deprecated Camel methods (#8968) add d3889fc6854 CAMEL-18687: camel-salesforce: Support Client Credentials add 6091965de71 camel-salesforce: Bump default salesforce version to 56.0. add df60c60d989 Regen add c3da81c2951 docs: fix invalid document file (#8969) add a3ac6af2d7c CAMEL-18856: camel-main - Unable to declare java.util.List bean add a1d9b184595 (chores) tests: move utility method to TestSupport add 21c0188c9bc CAMEL-18523: camel-jbang - Add watch option add 2d219db0101 CAMEL-18523: camel-jbang - Add watch option add 43f5b93a36b Polished add 303b89a1a1a CAMEL-18523: camel-jbang - Add watch option add 080dbcb4e52 CAMEL-18523: camel-jbang - Add watch option add bcf6b1b181f camel-plc4x: Added autoReconnect uri parameter (#8971) add d45d6bcaf4c CAMEL-18496: removed the deprecated component camel-dozer add 15888902b55 Bump json5 from 1.0.1 to 1.0.2 in /docs add 422faed77c5 (chores) camel-core: disabled flaky test on Github add 6ff720a24cf CAMEL-18496: removed the deprecated component camel-cmis add 2c60e09391d Update try-catch-finally.adoc (#8974) add 152edb947d1 Regen for commit d45d6bcaf4c4e5d4ccd150d4bfe125ab38b14466 (#8977) add fee5b9ca167 Regen for commit 152edb947d13c046094961eeec8efb63c4a72994 add d8b3e25f8fb CAMEL-18538: camel-jbang - Run logs to both console and file add 903c066453a CAMEL-18538: camel-jbang - Log command add 5c7802d6800 (chores) documentation: removed advanced guides from Working with Camel Core add 7100125dae3 Regen for commit 903c066453a6dc1bbb11c2c1c5b6518c7649354f add 62a9b6e915b (chores) documentation: reorganize the route documentation add 4efd30ea9ec CAMEL-18860: java-joor-dsl - Adapt the code for native compilation (#8978) add f65fdadd237 Align all Lucene and Solr versions to 8.11.2 (#8988) add fadaeaad959 Upgrade Spark to 3.3.1 (#8989) add ab6b232c897 CAMEL-18863: camel-pulsar - Support chunking to enable sending a large message (#8987) add 5dc178fa4c8 (chores) camel-aws2-sqs: avoid risky unboxing add 9db07d8a32e (chores) camel-bindy: avoid risky unboxing add 7d10d520ae5 (chores) camel-file: avoid risky unboxing add a606837ee60 (chores) camel-grok: avoid risky unboxing add dd814a1efe2 (chores) camel-http: avoid risky unboxing add ad72aa8603a (chores) camel-mongodb: avoid risky unboxing add cf855bf0133 (chores) camel-ftp: avoid risky unboxing add 0f04960fdf1 (chores) camel-mllp: avoid risky unboxing add f922b4a5b7d (chores) camel-disruptor: avoid risky unboxing add fe0d1c91a6d (chores) camel-cxf: avoid risky unboxing add 0ecc08fbf38 (chores) camel-consul: avoid risky unboxing add e99f805334c (chores) camel-azure-datalake: avoid risky unboxing add e29f43e33d2 (chores) camel-route-parser: removed unused exceptions add eeaec71bbb0 (chores) camel-jbang: removed unused exceptions add 32bdb4e66bd (chores) camel-file: removed unused exceptions add 19cfba18cb9 (chores) camel-ftp: commented actually used excepti
