Propagate a flag to signal the presence of Envers to the PersistenceU…

…nitDescriptorBuildItem

extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java

@@ -287,6 +287,8 @@ public void configurationDescriptorBuilding(
             return;
         }
 
+        final boolean enversIsPresent = capabilities.isPresent(Capability.HIBERNATE_ENVERS);
+
         // First produce the PUs having a persistence.xml: these are not reactive, as we don't allow using a persistence.xml for them.
         for (PersistenceXmlDescriptorBuildItem persistenceXmlDescriptorBuildItem : persistenceXmlDescriptors) {
             persistenceUnitDescriptors
@@ -296,7 +298,8 @@ public void configurationDescriptorBuilding(
                                     .getProperties().getProperty(AvailableSettings.MULTI_TENANT))),
                             null,
                             false,
-                            true));
+                            true,
+                            enversIsPresent));
         }
 
         if (impliedPU.shouldGenerateImpliedBlockingPersistenceUnit()) {
@@ -878,11 +881,13 @@ private static void producePersistenceUnitDescriptorFromConfig(
             storageEngineCollector.add(persistenceUnitConfig.dialect.storageEngine.get());
         }
 
+        final boolean isEnversPresent = capabilities.isPresent(Capability.HIBERNATE_ENVERS);
+
         persistenceUnitDescriptors.produce(
                 new PersistenceUnitDescriptorBuildItem(descriptor, dataSource,
                         getMultiTenancyStrategy(persistenceUnitConfig.multitenant),
                         persistenceUnitConfig.multitenantSchemaDatasource.orElse(null),
-                        false, false));
+                        false, false, isEnversPresent));
     }
 
     public static Optional<String> guessDialect(String resolvedDbKind) {

extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/PersistenceUnitDescriptorBuildItem.java

@@ -18,15 +18,17 @@
 public final class PersistenceUnitDescriptorBuildItem extends MultiBuildItem {
 
     private final ParsedPersistenceXmlDescriptor descriptor;
+    private final boolean enversIsPresent;
     private final String dataSource;
     private final MultiTenancyStrategy multiTenancyStrategy;
     private final String multiTenancySchemaDataSource;
     private final boolean isReactive;
     private final boolean fromPersistenceXml;
 
     public PersistenceUnitDescriptorBuildItem(ParsedPersistenceXmlDescriptor descriptor, boolean isReactive,
-            boolean fromPersistenceXml) {
+            boolean fromPersistenceXml, boolean enversIsPresent) {
         this.descriptor = descriptor;
+        this.enversIsPresent = enversIsPresent;
         this.dataSource = DataSourceUtil.DEFAULT_DATASOURCE_NAME;
         this.multiTenancyStrategy = MultiTenancyStrategy.NONE;
         this.multiTenancySchemaDataSource = null;
@@ -36,9 +38,10 @@ public PersistenceUnitDescriptorBuildItem(ParsedPersistenceXmlDescriptor descrip
 
     public PersistenceUnitDescriptorBuildItem(ParsedPersistenceXmlDescriptor descriptor, String dataSource,
             MultiTenancyStrategy multiTenancyStrategy, String multiTenancySchemaDataSource, boolean isReactive,
-            boolean fromPersistenceXml) {
+            boolean fromPersistenceXml, boolean enversIsPresent) {
         this.descriptor = descriptor;
         this.dataSource = dataSource;
+        this.enversIsPresent = enversIsPresent;
         this.multiTenancyStrategy = multiTenancyStrategy;
         this.multiTenancySchemaDataSource = multiTenancySchemaDataSource;
         this.isReactive = isReactive;
@@ -71,6 +74,6 @@ public String getMultiTenancySchemaDataSource() {
 
     public QuarkusPersistenceUnitDefinition asOutputPersistenceUnitDefinition() {
         return new QuarkusPersistenceUnitDefinition(descriptor, dataSource, multiTenancyStrategy, isReactive,
-                fromPersistenceXml);
+                fromPersistenceXml, enversIsPresent);
     }
 }

extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/FastBootMetadataBuilder.java

@@ -100,11 +100,13 @@ public class FastBootMetadataBuilder {
     private final MultiTenancyStrategy multiTenancyStrategy;
     private final boolean isReactive;
     private final boolean fromPersistenceXml;
+    private final boolean isEnversPresent;
 
     @SuppressWarnings("unchecked")
     public FastBootMetadataBuilder(final QuarkusPersistenceUnitDefinition puDefinition, Scanner scanner,
             Collection<Class<? extends Integrator>> additionalIntegrators, PreGeneratedProxies preGeneratedProxies) {
         this.persistenceUnit = puDefinition.getActualHibernateDescriptor();
+        this.isEnversPresent = puDefinition.isEnversPresent();
         this.dataSource = puDefinition.getDataSource();
         this.isReactive = puDefinition.isReactive();
         this.fromPersistenceXml = puDefinition.isFromPersistenceXml();

extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/boot/QuarkusPersistenceUnitDefinition.java

@@ -24,16 +24,19 @@ public final class QuarkusPersistenceUnitDefinition {
     private final MultiTenancyStrategy multitenancyStrategy;
     private final boolean isReactive;
     private final boolean fromPersistenceXml;
+    private final boolean enversPresent;
 
     public QuarkusPersistenceUnitDefinition(PersistenceUnitDescriptor persistenceUnitDescriptor, String dataSource,
-            MultiTenancyStrategy multitenancyStrategy, boolean isReactive, boolean fromPersistenceXml) {
+            MultiTenancyStrategy multitenancyStrategy, boolean isReactive, boolean fromPersistenceXml,
+            boolean enversPresent) {
         Objects.requireNonNull(persistenceUnitDescriptor);
         Objects.requireNonNull(multitenancyStrategy);
         this.actualHibernateDescriptor = LightPersistenceXmlDescriptor.validateAndReadFrom(persistenceUnitDescriptor);
         this.dataSource = dataSource;
         this.multitenancyStrategy = multitenancyStrategy;
         this.isReactive = isReactive;
         this.fromPersistenceXml = fromPersistenceXml;
+        this.enversPresent = enversPresent;
     }
 
     /**
@@ -43,7 +46,8 @@ private QuarkusPersistenceUnitDefinition(LightPersistenceXmlDescriptor persisten
             String dataSource,
             MultiTenancyStrategy multitenancyStrategy,
             boolean isReactive,
-            boolean fromPersistenceXml) {
+            boolean fromPersistenceXml,
+            boolean enversPresent) {
         Objects.requireNonNull(persistenceUnitDescriptor);
         Objects.requireNonNull(dataSource);
         Objects.requireNonNull(multitenancyStrategy);
@@ -52,6 +56,7 @@ private QuarkusPersistenceUnitDefinition(LightPersistenceXmlDescriptor persisten
         this.multitenancyStrategy = multitenancyStrategy;
         this.isReactive = isReactive;
         this.fromPersistenceXml = fromPersistenceXml;
+        this.enversPresent = enversPresent;
     }
 
     public PersistenceUnitDescriptor getActualHibernateDescriptor() {
@@ -79,6 +84,10 @@ public boolean isFromPersistenceXml() {
         return fromPersistenceXml;
     }
 
+    public boolean isEnversPresent() {
+        return enversPresent;
+    }
+
     /**
      * This includes the state of both the QuarkusPersistenceUnitDefinition
      * and its more complex field of type LightPersistenceXmlDescriptor
@@ -97,6 +106,7 @@ public static class Serialized {
         private SharedCacheMode puSharedCachemode;
         private List<String> puManagedClassNames;
         private Properties puProperties;
+        private boolean enversIsPresent;
 
         //All standard getters and setters generated by IDE:
 
@@ -195,6 +205,14 @@ public Properties getPuProperties() {
         public void setPuProperties(Properties puProperties) {
             this.puProperties = puProperties;
         }
+
+        public boolean isEnversIsPresent() {
+            return enversIsPresent;
+        }
+
+        public void setEnversIsPresent(boolean enversIsPresent) {
+            this.enversIsPresent = enversIsPresent;
+        }
     }
 
     public static final class Substitution implements ObjectSubstitution<QuarkusPersistenceUnitDefinition, Serialized> {
@@ -216,6 +234,7 @@ public Serialized serialize(final QuarkusPersistenceUnitDefinition obj) {
             s.setMultitenancyStrategy(obj.getMultitenancyStrategy());
             s.setReactive(obj.isReactive);
             s.setFromPersistenceXml(obj.isFromPersistenceXml());
+            s.setEnversIsPresent(obj.isEnversPresent());
             return s;
         }
 
@@ -226,7 +245,7 @@ public QuarkusPersistenceUnitDefinition deserialize(Serialized obj) {
                     obj.puValidationMode, obj.puSharedCachemode, obj.puManagedClassNames, obj.puProperties);
 
             return new QuarkusPersistenceUnitDefinition(xmlDescriptor, obj.getDataSource(), obj.getMultitenancyStrategy(),
-                    obj.isReactive(), obj.isFromPersistenceXml());
+                    obj.isReactive(), obj.isFromPersistenceXml(), obj.isEnversIsPresent());
         }
     }
 

extensions/hibernate-reactive/deployment/src/main/java/io/quarkus/hibernate/reactive/deployment/HibernateReactiveProcessor.java

@@ -147,7 +147,11 @@ public void buildReactivePersistenceUnit(
                     dbKind, applicationArchivesBuildItem, launchMode.getLaunchMode(),
                     systemProperties, nativeImageResources, hotDeploymentWatchedFiles);
 
-            persistenceUnitDescriptors.produce(new PersistenceUnitDescriptorBuildItem(reactivePU, true, false));
+            //Some constant arguments to the following method:
+            // - this is Reactive
+            // - we don't support starting Hibernate Reactive from a persistence.xml
+            // - we don't support Hibernate Envers with Hibernate Reactive
+            persistenceUnitDescriptors.produce(new PersistenceUnitDescriptorBuildItem(reactivePU, true, false, false));
         }
 
     }