Merge pull request quarkusio#44750 from FroMage/44738

Fixed panache-hibernate-common-deployment packages
mkouba · Nov 27, 2024 · 4864b93 · 4864b93
2 parents 5510bc8 + 87148ef
commit 4864b93
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 18 deletions.
diff --git a/...m/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java b/...m/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java
@@ -3,10 +3,10 @@
 import static io.quarkus.deployment.annotations.ExecutionTime.RUNTIME_INIT;
 import static io.quarkus.deployment.annotations.ExecutionTime.STATIC_INIT;
 import static io.quarkus.hibernate.orm.deployment.HibernateConfigUtil.firstPresent;
-import static org.hibernate.cfg.AvailableSettings.JAKARTA_SHARED_CACHE_MODE;
-import static org.hibernate.cfg.AvailableSettings.USE_DIRECT_REFERENCE_CACHE_ENTRIES;
-import static org.hibernate.cfg.AvailableSettings.USE_QUERY_CACHE;
-import static org.hibernate.cfg.AvailableSettings.USE_SECOND_LEVEL_CACHE;
+import static org.hibernate.cfg.CacheSettings.JAKARTA_SHARED_CACHE_MODE;
+import static org.hibernate.cfg.CacheSettings.USE_DIRECT_REFERENCE_CACHE_ENTRIES;
+import static org.hibernate.cfg.CacheSettings.USE_QUERY_CACHE;
+import static org.hibernate.cfg.CacheSettings.USE_SECOND_LEVEL_CACHE;
 
 import java.io.IOException;
 import java.net.URL;
@@ -132,8 +132,8 @@
 import io.quarkus.hibernate.orm.runtime.schema.SchemaManagementIntegrator;
 import io.quarkus.hibernate.orm.runtime.tenant.DataSourceTenantConnectionResolver;
 import io.quarkus.hibernate.orm.runtime.tenant.TenantConnectionResolver;
-import io.quarkus.panache.common.deployment.HibernateEnhancersRegisteredBuildItem;
-import io.quarkus.panache.common.deployment.HibernateModelClassCandidatesForFieldAccessBuildItem;
+import io.quarkus.panache.hibernate.common.deployment.HibernateEnhancersRegisteredBuildItem;
+import io.quarkus.panache.hibernate.common.deployment.HibernateModelClassCandidatesForFieldAccessBuildItem;
 import io.quarkus.runtime.LaunchMode;
 import io.quarkus.runtime.configuration.ConfigurationException;
 import net.bytebuddy.description.type.TypeDescription;

diff --git a/...va/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinPanacheResourceProcessor.java b/...va/io/quarkus/hibernate/orm/panache/kotlin/deployment/KotlinPanacheResourceProcessor.java
@@ -43,7 +43,6 @@
 import io.quarkus.hibernate.orm.panache.kotlin.PanacheEntity;
 import io.quarkus.hibernate.orm.panache.kotlin.runtime.PanacheKotlinHibernateOrmRecorder;
 import io.quarkus.panache.common.deployment.ByteCodeType;
-import io.quarkus.panache.common.deployment.HibernateEnhancersRegisteredBuildItem;
 import io.quarkus.panache.common.deployment.KotlinPanacheCompanionEnhancer;
 import io.quarkus.panache.common.deployment.KotlinPanacheEntityEnhancer;
 import io.quarkus.panache.common.deployment.KotlinPanacheRepositoryEnhancer;
@@ -52,6 +51,7 @@
 import io.quarkus.panache.common.deployment.PanacheMethodCustomizerBuildItem;
 import io.quarkus.panache.common.deployment.PanacheRepositoryEnhancer;
 import io.quarkus.panache.common.deployment.TypeBundle;
