Merge pull request #50026 from gastaldi/cycle

Fix Build Cycle error when specific extensions and JFR are used in the same project

Author: gastaldi

extensions/infinispan-client/deployment/src/main/java/io/quarkus/infinispan/client/deployment/InfinispanClientProcessor.java

@@ -82,8 +82,6 @@
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.HotDeploymentWatchedFileBuildItem;
 import io.quarkus.deployment.builditem.NativeImageFeatureBuildItem;
-import io.quarkus.deployment.builditem.SystemPropertyBuildItem;
-import io.quarkus.deployment.builditem.nativeimage.NativeImageConfigBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.NativeImageSecurityProviderBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
@@ -135,6 +133,11 @@ NativeImageFeatureBuildItem nativeImageFeature() {
         return new NativeImageFeatureBuildItem(DisableLoggingFeature.class);
     }
 
+    @BuildStep
+    FeatureBuildItem feature() {
+        return new FeatureBuildItem(Feature.INFINISPAN_CLIENT);
+    }
+
     /**
      * Sets up additional properties for use when proto stream marshaller is in use
      */
@@ -171,18 +174,14 @@ private static void initMarshaller(String clientName, Optional<String> marshalle
     InfinispanPropertiesBuildItem setup(ApplicationArchivesBuildItem applicationArchivesBuildItem,
             BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
             BuildProducer<HotDeploymentWatchedFileBuildItem> hotDeployment,
-            BuildProducer<SystemPropertyBuildItem> systemProperties,
-            BuildProducer<FeatureBuildItem> feature,
             BuildProducer<AdditionalBeanBuildItem> additionalBeans,
             BuildProducer<ExtensionSslNativeSupportBuildItem> sslNativeSupport,
             BuildProducer<NativeImageSecurityProviderBuildItem> nativeImageSecurityProviders,
-            BuildProducer<NativeImageConfigBuildItem> nativeImageConfig,
             BuildProducer<InfinispanClientNameBuildItem> infinispanClientNames,
             MarshallingBuildItem marshallingBuildItem,
             BuildProducer<NativeImageResourceBuildItem> resourceBuildItem,
             CombinedIndexBuildItem applicationIndexBuildItem) throws ClassNotFoundException, IOException {
 
-        feature.produce(new FeatureBuildItem(Feature.INFINISPAN_CLIENT));
         additionalBeans.produce(AdditionalBeanBuildItem.unremovableOf(InfinispanClientProducer.class));
         additionalBeans.produce(AdditionalBeanBuildItem.unremovableOf(CacheInvalidateAllInterceptor.class));
         additionalBeans.produce(AdditionalBeanBuildItem.unremovableOf(CacheResultInterceptor.class));
@@ -250,10 +249,10 @@ InfinispanPropertiesBuildItem setup(ApplicationArchivesBuildItem applicationArch
                     }
                 }
                 properties.putAll(marshallingBuildItem.getProperties());
-                Collection<ClassInfo> initializerClasses = index.getAllKnownImplementors(DotName.createSimple(
+                Collection<ClassInfo> initializerClasses = index.getAllKnownImplementations(DotName.createSimple(
                         SerializationContextInitializer.class.getName()));
                 initializerClasses
-                        .addAll(index.getAllKnownImplementors(DotName.createSimple(GeneratedSchema.class.getName())));
+                        .addAll(index.getAllKnownImplementations(DotName.createSimple(GeneratedSchema.class.getName())));
 
                 Set<SerializationContextInitializer> initializers = new HashSet<>(initializerClasses.size());
                 for (ClassInfo ci : initializerClasses) {
@@ -369,7 +368,7 @@ private static String getContents(String fileName) {
      * @return string containing the contents of the file
      */
     private static String getContents(InputStream stream) {
-        try (Scanner scanner = new Scanner(stream, "UTF-8")) {
+        try (Scanner scanner = new Scanner(stream, StandardCharsets.UTF_8)) {
             return scanner.useDelimiter("\\A").next();
         }
     }
@@ -486,7 +485,7 @@ void registerServiceBinding(Capabilities capabilities, BuildProducer<ServiceProv
         }
     }
 
-    class RemoteCacheBean {
+    static class RemoteCacheBean {
         Type type;
         String clientName;
         String cacheName;

extensions/reactive-streams-operators/smallrye-reactive-streams-operators/deployment/src/main/java/io/quarkus/smallrye/reactivestreamoperators/deployment/SmallRyeReactiveStreamsOperatorsProcessor.java

@@ -14,9 +14,12 @@
 public class SmallRyeReactiveStreamsOperatorsProcessor {
 
     @BuildStep
-    public void build(BuildProducer<ServiceProviderBuildItem> serviceProvider,
-            BuildProducer<FeatureBuildItem> feature) {
-        feature.produce(new FeatureBuildItem(Feature.SMALLRYE_REACTIVE_STREAMS_OPERATORS));
+    FeatureBuildItem feature() {
+        return new FeatureBuildItem(Feature.SMALLRYE_REACTIVE_STREAMS_OPERATORS);
+    }
+
+    @BuildStep
+    public void build(BuildProducer<ServiceProviderBuildItem> serviceProvider) {
         serviceProvider.produce(new ServiceProviderBuildItem(ReactiveStreamsEngine.class.getName(), Engine.class.getName()));
         serviceProvider.produce(new ServiceProviderBuildItem(ReactiveStreamsFactory.class.getName(),
                 ReactiveStreamsFactoryImpl.class.getName()));

extensions/scheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/SchedulerProcessor.java

@@ -366,7 +366,7 @@ public List<UnremovableBeanBuildItem> unremovableBeans() {
 
     @BuildStep
     @Record(RUNTIME_INIT)
-    public FeatureBuildItem build(
+    public void build(
             SchedulerRecorder recorder,
             BuildProducer<SyntheticBeanBuildItem> syntheticBeans,
             List<ScheduledBusinessMethodItem> scheduledMethods,
@@ -415,7 +415,10 @@ public String apply(String name) {
                 .supplier(recorder.createContext(scheduledMetadata, !schedulerForcedStartItems.isEmpty(),
                         discoveredImplementations.getAutoImplementation()))
                 .done());
+    }
 
+    @BuildStep
+    FeatureBuildItem feature() {
         return new FeatureBuildItem(Feature.SCHEDULER);
     }