Skip to content

Upgrade Hibernate ORM to 7.2.0.CR3 #2804

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Upgrade Hibernate ORM to 7.2.0.CR3 #2804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]
assertjVersion = "3.27.6"
hibernateOrmVersion = "7.2.0.CR2"
hibernateOrmGradlePluginVersion = "7.2.0.CR2"
hibernateOrmVersion = "7.2.0.CR3"
hibernateOrmGradlePluginVersion = "7.2.0.CR3"
jacksonDatabindVersion = "2.20.1"
jbossLoggingAnnotationVersion = "3.0.4.Final"
jbossLoggingVersion = "3.6.1.Final"
Expand Down
3 changes: 1 addition & 2 deletions ...a/org/hibernate/reactive/persister/entity/mutation/ReactiveInsertCoordinatorStandard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,9 +415,8 @@ else if ( isValueGenerationInSql( generator, factory().getJdbcServices().getDial
final BasicEntityIdentifierMapping identifierMapping = (BasicEntityIdentifierMapping) entityPersister().getIdentifierMapping();
final String[] columnValues = generator.getReferencedColumnValues( dialect );
tableMapping.getKeyMapping().forEachKeyColumn( (i, column) -> tableInsertBuilder.addKeyColumn(
column.getColumnName(),
columnValues[i],
identifierMapping.getJdbcMapping()
identifierMapping
) );
}
}
Expand Down
8 changes: 4 additions & 4 deletions ...src/main/java/org/hibernate/reactive/sql/exec/internal/ReactiveJdbcSelectWithActions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public static class Builder implements JdbcSelectWithActionsBuilder {
protected LockOptions lockOptions;
protected QuerySpec lockingTarget;
protected LockingClauseStrategy lockingClauseStrategy;
boolean isFollonOnLockStrategy;
boolean isFollowOnLockStrategy;

@Override
public Builder setPrimaryAction(JdbcSelect primaryAction) {
Expand Down Expand Up @@ -179,8 +179,8 @@ public Builder setLockingClauseStrategy(LockingClauseStrategy lockingClauseStrat
}

@Override
public Builder setIsFollowOnLockStrategy(boolean isFollonOnLockStrategy) {
this.isFollonOnLockStrategy = isFollonOnLockStrategy;
public Builder setIsFollowOnLockStrategy(boolean isFollowOnLockStrategy) {
this.isFollowOnLockStrategy = isFollowOnLockStrategy;
return this;
}

Expand All @@ -194,7 +194,7 @@ public JdbcSelect build() {
)
);
}
if ( isFollonOnLockStrategy ) {
if ( isFollowOnLockStrategy ) {
ReactiveFollowOnLockingAction.apply( lockOptions, lockingTarget, lockingClauseStrategy, this );
}

Expand Down
9 changes: 1 addition & 8 deletions ...ain/java/org/hibernate/reactive/sql/exec/internal/lock/ReactiveFollowOnLockingAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,9 @@
import org.hibernate.LockMode;
import org.hibernate.LockOptions;
import org.hibernate.Locking;
import org.hibernate.engine.spi.CollectionKey;
import org.hibernate.engine.spi.EntityKey;
import org.hibernate.engine.spi.SharedSessionContractImplementor;
import org.hibernate.metamodel.mapping.EntityMappingType;
import org.hibernate.metamodel.mapping.PluralAttributeMapping;
import org.hibernate.metamodel.mapping.TableDetails;
import org.hibernate.reactive.logging.impl.Log;
import org.hibernate.reactive.logging.impl.LoggerFactory;
Expand All @@ -32,10 +30,8 @@
import java.lang.invoke.MethodHandles;
import java.sql.Connection;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletionStage;

import static java.util.Collections.emptyMap;
import static org.hibernate.reactive.util.impl.CompletionStages.loop;

/**
Expand Down Expand Up @@ -98,10 +94,7 @@ public CompletionStage<Void> reactivePerformReactivePostAction(

// collect registrations by entity type
final var entitySegments = segmentLoadedValues();
final Map<EntityMappingType, Map<PluralAttributeMapping, List<CollectionKey>>> collectionSegments =
lockScope == Locking.Scope.INCLUDE_FETCHES
? segmentLoadedCollections()
: emptyMap();
final var collectionSegments = segmentLoadedCollections();

// for each entity-type, prepare a locking select statement per table.
// this is based on the attributes for "state array" ordering purposes -
Expand Down
Loading