Hibernate/hibernate-orm
1
0
Fork 0
mirror of https://github.com/hibernate/hibernate-orm synced 2025-02-17 00:24:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

more changes for id type as Object instead of Serializable

Browse Source
This commit is contained in:
Steve Ebersole 2021-01-13 11:38:24 -06:00
parent 4efffca23b
commit e5c40e3af7
5 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hibernate-core/src/main/java/org/hibernate/Session.java
View File

@ -7,7 +7,6 @@
package org.hibernate;
import java.io.Closeable;
import java.io.Serializable;
import java.sql.Connection;
import java.util.List;
import javax.persistence.EntityGraph;
@ -749,7 +748,7 @@ public interface Session extends SharedSessionContract, EntityManager, AutoClose
*
* @see #get(String, Object, LockOptions)
*/
Object get(String entityName, Serializable id, LockMode lockMode);
Object get(String entityName, Object id, LockMode lockMode);
/**
* Return the persistent instance of the given entity class with the given identifier,

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

@ -6,7 +6,6 @@
*/
package org.hibernate.engine.spi;
import java.io.Serializable;
import java.sql.Connection;
import java.util.List;
import java.util.Map;
@ -34,12 +33,12 @@
import org.hibernate.LockOptions;
import org.hibernate.MultiIdentifierLoadAccess;
import org.hibernate.NaturalIdLoadAccess;
import org.hibernate.NaturalIdMultiLoadAccess;
import org.hibernate.ReplicationMode;
import org.hibernate.Session;
import org.hibernate.SessionEventListener;
import org.hibernate.SharedSessionBuilder;
import org.hibernate.SimpleNaturalIdLoadAccess;
import org.hibernate.NaturalIdMultiLoadAccess;
import org.hibernate.Transaction;
import org.hibernate.UnknownProfileException;
import org.hibernate.cache.spi.CacheTransactionSynchronization;
@ -188,7 +187,7 @@ public String guessEntityName(Object entity) throws HibernateException {
}
@Override
public Object instantiate(String entityName, Serializable id) throws HibernateException {
public Object instantiate(String entityName, Object id) throws HibernateException {
return delegate.instantiate( entityName, id );
}
@ -897,7 +896,7 @@ public Object get(String entityName, Object id) {
}
@Override
public Object get(String entityName, Serializable id, LockMode lockMode) {
public Object get(String entityName, Object id, LockMode lockMode) {
return delegate.get( entityName, id, lockMode );
}

2
hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java
View File

@ -310,7 +310,7 @@ Object internalLoad(String entityName, Object id, boolean eager, boolean nullabl
/**
* Instantiate the entity class, initializing with the given identifier
*/
Object instantiate(String entityName, Serializable id) throws HibernateException;
Object instantiate(String entityName, Object id) throws HibernateException;
/**
* Execute a native SQL query, and return the results as a fully built list.

6
hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
View File

@ -48,6 +48,7 @@
import org.hibernate.MappingException;
import org.hibernate.MultiIdentifierLoadAccess;
import org.hibernate.NaturalIdLoadAccess;
import org.hibernate.NaturalIdMultiLoadAccess;
import org.hibernate.ObjectDeletedException;
import org.hibernate.ObjectNotFoundException;
import org.hibernate.ReplicationMode;
@ -56,7 +57,6 @@
import org.hibernate.SessionException;
import org.hibernate.SharedSessionBuilder;
import org.hibernate.SimpleNaturalIdLoadAccess;
import org.hibernate.NaturalIdMultiLoadAccess;
import org.hibernate.Transaction;
import org.hibernate.TransientObjectException;
import org.hibernate.TypeMismatchException;
@ -1097,7 +1097,7 @@ public <T> T get(Class<T> entityClass, Object id, LockOptions lockOptions) throw
}
@Override
public Object get(String entityName, Serializable id, LockMode lockMode) throws HibernateException {
public Object get(String entityName, Object id, LockMode lockMode) throws HibernateException {
return this.byId( entityName ).with( new LockOptions( lockMode ) ).load( id );
}
@ -1377,7 +1377,7 @@ public void forceFlush(EntityEntry entityEntry) throws HibernateException {
}
@Override
public Object instantiate(String entityName, Serializable id) throws HibernateException {
public Object instantiate(String entityName, Object id) throws HibernateException {
return instantiate( getFactory().getMetamodel().entityPersister( entityName ), id );
}

4
hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java
View File

@ -257,9 +257,7 @@ public void initializeCollection(
}
@Override
public Object instantiate(
String entityName,
Serializable id) throws HibernateException {
public Object instantiate(String entityName, Object id) throws HibernateException {
checkOpen();
return getFactory().getMetamodel().entityPersister( entityName ).instantiate( id, this );
}