Commit 67874eb

committed

HHH-12185 - Simplify SessionFactoryBuilder / SessionFactoryOptions handling

Option #2 - SessionFactoryOptionsBuilder as SessionFactoryOptions

1 parent 7baa9e4 commit 67874ebCopy full SHA for 67874eb

File tree

3 files changed

+14

-805

lines changed

hibernate-core/src/main/java/org/hibernate/boot/internal

3 files changed

+14

-805

lines changed

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

Lines changed: 14 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@`
`128`	`128`	`*`
`129`	`129`	`* @author Steve Ebersole`
`130`	`130`	`*/`
`131`		`-public class SessionFactoryOptionsBuilder implements SessionFactoryOptionsState {`
	`131`	`+public class SessionFactoryOptionsBuilder implements SessionFactoryOptions {`
`132`	`132`	`private static final Logger log = Logger.getLogger( SessionFactoryOptionsBuilder.class );`
`133`	`133`
`134`	`134`	`private final StandardServiceRegistry serviceRegistry;`
`@@ -227,7 +227,7 @@ public class SessionFactoryOptionsBuilder implements SessionFactoryOptionsState`
`227`	`227`
`228`	`228`	`private boolean failOnPaginationOverCollectionFetchEnabled;`
`229`	`229`
`230`		`- @SuppressWarnings("WeakerAccess")`
	`230`	`+ @SuppressWarnings({"WeakerAccess", "deprecation"})`
`231`	`231`	`public SessionFactoryOptionsBuilder(StandardServiceRegistry serviceRegistry) {`
`232`	`232`	`this.serviceRegistry = serviceRegistry;`
`233`	`233`
`@@ -457,6 +457,7 @@ else if ( jdbcTimeZoneValue != null ) {`
`457`	`457`	`);`
`458`	`458`	`}`
`459`	`459`
	`460`	`+ @SuppressWarnings("deprecation")`
`460`	`461`	`private static Interceptor determineInterceptor(Map configurationSettings, StrategySelector strategySelector) {`
`461`	`462`	`Object setting = configurationSettings.get( INTERCEPTOR );`
`462`	`463`	`if ( setting == null ) {`
`@@ -476,7 +477,7 @@ private static Interceptor determineInterceptor(Map configurationSettings, Strat`
`476`	`477`	`);`
`477`	`478`	`}`
`478`	`479`
`479`		`- @SuppressWarnings("unchecked")`
	`480`	`+ @SuppressWarnings({"unchecked", "deprecation"})`
`480`	`481`	`private static Supplier<? extends Interceptor> determineStatelessInterceptor(`
`481`	`482`	`Map configurationSettings,`
`482`	`483`	`StrategySelector strategySelector) {`
`@@ -524,6 +525,7 @@ private static Supplier<? extends Interceptor> interceptorSupplier(Class<? exten`
`524`	`525`	`};`
`525`	`526`	`}`
`526`	`527`
	`528`	`+ @SuppressWarnings("deprecation")`
`527`	`529`	`private PhysicalConnectionHandlingMode interpretConnectionHandlingMode(`
`528`	`530`	`Map configurationSettings,`
`529`	`531`	`StandardServiceRegistry serviceRegistry) {`
`@@ -552,6 +554,7 @@ private PhysicalConnectionHandlingMode interpretConnectionHandlingMode(`
`552`	`554`	`return transactionCoordinatorBuilder.getDefaultConnectionHandlingMode();`
`553`	`555`	`}`
`554`	`556`
	`557`	`+ @SuppressWarnings("deprecation")`
`555`	`558`	`private PhysicalConnectionHandlingMode interpretConnectionHandlingMode(`
`556`	`559`	`ConnectionAcquisitionMode specifiedAcquisitionMode,`
`557`	`560`	`ConnectionReleaseMode specifiedReleaseMode,`
`@@ -770,11 +773,6 @@ public Map getQuerySubstitutions() {`
`770`	`773`	`return querySubstitutions;`
`771`	`774`	`}`
`772`	`775`
`773`		`- @Override`
`774`		`- public boolean isStrictJpaQueryLanguageCompliance() {`
`775`		`- return jpaCompliance.isJpaQueryComplianceEnabled();`
`776`		`- }`
`777`		`-`
`778`	`776`	`@Override`
`779`	`777`	`public boolean isNamedQueryStartupCheckingEnabled() {`
`780`	`778`	`return namedQueryStartupCheckingEnabled;`
`@@ -876,15 +874,20 @@ public PhysicalConnectionHandlingMode getPhysicalConnectionHandlingMode() {`
`876`	`874`	`}`
`877`	`875`
`878`	`876`	`@Override`
`879`		`- public booleanconnectionProviderDisablesAutoCommit() {`
`880`		`- returnconnectionProviderDisablesAutoCommit;`
	`877`	`+ public voidsetCheckNullability(booleanenabled) {`
	`878`	`+ this.checkNullability = enabled;`
`881`	`879`	`}`
`882`	`880`
`883`	`881`	`@Override`
`884`	`882`	`public ConnectionReleaseMode getConnectionReleaseMode() {`
`885`	`883`	`return getPhysicalConnectionHandlingMode().getReleaseMode();`
`886`	`884`	`}`
`887`	`885`
	`886`	`+ @Override`
	`887`	`+ public boolean doesConnectionProviderDisableAutoCommit() {`
	`888`	`+ return connectionProviderDisablesAutoCommit;`
	`889`	`+ }`
	`890`	`+`
`888`	`891`	`@Override`
`889`	`892`	`public boolean isCommentsEnabled() {`
`890`	`893`	`return commentsEnabled;`
`@@ -1226,7 +1229,7 @@ public void enableJdbcStyleParamsZeroBased() {`
`1226`	`1229`	`}`
`1227`	`1230`
`1228`	`1231`	`public SessionFactoryOptions buildOptions() {`
`1229`		`- return newSessionFactoryOptionsImpl( this );`
	`1232`	`+ return this;`
`1230`	`1233`	`}`
`1231`	`1234`
`1232`	`1235`	`}`

0 commit comments

Comments

(0)

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 67874eb

File tree

3 files changed

3 files changed

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

0 commit comments