diff --git a/documentation/documentation.gradle b/documentation/documentation.gradle index b7798e2497..9b31227e9d 100644 --- a/documentation/documentation.gradle +++ b/documentation/documentation.gradle @@ -612,7 +612,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" } diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionRecreateAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionRecreateAction.java index 8fdf106283..46714551ab 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionRecreateAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionRecreateAction.java @@ -7,9 +7,9 @@ package org.hibernate.action.internal; import org.hibernate.HibernateException; import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.event.spi.EventMonitor; +import org.hibernate.event.monitor.spi.EventMonitor; import org.hibernate.event.spi.EventSource; -import org.hibernate.event.spi.DiagnosticEvent; +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; diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionRemoveAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionRemoveAction.java index 5c951376a3..2654710c80 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionRemoveAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionRemoveAction.java @@ -8,9 +8,9 @@ import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.event.spi.EventMonitor; +import org.hibernate.event.monitor.spi.EventMonitor; import org.hibernate.event.spi.EventSource; -import org.hibernate.event.spi.DiagnosticEvent; +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; diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionUpdateAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionUpdateAction.java index d9b8ce08e7..9360144ba5 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionUpdateAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/CollectionUpdateAction.java @@ -8,9 +8,9 @@ import org.hibernate.AssertionFailure; import org.hibernate.HibernateException; import org.hibernate.collection.spi.PersistentCollection; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.event.spi.EventMonitor; +import org.hibernate.event.monitor.spi.EventMonitor; import org.hibernate.event.spi.EventSource; -import org.hibernate.event.spi.DiagnosticEvent; +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; diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityDeleteAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityDeleteAction.java index 33941ec761..b9826c0e56 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityDeleteAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityDeleteAction.java @@ -13,9 +13,9 @@ import org.hibernate.engine.spi.EntityKey; import org.hibernate.engine.spi.PersistenceContext; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.event.service.spi.EventListenerGroup; -import org.hibernate.event.spi.EventMonitor; +import org.hibernate.event.monitor.spi.EventMonitor; import org.hibernate.event.spi.EventSource; -import org.hibernate.event.spi.DiagnosticEvent; +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; diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityIdentityInsertAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityIdentityInsertAction.java index 744841976c..cdd494ff6b 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityIdentityInsertAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityIdentityInsertAction.java @@ -10,9 +10,9 @@ import org.hibernate.engine.spi.EntityKey; import org.hibernate.engine.spi.PersistenceContext; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.event.service.spi.EventListenerGroup; -import org.hibernate.event.spi.EventMonitor; +import org.hibernate.event.monitor.spi.EventMonitor; import org.hibernate.event.spi.EventSource; -import org.hibernate.event.spi.DiagnosticEvent; +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; diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityInsertAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityInsertAction.java index fdf790f74c..55a91f65d6 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityInsertAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityInsertAction.java @@ -15,8 +15,8 @@ import org.hibernate.engine.spi.PersistenceContext; import org.hibernate.engine.spi.SessionEventListenerManager; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.event.spi.EventMonitor; -import org.hibernate.event.spi.DiagnosticEvent; +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; diff --git a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityUpdateAction.java b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityUpdateAction.java index f4b8e329cb..8e57dcc362 100644 --- a/hibernate-core/src/main/java/org/hibernate/action/internal/EntityUpdateAction.java +++ b/hibernate-core/src/main/java/org/hibernate/action/internal/EntityUpdateAction.java @@ -17,8 +17,8 @@ import org.hibernate.engine.spi.SessionEventListenerManager; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.engine.spi.Status; -import org.hibernate.event.spi.EventMonitor; -import org.hibernate.event.spi.DiagnosticEvent; +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; diff --git a/hibernate-core/src/main/java/org/hibernate/cache/internal/QueryResultsCacheImpl.java b/hibernate-core/src/main/java/org/hibernate/cache/internal/QueryResultsCacheImpl.java index e6910b6d82..bae5aac237 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/internal/QueryResultsCacheImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/internal/QueryResultsCacheImpl.java @@ -15,8 +15,8 @@ import org.hibernate.cache.spi.QueryResultsCache; import org.hibernate.cache.spi.QueryResultsRegion; import org.hibernate.cache.spi.TimestampsCache; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.event.spi.EventMonitor; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.EventMonitor; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import static org.hibernate.cache.spi.SecondLevelCacheLogger.L2CACHE_LOGGER; diff --git a/hibernate-core/src/main/java/org/hibernate/cache/internal/TimestampsCacheEnabledImpl.java b/hibernate-core/src/main/java/org/hibernate/cache/internal/TimestampsCacheEnabledImpl.java index 3636532d9d..e0c4bb4f28 100644 --- a/hibernate-core/src/main/java/org/hibernate/cache/internal/TimestampsCacheEnabledImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/cache/internal/TimestampsCacheEnabledImpl.java @@ -12,8 +12,8 @@ import org.hibernate.cache.spi.TimestampsRegion; import org.hibernate.engine.spi.SessionEventListenerManager; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.event.spi.EventMonitor; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.EventMonitor; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.stat.spi.StatisticsImplementor; import org.jboss.logging.Logger; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/CacheHelper.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/CacheHelper.java index 3ff16d551a..1656cbb296 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/CacheHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/CacheHelper.java @@ -8,8 +8,8 @@ import org.hibernate.cache.MutableCacheKeyBuilder; import org.hibernate.cache.spi.access.CachedDomainDataAccess; import org.hibernate.engine.spi.SessionEventListenerManager; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.event.spi.EventMonitor; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.EventMonitor; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.metamodel.mapping.JdbcMapping; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.persister.entity.EntityPersister; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdResolutionsImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdResolutionsImpl.java index 013af9a253..9249569b7e 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdResolutionsImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/internal/NaturalIdResolutionsImpl.java @@ -21,8 +21,8 @@ import org.hibernate.engine.spi.PersistenceContext; import org.hibernate.engine.spi.Resolution; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.event.spi.EventMonitor; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.EventMonitor; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.metamodel.mapping.EntityMappingType; import org.hibernate.metamodel.mapping.NaturalIdLogging; import org.hibernate.metamodel.mapping.NaturalIdMapping; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchImpl.java index 2d9fbd27d7..8da0d7e0eb 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/batch/internal/BatchImpl.java @@ -21,8 +21,8 @@ import org.hibernate.engine.jdbc.spi.JdbcCoordinator; import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.engine.jdbc.spi.SqlExceptionHelper; import org.hibernate.engine.jdbc.spi.SqlStatementLogger; -import org.hibernate.event.spi.EventMonitor; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.EventMonitor; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.resource.jdbc.spi.JdbcEventHandler; import org.hibernate.resource.jdbc.spi.JdbcSessionOwner; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentInitiator.java index 982ff6be53..52442048c8 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentInitiator.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentInitiator.java @@ -30,8 +30,8 @@ import org.hibernate.engine.jdbc.internal.JdbcCoordinatorImpl; import org.hibernate.engine.jdbc.internal.JdbcServicesImpl; import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.engine.jdbc.spi.SqlExceptionHelper; -import org.hibernate.event.internal.EmptyEventMonitor; -import org.hibernate.event.spi.EventMonitor; +import org.hibernate.event.monitor.internal.EmptyEventMonitor; +import org.hibernate.event.monitor.spi.EventMonitor; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.internal.log.ConnectionInfoLogger; import org.hibernate.internal.util.StringHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/MutationStatementPreparerImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/MutationStatementPreparerImpl.java index 0cbd958cbe..0fc25d22cd 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/MutationStatementPreparerImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/MutationStatementPreparerImpl.java @@ -12,8 +12,8 @@ import org.hibernate.AssertionFailure; import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.engine.jdbc.spi.MutationStatementPreparer; import org.hibernate.engine.jdbc.spi.SqlExceptionHelper; -import org.hibernate.event.spi.EventMonitor; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.EventMonitor; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.resource.jdbc.spi.JdbcEventHandler; import org.hibernate.resource.jdbc.spi.JdbcSessionContext; import org.hibernate.resource.jdbc.spi.JdbcSessionOwner; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/ResultSetReturnImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/ResultSetReturnImpl.java index 9d56b1401b..14d57e4cde 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/ResultSetReturnImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/ResultSetReturnImpl.java @@ -14,8 +14,8 @@ import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.engine.jdbc.spi.ResultSetReturn; import org.hibernate.engine.jdbc.spi.SqlExceptionHelper; import org.hibernate.engine.jdbc.spi.SqlStatementLogger; -import org.hibernate.event.spi.EventMonitor; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.EventMonitor; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.resource.jdbc.spi.JdbcEventHandler; import org.hibernate.resource.jdbc.spi.JdbcSessionContext; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/StatementPreparerImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/StatementPreparerImpl.java index e546f2b1ca..9fe086fdcc 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/StatementPreparerImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/StatementPreparerImpl.java @@ -15,8 +15,8 @@ import org.hibernate.ScrollMode; import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.engine.jdbc.spi.SqlExceptionHelper; import org.hibernate.engine.jdbc.spi.StatementPreparer; -import org.hibernate.event.spi.EventMonitor; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.EventMonitor; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.resource.jdbc.spi.JdbcEventHandler; import org.hibernate.resource.jdbc.spi.JdbcSessionContext; import org.hibernate.resource.jdbc.spi.JdbcSessionOwner; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java index ed83ee48d8..505a343532 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java @@ -34,7 +34,7 @@ import org.hibernate.engine.jdbc.LobCreator; import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess; import org.hibernate.engine.jdbc.spi.JdbcCoordinator; import org.hibernate.engine.jdbc.spi.JdbcServices; -import org.hibernate.event.spi.EventMonitor; +import org.hibernate.event.monitor.spi.EventMonitor; import org.hibernate.event.spi.EventSource; import org.hibernate.graph.RootGraph; import org.hibernate.graph.spi.RootGraphImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionDelegatorBaseImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionDelegatorBaseImpl.java index 3fa47a5f49..4aa1eec785 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionDelegatorBaseImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionDelegatorBaseImpl.java @@ -25,7 +25,7 @@ import org.hibernate.engine.jdbc.LobCreator; import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess; import org.hibernate.engine.jdbc.spi.JdbcCoordinator; import org.hibernate.engine.jdbc.spi.JdbcServices; -import org.hibernate.event.spi.EventMonitor; +import org.hibernate.event.monitor.spi.EventMonitor; import org.hibernate.graph.RootGraph; import org.hibernate.jdbc.ReturningWork; import org.hibernate.jdbc.Work; diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultAutoFlushEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultAutoFlushEventListener.java index 5d0116ca8f..2c0fe0c44b 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultAutoFlushEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultAutoFlushEventListener.java @@ -11,8 +11,8 @@ import org.hibernate.engine.spi.PersistenceContext; import org.hibernate.engine.spi.SessionEventListenerManager; import org.hibernate.event.spi.AutoFlushEvent; import org.hibernate.event.spi.AutoFlushEventListener; -import org.hibernate.event.spi.EventMonitor; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.EventMonitor; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.event.spi.EventSource; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.stat.spi.StatisticsImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEntityEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEntityEventListener.java index 07b9a1fbec..53f2499211 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEntityEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEntityEventListener.java @@ -23,8 +23,8 @@ import org.hibernate.engine.spi.SelfDirtinessTracker; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.engine.spi.Status; -import org.hibernate.event.spi.EventMonitor; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.EventMonitor; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.event.spi.EventSource; import org.hibernate.event.spi.FlushEntityEvent; import org.hibernate.event.spi.FlushEntityEventListener; diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEventListener.java b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEventListener.java index 597155f23c..b3a6d89fa5 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/event/internal/DefaultFlushEventListener.java @@ -6,8 +6,8 @@ package org.hibernate.event.internal; import org.hibernate.HibernateException; import org.hibernate.engine.spi.PersistenceContext; -import org.hibernate.event.spi.EventMonitor; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.EventMonitor; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.event.spi.EventSource; import org.hibernate.event.spi.FlushEvent; import org.hibernate.event.spi.FlushEventListener; diff --git a/hibernate-core/src/main/java/org/hibernate/event/internal/EmptyEventMonitor.java b/hibernate-core/src/main/java/org/hibernate/event/monitor/internal/EmptyEventMonitor.java similarity index 97% rename from hibernate-core/src/main/java/org/hibernate/event/internal/EmptyEventMonitor.java rename to hibernate-core/src/main/java/org/hibernate/event/monitor/internal/EmptyEventMonitor.java index ba7de973c9..da4cdc86d3 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/internal/EmptyEventMonitor.java +++ b/hibernate-core/src/main/java/org/hibernate/event/monitor/internal/EmptyEventMonitor.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.event.internal; +package org.hibernate.event.monitor.internal; import org.hibernate.LockMode; import org.hibernate.cache.spi.Region; @@ -10,8 +10,8 @@ import org.hibernate.cache.spi.access.CachedDomainDataAccess; import org.hibernate.engine.spi.EntityEntry; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.event.spi.AutoFlushEvent; -import org.hibernate.event.spi.EventMonitor; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.EventMonitor; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.event.spi.FlushEvent; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.persister.entity.EntityPersister; diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/DiagnosticEvent.java b/hibernate-core/src/main/java/org/hibernate/event/monitor/spi/DiagnosticEvent.java similarity index 92% rename from hibernate-core/src/main/java/org/hibernate/event/spi/DiagnosticEvent.java rename to hibernate-core/src/main/java/org/hibernate/event/monitor/spi/DiagnosticEvent.java index 794ff69df6..75b2f1b767 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/spi/DiagnosticEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/monitor/spi/DiagnosticEvent.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.event.spi; +package org.hibernate.event.monitor.spi; import org.hibernate.Incubating; diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/EventMonitor.java b/hibernate-core/src/main/java/org/hibernate/event/monitor/spi/EventMonitor.java similarity index 98% rename from hibernate-core/src/main/java/org/hibernate/event/spi/EventMonitor.java rename to hibernate-core/src/main/java/org/hibernate/event/monitor/spi/EventMonitor.java index 93c79b2315..cd753ba9e0 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/spi/EventMonitor.java +++ b/hibernate-core/src/main/java/org/hibernate/event/monitor/spi/EventMonitor.java @@ -2,7 +2,7 @@ * SPDX-License-Identifier: LGPL-2.1-or-later * Copyright Red Hat Inc. and Hibernate Authors */ -package org.hibernate.event.spi; +package org.hibernate.event.monitor.spi; import org.hibernate.Incubating; import org.hibernate.LockMode; @@ -10,6 +10,7 @@ import org.hibernate.cache.spi.Region; import org.hibernate.cache.spi.access.CachedDomainDataAccess; import org.hibernate.engine.spi.EntityEntry; import org.hibernate.engine.spi.SharedSessionContractImplementor; +import org.hibernate.event.spi.AutoFlushEvent; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.persister.entity.EntityPersister; import org.hibernate.service.JavaServiceLoadable; diff --git a/hibernate-core/src/main/java/org/hibernate/event/monitor/spi/package-info.java b/hibernate-core/src/main/java/org/hibernate/event/monitor/spi/package-info.java new file mode 100644 index 0000000000..c83bc12749 --- /dev/null +++ b/hibernate-core/src/main/java/org/hibernate/event/monitor/spi/package-info.java @@ -0,0 +1,10 @@ +/** + * An SPI for services which collect, report, or monitor diagnostic events. + * For example, this SPI is implemented by Hibernate JFR to report events + * to Java Flight Recorder. + * + * @see org.hibernate.event.monitor.spi.EventMonitor + * + * @since 7 + */ +package org.hibernate.event.monitor.spi; diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/EventManager.java b/hibernate-core/src/main/java/org/hibernate/event/spi/EventManager.java index c2d0732067..f5aa6ec5c6 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/spi/EventManager.java +++ b/hibernate-core/src/main/java/org/hibernate/event/spi/EventManager.java @@ -4,6 +4,8 @@ */ package org.hibernate.event.spi; +import org.hibernate.event.monitor.spi.EventMonitor; + /** * @deprecated Renamed {@link EventMonitor}. */ diff --git a/hibernate-core/src/main/java/org/hibernate/event/spi/HibernateMonitoringEvent.java b/hibernate-core/src/main/java/org/hibernate/event/spi/HibernateMonitoringEvent.java index b001002489..409fcbfe9f 100644 --- a/hibernate-core/src/main/java/org/hibernate/event/spi/HibernateMonitoringEvent.java +++ b/hibernate-core/src/main/java/org/hibernate/event/spi/HibernateMonitoringEvent.java @@ -4,6 +4,8 @@ */ package org.hibernate.event.spi; +import org.hibernate.event.monitor.spi.DiagnosticEvent; + /** * @deprecated Renamed {@link DiagnosticEvent}. */ diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java index 116b8881cd..fe4eb6e2fc 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableGenerator.java @@ -34,8 +34,8 @@ import org.hibernate.engine.jdbc.internal.FormatStyle; import org.hibernate.engine.jdbc.spi.SqlStatementLogger; import org.hibernate.engine.spi.SessionEventListenerManager; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.event.spi.EventMonitor; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.EventMonitor; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.generator.GeneratorCreationContext; import org.hibernate.id.ExportableColumn; import org.hibernate.id.IdentifierGeneratorHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableStructure.java b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableStructure.java index 67888a22a5..782b578608 100644 --- a/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableStructure.java +++ b/hibernate-core/src/main/java/org/hibernate/id/enhanced/TableStructure.java @@ -23,8 +23,8 @@ import org.hibernate.engine.jdbc.internal.FormatStyle; import org.hibernate.engine.jdbc.spi.SqlStatementLogger; import org.hibernate.engine.spi.SessionEventListenerManager; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.event.spi.EventMonitor; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.EventMonitor; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.id.ExportableColumn; import org.hibernate.id.IdentifierGenerationException; import org.hibernate.id.IntegralDataTypeHolder; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java b/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java index 93f1666350..50d024ece0 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java @@ -49,7 +49,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.engine.transaction.internal.TransactionImpl; import org.hibernate.engine.transaction.spi.TransactionImplementor; -import org.hibernate.event.spi.EventMonitor; +import org.hibernate.event.monitor.spi.EventMonitor; import org.hibernate.graph.RootGraph; import org.hibernate.graph.internal.RootGraphImpl; import org.hibernate.graph.spi.RootGraphImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/ContextualJdbcConnectionAccess.java b/hibernate-core/src/main/java/org/hibernate/internal/ContextualJdbcConnectionAccess.java index fd71488d7d..9b614f28f5 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/ContextualJdbcConnectionAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/ContextualJdbcConnectionAccess.java @@ -13,8 +13,8 @@ import org.hibernate.SessionEventListener; import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess; import org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.event.spi.EventMonitor; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.EventMonitor; +import org.hibernate.event.monitor.spi.DiagnosticEvent; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/internal/FastSessionServices.java b/hibernate-core/src/main/java/org/hibernate/internal/FastSessionServices.java index 876c385eb6..1c266298c3 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/FastSessionServices.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/FastSessionServices.java @@ -22,7 +22,8 @@ import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider; import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.event.internal.EmptyEventMonitor; +import org.hibernate.event.monitor.internal.EmptyEventMonitor; +import org.hibernate.event.monitor.spi.EventMonitor; import org.hibernate.event.service.spi.EventListenerGroup; import org.hibernate.event.service.spi.EventListenerRegistry; import org.hibernate.event.spi.*; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/NonContextualJdbcConnectionAccess.java b/hibernate-core/src/main/java/org/hibernate/internal/NonContextualJdbcConnectionAccess.java index 295a17d0da..fb3641d987 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/NonContextualJdbcConnectionAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/NonContextualJdbcConnectionAccess.java @@ -13,8 +13,8 @@ import org.hibernate.SessionEventListener; import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.event.spi.EventMonitor; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.EventMonitor; +import org.hibernate.event.monitor.spi.DiagnosticEvent; /** * @author Steve Ebersole diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java index 3a11ef220d..f4fd95ba42 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java @@ -72,8 +72,8 @@ import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.engine.transaction.spi.TransactionImplementor; import org.hibernate.resource.transaction.spi.TransactionObserver; -import org.hibernate.event.spi.EventMonitor; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.EventMonitor; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.event.spi.AutoFlushEvent; import org.hibernate.event.spi.AutoFlushEventListener; import org.hibernate.event.spi.ClearEvent; diff --git a/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java index 7fb79b588f..b2324887e4 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java @@ -31,8 +31,8 @@ import org.hibernate.engine.spi.LoadQueryInfluencers; import org.hibernate.engine.spi.PersistenceContext; import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper; import org.hibernate.engine.transaction.jta.platform.spi.JtaPlatform; -import org.hibernate.event.spi.EventMonitor; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.EventMonitor; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.event.spi.PostDeleteEvent; import org.hibernate.event.spi.PostDeleteEventListener; import org.hibernate.event.spi.PostInsertEvent; diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderHelper.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderHelper.java index 9699247b2b..885b46e10d 100644 --- a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderHelper.java @@ -18,9 +18,9 @@ import org.hibernate.engine.spi.LoadQueryInfluencers; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.engine.spi.SubselectFetch; -import org.hibernate.event.spi.EventMonitor; +import org.hibernate.event.monitor.spi.EventMonitor; import org.hibernate.event.spi.EventSource; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.loader.LoaderLogging; import org.hibernate.metamodel.mapping.BasicValuedModelPart; import org.hibernate.metamodel.mapping.EntityMappingType; diff --git a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/JdbcSessionOwner.java b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/JdbcSessionOwner.java index bdd4cab39f..614da638cc 100644 --- a/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/JdbcSessionOwner.java +++ b/hibernate-core/src/main/java/org/hibernate/resource/jdbc/spi/JdbcSessionOwner.java @@ -7,7 +7,7 @@ package org.hibernate.resource.jdbc.spi; import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess; import org.hibernate.engine.jdbc.spi.SqlExceptionHelper; import org.hibernate.event.spi.EventManager; -import org.hibernate.event.spi.EventMonitor; +import org.hibernate.event.monitor.spi.EventMonitor; import org.hibernate.resource.transaction.spi.TransactionCoordinator; import static java.lang.reflect.InvocationHandler.invokeDefault; diff --git a/hibernate-core/src/main/java/org/hibernate/result/internal/OutputsImpl.java b/hibernate-core/src/main/java/org/hibernate/result/internal/OutputsImpl.java index 8e527c84d5..9008b8c165 100644 --- a/hibernate-core/src/main/java/org/hibernate/result/internal/OutputsImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/result/internal/OutputsImpl.java @@ -16,8 +16,8 @@ import java.util.function.Supplier; import org.hibernate.JDBCException; import org.hibernate.engine.jdbc.spi.SqlStatementLogger; import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.event.spi.EventMonitor; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.EventMonitor; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.internal.CoreLogging; import org.hibernate.procedure.internal.ProcedureCallImpl; import org.hibernate.query.results.ResultSetMapping; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/StandardJdbcMutationExecutor.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/StandardJdbcMutationExecutor.java index 539352a869..4ecf3a2107 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/StandardJdbcMutationExecutor.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/StandardJdbcMutationExecutor.java @@ -12,8 +12,8 @@ import java.util.function.Function; import org.hibernate.JDBCException; import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.event.spi.EventMonitor; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.EventMonitor; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.exception.ConstraintViolationException; import org.hibernate.query.spi.QueryOptions; import org.hibernate.resource.jdbc.spi.LogicalConnectionImplementor; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityInitializerImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityInitializerImpl.java index a14ac84636..1a1916272e 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityInitializerImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityInitializerImpl.java @@ -34,8 +34,8 @@ import org.hibernate.engine.spi.SessionEventListenerManager; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.engine.spi.Status; -import org.hibernate.event.spi.EventMonitor; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.EventMonitor; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.event.spi.PreLoadEvent; import org.hibernate.event.spi.PreLoadEventListener; import org.hibernate.internal.log.LoggingHelper; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/ResultsHelper.java b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/ResultsHelper.java index 08c9f4be30..38eb2c3365 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/internal/ResultsHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/internal/ResultsHelper.java @@ -16,8 +16,8 @@ import org.hibernate.engine.spi.PersistenceContext; import org.hibernate.engine.spi.SessionEventListenerManager; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.event.spi.EventMonitor; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.EventMonitor; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.metamodel.mapping.PluralAttributeMapping; diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DeferredResultSetAccess.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DeferredResultSetAccess.java index 487e6cc185..6ccda04687 100644 --- a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DeferredResultSetAccess.java +++ b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DeferredResultSetAccess.java @@ -18,8 +18,8 @@ import org.hibernate.engine.jdbc.spi.SqlStatementLogger; import org.hibernate.engine.spi.SessionEventListenerManager; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.event.spi.EventMonitor; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.EventMonitor; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.internal.CoreLogging; import org.hibernate.internal.CoreMessageLogger; import org.hibernate.query.spi.Limit; diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/CacheGetEvent.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/CacheGetEvent.java index b93201fa16..e6135e1edf 100644 --- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/CacheGetEvent.java +++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/CacheGetEvent.java @@ -4,7 +4,7 @@ */ package org.hibernate.event.jfr.internal; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.internal.build.AllowNonPortable; import jdk.jfr.Category; diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/CachePutEvent.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/CachePutEvent.java index ae718e7647..3bb1ec4ecc 100644 --- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/CachePutEvent.java +++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/CachePutEvent.java @@ -4,7 +4,7 @@ */ package org.hibernate.event.jfr.internal; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.internal.build.AllowNonPortable; import jdk.jfr.Category; diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/CollectionRecreateEvent.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/CollectionRecreateEvent.java index eccd993f4a..d34baf7b3f 100644 --- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/CollectionRecreateEvent.java +++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/CollectionRecreateEvent.java @@ -10,7 +10,7 @@ import jdk.jfr.Event; import jdk.jfr.Label; import jdk.jfr.Name; import jdk.jfr.StackTrace; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.internal.build.AllowNonPortable; @Name(CollectionRecreateEvent.NAME) diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/CollectionRemoveEvent.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/CollectionRemoveEvent.java index e03c1986aa..3fc234a366 100644 --- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/CollectionRemoveEvent.java +++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/CollectionRemoveEvent.java @@ -10,7 +10,7 @@ import jdk.jfr.Event; import jdk.jfr.Label; import jdk.jfr.Name; import jdk.jfr.StackTrace; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.internal.build.AllowNonPortable; @Name(CollectionRemoveEvent.NAME) diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/CollectionUpdateEvent.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/CollectionUpdateEvent.java index c909e0518f..7ffec040a1 100644 --- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/CollectionUpdateEvent.java +++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/CollectionUpdateEvent.java @@ -10,7 +10,7 @@ import jdk.jfr.Event; import jdk.jfr.Label; import jdk.jfr.Name; import jdk.jfr.StackTrace; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.internal.build.AllowNonPortable; @Name(CollectionUpdateEvent.NAME) diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/DirtyCalculationEvent.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/DirtyCalculationEvent.java index 1fe317debd..0657c86346 100644 --- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/DirtyCalculationEvent.java +++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/DirtyCalculationEvent.java @@ -4,7 +4,7 @@ */ package org.hibernate.event.jfr.internal; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.internal.build.AllowNonPortable; import jdk.jfr.Category; diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/EntityDeleteEvent.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/EntityDeleteEvent.java index c39c740271..ee41b61a87 100644 --- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/EntityDeleteEvent.java +++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/EntityDeleteEvent.java @@ -10,7 +10,7 @@ import jdk.jfr.Event; import jdk.jfr.Label; import jdk.jfr.Name; import jdk.jfr.StackTrace; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.internal.build.AllowNonPortable; @Name(EntityDeleteEvent.NAME) diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/EntityInsertEvent.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/EntityInsertEvent.java index b8e7d1eab7..5ffdcc588a 100644 --- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/EntityInsertEvent.java +++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/EntityInsertEvent.java @@ -10,7 +10,7 @@ import jdk.jfr.Event; import jdk.jfr.Label; import jdk.jfr.Name; import jdk.jfr.StackTrace; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.internal.build.AllowNonPortable; @Name(EntityInsertEvent.NAME) diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/EntityLockEvent.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/EntityLockEvent.java index e99d5eb182..c38f058e9b 100644 --- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/EntityLockEvent.java +++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/EntityLockEvent.java @@ -11,7 +11,7 @@ import jdk.jfr.Label; import jdk.jfr.Name; import jdk.jfr.StackTrace; import org.hibernate.LockMode; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.internal.build.AllowNonPortable; @Name(EntityLockEvent.NAME) diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/EntityUpdateEvent.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/EntityUpdateEvent.java index c227b88ad7..c86c1ce3b2 100644 --- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/EntityUpdateEvent.java +++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/EntityUpdateEvent.java @@ -10,7 +10,7 @@ import jdk.jfr.Event; import jdk.jfr.Label; import jdk.jfr.Name; import jdk.jfr.StackTrace; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.internal.build.AllowNonPortable; @Name(EntityUpdateEvent.NAME) diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/EntityUpsertEvent.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/EntityUpsertEvent.java index c801a6a725..ebc3b32f7d 100644 --- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/EntityUpsertEvent.java +++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/EntityUpsertEvent.java @@ -10,7 +10,7 @@ import jdk.jfr.Event; import jdk.jfr.Label; import jdk.jfr.Name; import jdk.jfr.StackTrace; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.internal.build.AllowNonPortable; @Name(EntityUpsertEvent.NAME) diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/FlushEvent.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/FlushEvent.java index 5af24b4cbb..13b9b8dfb4 100644 --- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/FlushEvent.java +++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/FlushEvent.java @@ -4,7 +4,7 @@ */ package org.hibernate.event.jfr.internal; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.internal.build.AllowNonPortable; import jdk.jfr.Category; diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcBatchExecutionEvent.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcBatchExecutionEvent.java index a230148a4c..9d90be40d4 100644 --- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcBatchExecutionEvent.java +++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcBatchExecutionEvent.java @@ -4,7 +4,7 @@ */ package org.hibernate.event.jfr.internal; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.internal.build.AllowNonPortable; import jdk.jfr.Category; diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcConnectionAcquisitionEvent.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcConnectionAcquisitionEvent.java index 96db5770d8..f83e5c81de 100644 --- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcConnectionAcquisitionEvent.java +++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcConnectionAcquisitionEvent.java @@ -4,7 +4,7 @@ */ package org.hibernate.event.jfr.internal; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.internal.build.AllowNonPortable; import jdk.jfr.Category; diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcConnectionReleaseEvent.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcConnectionReleaseEvent.java index aebd34836c..56a3cfc593 100644 --- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcConnectionReleaseEvent.java +++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcConnectionReleaseEvent.java @@ -4,7 +4,7 @@ */ package org.hibernate.event.jfr.internal; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.internal.build.AllowNonPortable; import jdk.jfr.Category; diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcPreparedStatementCreationEvent.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcPreparedStatementCreationEvent.java index 434547182a..fa5d17202e 100644 --- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcPreparedStatementCreationEvent.java +++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcPreparedStatementCreationEvent.java @@ -4,7 +4,7 @@ */ package org.hibernate.event.jfr.internal; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.internal.build.AllowNonPortable; import jdk.jfr.Category; diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcPreparedStatementExecutionEvent.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcPreparedStatementExecutionEvent.java index d9af6d6551..3d9bd847ea 100644 --- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcPreparedStatementExecutionEvent.java +++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JdbcPreparedStatementExecutionEvent.java @@ -4,7 +4,7 @@ */ package org.hibernate.event.jfr.internal; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.internal.build.AllowNonPortable; import jdk.jfr.Category; diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JfrEventMonitor.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JfrEventMonitor.java index a80d06fee7..020f97a469 100644 --- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JfrEventMonitor.java +++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/JfrEventMonitor.java @@ -10,8 +10,8 @@ import org.hibernate.cache.spi.access.CachedDomainDataAccess; import org.hibernate.engine.spi.EntityEntry; import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.event.spi.AutoFlushEvent; -import org.hibernate.event.spi.EventMonitor; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.EventMonitor; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.internal.build.AllowNonPortable; import org.hibernate.persister.collection.CollectionPersister; import org.hibernate.persister.entity.EntityPersister; diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/PartialFlushEvent.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/PartialFlushEvent.java index 20cba8197b..3ab89e8e4c 100644 --- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/PartialFlushEvent.java +++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/PartialFlushEvent.java @@ -4,7 +4,7 @@ */ package org.hibernate.event.jfr.internal; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.internal.build.AllowNonPortable; import jdk.jfr.Category; diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/PrePartialFlushEvent.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/PrePartialFlushEvent.java index 2408ca73c3..30102711d6 100644 --- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/PrePartialFlushEvent.java +++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/PrePartialFlushEvent.java @@ -4,7 +4,7 @@ */ package org.hibernate.event.jfr.internal; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.internal.build.AllowNonPortable; import jdk.jfr.Category; diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/SessionClosedEvent.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/SessionClosedEvent.java index ba6a158359..f8899b3425 100644 --- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/SessionClosedEvent.java +++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/SessionClosedEvent.java @@ -4,7 +4,7 @@ */ package org.hibernate.event.jfr.internal; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.internal.build.AllowNonPortable; import jdk.jfr.Category; diff --git a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/SessionOpenEvent.java b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/SessionOpenEvent.java index e66bcca45d..3c01c9ca22 100644 --- a/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/SessionOpenEvent.java +++ b/hibernate-jfr/src/main/java/org/hibernate/event/jfr/internal/SessionOpenEvent.java @@ -4,7 +4,7 @@ */ package org.hibernate.event.jfr.internal; -import org.hibernate.event.spi.DiagnosticEvent; +import org.hibernate.event.monitor.spi.DiagnosticEvent; import org.hibernate.internal.build.AllowNonPortable; import jdk.jfr.Category; diff --git a/hibernate-jfr/src/main/resources/META-INF/services/org.hibernate.event.spi.EventMonitor b/hibernate-jfr/src/main/resources/META-INF/services/org.hibernate.event.monitor.spi.EventMonitor similarity index 100% rename from hibernate-jfr/src/main/resources/META-INF/services/org.hibernate.event.spi.EventMonitor rename to hibernate-jfr/src/main/resources/META-INF/services/org.hibernate.event.monitor.spi.EventMonitor