DELTASPIKE-387 Renamed package.
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/c4d5975f Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/c4d5975f Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/c4d5975f Branch: refs/heads/master Commit: c4d5975f84bfb6ba7542ed93d2412c7b2b4bbd6f Parents: 8ec331b Author: John D. Ament <john.d.am...@gmail.com> Authored: Sun Jun 23 21:32:50 2013 -0400 Committer: John D. Ament <john.d.am...@gmail.com> Committed: Sun Jun 23 21:32:50 2013 -0400 ---------------------------------------------------------------------- .../CDIAwareConstraintValidatorFactory.java | 70 ++++++++++++++++++++ .../CDIAwareConstraintValidatorFactory.java | 70 -------------------- .../beanval/test/InjectedValidationTest.java | 2 +- .../impl/src/test/resources/validation.xml | 2 +- 4 files changed, 72 insertions(+), 72 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/c4d5975f/deltaspike/modules/bean-validation/impl/src/main/java/org/apache/deltaspike/beanValidation/impl/CDIAwareConstraintValidatorFactory.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/bean-validation/impl/src/main/java/org/apache/deltaspike/beanValidation/impl/CDIAwareConstraintValidatorFactory.java b/deltaspike/modules/bean-validation/impl/src/main/java/org/apache/deltaspike/beanValidation/impl/CDIAwareConstraintValidatorFactory.java new file mode 100644 index 0000000..434a19a --- /dev/null +++ b/deltaspike/modules/bean-validation/impl/src/main/java/org/apache/deltaspike/beanValidation/impl/CDIAwareConstraintValidatorFactory.java @@ -0,0 +1,70 @@ +/* + * 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.deltaspike.beanValidation.impl; + +import java.util.logging.Level; +import java.util.logging.Logger; + +import javax.validation.ConstraintValidator; +import javax.validation.ConstraintValidatorFactory; +import javax.validation.Validation; + +import org.apache.deltaspike.core.api.provider.BeanProvider; + +/** + * A factory for creating CDI Aware/Enabled ConstraintValidators. + * + */ +public class CDIAwareConstraintValidatorFactory implements + ConstraintValidatorFactory +{ + + private final Logger log = Logger + .getLogger(CDIAwareConstraintValidatorFactory.class.toString()); + + private final ConstraintValidatorFactory delegate; + + public CDIAwareConstraintValidatorFactory() + { + delegate = Validation.byDefaultProvider().configure().getDefaultConstraintValidatorFactory(); + if (log.isLoggable(Level.CONFIG)) + { + log.config("Setting up delegate ConstraintValidatorFactory as " + + delegate.getClass().getCanonicalName()); + } + } + + @Override + public <T extends ConstraintValidator<?, ?>> T getInstance(Class<T> validatorClass) + { + T resolvedInst = null; + resolvedInst = BeanProvider.getContextualReference(validatorClass,true); + if (resolvedInst == null) + { + if (log.isLoggable(Level.CONFIG)) + { + log.config("No contextual instances found for class " + validatorClass.getCanonicalName() + + " delegating to DefaultProvider behavior."); + } + resolvedInst = this.delegate.getInstance(validatorClass); + } + return resolvedInst; + } + +} http://git-wip-us.apache.org/repos/asf/deltaspike/blob/c4d5975f/deltaspike/modules/bean-validation/impl/src/main/java/org/apache/deltaspike/beanval/impl/CDIAwareConstraintValidatorFactory.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/bean-validation/impl/src/main/java/org/apache/deltaspike/beanval/impl/CDIAwareConstraintValidatorFactory.java b/deltaspike/modules/bean-validation/impl/src/main/java/org/apache/deltaspike/beanval/impl/CDIAwareConstraintValidatorFactory.java deleted file mode 100644 index 53b33b4..0000000 --- a/deltaspike/modules/bean-validation/impl/src/main/java/org/apache/deltaspike/beanval/impl/CDIAwareConstraintValidatorFactory.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * 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.deltaspike.beanval.impl; - -import java.util.logging.Level; -import java.util.logging.Logger; - -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorFactory; -import javax.validation.Validation; - -import org.apache.deltaspike.core.api.provider.BeanProvider; - -/** - * A factory for creating CDI Aware/Enabled ConstraintValidators. - * - */ -public class CDIAwareConstraintValidatorFactory implements - ConstraintValidatorFactory -{ - - private final Logger log = Logger - .getLogger(CDIAwareConstraintValidatorFactory.class.toString()); - - private final ConstraintValidatorFactory delegate; - - public CDIAwareConstraintValidatorFactory() - { - delegate = Validation.byDefaultProvider().configure().getDefaultConstraintValidatorFactory(); - if (log.isLoggable(Level.CONFIG)) - { - log.config("Setting up delegate ConstraintValidatorFactory as " + - delegate.getClass().getCanonicalName()); - } - } - - @Override - public <T extends ConstraintValidator<?, ?>> T getInstance(Class<T> validatorClass) - { - T resolvedInst = null; - resolvedInst = BeanProvider.getContextualReference(validatorClass,true); - if (resolvedInst == null) - { - if (log.isLoggable(Level.CONFIG)) - { - log.config("No contextual instances found for class " + validatorClass.getCanonicalName() + - " delegating to DefaultProvider behavior."); - } - resolvedInst = this.delegate.getInstance(validatorClass); - } - return resolvedInst; - } - -} http://git-wip-us.apache.org/repos/asf/deltaspike/blob/c4d5975f/deltaspike/modules/bean-validation/impl/src/test/java/org/apache/deltaspike/beanval/test/InjectedValidationTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/bean-validation/impl/src/test/java/org/apache/deltaspike/beanval/test/InjectedValidationTest.java b/deltaspike/modules/bean-validation/impl/src/test/java/org/apache/deltaspike/beanval/test/InjectedValidationTest.java index 40c9a98..e08fcae 100644 --- a/deltaspike/modules/bean-validation/impl/src/test/java/org/apache/deltaspike/beanval/test/InjectedValidationTest.java +++ b/deltaspike/modules/bean-validation/impl/src/test/java/org/apache/deltaspike/beanval/test/InjectedValidationTest.java @@ -24,7 +24,7 @@ import javax.validation.ConstraintViolation; import javax.validation.Validation; import javax.validation.Validator; -import org.apache.deltaspike.beanval.impl.CDIAwareConstraintValidatorFactory; +import org.apache.deltaspike.beanValidation.impl.CDIAwareConstraintValidatorFactory; import org.apache.deltaspike.test.category.WebProfileCategory; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; http://git-wip-us.apache.org/repos/asf/deltaspike/blob/c4d5975f/deltaspike/modules/bean-validation/impl/src/test/resources/validation.xml ---------------------------------------------------------------------- diff --git a/deltaspike/modules/bean-validation/impl/src/test/resources/validation.xml b/deltaspike/modules/bean-validation/impl/src/test/resources/validation.xml index bdaa07b..740e9bd 100644 --- a/deltaspike/modules/bean-validation/impl/src/test/resources/validation.xml +++ b/deltaspike/modules/bean-validation/impl/src/test/resources/validation.xml @@ -19,5 +19,5 @@ <validation-config xmlns="http://jboss.org/xml/ns/javax/validation/configuration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configuration"> - <constraint-validator-factory>org.apache.deltaspike.beanval.impl.CDIAwareConstraintValidatorFactory</constraint-validator-factory> + <constraint-validator-factory>org.apache.deltaspike.beanValidation.impl.CDIAwareConstraintValidatorFactory</constraint-validator-factory> </validation-config> \ No newline at end of file