Skip to content

Commit dbb3fd9

Browse files
gavinkinggavinking
committed
generalize uses of SessionImplementor to SharedSessionContractImplementor
1 parent 8f2ab3e commit dbb3fd9

File tree

5 files changed

+44
-47
lines changed

5 files changed

+44
-47
lines changed

‎hibernate-reactive-core/src/main/java/org/hibernate/reactive/engine/impl/CollectionTypes.java‎

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.hibernate.collection.spi.PersistentCollection;
2424
import org.hibernate.engine.spi.CollectionEntry;
2525
import org.hibernate.engine.spi.PersistenceContext;
26-
import org.hibernate.engine.spi.SessionImplementor;
2726
import org.hibernate.engine.spi.SharedSessionContractImplementor;
2827
import org.hibernate.metamodel.mapping.PluralAttributeMapping;
2928
import org.hibernate.persister.collection.CollectionPersister;
@@ -52,13 +51,13 @@ public class CollectionTypes {
5251
private static final Log LOG = LoggerFactory.make( Log.class, MethodHandles.lookup() );
5352

5453
/**
55-
* @see org.hibernate.type.AbstractType#replace(Object, Object, SharedSessionContractImplementor, Object, Map, ForeignKeyDirection)
54+
* @see org.hibernate.type.AbstractType#replace(Object, Object, , Object, Map, ForeignKeyDirection)
5655
*/
5756
public static CompletionStage<Object> replace(
5857
CollectionType type,
5958
Object original,
6059
Object target,
61-
SessionImplementor session,
60+
SharedSessionContractImplementor session,
6261
Object owner,
6362
Map<Object, Object> copyCache,
6463
ForeignKeyDirection foreignKeyDirection)
@@ -70,13 +69,13 @@ public static CompletionStage<Object> replace(
7069
}
7170

7271
/**
73-
* @see CollectionType#replace(Object, Object, SharedSessionContractImplementor, Object, Map)
72+
* @see CollectionType#replace(Object, Object, , Object, Map)
7473
*/
7574
public static CompletionStage<Object> replace(
7675
CollectionType type,
7776
Object original,
7877
Object target,
79-
SessionImplementor session,
78+
SharedSessionContractImplementor session,
8079
Object owner,
8180
Map<Object, Object> copyCache) throws HibernateException {
8281
if ( original == null ) {
@@ -92,11 +91,11 @@ else if ( !Hibernate.isInitialized( original ) ) {
9291

9392
// todo: make org.hibernate.type.CollectionType#replaceNullOriginal public ?
9493
/**
95-
* @see CollectionType#replaceNullOriginal(Object, SharedSessionContractImplementor)
94+
* @see CollectionType#replaceNullOriginal(Object, )
9695
*/
9796
private static Object replaceNullOriginal(
9897
Object target,
99-
SessionImplementor session) {
98+
SharedSessionContractImplementor session) {
10099
if ( target == null ) {
101100
return null;
102101
}
@@ -132,7 +131,7 @@ private static Object replaceUninitializedOriginal(
132131
CollectionType type,
133132
Object original,
134133
Object target,
135-
SessionImplementor session,
134+
SharedSessionContractImplementor session,
136135
Map<Object, Object> copyCache) {
137136
final PersistentCollection<?> persistentCollection = (PersistentCollection<?>) original;
138137
if ( persistentCollection.hasQueuedOperations() ) {
@@ -159,13 +158,13 @@ private static Object replaceUninitializedOriginal(
159158
}
160159

161160
/**
162-
* @see CollectionType#replaceOriginal(Object, Object, SharedSessionContractImplementor, Object, Map)
161+
* @see CollectionType#replaceOriginal(Object, Object, , Object, Map)
163162
*/
164163
private static CompletionStage<Object> replaceOriginal(
165164
CollectionType type,
166165
Object original,
167166
Object target,
168-
SessionImplementor session,
167+
SharedSessionContractImplementor session,
169168
Object owner,
170169
Map<Object, Object> copyCache) {
171170

@@ -203,15 +202,15 @@ private static CompletionStage<Object> replaceOriginal(
203202
}
204203

205204
/**
206-
* @see CollectionType#replaceElements(Object, Object, Object, Map, SharedSessionContractImplementor)
205+
* @see CollectionType#replaceElements(Object, Object, Object, Map, )
207206
*/
208207
private static CompletionStage<Object> replaceElements(
209208
CollectionType type,
210209
Object original,
211210
Object target,
212211
Object owner,
213212
Map<Object, Object> copyCache,
214-
SessionImplementor session) {
213+
SharedSessionContractImplementor session) {
215214
if ( type instanceof ArrayType ) {
216215
return replaceArrayTypeElements( type, original, target, owner, copyCache, session );
217216
}
@@ -246,7 +245,7 @@ private static CompletionStage<Object> replaceCollectionTypeElements(
246245
final Collection<Object> result,
247246
Object owner,
248247
Map<Object, Object> copyCache,
249-
SessionImplementor session) {
248+
SharedSessionContractImplementor session) {
250249
result.clear();
251250
// copy elements into newly empty target collection
252251
final Type elemType = type.getElementType( session.getFactory() );
@@ -261,7 +260,7 @@ private static CompletionStage<Object> preserveSnapshotIfNecessary(
261260
Collection<Object> result,
262261
Object owner,
263262
Map<Object, Object> copyCache,
264-
SessionImplementor session,
263+
SharedSessionContractImplementor session,
265264
Type elemType) {
266265
// if the original is a PersistentCollection, and that original
267266
// was not flagged as dirty, then reset the target's dirty flag
@@ -293,7 +292,7 @@ private static CompletionStage<Object> replaceMapTypeElements(
293292
Map<Object, Object> target,
294293
Object owner,
295294
Map<Object, Object> copyCache,
296-
SessionImplementor session) {
295+
SharedSessionContractImplementor session) {
297296
final CollectionPersister persister =
298297
session.getFactory().getRuntimeMetamodels().getMappingMetamodel()
299298
.getCollectionDescriptor( type.getRole() );
@@ -320,7 +319,7 @@ private static CompletionStage<Object> replaceArrayTypeElements(
320319
Object target,
321320
Object owner,
322321
Map<Object, Object> copyCache,
323-
SessionImplementor session) {
322+
SharedSessionContractImplementor session) {
324323
final Object result;
325324
final int length = Array.getLength( original );
326325
if ( length != Array.getLength( target ) ) {
@@ -345,7 +344,7 @@ private static CompletionStage<Object> getReplace(
345344
Type elemType,
346345
Object o,
347346
Object owner,
348-
SessionImplementor session,
347+
SharedSessionContractImplementor session,
349348
Map<Object, Object> copyCache) {
350349
return getReplace( elemType, o, null, owner, session, copyCache );
351350
}
@@ -355,23 +354,23 @@ private static CompletionStage<Object> getReplace(
355354
Object object,
356355
Object target,
357356
Object owner,
358-
SessionImplementor session,
357+
SharedSessionContractImplementor session,
359358
Map<Object, Object> copyCache) {
360359
return elemType instanceof EntityType entityType
361360
? EntityTypes.replace( entityType, object, target, session, owner, copyCache )
362361
: completedFuture( elemType.replace( object, target, session, owner, copyCache) );
363362
}
364363

365364
/**
366-
* @see CollectionType#preserveSnapshot(PersistentCollection, PersistentCollection, Type, Object, Map, SharedSessionContractImplementor)
365+
* @see CollectionType#preserveSnapshot(PersistentCollection, PersistentCollection, Type, Object, Map, )
367366
*/
368367
private static CompletionStage<Void> preserveSnapshot(
369368
PersistentCollection<?> original,
370369
PersistentCollection<?> result,
371370
Type elemType,
372371
Object owner,
373372
Map<Object, Object> copyCache,
374-
SessionImplementor session) {
373+
SharedSessionContractImplementor session) {
375374
final CollectionEntry ce = session.getPersistenceContextInternal().getCollectionEntry( result );
376375
if ( ce != null ) {
377376
return createSnapshot( original, result, elemType, owner, copyCache, session )
@@ -383,15 +382,15 @@ private static CompletionStage<Void> preserveSnapshot(
383382
}
384383

385384
/**
386-
* @see CollectionType#createSnapshot(PersistentCollection, PersistentCollection, Type, Object, Map, SharedSessionContractImplementor)
385+
* @see CollectionType#createSnapshot(PersistentCollection, PersistentCollection, Type, Object, Map, )
387386
*/
388387
private static CompletionStage<Serializable> createSnapshot(
389388
PersistentCollection<?> original,
390389
PersistentCollection<?> result,
391390
Type elemType,
392391
Object owner,
393392
Map<Object, Object> copyCache,
394-
SessionImplementor session) {
393+
SharedSessionContractImplementor session) {
395394
final Serializable originalSnapshot = original.getStoredSnapshot();
396395
if ( originalSnapshot instanceof List<?> list ) {
397396
return createListSnapshot( list, elemType, owner, copyCache, session );
@@ -409,30 +408,30 @@ else if ( originalSnapshot instanceof Object[] array ) {
409408
}
410409

411410
/**
412-
* @see CollectionType#createArraySnapshot(Object[], Type, Object, Map, SharedSessionContractImplementor)
411+
* @see CollectionType#createArraySnapshot(Object[], Type, Object, Map, )
413412
*/
414413
private static CompletionStage<Serializable> createArraySnapshot(
415414
Object[] array,
416415
Type elemType,
417416
Object owner,
418417
Map<Object, Object> copyCache,
419-
SessionImplementor session) {
418+
SharedSessionContractImplementor session) {
420419
return loop( 0, array.length,
421420
i -> getReplace( elemType, array[i], owner, session, copyCache )
422421
.thenAccept( o -> array[i] = o )
423422
).thenApply( unused -> array );
424423
}
425424

426425
/**
427-
* @see CollectionType#createMapSnapshot(Map, PersistentCollection, Type, Object, Map, SharedSessionContractImplementor)
426+
* @see CollectionType#createMapSnapshot(Map, PersistentCollection, Type, Object, Map, )
428427
*/
429428
private static <K,V> CompletionStage<Serializable> createMapSnapshot(
430429
Map<K,V> map,
431430
PersistentCollection<?> result,
432431
Type elemType,
433432
Object owner,
434433
Map<Object, Object> copyCache,
435-
SessionImplementor session) {
434+
SharedSessionContractImplementor session) {
436435
final Map<?, ?> resultSnapshot = (Map<?, ?>) result.getStoredSnapshot();
437436
final Map<K, V> targetMap =
438437
map instanceof SortedMap<K, V> sortedMap
@@ -450,14 +449,14 @@ private static <K,V> CompletionStage<Serializable> createMapSnapshot(
450449
}
451450

452451
/**
453-
* @see CollectionType#createListSnapshot(List, Type, Object, Map, SharedSessionContractImplementor)
452+
* @see CollectionType#createListSnapshot(List, Type, Object, Map, )
454453
*/
455454
private static CompletionStage<Serializable> createListSnapshot(
456455
List<?> list,
457456
Type elemType,
458457
Object owner,
459458
Map<Object, Object> copyCache,
460-
SessionImplementor session) {
459+
SharedSessionContractImplementor session) {
461460
final ArrayList<Object> targetList = new ArrayList<>( list.size() );
462461
return loop( list,
463462
obj -> getReplace( elemType, obj, owner, session, copyCache )

‎hibernate-reactive-core/src/main/java/org/hibernate/reactive/engine/impl/EntityTypes.java‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import org.hibernate.engine.spi.PersistenceContext;
1717
import org.hibernate.engine.spi.PersistentAttributeInterceptor;
1818
import org.hibernate.engine.spi.SessionFactoryImplementor;
19-
import org.hibernate.engine.spi.SessionImplementor;
2019
import org.hibernate.engine.spi.SharedSessionContractImplementor;
2120
import org.hibernate.metamodel.mapping.AttributeMapping;
2221
import org.hibernate.persister.entity.EntityPersister;
@@ -155,7 +154,7 @@ public static CompletionStage<Object[]> replace(
155154
final Object[] original,
156155
final Object[] target,
157156
final Type[] types,
158-
final SessionImplementor session,
157+
final SharedSessionContractImplementor session,
159158
final Object owner,
160159
final Map<Object, Object> copyCache) {
161160
Object[] copied = new Object[original.length];
@@ -171,7 +170,7 @@ public static CompletionStage<Object[]> replace(
171170
final Object[] original,
172171
final Object[] target,
173172
final Type[] types,
174-
final SessionImplementor session,
173+
final SharedSessionContractImplementor session,
175174
final Object owner,
176175
final Map<Object, Object> copyCache,
177176
final ForeignKeyDirection foreignKeyDirection) {
@@ -188,7 +187,7 @@ private static CompletionStage<Object> replace(
188187
EntityType entityType,
189188
Object original,
190189
Object target,
191-
SessionImplementor session,
190+
SharedSessionContractImplementor session,
192191
Object owner,
193192
Map<Object, Object> copyCache,
194193
ForeignKeyDirection foreignKeyDirection)
@@ -208,7 +207,7 @@ protected static CompletionStage<Object> replace(
208207
EntityType entityType,
209208
Object original,
210209
Object target,
211-
SessionImplementor session,
210+
SharedSessionContractImplementor session,
212211
Object owner,
213212
Map<Object, Object> copyCache) {
214213
if ( original == null ) {
@@ -254,7 +253,7 @@ protected static CompletionStage<Object> replace(
254253
private static CompletionStage<Object> resolveIdOrUniqueKey(
255254
EntityType entityType,
256255
Object original,
257-
SessionImplementor session,
256+
SharedSessionContractImplementor session,
258257
Object owner,
259258
Map<Object, Object> copyCache) {
260259
return getIdentifier( entityType, original, session )
@@ -289,7 +288,7 @@ private static CompletionStage<Object> resolveIdOrUniqueKey(
289288
private static CompletionStage<Object> getIdentifier(
290289
EntityType entityType,
291290
Object value,
292-
SessionImplementor session) {
291+
SharedSessionContractImplementor session) {
293292
if ( entityType.isReferenceToIdentifierProperty() ) {
294293
// tolerates nulls
295294
return getEntityIdentifierIfNotUnsaved( entityType.getAssociatedEntityName(), value, session );
@@ -358,7 +357,7 @@ private static CompletionStage<Object> getIdentifierFromHibernateProxy(
358357
// an entity type, in which case we need to resolve its identifier
359358
final AttributeMapping type = entityPersister.findAttributeMapping( uniqueKeyPropertyName );
360359
if ( type.isEntityIdentifierMapping() ) {
361-
propertyValue = getIdentifier( (EntityType) type, propertyValue, (SessionImplementor) session );
360+
propertyValue = getIdentifier( (EntityType) type, propertyValue, (SharedSessionContractImplementor) session );
362361
}
363362
return propertyValue;
364363
}
@@ -389,7 +388,7 @@ private static CompletionStage<Void> replace(
389388
Object[] original,
390389
Object[] target,
391390
Type[] types,
392-
SessionImplementor session,
391+
SharedSessionContractImplementor session,
393392
Object owner,
394393
Map<Object, Object> copyCache,
395394
int i,
@@ -435,7 +434,7 @@ private static CompletionStage<Void> replace(
435434
Object[] original,
436435
Object[] target,
437436
Type[] types,
438-
SessionImplementor session,
437+
SharedSessionContractImplementor session,
439438
Object owner,
440439
Map<Object, Object> copyCache,
441440
ForeignKeyDirection foreignKeyDirection,

‎hibernate-reactive-core/src/main/java/org/hibernate/reactive/engine/impl/ForeignKeys.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import org.hibernate.engine.spi.EntityEntry;
1616
import org.hibernate.engine.spi.PersistenceContext;
1717
import org.hibernate.engine.spi.SelfDirtinessTracker;
18-
import org.hibernate.engine.spi.SessionImplementor;
1918
import org.hibernate.engine.spi.SharedSessionContractImplementor;
2019
import org.hibernate.internal.util.StringHelper;
2120
import org.hibernate.persister.entity.EntityPersister;
@@ -48,7 +47,7 @@ public final class ForeignKeys {
4847
public static class Nullifier {
4948
private final boolean isDelete;
5049
private final boolean isEarlyInsert;
51-
private final SessionImplementor session;
50+
private final SharedSessionContractImplementor session;
5251
private final Object self;
5352
private final EntityPersister persister;
5453

@@ -65,7 +64,7 @@ public Nullifier(
6564
final Object self,
6665
final boolean isDelete,
6766
final boolean isEarlyInsert,
68-
final SessionImplementor session,
67+
final SharedSessionContractImplementor session,
6968
final EntityPersister persister) {
7069
this.isDelete = isDelete;
7170
this.isEarlyInsert = isEarlyInsert;
@@ -270,7 +269,7 @@ private CompletionStage<Boolean> isNullifiable(final String entityName, Object o
270269
*
271270
* @return {@code true} if the given entity is not transient (meaning it is either detached/persistent)
272271
*/
273-
public static CompletionStage<Boolean> isNotTransient(String entityName, Object entity, Boolean assumed, SessionImplementor session) {
272+
public static CompletionStage<Boolean> isNotTransient(String entityName, Object entity, Boolean assumed, SharedSessionContractImplementor session) {
274273
if ( isHibernateProxy( entity ) ) {
275274
return trueFuture();
276275
}
@@ -297,7 +296,7 @@ public static CompletionStage<Boolean> isNotTransient(String entityName, Object
297296
*
298297
* @return {@code true} if the given entity is transient (unsaved)
299298
*/
300-
public static CompletionStage<Boolean> isTransient(String entityName, Object entity, Boolean assumed, SessionImplementor session) {
299+
public static CompletionStage<Boolean> isTransient(String entityName, Object entity, Boolean assumed, SharedSessionContractImplementor session) {
301300
if ( entity == LazyPropertyInitializer.UNFETCHED_PROPERTY ) {
302301
// an unfetched association can only point to
303302
// an entity that already exists in the db
@@ -350,7 +349,7 @@ public static CompletionStage<Boolean> isTransient(String entityName, Object ent
350349
public static CompletionStage<Object> getEntityIdentifierIfNotUnsaved(
351350
final String entityName,
352351
final Object object,
353-
final SessionImplementor session) throws TransientObjectException {
352+
final SharedSessionContractImplementor session) throws TransientObjectException {
354353
if ( object == null ) {
355354
return nullFuture();
356355
}
@@ -387,7 +386,7 @@ public static CompletionStage<NonNullableTransientDependencies> findNonNullableT
387386

388387
final EntityPersister persister = session.getEntityPersister( entityName, entity );
389388
final Type[] types = persister.getPropertyTypes();
390-
final Nullifier nullifier = new Nullifier( entity, false, isEarlyInsert, (SessionImplementor) session, persister );
389+
final Nullifier nullifier = new Nullifier( entity, false, isEarlyInsert, session, persister );
391390
final String[] propertyNames = persister.getPropertyNames();
392391
final boolean[] nullability = persister.getPropertyNullability();
393392
final NonNullableTransientDependencies nonNullableTransientEntities = new NonNullableTransientDependencies();

0 commit comments

Comments
 (0)