From c48339d0f9d84bd0770ad942a20448ed543bf388 Mon Sep 17 00:00:00 2001
From: marko-bekhta <marko.prykladna@gmail.com>
Date: Mon, 20 Nov 2023 18:55:12 +0100
Subject: [PATCH] Add classes from additional JPA model build items to
 pre-generate proxies

---
 .../hibernate/orm/deployment/HibernateOrmProcessor.java     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java
index 8a45d4ceca3c5..7d0101630b26a 100644
--- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java
+++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java
@@ -416,6 +416,7 @@ public BytecodeRecorderConstantDefinitionBuildItem pregenProxies(
             JpaModelIndexBuildItem indexBuildItem,
             TransformedClassesBuildItem transformedClassesBuildItem,
             List<PersistenceUnitDescriptorBuildItem> persistenceUnitDescriptorBuildItems,
+            List<AdditionalJpaModelBuildItem> additionalJpaModelBuildItems,
             BuildProducer<GeneratedClassBuildItem> generatedClassBuildItemBuildProducer,
             LiveReloadBuildItem liveReloadBuildItem) {
         Set<String> managedClassAndPackageNames = new HashSet<>(jpaModel.getEntityClassNames());
@@ -426,6 +427,11 @@ public BytecodeRecorderConstantDefinitionBuildItem pregenProxies(
             // is used for packages too, and it relies (indirectly) on getManagedClassNames().
             managedClassAndPackageNames.addAll(pud.getManagedClassNames());
         }
+
+        for (AdditionalJpaModelBuildItem additionalJpaModelBuildItem : additionalJpaModelBuildItems) {
+            managedClassAndPackageNames.add(additionalJpaModelBuildItem.getClassName());
+        }
+
         PreGeneratedProxies proxyDefinitions = generatedProxies(managedClassAndPackageNames,
                 indexBuildItem.getIndex(), transformedClassesBuildItem,
                 generatedClassBuildItemBuildProducer, liveReloadBuildItem);