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

HHH-9071 When an already initialized proxy is narrowed, initialize the 

new proxy (cherry picked from commit
2cf52cc7f1)

Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
This commit is contained in:
Guillaume Smet 2014-03-21 11:33:49 -04:00 committed by Brett Meyer
parent b03dad0094
commit 6145c9a66a
5 changed files with 265 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java
View File

@ -732,9 +732,19 @@ public class StatefulPersistenceContext implements PersistenceContext {
"proxy not of type HibernateProxy; it is " + proxyOrig.getClass()
);
}
HibernateProxy originalHibernateProxy = (HibernateProxy) proxyOrig;
HibernateProxy newHibernateProxy = (HibernateProxy) proxy;
// set the read-only/modifiable mode in the new proxy to what it was in the original proxy
boolean readOnlyOrig = ( ( HibernateProxy ) proxyOrig ).getHibernateLazyInitializer().isReadOnly();
( ( HibernateProxy ) proxy ).getHibernateLazyInitializer().setReadOnly( readOnlyOrig );
final boolean readOnlyOrig = originalHibernateProxy.getHibernateLazyInitializer().isReadOnly();
newHibernateProxy.getHibernateLazyInitializer().setReadOnly( readOnlyOrig );
// if the original proxy is already initialized, initialize the new proxy
if ( !originalHibernateProxy.getHibernateLazyInitializer().isUninitialized() ) {
newHibernateProxy.getHibernateLazyInitializer().setImplementation(
originalHibernateProxy.getHibernateLazyInitializer().getImplementation() );
}
}
return proxy;
}

50
hibernate-core/src/test/java/org/hibernate/test/proxy/narrow/AbstractEntity.java Normal file
View File

@ -0,0 +1,50 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* JBoss, Home of Professional Open Source
* Copyright 2014 Red Hat Inc. and/or its affiliates and other contributors
* as indicated by the @authors tag. All rights reserved.
* See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU Lesser General Public License, v. 2.1.
* This program is distributed in the hope that it will be useful, but WITHOUT A
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
* You should have received a copy of the GNU Lesser General Public License,
* v.2.1 along with this distribution; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
package org.hibernate.test.proxy.narrow;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
/**
* @author Yoann Rodière
* @author Guillaume Smet
*/
@Entity
public abstract class AbstractEntity {
@Id
@GeneratedValue
private Integer id;
public AbstractEntity() {
super();
}
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
}

46
hibernate-core/src/test/java/org/hibernate/test/proxy/narrow/ConcreteEntity.java Normal file
View File

@ -0,0 +1,46 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* JBoss, Home of Professional Open Source
* Copyright 2014 Red Hat Inc. and/or its affiliates and other contributors
* as indicated by the @authors tag. All rights reserved.
* See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU Lesser General Public License, v. 2.1.
* This program is distributed in the hope that it will be useful, but WITHOUT A
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
* You should have received a copy of the GNU Lesser General Public License,
* v.2.1 along with this distribution; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
package org.hibernate.test.proxy.narrow;
import javax.persistence.Entity;
/**
* @author Yoann Rodière
* @author Guillaume Smet
*/
@Entity
public class ConcreteEntity extends AbstractEntity {
private String content = "text";
public ConcreteEntity() {
super();
}
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
}

67
hibernate-core/src/test/java/org/hibernate/test/proxy/narrow/LazyAbstractEntityReference.java Normal file
View File

@ -0,0 +1,67 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* JBoss, Home of Professional Open Source
* Copyright 2014 Red Hat Inc. and/or its affiliates and other contributors
* as indicated by the @authors tag. All rights reserved.
* See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU Lesser General Public License, v. 2.1.
* This program is distributed in the hope that it will be useful, but WITHOUT A
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
* You should have received a copy of the GNU Lesser General Public License,
* v.2.1 along with this distribution; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
package org.hibernate.test.proxy.narrow;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.ManyToOne;
/**
* @author Yoann Rodière
* @author Guillaume Smet
*/
@Entity
public class LazyAbstractEntityReference {
@Id
@GeneratedValue
private Integer id;
@ManyToOne(fetch = FetchType.LAZY)
private AbstractEntity entity;
protected LazyAbstractEntityReference() {
}
public LazyAbstractEntityReference(AbstractEntity entity) {
super();
setEntity( entity );
}
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public AbstractEntity getEntity() {
return entity;
}
public void setEntity(AbstractEntity entity) {
this.entity = entity;
}
}

90
hibernate-core/src/test/java/org/hibernate/test/proxy/narrow/ProxyNarrowingTest.java Normal file
View File

@ -0,0 +1,90 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* JBoss, Home of Professional Open Source
* Copyright 2014 Red Hat Inc. and/or its affiliates and other contributors
* as indicated by the @authors tag. All rights reserved.
* See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU Lesser General Public License, v. 2.1.
* This program is distributed in the hope that it will be useful, but WITHOUT A
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
* You should have received a copy of the GNU Lesser General Public License,
* v.2.1 along with this distribution; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
package org.hibernate.test.proxy.narrow;
import static org.junit.Assert.assertTrue;
import org.hibernate.Hibernate;
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.proxy.HibernateProxy;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import org.junit.Test;
/**
* @author Yoann Rodière
* @author Guillaume Smet
*/
public class ProxyNarrowingTest extends BaseCoreFunctionalTestCase {
@Override
protected Class<?>[] getAnnotatedClasses() {
return new Class<?>[] { AbstractEntity.class, ConcreteEntity.class, LazyAbstractEntityReference.class };
}
@Test
public void testNarrowedProxyIsInitializedIfOriginalProxyIsInitialized() {
Session session = openSession();
Integer entityReferenceId = null;
// Populate the database
try {
Transaction t = session.beginTransaction();
ConcreteEntity entity = new ConcreteEntity();
session.save( entity );
LazyAbstractEntityReference reference = new LazyAbstractEntityReference( entity );
session.save( reference );
entityReferenceId = reference.getId();
session.flush();
t.commit();
}
finally {
session.close();
}
session = openSession();
try {
// load a proxified version of the entity into the session: the proxy is based on the AbstractEntity class
// as the reference class property is of type AbstractEntity.
LazyAbstractEntityReference reference = (LazyAbstractEntityReference) session.get( LazyAbstractEntityReference.class, entityReferenceId );
AbstractEntity abstractEntityProxy = reference.getEntity();
assertTrue( ( abstractEntityProxy instanceof HibernateProxy ) && !Hibernate.isInitialized( abstractEntityProxy ) );
Hibernate.initialize( abstractEntityProxy );
assertTrue( Hibernate.isInitialized( abstractEntityProxy ) );
// load the concrete class via session.load to trigger the StatefulPersistenceContext.narrowProxy code
ConcreteEntity concreteEntityProxy = (ConcreteEntity) session.load( ConcreteEntity.class, abstractEntityProxy.getId() );
// the new proxy created should be initialized
assertTrue( ( concreteEntityProxy instanceof HibernateProxy ) && Hibernate.isInitialized( concreteEntityProxy ) );
}
finally {
session.close();
}
}
}