Author: ppoddar
Date: Thu May 29 14:53:51 2008
New Revision: 661498
URL: http://svn.apache.org/viewvc?rev=661498&view=rev
Log:
OPENJPA-610: OpenJPA internal exceptions are heuristically translated at
facade-level to JPA-defined exception subtypes
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheBehavesIdentical.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceExceptions.java
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheBehavesIdentical.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheBehavesIdentical.java?rev=661498&r1=661497&r2=661498&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheBehavesIdentical.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheBehavesIdentical.java
Thu May 29 14:53:51 2008
@@ -438,9 +438,9 @@
assertEquals(useDataCache, dataCache.contains(PObject.class,
oid));
/**
- * refresh behavior depends on current lock. Having no lock
will refresh
- * the instance (wrongly) while any other lock will attempt to
fetch the
- * instance from database (correctly) raising
EntityNotFoundException.
+ * refresh behavior no more depends on current lock. Refresh
+ * will always attempt to fetch the instance from database
+ * raising EntityNotFoundException.
*
*/
em.getTransaction().begin();
@@ -448,18 +448,12 @@
em.getFetchPlan().setReadLockMode(lock);
try {
em.refresh(pc);
- if (lock == null) {
- assertEquals(useDataCache ? MARKER_DATACACHE :
MARKER_CACHE, pc.getName());
- } else {
- fail("expected EntityNotFoundException for
PObject:" + oid);
- }
+ fail("expected EntityNotFoundException for PObject:" +
oid);
+ } catch (EntityNotFoundException ex) {
+ // we are good
} catch (Exception ex) {
- if (ex instanceof EntityNotFoundException ||
- ex instanceof
org.apache.openjpa.persistence.EntityNotFoundException) {
- if (lock != null) {
- // we are good
- }
- }
+ ex.printStackTrace();
+ fail("expected EntityNotFoundException for PObject:" +
oid);
} finally {
em.getTransaction().rollback();
}
Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceExceptions.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceExceptions.java?rev=661498&r1=661497&r2=661498&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceExceptions.java
(original)
+++
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceExceptions.java
Thu May 29 14:53:51 2008
@@ -22,7 +22,11 @@
import org.apache.openjpa.kernel.Broker;
import org.apache.openjpa.util.Exceptions;
+import org.apache.openjpa.util.NoTransactionException;
+import org.apache.openjpa.util.ObjectExistsException;
+import org.apache.openjpa.util.ObjectNotFoundException;
import org.apache.openjpa.util.OpenJPAException;
+import org.apache.openjpa.util.OptimisticException;
import org.apache.openjpa.util.RuntimeExceptionTranslator;
import org.apache.openjpa.util.StoreException;
import org.apache.openjpa.util.UserException;
@@ -167,6 +171,12 @@
/**
* Translate the given user exception.
+ * If a {link [EMAIL PROTECTED] OpenJPAException#getSubtype() sub type} is
set on the
+ * given exception then a corresponding facade-level exception i.e. the
+ * exceptions that inherit JPA-defined exceptions is generated.
+ * If given exception is not further classified to a sub type, then
+ * an [EMAIL PROTECTED] [EMAIL PROTECTED]
#translateInternalException(OpenJPAException)} attempt}
+ * is made to translate the given OpenJPAException by its internal cause.
*/
private static Exception translateUserException(OpenJPAException ke) {
Exception e;
@@ -193,13 +203,47 @@
getFailedObject(ke), ke.isFatal());
break;
default:
- e = new org.apache.openjpa.persistence.ArgumentException
- (ke.getMessage(), getNestedThrowables(ke),
- getFailedObject(ke), ke.isFatal());
+ e = translateCause(ke);
}
e.setStackTrace(ke.getStackTrace());
return e;
}
+
+ /**
+ * Translate to a facade-level exception if the given exception
+ * a) has a cause i.e. one and only nested Throwable
+ * and b) that cause is one of the known internal exception which has a
+ * direct facade-level counterpart
+ * (for example, ObjectNotFoundException can be translated to
+ * EntityNotFoundException).
+ * If the above conditions are not met then return generic
ArgumentException.
+ *
+ * In either case, preserve all the details.
+ */
+ private static Exception translateCause(OpenJPAException ke) {
+ Throwable cause = ke.getCause();
+ if (cause instanceof ObjectNotFoundException) {
+ return new EntityNotFoundException(
+ ke.getMessage(), getNestedThrowables(ke),
+ getFailedObject(ke), ke.isFatal());
+ } else if (cause instanceof ObjectExistsException) {
+ return new EntityExistsException(
+ ke.getMessage(), getNestedThrowables(ke),
+ getFailedObject(ke), ke.isFatal());
+ } else if (cause instanceof NoTransactionException) {
+ return new TransactionRequiredException(
+ ke.getMessage(), getNestedThrowables(ke),
+ getFailedObject(ke), ke.isFatal());
+ } else if (cause instanceof OptimisticException) {
+ return new OptimisticLockException(
+ ke.getMessage(), getNestedThrowables(ke),
+ getFailedObject(ke), ke.isFatal());
+ } else {
+ return new org.apache.openjpa.persistence.ArgumentException(
+ ke.getMessage(), getNestedThrowables(ke),
+ getFailedObject(ke), ke.isFatal());
+ }
+ }
/**
* Translate the given general exception.
