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 6315747ef646df8fc470d549e36a498c00bb0d1b
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Oct 22 06:59:44 2020 +0200
CAMEL-15732: Move transformer and validator key to impl.engine package
where they belong better as that is where the endpoint key is also.
---
.../transformer/SpringTransformerRouteTest.java | 2 +-
.../impl/validator/SpringValidatorRouteTest.java | 2 +-
.../transformer/SpringTransformerRouteTest.xml | 30 +++++++++++-----------
.../impl/validator/SpringValidatorRouteTest.xml | 8 +++---
.../camel/impl/engine/AbstractCamelContext.java | 2 --
.../impl/engine/DefaultTransformerRegistry.java | 1 -
.../impl/engine/DefaultValidatorRegistry.java | 1 -
.../camel/impl/engine/SimpleCamelContext.java | 2 --
.../engine}/TransformerKey.java | 4 +--
.../validator => impl/engine}/ValidatorKey.java | 4 +--
.../org/apache/camel/impl/DefaultCamelContext.java | 4 +--
.../core/xml/AbstractCamelContextFactoryBean.java | 4 +--
.../ROOT/pages/camel-3x-upgrade-guide-3_7.adoc | 10 ++++++++
13 files changed, 37 insertions(+), 37 deletions(-)
diff --git
a/components/camel-spring/src/test/java/org/apache/camel/spring/impl/transformer/SpringTransformerRouteTest.java
b/components/camel-spring/src/test/java/org/apache/camel/spring/impl/transformer/SpringTransformerRouteTest.java
index 640493d..0d713d5 100644
---
a/components/camel-spring/src/test/java/org/apache/camel/spring/impl/transformer/SpringTransformerRouteTest.java
+++
b/components/camel-spring/src/test/java/org/apache/camel/spring/impl/transformer/SpringTransformerRouteTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.spring.impl.transformer;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.impl.transformer.TransformerRouteTest;
+import org.apache.camel.processor.transformer.TransformerRouteTest;
import static
org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git
a/components/camel-spring/src/test/java/org/apache/camel/spring/impl/validator/SpringValidatorRouteTest.java
b/components/camel-spring/src/test/java/org/apache/camel/spring/impl/validator/SpringValidatorRouteTest.java
index 2591fa1..2d3339e 100644
---
a/components/camel-spring/src/test/java/org/apache/camel/spring/impl/validator/SpringValidatorRouteTest.java
+++
b/components/camel-spring/src/test/java/org/apache/camel/spring/impl/validator/SpringValidatorRouteTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.spring.impl.validator;
import org.apache.camel.CamelContext;
-import org.apache.camel.impl.validator.ValidatorRouteTest;
+import org.apache.camel.component.validator.ValidatorRouteTest;
import static
org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
diff --git
a/components/camel-spring/src/test/resources/org/apache/camel/spring/impl/transformer/SpringTransformerRouteTest.xml
b/components/camel-spring/src/test/resources/org/apache/camel/spring/impl/transformer/SpringTransformerRouteTest.xml
index da24cc5..268dbf0 100644
---
a/components/camel-spring/src/test/resources/org/apache/camel/spring/impl/transformer/SpringTransformerRouteTest.xml
+++
b/components/camel-spring/src/test/resources/org/apache/camel/spring/impl/transformer/SpringTransformerRouteTest.xml
@@ -24,11 +24,11 @@
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <bean id="myTypeConverters"
class="org.apache.camel.impl.transformer.TransformerRouteTest$MyTypeConverters"/>
- <bean id="myJsonDataFormatDef"
class="org.apache.camel.impl.transformer.TransformerRouteTest$MyJsonDataFormatDefinition"/>
- <bean id="myXmlProcessor"
class="org.apache.camel.spring.impl.transformer.SpringTransformerRouteTest$MyXmlProcessor"/>
- <bean id="otherToXOrder"
class="org.apache.camel.impl.transformer.TransformerRouteTest$OtherToXOrderTransformer"/>
- <bean id="xOrderResponseToOther"
class="org.apache.camel.impl.transformer.TransformerRouteTest$XOrderResponseToOtherTransformer"/>
+ <bean id="myTypeConverters"
class="org.apache.camel.processor.transformer.TransformerRouteTest$MyTypeConverters"/>
+ <bean id="myJsonDataFormatDef"
class="org.apache.camel.processor.transformer.TransformerRouteTest$MyJsonDataFormatDefinition"/>
+ <bean id="myXmlProcessor"
class="org.apache.camel.spring.processor.transformer.SpringTransformerRouteTest$MyXmlProcessor"/>
+ <bean id="otherToXOrder"
class="org.apache.camel.processor.transformer.TransformerRouteTest$OtherToXOrderTransformer"/>
+ <bean id="xOrderResponseToOther"
class="org.apache.camel.processor.transformer.TransformerRouteTest$XOrderResponseToOtherTransformer"/>
<camelContext xmlns="http://camel.apache.org/schema/spring";>
@@ -38,18 +38,18 @@
<dataFormatTransformer scheme="json">
<custom ref="myJsonDataFormatDef"/>
</dataFormatTransformer>
- <endpointTransformer ref="myXmlEndpoint" fromType="xml:XmlXOrder"
toType="java:org.apache.camel.impl.transformer.TransformerRouteTest$XOrder"/>
- <endpointTransformer ref="myXmlEndpoint"
fromType="java:org.apache.camel.impl.transformer.TransformerRouteTest$XOrderResponse"
toType="xml:XmlXOrderResponse"/>
- <customTransformer ref="otherToXOrder"
fromType="other:OtherXOrder"
toType="java:org.apache.camel.impl.transformer.TransformerRouteTest$XOrder"/>
- <customTransformer ref="xOrderResponseToOther"
fromType="java:org.apache.camel.impl.transformer.TransformerRouteTest$XOrderResponse"
toType="other:OtherXOrderResponse"/>
+ <endpointTransformer ref="myXmlEndpoint" fromType="xml:XmlXOrder"
toType="java:org.apache.camel.processor.transformer.TransformerRouteTest$XOrder"/>
+ <endpointTransformer ref="myXmlEndpoint"
fromType="java:org.apache.camel.processor.transformer.TransformerRouteTest$XOrderResponse"
toType="xml:XmlXOrderResponse"/>
+ <customTransformer ref="otherToXOrder"
fromType="other:OtherXOrder"
toType="java:org.apache.camel.processor.transformer.TransformerRouteTest$XOrder"/>
+ <customTransformer ref="xOrderResponseToOther"
fromType="java:org.apache.camel.processor.transformer.TransformerRouteTest$XOrderResponse"
toType="other:OtherXOrderResponse"/>
</transformers>
<route>
<from uri="direct:abc"/>
- <inputType
urn="java:org.apache.camel.impl.transformer.TransformerRouteTest$AOrder"/>
- <outputType
urn="java:org.apache.camel.impl.transformer.TransformerRouteTest$AOrderResponse"/>
+ <inputType
urn="java:org.apache.camel.processor.transformer.TransformerRouteTest$AOrder"/>
+ <outputType
urn="java:org.apache.camel.processor.transformer.TransformerRouteTest$AOrderResponse"/>
<when>
- <simple>${body} not is
'org.apache.camel.impl.transformer.TransformerRouteTest\\$AOrder'</simple>
+ <simple>${body} not is
'org.apache.camel.processor.transformer.TransformerRouteTest\\$AOrder'</simple>
<throwException exceptionType="java.lang.Exception"
message="expected AOrder object but was '${body}'"/>
</when>
<inOut uri="direct:xyz"/>
@@ -58,10 +58,10 @@
<route>
<from uri="direct:xyz"/>
- <inputType
urn="java:org.apache.camel.impl.transformer.TransformerRouteTest$XOrder"/>
- <outputType
urn="java:org.apache.camel.impl.transformer.TransformerRouteTest$XOrderResponse"/>
+ <inputType
urn="java:org.apache.camel.processor.transformer.TransformerRouteTest$XOrder"/>
+ <outputType
urn="java:org.apache.camel.processor.transformer.TransformerRouteTest$XOrderResponse"/>
<when>
- <simple>${body} not is
'org.apache.camel.impl.transformer.TransformerRouteTest\\$XOrder'</simple>
+ <simple>${body} not is
'org.apache.camel.processor.transformer.TransformerRouteTest\\$XOrder'</simple>
<throwException exceptionType="java.lang.Exception"
message="expected XOrder object but was '${body}'"/>
</when>
<setBody><constant>response</constant></setBody>
diff --git
a/components/camel-spring/src/test/resources/org/apache/camel/spring/impl/validator/SpringValidatorRouteTest.xml
b/components/camel-spring/src/test/resources/org/apache/camel/spring/impl/validator/SpringValidatorRouteTest.xml
index e5b10e9..d0802f7 100644
---
a/components/camel-spring/src/test/resources/org/apache/camel/spring/impl/validator/SpringValidatorRouteTest.xml
+++
b/components/camel-spring/src/test/resources/org/apache/camel/spring/impl/validator/SpringValidatorRouteTest.xml
@@ -24,15 +24,15 @@
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
">
- <bean id="myxml"
class="org.apache.camel.impl.validator.ValidatorRouteTest.MyXmlComponent"/>
+ <bean id="myxml"
class="org.apache.camel.processor.validator.ValidatorRouteTest.MyXmlComponent"/>
<camelContext xmlns="http://camel.apache.org/schema/spring";>
<validators>
<predicateValidator type="json"><simple>${body} contains
'{name:XOrder'</simple></predicateValidator>
<endpointValidator type="xml:XmlXOrderResponse"
uri="myxml:endpoint"/>
- <customValidator type="other:OtherXOrder"
className="org.apache.camel.impl.validator.ValidatorRouteTest$OtherXOrderValidator"/>
- <customValidator type="other:OtherXOrderResponse"
className="org.apache.camel.impl.validator.ValidatorRouteTest$OtherXOrderResponseValidator"/>
+ <customValidator type="other:OtherXOrder"
className="org.apache.camel.processor.validator.ValidatorRouteTest$OtherXOrderValidator"/>
+ <customValidator type="other:OtherXOrderResponse"
className="org.apache.camel.processor.validator.ValidatorRouteTest$OtherXOrderResponseValidator"/>
</validators>
<route>
@@ -57,7 +57,7 @@
<inputType urn="other:OtherXOrder" validate="true"/>
<outputType urn="other:OtherXOrderResponse" validate="true"/>
<validate>
- <simple>${exchangeProperty.validator-invoked} ==
'org.apache.camel.impl.validator.ValidatorRouteTest$OtherXOrderValidator'</simple>
+ <simple>${exchangeProperty.validator-invoked} ==
'org.apache.camel.processor.validator.ValidatorRouteTest$OtherXOrderValidator'</simple>
</validate>
<setBody><constant>name=XOrderResponse</constant></setBody>
</route>
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 bcd170c..42350c0 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,6 @@ 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.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 670cccf..66fa63c 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,6 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.camel.CamelContext;
-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 85d0e93..792b40b 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,6 @@
package org.apache.camel.impl.engine;
import org.apache.camel.CamelContext;
-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 d4cf18e..608193a 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
@@ -30,8 +30,6 @@ import org.apache.camel.catalog.RuntimeCamelCatalog;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.impl.converter.DefaultTypeConverter;
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/processor/transformer/TransformerKey.java
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/TransformerKey.java
similarity index 95%
rename from
core/camel-base/src/main/java/org/apache/camel/processor/transformer/TransformerKey.java
rename to
core/camel-base/src/main/java/org/apache/camel/impl/engine/TransformerKey.java
index d651176..8ce756b 100644
---
a/core/camel-base/src/main/java/org/apache/camel/processor/transformer/TransformerKey.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/TransformerKey.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.processor.transformer;
+package org.apache.camel.impl.engine;
import org.apache.camel.ValueHolder;
import org.apache.camel.spi.DataType;
@@ -26,8 +26,6 @@ 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/processor/validator/ValidatorKey.java
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/ValidatorKey.java
similarity index 93%
rename from
core/camel-base/src/main/java/org/apache/camel/processor/validator/ValidatorKey.java
rename to
core/camel-base/src/main/java/org/apache/camel/impl/engine/ValidatorKey.java
index 6a4f123..1c8a111 100644
---
a/core/camel-base/src/main/java/org/apache/camel/processor/validator/ValidatorKey.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/ValidatorKey.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.processor.validator;
+package org.apache.camel.impl.engine;
import org.apache.camel.CamelContext;
import org.apache.camel.ValueHolder;
@@ -25,8 +25,6 @@ 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-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 ec5d612..780f6c2 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,6 +32,8 @@ 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.engine.TransformerKey;
+import org.apache.camel.impl.engine.ValidatorKey;
import org.apache.camel.model.DataFormatDefinition;
import org.apache.camel.model.FaultToleranceConfigurationDefinition;
import org.apache.camel.model.HystrixConfigurationDefinition;
@@ -48,8 +50,6 @@ 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-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 c43991f..70fb816 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,6 +51,8 @@ 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.engine.TransformerKey;
+import org.apache.camel.impl.engine.ValidatorKey;
import org.apache.camel.model.ContextScanDefinition;
import org.apache.camel.model.FaultToleranceConfigurationDefinition;
import org.apache.camel.model.FromDefinition;
@@ -86,8 +88,6 @@ 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/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_7.adoc
b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_7.adoc
index 66ad0af..d984e2e 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_7.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_7.adoc
@@ -6,6 +6,16 @@ from both 3.0 to 3.1 and 3.1 to 3.2.
== Upgrading Camel 3.6 to 3.7
+=== API changes
+
+These internal classes has been moved to locations that better suit where
other similar processors are located.
+
+The class `org.apache.camel.impl.validator.ProcessorValidator` moved to
`org.apache.camel.processor.validator.ProcessorValidator`.
+The class `org.apache.camel.impl.transformer.ProcessorTransformer` moved to
`org.apache.camel.processor.transformer.ProcessorTransformer`.
+The class `org.apache.camel.impl.transformer.DataFormatTransformer` moved to
`org.apache.camel.processor.transformer.DataFormatTransformer`.
+The class `org.apache.camel.impl.validator.ValidatorKey` moved to
`org.apache.camel.impl.engine.ValidatorKey`.
+The class `org.apache.camel.impl.transformer.TransformerKey` moved to
`org.apache.camel.impl.engine.TransformerKey`.
+
=== Camel-Couchbase
The original URI path has been changed, now the bucket part is simply a
required option and it's not part of the URI anymore.
