You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by dw...@apache.org on 2009/05/29 19:58:50 UTC
svn commit: r780049 - in
/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence:
PersistenceProductDerivation.java validation/ValidatorImpl.java
Author: dwoods
Date: Fri May 29 17:58:50 2009
New Revision: 780049
URL: http://svn.apache.org/viewvc?rev=780049&view=rev
Log:
revert unintended file commits in Rev780046
Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/ValidatorImpl.java
Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java?rev=780049&r1=780048&r2=780049&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java Fri May 29 17:58:50 2009
@@ -57,8 +57,6 @@
import org.apache.openjpa.lib.meta.XMLVersionParser;
import org.apache.openjpa.lib.util.J2DoPrivHelper;
import org.apache.openjpa.lib.util.Localizer;
-import org.apache.openjpa.persistence.validation.ValidatorImpl;
-import org.apache.openjpa.validation.Validator;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
@@ -166,13 +164,6 @@
Compatibility compatibility = conf.getCompatibilityInstance();
compatibility.setFlushBeforeDetach(true);
compatibility.setCopyOnDetach(true);
- } else {
- System.out.println("********* Creating ValidatorImpl **********");
- if (!conf.getValidationMode().equalsIgnoreCase("NONE")) {
- Validator val = new ValidatorImpl(
- conf.getValidationFactoryInstance(),
- conf.getValidationMode());
- }
}
return true;
}
Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/ValidatorImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/ValidatorImpl.java?rev=780049&r1=780048&r2=780049&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/ValidatorImpl.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/ValidatorImpl.java Fri May 29 17:58:50 2009
@@ -101,13 +101,9 @@
*/
public ValidatorImpl(Object validatorFactory,
String mode) {
- if (validatorFactory != null) {
- if (validatorFactory instanceof ValidatorFactory) {
- _validatorFactory = (ValidatorFactory)validatorFactory;
- } else {
- // TODO: Add a localized exception
- throw new IllegalArgumentException();
- }
+ if (validatorFactory != null && validatorFactory instanceof
+ ValidatorFactory) {
+ _validatorFactory = (ValidatorFactory)validatorFactory;
} else {
_validatorFactory = getDefaultValidatorFactory();
}
@@ -165,17 +161,7 @@
* @return returns true if validating for this particular event
*/
public boolean isValidating(Integer event) {
- return (hasValidator() && (_validationGroups.get(event) != null));
- }
-
- /**
- * Returns whether a Validator was created by the ValidatorFactory
- * and validation can be used.
- *
- * @return returns true if ValidatorFactory returned a Validator
- */
- public boolean hasValidator() {
- return (_validator != null);
+ return _validationGroups.get(event) != null;
}
/**
@@ -289,12 +275,8 @@
// Get the default validator factory
private ValidatorFactory getDefaultValidatorFactory() {
- ValidatorFactory factory = null;
- try {
- factory = Validation.buildDefaultValidatorFactory();
- } catch (javax.validation.ValidationException e) {
- // no validation providers found
- }
+ ValidatorFactory factory =
+ Validation.buildDefaultValidatorFactory();
return factory;
}