You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/07/22 09:54:27 UTC
[camel] 01/03: Camel-Bean-Validator: Use BindToRegistry annotation
instead of JndiRegistry
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 68499bcc1633aca7cbf164ac733b055ec0b39b14
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jul 22 11:51:47 2019 +0200
Camel-Bean-Validator: Use BindToRegistry annotation instead of JndiRegistry
---
.../bean/validator/BeanValidatorConfigurationTest.java | 14 ++++----------
.../validator/CustomValidationProviderResolverTest.java | 9 ++-------
.../validator/HibernateValidationProviderResolverTest.java | 13 ++++++-------
3 files changed, 12 insertions(+), 24 deletions(-)
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java
index 0502834..34f6cf7 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java
@@ -25,6 +25,7 @@ import javax.validation.Path;
import javax.validation.Path.Node;
import javax.validation.TraversableResolver;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Before;
@@ -32,8 +33,11 @@ import org.junit.Test;
public class BeanValidatorConfigurationTest extends CamelTestSupport {
+ @BindToRegistry("myMessageInterpolator")
private MessageInterpolator messageInterpolator;
+ @BindToRegistry("myTraversableResolver")
private TraversableResolver traversableResolver;
+ @BindToRegistry("myConstraintValidatorFactory")
private ConstraintValidatorFactory constraintValidatorFactory;
@Override
@@ -46,16 +50,6 @@ public class BeanValidatorConfigurationTest extends CamelTestSupport {
super.setUp();
}
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
-
- registry.bind("myMessageInterpolator", this.messageInterpolator);
- registry.bind("myTraversableResolver", this.traversableResolver);
- registry.bind("myConstraintValidatorFactory", this.constraintValidatorFactory);
- return registry;
- }
-
@Test
public void configureWithDefaults() throws Exception {
if (isPlatform("aix")) {
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CustomValidationProviderResolverTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CustomValidationProviderResolverTest.java
index 8b8056d..15346e3 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CustomValidationProviderResolverTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CustomValidationProviderResolverTest.java
@@ -23,6 +23,7 @@ import static java.util.Arrays.asList;
import javax.validation.ValidationProviderResolver;
import javax.validation.spi.ValidationProvider;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -38,6 +39,7 @@ public class CustomValidationProviderResolverTest extends CamelTestSupport {
// Routing fixtures
+ @BindToRegistry("myValidationProviderResolver")
ValidationProviderResolver validationProviderResolver = mock(ValidationProviderResolver.class);
@Override
@@ -58,13 +60,6 @@ public class CustomValidationProviderResolverTest extends CamelTestSupport {
};
}
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
- registry.bind("myValidationProviderResolver", validationProviderResolver);
- return registry;
- }
-
// Tests
@Test
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolverTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolverTest.java
index 51113e0..cf070d8 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolverTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolverTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.camel.component.bean.validator;
+import javax.validation.ValidationProviderResolver;
+
+import org.apache.camel.BindToRegistry;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -29,6 +32,9 @@ public class HibernateValidationProviderResolverTest extends CamelTestSupport {
@EndpointInject("mock:test")
MockEndpoint mockEndpoint;
+
+ @BindToRegistry("myValidationProviderResolver")
+ ValidationProviderResolver validationProviderResolver = new HibernateValidationProviderResolver();
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
@@ -43,13 +49,6 @@ public class HibernateValidationProviderResolverTest extends CamelTestSupport {
};
}
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
- registry.bind("myValidationProviderResolver", new HibernateValidationProviderResolver());
- return registry;
- }
-
// Tests
@Test