Repository: deltaspike Updated Branches: refs/heads/master 2cc5eeb07 -> 0922aa512
DELTASPIKE-1324 Ensure that class level is read before method level. Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/0922aa51 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/0922aa51 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/0922aa51 Branch: refs/heads/master Commit: 0922aa512a2ba68dc685fc0984fd7662df84a3b9 Parents: 2cc5eeb Author: John D. Ament <johndam...@apache.org> Authored: Thu Mar 8 20:56:27 2018 -0500 Committer: John D. Ament <johndam...@apache.org> Committed: Thu Mar 8 20:56:27 2018 -0500 ---------------------------------------------------------------------- .../jpa/impl/transaction/TransactionStrategyHelper.java | 8 ++------ .../transactional/defaultinjection/TransactionalBean.java | 1 + 2 files changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/0922aa51/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/TransactionStrategyHelper.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/TransactionStrategyHelper.java b/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/TransactionStrategyHelper.java index e6bf768..6c8af2d 100644 --- a/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/TransactionStrategyHelper.java +++ b/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/TransactionStrategyHelper.java @@ -21,7 +21,6 @@ package org.apache.deltaspike.jpa.impl.transaction; import org.apache.deltaspike.core.util.AnnotationUtils; import org.apache.deltaspike.jpa.api.transaction.Transactional; import org.apache.deltaspike.jpa.impl.entitymanager.EntityManagerMetadata; -import org.apache.deltaspike.jpa.impl.entitymanager.EntityManagerRefLookup; import javax.enterprise.context.Dependent; import javax.enterprise.inject.Any; @@ -49,9 +48,6 @@ public class TransactionStrategyHelper implements Serializable @Inject private BeanManager beanManager; - @Inject - private EntityManagerRefLookup entityManagerRefLookup; - /** * <p>This method uses the InvocationContext to scan the @Transactional * interceptor for a manually specified Qualifier.</p> @@ -68,7 +64,7 @@ public class TransactionStrategyHelper implements Serializable public Set<Class<? extends Annotation>> resolveEntityManagerQualifiers(EntityManagerMetadata entityManagerMetadata, Class interceptedTargetClass) { - Set<Class<? extends Annotation>> emQualifiers = new HashSet<Class<? extends Annotation>>(); + Set<Class<? extends Annotation>> emQualifiers = new HashSet<>(); Class<? extends Annotation>[] qualifierClasses = entityManagerMetadata.getQualifiers(); if (qualifierClasses == null || qualifierClasses.length == 1 && Any.class.equals(qualifierClasses[0]) ) @@ -151,8 +147,8 @@ public class TransactionStrategyHelper implements Serializable EntityManagerMetadata createEntityManagerMetadata(InvocationContext context) { EntityManagerMetadata metadata = new EntityManagerMetadata(); - metadata.readFrom(context.getMethod(), beanManager); metadata.readFrom(context.getMethod().getDeclaringClass(), beanManager); + metadata.readFrom(context.getMethod(), beanManager); return metadata; } http://git-wip-us.apache.org/repos/asf/deltaspike/blob/0922aa51/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/defaultinjection/TransactionalBean.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/defaultinjection/TransactionalBean.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/defaultinjection/TransactionalBean.java index 6060f4f..2013d3d 100644 --- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/defaultinjection/TransactionalBean.java +++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/defaultinjection/TransactionalBean.java @@ -25,6 +25,7 @@ import javax.inject.Inject; import javax.persistence.EntityManager; @ApplicationScoped +@Transactional(readOnly = true) public class TransactionalBean { @Inject
