Skip to content

Use a more specific interface (QueryProducerImplementor) in JdbcExecHelper to help with build reproducibility #9906

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

Closed
wants to merge 1 commit into from
Closed

Use a more specific interface (QueryProducerImplementor) in JdbcExecHelper to help with build reproducibility #9906

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
6 changes: 3 additions & 3 deletions hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcExecHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
package org.hibernate.sql.exec.internal;

import org.hibernate.CacheMode;
import org.hibernate.engine.spi.SharedSessionContractImplementor;
import org.hibernate.query.spi.QueryOptions;
import org.hibernate.query.spi.QueryProducerImplementor;
import org.hibernate.sql.exec.spi.ExecutionContext;

import static org.hibernate.internal.util.NullnessHelper.coalesceSuppliedValues;
Expand All @@ -27,15 +27,15 @@ public static CacheMode resolveCacheMode(ExecutionContext executionContext) {
return resolveCacheMode( executionContext.getQueryOptions(), executionContext.getSession() );
}

public static CacheMode resolveCacheMode(QueryOptions options, SharedSessionContractImplementor session) {
public static CacheMode resolveCacheMode(QueryOptions options, QueryProducerImplementor session) {
return coalesceSuppliedValues(
() -> options == null ? null : options.getCacheMode(),
session::getCacheMode,
() -> CacheMode.NORMAL
);
}

public static CacheMode resolveCacheMode(CacheMode override, SharedSessionContractImplementor session) {
public static CacheMode resolveCacheMode(CacheMode override, QueryProducerImplementor session) {
return coalesceSuppliedValues(
() -> override,
session::getCacheMode,
Expand Down
Loading