From e21f4d3fe4f40c0515dabc95cc97a3478daf67b7 Mon Sep 17 00:00:00 2001
From: Sanne Grinovero <sanne@hibernate.org>
Date: Mon, 14 Dec 2020 16:25:11 +0000
Subject: [PATCH] HHH-14356 Have Hibernate Envers produce a user friendly
 bootstrap exception if xml_mapping_enabled=false

---
 .../envers/boot/internal/EnversServiceImpl.java        | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversServiceImpl.java b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversServiceImpl.java
index 8f68358a81..f0ab2ad6f2 100644
--- a/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversServiceImpl.java
+++ b/hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversServiceImpl.java
@@ -9,11 +9,14 @@ package org.hibernate.envers.boot.internal;
 import java.util.Map;
 import java.util.Properties;
 
+import org.hibernate.HibernateException;
 import org.hibernate.MappingException;
 import org.hibernate.annotations.common.reflection.ReflectionManager;
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.boot.spi.MetadataImplementor;
+import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.engine.config.spi.ConfigurationService;
+import org.hibernate.engine.config.spi.StandardConverters;
 import org.hibernate.envers.configuration.internal.AuditEntitiesConfiguration;
 import org.hibernate.envers.configuration.internal.EntitiesConfigurator;
 import org.hibernate.envers.configuration.internal.GlobalConfiguration;
@@ -36,6 +39,8 @@ import org.hibernate.service.spi.Stoppable;
 
 import org.jboss.logging.Logger;
 
+import static org.hibernate.cfg.AvailableSettings.XML_MAPPING_ENABLED;
+
 /**
  * Provides central access to Envers' configuration.
  *
@@ -84,6 +89,11 @@ public class EnversServiceImpl implements EnversService, Configurable, Stoppable
 			);
 		}
 		this.integrationEnabled = ConfigurationHelper.getBoolean( INTEGRATION_ENABLED, configurationValues, true );
+		boolean xmlMappingEnabled = ConfigurationHelper.getBoolean( XML_MAPPING_ENABLED, configurationValues, true );
+		if ( this.integrationEnabled && !xmlMappingEnabled ) {
+			throw new HibernateException( "Hibernate Envers currently requires XML mapping to be enabled. Please don't disable setting `" + XML_MAPPING_ENABLED + "`; alternatively disable Hibernate Envers." );
+		}
+
 		log.infof( "Envers integration enabled? : %s", integrationEnabled );
 	}