Download as
Browse Code »

Commit fe6509ae669ba7c7613dd4ffaa2da57d1e268195

Authored by Dancovich
1 parent 79ddb531
Exists in master

Rollback em refatoração de proxies (QueryProxy e TypedQueryProxy).

Showing 8 changed files with 366 additions and 422 deletions   Show diff stats
impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/EntityManagerProxy.java
  Diff comments   View file @fe6509a
@@ -317,8 +317,7 @@ public class EntityManagerProxy implements EntityManager, Serializable { @@ -317,8 +317,7 @@ public class EntityManagerProxy implements EntityManager, Serializable {
317 */ 317 */
318 @Override 318 @Override
319 public Query createQuery(String qlString) { 319 public Query createQuery(String qlString) {
320 - joinTransactionIfNecessary();  
321 - return /*new QueryProxy(*/getEntityManagerDelegate().createQuery(qlString)/* , this)*/ ; 320 + return new QueryProxy(getEntityManagerDelegate().createQuery(qlString) , this) ;
322 } 321 }
323 322
324 /* 323 /*
@@ -327,8 +326,7 @@ public class EntityManagerProxy implements EntityManager, Serializable { @@ -327,8 +326,7 @@ public class EntityManagerProxy implements EntityManager, Serializable {
327 */ 326 */
328 @Override 327 @Override
329 public <T> TypedQuery<T> createQuery(CriteriaQuery<T> criteriaQuery) { 328 public <T> TypedQuery<T> createQuery(CriteriaQuery<T> criteriaQuery) {
330 - joinTransactionIfNecessary();  
331 - return /*new TypedQueryProxy<T>(*/ getEntityManagerDelegate().createQuery(criteriaQuery) /*, this )*/; 329 + return new TypedQueryProxy<T>( getEntityManagerDelegate().createQuery(criteriaQuery) , this );
332 } 330 }
333 331
334 /* 332 /*
@@ -337,8 +335,7 @@ public class EntityManagerProxy implements EntityManager, Serializable { @@ -337,8 +335,7 @@ public class EntityManagerProxy implements EntityManager, Serializable {
337 */ 335 */
338 @Override 336 @Override
339 public <T> TypedQuery<T> createQuery(String qlString, Class<T> resultClass) { 337 public <T> TypedQuery<T> createQuery(String qlString, Class<T> resultClass) {
340 - joinTransactionIfNecessary();  
341 - return /*new TypedQueryProxy<T>(*/getEntityManagerDelegate().createQuery(qlString, resultClass)/*,this)*/; 338 + return new TypedQueryProxy<T>(getEntityManagerDelegate().createQuery(qlString, resultClass),this);
342 } 339 }
343 340
344 /* 341 /*
@@ -347,8 +344,7 @@ public class EntityManagerProxy implements EntityManager, Serializable { @@ -347,8 +344,7 @@ public class EntityManagerProxy implements EntityManager, Serializable {
347 */ 344 */
348 @Override 345 @Override
349 public Query createNamedQuery(String name) { 346 public Query createNamedQuery(String name) {
350 - joinTransactionIfNecessary();  
351 - return /*new QueryProxy(*/getEntityManagerDelegate().createNamedQuery(name)/*, this)*/; 347 + return new QueryProxy(getEntityManagerDelegate().createNamedQuery(name), this);
352 } 348 }
353 349
354 /* 350 /*
@@ -357,7 +353,6 @@ public class EntityManagerProxy implements EntityManager, Serializable { @@ -357,7 +353,6 @@ public class EntityManagerProxy implements EntityManager, Serializable {
357 */ 353 */
358 @Override 354 @Override
359 public <T> TypedQuery<T> createNamedQuery(String name, Class<T> resultClass) { 355 public <T> TypedQuery<T> createNamedQuery(String name, Class<T> resultClass) {
360 - joinTransactionIfNecessary();  
361 return getEntityManagerDelegate().createNamedQuery(name, resultClass); 356 return getEntityManagerDelegate().createNamedQuery(name, resultClass);
362 } 357 }
363 358
@@ -367,8 +362,7 @@ public class EntityManagerProxy implements EntityManager, Serializable { @@ -367,8 +362,7 @@ public class EntityManagerProxy implements EntityManager, Serializable {
367 */ 362 */
368 @Override 363 @Override
369 public Query createNativeQuery(String sqlString) { 364 public Query createNativeQuery(String sqlString) {
370 - joinTransactionIfNecessary();  
371 - return /*new QueryProxy(*/getEntityManagerDelegate().createNativeQuery(sqlString)/*, this)*/; 365 + return new QueryProxy(getEntityManagerDelegate().createNativeQuery(sqlString), this);
372 } 366 }
373 367
374 /* 368 /*
@@ -377,8 +371,7 @@ public class EntityManagerProxy implements EntityManager, Serializable { @@ -377,8 +371,7 @@ public class EntityManagerProxy implements EntityManager, Serializable {
377 */ 371 */
378 @Override 372 @Override
379 public Query createNativeQuery(String sqlString, @SuppressWarnings("rawtypes") Class resultClass) { 373 public Query createNativeQuery(String sqlString, @SuppressWarnings("rawtypes") Class resultClass) {
380 - joinTransactionIfNecessary();  
381 - return /*new QueryProxy(*/getEntityManagerDelegate().createNativeQuery(sqlString, resultClass)/*, this)*/; 374 + return new QueryProxy(getEntityManagerDelegate().createNativeQuery(sqlString, resultClass), this);
382 } 375 }
383 376
384 /* 377 /*
@@ -387,8 +380,7 @@ public class EntityManagerProxy implements EntityManager, Serializable { @@ -387,8 +380,7 @@ public class EntityManagerProxy implements EntityManager, Serializable {
387 */ 380 */
388 @Override 381 @Override
389 public Query createNativeQuery(String sqlString, String resultSetMapping) { 382 public Query createNativeQuery(String sqlString, String resultSetMapping) {
390 - joinTransactionIfNecessary();  
391 - return /*new QueryProxy(*/getEntityManagerDelegate().createNativeQuery(sqlString, resultSetMapping)/*,this)*/; 383 + return new QueryProxy(getEntityManagerDelegate().createNativeQuery(sqlString, resultSetMapping),this);
392 } 384 }
393 385
394 /* 386 /*
@@ -403,7 +395,7 @@ public class EntityManagerProxy implements EntityManager, Serializable { @@ -403,7 +395,7 @@ public class EntityManagerProxy implements EntityManager, Serializable {
403 /** 395 /**
404 * Attemp to join transaction, if the active transaction is not managed by current EntityManager. 396 * Attemp to join transaction, if the active transaction is not managed by current EntityManager.
405 */ 397 */
406 - public final void joinTransactionIfNecessary() { 398 + protected final void joinTransactionIfNecessary() {
407 try { 399 try {
408 getEntityManagerDelegate().getTransaction(); 400 getEntityManagerDelegate().getTransaction();
409 } catch (IllegalStateException cause) { 401 } catch (IllegalStateException cause) {
@@ -480,7 +472,6 @@ public class EntityManagerProxy implements EntityManager, Serializable { @@ -480,7 +472,6 @@ public class EntityManagerProxy implements EntityManager, Serializable {
480 */ 472 */
481 @Override 473 @Override
482 public CriteriaBuilder getCriteriaBuilder() { 474 public CriteriaBuilder getCriteriaBuilder() {
483 - joinTransactionIfNecessary();  
484 return getEntityManagerDelegate().getCriteriaBuilder(); 475 return getEntityManagerDelegate().getCriteriaBuilder();
485 } 476 }
486 477
impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/QueryProxy.java 0 → 100644
  Diff comments   View file @fe6509a
@@ -0,0 +1,179 @@ @@ -0,0 +1,179 @@
  1 +package br.gov.frameworkdemoiselle.internal.proxy;
  2 +
  3 +import java.util.Calendar;
  4 +import java.util.Date;
  5 +import java.util.List;
  6 +import java.util.Map;
  7 +import java.util.Set;
  8 +
  9 +import javax.persistence.FlushModeType;
  10 +import javax.persistence.LockModeType;
  11 +import javax.persistence.Parameter;
  12 +import javax.persistence.Query;
  13 +import javax.persistence.TemporalType;
  14 +
  15 +public class QueryProxy implements Query {
  16 +
  17 + private Query queryDelegate;
  18 + private EntityManagerProxy entityManagerCaller;
  19 +
  20 + public QueryProxy(Query queryDelegate,EntityManagerProxy entityManagerCaller){
  21 + this.queryDelegate = queryDelegate;
  22 + this.entityManagerCaller = entityManagerCaller;
  23 + }
  24 +
  25 + @SuppressWarnings("rawtypes")
  26 + public List getResultList() {
  27 + entityManagerCaller.joinTransactionIfNecessary();
  28 + return queryDelegate.getResultList();
  29 + }
  30 +
  31 + public Object getSingleResult() {
  32 + entityManagerCaller.joinTransactionIfNecessary();
  33 + return queryDelegate.getSingleResult();
  34 + }
  35 +
  36 + public int executeUpdate() {
  37 + entityManagerCaller.joinTransactionIfNecessary();
  38 + return queryDelegate.executeUpdate();
  39 + }
  40 +
  41 + public Query setMaxResults(int maxResult) {
  42 + queryDelegate.setMaxResults(maxResult);
  43 + return this;
  44 + }
  45 +
  46 + public int getMaxResults() {
  47 + return queryDelegate.getMaxResults();
  48 + }
  49 +
  50 + public Query setFirstResult(int startPosition) {
  51 + queryDelegate.setFirstResult(startPosition);
  52 + return this;
  53 + }
  54 +
  55 + public int getFirstResult() {
  56 + return queryDelegate.getFirstResult();
  57 + }
  58 +
  59 + public Query setHint(String hintName, Object value) {
  60 + queryDelegate.setHint(hintName, value);
  61 + return this;
  62 + }
  63 +
  64 + public Map<String, Object> getHints() {
  65 + return queryDelegate.getHints();
  66 + }
  67 +
  68 + public <T> Query setParameter(Parameter<T> param, T value) {
  69 + queryDelegate.setParameter(param, value);
  70 + return this;
  71 + }
  72 +
  73 + public Query setParameter(Parameter<Calendar> param, Calendar value,
  74 + TemporalType temporalType) {
  75 + queryDelegate.setParameter(param, value, temporalType);
  76 + return this;
  77 + }
  78 +
  79 + public Query setParameter(Parameter<Date> param, Date value,
  80 + TemporalType temporalType) {
  81 + queryDelegate.setParameter(param, value, temporalType);
  82 + return this;
  83 + }
  84 +
  85 + public Query setParameter(String name, Object value) {
  86 + queryDelegate.setParameter(name, value);
  87 + return this;
  88 + }
  89 +
  90 + public Query setParameter(String name, Calendar value,
  91 + TemporalType temporalType) {
  92 + queryDelegate.setParameter(name, value, temporalType);
  93 + return this;
  94 + }
  95 +
  96 + public Query setParameter(String name, Date value, TemporalType temporalType) {
  97 + queryDelegate.setParameter(name, value, temporalType);
  98 + return this;
  99 + }
  100 +
  101 + public Query setParameter(int position, Object value) {
  102 + queryDelegate.setParameter(position, value);
  103 + return this;
  104 + }
  105 +
  106 + public Query setParameter(int position, Calendar value,
  107 + TemporalType temporalType) {
  108 + queryDelegate.setParameter(position, value, temporalType);
  109 + return this;
  110 + }
  111 +
  112 + public Query setParameter(int position, Date value,
  113 + TemporalType temporalType) {
  114 + queryDelegate.setParameter(position, value, temporalType);
  115 + return this;
  116 + }
  117 +
  118 + public Set<Parameter<?>> getParameters() {
  119 + return queryDelegate.getParameters();
  120 + }
  121 +
  122 + public Parameter<?> getParameter(String name) {
  123 + return queryDelegate.getParameter(name);
  124 + }
  125 +
  126 + public <T> Parameter<T> getParameter(String name, Class<T> type) {
  127 + return queryDelegate.getParameter(name, type);
  128 + }
  129 +
  130 + public Parameter<?> getParameter(int position) {
  131 + return queryDelegate.getParameter(position);
  132 + }
  133 +
  134 + public <T> Parameter<T> getParameter(int position, Class<T> type) {
  135 + return queryDelegate.getParameter(position, type);
  136 + }
  137 +
  138 + public boolean isBound(Parameter<?> param) {
  139 + return queryDelegate.isBound(param);
  140 + }
  141 +
  142 + public <T> T getParameterValue(Parameter<T> param) {
  143 + return queryDelegate.getParameterValue(param);
  144 + }
  145 +
  146 + public Object getParameterValue(String name) {
  147 + return queryDelegate.getParameterValue(name);
  148 + }
  149 +
  150 + public Object getParameterValue(int position) {
  151 + return queryDelegate.getParameterValue(position);
  152 + }
  153 +
  154 + public Query setFlushMode(FlushModeType flushMode) {
  155 + queryDelegate.setFlushMode(flushMode);
  156 + return this;
  157 + }
  158 +
  159 + public FlushModeType getFlushMode() {
  160 + return queryDelegate.getFlushMode();
  161 + }
  162 +
  163 + public Query setLockMode(LockModeType lockMode) {
  164 + entityManagerCaller.joinTransactionIfNecessary();
  165 + queryDelegate.setLockMode(lockMode);
  166 + return this;
  167 + }
  168 +
  169 + public LockModeType getLockMode() {
  170 + return queryDelegate.getLockMode();
  171 + }
  172 +
  173 + public <T> T unwrap(Class<T> cls) {
  174 + return queryDelegate.unwrap(cls);
  175 + }
  176 +
  177 +
  178 +
  179 +}
impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/TypedQueryProxy.java 0 → 100644
  Diff comments   View file @fe6509a
@@ -0,0 +1,179 @@ @@ -0,0 +1,179 @@
  1 +package br.gov.frameworkdemoiselle.internal.proxy;
  2 +
  3 +import java.util.Calendar;
  4 +import java.util.Date;
  5 +import java.util.List;
  6 +import java.util.Map;
  7 +import java.util.Set;
  8 +
  9 +import javax.persistence.FlushModeType;
  10 +import javax.persistence.LockModeType;
  11 +import javax.persistence.Parameter;
  12 +import javax.persistence.TemporalType;
  13 +import javax.persistence.TypedQuery;
  14 +
  15 +public class TypedQueryProxy<X> implements TypedQuery<X> {
  16 +
  17 + private TypedQuery<X> queryDelegate;
  18 + private EntityManagerProxy entityManagerCaller;
  19 +
  20 + public TypedQueryProxy(TypedQuery<X> queryDelegate,
  21 + EntityManagerProxy entityManagerCaller) {
  22 + this.queryDelegate = queryDelegate;
  23 + this.entityManagerCaller = entityManagerCaller;
  24 + }
  25 +
  26 + public List<X> getResultList() {
  27 + entityManagerCaller.joinTransactionIfNecessary();
  28 + return queryDelegate.getResultList();
  29 + }
  30 +
  31 + public X getSingleResult() {
  32 + entityManagerCaller.joinTransactionIfNecessary();
  33 + return queryDelegate.getSingleResult();
  34 + }
  35 +
  36 + public int executeUpdate() {
  37 + entityManagerCaller.joinTransactionIfNecessary();
  38 + return queryDelegate.executeUpdate();
  39 + }
  40 +
  41 + public TypedQuery<X> setMaxResults(int maxResult) {
  42 + queryDelegate.setMaxResults(maxResult);
  43 + return this;
  44 + }
  45 +
  46 + public TypedQuery<X> setFirstResult(int startPosition) {
  47 + queryDelegate.setFirstResult(startPosition);
  48 + return this;
  49 + }
  50 +
  51 + public TypedQuery<X> setHint(String hintName, Object value) {
  52 + queryDelegate.setHint(hintName, value);
  53 + return this;
  54 + }
  55 +
  56 + public int getMaxResults() {
  57 + return queryDelegate.getMaxResults();
  58 + }
  59 +
  60 + public <T> TypedQuery<X> setParameter(Parameter<T> param, T value) {
  61 + queryDelegate.setParameter(param, value);
  62 + return this;
  63 + }
  64 +
  65 + public int getFirstResult() {
  66 + return queryDelegate.getFirstResult();
  67 + }
  68 +
  69 + public TypedQuery<X> setParameter(Parameter<Calendar> param,
  70 + Calendar value, TemporalType temporalType) {
  71 + queryDelegate.setParameter(param, value, temporalType);
  72 + return this;
  73 + }
  74 +
  75 + public TypedQuery<X> setParameter(Parameter<Date> param, Date value,
  76 + TemporalType temporalType) {
  77 + queryDelegate.setParameter(param, value, temporalType);
  78 + return this;
  79 + }
  80 +
  81 + public Map<String, Object> getHints() {
  82 + return queryDelegate.getHints();
  83 + }
  84 +
  85 + public TypedQuery<X> setParameter(String name, Object value) {
  86 + queryDelegate.setParameter(name, value);
  87 + return this;
  88 + }
  89 +
  90 + public TypedQuery<X> setParameter(String name, Calendar value,
  91 + TemporalType temporalType) {
  92 + queryDelegate.setParameter(name, value, temporalType);
  93 + return this;
  94 + }
  95 +
  96 + public TypedQuery<X> setParameter(String name, Date value,
  97 + TemporalType temporalType) {
  98 + queryDelegate.setParameter(name, value, temporalType);
  99 + return this;
  100 + }
  101 +
  102 + public TypedQuery<X> setParameter(int position, Object value) {
  103 + queryDelegate.setParameter(position, value);
  104 + return this;
  105 + }
  106 +
  107 + public TypedQuery<X> setParameter(int position, Calendar value,
  108 + TemporalType temporalType) {
  109 + queryDelegate.setParameter(position, value, temporalType);
  110 + return this;
  111 + }
  112 +
  113 + public TypedQuery<X> setParameter(int position, Date value,
  114 + TemporalType temporalType) {
  115 + queryDelegate.setParameter(position, value, temporalType);
  116 + return this;
  117 + }
  118 +
  119 + public TypedQuery<X> setFlushMode(FlushModeType flushMode) {
  120 + queryDelegate.setFlushMode(flushMode);
  121 + return this;
  122 + }
  123 +
  124 + public TypedQuery<X> setLockMode(LockModeType lockMode) {
  125 + queryDelegate.setLockMode(lockMode);
  126 + return this;
  127 + }
  128 +
  129 + public Set<Parameter<?>> getParameters() {
  130 + return queryDelegate.getParameters();
  131 + }
  132 +
  133 + public Parameter<?> getParameter(String name) {
  134 + return queryDelegate.getParameter(name);
  135 + }
  136 +
  137 + public <T> Parameter<T> getParameter(String name, Class<T> type) {
  138 + return queryDelegate.getParameter(name, type);
  139 + }
  140 +
  141 + public Parameter<?> getParameter(int position) {
  142 + return queryDelegate.getParameter(position);
  143 + }
  144 +
  145 + public <T> Parameter<T> getParameter(int position, Class<T> type) {
  146 + return queryDelegate.getParameter(position, type);
  147 + }
  148 +
  149 + public boolean isBound(Parameter<?> param) {
  150 + return queryDelegate.isBound(param);
  151 + }
  152 +
  153 + public <T> T getParameterValue(Parameter<T> param) {
  154 + return queryDelegate.getParameterValue(param);
  155 + }
  156 +
  157 + public Object getParameterValue(String name) {
  158 + return queryDelegate.getParameterValue(name);
  159 + }
  160 +
  161 + public Object getParameterValue(int position) {
  162 + return queryDelegate.getParameterValue(position);
  163 + }
  164 +
  165 + public FlushModeType getFlushMode() {
  166 + return queryDelegate.getFlushMode();
  167 + }
  168 +
  169 + public LockModeType getLockMode() {
  170 + return queryDelegate.getLockMode();
  171 + }
  172 +
  173 + public <T> T unwrap(Class<T> cls) {
  174 + return queryDelegate.unwrap(cls);
  175 + }
  176 +
  177 +
  178 +
  179 +}
impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/query/QueryProxy.java
View file @79ddb53
@@ -1,213 +0,0 @@ @@ -1,213 +0,0 @@
1 -package br.gov.frameworkdemoiselle.internal.proxy.query;  
2 -  
3 -import java.util.Calendar;  
4 -import java.util.Date;  
5 -import java.util.List;  
6 -import java.util.Map;  
7 -import java.util.Set;  
8 -  
9 -import javax.persistence.FlushModeType;  
10 -import javax.persistence.LockModeType;  
11 -import javax.persistence.Parameter;  
12 -import javax.persistence.Query;  
13 -import javax.persistence.TemporalType;  
14 -  
15 -import br.gov.frameworkdemoiselle.internal.proxy.EntityManagerProxy;  
16 -  
17 -public class QueryProxy implements Query {  
18 -  
19 - private Query queryDelegate;  
20 - private EntityManagerProxy entityManagerCaller;  
21 -  
22 - public QueryProxy(Query queryDelegate,EntityManagerProxy entityManagerCaller){  
23 - this.queryDelegate = queryDelegate;  
24 - this.entityManagerCaller = entityManagerCaller;  
25 - }  
26 -  
27 - @SuppressWarnings("rawtypes")  
28 - public List getResultList() {  
29 - entityManagerCaller.joinTransactionIfNecessary();  
30 - return queryDelegate.getResultList();  
31 - }  
32 -  
33 - /**  
34 - * @see Query.getSingleResult()  
35 - */  
36 - @Override  
37 - public Object getSingleResult() {  
38 - entityManagerCaller.joinTransactionIfNecessary();  
39 - return queryDelegate.getSingleResult();  
40 - }  
41 -  
42 - @Override  
43 - public int executeUpdate() {  
44 - entityManagerCaller.joinTransactionIfNecessary();  
45 - return queryDelegate.executeUpdate();  
46 - }  
47 -  
48 - @Override  
49 - public Query setMaxResults(int maxResult) {  
50 - queryDelegate.setMaxResults(maxResult);  
51 - return this;  
52 - }  
53 -  
54 - @Override  
55 - public int getMaxResults() {  
56 - return queryDelegate.getMaxResults();  
57 - }  
58 -  
59 - @Override  
60 - public Query setFirstResult(int startPosition) {  
61 - queryDelegate.setFirstResult(startPosition);  
62 - return this;  
63 - }  
64 -  
65 - @Override  
66 - public int getFirstResult() {  
67 - return queryDelegate.getFirstResult();  
68 - }  
69 -  
70 - @Override  
71 - public Query setHint(String hintName, Object value) {  
72 - queryDelegate.setHint(hintName, value);  
73 - return this;  
74 - }  
75 -  
76 - @Override  
77 - public Map<String, Object> getHints() {  
78 - return queryDelegate.getHints();  
79 - }  
80 -  
81 - @Override  
82 - public <T> Query setParameter(Parameter<T> param, T value) {  
83 - queryDelegate.setParameter(param, value);  
84 - return this;  
85 - }  
86 -  
87 - @Override  
88 - public Query setParameter(Parameter<Calendar> param, Calendar value,  
89 - TemporalType temporalType) {  
90 - queryDelegate.setParameter(param, value, temporalType);  
91 - return this;  
92 - }  
93 -  
94 - @Override  
95 - public Query setParameter(Parameter<Date> param, Date value,  
96 - TemporalType temporalType) {  
97 - queryDelegate.setParameter(param, value, temporalType);  
98 - return this;  
99 - }  
100 -  
101 - @Override  
102 - public Query setParameter(String name, Object value) {  
103 - queryDelegate.setParameter(name, value);  
104 - return this;  
105 - }  
106 -  
107 - @Override  
108 - public Query setParameter(String name, Calendar value,  
109 - TemporalType temporalType) {  
110 - queryDelegate.setParameter(name, value, temporalType);  
111 - return this;  
112 - }  
113 -  
114 - @Override  
115 - public Query setParameter(String name, Date value, TemporalType temporalType) {  
116 - queryDelegate.setParameter(name, value, temporalType);  
117 - return this;  
118 - }  
119 -  
120 - @Override  
121 - public Query setParameter(int position, Object value) {  
122 - queryDelegate.setParameter(position, value);  
123 - return this;  
124 - }  
125 -  
126 - @Override  
127 - public Query setParameter(int position, Calendar value,  
128 - TemporalType temporalType) {  
129 - queryDelegate.setParameter(position, value, temporalType);  
130 - return this;  
131 - }  
132 -  
133 - @Override  
134 - public Query setParameter(int position, Date value,  
135 - TemporalType temporalType) {  
136 - queryDelegate.setParameter(position, value, temporalType);  
137 - return this;  
138 - }  
139 -  
140 - @Override  
141 - public Set<Parameter<?>> getParameters() {  
142 - return queryDelegate.getParameters();  
143 - }  
144 -  
145 - @Override  
146 - public Parameter<?> getParameter(String name) {  
147 - return queryDelegate.getParameter(name);  
148 - }  
149 -  
150 - @Override  
151 - public <T> Parameter<T> getParameter(String name, Class<T> type) {  
152 - return queryDelegate.getParameter(name, type);  
153 - }  
154 -  
155 - @Override  
156 - public Parameter<?> getParameter(int position) {  
157 - return queryDelegate.getParameter(position);  
158 - }  
159 -  
160 - @Override  
161 - public <T> Parameter<T> getParameter(int position, Class<T> type) {  
162 - return queryDelegate.getParameter(position, type);  
163 - }  
164 -  
165 - @Override  
166 - public boolean isBound(Parameter<?> param) {  
167 - return queryDelegate.isBound(param);  
168 - }  
169 -  
170 - @Override  
171 - public <T> T getParameterValue(Parameter<T> param) {  
172 - return queryDelegate.getParameterValue(param);  
173 - }  
174 -  
175 - @Override  
176 - public Object getParameterValue(String name) {  
177 - return queryDelegate.getParameterValue(name);  
178 - }  
179 -  
180 - @Override  
181 - public Object getParameterValue(int position) {  
182 - return queryDelegate.getParameterValue(position);  
183 - }  
184 -  
185 - @Override  
186 - public Query setFlushMode(FlushModeType flushMode) {  
187 - queryDelegate.setFlushMode(flushMode);  
188 - return this;  
189 - }  
190 -  
191 - @Override  
192 - public FlushModeType getFlushMode() {  
193 - return queryDelegate.getFlushMode();  
194 - }  
195 -  
196 - @Override  
197 - public Query setLockMode(LockModeType lockMode) {  
198 - entityManagerCaller.joinTransactionIfNecessary();  
199 - queryDelegate.setLockMode(lockMode);  
200 - return this;  
201 - }  
202 -  
203 - @Override  
204 - public LockModeType getLockMode() {  
205 - return queryDelegate.getLockMode();  
206 - }  
207 -  
208 - @Override  
209 - public <T> T unwrap(Class<T> cls) {  
210 - return queryDelegate.unwrap(cls);  
211 - }  
212 -  
213 -}  
impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/query/TypedQueryProxy.java
View file @79ddb53
@@ -1,181 +0,0 @@ @@ -1,181 +0,0 @@
1 -package br.gov.frameworkdemoiselle.internal.proxy.query;  
2 -  
3 -import java.util.Calendar;  
4 -import java.util.Date;  
5 -import java.util.List;  
6 -import java.util.Map;  
7 -import java.util.Set;  
8 -  
9 -import javax.persistence.FlushModeType;  
10 -import javax.persistence.LockModeType;  
11 -import javax.persistence.Parameter;  
12 -import javax.persistence.TemporalType;  
13 -import javax.persistence.TypedQuery;  
14 -  
15 -import br.gov.frameworkdemoiselle.internal.proxy.EntityManagerProxy;  
16 -  
17 -public class TypedQueryProxy<X> implements TypedQuery<X> {  
18 -  
19 - private TypedQuery<X> queryDelegate;  
20 - private EntityManagerProxy entityManagerCaller;  
21 -  
22 - public TypedQueryProxy(TypedQuery<X> queryDelegate,  
23 - EntityManagerProxy entityManagerCaller) {  
24 - this.queryDelegate = queryDelegate;  
25 - this.entityManagerCaller = entityManagerCaller;  
26 - }  
27 -  
28 - public List<X> getResultList() {  
29 - entityManagerCaller.joinTransactionIfNecessary();  
30 - return queryDelegate.getResultList();  
31 - }  
32 -  
33 - public X getSingleResult() {  
34 - entityManagerCaller.joinTransactionIfNecessary();  
35 - return queryDelegate.getSingleResult();  
36 - }  
37 -  
38 - public int executeUpdate() {  
39 - entityManagerCaller.joinTransactionIfNecessary();  
40 - return queryDelegate.executeUpdate();  
41 - }  
42 -  
43 - public TypedQuery<X> setMaxResults(int maxResult) {  
44 - queryDelegate.setMaxResults(maxResult);  
45 - return this;  
46 - }  
47 -  
48 - public TypedQuery<X> setFirstResult(int startPosition) {  
49 - queryDelegate.setFirstResult(startPosition);  
50 - return this;  
51 - }  
52 -  
53 - public TypedQuery<X> setHint(String hintName, Object value) {  
54 - queryDelegate.setHint(hintName, value);  
55 - return this;  
56 - }  
57 -  
58 - public int getMaxResults() {  
59 - return queryDelegate.getMaxResults();  
60 - }  
61 -  
62 - public <T> TypedQuery<X> setParameter(Parameter<T> param, T value) {  
63 - queryDelegate.setParameter(param, value);  
64 - return this;  
65 - }  
66 -  
67 - public int getFirstResult() {  
68 - return queryDelegate.getFirstResult();  
69 - }  
70 -  
71 - public TypedQuery<X> setParameter(Parameter<Calendar> param,  
72 - Calendar value, TemporalType temporalType) {  
73 - queryDelegate.setParameter(param, value, temporalType);  
74 - return this;  
75 - }  
76 -  
77 - public TypedQuery<X> setParameter(Parameter<Date> param, Date value,  
78 - TemporalType temporalType) {  
79 - queryDelegate.setParameter(param, value, temporalType);  
80 - return this;  
81 - }  
82 -  
83 - public Map<String, Object> getHints() {  
84 - return queryDelegate.getHints();  
85 - }  
86 -  
87 - public TypedQuery<X> setParameter(String name, Object value) {  
88 - queryDelegate.setParameter(name, value);  
89 - return this;  
90 - }  
91 -  
92 - public TypedQuery<X> setParameter(String name, Calendar value,  
93 - TemporalType temporalType) {  
94 - queryDelegate.setParameter(name, value, temporalType);  
95 - return this;  
96 - }  
97 -  
98 - public TypedQuery<X> setParameter(String name, Date value,  
99 - TemporalType temporalType) {  
100 - queryDelegate.setParameter(name, value, temporalType);  
101 - return this;  
102 - }  
103 -  
104 - public TypedQuery<X> setParameter(int position, Object value) {  
105 - queryDelegate.setParameter(position, value);  
106 - return this;  
107 - }  
108 -  
109 - public TypedQuery<X> setParameter(int position, Calendar value,  
110 - TemporalType temporalType) {  
111 - queryDelegate.setParameter(position, value, temporalType);  
112 - return this;  
113 - }  
114 -  
115 - public TypedQuery<X> setParameter(int position, Date value,  
116 - TemporalType temporalType) {  
117 - queryDelegate.setParameter(position, value, temporalType);  
118 - return this;  
119 - }  
120 -  
121 - public TypedQuery<X> setFlushMode(FlushModeType flushMode) {  
122 - queryDelegate.setFlushMode(flushMode);  
123 - return this;  
124 - }  
125 -  
126 - public TypedQuery<X> setLockMode(LockModeType lockMode) {  
127 - queryDelegate.setLockMode(lockMode);  
128 - return this;  
129 - }  
130 -  
131 - public Set<Parameter<?>> getParameters() {  
132 - return queryDelegate.getParameters();  
133 - }  
134 -  
135 - public Parameter<?> getParameter(String name) {  
136 - return queryDelegate.getParameter(name);  
137 - }  
138 -  
139 - public <T> Parameter<T> getParameter(String name, Class<T> type) {  
140 - return queryDelegate.getParameter(name, type);  
141 - }  
142 -  
143 - public Parameter<?> getParameter(int position) {  
144 - return queryDelegate.getParameter(position);  
145 - }  
146 -  
147 - public <T> Parameter<T> getParameter(int position, Class<T> type) {  
148 - return queryDelegate.getParameter(position, type);  
149 - }  
150 -  
151 - public boolean isBound(Parameter<?> param) {  
152 - return queryDelegate.isBound(param);  
153 - }  
154 -  
155 - public <T> T getParameterValue(Parameter<T> param) {  
156 - return queryDelegate.getParameterValue(param);  
157 - }  
158 -  
159 - public Object getParameterValue(String name) {  
160 - return queryDelegate.getParameterValue(name);  
161 - }  
162 -  
163 - public Object getParameterValue(int position) {  
164 - return queryDelegate.getParameterValue(position);  
165 - }  
166 -  
167 - public FlushModeType getFlushMode() {  
168 - return queryDelegate.getFlushMode();  
169 - }  
170 -  
171 - public LockModeType getLockMode() {  
172 - return queryDelegate.getLockMode();  
173 - }  
174 -  
175 - public <T> T unwrap(Class<T> cls) {  
176 - return queryDelegate.unwrap(cls);  
177 - }  
178 -  
179 -  
180 -  
181 -}  
impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/internal/proxy/EntityManagerProxyTest.java
  Diff comments   View file @fe6509a
@@ -65,7 +65,6 @@ import org.powermock.modules.junit4.PowerMockRunner; @@ -65,7 +65,6 @@ import org.powermock.modules.junit4.PowerMockRunner;
65 65
66 import br.gov.frameworkdemoiselle.internal.producer.EntityManagerProducer; 66 import br.gov.frameworkdemoiselle.internal.producer.EntityManagerProducer;
67 import br.gov.frameworkdemoiselle.internal.producer.FakeEntityManager; 67 import br.gov.frameworkdemoiselle.internal.producer.FakeEntityManager;
68 -import br.gov.frameworkdemoiselle.internal.proxy.query.QueryProxy;  
69 import br.gov.frameworkdemoiselle.util.Beans; 68 import br.gov.frameworkdemoiselle.util.Beans;
70 69
71 @RunWith(PowerMockRunner.class) 70 @RunWith(PowerMockRunner.class)
@@ -78,14 +77,11 @@ public class EntityManagerProxyTest { @@ -78,14 +77,11 @@ public class EntityManagerProxyTest {
78 77
79 private EntityManagerProducer entityManagerContext; 78 private EntityManagerProducer entityManagerContext;
80 79
81 - private EntityTransaction transaction;  
82 -  
83 @Before 80 @Before
84 public void setUp() throws Exception { 81 public void setUp() throws Exception {
85 mockStatic(Beans.class); 82 mockStatic(Beans.class);
86 this.entityManager = EasyMock.createMock(EntityManager.class); 83 this.entityManager = EasyMock.createMock(EntityManager.class);
87 this.entityManagerContext = EasyMock.createMock(EntityManagerProducer.class); 84 this.entityManagerContext = EasyMock.createMock(EntityManagerProducer.class);
88 - this.transaction = EasyMock.createMock(EntityTransaction.class);  
89 85
90 expect(Beans.getReference(EntityManagerProducer.class)).andReturn(this.entityManagerContext).anyTimes(); 86 expect(Beans.getReference(EntityManagerProducer.class)).andReturn(this.entityManagerContext).anyTimes();
91 expect(this.entityManagerContext.getEntityManager("teste")).andReturn(this.entityManager).anyTimes(); 87 expect(this.entityManagerContext.getEntityManager("teste")).andReturn(this.entityManager).anyTimes();
@@ -343,7 +339,6 @@ public class EntityManagerProxyTest { @@ -343,7 +339,6 @@ public class EntityManagerProxyTest {
343 public void testCreateQuery() { 339 public void testCreateQuery() {
344 Query query = EasyMock.createMock(Query.class); 340 Query query = EasyMock.createMock(Query.class);
345 expect(this.entityManager.createQuery("teste")).andReturn(query); 341 expect(this.entityManager.createQuery("teste")).andReturn(query);
346 - expect(this.entityManager.getTransaction()).andReturn(transaction);  
347 replay(this.entityManager); 342 replay(this.entityManager);
348 assertTrue(Query.class.isAssignableFrom(this.entityManagerProxy.createQuery("teste").getClass()) ); 343 assertTrue(Query.class.isAssignableFrom(this.entityManagerProxy.createQuery("teste").getClass()) );
349 verify(this.entityManager); 344 verify(this.entityManager);
@@ -356,7 +351,6 @@ public class EntityManagerProxyTest { @@ -356,7 +351,6 @@ public class EntityManagerProxyTest {
356 351
357 CriteriaQuery<Object> criteriaQuery = null; 352 CriteriaQuery<Object> criteriaQuery = null;
358 expect(this.entityManager.createQuery(criteriaQuery)).andReturn(typedQuery); 353 expect(this.entityManager.createQuery(criteriaQuery)).andReturn(typedQuery);
359 - expect(this.entityManager.getTransaction()).andReturn(transaction);  
360 replay(this.entityManager); 354 replay(this.entityManager);
361 assertTrue(TypedQuery.class.isAssignableFrom(this.entityManagerProxy.createQuery(criteriaQuery).getClass())); 355 assertTrue(TypedQuery.class.isAssignableFrom(this.entityManagerProxy.createQuery(criteriaQuery).getClass()));
362 verify(this.entityManager); 356 verify(this.entityManager);
@@ -368,7 +362,6 @@ public class EntityManagerProxyTest { @@ -368,7 +362,6 @@ public class EntityManagerProxyTest {
368 TypedQuery<String> typeQuery = EasyMock.createMock(TypedQuery.class); 362 TypedQuery<String> typeQuery = EasyMock.createMock(TypedQuery.class);
369 363
370 expect(this.entityManager.createQuery("teste", String.class)).andReturn(typeQuery); 364 expect(this.entityManager.createQuery("teste", String.class)).andReturn(typeQuery);
371 - expect(this.entityManager.getTransaction()).andReturn(transaction);  
372 replay(this.entityManager); 365 replay(this.entityManager);
373 assertTrue(TypedQuery.class.isAssignableFrom(this.entityManagerProxy.createQuery("teste", String.class).getClass())); 366 assertTrue(TypedQuery.class.isAssignableFrom(this.entityManagerProxy.createQuery("teste", String.class).getClass()));
374 verify(this.entityManager); 367 verify(this.entityManager);
@@ -378,7 +371,6 @@ public class EntityManagerProxyTest { @@ -378,7 +371,6 @@ public class EntityManagerProxyTest {
378 public void testCreateNamedQuery() { 371 public void testCreateNamedQuery() {
379 Query query = EasyMock.createMock(Query.class); 372 Query query = EasyMock.createMock(Query.class);
380 expect(this.entityManager.createNamedQuery("teste")).andReturn(query); 373 expect(this.entityManager.createNamedQuery("teste")).andReturn(query);
381 - expect(this.entityManager.getTransaction()).andReturn(transaction);  
382 replay(this.entityManager); 374 replay(this.entityManager);
383 assertTrue(Query.class.isAssignableFrom(this.entityManagerProxy.createNamedQuery("teste").getClass())); 375 assertTrue(Query.class.isAssignableFrom(this.entityManagerProxy.createNamedQuery("teste").getClass()));
384 verify(this.entityManager); 376 verify(this.entityManager);
@@ -389,7 +381,6 @@ public class EntityManagerProxyTest { @@ -389,7 +381,6 @@ public class EntityManagerProxyTest {
389 @SuppressWarnings("unchecked") 381 @SuppressWarnings("unchecked")
390 TypedQuery<String> typedQuery = EasyMock.createMock(TypedQuery.class); 382 TypedQuery<String> typedQuery = EasyMock.createMock(TypedQuery.class);
391 expect(this.entityManager.createNamedQuery("teste", String.class)).andReturn(typedQuery); 383 expect(this.entityManager.createNamedQuery("teste", String.class)).andReturn(typedQuery);
392 - expect(this.entityManager.getTransaction()).andReturn(transaction);  
393 replay(this.entityManager); 384 replay(this.entityManager);
394 assertEquals(typedQuery, this.entityManagerProxy.createNamedQuery("teste", String.class)); 385 assertEquals(typedQuery, this.entityManagerProxy.createNamedQuery("teste", String.class));
395 verify(this.entityManager); 386 verify(this.entityManager);
impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/internal/proxy/QueryProxyTest.java
  Diff comments   View file @fe6509a
@@ -28,7 +28,6 @@ import org.powermock.reflect.Whitebox; @@ -28,7 +28,6 @@ import org.powermock.reflect.Whitebox;
28 28
29 import br.gov.frameworkdemoiselle.domain.Client; 29 import br.gov.frameworkdemoiselle.domain.Client;
30 import br.gov.frameworkdemoiselle.internal.producer.EntityManagerProducer; 30 import br.gov.frameworkdemoiselle.internal.producer.EntityManagerProducer;
31 -import br.gov.frameworkdemoiselle.internal.proxy.query.QueryProxy;  
32 import br.gov.frameworkdemoiselle.util.Beans; 31 import br.gov.frameworkdemoiselle.util.Beans;
33 32
34 /** 33 /**
impl/extension/jpa/src/test/java/br/gov/frameworkdemoiselle/internal/proxy/TypedQueryProxyTest.java
  Diff comments   View file @fe6509a
@@ -29,7 +29,6 @@ import org.powermock.reflect.Whitebox; @@ -29,7 +29,6 @@ import org.powermock.reflect.Whitebox;
29 29
30 import br.gov.frameworkdemoiselle.domain.Client; 30 import br.gov.frameworkdemoiselle.domain.Client;
31 import br.gov.frameworkdemoiselle.internal.producer.EntityManagerProducer; 31 import br.gov.frameworkdemoiselle.internal.producer.EntityManagerProducer;
32 -import br.gov.frameworkdemoiselle.internal.proxy.query.TypedQueryProxy;  
33 import br.gov.frameworkdemoiselle.util.Beans; 32 import br.gov.frameworkdemoiselle.util.Beans;
34 33
35 /** 34 /**