Skip to content

Commit 2b5299e

Browse files
gavinkinggavinking
committed
avoid use of deprecated service lookup
because it results in logging telling us not to do it
1 parent 9c18da9 commit 2b5299e

File tree

9 files changed

+24
-41
lines changed

9 files changed

+24
-41
lines changed

‎documentation/src/main/asciidoc/integrationguide/chapters/services/extras/register-event-listeners-example.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ public void integrate(
66
SessionFactoryServiceRegistry serviceRegistry) {
77
// As you might expect, an EventListenerRegistry is the thing with which event listeners are registered It is a
88
// service so we look it up using the service registry
9-
final EventListenerRegistry eventListenerRegistry = serviceRegistry.getService( EventListenerRegistry.class );
9+
final EventListenerRegistry eventListenerRegistry = sessionFactory.getEventListenerRegistry();
1010

1111
// If you wish to have custom determination and handling of "duplicate" listeners, you would have to add an
1212
// implementation of the org.hibernate.event.service.spi.DuplicationStrategy contract like this

‎hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/TypeSafeActivator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ private static void setupListener(ValidatorFactory validatorFactory, SessionFact
158158
final ConfigurationService cfgService = serviceRegistry.requireService( ConfigurationService.class );
159159
final BeanValidationEventListener listener =
160160
new BeanValidationEventListener( validatorFactory, cfgService.getSettings(), classLoaderService );
161-
final EventListenerRegistry listenerRegistry = serviceRegistry.requireService( EventListenerRegistry.class );
161+
final EventListenerRegistry listenerRegistry = sessionFactory.getEventListenerRegistry();
162162
listenerRegistry.addDuplicationStrategy( DuplicationStrategyImpl.INSTANCE );
163163
listenerRegistry.appendListeners( EventType.PRE_INSERT, listener );
164164
listenerRegistry.appendListeners( EventType.PRE_UPDATE, listener );

‎hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataImpl.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -493,12 +493,9 @@ public void initSessionFactory(SessionFactoryImplementor sessionFactory) {
493493
// must not use BootstrapContext services here
494494
final ServiceRegistryImplementor registry = sessionFactory.getServiceRegistry();
495495
assert registry != null;
496-
final ConfigurationService configurationService =
497-
registry.requireService( ConfigurationService.class );
498-
final ClassLoaderService classLoaderService =
499-
registry.requireService( ClassLoaderService.class );
500-
final EventListenerRegistry eventListenerRegistry =
501-
registry.requireService( EventListenerRegistry.class );
496+
final ConfigurationService configurationService = registry.requireService( ConfigurationService.class );
497+
final ClassLoaderService classLoaderService = registry.requireService( ClassLoaderService.class );
498+
final EventListenerRegistry eventListenerRegistry = sessionFactory.getEventListenerRegistry();
502499
configurationService.getSettings().forEach( (propertyName, value) -> {
503500
if ( propertyName.startsWith( EVENT_LISTENER_PREFIX ) ) {
504501
final String eventTypeName = propertyName.substring( EVENT_LISTENER_PREFIX.length() + 1 );

‎hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/BootstrapTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -498,9 +498,8 @@ public void integrate(
498498

499499
// As you might expect, an EventListenerRegistry is the thing with which event
500500
// listeners are registered
501-
// It is a service so we look it up using the service registry
502-
final EventListenerRegistry eventListenerRegistry =
503-
bootstrapContext.getServiceRegistry().getService(EventListenerRegistry.class);
501+
// It is a service, so we look it up using the service registry
502+
final EventListenerRegistry eventListenerRegistry = sessionFactory.getEventListenerRegistry();
504503

505504
// If you wish to have custom determination and handling of "duplicate" listeners,
506505
// you would have to add an implementation of the

‎hibernate-core/src/test/java/org/hibernate/orm/test/events/LegacyPostCommitListenerTest.java‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.hibernate.event.spi.PostUpdateEventListener;
2222
import org.hibernate.integrator.spi.Integrator;
2323
import org.hibernate.persister.entity.EntityPersister;
24-
import org.hibernate.service.spi.ServiceRegistryImplementor;
2524

2625
import org.hibernate.testing.orm.junit.JiraKey;
2726
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
@@ -59,16 +58,13 @@ public void integrate(
5958
}
6059

6160
private void integrate(SessionFactoryImplementor sessionFactory) {
62-
final ServiceRegistryImplementor serviceRegistry = sessionFactory.getServiceRegistry();
63-
serviceRegistry.getService( EventListenerRegistry.class ).getEventListenerGroup(
64-
EventType.POST_COMMIT_DELETE
65-
).appendListener( postCommitDeleteEventListener );
66-
serviceRegistry.getService( EventListenerRegistry.class ).getEventListenerGroup(
67-
EventType.POST_COMMIT_UPDATE
68-
).appendListener( postCommitUpdateEventListener );
69-
serviceRegistry.getService( EventListenerRegistry.class ).getEventListenerGroup(
70-
EventType.POST_COMMIT_INSERT
71-
).appendListener( postCommitInsertEventListener );
61+
final EventListenerRegistry listenerRegistry = sessionFactory.getEventListenerRegistry();
62+
listenerRegistry.getEventListenerGroup( EventType.POST_COMMIT_DELETE )
63+
.appendListener( postCommitDeleteEventListener );
64+
listenerRegistry.getEventListenerGroup( EventType.POST_COMMIT_UPDATE )
65+
.appendListener( postCommitUpdateEventListener );
66+
listenerRegistry.getEventListenerGroup( EventType.POST_COMMIT_INSERT )
67+
.appendListener( postCommitInsertEventListener );
7268
}
7369
}
7470
);

‎hibernate-core/src/test/java/org/hibernate/orm/test/events/PostCommitListenerTest.java‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.hibernate.event.spi.PostUpdateEventListener;
2525
import org.hibernate.integrator.spi.Integrator;
2626
import org.hibernate.persister.entity.EntityPersister;
27-
import org.hibernate.service.spi.ServiceRegistryImplementor;
2827

2928
import org.hibernate.testing.orm.junit.JiraKey;
3029
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
@@ -65,16 +64,13 @@ public void integrate(
6564
}
6665

6766
private void integrate(SessionFactoryImplementor sessionFactory) {
68-
final ServiceRegistryImplementor serviceRegistry = sessionFactory.getServiceRegistry();
69-
serviceRegistry.getService( EventListenerRegistry.class ).getEventListenerGroup(
70-
EventType.POST_COMMIT_DELETE
71-
).appendListener( postCommitDeleteEventListener );
72-
serviceRegistry.getService( EventListenerRegistry.class ).getEventListenerGroup(
73-
EventType.POST_COMMIT_UPDATE
74-
).appendListener( postCommitUpdateEventListener );
75-
serviceRegistry.getService( EventListenerRegistry.class ).getEventListenerGroup(
76-
EventType.POST_COMMIT_INSERT
77-
).appendListener( postCommitInsertEventListener );
67+
final EventListenerRegistry listenerRegistry = sessionFactory.getEventListenerRegistry();
68+
listenerRegistry.getEventListenerGroup( EventType.POST_COMMIT_DELETE )
69+
.appendListener( postCommitDeleteEventListener );
70+
listenerRegistry.getEventListenerGroup( EventType.POST_COMMIT_UPDATE )
71+
.appendListener( postCommitUpdateEventListener );
72+
listenerRegistry.getEventListenerGroup( EventType.POST_COMMIT_INSERT )
73+
.appendListener( postCommitInsertEventListener );
7874
}
7975
}
8076
);

‎hibernate-core/src/test/java/org/hibernate/orm/test/stateless/events/CollectionListenerInStatelessSessionTest.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
*/
55
package org.hibernate.orm.test.stateless.events;
66

7-
import org.hibernate.engine.spi.SessionFactoryImplementor;
8-
import org.hibernate.event.service.spi.EventListenerRegistry;
97
import org.hibernate.event.spi.EventType;
108
import org.hibernate.event.spi.PostCollectionRecreateEvent;
119
import org.hibernate.event.spi.PostCollectionRecreateEventListener;
@@ -28,9 +26,7 @@ class CollectionListenerInStatelessSessionTest {
2826

2927
@Test
3028
void statelessInsert(SessionFactoryScope scope) {
31-
EventListenerRegistry registry =
32-
scope.getSessionFactory().unwrap(SessionFactoryImplementor.class)
33-
.getServiceRegistry().getService(EventListenerRegistry.class);
29+
var registry = scope.getSessionFactory().getEventListenerRegistry();
3430
var preRecreate = new MyPreCollectionRecreateEventListener();
3531
var preRemove = new MyPreCollectionRemoveEventListener();
3632
var postRecreate = new MyPostCollectionRecreateEventListener();

‎hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversIntegrator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public void integrate(
8181

8282
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
8383
// Do the registrations
84-
final EventListenerRegistry listenerRegistry = serviceRegistry.getService( EventListenerRegistry.class );
84+
final EventListenerRegistry listenerRegistry = sessionFactory.getEventListenerRegistry();
8585
listenerRegistry.addDuplicationStrategy( EnversListenerDuplicationStrategy.INSTANCE );
8686

8787
if ( enversService.getEntitiesConfigurations().hasAuditedEntities() ) {

‎hibernate-envers/src/test/java/org/hibernate/orm/test/envers/integration/basic/RegisterUserEventListenersTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ protected Class<?>[] getAnnotatedClasses() {
3333
@Test
3434
@JiraKey(value = "HHH-7478")
3535
public void testTransactionProcessSynchronization() {
36-
final EventListenerRegistry registry = sessionFactory().getServiceRegistry()
37-
.getService( EventListenerRegistry.class );
36+
final EventListenerRegistry registry = sessionFactory().getEventListenerRegistry();
3837
final CountingPostInsertTransactionBoundaryListener listener = new CountingPostInsertTransactionBoundaryListener();
3938

4039
registry.getEventListenerGroup( EventType.POST_INSERT ).appendListener( listener );

0 commit comments

Comments
 (0)