From fe6509ae669ba7c7613dd4ffaa2da57d1e268195 Mon Sep 17 00:00:00 2001 From: Dancovich Date: Thu, 18 Oct 2012 16:37:24 -0300 Subject: [PATCH] Rollback em refatoração de proxies (QueryProxy e TypedQueryProxy). --- impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/EntityManagerProxy.java | 25 ++++++++----------------- impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/QueryProxy.java | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/TypedQueryProxy.java | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/query/QueryProxy.java | 213 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/query/TypedQueryProxy.java | 181 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/internal/proxy/EntityManagerProxyTest.java | 9 --------- impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/internal/proxy/QueryProxyTest.java | 1 - impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/internal/proxy/TypedQueryProxyTest.java | 1 - 8 files changed, 366 insertions(+), 422 deletions(-) create mode 100644 impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/QueryProxy.java create mode 100644 impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/TypedQueryProxy.java delete mode 100644 impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/query/QueryProxy.java delete mode 100644 impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/query/TypedQueryProxy.java diff --git a/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/EntityManagerProxy.java b/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/EntityManagerProxy.java index 977d836..e2429f4 100644 --- a/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/EntityManagerProxy.java +++ b/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/EntityManagerProxy.java @@ -317,8 +317,7 @@ public class EntityManagerProxy implements EntityManager, Serializable { */ @Override public Query createQuery(String qlString) { - joinTransactionIfNecessary(); - return /*new QueryProxy(*/getEntityManagerDelegate().createQuery(qlString)/* , this)*/ ; + return new QueryProxy(getEntityManagerDelegate().createQuery(qlString) , this) ; } /* @@ -327,8 +326,7 @@ public class EntityManagerProxy implements EntityManager, Serializable { */ @Override public TypedQuery createQuery(CriteriaQuery criteriaQuery) { - joinTransactionIfNecessary(); - return /*new TypedQueryProxy(*/ getEntityManagerDelegate().createQuery(criteriaQuery) /*, this )*/; + return new TypedQueryProxy( getEntityManagerDelegate().createQuery(criteriaQuery) , this ); } /* @@ -337,8 +335,7 @@ public class EntityManagerProxy implements EntityManager, Serializable { */ @Override public TypedQuery createQuery(String qlString, Class resultClass) { - joinTransactionIfNecessary(); - return /*new TypedQueryProxy(*/getEntityManagerDelegate().createQuery(qlString, resultClass)/*,this)*/; + return new TypedQueryProxy(getEntityManagerDelegate().createQuery(qlString, resultClass),this); } /* @@ -347,8 +344,7 @@ public class EntityManagerProxy implements EntityManager, Serializable { */ @Override public Query createNamedQuery(String name) { - joinTransactionIfNecessary(); - return /*new QueryProxy(*/getEntityManagerDelegate().createNamedQuery(name)/*, this)*/; + return new QueryProxy(getEntityManagerDelegate().createNamedQuery(name), this); } /* @@ -357,7 +353,6 @@ public class EntityManagerProxy implements EntityManager, Serializable { */ @Override public TypedQuery createNamedQuery(String name, Class resultClass) { - joinTransactionIfNecessary(); return getEntityManagerDelegate().createNamedQuery(name, resultClass); } @@ -367,8 +362,7 @@ public class EntityManagerProxy implements EntityManager, Serializable { */ @Override public Query createNativeQuery(String sqlString) { - joinTransactionIfNecessary(); - return /*new QueryProxy(*/getEntityManagerDelegate().createNativeQuery(sqlString)/*, this)*/; + return new QueryProxy(getEntityManagerDelegate().createNativeQuery(sqlString), this); } /* @@ -377,8 +371,7 @@ public class EntityManagerProxy implements EntityManager, Serializable { */ @Override public Query createNativeQuery(String sqlString, @SuppressWarnings("rawtypes") Class resultClass) { - joinTransactionIfNecessary(); - return /*new QueryProxy(*/getEntityManagerDelegate().createNativeQuery(sqlString, resultClass)/*, this)*/; + return new QueryProxy(getEntityManagerDelegate().createNativeQuery(sqlString, resultClass), this); } /* @@ -387,8 +380,7 @@ public class EntityManagerProxy implements EntityManager, Serializable { */ @Override public Query createNativeQuery(String sqlString, String resultSetMapping) { - joinTransactionIfNecessary(); - return /*new QueryProxy(*/getEntityManagerDelegate().createNativeQuery(sqlString, resultSetMapping)/*,this)*/; + return new QueryProxy(getEntityManagerDelegate().createNativeQuery(sqlString, resultSetMapping),this); } /* @@ -403,7 +395,7 @@ public class EntityManagerProxy implements EntityManager, Serializable { /** * Attemp to join transaction, if the active transaction is not managed by current EntityManager. */ - public final void joinTransactionIfNecessary() { + protected final void joinTransactionIfNecessary() { try { getEntityManagerDelegate().getTransaction(); } catch (IllegalStateException cause) { @@ -480,7 +472,6 @@ public class EntityManagerProxy implements EntityManager, Serializable { */ @Override public CriteriaBuilder getCriteriaBuilder() { - joinTransactionIfNecessary(); return getEntityManagerDelegate().getCriteriaBuilder(); } diff --git a/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/QueryProxy.java b/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/QueryProxy.java new file mode 100644 index 0000000..07b0bd3 --- /dev/null +++ b/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/QueryProxy.java @@ -0,0 +1,179 @@ +package br.gov.frameworkdemoiselle.internal.proxy; + +import java.util.Calendar; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.persistence.FlushModeType; +import javax.persistence.LockModeType; +import javax.persistence.Parameter; +import javax.persistence.Query; +import javax.persistence.TemporalType; + +public class QueryProxy implements Query { + + private Query queryDelegate; + private EntityManagerProxy entityManagerCaller; + + public QueryProxy(Query queryDelegate,EntityManagerProxy entityManagerCaller){ + this.queryDelegate = queryDelegate; + this.entityManagerCaller = entityManagerCaller; + } + + @SuppressWarnings("rawtypes") + public List getResultList() { + entityManagerCaller.joinTransactionIfNecessary(); + return queryDelegate.getResultList(); + } + + public Object getSingleResult() { + entityManagerCaller.joinTransactionIfNecessary(); + return queryDelegate.getSingleResult(); + } + + public int executeUpdate() { + entityManagerCaller.joinTransactionIfNecessary(); + return queryDelegate.executeUpdate(); + } + + public Query setMaxResults(int maxResult) { + queryDelegate.setMaxResults(maxResult); + return this; + } + + public int getMaxResults() { + return queryDelegate.getMaxResults(); + } + + public Query setFirstResult(int startPosition) { + queryDelegate.setFirstResult(startPosition); + return this; + } + + public int getFirstResult() { + return queryDelegate.getFirstResult(); + } + + public Query setHint(String hintName, Object value) { + queryDelegate.setHint(hintName, value); + return this; + } + + public Map getHints() { + return queryDelegate.getHints(); + } + + public Query setParameter(Parameter param, T value) { + queryDelegate.setParameter(param, value); + return this; + } + + public Query setParameter(Parameter param, Calendar value, + TemporalType temporalType) { + queryDelegate.setParameter(param, value, temporalType); + return this; + } + + public Query setParameter(Parameter param, Date value, + TemporalType temporalType) { + queryDelegate.setParameter(param, value, temporalType); + return this; + } + + public Query setParameter(String name, Object value) { + queryDelegate.setParameter(name, value); + return this; + } + + public Query setParameter(String name, Calendar value, + TemporalType temporalType) { + queryDelegate.setParameter(name, value, temporalType); + return this; + } + + public Query setParameter(String name, Date value, TemporalType temporalType) { + queryDelegate.setParameter(name, value, temporalType); + return this; + } + + public Query setParameter(int position, Object value) { + queryDelegate.setParameter(position, value); + return this; + } + + public Query setParameter(int position, Calendar value, + TemporalType temporalType) { + queryDelegate.setParameter(position, value, temporalType); + return this; + } + + public Query setParameter(int position, Date value, + TemporalType temporalType) { + queryDelegate.setParameter(position, value, temporalType); + return this; + } + + public Set> getParameters() { + return queryDelegate.getParameters(); + } + + public Parameter getParameter(String name) { + return queryDelegate.getParameter(name); + } + + public Parameter getParameter(String name, Class type) { + return queryDelegate.getParameter(name, type); + } + + public Parameter getParameter(int position) { + return queryDelegate.getParameter(position); + } + + public Parameter getParameter(int position, Class type) { + return queryDelegate.getParameter(position, type); + } + + public boolean isBound(Parameter param) { + return queryDelegate.isBound(param); + } + + public T getParameterValue(Parameter param) { + return queryDelegate.getParameterValue(param); + } + + public Object getParameterValue(String name) { + return queryDelegate.getParameterValue(name); + } + + public Object getParameterValue(int position) { + return queryDelegate.getParameterValue(position); + } + + public Query setFlushMode(FlushModeType flushMode) { + queryDelegate.setFlushMode(flushMode); + return this; + } + + public FlushModeType getFlushMode() { + return queryDelegate.getFlushMode(); + } + + public Query setLockMode(LockModeType lockMode) { + entityManagerCaller.joinTransactionIfNecessary(); + queryDelegate.setLockMode(lockMode); + return this; + } + + public LockModeType getLockMode() { + return queryDelegate.getLockMode(); + } + + public T unwrap(Class cls) { + return queryDelegate.unwrap(cls); + } + + + +} diff --git a/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/TypedQueryProxy.java b/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/TypedQueryProxy.java new file mode 100644 index 0000000..11e4a51 --- /dev/null +++ b/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/TypedQueryProxy.java @@ -0,0 +1,179 @@ +package br.gov.frameworkdemoiselle.internal.proxy; + +import java.util.Calendar; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.persistence.FlushModeType; +import javax.persistence.LockModeType; +import javax.persistence.Parameter; +import javax.persistence.TemporalType; +import javax.persistence.TypedQuery; + +public class TypedQueryProxy implements TypedQuery { + + private TypedQuery queryDelegate; + private EntityManagerProxy entityManagerCaller; + + public TypedQueryProxy(TypedQuery queryDelegate, + EntityManagerProxy entityManagerCaller) { + this.queryDelegate = queryDelegate; + this.entityManagerCaller = entityManagerCaller; + } + + public List getResultList() { + entityManagerCaller.joinTransactionIfNecessary(); + return queryDelegate.getResultList(); + } + + public X getSingleResult() { + entityManagerCaller.joinTransactionIfNecessary(); + return queryDelegate.getSingleResult(); + } + + public int executeUpdate() { + entityManagerCaller.joinTransactionIfNecessary(); + return queryDelegate.executeUpdate(); + } + + public TypedQuery setMaxResults(int maxResult) { + queryDelegate.setMaxResults(maxResult); + return this; + } + + public TypedQuery setFirstResult(int startPosition) { + queryDelegate.setFirstResult(startPosition); + return this; + } + + public TypedQuery setHint(String hintName, Object value) { + queryDelegate.setHint(hintName, value); + return this; + } + + public int getMaxResults() { + return queryDelegate.getMaxResults(); + } + + public TypedQuery setParameter(Parameter param, T value) { + queryDelegate.setParameter(param, value); + return this; + } + + public int getFirstResult() { + return queryDelegate.getFirstResult(); + } + + public TypedQuery setParameter(Parameter param, + Calendar value, TemporalType temporalType) { + queryDelegate.setParameter(param, value, temporalType); + return this; + } + + public TypedQuery setParameter(Parameter param, Date value, + TemporalType temporalType) { + queryDelegate.setParameter(param, value, temporalType); + return this; + } + + public Map getHints() { + return queryDelegate.getHints(); + } + + public TypedQuery setParameter(String name, Object value) { + queryDelegate.setParameter(name, value); + return this; + } + + public TypedQuery setParameter(String name, Calendar value, + TemporalType temporalType) { + queryDelegate.setParameter(name, value, temporalType); + return this; + } + + public TypedQuery setParameter(String name, Date value, + TemporalType temporalType) { + queryDelegate.setParameter(name, value, temporalType); + return this; + } + + public TypedQuery setParameter(int position, Object value) { + queryDelegate.setParameter(position, value); + return this; + } + + public TypedQuery setParameter(int position, Calendar value, + TemporalType temporalType) { + queryDelegate.setParameter(position, value, temporalType); + return this; + } + + public TypedQuery setParameter(int position, Date value, + TemporalType temporalType) { + queryDelegate.setParameter(position, value, temporalType); + return this; + } + + public TypedQuery setFlushMode(FlushModeType flushMode) { + queryDelegate.setFlushMode(flushMode); + return this; + } + + public TypedQuery setLockMode(LockModeType lockMode) { + queryDelegate.setLockMode(lockMode); + return this; + } + + public Set> getParameters() { + return queryDelegate.getParameters(); + } + + public Parameter getParameter(String name) { + return queryDelegate.getParameter(name); + } + + public Parameter getParameter(String name, Class type) { + return queryDelegate.getParameter(name, type); + } + + public Parameter getParameter(int position) { + return queryDelegate.getParameter(position); + } + + public Parameter getParameter(int position, Class type) { + return queryDelegate.getParameter(position, type); + } + + public boolean isBound(Parameter param) { + return queryDelegate.isBound(param); + } + + public T getParameterValue(Parameter param) { + return queryDelegate.getParameterValue(param); + } + + public Object getParameterValue(String name) { + return queryDelegate.getParameterValue(name); + } + + public Object getParameterValue(int position) { + return queryDelegate.getParameterValue(position); + } + + public FlushModeType getFlushMode() { + return queryDelegate.getFlushMode(); + } + + public LockModeType getLockMode() { + return queryDelegate.getLockMode(); + } + + public T unwrap(Class cls) { + return queryDelegate.unwrap(cls); + } + + + +} diff --git a/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/query/QueryProxy.java b/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/query/QueryProxy.java deleted file mode 100644 index f7b6138..0000000 --- a/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/query/QueryProxy.java +++ /dev/null @@ -1,213 +0,0 @@ -package br.gov.frameworkdemoiselle.internal.proxy.query; - -import java.util.Calendar; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.persistence.FlushModeType; -import javax.persistence.LockModeType; -import javax.persistence.Parameter; -import javax.persistence.Query; -import javax.persistence.TemporalType; - -import br.gov.frameworkdemoiselle.internal.proxy.EntityManagerProxy; - -public class QueryProxy implements Query { - - private Query queryDelegate; - private EntityManagerProxy entityManagerCaller; - - public QueryProxy(Query queryDelegate,EntityManagerProxy entityManagerCaller){ - this.queryDelegate = queryDelegate; - this.entityManagerCaller = entityManagerCaller; - } - - @SuppressWarnings("rawtypes") - public List getResultList() { - entityManagerCaller.joinTransactionIfNecessary(); - return queryDelegate.getResultList(); - } - - /** - * @see Query.getSingleResult() - */ - @Override - public Object getSingleResult() { - entityManagerCaller.joinTransactionIfNecessary(); - return queryDelegate.getSingleResult(); - } - - @Override - public int executeUpdate() { - entityManagerCaller.joinTransactionIfNecessary(); - return queryDelegate.executeUpdate(); - } - - @Override - public Query setMaxResults(int maxResult) { - queryDelegate.setMaxResults(maxResult); - return this; - } - - @Override - public int getMaxResults() { - return queryDelegate.getMaxResults(); - } - - @Override - public Query setFirstResult(int startPosition) { - queryDelegate.setFirstResult(startPosition); - return this; - } - - @Override - public int getFirstResult() { - return queryDelegate.getFirstResult(); - } - - @Override - public Query setHint(String hintName, Object value) { - queryDelegate.setHint(hintName, value); - return this; - } - - @Override - public Map getHints() { - return queryDelegate.getHints(); - } - - @Override - public Query setParameter(Parameter param, T value) { - queryDelegate.setParameter(param, value); - return this; - } - - @Override - public Query setParameter(Parameter param, Calendar value, - TemporalType temporalType) { - queryDelegate.setParameter(param, value, temporalType); - return this; - } - - @Override - public Query setParameter(Parameter param, Date value, - TemporalType temporalType) { - queryDelegate.setParameter(param, value, temporalType); - return this; - } - - @Override - public Query setParameter(String name, Object value) { - queryDelegate.setParameter(name, value); - return this; - } - - @Override - public Query setParameter(String name, Calendar value, - TemporalType temporalType) { - queryDelegate.setParameter(name, value, temporalType); - return this; - } - - @Override - public Query setParameter(String name, Date value, TemporalType temporalType) { - queryDelegate.setParameter(name, value, temporalType); - return this; - } - - @Override - public Query setParameter(int position, Object value) { - queryDelegate.setParameter(position, value); - return this; - } - - @Override - public Query setParameter(int position, Calendar value, - TemporalType temporalType) { - queryDelegate.setParameter(position, value, temporalType); - return this; - } - - @Override - public Query setParameter(int position, Date value, - TemporalType temporalType) { - queryDelegate.setParameter(position, value, temporalType); - return this; - } - - @Override - public Set> getParameters() { - return queryDelegate.getParameters(); - } - - @Override - public Parameter getParameter(String name) { - return queryDelegate.getParameter(name); - } - - @Override - public Parameter getParameter(String name, Class type) { - return queryDelegate.getParameter(name, type); - } - - @Override - public Parameter getParameter(int position) { - return queryDelegate.getParameter(position); - } - - @Override - public Parameter getParameter(int position, Class type) { - return queryDelegate.getParameter(position, type); - } - - @Override - public boolean isBound(Parameter param) { - return queryDelegate.isBound(param); - } - - @Override - public T getParameterValue(Parameter param) { - return queryDelegate.getParameterValue(param); - } - - @Override - public Object getParameterValue(String name) { - return queryDelegate.getParameterValue(name); - } - - @Override - public Object getParameterValue(int position) { - return queryDelegate.getParameterValue(position); - } - - @Override - public Query setFlushMode(FlushModeType flushMode) { - queryDelegate.setFlushMode(flushMode); - return this; - } - - @Override - public FlushModeType getFlushMode() { - return queryDelegate.getFlushMode(); - } - - @Override - public Query setLockMode(LockModeType lockMode) { - entityManagerCaller.joinTransactionIfNecessary(); - queryDelegate.setLockMode(lockMode); - return this; - } - - @Override - public LockModeType getLockMode() { - return queryDelegate.getLockMode(); - } - - @Override - public T unwrap(Class cls) { - return queryDelegate.unwrap(cls); - } - -} diff --git a/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/query/TypedQueryProxy.java b/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/query/TypedQueryProxy.java deleted file mode 100644 index 2757079..0000000 --- a/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/query/TypedQueryProxy.java +++ /dev/null @@ -1,181 +0,0 @@ -package br.gov.frameworkdemoiselle.internal.proxy.query; - -import java.util.Calendar; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.persistence.FlushModeType; -import javax.persistence.LockModeType; -import javax.persistence.Parameter; -import javax.persistence.TemporalType; -import javax.persistence.TypedQuery; - -import br.gov.frameworkdemoiselle.internal.proxy.EntityManagerProxy; - -public class TypedQueryProxy implements TypedQuery { - - private TypedQuery queryDelegate; - private EntityManagerProxy entityManagerCaller; - - public TypedQueryProxy(TypedQuery queryDelegate, - EntityManagerProxy entityManagerCaller) { - this.queryDelegate = queryDelegate; - this.entityManagerCaller = entityManagerCaller; - } - - public List getResultList() { - entityManagerCaller.joinTransactionIfNecessary(); - return queryDelegate.getResultList(); - } - - public X getSingleResult() { - entityManagerCaller.joinTransactionIfNecessary(); - return queryDelegate.getSingleResult(); - } - - public int executeUpdate() { - entityManagerCaller.joinTransactionIfNecessary(); - return queryDelegate.executeUpdate(); - } - - public TypedQuery setMaxResults(int maxResult) { - queryDelegate.setMaxResults(maxResult); - return this; - } - - public TypedQuery setFirstResult(int startPosition) { - queryDelegate.setFirstResult(startPosition); - return this; - } - - public TypedQuery setHint(String hintName, Object value) { - queryDelegate.setHint(hintName, value); - return this; - } - - public int getMaxResults() { - return queryDelegate.getMaxResults(); - } - - public TypedQuery setParameter(Parameter param, T value) { - queryDelegate.setParameter(param, value); - return this; - } - - public int getFirstResult() { - return queryDelegate.getFirstResult(); - } - - public TypedQuery setParameter(Parameter param, - Calendar value, TemporalType temporalType) { - queryDelegate.setParameter(param, value, temporalType); - return this; - } - - public TypedQuery setParameter(Parameter param, Date value, - TemporalType temporalType) { - queryDelegate.setParameter(param, value, temporalType); - return this; - } - - public Map getHints() { - return queryDelegate.getHints(); - } - - public TypedQuery setParameter(String name, Object value) { - queryDelegate.setParameter(name, value); - return this; - } - - public TypedQuery setParameter(String name, Calendar value, - TemporalType temporalType) { - queryDelegate.setParameter(name, value, temporalType); - return this; - } - - public TypedQuery setParameter(String name, Date value, - TemporalType temporalType) { - queryDelegate.setParameter(name, value, temporalType); - return this; - } - - public TypedQuery setParameter(int position, Object value) { - queryDelegate.setParameter(position, value); - return this; - } - - public TypedQuery setParameter(int position, Calendar value, - TemporalType temporalType) { - queryDelegate.setParameter(position, value, temporalType); - return this; - } - - public TypedQuery setParameter(int position, Date value, - TemporalType temporalType) { - queryDelegate.setParameter(position, value, temporalType); - return this; - } - - public TypedQuery setFlushMode(FlushModeType flushMode) { - queryDelegate.setFlushMode(flushMode); - return this; - } - - public TypedQuery setLockMode(LockModeType lockMode) { - queryDelegate.setLockMode(lockMode); - return this; - } - - public Set> getParameters() { - return queryDelegate.getParameters(); - } - - public Parameter getParameter(String name) { - return queryDelegate.getParameter(name); - } - - public Parameter getParameter(String name, Class type) { - return queryDelegate.getParameter(name, type); - } - - public Parameter getParameter(int position) { - return queryDelegate.getParameter(position); - } - - public Parameter getParameter(int position, Class type) { - return queryDelegate.getParameter(position, type); - } - - public boolean isBound(Parameter param) { - return queryDelegate.isBound(param); - } - - public T getParameterValue(Parameter param) { - return queryDelegate.getParameterValue(param); - } - - public Object getParameterValue(String name) { - return queryDelegate.getParameterValue(name); - } - - public Object getParameterValue(int position) { - return queryDelegate.getParameterValue(position); - } - - public FlushModeType getFlushMode() { - return queryDelegate.getFlushMode(); - } - - public LockModeType getLockMode() { - return queryDelegate.getLockMode(); - } - - public T unwrap(Class cls) { - return queryDelegate.unwrap(cls); - } - - - -} diff --git a/impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/internal/proxy/EntityManagerProxyTest.java b/impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/internal/proxy/EntityManagerProxyTest.java index e681940..b8023a2 100644 --- a/impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/internal/proxy/EntityManagerProxyTest.java +++ b/impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/internal/proxy/EntityManagerProxyTest.java @@ -65,7 +65,6 @@ import org.powermock.modules.junit4.PowerMockRunner; import br.gov.frameworkdemoiselle.internal.producer.EntityManagerProducer; import br.gov.frameworkdemoiselle.internal.producer.FakeEntityManager; -import br.gov.frameworkdemoiselle.internal.proxy.query.QueryProxy; import br.gov.frameworkdemoiselle.util.Beans; @RunWith(PowerMockRunner.class) @@ -78,14 +77,11 @@ public class EntityManagerProxyTest { private EntityManagerProducer entityManagerContext; - private EntityTransaction transaction; - @Before public void setUp() throws Exception { mockStatic(Beans.class); this.entityManager = EasyMock.createMock(EntityManager.class); this.entityManagerContext = EasyMock.createMock(EntityManagerProducer.class); - this.transaction = EasyMock.createMock(EntityTransaction.class); expect(Beans.getReference(EntityManagerProducer.class)).andReturn(this.entityManagerContext).anyTimes(); expect(this.entityManagerContext.getEntityManager("teste")).andReturn(this.entityManager).anyTimes(); @@ -343,7 +339,6 @@ public class EntityManagerProxyTest { public void testCreateQuery() { Query query = EasyMock.createMock(Query.class); expect(this.entityManager.createQuery("teste")).andReturn(query); - expect(this.entityManager.getTransaction()).andReturn(transaction); replay(this.entityManager); assertTrue(Query.class.isAssignableFrom(this.entityManagerProxy.createQuery("teste").getClass()) ); verify(this.entityManager); @@ -356,7 +351,6 @@ public class EntityManagerProxyTest { CriteriaQuery criteriaQuery = null; expect(this.entityManager.createQuery(criteriaQuery)).andReturn(typedQuery); - expect(this.entityManager.getTransaction()).andReturn(transaction); replay(this.entityManager); assertTrue(TypedQuery.class.isAssignableFrom(this.entityManagerProxy.createQuery(criteriaQuery).getClass())); verify(this.entityManager); @@ -368,7 +362,6 @@ public class EntityManagerProxyTest { TypedQuery typeQuery = EasyMock.createMock(TypedQuery.class); expect(this.entityManager.createQuery("teste", String.class)).andReturn(typeQuery); - expect(this.entityManager.getTransaction()).andReturn(transaction); replay(this.entityManager); assertTrue(TypedQuery.class.isAssignableFrom(this.entityManagerProxy.createQuery("teste", String.class).getClass())); verify(this.entityManager); @@ -378,7 +371,6 @@ public class EntityManagerProxyTest { public void testCreateNamedQuery() { Query query = EasyMock.createMock(Query.class); expect(this.entityManager.createNamedQuery("teste")).andReturn(query); - expect(this.entityManager.getTransaction()).andReturn(transaction); replay(this.entityManager); assertTrue(Query.class.isAssignableFrom(this.entityManagerProxy.createNamedQuery("teste").getClass())); verify(this.entityManager); @@ -389,7 +381,6 @@ public class EntityManagerProxyTest { @SuppressWarnings("unchecked") TypedQuery typedQuery = EasyMock.createMock(TypedQuery.class); expect(this.entityManager.createNamedQuery("teste", String.class)).andReturn(typedQuery); - expect(this.entityManager.getTransaction()).andReturn(transaction); replay(this.entityManager); assertEquals(typedQuery, this.entityManagerProxy.createNamedQuery("teste", String.class)); verify(this.entityManager); diff --git a/impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/internal/proxy/QueryProxyTest.java b/impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/internal/proxy/QueryProxyTest.java index b234177..01e58b7 100644 --- a/impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/internal/proxy/QueryProxyTest.java +++ b/impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/internal/proxy/QueryProxyTest.java @@ -28,7 +28,6 @@ import org.powermock.reflect.Whitebox; import br.gov.frameworkdemoiselle.domain.Client; import br.gov.frameworkdemoiselle.internal.producer.EntityManagerProducer; -import br.gov.frameworkdemoiselle.internal.proxy.query.QueryProxy; import br.gov.frameworkdemoiselle.util.Beans; /** diff --git a/impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/internal/proxy/TypedQueryProxyTest.java b/impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/internal/proxy/TypedQueryProxyTest.java index 4b5cca6..d53a5a4 100644 --- a/impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/internal/proxy/TypedQueryProxyTest.java +++ b/impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/internal/proxy/TypedQueryProxyTest.java @@ -29,7 +29,6 @@ import org.powermock.reflect.Whitebox; import br.gov.frameworkdemoiselle.domain.Client; import br.gov.frameworkdemoiselle.internal.producer.EntityManagerProducer; -import br.gov.frameworkdemoiselle.internal.proxy.query.TypedQueryProxy; import br.gov.frameworkdemoiselle.util.Beans; /** -- libgit2 0.21.2