Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 7baa9e4

Browse files
HHH-12185 - Simplify SessionFactoryBuilder / SessionFactoryOptions handling
Option #1 - still building a stand-alone, immutable options object
1 parent 829b338 commit 7baa9e4

File tree

8 files changed

+1333
-1368
lines changed

8 files changed

+1333
-1368
lines changed

‎hibernate-core/src/main/java/org/hibernate/boot/SessionFactoryBuilder.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,10 @@ SessionFactoryBuilder applyEntityTuplizer(
441441
* @return {@code this}, for method chaining
442442
*
443443
* @see org.hibernate.cfg.AvailableSettings#JPAQL_STRICT_COMPLIANCE
444+
*
445+
* @deprecated Use {@link #enableJpaQueryCompliance} instead
444446
*/
447+
@Deprecated
445448
SessionFactoryBuilder applyStrictJpaQueryLanguageCompliance(boolean enabled);
446449

447450
/**

‎hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryBuilderImpl.java

Lines changed: 84 additions & 1349 deletions
Large diffs are not rendered by default.

‎hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java

Lines changed: 1232 additions & 0 deletions
Large diffs are not rendered by default.

‎hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsImpl.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ public class SessionFactoryOptionsImpl implements SessionFactoryOptions {
9999

100100
// Queries
101101
private final Map querySubstitutions;
102-
private final boolean strictJpaQueryLanguageCompliance;
103102
private final boolean namedQueryStartupCheckingEnabled;
104103
private final boolean conventionalJavaConstants;
105104
private final boolean procedureParameterNullPassingEnabled;
@@ -186,7 +185,6 @@ public SessionFactoryOptionsImpl(SessionFactoryOptionsState state) {
186185
this.currentTenantIdentifierResolver = state.getCurrentTenantIdentifierResolver();
187186

188187
this.querySubstitutions = state.getQuerySubstitutions();
189-
this.strictJpaQueryLanguageCompliance = state.isStrictJpaQueryLanguageCompliance();
190188
this.namedQueryStartupCheckingEnabled = state.isNamedQueryStartupCheckingEnabled();
191189
this.conventionalJavaConstants = state.isConventionalJavaConstants();
192190
this.procedureParameterNullPassingEnabled = state.isProcedureParameterNullPassingEnabled();
@@ -396,11 +394,6 @@ public Map getQuerySubstitutions() {
396394
return querySubstitutions;
397395
}
398396

399-
@Override
400-
public boolean isStrictJpaQueryLanguageCompliance() {
401-
return strictJpaQueryLanguageCompliance;
402-
}
403-
404397
@Override
405398
public boolean isNamedQueryStartupCheckingEnabled() {
406399
return namedQueryStartupCheckingEnabled;

‎hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingSessionFactoryOptions.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -211,11 +211,6 @@ public Map getQuerySubstitutions() {
211211
return delegate.getQuerySubstitutions();
212212
}
213213

214-
@Override
215-
public boolean isStrictJpaQueryLanguageCompliance() {
216-
return delegate.isStrictJpaQueryLanguageCompliance();
217-
}
218-
219214
@Override
220215
public boolean isNamedQueryStartupCheckingEnabled() {
221216
return delegate.isNamedQueryStartupCheckingEnabled();

‎hibernate-core/src/main/java/org/hibernate/boot/spi/SessionFactoryOptions.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,14 @@ default Supplier<? extends Interceptor> getStatelessInterceptorImplementorSuppli
165165

166166
Map getQuerySubstitutions();
167167

168-
boolean isStrictJpaQueryLanguageCompliance();
168+
/**
169+
* @deprecated Use {@link JpaCompliance#isJpaQueryComplianceEnabled()} instead
170+
* via {@link #getJpaCompliance()}
171+
*/
172+
@Deprecated
173+
default boolean isStrictJpaQueryLanguageCompliance() {
174+
return getJpaCompliance().isJpaQueryComplianceEnabled();
175+
}
169176

170177
boolean isNamedQueryStartupCheckingEnabled();
171178

‎hibernate-core/src/main/java/org/hibernate/cfg/Settings.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ public Settings(SessionFactoryOptions sessionFactoryOptions, String defaultCatal
8989
LOG.debugf( "JTA Track by Thread: %s", enabledDisabled( sessionFactoryOptions.isJtaTrackByThread() ) );
9090

9191
LOG.debugf( "Query language substitutions: %s", sessionFactoryOptions.getQuerySubstitutions() );
92-
LOG.debugf( "JPA query language strict compliance: %s", enabledDisabled( sessionFactoryOptions.isStrictJpaQueryLanguageCompliance() ) );
9392
LOG.debugf( "Named query checking : %s", enabledDisabled( sessionFactoryOptions.isNamedQueryStartupCheckingEnabled() ) );
9493

9594
LOG.debugf( "Second-level cache: %s", enabledDisabled( sessionFactoryOptions.isSecondLevelCacheEnabled() ) );
@@ -109,6 +108,11 @@ public Settings(SessionFactoryOptions sessionFactoryOptions, String defaultCatal
109108
LOG.debugf( "JDBC result set fetch size: %s", sessionFactoryOptions.getJdbcFetchSize() );
110109
LOG.debugf( "Connection release mode: %s", sessionFactoryOptions.getConnectionReleaseMode() );
111110
LOG.debugf( "Generate SQL with comments: %s", enabledDisabled( sessionFactoryOptions.isCommentsEnabled() ) );
111+
112+
LOG.debugf( "JPA compliance - query : ", enabledDisabled( sessionFactoryOptions.getJpaCompliance().isJpaQueryComplianceEnabled() ) );
113+
LOG.debugf( "JPA compliance - closed-handling : ", enabledDisabled( sessionFactoryOptions.getJpaCompliance().isJpaClosedComplianceEnabled() ) );
114+
LOG.debugf( "JPA compliance - lists : ", enabledDisabled( sessionFactoryOptions.getJpaCompliance().isJpaListComplianceEnabled() ) );
115+
LOG.debugf( "JPA compliance - transactions : ", enabledDisabled( sessionFactoryOptions.getJpaCompliance().isJpaTransactionComplianceEnabled() ) );
112116
}
113117
}
114118

@@ -207,10 +211,6 @@ public Map getQuerySubstitutions() {
207211
return sessionFactoryOptions.getQuerySubstitutions();
208212
}
209213

210-
public boolean isStrictJPAQLCompliance() {
211-
return sessionFactoryOptions.isStrictJpaQueryLanguageCompliance();
212-
}
213-
214214
public boolean isNamedQueryStartupCheckingEnabled() {
215215
return sessionFactoryOptions.isNamedQueryStartupCheckingEnabled();
216216
}

‎hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/SessionFactoryHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,6 @@ public String[][] generateColumnNames(Type[] sqlResultTypes) {
419419
}
420420

421421
public boolean isStrictJPAQLComplianceEnabled() {
422-
return sfi.getSessionFactoryOptions().isStrictJpaQueryLanguageCompliance();
422+
return sfi.getSessionFactoryOptions().getJpaCompliance().isJpaQueryComplianceEnabled();
423423
}
424424
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /