Updated Branches: refs/heads/master 30842e35c -> 4c2150884
[CAMEL-7162] Now Bean Validator tries to resolve ValidationProviderResolver reference. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4c215088 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4c215088 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4c215088 Branch: refs/heads/master Commit: 4c2150884f24e5d70d89066797465d690804b1c5 Parents: 30842e3 Author: Henryk Konsek <[email protected]> Authored: Mon Feb 3 14:12:19 2014 +0100 Committer: Henryk Konsek <[email protected]> Committed: Mon Feb 3 14:12:19 2014 +0100 ---------------------------------------------------------------------- components/camel-bean-validator/pom.xml | 5 ++ .../bean/validator/BeanValidatorComponent.java | 13 +++- .../CustomValidationProviderResolverTest.java | 74 ++++++++++++++++++++ 3 files changed, 89 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/4c215088/components/camel-bean-validator/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-bean-validator/pom.xml b/components/camel-bean-validator/pom.xml index 0806249..70f285a 100644 --- a/components/camel-bean-validator/pom.xml +++ b/components/camel-bean-validator/pom.xml @@ -77,6 +77,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-test</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/camel/blob/4c215088/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 4491b55..e17243c 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 @@ -23,7 +23,9 @@ import javax.validation.ConstraintValidatorFactory; import javax.validation.MessageInterpolator; import javax.validation.TraversableResolver; import javax.validation.Validation; +import javax.validation.ValidationProviderResolver; import javax.validation.ValidatorFactory; +import javax.validation.bootstrap.GenericBootstrap; import org.apache.camel.Endpoint; import org.apache.camel.impl.DefaultComponent; @@ -38,14 +40,19 @@ 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); MessageInterpolator messageInterpolator = resolveAndRemoveReferenceParameter(parameters, "messageInterpolator", MessageInterpolator.class); TraversableResolver traversableResolver = resolveAndRemoveReferenceParameter(parameters, "traversableResolver", TraversableResolver.class); ConstraintValidatorFactory constraintValidatorFactory = resolveAndRemoveReferenceParameter(parameters, "constraintValidatorFactory", ConstraintValidatorFactory.class); String group = getAndRemoveParameter(parameters, "group", String.class); - Configuration<?> configuration = Validation.byDefaultProvider().configure(); - + GenericBootstrap bootstrap = Validation.byDefaultProvider(); + if (validationProviderResolver != null) { + bootstrap.providerResolver(validationProviderResolver); + } + Configuration<?> configuration = bootstrap.configure(); + if (messageInterpolator != null) { configuration.messageInterpolator(messageInterpolator); } http://git-wip-us.apache.org/repos/asf/camel/blob/4c215088/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CustomValidationProviderResolverTest.java ---------------------------------------------------------------------- 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 new file mode 100644 index 0000000..aca697e --- /dev/null +++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CustomValidationProviderResolverTest.java @@ -0,0 +1,74 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.bean.validator; + +import java.util.List; + +import static java.util.Arrays.asList; + +import javax.validation.ValidationProviderResolver; + +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.impl.JndiRegistry; +import org.apache.camel.test.junit4.CamelTestSupport; +import org.hibernate.validator.HibernateValidator; +import org.junit.Test; + +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.atLeastOnce; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + +public class CustomValidationProviderResolverTest extends CamelTestSupport { + + // Routing fixtures + + ValidationProviderResolver validationProviderResolver = mock(ValidationProviderResolver.class); + + @Override + protected void doPreSetup() throws Exception { + List validationProviders = asList(new HibernateValidator()); + given(validationProviderResolver.getValidationProviders()).willReturn(validationProviders); + super.doPreSetup(); + } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + @Override + public void configure() throws Exception { + from("direct:test"). + to("bean-validator://ValidationProviderResolverTest?validationProviderResolver=#myValidationProviderResolver"); + } + }; + } + + @Override + protected JndiRegistry createRegistry() throws Exception { + JndiRegistry registry = super.createRegistry(); + registry.bind("myValidationProviderResolver", validationProviderResolver); + return registry; + } + + // Tests + + @Test + public void shouldResolveCustomValidationProviderResolver() { + verify(validationProviderResolver, atLeastOnce()).getValidationProviders(); + } + +}
