Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-5258 isLoaded and superclasses and private properties now works 

Use getDeclaredField and getDeclaredMethod, use the whole class hierarchy
and use a cache to speed up both class hierarchy
and property to Member computation

git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@19601 1b8cb986-b30d-0410-93ca-fae66ebed9b2
This commit is contained in:
Emmanuel Bernard 2010-05-25 13:08:22 +00:00
parent 66ef8d95c5
commit 30ea7142e8
3 changed files with 125 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
entitymanager/src/main/java/org/hibernate/ejb/EntityManagerFactoryImpl.java
View File

@ -65,6 +65,7 @@ public class EntityManagerFactoryImpl implements HibernateEntityManagerFactory {
private final Metamodel metamodel;
private final HibernatePersistenceUnitUtil util;
private final Map<String,Object> properties;
private final PersistenceUtilHelper.MetadataCache cache = new PersistenceUtilHelper.MetadataCache();
@SuppressWarnings( "unchecked" )
public EntityManagerFactoryImpl(
@ -182,13 +183,15 @@ public class EntityManagerFactoryImpl implements HibernateEntityManagerFactory {
private static class HibernatePersistenceUnitUtil implements PersistenceUnitUtil, Serializable {
private final HibernateEntityManagerFactory emf;
private transient PersistenceUtilHelper.MetadataCache cache;
private HibernatePersistenceUnitUtil(EntityManagerFactoryImpl emf) {
this.emf = emf;
this.cache = emf.cache;
}
public boolean isLoaded(Object entity, String attributeName) {
LoadState state = PersistenceUtilHelper.isLoadedWithoutReference( entity, attributeName );
LoadState state = PersistenceUtilHelper.isLoadedWithoutReference( entity, attributeName, cache );
if (state == LoadState.LOADED) {
return true;
}
@ -196,7 +199,7 @@ public class EntityManagerFactoryImpl implements HibernateEntityManagerFactory {
return false;
}
else {
return PersistenceUtilHelper.isLoadedWithReference( entity, attributeName ) != LoadState.NOT_LOADED;
return PersistenceUtilHelper.isLoadedWithReference( entity, attributeName, cache ) != LoadState.NOT_LOADED;
}
}

5
entitymanager/src/main/java/org/hibernate/ejb/HibernatePersistence.java
View File

@ -38,6 +38,7 @@ import org.hibernate.ejb.util.PersistenceUtilHelper;
* @author Gavin King
*/
public class HibernatePersistence extends AvailableSettings implements PersistenceProvider {
private final PersistenceUtilHelper.MetadataCache cache = new PersistenceUtilHelper.MetadataCache();
/**
* Get an entity manager factory by its entity manager name, using the specified
@ -85,11 +86,11 @@ public class HibernatePersistence extends AvailableSettings implements Persisten
private final ProviderUtil providerUtil = new ProviderUtil() {
public LoadState isLoadedWithoutReference(Object proxy, String property) {
return PersistenceUtilHelper.isLoadedWithoutReference( proxy, property );
return PersistenceUtilHelper.isLoadedWithoutReference( proxy, property, cache );
}
public LoadState isLoadedWithReference(Object proxy, String property) {
return PersistenceUtilHelper.isLoadedWithReference( proxy, property );
return PersistenceUtilHelper.isLoadedWithReference( proxy, property, cache );
}
public LoadState isLoaded(Object o) {

147
entitymanager/src/main/java/org/hibernate/ejb/util/PersistenceUtilHelper.java
View File

@ -1,14 +1,21 @@
package org.hibernate.ejb.util;
import java.io.Serializable;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Member;
import java.lang.reflect.Modifier;
import java.lang.reflect.AccessibleObject;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.WeakHashMap;
import javax.persistence.spi.LoadState;
import javax.persistence.PersistenceException;
import org.hibernate.AssertionFailure;
import org.hibernate.proxy.HibernateProxy;
import org.hibernate.proxy.LazyInitializer;
import org.hibernate.intercept.FieldInterceptionHelper;
@ -19,7 +26,7 @@ import org.hibernate.collection.PersistentCollection;
* @author Emmanuel Bernard
*/
public class PersistenceUtilHelper {
public static LoadState isLoadedWithoutReference(Object proxy, String property) {
public static LoadState isLoadedWithoutReference(Object proxy, String property, MetadataCache cache) {
Object entity;
boolean sureFromUs = false;
if ( proxy instanceof HibernateProxy ) {
@ -44,7 +51,7 @@ public class PersistenceUtilHelper {
if (isInitialized && interceptor != null) {
//property is loaded according to bytecode enhancement, but is it loaded as far as association?
//it's ours, we can read
state = isLoaded( get( entity, property ) );
state = isLoaded( get( entity, property, cache ) );
//it's ours so we know it's loaded
if (state == LoadState.UNKNOWN) state = LoadState.LOADED;
}
@ -54,7 +61,7 @@ public class PersistenceUtilHelper {
else if ( sureFromUs ) { //interceptor == null
//property is loaded according to bytecode enhancement, but is it loaded as far as association?
//it's ours, we can read
state = isLoaded( get( entity, property ) );
state = isLoaded( get( entity, property, cache ) );
//it's ours so we know it's loaded
if (state == LoadState.UNKNOWN) state = LoadState.LOADED;
}
@ -71,31 +78,25 @@ public class PersistenceUtilHelper {
}
}
public static LoadState isLoadedWithReference(Object proxy, String property) {
public static LoadState isLoadedWithReference(Object proxy, String property, MetadataCache cache) {
//for sure we don't instrument and for sure it's not a lazy proxy
Object object = get(proxy, property);
Object object = get(proxy, property, cache);
return isLoaded( object );
}
private static Object get(Object proxy, String property) {
private static Object get(Object proxy, String property, MetadataCache cache) {
final Class<?> clazz = proxy.getClass();
try {
try {
final Field field = clazz.getField( property );
setAccessibility( field );
return field.get( proxy );
Member member = cache.getMember( clazz, property );
if (member instanceof Field) {
return ( (Field) member ).get( proxy );
}
catch ( NoSuchFieldException e ) {
final Method method = getMethod( clazz, property );
if (method != null) {
setAccessibility( method );
return method.invoke( proxy );
else if (member instanceof Method) {
return ( (Method) member ).invoke( proxy );
}
else {
throw new PersistenceException( "Unable to find field or method: "
+ clazz + "#"
+ property);
}
throw new AssertionFailure( "Member object neither Field nor Method: " + member);
}
}
catch ( IllegalAccessException e ) {
@ -110,6 +111,27 @@ public class PersistenceUtilHelper {
}
}
private static void setAccessibility(Member member) {
if ( !Modifier.isPublic( member.getModifiers() ) ) {
//Sun's ease of use, sigh...
( ( AccessibleObject ) member ).setAccessible( true );
}
}
public static LoadState isLoaded(Object o) {
if ( o instanceof HibernateProxy ) {
final boolean isInitialized = !( ( HibernateProxy ) o ).getHibernateLazyInitializer().isUninitialized();
return isInitialized ? LoadState.LOADED : LoadState.NOT_LOADED;
}
else if ( o instanceof PersistentCollection ) {
final boolean isInitialized = ( ( PersistentCollection ) o ).wasInitialized();
return isInitialized ? LoadState.LOADED : LoadState.NOT_LOADED;
}
else {
return LoadState.UNKNOWN;
}
}
/**
* Returns the method with the specified name or <code>null</code> if it does not exist.
*
@ -135,24 +157,83 @@ public class PersistenceUtilHelper {
}
}
private static void setAccessibility(Member member) {
if ( !Modifier.isPublic( member.getModifiers() ) ) {
//Sun's ease of use, sigh...
( ( AccessibleObject ) member ).setAccessible( true );
}
/**
* Cache hierarchy and member resolution in a weak hash map
*/
//TODO not really thread-safe
public static class MetadataCache implements Serializable {
private transient Map<Class<?>, ClassCache> classCache = new WeakHashMap<Class<?>, ClassCache>();
private void readObject(java.io.ObjectInputStream stream) {
classCache = new WeakHashMap<Class<?>, ClassCache>();
}
public static LoadState isLoaded(Object o) {
if ( o instanceof HibernateProxy ) {
final boolean isInitialized = !( ( HibernateProxy ) o ).getHibernateLazyInitializer().isUninitialized();
return isInitialized ? LoadState.LOADED : LoadState.NOT_LOADED;
Member getMember(Class<?> clazz, String property) {
ClassCache cache = classCache.get( clazz );
if (cache == null) {
cache = new ClassCache(clazz);
classCache.put( clazz, cache );
}
else if ( o instanceof PersistentCollection ) {
final boolean isInitialized = ( ( PersistentCollection ) o ).wasInitialized();
return isInitialized ? LoadState.LOADED : LoadState.NOT_LOADED;
Member member = cache.members.get( property );
if ( member == null ) {
member = findMember( clazz, property );
cache.members.put( property, member );
}
return member;
}
private Member findMember(Class<?> clazz, String property) {
final List<Class<?>> classes = getClassHierarchy( clazz );
for (Class current : classes) {
final Field field;
try {
field = current.getDeclaredField( property );
setAccessibility( field );
return field;
}
catch ( NoSuchFieldException e ) {
final Method method = getMethod( clazz, property );
if (method != null) {
setAccessibility( method );
return method;
}
}
}
//we could not find any match
throw new PersistenceException( "Unable to find field or method: "
+ clazz + "#"
+ property);
}
private List<Class<?>> getClassHierarchy(Class<?> clazz) {
ClassCache cache = classCache.get( clazz );
if (cache == null) {
cache = new ClassCache(clazz);
classCache.put( clazz, cache );
}
return cache.classHierarchy;
}
private static List<Class<?>> findClassHierarchy(Class<?> clazz) {
List<Class<?>> classes = new ArrayList<Class<?>>();
Class<?> current = clazz;
do {
classes.add( current );
current = current.getSuperclass();
}
while ( current != null );
return classes;
}
private static class ClassCache {
List<Class<?>> classHierarchy;
Map<String, Member> members = new HashMap<String, Member>();
public ClassCache(Class<?> clazz) {
classHierarchy = findClassHierarchy( clazz );
}
else {
return LoadState.UNKNOWN;
}
}