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 aac68c8 CAMEL-14484: Move PredicateValidatingProcessor from
camel-jaxp to camel-support.
aac68c8 is described below
commit aac68c8af6f1cb2e772a4cdce0dc2f17886c75a1
Author: Claus Ibsen <[email protected]>
AuthorDate: Tue Feb 4 11:02:03 2020 +0100
CAMEL-14484: Move PredicateValidatingProcessor from camel-jaxp to
camel-support.
---
components/camel-validator/pom.xml | 2 +-
.../src/main/java/org/apache/camel/reifier/ValidateReifier.java | 6 ++++--
.../apache/camel/reifier/validator/PredicateValidatorReifier.java | 2 +-
.../test/java/org/apache/camel/processor/ValidateRegExpTest.java | 2 +-
.../test/java/org/apache/camel/processor/ValidateSimpleTest.java | 2 +-
.../apache/camel/management/DefaultManagementObjectStrategy.java | 2 +-
.../java/org/apache/camel/management/mbean/ManagedValidate.java | 2 +-
.../camel/support/processor}/PredicateValidatingProcessor.java | 2 +-
.../camel/support/processor}/PredicateValidationException.java | 2 +-
docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc | 5 +++++
10 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/components/camel-validator/pom.xml
b/components/camel-validator/pom.xml
index 46da8d0..03b677f 100644
--- a/components/camel-validator/pom.xml
+++ b/components/camel-validator/pom.xml
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-support</artifactId>
+ <artifactId>camel-core-engine</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ValidateReifier.java
b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ValidateReifier.java
index 2a5047d..8535032 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ValidateReifier.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/ValidateReifier.java
@@ -17,10 +17,11 @@
package org.apache.camel.reifier;
import org.apache.camel.Predicate;
+import org.apache.camel.Processor;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.ValidateDefinition;
import org.apache.camel.spi.RouteContext;
-import
org.apache.camel.support.processor.validation.PredicateValidatingProcessor;
+import org.apache.camel.support.processor.PredicateValidatingProcessor;
public class ValidateReifier extends ExpressionReifier<ValidateDefinition> {
@@ -29,8 +30,9 @@ public class ValidateReifier extends
ExpressionReifier<ValidateDefinition> {
}
@Override
- public PredicateValidatingProcessor createProcessor(RouteContext
routeContext) throws Exception {
+ public Processor createProcessor(RouteContext routeContext) throws
Exception {
Predicate pred =
definition.getExpression().createPredicate(routeContext);
return new PredicateValidatingProcessor(pred);
}
+
}
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 17c097b..494af80 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
@@ -22,7 +22,7 @@ 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.spi.Validator;
-import
org.apache.camel.support.processor.validation.PredicateValidatingProcessor;
+import org.apache.camel.support.processor.PredicateValidatingProcessor;
public class PredicateValidatorReifier extends
ValidatorReifier<PredicateValidatorDefinition> {
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/ValidateRegExpTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/ValidateRegExpTest.java
index d31630f..d14c97f 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/ValidateRegExpTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/ValidateRegExpTest.java
@@ -21,7 +21,7 @@ import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import
org.apache.camel.support.processor.validation.PredicateValidationException;
+import org.apache.camel.support.processor.PredicateValidationException;
import org.junit.Before;
import org.junit.Test;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/ValidateSimpleTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/ValidateSimpleTest.java
index dd121c0..b463006 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/ValidateSimpleTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/ValidateSimpleTest.java
@@ -21,7 +21,7 @@ import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import
org.apache.camel.support.processor.validation.PredicateValidationException;
+import org.apache.camel.support.processor.PredicateValidationException;
import org.junit.Before;
import org.junit.Test;
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 2449b3c..c4f29e3 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
@@ -163,7 +163,7 @@ import org.apache.camel.support.ScheduledPollConsumer;
import org.apache.camel.support.processor.MarshalProcessor;
import org.apache.camel.support.processor.ThroughputLogger;
import org.apache.camel.support.processor.UnmarshalProcessor;
-import
org.apache.camel.support.processor.validation.PredicateValidatingProcessor;
+import org.apache.camel.support.processor.PredicateValidatingProcessor;
/**
* Default {@link org.apache.camel.spi.ManagementObjectStrategy}.
diff --git
a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedValidate.java
b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedValidate.java
index fddb956..66478ed 100644
---
a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedValidate.java
+++
b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedValidate.java
@@ -20,7 +20,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.api.management.ManagedResource;
import org.apache.camel.api.management.mbean.ManagedValidateMBean;
import org.apache.camel.model.ValidateDefinition;
-import
org.apache.camel.support.processor.validation.PredicateValidatingProcessor;
+import org.apache.camel.support.processor.PredicateValidatingProcessor;
@ManagedResource(description = "Managed Validate")
public class ManagedValidate extends ManagedProcessor implements
ManagedValidateMBean {
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/support/processor/validation/PredicateValidatingProcessor.java
b/core/camel-support/src/main/java/org/apache/camel/support/processor/PredicateValidatingProcessor.java
similarity index 97%
rename from
core/camel-jaxp/src/main/java/org/apache/camel/support/processor/validation/PredicateValidatingProcessor.java
rename to
core/camel-support/src/main/java/org/apache/camel/support/processor/PredicateValidatingProcessor.java
index 4940864..b96f636 100644
---
a/core/camel-jaxp/src/main/java/org/apache/camel/support/processor/validation/PredicateValidatingProcessor.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/processor/PredicateValidatingProcessor.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.support.processor.validation;
+package org.apache.camel.support.processor;
import org.apache.camel.Exchange;
import org.apache.camel.Predicate;
diff --git
a/core/camel-jaxp/src/main/java/org/apache/camel/support/processor/validation/PredicateValidationException.java
b/core/camel-support/src/main/java/org/apache/camel/support/processor/PredicateValidationException.java
similarity index 96%
rename from
core/camel-jaxp/src/main/java/org/apache/camel/support/processor/validation/PredicateValidationException.java
rename to
core/camel-support/src/main/java/org/apache/camel/support/processor/PredicateValidationException.java
index 57c72c0..aec85d0 100644
---
a/core/camel-jaxp/src/main/java/org/apache/camel/support/processor/validation/PredicateValidationException.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/processor/PredicateValidationException.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.support.processor.validation;
+package org.apache.camel.support.processor;
import org.apache.camel.Exchange;
import org.apache.camel.Predicate;
diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
index d9297488..cac752a 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide.adoc
@@ -222,6 +222,11 @@ Should now be:
exchange.setRollbackOnly(true);
----
+==== camel-jaxp
+
+The class `org.apache.camel.processor.validation.PredicateValidatingProcessor`
has moved from `camel-jaxp` JAR
+to `camel-support` JAR and renamed to
`org.apache.camel.support.processor.PredicateValidatingProcessor`.
+
==== Java DSL
The Java DSL has been revisited and the following methods have been removed:
