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

HHH-5883: Fixing - @Lob annotated field throws MappingException when the field type is serializable

This commit is contained in:
adamw 2011-01-31 12:26:26 +01:00 committed by JPAV
parent 318352519f
commit 2ccc73454a
3 changed files with 168 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/BasicMetadataGenerator.java
View File

@ -22,15 +22,14 @@
* Boston, MA 02110-1301 USA
*/
package org.hibernate.envers.configuration.metadata;
import java.util.Iterator;
import java.util.Properties;
import org.dom4j.Element;
import org.hibernate.envers.configuration.metadata.reader.PropertyAuditingData;
import org.hibernate.envers.entities.mapper.SimpleMapperBuilder;
import org.hibernate.mapping.Column;
import org.hibernate.mapping.SimpleValue;
import org.hibernate.mapping.Value;
import org.hibernate.type.BasicType;
import org.hibernate.type.SerializableToBlobType;
import org.hibernate.type.Type;
/**
@ -43,7 +42,8 @@ public final class BasicMetadataGenerator {
Value value, SimpleMapperBuilder mapper, boolean insertable, boolean key) {
Type type = value.getType();
if (type instanceof BasicType || "org.hibernate.type.PrimitiveByteArrayBlobType".equals(type.getClass().getName())) {
if (type instanceof BasicType || type instanceof SerializableToBlobType ||
"org.hibernate.type.PrimitiveByteArrayBlobType".equals(type.getClass().getName())) {
if (parent != null) {
boolean addNestedType = (value instanceof SimpleValue) && ((SimpleValue) value).getTypeParameters() != null;
@ -54,7 +54,7 @@ public final class BasicMetadataGenerator {
Element prop_mapping = MetadataTools.addProperty(parent, propertyAuditingData.getName(),
addNestedType ? null : typeName, propertyAuditingData.isForceInsertable() || insertable, key);
MetadataTools.addColumns(prop_mapping, (Iterator<Column>) value.getColumnIterator());
MetadataTools.addColumns(prop_mapping, value.getColumnIterator());
if (addNestedType) {
Properties typeParameters = ((SimpleValue) value).getTypeParameters();

92
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/LobSerializableTestEntity.java Normal file
View File

@ -0,0 +1,92 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
* indicated by the @author tags or express copyright attribution
* statements applied by the authors. All third-party contributions are
* distributed under license by Red Hat Middleware LLC.
*
* 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, as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY 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
* along with this distribution; if not, write to:
* Free Software Foundation, Inc.
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.envers.test.integration.data;
import org.hibernate.envers.Audited;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Lob;
/**
* @author Adam Warski (adam at warski dot org)
*/
@Entity
public class LobSerializableTestEntity {
@Id
@GeneratedValue
private Integer id;
@Audited
@Lob
private SerObject obj;
public LobSerializableTestEntity() {
}
public LobSerializableTestEntity(SerObject obj) {
this.obj = obj;
}
public LobSerializableTestEntity(Integer id, SerObject obj) {
this.obj = obj;
this.id = id;
}
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public SerObject getObj() {
return obj;
}
public void setObj(SerObject obj) {
this.obj = obj;
}
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof LobSerializableTestEntity)) return false;
LobSerializableTestEntity that = (LobSerializableTestEntity) o;
if (id != null ? !id.equals(that.id) : that.id != null) return false;
if (obj != null ? !obj.equals(that.obj) : that.obj != null) return false;
return true;
}
public int hashCode() {
int result;
result = (id != null ? id.hashCode() : 0);
result = 31 * result + (obj != null ? obj.hashCode() : 0);
return result;
}
}

72
hibernate-envers/src/test/java/org/hibernate/envers/test/integration/data/LobSerializables.java Normal file
View File

@ -0,0 +1,72 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as
* indicated by the @author tags or express copyright attribution
* statements applied by the authors. All third-party contributions are
* distributed under license by Red Hat Middleware LLC.
*
* 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, as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY 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
* along with this distribution; if not, write to:
* Free Software Foundation, Inc.
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
package org.hibernate.envers.test.integration.data;
import org.hibernate.ejb.Ejb3Configuration;
import org.hibernate.envers.test.AbstractEntityTest;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import javax.persistence.EntityManager;
import java.util.Arrays;
/**
* @author Adam Warski (adam at warski dot org)
*/
public class LobSerializables extends AbstractEntityTest {
private Integer id1;
public void configure(Ejb3Configuration cfg) {
cfg.addAnnotatedClass(LobSerializableTestEntity.class);
}
@BeforeClass(dependsOnMethods = "init")
public void initData() {
EntityManager em = getEntityManager();
em.getTransaction().begin();
LobSerializableTestEntity ste = new LobSerializableTestEntity(new SerObject("d1"));
em.persist(ste);
id1 = ste.getId();
em.getTransaction().commit();
em.getTransaction().begin();
ste = em.find(LobSerializableTestEntity.class, id1);
ste.setObj(new SerObject("d2"));
em.getTransaction().commit();
}
@Test
public void testRevisionsCounts() {
assert Arrays.asList(1, 2).equals(getAuditReader().getRevisions(LobSerializableTestEntity.class, id1));
}
@Test
public void testHistoryOfId1() {
LobSerializableTestEntity ver1 = new LobSerializableTestEntity(id1, new SerObject("d1"));
LobSerializableTestEntity ver2 = new LobSerializableTestEntity(id1, new SerObject("d2"));
assert getAuditReader().find(LobSerializableTestEntity.class, id1, 1).equals(ver1);
assert getAuditReader().find(LobSerializableTestEntity.class, id1, 2).equals(ver2);
}
}