+import io.quarkus.panache.hibernate.common.deployment.HibernateEnhancersRegisteredBuildItem;
 
 public final class KotlinPanacheResourceProcessor {
     private static final DotName DOTNAME_ID = DotName.createSimple(Id.class.getName());

diff --git a/...n/java/io/quarkus/hibernate/orm/panache/deployment/PanacheHibernateResourceProcessor.java b/...n/java/io/quarkus/hibernate/orm/panache/deployment/PanacheHibernateResourceProcessor.java
@@ -39,10 +39,10 @@
 import io.quarkus.hibernate.orm.panache.PanacheRepository;
 import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase;
 import io.quarkus.hibernate.orm.panache.runtime.PanacheHibernateOrmRecorder;
-import io.quarkus.panache.common.deployment.HibernateEnhancersRegisteredBuildItem;
-import io.quarkus.panache.common.deployment.PanacheJpaEntityOperationsEnhancer;
 import io.quarkus.panache.common.deployment.PanacheMethodCustomizer;
 import io.quarkus.panache.common.deployment.PanacheMethodCustomizerBuildItem;
+import io.quarkus.panache.hibernate.common.deployment.HibernateEnhancersRegisteredBuildItem;
+import io.quarkus.panache.hibernate.common.deployment.PanacheJpaEntityOperationsEnhancer;
 
 public final class PanacheHibernateResourceProcessor {
 

diff --git a/...hibernate/reactive/panache/kotlin/deployment/HibernateReactivePanacheKotlinProcessor.java b/...hibernate/reactive/panache/kotlin/deployment/HibernateReactivePanacheKotlinProcessor.java
@@ -28,7 +28,6 @@
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.deployment.util.JandexUtil;
 import io.quarkus.hibernate.orm.deployment.spi.AdditionalJpaModelBuildItem;
-import io.quarkus.panache.common.deployment.HibernateEnhancersRegisteredBuildItem;
 import io.quarkus.panache.common.deployment.KotlinPanacheCompanionEnhancer;
 import io.quarkus.panache.common.deployment.KotlinPanacheEntityEnhancer;
 import io.quarkus.panache.common.deployment.KotlinPanacheRepositoryEnhancer;
@@ -37,6 +36,7 @@
 import io.quarkus.panache.common.deployment.PanacheMethodCustomizerBuildItem;
 import io.quarkus.panache.common.deployment.PanacheRepositoryEnhancer;
 import io.quarkus.panache.common.deployment.TypeBundle;
+import io.quarkus.panache.hibernate.common.deployment.HibernateEnhancersRegisteredBuildItem;
 
 public class HibernateReactivePanacheKotlinProcessor {
 

diff --git a/...a/io/quarkus/hibernate/reactive/panache/deployment/PanacheHibernateResourceProcessor.java b/...a/io/quarkus/hibernate/reactive/panache/deployment/PanacheHibernateResourceProcessor.java
@@ -33,10 +33,10 @@
 import io.quarkus.hibernate.reactive.panache.PanacheEntityBase;
 import io.quarkus.hibernate.reactive.panache.PanacheRepository;
 import io.quarkus.hibernate.reactive.panache.PanacheRepositoryBase;
-import io.quarkus.panache.common.deployment.HibernateEnhancersRegisteredBuildItem;
-import io.quarkus.panache.common.deployment.PanacheJpaEntityOperationsEnhancer;
 import io.quarkus.panache.common.deployment.PanacheMethodCustomizer;
 import io.quarkus.panache.common.deployment.PanacheMethodCustomizerBuildItem;
+import io.quarkus.panache.hibernate.common.deployment.HibernateEnhancersRegisteredBuildItem;
+import io.quarkus.panache.hibernate.common.deployment.PanacheJpaEntityOperationsEnhancer;
 import io.smallrye.common.annotation.CheckReturnValue;
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;

diff --git a/...ibernateEnhancersRegisteredBuildItem.java → ...ibernateEnhancersRegisteredBuildItem.java b/...ibernateEnhancersRegisteredBuildItem.java → ...ibernateEnhancersRegisteredBuildItem.java
@@ -1,4 +1,4 @@
-package io.quarkus.panache.common.deployment;
+package io.quarkus.panache.hibernate.common.deployment;
 
 import io.quarkus.builder.item.SimpleBuildItem;
 

diff --git a/...nateMetamodelForFieldAccessBuildItem.java → ...nateMetamodelForFieldAccessBuildItem.java b/...nateMetamodelForFieldAccessBuildItem.java → ...nateMetamodelForFieldAccessBuildItem.java
@@ -1,6 +1,7 @@
-package io.quarkus.panache.common.deployment;
+package io.quarkus.panache.hibernate.common.deployment;
 
 import io.quarkus.builder.item.SimpleBuildItem;
+import io.quarkus.panache.common.deployment.MetamodelInfo;
 
 public final class HibernateMetamodelForFieldAccessBuildItem extends SimpleBuildItem {
     private final MetamodelInfo metamodelInfo;

diff --git a/...assCandidatesForFieldAccessBuildItem.java → ...assCandidatesForFieldAccessBuildItem.java b/...assCandidatesForFieldAccessBuildItem.java → ...assCandidatesForFieldAccessBuildItem.java
@@ -1,4 +1,4 @@
-package io.quarkus.panache.common.deployment;
+package io.quarkus.panache.hibernate.common.deployment;
 
 import java.util.Set;
 

diff --git a/...acheHibernateCommonResourceProcessor.java → ...acheHibernateCommonResourceProcessor.java b/...acheHibernateCommonResourceProcessor.java → ...acheHibernateCommonResourceProcessor.java
@@ -1,4 +1,4 @@
-package io.quarkus.panache.common.deployment;
+package io.quarkus.panache.hibernate.common.deployment;
 
 import java.lang.reflect.Modifier;
 import java.util.HashSet;
@@ -23,6 +23,11 @@
 import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem;
 import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
 import io.quarkus.gizmo.DescriptorUtils;
+import io.quarkus.panache.common.deployment.EntityField;
+import io.quarkus.panache.common.deployment.EntityModel;
+import io.quarkus.panache.common.deployment.MetamodelInfo;
+import io.quarkus.panache.common.deployment.PanacheEntityClassesBuildItem;
+import io.quarkus.panache.common.deployment.PanacheFieldAccessEnhancer;
 
 public final class PanacheHibernateCommonResourceProcessor {
 

diff --git a/...nt/PanacheJpaEntityAccessorsEnhancer.java → ...nt/PanacheJpaEntityAccessorsEnhancer.java b/...nt/PanacheJpaEntityAccessorsEnhancer.java → ...nt/PanacheJpaEntityAccessorsEnhancer.java
@@ -1,4 +1,4 @@
-package io.quarkus.panache.common.deployment;
+package io.quarkus.panache.hibernate.common.deployment;
 
 import java.util.function.BiFunction;
 
@@ -7,6 +7,8 @@
 import org.jboss.jandex.IndexView;
 import org.objectweb.asm.ClassVisitor;
 
+import io.quarkus.panache.common.deployment.EntityModel;
+import io.quarkus.panache.common.deployment.MetamodelInfo;
 import io.quarkus.panache.common.deployment.visitors.PanacheEntityClassAccessorGenerationVisitor;
 
 public class PanacheJpaEntityAccessorsEnhancer

diff --git a/...t/PanacheJpaEntityOperationsEnhancer.java → ...t/PanacheJpaEntityOperationsEnhancer.java b/...t/PanacheJpaEntityOperationsEnhancer.java → ...t/PanacheJpaEntityOperationsEnhancer.java
@@ -1,4 +1,4 @@
-package io.quarkus.panache.common.deployment;
+package io.quarkus.panache.hibernate.common.deployment;
 
 import java.util.List;
 
@@ -7,6 +7,9 @@
 import org.jboss.jandex.IndexView;
 import org.objectweb.asm.ClassVisitor;
 
+import io.quarkus.panache.common.deployment.PanacheEntityEnhancer;
+import io.quarkus.panache.common.deployment.PanacheMethodCustomizer;
+import io.quarkus.panache.common.deployment.TypeBundle;
 import io.quarkus.panache.common.deployment.visitors.PanacheEntityClassOperationGenerationVisitor;
 
 public class PanacheJpaEntityOperationsEnhancer extends PanacheEntityEnhancer {