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

HHH-16223 Get SchemaManagementToolCoordinator to log deprecation warnings on legacy property

This commit is contained in:
Sanne Grinovero 2023-03-07 20:09:44 +00:00 committed by Sanne Grinovero
parent c8b3257644
commit a344cb6364
1 changed files with 18 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
hibernate-core/src/main/java/org/hibernate/tool/schema/spi/SchemaManagementToolCoordinator.java
View File

@ -514,6 +514,17 @@ public class SchemaManagementToolCoordinator {
Object getScriptTargetSetting(Map<?,?> configurationValues); Object getScriptTargetSetting(Map<?,?> configurationValues);
} }
private static Object getConfigurationValue(final Map<?,?> configurationValues, final String referenceKey, final String legacyKey) {
Object setting = configurationValues.get( referenceKey );
if ( setting == null ) {
setting = configurationValues.get( legacyKey );
if ( setting != null ) {
DEPRECATION_LOGGER.deprecatedSetting( referenceKey, legacyKey );
}
}
return setting;
}
private static class CreateSettingSelector implements SettingSelector { private static class CreateSettingSelector implements SettingSelector {
/** /**
* Singleton access * Singleton access
@ -522,29 +533,17 @@ public class SchemaManagementToolCoordinator {
@Override @Override
public Object getSourceTypeSetting(Map<?,?> configurationValues) { public Object getSourceTypeSetting(Map<?,?> configurationValues) {
Object setting = configurationValues.get( HBM2DDL_CREATE_SOURCE ); return getConfigurationValue( configurationValues, JAKARTA_HBM2DDL_CREATE_SOURCE, HBM2DDL_CREATE_SOURCE );
if ( setting == null ) {
setting = configurationValues.get( JAKARTA_HBM2DDL_CREATE_SOURCE );
}
return setting;
} }
@Override @Override
public Object getScriptSourceSetting(Map<?,?> configurationValues) { public Object getScriptSourceSetting(Map<?,?> configurationValues) {
Object setting = configurationValues.get( HBM2DDL_CREATE_SCRIPT_SOURCE ); return getConfigurationValue( configurationValues, JAKARTA_HBM2DDL_CREATE_SCRIPT_SOURCE, HBM2DDL_CREATE_SCRIPT_SOURCE );
if ( setting == null ) {
setting = configurationValues.get( JAKARTA_HBM2DDL_CREATE_SCRIPT_SOURCE );
}
return setting;
} }
@Override @Override
public Object getScriptTargetSetting(Map<?,?> configurationValues) { public Object getScriptTargetSetting(Map<?,?> configurationValues) {
Object setting = configurationValues.get( HBM2DDL_SCRIPTS_CREATE_TARGET ); return getConfigurationValue( configurationValues, JAKARTA_HBM2DDL_SCRIPTS_CREATE_TARGET, HBM2DDL_SCRIPTS_CREATE_TARGET );
if ( setting == null ) {
setting = configurationValues.get( JAKARTA_HBM2DDL_SCRIPTS_CREATE_TARGET );
}
return setting;
} }
} }
@ -556,29 +555,17 @@ public class SchemaManagementToolCoordinator {
@Override @Override
public Object getSourceTypeSetting(Map<?,?> configurationValues) { public Object getSourceTypeSetting(Map<?,?> configurationValues) {
Object setting = configurationValues.get( HBM2DDL_DROP_SOURCE ); return getConfigurationValue( configurationValues, JAKARTA_HBM2DDL_DROP_SOURCE, HBM2DDL_DROP_SOURCE );
if ( setting == null ) {
setting = configurationValues.get( JAKARTA_HBM2DDL_DROP_SOURCE );
}
return setting;
} }
@Override @Override
public Object getScriptSourceSetting(Map<?,?> configurationValues) { public Object getScriptSourceSetting(Map<?,?> configurationValues) {
Object setting = configurationValues.get( HBM2DDL_DROP_SCRIPT_SOURCE ); return getConfigurationValue( configurationValues, JAKARTA_HBM2DDL_DROP_SCRIPT_SOURCE, HBM2DDL_DROP_SCRIPT_SOURCE );
if ( setting == null ) {
setting = configurationValues.get( JAKARTA_HBM2DDL_DROP_SCRIPT_SOURCE );
}
return setting;
} }
@Override @Override
public Object getScriptTargetSetting(Map<?,?> configurationValues) { public Object getScriptTargetSetting(Map<?,?> configurationValues) {
Object setting = configurationValues.get( HBM2DDL_SCRIPTS_DROP_TARGET ); return getConfigurationValue( configurationValues, JAKARTA_HBM2DDL_SCRIPTS_DROP_TARGET, HBM2DDL_SCRIPTS_DROP_TARGET );
if ( setting == null ) {
setting = configurationValues.get( JAKARTA_HBM2DDL_SCRIPTS_DROP_TARGET );
}
return setting;
} }
} }
@ -606,11 +593,7 @@ public class SchemaManagementToolCoordinator {
@Override @Override
public Object getScriptTargetSetting(Map<?,?> configurationValues) { public Object getScriptTargetSetting(Map<?,?> configurationValues) {
// for now, reuse the CREATE script target setting // for now, reuse the CREATE script target setting
Object setting = configurationValues.get( HBM2DDL_SCRIPTS_CREATE_TARGET ); return getConfigurationValue( configurationValues, JAKARTA_HBM2DDL_SCRIPTS_CREATE_TARGET, HBM2DDL_SCRIPTS_CREATE_TARGET );
if ( setting == null ) {
setting = configurationValues.get( JAKARTA_HBM2DDL_SCRIPTS_CREATE_TARGET );
}
return setting;
} }
} }