Download as
Browse Code »

Commit ce421cf22d45245f36929a02da9c620e49b75ca7

Authored by Cleverson Sacramento
1 parent 31573b33
Exists in master

Remoção das anotações @Alternative das estratégias de transação e 

melhorias no TransactionBootstrap (mas ainda não definitivas).
Showing 3 changed files with 5 additions and 18 deletions   Show diff stats
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/TransactionBootstrap.java
  Diff comments   View file @ce421cf
... ... @@ -51,22 +51,13 @@ public class TransactionBootstrap extends AbstractBootstrap {
51 51 public <T> void processAnnotatedType(@Observes final ProcessAnnotatedType<T> event) throws ConfigurationException {
52 52  
53 53 Configuration config = new PropertiesConfiguration("demoiselle.properties");
54   - String selected = config.getString("frameworkdemoiselle.transaction.class");
  54 + String selected = config.getString("frameworkdemoiselle.transaction.class",
  55 + DefaultTransaction.class.getCanonicalName());
55 56  
56 57 Class<?> type = event.getAnnotatedType().getJavaClass();
57   - if (Transaction.class.isAssignableFrom(type) && type != Transaction.class && type != DefaultTransaction.class) {
58   - if (selected != null && !selected.equals(type.getCanonicalName())) {
59   - event.veto();
60   - }
  58 + if (Transaction.class.isAssignableFrom(type) && type != Transaction.class
  59 + && !type.getCanonicalName().equals(selected)) {
  60 + event.veto();
61 61 }
62   -
63   - // final AnnotatedType<T> annotatedType = event.getAnnotatedType();
64   - // for (AnnotatedMethod<?> am : annotatedType.getMethods()) {
65   - // if (am.isAnnotationPresent(annotationClass)) {
66   - // @SuppressWarnings("unchecked")
67   - // AnnotatedMethod<T> annotatedMethod = (AnnotatedMethod<T>) am;
68   - // processors.add(new StartupProcessor<T>(annotatedMethod, beanManager));
69   - // }
70   - // }
71 62 }
72 63 }
... ...
impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/transaction/JPATransaction.java
  Diff comments   View file @ce421cf
... ... @@ -39,7 +39,6 @@ package br.gov.frameworkdemoiselle.transaction;
39 39 import java.util.Collection;
40 40  
41 41 import javax.enterprise.context.RequestScoped;
42   -import javax.enterprise.inject.Alternative;
43 42 import javax.inject.Inject;
44 43 import javax.persistence.EntityManager;
45 44 import javax.persistence.EntityTransaction;
... ... @@ -52,7 +51,6 @@ import br.gov.frameworkdemoiselle.internal.producer.EntityManagerProducer;
52 51 * @author SERPRO
53 52 * @see Transaction
54 53 */
55   -@Alternative
56 54 @RequestScoped
57 55 public class JPATransaction implements Transaction {
58 56  
... ...
impl/extension/jta/src/main/java/br/gov/frameworkdemoiselle/transaction/JTATransaction.java
  Diff comments   View file @ce421cf
... ... @@ -37,14 +37,12 @@
37 37 package br.gov.frameworkdemoiselle.transaction;
38 38  
39 39 import javax.enterprise.context.RequestScoped;
40   -import javax.enterprise.inject.Alternative;
41 40 import javax.transaction.Status;
42 41 import javax.transaction.SystemException;
43 42 import javax.transaction.UserTransaction;
44 43  
45 44 import br.gov.frameworkdemoiselle.util.Beans;
46 45  
47   -@Alternative
48 46 @RequestScoped
49 47 public class JTATransaction implements Transaction {
50 48  
... ...