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

HHH-13823 Make it possible to reuse MergeContext in Hibernate RX. 

Exposes the operations used by DefaultMergeEventListener
This commit is contained in:
gavinking 2020-01-20 21:14:30 +01:00 committed by Sanne Grinovero
parent e5f8341aa4
commit fa952863cf
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hibernate-core/src/main/java/org/hibernate/event/internal/MergeContext.java
View File

@ -77,7 +77,7 @@ import org.jboss.logging.Logger;
* *
* @author Gail Badner * @author Gail Badner
*/ */
class MergeContext implements Map { public class MergeContext implements Map {
private static final Logger LOG = Logger.getLogger( MergeContext.class ); private static final Logger LOG = Logger.getLogger( MergeContext.class );
private final EventSource session; private final EventSource session;
@ -101,7 +101,7 @@ class MergeContext implements Map {
// key is a merge entity; // key is a merge entity;
// value is a flag indicating if the merge entity is currently in the merge process. // value is a flag indicating if the merge entity is currently in the merge process.
MergeContext(EventSource session, EntityCopyObserver entityCopyObserver){ public MergeContext(EventSource session, EntityCopyObserver entityCopyObserver){
this.session = session; this.session = session;
this.entityCopyObserver = entityCopyObserver; this.entityCopyObserver = entityCopyObserver;
} }
@ -226,7 +226,7 @@ class MergeContext implements Map {
* managed entity associated with <code>mergeEntity</code> * managed entity associated with <code>mergeEntity</code>
* @throws IllegalStateException if internal cross-references are out of sync, * @throws IllegalStateException if internal cross-references are out of sync,
*/ */
/* package-private */ Object put(Object mergeEntity, Object managedEntity, boolean isOperatedOn) { public Object put(Object mergeEntity, Object managedEntity, boolean isOperatedOn) {
if ( mergeEntity == null || managedEntity == null ) { if ( mergeEntity == null || managedEntity == null ) {
throw new NullPointerException( "null merge and managed entities are not supported by " + getClass().getName() ); throw new NullPointerException( "null merge and managed entities are not supported by " + getClass().getName() );
} }
@ -347,7 +347,7 @@ class MergeContext implements Map {
* @throws NullPointerException if mergeEntity is null * @throws NullPointerException if mergeEntity is null
* @throws IllegalStateException if this MergeContext does not contain a a cross-reference for mergeEntity * @throws IllegalStateException if this MergeContext does not contain a a cross-reference for mergeEntity
*/ */
/* package-private */ void setOperatedOn(Object mergeEntity, boolean isOperatedOn) { public void setOperatedOn(Object mergeEntity, boolean isOperatedOn) {
if ( mergeEntity == null ) { if ( mergeEntity == null ) {
throw new NullPointerException( "null entities are not supported by " + getClass().getName() ); throw new NullPointerException( "null entities are not supported by " + getClass().getName() );
} }