You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by al...@apache.org on 2010/03/07 17:16:06 UTC
svn commit: r920024 -
/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
Author: allee8285
Date: Sun Mar 7 16:16:06 2010
New Revision: 920024
URL: http://svn.apache.org/viewvc?rev=920024&view=rev
Log:
OPENJPA-1552 Add proper QueryImpl creation in EntityManagerImpl subclass.
Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java?rev=920024&r1=920023&r2=920024&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java Sun Mar 7 16:16:06 2010
@@ -105,7 +105,7 @@
private DelegatingBroker _broker;
private EntityManagerFactoryImpl _emf;
private Map<FetchConfiguration,FetchPlan> _plans = new IdentityHashMap<FetchConfiguration,FetchPlan>(1);
- private RuntimeExceptionTranslator _ret = PersistenceExceptions.getRollbackTranslator(this);
+ protected RuntimeExceptionTranslator _ret = PersistenceExceptions.getRollbackTranslator(this);
public EntityManagerImpl() {
// for Externalizable
@@ -972,7 +972,7 @@
if (pq != null) {
pq.setInto(q);
}
- return new QueryImpl(this, _ret, q).setId(qid);
+ return newQueryImpl(q).setId(qid);
} catch (RuntimeException re) {
throw PersistenceExceptions.toPersistenceException(re);
}
@@ -983,8 +983,7 @@
return createQuery((String) null);
assertNotCloseInvoked();
org.apache.openjpa.kernel.Query q = ((QueryImpl) query).getDelegate();
- return new QueryImpl(this, _ret, _broker.newQuery(q.getLanguage(),
- q));
+ return newQueryImpl(_broker.newQuery(q.getLanguage(), q));
}
@SuppressWarnings("unchecked")
@@ -1014,7 +1013,7 @@
del.compile();
}
- OpenJPAQuery q = new QueryImpl(this, _ret, del).setId(qid);
+ OpenJPAQuery q = newQueryImpl(del).setId(qid);
String[] hints = meta.getHintKeys();
Object[] values = meta.getHintValues();
for (int i = 0; i < hints.length; i++)
@@ -1040,13 +1039,17 @@
org.apache.openjpa.kernel.Query kernelQuery = _broker.newQuery(
QueryLanguages.LANG_SQL, query);
kernelQuery.setResultMapping(null, mappingName);
- return new QueryImpl(this, _ret, kernelQuery);
+ return newQueryImpl(kernelQuery);
+ }
+
+ protected <X> QueryImpl<X> newQueryImpl(org.apache.openjpa.kernel.Query kernelQuery) {
+ return new QueryImpl<X>(this, _ret, kernelQuery);
}
/**
* Validate that the user provided SQL.
*/
- private static void validateSQL(String query) {
+ protected void validateSQL(String query) {
if (StringUtils.trimToNull(query) == null)
throw new ArgumentException(_loc.get("no-sql"), null, null, false);
}
@@ -1325,7 +1328,7 @@
* closed, it will throw its own more informative exception when we
* delegate the pending operation to it.
*/
- void assertNotCloseInvoked() {
+ protected void assertNotCloseInvoked() {
if (!_broker.isClosed() && _broker.isCloseInvoked())
throw new InvalidStateException(_loc.get("close-invoked"), null,
null, true);
@@ -1562,7 +1565,7 @@
org.apache.openjpa.kernel.Query kernelQuery =_broker.newQuery(CriteriaBuilderImpl.LANG_CRITERIA, criteriaQuery);
- QueryImpl<T> facadeQuery = new QueryImpl<T>(this, _ret, kernelQuery);
+ QueryImpl<T> facadeQuery = newQueryImpl(kernelQuery);
Set<ParameterExpression<?>> params = criteriaQuery.getParameters();
for (ParameterExpression<?> param : params) {