Skip to content

Commit 05842ca

Browse files
committed
HHH-17612 Annotated envers supertype as @Entity instead of superclass
Also, fix a test which mapped the revision entity twice causing some failures
1 parent dd3be96 commit 05842ca

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

hibernate-envers/src/main/java/org/hibernate/envers/DefaultRevisionEntity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
import java.io.Serializable;
88
import java.util.Date;
99

10+
import jakarta.persistence.Entity;
1011
import jakarta.persistence.GeneratedValue;
1112
import jakarta.persistence.Id;
12-
import jakarta.persistence.MappedSuperclass;
1313
import jakarta.persistence.Transient;
1414

1515
/**
1616
* @author Adam Warski (adam at warski dot org)
1717
* @author Chris Cranford
1818
*/
19-
@MappedSuperclass
19+
@Entity
2020
public class DefaultRevisionEntity implements Serializable {
2121
private static final long serialVersionUID = 8530213963961662300L;
2222

hibernate-envers/src/main/java/org/hibernate/envers/DefaultTrackingModifiedEntitiesRevisionEntity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
import java.util.Set;
99
import jakarta.persistence.Column;
1010
import jakarta.persistence.ElementCollection;
11+
import jakarta.persistence.Entity;
1112
import jakarta.persistence.FetchType;
1213
import jakarta.persistence.JoinColumn;
1314
import jakarta.persistence.JoinTable;
14-
import jakarta.persistence.MappedSuperclass;
1515

1616
import org.hibernate.annotations.Fetch;
1717
import org.hibernate.annotations.FetchMode;
@@ -23,7 +23,7 @@
2323
*
2424
* @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com)
2525
*/
26-
@MappedSuperclass
26+
@Entity
2727
public class DefaultTrackingModifiedEntitiesRevisionEntity extends DefaultRevisionEntity {
2828
@ElementCollection(fetch = FetchType.EAGER)
2929
@JoinTable(name = "REVCHANGES", joinColumns = @JoinColumn(name = "REV"))

hibernate-envers/src/main/java/org/hibernate/envers/enhanced/SequenceIdRevisionEntity.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66

77
import java.io.Serializable;
88
import java.util.Date;
9+
10+
import jakarta.persistence.Entity;
911
import jakarta.persistence.GeneratedValue;
1012
import jakarta.persistence.Id;
11-
import jakarta.persistence.MappedSuperclass;
1213
import jakarta.persistence.Transient;
1314

1415
import org.hibernate.annotations.GenericGenerator;
@@ -22,7 +23,7 @@
2223
* @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com)
2324
* @author Chris Cranford
2425
*/
25-
@MappedSuperclass
26+
@Entity
2627
public class SequenceIdRevisionEntity implements Serializable {
2728
private static final long serialVersionUID = 4159156677698841902L;
2829

hibernate-envers/src/main/java/org/hibernate/envers/enhanced/SequenceIdTrackingModifiedEntitiesRevisionEntity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
import java.util.Set;
99
import jakarta.persistence.Column;
1010
import jakarta.persistence.ElementCollection;
11+
import jakarta.persistence.Entity;
1112
import jakarta.persistence.FetchType;
1213
import jakarta.persistence.JoinColumn;
1314
import jakarta.persistence.JoinTable;
14-
import jakarta.persistence.MappedSuperclass;
1515

1616
import org.hibernate.annotations.Fetch;
1717
import org.hibernate.annotations.FetchMode;
@@ -24,7 +24,7 @@
2424
*
2525
* @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com)
2626
*/
27-
@MappedSuperclass
27+
@Entity
2828
public class SequenceIdTrackingModifiedEntitiesRevisionEntity extends SequenceIdRevisionEntity {
2929
@ElementCollection(fetch = FetchType.EAGER)
3030
@JoinTable(name = "REVCHANGES", joinColumns = @JoinColumn(name = "REV"))

hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/reventity/removal/AbstractRevisionEntityRemovalTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ protected void addConfigOptions(Map options) {
3434
@Override
3535
protected Class<?>[] getAnnotatedClasses() {
3636
return new Class<?>[] {
37-
StrTestEntity.class, ListOwnedEntity.class, ListOwningEntity.class,
38-
getRevisionEntityClass()
37+
StrTestEntity.class, ListOwnedEntity.class, ListOwningEntity.class
3938
};
4039
}
4140

0 commit comments

Comments
 (0)