Skip to content

Commit

Permalink
Merge pull request #32521 from mkouba/arc-no-bce
Browse files Browse the repository at this point in the history 
ArC - optimize if no BuildCompatibleExtension is found
  • Loading branch information
@gsmet
gsmet authored Apr 11, 2023
2 parents 41bc2a9 + 2ae2f9f commit 5c69f84
Show file tree
Hide file tree
Showing 3 changed files with 91 additions and 22 deletions.
13 changes: 0 additions & 13 deletions extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -798,19 +798,6 @@ private void registerUnremovableListBeans(BeanRegistrationPhaseBuildItem beanReg
BuildProducer<ReflectiveFieldBuildItem> reflectiveFields,
BuildProducer<UnremovableBeanBuildItem> unremovableBeans) {
BeanDeployment beanDeployment = beanRegistrationPhase.getBeanProcessor().getBeanDeployment();
ReflectionRegistration reflectionRegistration = new ReflectionRegistration() {
@Override
public void registerMethod(MethodInfo methodInfo) {
reflectiveMethods.produce(new ReflectiveMethodBuildItem(methodInfo));
}

@Override
public void registerField(FieldInfo fieldInfo) {
reflectiveFields.produce(new ReflectiveFieldBuildItem(fieldInfo));
}

};

List<TypeAndQualifiers> unremovables = new ArrayList<>();

for (InjectionPointInfo injectionPoint : injectionPoints) {
Expand Down
8 changes: 8 additions & 0 deletions ...s/arc/processor/src/main/java/io/quarkus/arc/processor/bcextensions/ExtensionInvoker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,4 +134,12 @@ void invalidate() {
extensionClasses.clear();
extensionClassInstances.clear();
}

/**
*
* @return {@code true} if no {@link BuildCompatibleExtension} was found, {@code false} otherwise
*/
boolean isEmpty() {
return extensionClasses.isEmpty();
}
}
92 changes: 83 additions & 9 deletions ...c/processor/src/main/java/io/quarkus/arc/processor/bcextensions/ExtensionsEntryPoint.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,32 +69,56 @@
*/
public class ExtensionsEntryPoint {
private final ExtensionInvoker invoker;
private final AllAnnotationOverlays annotationOverlays = new AllAnnotationOverlays();
private final SharedErrors errors = new SharedErrors();
private final AllAnnotationOverlays annotationOverlays;
private final SharedErrors errors;

private final Map<DotName, ClassConfig> qualifiers = new ConcurrentHashMap<>();
private final Map<DotName, ClassConfig> interceptorBindings = new ConcurrentHashMap<>();
private final Map<DotName, ClassConfig> stereotypes = new ConcurrentHashMap<>();
private final List<MetaAnnotationsImpl.ContextData> contexts = Collections.synchronizedList(new ArrayList<>());
private final Map<DotName, ClassConfig> qualifiers;
private final Map<DotName, ClassConfig> interceptorBindings;
private final Map<DotName, ClassConfig> stereotypes;
private final List<MetaAnnotationsImpl.ContextData> contexts;

private volatile AllAnnotationTransformations preAnnotationTransformations;

private final List<SyntheticBeanBuilderImpl<?>> syntheticBeans = Collections.synchronizedList(new ArrayList<>());
private final List<SyntheticObserverBuilderImpl<?>> syntheticObservers = Collections.synchronizedList(new ArrayList<>());
private final List<SyntheticBeanBuilderImpl<?>> syntheticBeans;
private final List<SyntheticObserverBuilderImpl<?>> syntheticObservers;

public ExtensionsEntryPoint() {
this(List.of());
}

// only for `ArcTestContainer`
public ExtensionsEntryPoint(List<BuildCompatibleExtension> extensions) {
this.invoker = new ExtensionInvoker(extensions);
invoker = new ExtensionInvoker(extensions);
if (invoker.isEmpty()) {
annotationOverlays = null;
errors = null;
qualifiers = null;
interceptorBindings = null;
stereotypes = null;
contexts = null;
syntheticBeans = null;
syntheticObservers = null;
} else {
annotationOverlays = new AllAnnotationOverlays();
errors = new SharedErrors();
qualifiers = new ConcurrentHashMap<>();
interceptorBindings = new ConcurrentHashMap<>();
stereotypes = new ConcurrentHashMap<>();
contexts = Collections.synchronizedList(new ArrayList<>());
syntheticBeans = Collections.synchronizedList(new ArrayList<>());
syntheticObservers = Collections.synchronizedList(new ArrayList<>());
}
}

/**
* Must be called first, <i>before</i> {@code registerMetaAnnotations}.
* <p>
* It is a no-op if no {@link BuildCompatibleExtension} was found.
*/
public void runDiscovery(org.jboss.jandex.IndexView applicationIndex, Set<String> additionalClasses) {
if (invoker.isEmpty()) {
return;
}
try {
BuildServicesImpl.init(applicationIndex, annotationOverlays);

Expand All @@ -117,8 +141,13 @@ public void runDiscovery(org.jboss.jandex.IndexView applicationIndex, Set<String

/**
* Must be called <i>after</i> {@code runDiscovery} and <i>before</i> {@code runEnhancement}.
* <p>
* It is a no-op if no {@link BuildCompatibleExtension} was found.
*/
public void registerMetaAnnotations(BeanProcessor.Builder builder) {
if (invoker.isEmpty()) {
return;
}
builder.addAnnotationTransformer(preAnnotationTransformations.classes);
builder.addAnnotationTransformer(preAnnotationTransformations.methods);
builder.addAnnotationTransformer(preAnnotationTransformations.parameters);
Expand Down Expand Up @@ -200,8 +229,13 @@ public void register(RegistrationContext registrationContext) {

/**
* Must be called <i>after</i> {@code registerMetaAnnotations} and <i>before</i> {@code runRegistration}.
* <p>
* It is a no-op if no {@link BuildCompatibleExtension} was found.
*/
public void runEnhancement(org.jboss.jandex.IndexView beanArchiveIndex, BeanProcessor.Builder builder) {
if (invoker.isEmpty()) {
return;
}
AllAnnotationTransformations annotationTransformations = new AllAnnotationTransformations(beanArchiveIndex,
annotationOverlays);
builder.addAnnotationTransformer(annotationTransformations.classes);
Expand All @@ -223,10 +257,15 @@ public void runEnhancement(org.jboss.jandex.IndexView beanArchiveIndex, BeanProc

/**
* Must be called <i>after</i> {@code runEnhancement} and <i>before</i> {@code runSynthesis}.
* <p>
* It is a no-op if no {@link BuildCompatibleExtension} was found.
*/
public void runRegistration(org.jboss.jandex.IndexView beanArchiveIndex,
Collection<io.quarkus.arc.processor.BeanInfo> allBeans,
Collection<io.quarkus.arc.processor.ObserverInfo> allObservers) {
if (invoker.isEmpty()) {
return;
}

BuildServicesImpl.init(beanArchiveIndex, annotationOverlays);

Expand All @@ -240,8 +279,14 @@ public void runRegistration(org.jboss.jandex.IndexView beanArchiveIndex,

/**
* Must be called <i>after</i> {@code runRegistration} and <i>before</i> {@code registerSyntheticBeans}.
* <p>
* It is a no-op if no {@link BuildCompatibleExtension} was found.
*/
public void runSynthesis(org.jboss.jandex.IndexView beanArchiveIndex) {
if (invoker.isEmpty()) {
return;
}

BuildServicesImpl.init(beanArchiveIndex, annotationOverlays);

try {
Expand All @@ -254,8 +299,14 @@ public void runSynthesis(org.jboss.jandex.IndexView beanArchiveIndex) {

/**
* Must be called <i>after</i> {@code runSynthesis} and <i>before</i> {@code runRegistrationAgain}.
* <p>
* It is a no-op if no {@link BuildCompatibleExtension} was found.
*/
public void registerSyntheticBeans(BeanRegistrar.RegistrationContext context) {
if (invoker.isEmpty()) {
return;
}

Map<DotName, StereotypeInfo> allStereotypes = context.get(BuildExtension.Key.STEREOTYPES);

for (SyntheticBeanBuilderImpl<?> syntheticBean : syntheticBeans) {
Expand Down Expand Up @@ -369,8 +420,14 @@ public void registerSyntheticBeans(BeanRegistrar.RegistrationContext context) {

/**
* Must be called <i>after</i> {@code runSynthesis} and <i>before</i> {@code runRegistrationAgain}.
* <p>
* It is a no-op if no {@link BuildCompatibleExtension} was found.
*/
public void registerSyntheticObservers(ObserverRegistrar.RegistrationContext context) {
if (invoker.isEmpty()) {
return;
}

for (SyntheticObserverBuilderImpl<?> syntheticObserver : syntheticObservers) {
if (syntheticObserver.isAsync && syntheticObserver.transactionPhase != TransactionPhase.IN_PROGRESS) {
throw new IllegalStateException("Synthetic observer declared as asynchronous and transactional "
Expand Down Expand Up @@ -475,10 +532,16 @@ private void configureParams(ConfiguratorBase<?> configurator, Map<String, Objec
/**
* Must be called <i>after</i> {@code registerSynthetic{Beans,Observers}} and <i>before</i>
* {@code runValidation}.
* <p>
* It is a no-op if no {@link BuildCompatibleExtension} was found.
*/
public void runRegistrationAgain(org.jboss.jandex.IndexView beanArchiveIndex,
Collection<io.quarkus.arc.processor.BeanInfo> allBeans,
Collection<io.quarkus.arc.processor.ObserverInfo> allObservers) {
if (invoker.isEmpty()) {
return;
}

Collection<io.quarkus.arc.processor.BeanInfo> syntheticBeans = allBeans.stream()
.filter(BeanInfo::isSynthetic)
.collect(Collectors.toUnmodifiableList());
Expand All @@ -498,10 +561,15 @@ public void runRegistrationAgain(org.jboss.jandex.IndexView beanArchiveIndex,

/**
* Must be called <i>after</i> {@code runRegistrationAgain} and <i>before</i> {@code registerValidationErrors}.
* <p>
* It is a no-op if no {@link BuildCompatibleExtension} was found.
*/
public void runValidation(org.jboss.jandex.IndexView beanArchiveIndex,
Collection<io.quarkus.arc.processor.BeanInfo> allBeans,
Collection<io.quarkus.arc.processor.ObserverInfo> allObservers) {
if (invoker.isEmpty()) {
return;
}

BuildServicesImpl.init(beanArchiveIndex, annotationOverlays);

Expand All @@ -515,8 +583,14 @@ public void runValidation(org.jboss.jandex.IndexView beanArchiveIndex,

/**
* Must be called last, <i>after</i> {@code runValidation}.
* <p>
* It is a no-op if no {@link BuildCompatibleExtension} was found.
*/
public void registerValidationErrors(BeanDeploymentValidator.ValidationContext context) {
if (invoker.isEmpty()) {
return;
}

for (Throwable error : errors.list) {
context.addDeploymentProblem(error);
}
Expand Down

0 comments on commit 5c69f84

Please sign in to comment.