Hibernate/hibernate-orm
1
0
Fork 0
mirror of https://github.com/hibernate/hibernate-orm synced 2025-02-09 12:44:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

HHH-8984 Removing the tenantid from EntityEntry (not being used)

Browse Source
This commit is contained in:
Sanne Grinovero 2014-02-24 16:17:34 +00:00
parent 68113fb35b
commit db2a38f5e2
4 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -550,7 +550,6 @@ public EntityEntry addEntry(
lockMode, lockMode,
existsInDatabase, existsInDatabase,
persister, persister,
session.getTenantIdentifier(),
disableVersionIncrement, disableVersionIncrement,
lazyPropertiesAreUnfetched, lazyPropertiesAreUnfetched,
this this

7
hibernate-core/src/main/java/org/hibernate/engine/spi/EntityEntry.java
View File

@ -52,7 +52,6 @@ public final class EntityEntry implements Serializable {
private boolean existsInDatabase; private boolean existsInDatabase;
private Object version; private Object version;
private transient EntityPersister persister; // for convenience to save some lookups private transient EntityPersister persister; // for convenience to save some lookups
private final String tenantId;
private final String entityName; private final String entityName;
private transient EntityKey cachedEntityKey; // cached EntityKey (lazy-initialized) private transient EntityKey cachedEntityKey; // cached EntityKey (lazy-initialized)
private boolean isBeingReplicated; private boolean isBeingReplicated;
@ -69,7 +68,6 @@ public EntityEntry(
final LockMode lockMode, final LockMode lockMode,
final boolean existsInDatabase, final boolean existsInDatabase,
final EntityPersister persister, final EntityPersister persister,
final String tenantId,
final boolean disableVersionIncrement, final boolean disableVersionIncrement,
final boolean lazyPropertiesAreUnfetched, final boolean lazyPropertiesAreUnfetched,
final PersistenceContext persistenceContext) { final PersistenceContext persistenceContext) {
@ -87,7 +85,6 @@ public EntityEntry(
this.isBeingReplicated=disableVersionIncrement; this.isBeingReplicated=disableVersionIncrement;
this.loadedWithLazyPropertiesUnfetched = lazyPropertiesAreUnfetched; this.loadedWithLazyPropertiesUnfetched = lazyPropertiesAreUnfetched;
this.persister=persister; this.persister=persister;
this.tenantId = tenantId;
this.entityName = persister == null ? null : persister.getEntityName(); this.entityName = persister == null ? null : persister.getEntityName();
this.persistenceContext = persistenceContext; this.persistenceContext = persistenceContext;
} }
@ -100,7 +97,6 @@ private EntityEntry(
final SessionFactoryImplementor factory, final SessionFactoryImplementor factory,
final String entityName, final String entityName,
final Serializable id, final Serializable id,
final String tenantId,
final Status status, final Status status,
final Status previousStatus, final Status previousStatus,
final Object[] loadedState, final Object[] loadedState,
@ -114,7 +110,6 @@ private EntityEntry(
this.entityName = entityName; this.entityName = entityName;
this.persister = ( factory == null ? null : factory.getEntityPersister( entityName ) ); this.persister = ( factory == null ? null : factory.getEntityPersister( entityName ) );
this.id = id; this.id = id;
this.tenantId = tenantId;
this.status = status; this.status = status;
this.previousStatus = previousStatus; this.previousStatus = previousStatus;
this.loadedState = loadedState; this.loadedState = loadedState;
@ -396,7 +391,6 @@ public boolean isLoadedWithLazyPropertiesUnfetched() {
public void serialize(ObjectOutputStream oos) throws IOException { public void serialize(ObjectOutputStream oos) throws IOException {
oos.writeObject( entityName ); oos.writeObject( entityName );
oos.writeObject( id ); oos.writeObject( id );
oos.writeObject( tenantId );
oos.writeObject( status.name() ); oos.writeObject( status.name() );
oos.writeObject( (previousStatus == null ? "" : previousStatus.name()) ); oos.writeObject( (previousStatus == null ? "" : previousStatus.name()) );
// todo : potentially look at optimizing these two arrays // todo : potentially look at optimizing these two arrays
@ -431,7 +425,6 @@ public static EntityEntry deserialize(
( persistenceContext.getSession() == null ? null : persistenceContext.getSession().getFactory() ), ( persistenceContext.getSession() == null ? null : persistenceContext.getSession().getFactory() ),
(String) ois.readObject(), (String) ois.readObject(),
( Serializable ) ois.readObject(), ( Serializable ) ois.readObject(),
(String) ois.readObject(),
Status.valueOf( (String) ois.readObject() ), Status.valueOf( (String) ois.readObject() ),
( ( previousStatusString = ( String ) ois.readObject() ).length() == 0 ? ( ( previousStatusString = ( String ) ois.readObject() ).length() == 0 ?
null : null :

1
hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/EnhancerTest.java
View File

@ -302,7 +302,6 @@ private EntityEntry makeEntityEntry() {
LockMode.NONE, LockMode.NONE,
false, false,
null, null,
null,
false, false,
false, false,
null null

1
hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/customer/CustomerEnhancerTest.java
View File

@ -263,7 +263,6 @@ private EntityEntry makeEntityEntry() {
LockMode.NONE, LockMode.NONE,
false, false,
null, null,
null,
false, false,
false, false,
null null