From a919157e023686f9fbdf9ec6a3ac1db1468be8c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mathieu?= Date: Mon, 2 Dec 2024 12:53:54 +0100 Subject: [PATCH] Avoid split packages in MongoDB with Panache deployment Fixes #44735 --- .../deployment/BasePanacheMongoResourceProcessor.java | 2 +- .../deployment/PanacheMongoEntityClassBuildItem.java | 2 +- .../{ => common}/deployment/ProjectionForEnhancer.java | 2 +- .../deployment/PropertyMappingClassBuildStep.java | 2 +- .../deployment/KotlinPanacheMongoResourceProcessor.java | 4 ++-- .../panache/deployment/PanacheMongoResourceProcessor.java | 1 + 6 files changed, 7 insertions(+), 6 deletions(-) rename extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/{ => common}/deployment/BasePanacheMongoResourceProcessor.java (99%) rename extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/{ => common}/deployment/PanacheMongoEntityClassBuildItem.java (89%) rename extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/{ => common}/deployment/ProjectionForEnhancer.java (98%) rename extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/{ => common}/deployment/PropertyMappingClassBuildStep.java (91%) diff --git a/extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/BasePanacheMongoResourceProcessor.java b/extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/common/deployment/BasePanacheMongoResourceProcessor.java similarity index 99% rename from extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/BasePanacheMongoResourceProcessor.java rename to extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/common/deployment/BasePanacheMongoResourceProcessor.java index 991c8429a67f5..d328e445ed95a 100644 --- a/extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/BasePanacheMongoResourceProcessor.java +++ b/extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/common/deployment/BasePanacheMongoResourceProcessor.java @@ -1,4 +1,4 @@ -package io.quarkus.mongodb.panache.deployment; +package io.quarkus.mongodb.panache.common.deployment; import static io.quarkus.deployment.util.JandexUtil.resolveTypeParameters; import static org.jboss.jandex.DotName.createSimple; diff --git a/extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/PanacheMongoEntityClassBuildItem.java b/extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/common/deployment/PanacheMongoEntityClassBuildItem.java similarity index 89% rename from extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/PanacheMongoEntityClassBuildItem.java rename to extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/common/deployment/PanacheMongoEntityClassBuildItem.java index e5947ee2940c2..ff0320e78abf1 100644 --- a/extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/PanacheMongoEntityClassBuildItem.java +++ b/extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/common/deployment/PanacheMongoEntityClassBuildItem.java @@ -1,4 +1,4 @@ -package io.quarkus.mongodb.panache.deployment; +package io.quarkus.mongodb.panache.common.deployment; import org.jboss.jandex.ClassInfo; diff --git a/extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/ProjectionForEnhancer.java b/extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/common/deployment/ProjectionForEnhancer.java similarity index 98% rename from extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/ProjectionForEnhancer.java rename to extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/common/deployment/ProjectionForEnhancer.java index d7f8df7079435..2cf7c7b26acaa 100644 --- a/extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/ProjectionForEnhancer.java +++ b/extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/common/deployment/ProjectionForEnhancer.java @@ -1,4 +1,4 @@ -package io.quarkus.mongodb.panache.deployment; +package io.quarkus.mongodb.panache.common.deployment; import java.util.HashSet; import java.util.Map; diff --git a/extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/PropertyMappingClassBuildStep.java b/extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/common/deployment/PropertyMappingClassBuildStep.java similarity index 91% rename from extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/PropertyMappingClassBuildStep.java rename to extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/common/deployment/PropertyMappingClassBuildStep.java index a3a178f786c80..b3ba4efa2a61f 100644 --- a/extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/PropertyMappingClassBuildStep.java +++ b/extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/common/deployment/PropertyMappingClassBuildStep.java @@ -1,4 +1,4 @@ -package io.quarkus.mongodb.panache.deployment; +package io.quarkus.mongodb.panache.common.deployment; import io.quarkus.builder.item.MultiBuildItem; diff --git a/extensions/panache/mongodb-panache-kotlin/deployment/src/main/java/io/quarkus/mongodb/panache/kotlin/deployment/KotlinPanacheMongoResourceProcessor.java b/extensions/panache/mongodb-panache-kotlin/deployment/src/main/java/io/quarkus/mongodb/panache/kotlin/deployment/KotlinPanacheMongoResourceProcessor.java index fbb1ce98e56c9..c600f2e203559 100644 --- a/extensions/panache/mongodb-panache-kotlin/deployment/src/main/java/io/quarkus/mongodb/panache/kotlin/deployment/KotlinPanacheMongoResourceProcessor.java +++ b/extensions/panache/mongodb-panache-kotlin/deployment/src/main/java/io/quarkus/mongodb/panache/kotlin/deployment/KotlinPanacheMongoResourceProcessor.java @@ -15,8 +15,8 @@ import io.quarkus.deployment.builditem.CombinedIndexBuildItem; import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; -import io.quarkus.mongodb.panache.deployment.BasePanacheMongoResourceProcessor; -import io.quarkus.mongodb.panache.deployment.PropertyMappingClassBuildStep; +import io.quarkus.mongodb.panache.common.deployment.BasePanacheMongoResourceProcessor; +import io.quarkus.mongodb.panache.common.deployment.PropertyMappingClassBuildStep; import io.quarkus.panache.common.deployment.MetamodelInfo; import io.quarkus.panache.common.deployment.PanacheCompanionEnhancer; import io.quarkus.panache.common.deployment.PanacheEntityEnhancer; diff --git a/extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/PanacheMongoResourceProcessor.java b/extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/PanacheMongoResourceProcessor.java index 2b60a4f87cde7..80e360d28721a 100644 --- a/extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/PanacheMongoResourceProcessor.java +++ b/extensions/panache/mongodb-panache/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/PanacheMongoResourceProcessor.java @@ -6,6 +6,7 @@ import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.CombinedIndexBuildItem; import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.mongodb.panache.common.deployment.BasePanacheMongoResourceProcessor; import io.quarkus.panache.common.deployment.MetamodelInfo; import io.quarkus.panache.common.deployment.PanacheEntityEnhancer; import io.quarkus.panache.common.deployment.PanacheMethodCustomizer;