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
commit 15d0a2bb9a70a3c008ed04eccc4fdcea959eba85
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Oct 21 21:51:42 2020 +0200
CAMEL-15732: Untangle reifier and move transformer and validator processors
to processor package instead of impl so they are where all the other processors
are.
---
.../main/java/org/apache/camel/impl/engine/AbstractCamelContext.java | 4 ++--
.../java/org/apache/camel/impl/engine/DefaultTransformerRegistry.java | 2 +-
.../java/org/apache/camel/impl/engine/DefaultValidatorRegistry.java | 2 +-
.../main/java/org/apache/camel/impl/engine/SimpleCamelContext.java | 4 ++--
.../camel/{impl => processor}/transformer/DataFormatTransformer.java | 2 +-
.../camel/{impl => processor}/transformer/ProcessorTransformer.java | 2 +-
.../apache/camel/{impl => processor}/transformer/TransformerKey.java | 4 +++-
.../org/apache/camel/{impl => processor}/transformer/package.html | 0
.../camel/{impl => processor}/validator/ProcessorValidator.java | 2 +-
.../org/apache/camel/{impl => processor}/validator/ValidatorKey.java | 4 +++-
.../java/org/apache/camel/{impl => processor}/validator/package.html | 0
.../src/main/java/org/apache/camel/impl/DefaultCamelContext.java | 4 ++--
.../camel/model/transformer/DataFormatTransformerDefinition.java | 2 +-
.../apache/camel/model/transformer/EndpointTransformerDefinition.java | 2 +-
.../org/apache/camel/model/validator/EndpointValidatorDefinition.java | 2 +-
.../apache/camel/model/validator/PredicateValidatorDefinition.java | 2 +-
.../camel/reifier/transformer/DataFormatTransformerReifier.java | 2 +-
.../apache/camel/reifier/transformer/EndpointTransformeReifier.java | 2 +-
.../org/apache/camel/reifier/validator/EndpointValidatorReifier.java | 2 +-
.../org/apache/camel/reifier/validator/PredicateValidatorReifier.java | 2 +-
.../org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java | 4 ++--
.../test/java/org/apache/camel/builder/TransformerBuilderTest.java | 2 +-
.../{impl => processor}/transformer/TransformerContractTest.java | 2 +-
.../camel/{impl => processor}/transformer/TransformerRouteTest.java | 2 +-
.../{impl => processor}/validator/BeanValidatorInputValidateTest.java | 2 +-
.../validator/BeanValidatorOutputValidateTest.java | 2 +-
.../validator/InflightRepositoryWithFailedValidationTest.java | 2 +-
.../camel/{impl => processor}/validator/ValidatorContractTest.java | 2 +-
.../camel/{impl => processor}/validator/ValidatorRouteTest.java | 2 +-
.../camel/{impl => processor}/validator/ValidatorXmlSchemaTest.java | 2 +-
30 files changed, 36 insertions(+), 32 deletions(-)
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index 3a4352b..bcd170c 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -73,8 +73,8 @@ import org.apache.camel.TypeConverter;
import org.apache.camel.VetoCamelContextStartException;
import org.apache.camel.catalog.RuntimeCamelCatalog;
import org.apache.camel.health.HealthCheckRegistry;
-import org.apache.camel.impl.transformer.TransformerKey;
-import org.apache.camel.impl.validator.ValidatorKey;
+import org.apache.camel.processor.transformer.TransformerKey;
+import org.apache.camel.processor.validator.ValidatorKey;
import org.apache.camel.spi.AnnotationBasedProcessorFactory;
import org.apache.camel.spi.AnnotationScanTypeConverters;
import org.apache.camel.spi.AsyncProcessorAwaitManager;
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultTransformerRegistry.java
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultTransformerRegistry.java
index fb3b77b..670cccf 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultTransformerRegistry.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultTransformerRegistry.java
@@ -20,7 +20,7 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.camel.CamelContext;
-import org.apache.camel.impl.transformer.TransformerKey;
+import org.apache.camel.processor.transformer.TransformerKey;
import org.apache.camel.spi.DataType;
import org.apache.camel.spi.Transformer;
import org.apache.camel.spi.TransformerRegistry;
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultValidatorRegistry.java
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultValidatorRegistry.java
index 01181b9..85d0e93 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultValidatorRegistry.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultValidatorRegistry.java
@@ -17,7 +17,7 @@
package org.apache.camel.impl.engine;
import org.apache.camel.CamelContext;
-import org.apache.camel.impl.validator.ValidatorKey;
+import org.apache.camel.processor.validator.ValidatorKey;
import org.apache.camel.spi.DataType;
import org.apache.camel.spi.Validator;
import org.apache.camel.spi.ValidatorRegistry;
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
index f1770bd..d4cf18e 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
@@ -29,9 +29,9 @@ import org.apache.camel.TypeConverter;
import org.apache.camel.catalog.RuntimeCamelCatalog;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.impl.converter.DefaultTypeConverter;
-import org.apache.camel.impl.transformer.TransformerKey;
-import org.apache.camel.impl.validator.ValidatorKey;
import org.apache.camel.processor.MulticastProcessor;
+import org.apache.camel.processor.transformer.TransformerKey;
+import org.apache.camel.processor.validator.ValidatorKey;
import org.apache.camel.spi.AsyncProcessorAwaitManager;
import org.apache.camel.spi.BeanIntrospection;
import org.apache.camel.spi.BeanProcessorFactory;
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/transformer/DataFormatTransformer.java
b/core/camel-base/src/main/java/org/apache/camel/processor/transformer/DataFormatTransformer.java
similarity index 99%
rename from
core/camel-base/src/main/java/org/apache/camel/impl/transformer/DataFormatTransformer.java
rename to
core/camel-base/src/main/java/org/apache/camel/processor/transformer/DataFormatTransformer.java
index efd8b3c..60f1bc7 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/transformer/DataFormatTransformer.java
+++
b/core/camel-base/src/main/java/org/apache/camel/processor/transformer/DataFormatTransformer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl.transformer;
+package org.apache.camel.processor.transformer;
import java.io.InputStream;
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/transformer/ProcessorTransformer.java
b/core/camel-base/src/main/java/org/apache/camel/processor/transformer/ProcessorTransformer.java
similarity index 98%
rename from
core/camel-base/src/main/java/org/apache/camel/impl/transformer/ProcessorTransformer.java
rename to
core/camel-base/src/main/java/org/apache/camel/processor/transformer/ProcessorTransformer.java
index 498457c..1301ece 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/transformer/ProcessorTransformer.java
+++
b/core/camel-base/src/main/java/org/apache/camel/processor/transformer/ProcessorTransformer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl.transformer;
+package org.apache.camel.processor.transformer;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/transformer/TransformerKey.java
b/core/camel-base/src/main/java/org/apache/camel/processor/transformer/TransformerKey.java
similarity index 95%
rename from
core/camel-base/src/main/java/org/apache/camel/impl/transformer/TransformerKey.java
rename to
core/camel-base/src/main/java/org/apache/camel/processor/transformer/TransformerKey.java
index 0c22d77..d651176 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/transformer/TransformerKey.java
+++
b/core/camel-base/src/main/java/org/apache/camel/processor/transformer/TransformerKey.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl.transformer;
+package org.apache.camel.processor.transformer;
import org.apache.camel.ValueHolder;
import org.apache.camel.spi.DataType;
@@ -26,6 +26,8 @@ import org.apache.camel.util.StringHelper;
*/
public final class TransformerKey extends ValueHolder<String> {
+ // TODO: Move to org.apache.camel.impl.engine
+
private String scheme;
private DataType from;
private DataType to;
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/transformer/package.html
b/core/camel-base/src/main/java/org/apache/camel/processor/transformer/package.html
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/impl/transformer/package.html
rename to
core/camel-base/src/main/java/org/apache/camel/processor/transformer/package.html
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/validator/ProcessorValidator.java
b/core/camel-base/src/main/java/org/apache/camel/processor/validator/ProcessorValidator.java
similarity index 98%
rename from
core/camel-base/src/main/java/org/apache/camel/impl/validator/ProcessorValidator.java
rename to
core/camel-base/src/main/java/org/apache/camel/processor/validator/ProcessorValidator.java
index 43a91a4..3ef00bf 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/validator/ProcessorValidator.java
+++
b/core/camel-base/src/main/java/org/apache/camel/processor/validator/ProcessorValidator.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl.validator;
+package org.apache.camel.processor.validator;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/validator/ValidatorKey.java
b/core/camel-base/src/main/java/org/apache/camel/processor/validator/ValidatorKey.java
similarity index 93%
rename from
core/camel-base/src/main/java/org/apache/camel/impl/validator/ValidatorKey.java
rename to
core/camel-base/src/main/java/org/apache/camel/processor/validator/ValidatorKey.java
index f46d042..6a4f123 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/validator/ValidatorKey.java
+++
b/core/camel-base/src/main/java/org/apache/camel/processor/validator/ValidatorKey.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl.validator;
+package org.apache.camel.processor.validator;
import org.apache.camel.CamelContext;
import org.apache.camel.ValueHolder;
@@ -25,6 +25,8 @@ import org.apache.camel.spi.DataType;
*/
public final class ValidatorKey extends ValueHolder<String> {
+ // TODO: Move to org.apache.camel.impl.engine
+
private DataType type;
public ValidatorKey(DataType type) {
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/validator/package.html
b/core/camel-base/src/main/java/org/apache/camel/processor/validator/package.html
similarity index 100%
rename from
core/camel-base/src/main/java/org/apache/camel/impl/validator/package.html
rename to
core/camel-base/src/main/java/org/apache/camel/processor/validator/package.html
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 b6d16d9..ec5d612 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
@@ -32,8 +32,6 @@ import org.apache.camel.ValueHolder;
import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.impl.engine.RouteService;
import org.apache.camel.impl.engine.SimpleCamelContext;
-import org.apache.camel.impl.transformer.TransformerKey;
-import org.apache.camel.impl.validator.ValidatorKey;
import org.apache.camel.model.DataFormatDefinition;
import org.apache.camel.model.FaultToleranceConfigurationDefinition;
import org.apache.camel.model.HystrixConfigurationDefinition;
@@ -50,6 +48,8 @@ import org.apache.camel.model.language.ExpressionDefinition;
import org.apache.camel.model.rest.RestDefinition;
import org.apache.camel.model.transformer.TransformerDefinition;
import org.apache.camel.model.validator.ValidatorDefinition;
+import org.apache.camel.processor.transformer.TransformerKey;
+import org.apache.camel.processor.validator.ValidatorKey;
import org.apache.camel.reifier.RouteReifier;
import org.apache.camel.reifier.dataformat.DataFormatReifier;
import org.apache.camel.reifier.errorhandler.ErrorHandlerReifier;
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
b/core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
index c817406..dd233d2 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
@@ -68,7 +68,7 @@ import org.apache.camel.model.dataformat.ZipFileDataFormat;
import org.apache.camel.spi.Metadata;
/**
- * Represents a {@link
org.apache.camel.impl.transformer.DataFormatTransformer} which leverages
+ * Represents a {@link
org.apache.camel.processor.transformer.DataFormatTransformer} which leverages
* {@link org.apache.camel.spi.DataFormat} to perform transformation. One of
the DataFormat 'ref' or DataFormat 'type'
* needs to be specified.
*/
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java
b/core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java
index 07aa041..11a8e1c 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java
@@ -26,7 +26,7 @@ import org.apache.camel.spi.Metadata;
/**
* Represents an endpoint {@link org.apache.camel.spi.Transformer} which
leverages camel
* {@link org.apache.camel.Endpoint} to perform transformation. A
- * {@link org.apache.camel.impl.transformer.ProcessorTransformer} will be
created internally with a
+ * {@link org.apache.camel.processor.transformer.ProcessorTransformer} will be
created internally with a
* {@link org.apache.camel.processor.SendProcessor} which forwards the message
to the specified Endpoint. One of the
* Endpoint 'ref' or 'uri' needs to be specified. {@see TransformerDefinition}
{@see ProcessorTransformer}
*/
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/model/validator/EndpointValidatorDefinition.java
b/core/camel-core-engine/src/main/java/org/apache/camel/model/validator/EndpointValidatorDefinition.java
index b9c3e29..02acfb8 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/model/validator/EndpointValidatorDefinition.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/model/validator/EndpointValidatorDefinition.java
@@ -28,7 +28,7 @@ import org.apache.camel.spi.Validator;
* Represents an endpoint {@link Validator} which leverages camel validator
component such as
* <a href="http://camel.apache.org/validation.html";>Validator Component</a>
and
* <a href="http://camel.apache.org/bean-validation.html";>Bean Validator
Component</a> to perform content validation. A
- * {@link org.apache.camel.impl.validator.ProcessorValidator} will be created
internally with a
+ * {@link org.apache.camel.processor.validator.ProcessorValidator} will be
created internally with a
* {@link org.apache.camel.processor.SendProcessor} which forwards the message
to the validator Endpoint.
* {@see ValidatorDefinition} {@see Validator}
*/
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/model/validator/PredicateValidatorDefinition.java
b/core/camel-core-engine/src/main/java/org/apache/camel/model/validator/PredicateValidatorDefinition.java
index 217c9cc..4dc0e48 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/model/validator/PredicateValidatorDefinition.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/model/validator/PredicateValidatorDefinition.java
@@ -29,7 +29,7 @@ import org.apache.camel.spi.Validator;
/**
* Represents a predicate {@link Validator} which leverages expression or
predicates to perform content validation. A
- * {@link org.apache.camel.impl.validator.ProcessorValidator} will be created
internally with a
+ * {@link org.apache.camel.processor.validator.ProcessorValidator} will be
created internally with a
* {@link org.apache.camel.processor.validation.PredicateValidatingProcessor}
which validates the message according to
* specified expression/predicates. {@see ValidatorDefinition} {@see Validator}
*/
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/transformer/DataFormatTransformerReifier.java
b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/transformer/DataFormatTransformerReifier.java
index 9b46984..75e4017 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/transformer/DataFormatTransformerReifier.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/transformer/DataFormatTransformerReifier.java
@@ -17,9 +17,9 @@
package org.apache.camel.reifier.transformer;
import org.apache.camel.CamelContext;
-import org.apache.camel.impl.transformer.DataFormatTransformer;
import org.apache.camel.model.transformer.DataFormatTransformerDefinition;
import org.apache.camel.model.transformer.TransformerDefinition;
+import org.apache.camel.processor.transformer.DataFormatTransformer;
import org.apache.camel.reifier.dataformat.DataFormatReifier;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.Transformer;
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/transformer/EndpointTransformeReifier.java
b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/transformer/EndpointTransformeReifier.java
index d9ac1d1..bb593ee 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/transformer/EndpointTransformeReifier.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/transformer/EndpointTransformeReifier.java
@@ -19,10 +19,10 @@ package org.apache.camel.reifier.transformer;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.ExchangePattern;
-import org.apache.camel.impl.transformer.ProcessorTransformer;
import org.apache.camel.model.transformer.EndpointTransformerDefinition;
import org.apache.camel.model.transformer.TransformerDefinition;
import org.apache.camel.processor.SendProcessor;
+import org.apache.camel.processor.transformer.ProcessorTransformer;
import org.apache.camel.spi.Transformer;
public class EndpointTransformeReifier extends
TransformerReifier<EndpointTransformerDefinition> {
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/validator/EndpointValidatorReifier.java
b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/validator/EndpointValidatorReifier.java
index 1a00c0b..f4e4012 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/validator/EndpointValidatorReifier.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/validator/EndpointValidatorReifier.java
@@ -19,10 +19,10 @@ package org.apache.camel.reifier.validator;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.ExchangePattern;
-import org.apache.camel.impl.validator.ProcessorValidator;
import org.apache.camel.model.validator.EndpointValidatorDefinition;
import org.apache.camel.model.validator.ValidatorDefinition;
import org.apache.camel.processor.SendProcessor;
+import org.apache.camel.processor.validator.ProcessorValidator;
import org.apache.camel.spi.Validator;
public class EndpointValidatorReifier extends
ValidatorReifier<EndpointValidatorDefinition> {
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/validator/PredicateValidatorReifier.java
b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/validator/PredicateValidatorReifier.java
index ad693cf..2c04f03 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/validator/PredicateValidatorReifier.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/validator/PredicateValidatorReifier.java
@@ -18,9 +18,9 @@ package org.apache.camel.reifier.validator;
import org.apache.camel.CamelContext;
import org.apache.camel.Predicate;
-import org.apache.camel.impl.validator.ProcessorValidator;
import org.apache.camel.model.validator.PredicateValidatorDefinition;
import org.apache.camel.model.validator.ValidatorDefinition;
+import org.apache.camel.processor.validator.ProcessorValidator;
import org.apache.camel.spi.Validator;
import org.apache.camel.support.processor.PredicateValidatingProcessor;
diff --git
a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
index bf546a2..c43991f 100644
---
a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
+++
b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
@@ -51,8 +51,6 @@ import org.apache.camel.component.properties.PropertiesParser;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.engine.DefaultManagementStrategy;
-import org.apache.camel.impl.transformer.TransformerKey;
-import org.apache.camel.impl.validator.ValidatorKey;
import org.apache.camel.model.ContextScanDefinition;
import org.apache.camel.model.FaultToleranceConfigurationDefinition;
import org.apache.camel.model.FromDefinition;
@@ -88,6 +86,8 @@ import
org.apache.camel.model.transformer.TransformersDefinition;
import org.apache.camel.model.validator.ValidatorDefinition;
import org.apache.camel.model.validator.ValidatorsDefinition;
import org.apache.camel.processor.interceptor.BacklogTracer;
+import org.apache.camel.processor.transformer.TransformerKey;
+import org.apache.camel.processor.validator.ValidatorKey;
import org.apache.camel.reifier.transformer.TransformerReifier;
import org.apache.camel.reifier.validator.ValidatorReifier;
import org.apache.camel.spi.AsyncProcessorAwaitManager;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/builder/TransformerBuilderTest.java
b/core/camel-core/src/test/java/org/apache/camel/builder/TransformerBuilderTest.java
index 4eb8d07..38e34f1 100644
---
a/core/camel-core/src/test/java/org/apache/camel/builder/TransformerBuilderTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/builder/TransformerBuilderTest.java
@@ -22,8 +22,8 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Message;
import org.apache.camel.TestSupport;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.transformer.ProcessorTransformer;
import org.apache.camel.processor.SendProcessor;
+import org.apache.camel.processor.transformer.ProcessorTransformer;
import org.apache.camel.spi.DataType;
import org.apache.camel.spi.Transformer;
import org.junit.jupiter.api.Test;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/impl/transformer/TransformerContractTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/transformer/TransformerContractTest.java
similarity index 99%
rename from
core/camel-core/src/test/java/org/apache/camel/impl/transformer/TransformerContractTest.java
rename to
core/camel-core/src/test/java/org/apache/camel/processor/transformer/TransformerContractTest.java
index 15f52e0..adae740 100644
---
a/core/camel-core/src/test/java/org/apache/camel/impl/transformer/TransformerContractTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/transformer/TransformerContractTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl.transformer;
+package org.apache.camel.processor.transformer;
import java.io.BufferedReader;
import java.io.InputStream;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/impl/transformer/TransformerRouteTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/transformer/TransformerRouteTest.java
similarity index 99%
rename from
core/camel-core/src/test/java/org/apache/camel/impl/transformer/TransformerRouteTest.java
rename to
core/camel-core/src/test/java/org/apache/camel/processor/transformer/TransformerRouteTest.java
index 9a84bbd..dc4ac53 100644
---
a/core/camel-core/src/test/java/org/apache/camel/impl/transformer/TransformerRouteTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/transformer/TransformerRouteTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl.transformer;
+package org.apache.camel.processor.transformer;
import java.io.BufferedReader;
import java.io.InputStream;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/impl/validator/BeanValidatorInputValidateTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/validator/BeanValidatorInputValidateTest.java
similarity index 98%
rename from
core/camel-core/src/test/java/org/apache/camel/impl/validator/BeanValidatorInputValidateTest.java
rename to
core/camel-core/src/test/java/org/apache/camel/processor/validator/BeanValidatorInputValidateTest.java
index 22b7577..dae0040 100644
---
a/core/camel-core/src/test/java/org/apache/camel/impl/validator/BeanValidatorInputValidateTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/validator/BeanValidatorInputValidateTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl.validator;
+package org.apache.camel.processor.validator;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Message;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/impl/validator/BeanValidatorOutputValidateTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/validator/BeanValidatorOutputValidateTest.java
similarity index 98%
rename from
core/camel-core/src/test/java/org/apache/camel/impl/validator/BeanValidatorOutputValidateTest.java
rename to
core/camel-core/src/test/java/org/apache/camel/processor/validator/BeanValidatorOutputValidateTest.java
index e22e7fa..d548975 100644
---
a/core/camel-core/src/test/java/org/apache/camel/impl/validator/BeanValidatorOutputValidateTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/validator/BeanValidatorOutputValidateTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl.validator;
+package org.apache.camel.processor.validator;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.ContextTestSupport;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/impl/validator/InflightRepositoryWithFailedValidationTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/validator/InflightRepositoryWithFailedValidationTest.java
similarity index 97%
rename from
core/camel-core/src/test/java/org/apache/camel/impl/validator/InflightRepositoryWithFailedValidationTest.java
rename to
core/camel-core/src/test/java/org/apache/camel/processor/validator/InflightRepositoryWithFailedValidationTest.java
index 0b62345..a5f7c8a 100644
---
a/core/camel-core/src/test/java/org/apache/camel/impl/validator/InflightRepositoryWithFailedValidationTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/validator/InflightRepositoryWithFailedValidationTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl.validator;
+package org.apache.camel.processor.validator;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/impl/validator/ValidatorContractTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/validator/ValidatorContractTest.java
similarity index 98%
rename from
core/camel-core/src/test/java/org/apache/camel/impl/validator/ValidatorContractTest.java
rename to
core/camel-core/src/test/java/org/apache/camel/processor/validator/ValidatorContractTest.java
index 87968d4..15550ef 100644
---
a/core/camel-core/src/test/java/org/apache/camel/impl/validator/ValidatorContractTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/validator/ValidatorContractTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl.validator;
+package org.apache.camel.processor.validator;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Converter;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/impl/validator/ValidatorRouteTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/validator/ValidatorRouteTest.java
similarity index 99%
rename from
core/camel-core/src/test/java/org/apache/camel/impl/validator/ValidatorRouteTest.java
rename to
core/camel-core/src/test/java/org/apache/camel/processor/validator/ValidatorRouteTest.java
index 6864132..56a8af2 100644
---
a/core/camel-core/src/test/java/org/apache/camel/impl/validator/ValidatorRouteTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/validator/ValidatorRouteTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl.validator;
+package org.apache.camel.processor.validator;
import java.util.Map;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/impl/validator/ValidatorXmlSchemaTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/validator/ValidatorXmlSchemaTest.java
similarity index 98%
rename from
core/camel-core/src/test/java/org/apache/camel/impl/validator/ValidatorXmlSchemaTest.java
rename to
core/camel-core/src/test/java/org/apache/camel/processor/validator/ValidatorXmlSchemaTest.java
index 55b119b..b2ba16c 100644
---
a/core/camel-core/src/test/java/org/apache/camel/impl/validator/ValidatorXmlSchemaTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/validator/ValidatorXmlSchemaTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl.validator;
+package org.apache.camel.processor.validator;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.ContextTestSupport;
