You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2011/12/30 19:22:53 UTC
svn commit: r1225884 - in
/myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl:
./ transaction/
Author: gpetracek
Date: Fri Dec 30 18:22:52 2011
New Revision: 1225884
URL: http://svn.apache.org/viewvc?rev=1225884&view=rev
Log:
EXTCDI-253 and EXTCDI-254 support entity-manager injected via @PersistenceContext
Added:
myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/PersistenceHelper.java
Modified:
myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/LegacyTransactionalInterceptorStrategy.java
myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/transaction/TransactionalInterceptorStrategy.java
Modified: myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/LegacyTransactionalInterceptorStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/LegacyTransactionalInterceptorStrategy.java?rev=1225884&r1=1225883&r2=1225884&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/LegacyTransactionalInterceptorStrategy.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/LegacyTransactionalInterceptorStrategy.java Fri Dec 30 18:22:52 2011
@@ -18,33 +18,26 @@
*/
package org.apache.myfaces.extensions.cdi.jpa.impl;
-import org.apache.myfaces.extensions.cdi.jpa.impl.spi.PersistenceStrategy;
-import org.apache.myfaces.extensions.cdi.jpa.api.Transactional;
import org.apache.myfaces.extensions.cdi.core.impl.util.AnyLiteral;
-import org.apache.myfaces.extensions.cdi.core.api.util.ClassUtils;
-import org.apache.myfaces.extensions.cdi.jpa.impl.transaction.TransactionalInterceptor;
+import org.apache.myfaces.extensions.cdi.jpa.api.Transactional;
+import org.apache.myfaces.extensions.cdi.jpa.impl.spi.PersistenceStrategy;
+import javax.enterprise.context.Dependent;
import javax.enterprise.inject.Alternative;
-import javax.inject.Inject;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.Default;
-import javax.enterprise.context.Dependent;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
+import javax.interceptor.InvocationContext;
import javax.persistence.EntityManager;
import javax.persistence.EntityTransaction;
-import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
-import javax.interceptor.InvocationContext;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Logger;
-import java.util.logging.Level;
+import java.lang.annotation.Annotation;
import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
import java.util.HashSet;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.logging.Level;
+import java.util.logging.Logger;
/**
* <p><b>Attention!</b> although this impl is called 'Default...' it is <b>not</b>
@@ -74,9 +67,6 @@ public class LegacyTransactionalIntercep
{
private static final long serialVersionUID = -1432802805095533499L;
- //don't use final in interceptors
- private static String noFieldMarker = TransactionalInterceptor.class.getName() + ":DEFAULT_FIELD";
-
private @Inject BeanManager beanManager;
private static transient ThreadLocal<AtomicInteger> refCount = new ThreadLocal<AtomicInteger>();
@@ -87,10 +77,6 @@ public class LegacyTransactionalIntercep
private static transient ThreadLocal<HashMap<String, EntityManager>> entityManagerMap =
new ThreadLocal<HashMap<String, EntityManager>>();
- private static transient volatile Map<ClassLoader, Map<String, PersistenceContextMetaEntry>>
- persistenceContextMetaEntries =
- new ConcurrentHashMap<ClassLoader, Map<String, PersistenceContextMetaEntry>>();
-
/**
* {@inheritDoc}
*/
@@ -109,7 +95,7 @@ public class LegacyTransactionalIntercep
if (entityManagerBean == null)
{
//support for special add-ons which introduce backward compatibility - resolves the injected entity manager
- entityManagerEntry = tryToFindEntityManagerEntryInTarget(context.getTarget());
+ entityManagerEntry = PersistenceHelper.tryToFindEntityManagerEntryInTarget(context.getTarget());
if(entityManagerEntry == null)
{
@@ -390,103 +376,6 @@ public class LegacyTransactionalIntercep
}
}
- /*
- * needed for special add-ons - don't change it!
- */
- private EntityManagerEntry tryToFindEntityManagerEntryInTarget(Object target)
- {
- Map<String, PersistenceContextMetaEntry> mapping = persistenceContextMetaEntries.get(getClassLoader());
-
- mapping = initMapping(mapping);
-
- String key = target.getClass().getName();
- PersistenceContextMetaEntry persistenceContextEntry = mapping.get(key);
-
- if( persistenceContextEntry != null && noFieldMarker.equals(persistenceContextEntry.getFieldName()))
- {
- return null;
- }
-
- if(persistenceContextEntry == null)
- {
- persistenceContextEntry = findPersistenceContextEntry(target.getClass());
-
- if(persistenceContextEntry == null)
- {
- mapping.put(key, new PersistenceContextMetaEntry(
- Object.class, noFieldMarker, Default.class.getName(), false));
- return null;
- }
-
- mapping.put(key, persistenceContextEntry);
- }
-
- Field entityManagerField;
- try
- {
- entityManagerField = persistenceContextEntry.getSourceClass()
- .getDeclaredField(persistenceContextEntry.getFieldName());
- }
- catch (NoSuchFieldException e)
- {
- //TODO add logging in case of project stage dev.
- return null;
- }
-
- entityManagerField.setAccessible(true);
- try
- {
- EntityManager entityManager = (EntityManager)entityManagerField.get(target);
- return new EntityManagerEntry(entityManager, persistenceContextEntry);
- }
- catch (IllegalAccessException e)
- {
- //TODO add logging in case of project stage dev.
- return null;
- }
- }
-
- private synchronized Map<String, PersistenceContextMetaEntry> initMapping(
- Map<String, PersistenceContextMetaEntry> mapping)
- {
- if(mapping == null)
- {
- mapping = new ConcurrentHashMap<String, PersistenceContextMetaEntry>();
- persistenceContextMetaEntries.put(getClassLoader(), mapping);
- }
- return mapping;
- }
-
- private PersistenceContextMetaEntry findPersistenceContextEntry(Class target)
- {
- //TODO support other injection types
- Class currentParamClass = target;
- PersistenceContext persistenceContext;
- while (currentParamClass != null && !Object.class.getName().equals(currentParamClass.getName()))
- {
- for(Field currentField : currentParamClass.getDeclaredFields())
- {
- persistenceContext = currentField.getAnnotation(PersistenceContext.class);
- if(persistenceContext != null)
- {
- return new PersistenceContextMetaEntry(
- currentParamClass,
- currentField.getName(),
- persistenceContext.unitName(),
- PersistenceContextType.EXTENDED.equals(persistenceContext.type()));
- }
- }
- currentParamClass = currentParamClass.getSuperclass();
- }
-
- return null;
- }
-
- private ClassLoader getClassLoader()
- {
- return ClassUtils.getClassLoader(null);
- }
-
private IllegalStateException unsupportedUsage(InvocationContext context)
{
String target;
Added: myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/PersistenceHelper.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/PersistenceHelper.java?rev=1225884&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/PersistenceHelper.java (added)
+++ myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/PersistenceHelper.java Fri Dec 30 18:22:52 2011
@@ -0,0 +1,157 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.extensions.cdi.jpa.impl;
+
+import org.apache.myfaces.extensions.cdi.core.api.util.ClassUtils;
+
+import javax.enterprise.inject.Default;
+import javax.enterprise.inject.Typed;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceContextType;
+import java.lang.reflect.Field;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @author Gerhard Petracek
+ */
+@Typed()
+public class PersistenceHelper
+{
+ //don't use final in interceptors
+ private static String noFieldMarker = PersistenceHelper.class.getName() + ":DEFAULT_FIELD";
+
+ private static transient volatile Map<ClassLoader, Map<String, PersistenceContextMetaEntry>>
+ persistenceContextMetaEntries =
+ new ConcurrentHashMap<ClassLoader, Map<String, PersistenceContextMetaEntry>>();
+
+ private PersistenceHelper()
+ {
+ //prevent instantiation
+ }
+
+ public static EntityManager tryToFindEntityManagerReference(Object target)
+ {
+ EntityManagerEntry entityManagerEntry = tryToFindEntityManagerEntryInTarget(target);
+
+ if(entityManagerEntry == null)
+ {
+ return null;
+ }
+ return entityManagerEntry.getEntityManager();
+ }
+
+ /*
+ * needed for special add-ons - don't change it!
+ */
+ static EntityManagerEntry tryToFindEntityManagerEntryInTarget(Object target)
+ {
+ Map<String, PersistenceContextMetaEntry> mapping = persistenceContextMetaEntries.get(getClassLoader());
+
+ mapping = initMapping(mapping);
+
+ String key = target.getClass().getName();
+ PersistenceContextMetaEntry persistenceContextEntry = mapping.get(key);
+
+ if( persistenceContextEntry != null && noFieldMarker.equals(persistenceContextEntry.getFieldName()))
+ {
+ return null;
+ }
+
+ if(persistenceContextEntry == null)
+ {
+ persistenceContextEntry = findPersistenceContextEntry(target.getClass());
+
+ if(persistenceContextEntry == null)
+ {
+ mapping.put(key, new PersistenceContextMetaEntry(
+ Object.class, noFieldMarker, Default.class.getName(), false));
+ return null;
+ }
+
+ mapping.put(key, persistenceContextEntry);
+ }
+
+ Field entityManagerField;
+ try
+ {
+ entityManagerField = persistenceContextEntry.getSourceClass()
+ .getDeclaredField(persistenceContextEntry.getFieldName());
+ }
+ catch (NoSuchFieldException e)
+ {
+ //TODO add logging in case of project stage dev.
+ return null;
+ }
+
+ entityManagerField.setAccessible(true);
+ try
+ {
+ EntityManager entityManager = (EntityManager)entityManagerField.get(target);
+ return new EntityManagerEntry(entityManager, persistenceContextEntry);
+ }
+ catch (IllegalAccessException e)
+ {
+ //TODO add logging in case of project stage dev.
+ return null;
+ }
+ }
+
+ private static synchronized Map<String, PersistenceContextMetaEntry> initMapping(
+ Map<String, PersistenceContextMetaEntry> mapping)
+ {
+ if(mapping == null)
+ {
+ mapping = new ConcurrentHashMap<String, PersistenceContextMetaEntry>();
+ persistenceContextMetaEntries.put(getClassLoader(), mapping);
+ }
+ return mapping;
+ }
+
+ private static PersistenceContextMetaEntry findPersistenceContextEntry(Class target)
+ {
+ //TODO support other injection types
+ Class currentParamClass = target;
+ PersistenceContext persistenceContext;
+ while (currentParamClass != null && !Object.class.getName().equals(currentParamClass.getName()))
+ {
+ for(Field currentField : currentParamClass.getDeclaredFields())
+ {
+ persistenceContext = currentField.getAnnotation(PersistenceContext.class);
+ if(persistenceContext != null)
+ {
+ return new PersistenceContextMetaEntry(
+ currentParamClass,
+ currentField.getName(),
+ persistenceContext.unitName(),
+ PersistenceContextType.EXTENDED.equals(persistenceContext.type()));
+ }
+ }
+ currentParamClass = currentParamClass.getSuperclass();
+ }
+
+ return null;
+ }
+
+ private static ClassLoader getClassLoader()
+ {
+ return ClassUtils.getClassLoader(null);
+ }
+}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/transaction/TransactionalInterceptorStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/transaction/TransactionalInterceptorStrategy.java?rev=1225884&r1=1225883&r2=1225884&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/transaction/TransactionalInterceptorStrategy.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/transaction/TransactionalInterceptorStrategy.java Fri Dec 30 18:22:52 2011
@@ -20,6 +20,7 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.core.impl.util.AnyLiteral;
import org.apache.myfaces.extensions.cdi.jpa.api.Transactional;
+import org.apache.myfaces.extensions.cdi.jpa.impl.PersistenceHelper;
import org.apache.myfaces.extensions.cdi.jpa.impl.spi.PersistenceStrategy;
import org.apache.myfaces.extensions.cdi.jpa.impl.transaction.context.TransactionBeanStorage;
@@ -100,6 +101,12 @@ public class TransactionalInterceptorStr
EntityManager entityManager = resolveEntityManagerForQualifier(qualifierClass);
+ if(entityManager == null)
+ {
+ //fallback to support direct injection via @PersistenceContext
+ entityManager = PersistenceHelper.tryToFindEntityManagerReference(invocationContext.getTarget());
+ }
+
storeEntityManagerForQualifier(qualifierKey, entityManager);
EntityTransaction transaction = entityManager.getTransaction();
@@ -249,6 +256,11 @@ public class TransactionalInterceptorStr
{
Bean<EntityManager> entityManagerBean = resolveEntityManagerBean(qualifierClass);
+ if(entityManagerBean == null)
+ {
+ return null;
+ }
+
return (EntityManager) beanManager.getReference(entityManagerBean, EntityManager.class,
beanManager.createCreationalContext(entityManagerBean));
}