Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove some obsolete config properties

This commit is contained in:
Gavin King 2022-01-22 00:36:48 +01:00
parent 0b01d406c3
commit fd75e3e75d
17 changed files with 4 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryOptionsBuilder.java
View File

@ -378,13 +378,9 @@ public class SessionFactoryOptionsBuilder implements SessionFactoryOptions {
this.jtaTrackByThread = cfgService.getSetting( JTA_TRACK_BY_THREAD, BOOLEAN, true );
final String hqlTranslatorImplFqn = ConfigurationHelper.extractValue(
final String hqlTranslatorImplFqn = ConfigurationHelper.extractPropertyValue(
AvailableSettings.SEMANTIC_QUERY_PRODUCER,
configurationSettings,
() -> ConfigurationHelper.extractPropertyValue(
AvailableSettings.QUERY_TRANSLATOR,
configurationSettings
)
configurationSettings
);
this.hqlTranslator = resolveHqlTranslator(
hqlTranslatorImplFqn,
@ -403,17 +399,9 @@ public class SessionFactoryOptionsBuilder implements SessionFactoryOptions {
);
final String sqmMutationStrategyImplName = ConfigurationHelper.extractValue(
final String sqmMutationStrategyImplName = ConfigurationHelper.extractPropertyValue(
AvailableSettings.QUERY_MULTI_TABLE_MUTATION_STRATEGY,
configurationSettings,
() -> ConfigurationHelper.extractValue(
AvailableSettings.ID_TABLE_STRATEGY,
configurationSettings,
() -> ConfigurationHelper.extractPropertyValue(
AvailableSettings.HQL_BULK_ID_STRATEGY,
configurationSettings
)
)
configurationSettings
);
this.sqmMultiTableMutationStrategy = resolveSqmMutationStrategy(

45
hibernate-core/src/main/java/org/hibernate/cfg/AvailableSettings.java
View File

@ -929,39 +929,6 @@ public interface AvailableSettings {
*/
String CALLABLE_NAMED_PARAMS_ENABLED = "hibernate.query.proc.callable_named_params_enabled";
/**
* Should Hibernate use enhanced entities "as a proxy"?
* <p>
* E.g., when an application uses {@link org.hibernate.Session#load} against an enhanced
* class, enabling this will allow Hibernate to create an "empty" instance of the enhanced
* class to act as the proxy - it contains just the identifier which is later used to
* trigger the base initialization but no other data is loaded
* <p>
* Not enabling this (the legacy default behavior) would cause the "base" attributes to
* be loaded. Any lazy-group attributes would not be initialized.
* <p>
* Applications using bytecode enhancement and switching to allowing this should be careful
* in use of the various {@link org.hibernate.Hibernate} methods such as
* {@link org.hibernate.Hibernate#isInitialized},
* {@link org.hibernate.Hibernate#isPropertyInitialized}, etc - enabling this setting changes
* the results of those methods
*
* @implSpec See {@link org.hibernate.bytecode.enhance.spi.interceptor.EnhancementAsProxyLazinessInterceptor}
*
* @deprecated (as of 5.5) with no replacement. When using enhancement based lazy loading
* using the enhanced class as proxy is always used when appropriate.
*/
@Deprecated
String ALLOW_ENHANCEMENT_AS_PROXY = "hibernate.bytecode.allow_enhancement_as_proxy";
/**
* The classname of the HQL query parser factory
*
* @deprecated Use {@link #SEMANTIC_QUERY_PRODUCER}
*/
@Deprecated
String QUERY_TRANSLATOR = "hibernate.query.factory_class";
/**
* Names the {@link org.hibernate.query.hql.HqlTranslator} class to use.
*/
@ -972,18 +939,6 @@ public interface AvailableSettings {
*/
String SEMANTIC_QUERY_TRANSLATOR = "hibernate.query.sqm.translator";
/**
* @deprecated Use {@link #QUERY_MULTI_TABLE_MUTATION_STRATEGY} instead
*/
@Deprecated
String HQL_BULK_ID_STRATEGY = "hibernate.hql.bulk_id_strategy";
/**
* @deprecated Use {@link #QUERY_MULTI_TABLE_MUTATION_STRATEGY} instead
*/
@Deprecated
String ID_TABLE_STRATEGY = "hibernate.id_table_strategy";
/**
* Defines the "global" strategy to use for handling HQL and Criteria mutation queries.
*

6
hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/IdInUninitializedProxyTest.java
View File

@ -36,12 +36,6 @@ public class IdInUninitializedProxyTest extends BaseNonConfigCoreFunctionalTestC
return new Class[] { AnEntity.class };
}
@Override
protected void configureStandardServiceRegistryBuilder(StandardServiceRegistryBuilder ssrb) {
super.configureStandardServiceRegistryBuilder( ssrb );
ssrb.applySetting( AvailableSettings.ALLOW_ENHANCEMENT_AS_PROXY, true );
}
@Test
public void testIdIsAlwaysConsideredInitialized() {
inTransaction( session -> {

5
hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/QueryScrollingWithInheritanceProxyTest.java
View File

@ -49,11 +49,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
*/
@RunWith(BytecodeEnhancerRunner.class)
public class QueryScrollingWithInheritanceProxyTest extends BaseNonConfigCoreFunctionalTestCase {
@Override
protected void configureStandardServiceRegistryBuilder(StandardServiceRegistryBuilder ssrb) {
super.configureStandardServiceRegistryBuilder( ssrb );
ssrb.applySetting( AvailableSettings.ALLOW_ENHANCEMENT_AS_PROXY, "true" );
}
@Override
protected void configureSessionFactoryBuilder(SessionFactoryBuilder sfb) {

1
hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/JoinFetchedManyToOneAllowProxyTests.java
View File

@ -61,7 +61,6 @@ public class JoinFetchedManyToOneAllowProxyTests extends BaseNonConfigCoreFuncti
@Override
protected void configureStandardServiceRegistryBuilder(StandardServiceRegistryBuilder ssrb) {
super.configureStandardServiceRegistryBuilder( ssrb );
ssrb.applySetting( AvailableSettings.ALLOW_ENHANCEMENT_AS_PROXY, true );
sqlStatementInterceptor = new SQLStatementInterceptor( ssrb );
}

1
hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/ManyToOneAllowProxyTests.java
View File

@ -59,7 +59,6 @@ public class ManyToOneAllowProxyTests extends BaseNonConfigCoreFunctionalTestCas
@Override
protected void configureStandardServiceRegistryBuilder(StandardServiceRegistryBuilder ssrb) {
super.configureStandardServiceRegistryBuilder( ssrb );
ssrb.applySetting( AvailableSettings.ALLOW_ENHANCEMENT_AS_PROXY, true );
sqlStatementInterceptor = new SQLStatementInterceptor( ssrb );
}

1
hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/ManyToOneExplicitOptionTests.java
View File

@ -62,7 +62,6 @@ public class ManyToOneExplicitOptionTests extends BaseNonConfigCoreFunctionalTes
@Override
protected void configureStandardServiceRegistryBuilder(StandardServiceRegistryBuilder ssrb) {
super.configureStandardServiceRegistryBuilder( ssrb );
ssrb.applySetting( AvailableSettings.ALLOW_ENHANCEMENT_AS_PROXY, true );
sqlStatementInterceptor = new SQLStatementInterceptor( ssrb );
}

1
hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/collectioninitializer/InitLazyToOneWithinPaddedCollectionInitializationAllowProxyTest.java
View File

@ -56,7 +56,6 @@ public class InitLazyToOneWithinPaddedCollectionInitializationAllowProxyTest
@Override
protected void configureStandardServiceRegistryBuilder(StandardServiceRegistryBuilder ssrb) {
super.configureStandardServiceRegistryBuilder( ssrb );
ssrb.applySetting( AvailableSettings.ALLOW_ENHANCEMENT_AS_PROXY, true );
ssrb.applySetting( AvailableSettings.BATCH_FETCH_STYLE, PADDED );
ssrb.applySetting( AvailableSettings.DEFAULT_BATCH_FETCH_SIZE, 10 );
}

1
hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/mappedby/InverseToOneAllowProxyTests.java
View File

@ -57,7 +57,6 @@ public class InverseToOneAllowProxyTests extends BaseNonConfigCoreFunctionalTest
@Override
protected void configureStandardServiceRegistryBuilder(StandardServiceRegistryBuilder ssrb) {
super.configureStandardServiceRegistryBuilder( ssrb );
ssrb.applySetting( AvailableSettings.ALLOW_ENHANCEMENT_AS_PROXY, true );
sqlStatementInterceptor = new SQLStatementInterceptor( ssrb );
}

1
hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/mappedby/InverseToOneExplicitOptionTests.java
View File

@ -56,7 +56,6 @@ public class InverseToOneExplicitOptionTests extends BaseNonConfigCoreFunctional
@Override
protected void configureStandardServiceRegistryBuilder(StandardServiceRegistryBuilder ssrb) {
super.configureStandardServiceRegistryBuilder( ssrb );
ssrb.applySetting( AvailableSettings.ALLOW_ENHANCEMENT_AS_PROXY, true );
sqlStatementInterceptor = new SQLStatementInterceptor( ssrb );
}

1
hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/mappedby/JoinFetchedInverseToOneAllowProxyTests.java
View File

@ -59,7 +59,6 @@ public class JoinFetchedInverseToOneAllowProxyTests extends BaseNonConfigCoreFun
@Override
protected void configureStandardServiceRegistryBuilder(StandardServiceRegistryBuilder ssrb) {
super.configureStandardServiceRegistryBuilder( ssrb );
ssrb.applySetting( AvailableSettings.ALLOW_ENHANCEMENT_AS_PROXY, true );
sqlStatementInterceptor = new SQLStatementInterceptor( ssrb );
}

1
hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/JoinFetchedOneToOneAllowProxyTests.java
View File

@ -53,7 +53,6 @@ public class JoinFetchedOneToOneAllowProxyTests extends BaseNonConfigCoreFunctio
@Override
protected void configureStandardServiceRegistryBuilder(StandardServiceRegistryBuilder ssrb) {
super.configureStandardServiceRegistryBuilder( ssrb );
ssrb.applySetting( AvailableSettings.ALLOW_ENHANCEMENT_AS_PROXY, true );
sqlStatementInterceptor = new SQLStatementInterceptor( ssrb );
}

1
hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/OneToOneAllowProxyTests.java
View File

@ -57,7 +57,6 @@ public class OneToOneAllowProxyTests extends BaseNonConfigCoreFunctionalTestCase
@Override
protected void configureStandardServiceRegistryBuilder(StandardServiceRegistryBuilder ssrb) {
super.configureStandardServiceRegistryBuilder( ssrb );
ssrb.applySetting( AvailableSettings.ALLOW_ENHANCEMENT_AS_PROXY, true );
sqlStatementInterceptor = new SQLStatementInterceptor( ssrb );
}

1
hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/onetoone/OneToOneExplicitOptionTests.java
View File

@ -59,7 +59,6 @@ public class OneToOneExplicitOptionTests extends BaseNonConfigCoreFunctionalTest
@Override
protected void configureStandardServiceRegistryBuilder(StandardServiceRegistryBuilder ssrb) {
super.configureStandardServiceRegistryBuilder( ssrb );
ssrb.applySetting( AvailableSettings.ALLOW_ENHANCEMENT_AS_PROXY, true );
sqlStatementInterceptor = new SQLStatementInterceptor( ssrb );
}

1
hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/polymorphic/JoinFetchedPolymorphicToOneTests.java
View File

@ -124,7 +124,6 @@ public class JoinFetchedPolymorphicToOneTests extends BaseNonConfigCoreFunctiona
@Override
protected void configureStandardServiceRegistryBuilder(StandardServiceRegistryBuilder ssrb) {
super.configureStandardServiceRegistryBuilder( ssrb );
ssrb.applySetting( AvailableSettings.ALLOW_ENHANCEMENT_AS_PROXY, true );
sqlStatementInterceptor = new SQLStatementInterceptor( ssrb );
}

1
hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/polymorphic/PolymorphicToOneExplicitOptionTests.java
View File

@ -153,7 +153,6 @@ public class PolymorphicToOneExplicitOptionTests extends BaseNonConfigCoreFuncti
@Override
protected void configureStandardServiceRegistryBuilder(StandardServiceRegistryBuilder ssrb) {
super.configureStandardServiceRegistryBuilder( ssrb );
ssrb.applySetting( AvailableSettings.ALLOW_ENHANCEMENT_AS_PROXY, true );
sqlStatementInterceptor = new SQLStatementInterceptor( ssrb );
}

1
hibernate-core/src/test/java/org/hibernate/orm/test/mapping/lazytoone/polymorphic/PolymorphicToOneImplicitOptionTests.java
View File

@ -125,7 +125,6 @@ public class PolymorphicToOneImplicitOptionTests extends BaseNonConfigCoreFuncti
@Override
protected void configureStandardServiceRegistryBuilder(StandardServiceRegistryBuilder ssrb) {
super.configureStandardServiceRegistryBuilder( ssrb );
ssrb.applySetting( AvailableSettings.ALLOW_ENHANCEMENT_AS_PROXY, true );
sqlStatementInterceptor = new SQLStatementInterceptor( ssrb );
}