This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new f5f968c CAMEL-13797: Move @InvokeOnHeader/@InvokeOnHeaders to
org.apache.camel.spi package
f5f968c is described below
commit f5f968c1465f5ba70da8da8cc3dacb1e21eddf4a
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue Jul 30 09:18:48 2019 +0200
CAMEL-13797: Move @InvokeOnHeader/@InvokeOnHeaders to org.apache.camel.spi
package
---
MIGRATION.md | 2 ++
.../component/atomix/client/AbstractAtomixClientProducer.java | 2 +-
.../camel/component/atomix/client/map/AtomixMapProducer.java | 2 +-
.../atomix/client/messaging/AtomixMessagingProducer.java | 2 +-
.../atomix/client/multimap/AtomixMultiMapProducer.java | 2 +-
.../component/atomix/client/queue/AtomixQueueProducer.java | 2 +-
.../camel/component/atomix/client/set/AtomixSetProducer.java | 2 +-
.../component/atomix/client/value/AtomixValueProducer.java | 2 +-
.../camel/component/caffeine/cache/CaffeineCacheProducer.java | 2 +-
.../component/caffeine/load/CaffeineLoadCacheProducer.java | 2 +-
.../camel/component/consul/endpoint/ConsulCatalogProducer.java | 2 +-
.../component/consul/endpoint/ConsulCoordinatesProducer.java | 2 +-
.../camel/component/consul/endpoint/ConsulEventProducer.java | 2 +-
.../camel/component/consul/endpoint/ConsulHealthProducer.java | 2 +-
.../component/consul/endpoint/ConsulKeyValueProducer.java | 2 +-
.../component/consul/endpoint/ConsulPreparedQueryProducer.java | 2 +-
.../camel/component/consul/endpoint/ConsulSessionProducer.java | 2 +-
.../java/org/apache/camel/component/corda/CordaProducer.java | 3 ++-
.../org/apache/camel/component/ehcache/EhcacheProducer.java | 2 +-
.../apache/camel/component/infinispan/InfinispanProducer.java | 2 +-
.../java/org/apache/camel/component/web3j/Web3jProducer.java | 9 +++------
.../main/java/org/apache/camel/{ => spi}/InvokeOnHeader.java | 10 ++++++----
.../main/java/org/apache/camel/{ => spi}/InvokeOnHeaders.java | 10 ++++++----
.../java/org/apache/camel/support/HeaderSelectorProducer.java | 4 ++--
24 files changed, 39 insertions(+), 35 deletions(-)
diff --git a/MIGRATION.md b/MIGRATION.md
index aad73f1..3069571 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -316,6 +316,8 @@ The annotation `org.apache.camel.Constant` has been
removed, use `@Simple` inste
The annotation `org.apache.camel.language.SpEL` has been moved to
`org.apache.camel.language.spel.SpEL` and in the `camel-spring` JAR.
+The annotation `org.apache.camel.InvokeOnHeader` and
`org.apache.camel.InvokeOnHeaders` has been moved to the `org.apache.camel.spi`
package.
+
Rename various APIs in camel-core to fix the typo `chiper` to `cipher`.
The classes `ReloadStrategySupport` and `FileWatcherReloadStrategy` has been
removed.
diff --git
a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/AbstractAtomixClientProducer.java
b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/AbstractAtomixClientProducer.java
index 9c4fbf9..c2c1978 100644
---
a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/AbstractAtomixClientProducer.java
+++
b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/AbstractAtomixClientProducer.java
@@ -25,10 +25,10 @@ import java.util.concurrent.ConcurrentMap;
import io.atomix.resource.Resource;
import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
-import org.apache.camel.InvokeOnHeader;
import org.apache.camel.Message;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.atomix.AtomixAsyncMessageProcessor;
+import org.apache.camel.spi.InvokeOnHeader;
import org.apache.camel.support.DefaultAsyncProducer;
import org.apache.camel.util.ObjectHelper;
diff --git
a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/map/AtomixMapProducer.java
b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/map/AtomixMapProducer.java
index f727502..fd7a73a 100644
---
a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/map/AtomixMapProducer.java
+++
b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/map/AtomixMapProducer.java
@@ -21,9 +21,9 @@ import java.time.Duration;
import io.atomix.collections.DistributedMap;
import io.atomix.resource.ReadConsistency;
import org.apache.camel.AsyncCallback;
-import org.apache.camel.InvokeOnHeader;
import org.apache.camel.Message;
import org.apache.camel.component.atomix.client.AbstractAtomixClientProducer;
+import org.apache.camel.spi.InvokeOnHeader;
import org.apache.camel.util.ObjectHelper;
import static
org.apache.camel.component.atomix.client.AtomixClientConstants.RESOURCE_ACTION;
diff --git
a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingProducer.java
b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingProducer.java
index 22eb720..f5b371d 100644
---
a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingProducer.java
+++
b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingProducer.java
@@ -20,9 +20,9 @@ import io.atomix.group.DistributedGroup;
import io.atomix.group.GroupMember;
import io.atomix.group.messaging.MessageProducer;
import org.apache.camel.AsyncCallback;
-import org.apache.camel.InvokeOnHeader;
import org.apache.camel.Message;
import org.apache.camel.component.atomix.client.AbstractAtomixClientProducer;
+import org.apache.camel.spi.InvokeOnHeader;
import org.apache.camel.util.ObjectHelper;
import static
org.apache.camel.component.atomix.client.AtomixClientConstants.BROADCAST_TYPE;
diff --git
a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapProducer.java
b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapProducer.java
index d579ad3..7c11d98 100644
---
a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapProducer.java
+++
b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapProducer.java
@@ -21,9 +21,9 @@ import java.time.Duration;
import io.atomix.collections.DistributedMultiMap;
import io.atomix.resource.ReadConsistency;
import org.apache.camel.AsyncCallback;
-import org.apache.camel.InvokeOnHeader;
import org.apache.camel.Message;
import org.apache.camel.component.atomix.client.AbstractAtomixClientProducer;
+import org.apache.camel.spi.InvokeOnHeader;
import org.apache.camel.util.ObjectHelper;
import static
org.apache.camel.component.atomix.client.AtomixClientConstants.RESOURCE_ACTION;
diff --git
a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/queue/AtomixQueueProducer.java
b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/queue/AtomixQueueProducer.java
index 88730f0..d42cf9c 100644
---
a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/queue/AtomixQueueProducer.java
+++
b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/queue/AtomixQueueProducer.java
@@ -19,9 +19,9 @@ package org.apache.camel.component.atomix.client.queue;
import io.atomix.collections.DistributedQueue;
import io.atomix.resource.ReadConsistency;
import org.apache.camel.AsyncCallback;
-import org.apache.camel.InvokeOnHeader;
import org.apache.camel.Message;
import org.apache.camel.component.atomix.client.AbstractAtomixClientProducer;
+import org.apache.camel.spi.InvokeOnHeader;
import org.apache.camel.util.ObjectHelper;
import static
org.apache.camel.component.atomix.client.AtomixClientConstants.RESOURCE_ACTION;
diff --git
a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/set/AtomixSetProducer.java
b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/set/AtomixSetProducer.java
index 5c5a076..19aec85 100644
---
a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/set/AtomixSetProducer.java
+++
b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/set/AtomixSetProducer.java
@@ -21,9 +21,9 @@ import java.time.Duration;
import io.atomix.collections.DistributedSet;
import io.atomix.resource.ReadConsistency;
import org.apache.camel.AsyncCallback;
-import org.apache.camel.InvokeOnHeader;
import org.apache.camel.Message;
import org.apache.camel.component.atomix.client.AbstractAtomixClientProducer;
+import org.apache.camel.spi.InvokeOnHeader;
import org.apache.camel.util.ObjectHelper;
import static
org.apache.camel.component.atomix.client.AtomixClientConstants.RESOURCE_ACTION;
diff --git
a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/value/AtomixValueProducer.java
b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/value/AtomixValueProducer.java
index 747985a..1c83d24 100644
---
a/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/value/AtomixValueProducer.java
+++
b/components/camel-atomix/src/main/java/org/apache/camel/component/atomix/client/value/AtomixValueProducer.java
@@ -21,9 +21,9 @@ import java.time.Duration;
import io.atomix.resource.ReadConsistency;
import io.atomix.variables.DistributedValue;
import org.apache.camel.AsyncCallback;
-import org.apache.camel.InvokeOnHeader;
import org.apache.camel.Message;
import org.apache.camel.component.atomix.client.AbstractAtomixClientProducer;
+import org.apache.camel.spi.InvokeOnHeader;
import org.apache.camel.util.ObjectHelper;
import static
org.apache.camel.component.atomix.client.AtomixClientConstants.RESOURCE_ACTION;
diff --git
a/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/cache/CaffeineCacheProducer.java
b/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/cache/CaffeineCacheProducer.java
index 00e280f..618a1e0 100644
---
a/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/cache/CaffeineCacheProducer.java
+++
b/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/cache/CaffeineCacheProducer.java
@@ -22,10 +22,10 @@ import java.util.Set;
import com.github.benmanes.caffeine.cache.Cache;
import org.apache.camel.CamelExchangeException;
-import org.apache.camel.InvokeOnHeader;
import org.apache.camel.Message;
import org.apache.camel.component.caffeine.CaffeineConfiguration;
import org.apache.camel.component.caffeine.CaffeineConstants;
+import org.apache.camel.spi.InvokeOnHeader;
import org.apache.camel.support.HeaderSelectorProducer;
public class CaffeineCacheProducer extends HeaderSelectorProducer {
diff --git
a/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/load/CaffeineLoadCacheProducer.java
b/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/load/CaffeineLoadCacheProducer.java
index 1305687..56e2ab1 100644
---
a/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/load/CaffeineLoadCacheProducer.java
+++
b/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/load/CaffeineLoadCacheProducer.java
@@ -22,10 +22,10 @@ import java.util.Set;
import com.github.benmanes.caffeine.cache.LoadingCache;
import org.apache.camel.CamelExchangeException;
-import org.apache.camel.InvokeOnHeader;
import org.apache.camel.Message;
import org.apache.camel.component.caffeine.CaffeineConfiguration;
import org.apache.camel.component.caffeine.CaffeineConstants;
+import org.apache.camel.spi.InvokeOnHeader;
import org.apache.camel.support.HeaderSelectorProducer;
public class CaffeineLoadCacheProducer extends HeaderSelectorProducer {
diff --git
a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulCatalogProducer.java
b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulCatalogProducer.java
index 678cf0b..3928a9f 100644
---
a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulCatalogProducer.java
+++
b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulCatalogProducer.java
@@ -20,11 +20,11 @@ import com.orbitz.consul.CatalogClient;
import com.orbitz.consul.Consul;
import com.orbitz.consul.model.catalog.CatalogDeregistration;
import com.orbitz.consul.model.catalog.CatalogRegistration;
-import org.apache.camel.InvokeOnHeader;
import org.apache.camel.Message;
import org.apache.camel.component.consul.ConsulConfiguration;
import org.apache.camel.component.consul.ConsulConstants;
import org.apache.camel.component.consul.ConsulEndpoint;
+import org.apache.camel.spi.InvokeOnHeader;
public final class ConsulCatalogProducer extends
AbstractConsulProducer<CatalogClient> {
diff --git
a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulCoordinatesProducer.java
b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulCoordinatesProducer.java
index 7bf7053..41184ce 100644
---
a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulCoordinatesProducer.java
+++
b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulCoordinatesProducer.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.consul.endpoint;
import com.orbitz.consul.Consul;
import com.orbitz.consul.CoordinateClient;
-import org.apache.camel.InvokeOnHeader;
+import org.apache.camel.spi.InvokeOnHeader;
import org.apache.camel.Message;
import org.apache.camel.component.consul.ConsulConfiguration;
import org.apache.camel.component.consul.ConsulConstants;
diff --git
a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulEventProducer.java
b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulEventProducer.java
index 423cedb..8201428 100644
---
a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulEventProducer.java
+++
b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulEventProducer.java
@@ -20,11 +20,11 @@ import com.orbitz.consul.Consul;
import com.orbitz.consul.EventClient;
import com.orbitz.consul.option.EventOptions;
import com.orbitz.consul.option.QueryOptions;
-import org.apache.camel.InvokeOnHeader;
import org.apache.camel.Message;
import org.apache.camel.component.consul.ConsulConfiguration;
import org.apache.camel.component.consul.ConsulConstants;
import org.apache.camel.component.consul.ConsulEndpoint;
+import org.apache.camel.spi.InvokeOnHeader;
public final class ConsulEventProducer extends
AbstractConsulProducer<EventClient> {
diff --git
a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulHealthProducer.java
b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulHealthProducer.java
index 5114933..dcc5ea3 100644
---
a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulHealthProducer.java
+++
b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulHealthProducer.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.consul.endpoint;
import com.orbitz.consul.Consul;
import com.orbitz.consul.HealthClient;
import com.orbitz.consul.model.State;
-import org.apache.camel.InvokeOnHeader;
+import org.apache.camel.spi.InvokeOnHeader;
import org.apache.camel.Message;
import org.apache.camel.component.consul.ConsulConfiguration;
import org.apache.camel.component.consul.ConsulConstants;
diff --git
a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulKeyValueProducer.java
b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulKeyValueProducer.java
index b23f014..7a3ef49 100644
---
a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulKeyValueProducer.java
+++
b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulKeyValueProducer.java
@@ -20,11 +20,11 @@ import com.orbitz.consul.Consul;
import com.orbitz.consul.KeyValueClient;
import com.orbitz.consul.option.PutOptions;
import com.orbitz.consul.option.QueryOptions;
-import org.apache.camel.InvokeOnHeader;
import org.apache.camel.Message;
import org.apache.camel.component.consul.ConsulConfiguration;
import org.apache.camel.component.consul.ConsulConstants;
import org.apache.camel.component.consul.ConsulEndpoint;
+import org.apache.camel.spi.InvokeOnHeader;
public final class ConsulKeyValueProducer extends
AbstractConsulProducer<KeyValueClient> {
diff --git
a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulPreparedQueryProducer.java
b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulPreparedQueryProducer.java
index 4d8e4f5..93b38e8 100644
---
a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulPreparedQueryProducer.java
+++
b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulPreparedQueryProducer.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.consul.endpoint;
import com.orbitz.consul.Consul;
import com.orbitz.consul.PreparedQueryClient;
import com.orbitz.consul.model.query.PreparedQuery;
-import org.apache.camel.InvokeOnHeader;
+import org.apache.camel.spi.InvokeOnHeader;
import org.apache.camel.Message;
import org.apache.camel.component.consul.ConsulConfiguration;
import org.apache.camel.component.consul.ConsulConstants;
diff --git
a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulSessionProducer.java
b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulSessionProducer.java
index fec5e9c..e2751c5 100644
---
a/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulSessionProducer.java
+++
b/components/camel-consul/src/main/java/org/apache/camel/component/consul/endpoint/ConsulSessionProducer.java
@@ -19,11 +19,11 @@ package org.apache.camel.component.consul.endpoint;
import com.orbitz.consul.Consul;
import com.orbitz.consul.SessionClient;
import com.orbitz.consul.model.session.Session;
-import org.apache.camel.InvokeOnHeader;
import org.apache.camel.Message;
import org.apache.camel.component.consul.ConsulConfiguration;
import org.apache.camel.component.consul.ConsulConstants;
import org.apache.camel.component.consul.ConsulEndpoint;
+import org.apache.camel.spi.InvokeOnHeader;
import org.apache.camel.util.ObjectHelper;
public final class ConsulSessionProducer extends
AbstractConsulProducer<SessionClient> {
diff --git
a/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaProducer.java
b/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaProducer.java
index 25fcdd0..30ded99 100644
---
a/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaProducer.java
+++
b/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaProducer.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.corda;
import java.io.InputStream;
import java.security.PublicKey;
+
import net.corda.core.contracts.ContractState;
import net.corda.core.crypto.SecureHash;
import net.corda.core.flows.FlowLogic;
@@ -29,8 +30,8 @@ import net.corda.core.node.services.vault.AttachmentSort;
import net.corda.core.node.services.vault.PageSpecification;
import net.corda.core.node.services.vault.QueryCriteria;
import net.corda.core.node.services.vault.Sort;
-import org.apache.camel.InvokeOnHeader;
import org.apache.camel.Message;
+import org.apache.camel.spi.InvokeOnHeader;
import org.apache.camel.support.HeaderSelectorProducer;
import static org.apache.camel.component.corda.CordaConstants.ARGUMENTS;
diff --git
a/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/EhcacheProducer.java
b/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/EhcacheProducer.java
index d9c2e8b..0f8cea4 100644
---
a/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/EhcacheProducer.java
+++
b/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/EhcacheProducer.java
@@ -21,8 +21,8 @@ import java.util.Map;
import java.util.Set;
import org.apache.camel.CamelExchangeException;
-import org.apache.camel.InvokeOnHeader;
import org.apache.camel.Message;
+import org.apache.camel.spi.InvokeOnHeader;
import org.apache.camel.support.HeaderSelectorProducer;
import org.ehcache.Cache;
diff --git
a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanProducer.java
b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanProducer.java
index 2f36550..60009c0 100644
---
a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanProducer.java
+++
b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanProducer.java
@@ -20,9 +20,9 @@ import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
-import org.apache.camel.InvokeOnHeader;
import org.apache.camel.Message;
import org.apache.camel.component.infinispan.remote.InfinispanRemoteOperation;
+import org.apache.camel.spi.InvokeOnHeader;
import org.apache.camel.support.HeaderSelectorProducer;
import org.apache.camel.util.ObjectHelper;
import org.infinispan.commons.api.BasicCache;
diff --git
a/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jProducer.java
b/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jProducer.java
index 95cde73..6e589c2 100644
---
a/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jProducer.java
+++
b/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jProducer.java
@@ -21,16 +21,17 @@ import java.math.BigInteger;
import java.util.List;
import org.apache.camel.CamelExchangeException;
-import org.apache.camel.InvokeOnHeader;
import org.apache.camel.Message;
+import org.apache.camel.spi.InvokeOnHeader;
import org.apache.camel.support.HeaderSelectorProducer;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
import org.web3j.protocol.Web3j;
import org.web3j.protocol.core.DefaultBlockParameter;
import org.web3j.protocol.core.Request;
import org.web3j.protocol.core.Response;
-
import org.web3j.protocol.core.methods.response.DbGetHex;
import org.web3j.protocol.core.methods.response.DbGetString;
import org.web3j.protocol.core.methods.response.DbPutHex;
@@ -93,10 +94,6 @@ import org.web3j.quorum.methods.response.QuorumNodeInfo;
import org.web3j.quorum.methods.response.Vote;
import org.web3j.quorum.methods.response.Voter;
-/**
- * The web3j producer.
- */
-
public class Web3jProducer extends HeaderSelectorProducer {
private static final Logger LOG =
LoggerFactory.getLogger(Web3jProducer.class);
private Web3j web3j;
diff --git a/core/camel-api/src/main/java/org/apache/camel/InvokeOnHeader.java
b/core/camel-api/src/main/java/org/apache/camel/spi/InvokeOnHeader.java
similarity index 86%
rename from core/camel-api/src/main/java/org/apache/camel/InvokeOnHeader.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/InvokeOnHeader.java
index 856ac2a..f444485 100644
--- a/core/camel-api/src/main/java/org/apache/camel/InvokeOnHeader.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/InvokeOnHeader.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel;
+package org.apache.camel.spi;
import java.lang.annotation.ElementType;
import java.lang.annotation.Repeatable;
@@ -22,8 +22,12 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import org.apache.camel.Message;
+
/**
* Marks a method as being invoked for a specific header value.
+ * <p/>
+ * This can be used by Component implementations that uses
org.apache.camel.support.HeaderSelectorProducer.
*
* @see Message#getHeader(String)
*/
@@ -32,10 +36,8 @@ import java.lang.annotation.Target;
@Target(ElementType.METHOD)
public @interface InvokeOnHeader {
- // TODO: Move to spi as its more for component developers
-
/**
- * Name of header
+ * Name of header.
*/
String value();
}
\ No newline at end of file
diff --git a/core/camel-api/src/main/java/org/apache/camel/InvokeOnHeaders.java
b/core/camel-api/src/main/java/org/apache/camel/spi/InvokeOnHeaders.java
similarity index 85%
rename from core/camel-api/src/main/java/org/apache/camel/InvokeOnHeaders.java
rename to core/camel-api/src/main/java/org/apache/camel/spi/InvokeOnHeaders.java
index e73439c..f6edfc3 100644
--- a/core/camel-api/src/main/java/org/apache/camel/InvokeOnHeaders.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/InvokeOnHeaders.java
@@ -14,15 +14,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel;
+package org.apache.camel.spi;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import org.apache.camel.Message;
+
/**
* Marks a method as being invoked for a specific header value.
+ * <p/>
+ * This can be used by Component implementations that uses
org.apache.camel.support.HeaderSelectorProducer.
*
* @see Message#getHeader(String)
*/
@@ -30,10 +34,8 @@ import java.lang.annotation.Target;
@Target(ElementType.METHOD)
public @interface InvokeOnHeaders {
- // TODO: Move to spi as its more for component developers
-
/**
- * Name of headers
+ * Name of headers.
*/
InvokeOnHeader[] value();
}
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/HeaderSelectorProducer.java
b/core/camel-support/src/main/java/org/apache/camel/support/HeaderSelectorProducer.java
index 6909d81..db1c7ce 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/HeaderSelectorProducer.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/HeaderSelectorProducer.java
@@ -25,8 +25,8 @@ import java.util.function.Supplier;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
-import org.apache.camel.InvokeOnHeader;
-import org.apache.camel.InvokeOnHeaders;
+import org.apache.camel.spi.InvokeOnHeader;
+import org.apache.camel.spi.InvokeOnHeaders;
import org.apache.camel.Message;
import org.apache.camel.NoSuchHeaderException;
import org.apache.camel.Processor;
