HHH-18610 DynamicFetchBuilderLegacy LockMode

Author: dreab8

hibernate-core/src/main/java/org/hibernate/query/results/dynamic/DynamicFetchBuilderLegacy.java

@@ -60,6 +60,8 @@ public class DynamicFetchBuilderLegacy implements DynamicFetchBuilder, NativeQue
 	private final Map<Fetchable, FetchBuilder> fetchBuilderMap;
 	private final DynamicResultBuilderEntityStandard resultBuilderEntity;
 
+	private LockMode lockMode;
+
 	public DynamicFetchBuilderLegacy(
 			String tableAlias,
 			String ownerTableAlias,
@@ -101,6 +103,7 @@ public Fetchable getFetchable() {
 
 	@Override
 	public NativeQuery.FetchReturn setLockMode(LockMode lockMode) {
+		this.lockMode = lockMode;
 		return this;
 	}
 
@@ -171,6 +174,9 @@ public Fetch buildFetch(
 		final DomainResultCreationStateImpl creationState = impl( domainResultCreationState );
 		final TableGroup ownerTableGroup = creationState.getFromClauseAccess().findByAlias( ownerTableAlias );
 		final TableGroup tableGroup;
+		if ( lockMode != null ) {
+			domainResultCreationState.getSqlAstCreationState().registerLockMode( tableAlias, lockMode );
+		}
 		if ( fetchable instanceof TableGroupJoinProducer ) {
 			final SqlAliasBase sqlAliasBase = new SqlAliasBaseConstant( tableAlias );
 			final TableGroupJoin tableGroupJoin = ( (TableGroupJoinProducer) fetchable ).createTableGroupJoin(
@@ -341,11 +347,6 @@ public void addFetchBuilder(Fetchable fetchable, FetchBuilder fetchBuilder) {
 		fetchBuilderMap.put( fetchable, fetchBuilder );
 	}
 
-//	@Override
-//	public void visitFetchBuilders(BiConsumer<Fetchable, FetchBuilder> consumer) {
-//		fetchBuilderMap.forEach( consumer );
-//	}
-
 	@Override
 	public boolean equals(Object o) {
 		if ( this == o ) {
@@ -359,6 +360,7 @@ public boolean equals(Object o) {
 		return tableAlias.equals( that.tableAlias )
 				&& ownerTableAlias.equals( that.ownerTableAlias )
 				&& fetchable.equals( that.fetchable )
+				&& lockMode.equals( that.lockMode )
 				&& Objects.equals( columnNames, that.columnNames )
 				&& Objects.equals( fetchBuilderMap, that.fetchBuilderMap )
 				&& Objects.equals( resultBuilderEntity, that.resultBuilderEntity );
@@ -369,6 +371,7 @@ public int hashCode() {
 		int result = tableAlias.hashCode();
 		result = 31 * result + ownerTableAlias.hashCode();
 		result = 31 * result + fetchable.hashCode();
+		result = 31 * result + lockMode.hashCode();
 		result = 31 * result + ( columnNames != null ? columnNames.hashCode() : 0 );
 		result = 31 * result + ( fetchBuilderMap != null ? fetchBuilderMap.hashCode() : 0 );
 		result = 31 * result + ( resultBuilderEntity != null ? resultBuilderEntity.hashCode() : 0 );