Skip to content

Stop mutating shared ParsedPersistenceXmlDescriptor in build steps #51628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Pepo48 wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −4
Open

Stop mutating shared ParsedPersistenceXmlDescriptor in build steps #51628

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/KeycloakProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@
import io.quarkus.deployment.builditem.IndexDependencyBuildItem;
import io.quarkus.deployment.builditem.StaticInitConfigBuilderBuildItem;
import io.quarkus.hibernate.orm.deployment.HibernateOrmConfig;
import io.quarkus.hibernate.orm.deployment.JpaModelPersistenceUnitContributionBuildItem;
import io.quarkus.hibernate.orm.deployment.PersistenceXmlDescriptorBuildItem;
import io.quarkus.hibernate.orm.deployment.integration.HibernateOrmIntegrationRuntimeConfiguredBuildItem;
import io.quarkus.hibernate.orm.deployment.spi.AdditionalJpaModelBuildItem;
Expand Down Expand Up @@ -511,6 +512,7 @@ void configurePersistenceUnits(HibernateOrmConfig config,
BuildProducer<AdditionalJpaModelBuildItem> additionalJpaModel,
CombinedIndexBuildItem indexBuildItem,
BuildProducer<HibernateOrmIntegrationRuntimeConfiguredBuildItem> runtimeConfigured,
BuildProducer<JpaModelPersistenceUnitContributionBuildItem> jpaModelPuContributions,
KeycloakRecorder recorder) {
ParsedPersistenceXmlDescriptor defaultUnitDescriptor = null;
List<String> userManagedEntities = new ArrayList<>();
Expand All @@ -537,7 +539,7 @@ void configurePersistenceUnits(HibernateOrmConfig config,
throw new RuntimeException("No default persistence unit found.");
}

configureDefaultPersistenceUnitEntities(defaultUnitDescriptor, indexBuildItem, userManagedEntities);
configureDefaultPersistenceUnitEntities(defaultUnitDescriptor, jpaModelPuContributions, indexBuildItem, userManagedEntities);
}

@BuildStep
Expand Down Expand Up @@ -626,20 +628,28 @@ private void configureDefaultPersistenceUnitProperties(ParsedPersistenceXmlDescr
.ifPresent(v -> unitProperties.put(AvailableSettings.LOG_SLOW_QUERY, v));
}

private void configureDefaultPersistenceUnitEntities(ParsedPersistenceXmlDescriptor descriptor, CombinedIndexBuildItem indexBuildItem,
List<String> userManagedEntities) {
private void configureDefaultPersistenceUnitEntities(ParsedPersistenceXmlDescriptor descriptor,
BuildProducer<JpaModelPersistenceUnitContributionBuildItem> jpaModelPuContributions,
CombinedIndexBuildItem indexBuildItem, List<String> userManagedEntities) {
IndexView index = indexBuildItem.getIndex();
Collection<AnnotationInstance> annotations = index.getAnnotations(DotName.createSimple(Entity.class.getName()));

List<String> additionalEntities = new ArrayList<>();
for (AnnotationInstance annotation : annotations) {
AnnotationTarget target = annotation.target();
String targetName = target.asClass().name().toString();

if (!userManagedEntities.contains(targetName)
&& (!targetName.startsWith("org.keycloak") || targetName.startsWith("org.keycloak.testsuite"))) {
descriptor.addClasses(targetName);
additionalEntities.add(targetName);
}
}

if (!additionalEntities.isEmpty()) {
jpaModelPuContributions.produce(new JpaModelPersistenceUnitContributionBuildItem(
descriptor.getName(), descriptor.getPersistenceUnitRootUrl(),
additionalEntities, Collections.emptyList()));
}
Comment on lines +637 to +652

@Pepo48 Pepo48 Aug 11, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not valid - it doesn't account for the constructor's defensive copy into a TreeSet.

}

/**
Expand Down
Loading