Skip to content

HHH-18948 rename EventManager -> EventMonitor #9437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 16, 2024
Merged

HHH-18948 rename EventManager -> EventMonitor #9437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c407d36
HHH-18948 rename EventManager -> EventMonitor
gavinking Dec 16, 2024
297e2fb
HHH-18948 move the EventMonitor SPI to its own namespace
gavinking Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion documentation/documentation.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,7 @@ settingsDocumentation {
settingsClassName "org.hibernate.cfg.StatisticsSettings"
}
validation {
summary = "Jakarta Validation Integeration Settings"
summary = "Jakarta Validation Integration Settings"
description = "Settings used in the integration of Jakarta Validation"
settingsClassName "org.hibernate.cfg.ValidationSettings"
}
Expand Down
10 changes: 5 additions & 5 deletions hibernate-core/src/main/java/org/hibernate/action/internal/CollectionRecreateAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
import org.hibernate.HibernateException;
import org.hibernate.collection.spi.PersistentCollection;
import org.hibernate.engine.spi.SharedSessionContractImplementor;
import org.hibernate.event.spi.EventManager;
import org.hibernate.event.monitor.spi.EventMonitor;
import org.hibernate.event.spi.EventSource;
import org.hibernate.event.spi.HibernateMonitoringEvent;
import org.hibernate.event.monitor.spi.DiagnosticEvent;
import org.hibernate.event.spi.PostCollectionRecreateEvent;
import org.hibernate.event.spi.PostCollectionRecreateEventListener;
import org.hibernate.event.spi.PreCollectionRecreateEvent;
Expand Down Expand Up @@ -46,15 +46,15 @@ public void execute() throws HibernateException {
final SharedSessionContractImplementor session = getSession();
final CollectionPersister persister = getPersister();
final Object key = getKey();
final EventManager eventManager = session.getEventManager();
final HibernateMonitoringEvent event = eventManager.beginCollectionRecreateEvent();
final EventMonitor eventMonitor = session.getEventMonitor();
final DiagnosticEvent event = eventMonitor.beginCollectionRecreateEvent();
boolean success = false;
try {
persister.recreate( collection, key, session );
success = true;
}
finally {
eventManager.completeCollectionRecreateEvent( event, key, persister.getRole(), success, session );
eventMonitor.completeCollectionRecreateEvent( event, key, persister.getRole(), success, session );
}

session.getPersistenceContextInternal().getCollectionEntry( collection ).afterAction( collection );
Expand Down
10 changes: 5 additions & 5 deletions hibernate-core/src/main/java/org/hibernate/action/internal/CollectionRemoveAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
import org.hibernate.HibernateException;
import org.hibernate.collection.spi.PersistentCollection;
import org.hibernate.engine.spi.SharedSessionContractImplementor;
import org.hibernate.event.spi.EventManager;
import org.hibernate.event.monitor.spi.EventMonitor;
import org.hibernate.event.spi.EventSource;
import org.hibernate.event.spi.HibernateMonitoringEvent;
import org.hibernate.event.monitor.spi.DiagnosticEvent;
import org.hibernate.event.spi.PostCollectionRemoveEvent;
import org.hibernate.event.spi.PostCollectionRemoveEventListener;
import org.hibernate.event.spi.PreCollectionRemoveEvent;
Expand Down Expand Up @@ -112,15 +112,15 @@ public void execute() throws HibernateException {
// knowing if the collection is actually empty without querying the db)
final CollectionPersister persister = getPersister();
final Object key = getKey();
final EventManager eventManager = session.getEventManager();
final HibernateMonitoringEvent event = eventManager.beginCollectionRemoveEvent();
final EventMonitor eventMonitor = session.getEventMonitor();
final DiagnosticEvent event = eventMonitor.beginCollectionRemoveEvent();
boolean success = false;
try {
persister.remove( key, session );
success = true;
}
finally {
eventManager.completeCollectionRemoveEvent( event, key, persister.getRole(), success, session );
eventMonitor.completeCollectionRemoveEvent( event, key, persister.getRole(), success, session );
}
}

Expand Down
10 changes: 5 additions & 5 deletions hibernate-core/src/main/java/org/hibernate/action/internal/CollectionUpdateAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
import org.hibernate.HibernateException;
import org.hibernate.collection.spi.PersistentCollection;
import org.hibernate.engine.spi.SharedSessionContractImplementor;
import org.hibernate.event.spi.EventManager;
import org.hibernate.event.monitor.spi.EventMonitor;
import org.hibernate.event.spi.EventSource;
import org.hibernate.event.spi.HibernateMonitoringEvent;
import org.hibernate.event.monitor.spi.DiagnosticEvent;
import org.hibernate.event.spi.PostCollectionUpdateEvent;
import org.hibernate.event.spi.PostCollectionUpdateEventListener;
import org.hibernate.event.spi.PreCollectionUpdateEvent;
Expand Down Expand Up @@ -65,8 +65,8 @@ public void execute() throws HibernateException {
// Do nothing - we only need to notify the cache
}
else {
final EventManager eventManager = session.getEventManager();
final HibernateMonitoringEvent event = eventManager.beginCollectionUpdateEvent();
final EventMonitor eventMonitor = session.getEventMonitor();
final DiagnosticEvent event = eventMonitor.beginCollectionUpdateEvent();
boolean success = false;
try {
if ( !affectedByFilters && collection.empty() ) {
Expand All @@ -93,7 +93,7 @@ else if ( collection.needsRecreate( persister ) ) {
success = true;
}
finally {
eventManager.completeCollectionUpdateEvent( event, key, persister.getRole(), success, session );
eventMonitor.completeCollectionUpdateEvent( event, key, persister.getRole(), success, session );
}
}

Expand Down
10 changes: 5 additions & 5 deletions hibernate-core/src/main/java/org/hibernate/action/internal/EntityDeleteAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
import org.hibernate.engine.spi.PersistenceContext;
import org.hibernate.engine.spi.SharedSessionContractImplementor;
import org.hibernate.event.service.spi.EventListenerGroup;
import org.hibernate.event.spi.EventManager;
import org.hibernate.event.monitor.spi.EventMonitor;
import org.hibernate.event.spi.EventSource;
import org.hibernate.event.spi.HibernateMonitoringEvent;
import org.hibernate.event.monitor.spi.DiagnosticEvent;
import org.hibernate.event.spi.PostCommitDeleteEventListener;
import org.hibernate.event.spi.PostDeleteEvent;
import org.hibernate.event.spi.PostDeleteEventListener;
Expand Down Expand Up @@ -128,15 +128,15 @@ public void execute() throws HibernateException {
final Object ck = lockCacheItem();

if ( !isCascadeDeleteEnabled && !veto ) {
final EventManager eventManager = session.getEventManager();
final HibernateMonitoringEvent event = eventManager.beginEntityDeleteEvent();
final EventMonitor eventMonitor = session.getEventMonitor();
final DiagnosticEvent event = eventMonitor.beginEntityDeleteEvent();
boolean success = false;
try {
persister.getDeleteCoordinator().delete( instance, id, version, session );
success = true;
}
finally {
eventManager.completeEntityDeleteEvent( event, id, persister.getEntityName(), success, session );
eventMonitor.completeEntityDeleteEvent( event, id, persister.getEntityName(), success, session );
}
}

Expand Down
10 changes: 5 additions & 5 deletions hibernate-core/src/main/java/org/hibernate/action/internal/EntityIdentityInsertAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
import org.hibernate.engine.spi.PersistenceContext;
import org.hibernate.engine.spi.SharedSessionContractImplementor;
import org.hibernate.event.service.spi.EventListenerGroup;
import org.hibernate.event.spi.EventManager;
import org.hibernate.event.monitor.spi.EventMonitor;
import org.hibernate.event.spi.EventSource;
import org.hibernate.event.spi.HibernateMonitoringEvent;
import org.hibernate.event.monitor.spi.DiagnosticEvent;
import org.hibernate.event.spi.PostCommitInsertEventListener;
import org.hibernate.event.spi.PostInsertEvent;
import org.hibernate.event.spi.PostInsertEventListener;
Expand Down Expand Up @@ -82,8 +82,8 @@ public void execute() throws HibernateException {
// else inserted the same pk first, the insert would fail

if ( !isVeto() ) {
final EventManager eventManager = session.getEventManager();
final HibernateMonitoringEvent event = eventManager.beginEntityInsertEvent();
final EventMonitor eventMonitor = session.getEventMonitor();
final DiagnosticEvent event = eventMonitor.beginEntityInsertEvent();
boolean success = false;
final GeneratedValues generatedValues;
try {
Expand All @@ -92,7 +92,7 @@ public void execute() throws HibernateException {
success = true;
}
finally {
eventManager.completeEntityInsertEvent( event, generatedId, persister.getEntityName(), success, session );
eventMonitor.completeEntityInsertEvent( event, generatedId, persister.getEntityName(), success, session );
}
final PersistenceContext persistenceContext = session.getPersistenceContextInternal();
if ( persister.getRowIdMapping() != null ) {
Expand Down
26 changes: 13 additions & 13 deletions hibernate-core/src/main/java/org/hibernate/action/internal/EntityInsertAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
import org.hibernate.engine.spi.SessionEventListenerManager;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.engine.spi.SharedSessionContractImplementor;
import org.hibernate.event.spi.EventManager;
import org.hibernate.event.spi.HibernateMonitoringEvent;
import org.hibernate.event.monitor.spi.EventMonitor;
import org.hibernate.event.monitor.spi.DiagnosticEvent;
import org.hibernate.event.service.spi.EventListenerGroup;
import org.hibernate.event.spi.EventSource;
import org.hibernate.event.spi.PostCommitInsertEventListener;
Expand Down Expand Up @@ -105,16 +105,16 @@ public void execute() throws HibernateException {
if ( !veto ) {
final EntityPersister persister = getPersister();
final Object instance = getInstance();
final EventManager eventManager = session.getEventManager();
final HibernateMonitoringEvent event = eventManager.beginEntityInsertEvent();
final EventMonitor eventMonitor = session.getEventMonitor();
final DiagnosticEvent event = eventMonitor.beginEntityInsertEvent();
boolean success = false;
final GeneratedValues generatedValues;
try {
generatedValues = persister.getInsertCoordinator().insert( instance, id, getState(), session );
success = true;
}
finally {
eventManager.completeEntityInsertEvent( event, id, persister.getEntityName(), success, session );
eventMonitor.completeEntityInsertEvent( event, id, persister.getEntityName(), success, session );
}
final PersistenceContext persistenceContext = session.getPersistenceContextInternal();
final EntityEntry entry = persistenceContext.getEntry( instance );
Expand Down Expand Up @@ -187,8 +187,8 @@ protected void putCacheIfNecessary() {

protected boolean cacheInsert(EntityPersister persister, Object ck) {
final SharedSessionContractImplementor session = getSession();
final EventManager eventManager = session.getEventManager();
final HibernateMonitoringEvent cachePutEvent = eventManager.beginCachePutEvent();
final EventMonitor eventMonitor = session.getEventMonitor();
final DiagnosticEvent cachePutEvent = eventMonitor.beginCachePutEvent();
final EntityDataAccess cacheAccessStrategy = persister.getCacheAccessStrategy();
boolean insert = false;
try {
Expand All @@ -197,13 +197,13 @@ protected boolean cacheInsert(EntityPersister persister, Object ck) {
return insert;
}
finally {
eventManager.completeCachePutEvent(
eventMonitor.completeCachePutEvent(
cachePutEvent,
session,
cacheAccessStrategy,
getPersister(),
insert,
EventManager.CacheActionDescription.ENTITY_INSERT
EventMonitor.CacheActionDescription.ENTITY_INSERT
);
session.getEventListenerManager().cachePutEnd();
}
Expand Down Expand Up @@ -280,22 +280,22 @@ public void doAfterTransactionCompletion(boolean success, SharedSessionContractI
protected boolean cacheAfterInsert(EntityDataAccess cache, Object ck) {
final SharedSessionContractImplementor session = getSession();
final SessionEventListenerManager eventListenerManager = session.getEventListenerManager();
final EventManager eventManager = session.getEventManager();
final HibernateMonitoringEvent cachePutEvent = eventManager.beginCachePutEvent();
final EventMonitor eventMonitor = session.getEventMonitor();
final DiagnosticEvent cachePutEvent = eventMonitor.beginCachePutEvent();
boolean afterInsert = false;
try {
eventListenerManager.cachePutStart();
afterInsert = cache.afterInsert( session, ck, cacheEntry, version );
return afterInsert;
}
finally {
eventManager.completeCachePutEvent(
eventMonitor.completeCachePutEvent(
cachePutEvent,
session,
cache,
getPersister(),
afterInsert,
EventManager.CacheActionDescription.ENTITY_AFTER_INSERT
EventMonitor.CacheActionDescription.ENTITY_AFTER_INSERT
);
eventListenerManager.cachePutEnd();
}
Expand Down
26 changes: 13 additions & 13 deletions hibernate-core/src/main/java/org/hibernate/action/internal/EntityUpdateAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.engine.spi.SharedSessionContractImplementor;
import org.hibernate.engine.spi.Status;
import org.hibernate.event.spi.EventManager;
import org.hibernate.event.spi.HibernateMonitoringEvent;
import org.hibernate.event.monitor.spi.EventMonitor;
import org.hibernate.event.monitor.spi.DiagnosticEvent;
import org.hibernate.event.service.spi.EventListenerGroup;
import org.hibernate.event.spi.EventSource;
import org.hibernate.event.spi.PostCommitUpdateEventListener;
Expand Down Expand Up @@ -164,8 +164,8 @@ public void execute() throws HibernateException {
final Object instance = getInstance();
final Object previousVersion = getPreviousVersion();
final Object ck = lockCacheItem( previousVersion );
final EventManager eventManager = session.getEventManager();
final HibernateMonitoringEvent event = eventManager.beginEntityUpdateEvent();
final EventMonitor eventMonitor = session.getEventMonitor();
final DiagnosticEvent event = eventMonitor.beginEntityUpdateEvent();
boolean success = false;
final GeneratedValues generatedValues;
try {
Expand All @@ -183,7 +183,7 @@ public void execute() throws HibernateException {
success = true;
}
finally {
eventManager.completeEntityUpdateEvent( event, id, persister.getEntityName(), success, session );
eventMonitor.completeEntityUpdateEvent( event, id, persister.getEntityName(), success, session );
}
final EntityEntry entry = session.getPersistenceContextInternal().getEntry( instance );
if ( entry == null ) {
Expand Down Expand Up @@ -329,8 +329,8 @@ protected Object lockCacheItem(Object previousVersion) {

protected boolean updateCache(EntityPersister persister, Object previousVersion, Object ck) {
final SharedSessionContractImplementor session = getSession();
final EventManager eventManager = session.getEventManager();
final HibernateMonitoringEvent cachePutEvent = eventManager.beginCachePutEvent();
final EventMonitor eventMonitor = session.getEventMonitor();
final DiagnosticEvent cachePutEvent = eventMonitor.beginCachePutEvent();
final EntityDataAccess cacheAccessStrategy = persister.getCacheAccessStrategy();
boolean update = false;
try {
Expand All @@ -339,13 +339,13 @@ protected boolean updateCache(EntityPersister persister, Object previousVersion,
return update;
}
finally {
eventManager.completeCachePutEvent(
eventMonitor.completeCachePutEvent(
cachePutEvent,
session,
cacheAccessStrategy,
getPersister(),
update,
EventManager.CacheActionDescription.ENTITY_UPDATE
EventMonitor.CacheActionDescription.ENTITY_UPDATE
);
session.getEventListenerManager().cachePutEnd();
}
Expand Down Expand Up @@ -455,21 +455,21 @@ private boolean cacheUpdateRequired(boolean success, EntityPersister persister,

protected void cacheAfterUpdate(EntityDataAccess cache, Object ck, SharedSessionContractImplementor session) {
final SessionEventListenerManager eventListenerManager = session.getEventListenerManager();
final EventManager eventManager = session.getEventManager();
final HibernateMonitoringEvent cachePutEvent = eventManager.beginCachePutEvent();
final EventMonitor eventMonitor = session.getEventMonitor();
final DiagnosticEvent cachePutEvent = eventMonitor.beginCachePutEvent();
boolean put = false;
try {
eventListenerManager.cachePutStart();
put = cache.afterUpdate( session, ck, cacheEntry, nextVersion, previousVersion, lock );
}
finally {
eventManager.completeCachePutEvent(
eventMonitor.completeCachePutEvent(
cachePutEvent,
session,
cache,
getPersister(),
put,
EventManager.CacheActionDescription.ENTITY_AFTER_UPDATE
EventMonitor.CacheActionDescription.ENTITY_AFTER_UPDATE
);
final StatisticsImplementor statistics = session.getFactory().getStatistics();
if ( put && statistics.isStatisticsEnabled() ) {
Expand Down
18 changes: 9 additions & 9 deletions hibernate-core/src/main/java/org/hibernate/cache/internal/QueryResultsCacheImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
import org.hibernate.cache.spi.QueryResultsRegion;
import org.hibernate.cache.spi.TimestampsCache;
import org.hibernate.engine.spi.SharedSessionContractImplementor;
import org.hibernate.event.spi.EventManager;
import org.hibernate.event.spi.HibernateMonitoringEvent;
import org.hibernate.event.monitor.spi.EventMonitor;
import org.hibernate.event.monitor.spi.DiagnosticEvent;

import static org.hibernate.cache.spi.SecondLevelCacheLogger.L2CACHE_LOGGER;

Expand Down Expand Up @@ -61,19 +61,19 @@ public boolean put(
deepCopy( results )
);

final EventManager eventManager = session.getEventManager();
final HibernateMonitoringEvent cachePutEvent = eventManager.beginCachePutEvent();
final EventMonitor eventMonitor = session.getEventMonitor();
final DiagnosticEvent cachePutEvent = eventMonitor.beginCachePutEvent();
try {
session.getEventListenerManager().cachePutStart();
cacheRegion.putIntoCache( key, cacheItem, session );
}
finally {
eventManager.completeCachePutEvent(
eventMonitor.completeCachePutEvent(
cachePutEvent,
session,
cacheRegion,
true,
EventManager.CacheActionDescription.QUERY_RESULT
EventMonitor.CacheActionDescription.QUERY_RESULT
);
session.getEventListenerManager().cachePutEnd();
}
Expand Down Expand Up @@ -152,14 +152,14 @@ public List<?> get(

private CacheItem getCachedData(QueryKey key, SharedSessionContractImplementor session) {
CacheItem cachedItem = null;
final EventManager eventManager = session.getEventManager();
final HibernateMonitoringEvent cacheGetEvent = eventManager.beginCacheGetEvent();
final EventMonitor eventMonitor = session.getEventMonitor();
final DiagnosticEvent cacheGetEvent = eventMonitor.beginCacheGetEvent();
try {
session.getEventListenerManager().cacheGetStart();
cachedItem = (CacheItem) cacheRegion.getFromCache( key, session );
}
finally {
eventManager.completeCacheGetEvent(
eventMonitor.completeCacheGetEvent(
cacheGetEvent,
session,
cacheRegion,
Expand Down
Loading
Loading