Skip to content

HHH-18959 remove ResolveNaturalIdEvent #9487

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 3 commits into from
Dec 21, 2024
Merged

HHH-18959 remove ResolveNaturalIdEvent #9487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa45b2a
HHH-18959 remove unused ResolveNaturalIdEvent stuff
gavinking Dec 21, 2024
ab22c93
get rid of a raw type
gavinking Dec 21, 2024
c5946cb
remove ref to ResolveNaturalIdEventListener from hibernate-graalvm
gavinking Dec 21, 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
119 changes: 0 additions & 119 deletions ...core/src/main/java/org/hibernate/event/internal/DefaultResolveNaturalIdEventListener.java
View file
Open in desktop

This file was deleted.

10 changes: 3 additions & 7 deletions ...te-core/src/main/java/org/hibernate/event/service/internal/EventListenerRegistryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import org.hibernate.event.internal.DefaultPreLoadEventListener;
import org.hibernate.event.internal.DefaultRefreshEventListener;
import org.hibernate.event.internal.DefaultReplicateEventListener;
import org.hibernate.event.internal.DefaultResolveNaturalIdEventListener;
import org.hibernate.event.internal.PostDeleteEventListenerStandardImpl;
import org.hibernate.event.internal.PostInsertEventListenerStandardImpl;
import org.hibernate.event.internal.PostUpdateEventListenerStandardImpl;
Expand Down Expand Up @@ -75,7 +74,6 @@
import static org.hibernate.event.spi.EventType.PRE_UPSERT;
import static org.hibernate.event.spi.EventType.REFRESH;
import static org.hibernate.event.spi.EventType.REPLICATE;
import static org.hibernate.event.spi.EventType.RESOLVE_NATURAL_ID;

/**
* Standard implementation of EventListenerRegistry
Expand Down Expand Up @@ -123,17 +121,18 @@ public final <T> void setListeners(EventType<T> type, Class<? extends T>... list
setListeners( type, resolveListenerInstances( type, listenerClasses ) );
}

@SuppressWarnings( {"unchecked"})
@SafeVarargs
private <T> T[] resolveListenerInstances(EventType<T> type, Class<? extends T>... listenerClasses) {
@SuppressWarnings("unchecked")
T[] listeners = (T[]) Array.newInstance( type.baseListenerInterface(), listenerClasses.length );
for ( int i = 0; i < listenerClasses.length; i++ ) {
listeners[i] = resolveListenerInstance( listenerClasses[i] );
}
return listeners;
}

@SuppressWarnings( {"unchecked"})
private <T> T resolveListenerInstance(Class<T> listenerClass) {
@SuppressWarnings("unchecked")
T listenerInstance = (T) listenerClassToInstanceMap.get( listenerClass );
if ( listenerInstance == null ) {
listenerInstance = instantiateListener( listenerClass );
Expand Down Expand Up @@ -240,9 +239,6 @@ private void applyStandardListeners() {
// load listeners
prepareListeners( LOAD, new DefaultLoadEventListener() );

// resolve natural-id listeners
prepareListeners( RESOLVE_NATURAL_ID, new DefaultResolveNaturalIdEventListener() );

// load-collection listeners
prepareListeners( INIT_COLLECTION, new DefaultInitializeCollectionEventListener() );

Expand Down
4 changes: 1 addition & 3 deletions hibernate-core/src/main/java/org/hibernate/event/spi/EventType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ public final class EventType<T> {
private static final AtomicInteger STANDARD_TYPE_COUNTER = new AtomicInteger();

public static final EventType<LoadEventListener> LOAD = create( "load", LoadEventListener.class );
public static final EventType<ResolveNaturalIdEventListener> RESOLVE_NATURAL_ID = create( "resolve-natural-id", ResolveNaturalIdEventListener.class );

public static final EventType<InitializeCollectionEventListener> INIT_COLLECTION = create( "load-collection", InitializeCollectionEventListener.class );

Expand Down Expand Up @@ -156,8 +155,7 @@ public String eventName() {
return eventName;
}

@SuppressWarnings("rawtypes")
public Class baseListenerInterface() {
public Class<T> baseListenerInterface() {
return baseListenerInterface;
}

Expand Down
117 changes: 0 additions & 117 deletions hibernate-core/src/main/java/org/hibernate/event/spi/ResolveNaturalIdEvent.java
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions hibernate-core/src/main/java/org/hibernate/event/spi/ResolveNaturalIdEventListener.java
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions hibernate-core/src/main/java/org/hibernate/internal/FastSessionServices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ public final class FastSessionServices {
public final EventListenerGroup<PreUpsertEventListener> eventListenerGroup_PRE_UPSERT;
public final EventListenerGroup<RefreshEventListener> eventListenerGroup_REFRESH;
public final EventListenerGroup<ReplicateEventListener> eventListenerGroup_REPLICATE;
public final EventListenerGroup<ResolveNaturalIdEventListener> eventListenerGroup_RESOLVE_NATURAL_ID;

// Fields used only from within this package
final boolean disallowOutOfTransactionUpdateOperations;
Expand Down Expand Up @@ -196,7 +195,6 @@ public final class FastSessionServices {
this.eventListenerGroup_PRE_UPSERT = listeners( eventListenerRegistry, EventType.PRE_UPSERT );
this.eventListenerGroup_REFRESH = listeners( eventListenerRegistry, EventType.REFRESH );
this.eventListenerGroup_REPLICATE = listeners( eventListenerRegistry, EventType.REPLICATE );
this.eventListenerGroup_RESOLVE_NATURAL_ID = listeners( eventListenerRegistry, EventType.RESOLVE_NATURAL_ID );

//Other highly useful constants:
this.dialect = jdbcServices.getJdbcEnvironment().getDialect();
Expand Down
10 changes: 0 additions & 10 deletions hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,6 @@
import org.hibernate.event.spi.RefreshEventListener;
import org.hibernate.event.spi.ReplicateEvent;
import org.hibernate.event.spi.ReplicateEventListener;
import org.hibernate.event.spi.ResolveNaturalIdEvent;
import org.hibernate.event.spi.ResolveNaturalIdEventListener;
import org.hibernate.loader.internal.CacheLoadHelper;
import org.hibernate.resource.transaction.spi.TransactionObserver;
import org.hibernate.event.monitor.spi.EventMonitor;
Expand Down Expand Up @@ -1286,14 +1284,6 @@ private void fireLoadNoChecks(final LoadEvent event, final LoadType loadType) {
.fireEventOnEachListener( event, loadType, LoadEventListener::onLoad );
}

private void fireResolveNaturalId(final ResolveNaturalIdEvent event) {
checkOpenOrWaitingForAutoClose();
pulseTransactionCoordinator();
fastSessionServices.eventListenerGroup_RESOLVE_NATURAL_ID
.fireEventOnEachListener( event, ResolveNaturalIdEventListener::onResolveNaturalId );
delayedAfterCompletion();
}


// refresh() operations ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Expand Down
Loading
Loading