Repository: camel
Updated Branches:
refs/heads/master 5e302fddc -> 54172d699
Added Javadoc.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7f3d6ab6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7f3d6ab6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7f3d6ab6
Branch: refs/heads/master
Commit: 7f3d6ab62538c11ad1c67232800e782c88e11eec
Parents: 9b7ab42
Author: Henryk Konsek <he...@gmail.com>
Authored: Sun Feb 16 17:36:04 2014 +0100
Committer: Henryk Konsek <he...@gmail.com>
Committed: Sun Feb 16 17:36:04 2014 +0100
----------------------------------------------------------------------
.../bean/validator/BeanValidatorComponent.java | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7f3d6ab6/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java
index 55ef4e3..e7ebbbe 100644
--- a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java
+++ b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java
@@ -32,12 +32,16 @@ import org.apache.camel.impl.DefaultComponent;
import org.apache.camel.impl.ProcessorEndpoint;
/**
- * Bean Validator Component for validating java beans against JSR 303 Validator
- *
- * @version
+ * Bean Validator Component for validating Java beans against reference implementation of JSR 303 Validator (Hibernate
+ * Validator).
*/
public class BeanValidatorComponent extends DefaultComponent {
+ /**
+ * Prefix of the OSGi-aware implementations of {@code org.apache.camel.CamelContext} interface (like
+ * {@code org.apache.camel.core.osgi.OsgiDefaultCamelContext} or
+ * {@code org.apache.camel.osgi.OsgiSpringCamelContext} ).
+ */
private static final String OSGI_CONTEXT_CLASS_PREFIX = "Osgi";
@Override
@@ -80,6 +84,13 @@ public class BeanValidatorComponent extends DefaultComponent {
return new ProcessorEndpoint(uri, this, beanValidator);
}
+ /**
+ * Recognizes if component is executed in the OSGi environment. This implementation assumes that component is
+ * deployed into OSGi environment if it uses implementation of {@code org.apache.camel.CamelContext} with class
+ * name starting with the "Osgi" prefix.
+ *
+ * @return true if component is executed in the OSGi environment. False otherwise.
+ */
protected boolean isOsgiContext() {
return getCamelContext().getClass().getSimpleName().startsWith(OSGI_CONTEXT_CLASS_PREFIX);
}
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/camel Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/54172d69 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/54172d69 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/54172d69 Branch: refs/heads/master Commit: 54172d699a3b39bda94b91a2f8486477c2bf6cb8 Parents: f763045 5e302fd Author: Henryk Konsek <he...@gmail.com> Authored: Sun Feb 16 21:41:51 2014 +0100 Committer: Henryk Konsek <he...@gmail.com> Committed: Sun Feb 16 21:41:51 2014 +0100 ---------------------------------------------------------------------- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
[camel-bean-validator] Refactoring.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f763045e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f763045e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f763045e
Branch: refs/heads/master
Commit: f763045e69f0ab69f40c0a067838df4f265fbcea
Parents: 7f3d6ab
Author: Henryk Konsek <he...@gmail.com>
Authored: Sun Feb 16 21:41:07 2014 +0100
Committer: Henryk Konsek <he...@gmail.com>
Committed: Sun Feb 16 21:41:07 2014 +0100
----------------------------------------------------------------------
.../bean/validator/BeanValidatorComponent.java | 26 +++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f763045e/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java
index e7ebbbe..0de0f7f 100644
--- a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java
+++ b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java
@@ -48,7 +48,7 @@ public class BeanValidatorComponent extends DefaultComponent {
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
BeanValidator beanValidator = new BeanValidator();
- ValidationProviderResolver validationProviderResolver = resolveAndRemoveReferenceParameter(parameters, "validationProviderResolver", ValidationProviderResolver.class);
+ ValidationProviderResolver validationProviderResolver = resolveValidationProviderResolver(parameters);
MessageInterpolator messageInterpolator = resolveAndRemoveReferenceParameter(parameters, "messageInterpolator", MessageInterpolator.class);
TraversableResolver traversableResolver = resolveAndRemoveReferenceParameter(parameters, "traversableResolver", TraversableResolver.class);
ConstraintValidatorFactory constraintValidatorFactory = resolveAndRemoveReferenceParameter(parameters, "constraintValidatorFactory", ConstraintValidatorFactory.class);
@@ -57,8 +57,6 @@ public class BeanValidatorComponent extends DefaultComponent {
GenericBootstrap bootstrap = Validation.byDefaultProvider();
if (validationProviderResolver != null) {
bootstrap.providerResolver(validationProviderResolver);
- } else if (isOsgiContext()) {
- bootstrap.providerResolver(new HibernateValidationProviderResolver());
}
Configuration<?> configuration = bootstrap.configure();
@@ -85,6 +83,28 @@ public class BeanValidatorComponent extends DefaultComponent {
}
/**
+ * Resolves optional custom {@code javax.validation.ValidationProviderResolver} to be used by the component. By
+ * default component tries to use resolver instance bound to the Camel registry under name
+ * {@code validationProviderResolver} . If there is no such resolver instance in the registry and component is
+ * running in the OSGi environment, {@link HibernateValidationProviderResolver} will be used. In all the other
+ * cases this method will return null.
+ *
+ * @param parameters endpoint parameters
+ * @return {@code javax.validation.ValidationProviderResolver} instance or null if no custom resolver should
+ * be used by the component
+ */
+ protected ValidationProviderResolver resolveValidationProviderResolver(Map<String, Object> parameters) {
+ ValidationProviderResolver validationProviderResolver = resolveAndRemoveReferenceParameter(parameters, "validationProviderResolver", ValidationProviderResolver.class);
+ if (validationProviderResolver != null) {
+ return validationProviderResolver;
+ }
+ if (isOsgiContext()) {
+ return new HibernateValidationProviderResolver();
+ }
+ return null;
+ }
+
+ /**
* Recognizes if component is executed in the OSGi environment. This implementation assumes that component is
* deployed into OSGi environment if it uses implementation of {@code org.apache.camel.CamelContext} with class
* name starting with the "Osgi" prefix.