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

HHH-10056 - Separate settings for notions of (1) disabling EnversService and (2) auto-registering Envers listeners 

(cherry picked from commit 73c46e298c)
This commit is contained in:
Steve Ebersole 2015-09-02 09:05:34 -05:00
parent 5eb5ab4920
commit 38b3ed1ae9
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversService.java
View File

@ -34,13 +34,7 @@ public interface EnversService extends Service {
* The name of the configuration setting used to control whether the Envers integration * The name of the configuration setting used to control whether the Envers integration
* is enabled. Default is true * is enabled. Default is true
*/ */
public static final String INTEGRATION_ENABLED = "hibernate.integration.envers.enabled"; String INTEGRATION_ENABLED = "hibernate.integration.envers.enabled";
/**
* The name of the legacy configuration setting used to control whether auto registration
* of envers listeners should happen or not. Default is true
*/
public static final String LEGACY_AUTO_REGISTER = "hibernate.listeners.envers.autoRegister";
/** /**
* Is the Envers integration enabled? This is generally used as a * Is the Envers integration enabled? This is generally used as a

14
hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversServiceImpl.java
View File

@ -50,6 +50,8 @@ import org.jboss.logging.Logger;
public class EnversServiceImpl implements EnversService, Configurable, Stoppable { public class EnversServiceImpl implements EnversService, Configurable, Stoppable {
private static final Logger log = Logger.getLogger( EnversServiceImpl.class ); private static final Logger log = Logger.getLogger( EnversServiceImpl.class );
private static final String LEGACY_AUTO_REGISTER = "hibernate.listeners.envers.autoRegister";
private boolean integrationEnabled; private boolean integrationEnabled;
private boolean initialized; private boolean initialized;
@ -77,9 +79,15 @@ public class EnversServiceImpl implements EnversService, Configurable, Stoppable
@Override @Override
public void configure(Map configurationValues) { public void configure(Map configurationValues) {
final boolean legacySetting = ConfigurationHelper.getBoolean( LEGACY_AUTO_REGISTER, configurationValues, true ); if ( configurationValues.containsKey( LEGACY_AUTO_REGISTER ) ) {
this.integrationEnabled = ConfigurationHelper.getBoolean( INTEGRATION_ENABLED, configurationValues, legacySetting ); log.debugf(
"Encountered deprecated Envers setting [%s]; use [%s] or [%s] instead",
LEGACY_AUTO_REGISTER,
INTEGRATION_ENABLED,
EnversIntegrator.AUTO_REGISTER
);
}
this.integrationEnabled = ConfigurationHelper.getBoolean( INTEGRATION_ENABLED, configurationValues, true );
log.infof( "Envers integration enabled? : %s", integrationEnabled ); log.infof( "Envers integration enabled? : %s", integrationEnabled );
} }