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/07/31 04:13:04 UTC
svn commit: r799491 - in
/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation:
TraversableResolverImpl.java ValidatorImpl.java
Author: dwoods
Date: Fri Jul 31 02:13:04 2009
New Revision: 799491
URL: http://svn.apache.org/viewvc?rev=799491&view=rev
Log:
OPENJPA-1107 Provide TraversableResolver for use with Bean Validation Factory. Current TraversableResolverImpl behaves identical to the default JPA aware one that BV providers must implement, so not sure why we have to provide this yet....
Added:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/TraversableResolverImpl.java (with props)
Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/ValidatorImpl.java
Added: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/TraversableResolverImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/TraversableResolverImpl.java?rev=799491&view=auto
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/TraversableResolverImpl.java (added)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/TraversableResolverImpl.java Fri Jul 31 02:13:04 2009
@@ -0,0 +1,106 @@
+/*
+ * 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.openjpa.persistence.validation;
+
+import java.lang.annotation.ElementType;
+
+import javax.persistence.spi.LoadState;
+import javax.validation.Path;
+import javax.validation.TraversableResolver;
+import javax.validation.ValidationException;
+import javax.validation.Path.Node;
+
+import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory;
+import org.apache.openjpa.persistence.OpenJPAPersistenceUtil;
+
+/**
+ * OpenJPA optimized TraversableResolver Default implementation/behavior asks all discovered providers -
+ * javax.persistence.Persistence.getPersistenceUtil().isLoaded( traversableObject, traversableProperty.getName());
+ *
+ * @see javax.validation.TraversableResolver
+ */
+public class TraversableResolverImpl implements TraversableResolver {
+
+ // For OpenJPA created instance, we should have a reference to ourselves
+ private OpenJPAEntityManagerFactory emf = null;
+
+ public TraversableResolverImpl() {
+ }
+
+ public TraversableResolverImpl(OpenJPAEntityManagerFactory emf) {
+ this.emf = emf;
+ }
+
+ /* (non-Javadoc) isReachable() is called by the Validator before accessing
+ * a property for validation or for cascading.
+ *
+ * @see javax.validation.TraversableResolver#isReachable(java.lang.Object,
+ * javax.validation.Path.Node, java.lang.Class, javax.validation.Path,
+ * java.lang.annotation.ElementType)
+ */
+ public boolean isReachable(Object traversableObject,
+ Node traversableProperty, Class<?> rootBeanType,
+ Path pathToTraversableObject, ElementType elementType) {
+
+ if (traversableObject == null) {
+ return true;
+ }
+
+ // Identical behavior to spec defined default provider implementation
+ return javax.persistence.Persistence.getPersistenceUtil().isLoaded(
+ traversableObject, traversableProperty.getName());
+
+ /*
+ * Improved OpenJPA version of the default provider implementation
+ *
+ * The below code causes -
+ * Caused by: javax.validation.ValidationException: java.lang.UnsupportedOperationException
+ * at org.apache.openjpa.persistence.validation.TraversableResolverImpl.isReachable
+ * (TraversableResolverImpl.java:73)
+ * at org.hibernate.validation.engine.resolver.SingleThreadCachedTraversableResolver.isReachable
+ * (SingleThreadCachedTraversableResolver.java:47)
+ *
+ try {
+ if (OpenJPAPersistenceUtil.isLoaded(emf, traversableObject,
+ traversableProperty.getName()) == LoadState.NOT_LOADED) {
+ return false;
+ }
+ } catch (Exception e) {
+ // BV Spec Section 3.5.2 - any exceptions must be wrapped
+ throw new ValidationException(e);
+ }
+ // LoadState.LOADED or LoadState.UNKNOWN
+ return true;
+ */
+ }
+
+ /* (non-Javadoc) isCascadable() is called by the Validator after
+ * isReachable() returns true and before a property marked with @Valid
+ * is cascaded.
+ *
+ * @see javax.validation.TraversableResolver#isCascadable(java.lang.Object,
+ * javax.validation.Path.Node, java.lang.Class, javax.validation.Path,
+ * java.lang.annotation.ElementType)
+ */
+ public boolean isCascadable(Object traversableObject,
+ Node traversableProperty, Class<?> rootBeanType,
+ Path pathToTraversableObject, ElementType elementType) {
+
+ // BV Spec Section 3.5.2 says to always return true for JPA
+ return true;
+ }
+}
Propchange: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/validation/TraversableResolverImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
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=799491&r1=799490&r2=799491&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 Jul 31 02:13:04 2009
@@ -27,7 +27,6 @@
import javax.validation.metadata.BeanDescriptor;
import javax.validation.ConstraintViolation;
import javax.validation.ConstraintViolationException;
-import javax.validation.Validation;
import javax.validation.Validator;
import javax.validation.ValidatorFactory;
@@ -130,7 +129,10 @@
_validatorFactory = getDefaultValidatorFactory();
}
if (_validatorFactory != null) {
- _validator = _validatorFactory.getValidator();
+ // use our TraversableResolver instead of BV provider one
+ _validator = _validatorFactory.usingContext().
+ traversableResolver(new TraversableResolverImpl()).
+ getValidator();
} else {
// A default ValidatorFactory could not be created.
throw new RuntimeException(
@@ -150,10 +152,8 @@
addValidationGroup(VG_PRE_UPDATE,
_conf.getValidationGroupPreUpdate());
addValidationGroup(VG_PRE_REMOVE,
- _conf.getValidationGroupPreRemove());
-
- }
- else {
+ _conf.getValidationGroupPreRemove());
+ } else {
// add in default validation groups, which can be over-ridden later
addDefaultValidationGroups();
}
@@ -209,8 +209,7 @@
if (vgs != null) {
addValidationGroup(event, vgs);
}
- }
- else {
+ } else {
// There were no events found for group "{0}".
throw new IllegalArgumentException(
_loc.get("no-group-events", validationGroupName).getMessage());