Deprecate re-initialization methods in NativeImageConfigBuildItem

zakkak · zakkak · commit c68056168790 · 2025-10-17T00:23:21.000+03:00
Starting with Mandrel/GraalVM 23.1 for JDK 21 runtime initialization and
re-initialization are functionally the same.
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/NativeImageConfigBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/NativeImageConfigBuildItem.java
@@ -17,26 +17,23 @@
  * during the build process.
  * It collects information such as:
  * <ul>
- * <li>Classes to be initialized at runtime ({@link #runtimeInitializedClasses})</li>
- * <li>Classes to be re-initialized at runtime ({@link #runtimeReinitializedClasses})</li>
- * <li>Resource bundles to include ({@link #resourceBundles})</li>
- * <li>Dynamic proxy definitions ({@link #proxyDefinitions})</li>
- * <li>System properties to be set within the native image ({@link #nativeImageSystemProperties})</li>
+ * <li>Classes to be (re-)initialized at runtime</li>
+ * <li>Resource bundles to include</li>
+ * <li>Dynamic proxy definitions</li>
+ * <li>System properties to be set within the native image</li>
  * </ul>
  * The final native image configuration is assembled by combining all produced instances of this build item.
  * Use the {@link #builder()} method to construct instances.
  */
 public final class NativeImageConfigBuildItem extends MultiBuildItem {
 
     private final Set<String> runtimeInitializedClasses;
-    private final Set<String> runtimeReinitializedClasses;
     private final Set<String> resourceBundles;
     private final Set<List<String>> proxyDefinitions;
     private final Map<String, String> nativeImageSystemProperties;
 
     public NativeImageConfigBuildItem(Builder builder) {
         this.runtimeInitializedClasses = Collections.unmodifiableSet(builder.runtimeInitializedClasses);
-        this.runtimeReinitializedClasses = Collections.unmodifiableSet(builder.runtimeReinitializedClasses);
         this.resourceBundles = Collections.unmodifiableSet(builder.resourceBundles);
         this.proxyDefinitions = Collections.unmodifiableSet(builder.proxyDefinitions);
         this.nativeImageSystemProperties = Collections.unmodifiableMap(builder.nativeImageSystemProperties);
@@ -46,8 +43,13 @@ public Iterable<String> getRuntimeInitializedClasses() {
         return runtimeInitializedClasses;
     }
 
+    /**
+     * @deprecated Starting with Mandrel/GraalVM 23.1 for JDK 21 this is functionally the same with
+     *             {@link #getRuntimeInitializedClasses()}.
+     */
+    @Deprecated(since = "3.30", forRemoval = true)
     public Iterable<String> getRuntimeReinitializedClasses() {
-        return runtimeReinitializedClasses;
+        return getRuntimeInitializedClasses();
     }
 
     public Iterable<String> getResourceBundles() {
@@ -69,7 +71,6 @@ public static Builder builder() {
     public static class Builder {
 
         final Set<String> runtimeInitializedClasses = new HashSet<>();
-        final Set<String> runtimeReinitializedClasses = new HashSet<>();
         final Set<String> resourceBundles = new HashSet<>();
         final Set<List<String>> proxyDefinitions = new HashSet<>();
         final Map<String, String> nativeImageSystemProperties = new HashMap<>();
@@ -79,9 +80,13 @@ public Builder addRuntimeInitializedClass(String className) {
             return this;
         }
 
+        /**
+         * @deprecated Starting with Mandrel/GraalVM 23.1 for JDK 21 this is functionally the same with
+         *             {@link Builder#addRuntimeInitializedClass(String)}.
+         */
+        @Deprecated(since = "3.30", forRemoval = true)
         public Builder addRuntimeReinitializedClass(String className) {
-            runtimeReinitializedClasses.add(className);
-            return this;
+            return addRuntimeInitializedClass(className);
         }
 
         public Builder addResourceBundle(String className) {
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageConfigBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageConfigBuildStep.java
@@ -47,17 +47,13 @@ void build(NativeConfig nativeConfig,
             BuildProducer<NativeImageProxyDefinitionBuildItem> proxy,
             BuildProducer<NativeImageResourceBundleBuildItem> resourceBundle,
             BuildProducer<RuntimeInitializedClassBuildItem> runtimeInit,
-            BuildProducer<RuntimeReinitializedClassBuildItem> runtimeReinit,
             BuildProducer<NativeImageSystemPropertyBuildItem> nativeImage,
             BuildProducer<SystemPropertyBuildItem> systemProperty,
             BuildProducer<JavaLibraryPathAdditionalPathBuildItem> javaLibraryPathAdditionalPath) {
         for (NativeImageConfigBuildItem nativeImageConfigBuildItem : nativeImageConfigBuildItems) {
             for (String i : nativeImageConfigBuildItem.getRuntimeInitializedClasses()) {
                 runtimeInit.produce(new RuntimeInitializedClassBuildItem(i));
             }
-            for (String i : nativeImageConfigBuildItem.getRuntimeReinitializedClasses()) {
-                runtimeReinit.produce(new RuntimeReinitializedClassBuildItem(i));
-            }
             for (Map.Entry<String, String> e : nativeImageConfigBuildItem.getNativeImageSystemProperties().entrySet()) {
                 nativeImage.produce(new NativeImageSystemPropertyBuildItem(e.getKey(), e.getValue()));
             }
diff --git a/extensions/grpc-common/deployment/src/main/java/io/quarkus/grpc/common/deployment/GrpcCommonProcessor.java b/extensions/grpc-common/deployment/src/main/java/io/quarkus/grpc/common/deployment/GrpcCommonProcessor.java
@@ -90,7 +90,7 @@ NativeImageConfigBuildItem nativeImageConfiguration() {
                 .addRuntimeInitializedClass("io.grpc.netty.NettyServerBuilder")
                 .addRuntimeInitializedClass("io.grpc.netty.NettyChannelBuilder")
                 .addRuntimeInitializedClass("io.grpc.internal.RetriableStream")
-                .addRuntimeReinitializedClass("com.google.protobuf.UnsafeUtil");
+                .addRuntimeInitializedClass("com.google.protobuf.UnsafeUtil");
         return builder.build();
     }
 
diff --git a/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java b/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java
@@ -508,7 +508,7 @@ NativeImageConfigBuildItem nativeImageConfiguration() {
                         "org.apache.kafka.common.security.oauthbearer.internals.expiring.ExpiringCredentialRefreshingLogin")
                 // VerificationKeyResolver is value on static map in OAuthBearerValidatorCallbackHandler
                 .addRuntimeInitializedClass("org.apache.kafka.common.security.oauthbearer.OAuthBearerValidatorCallbackHandler")
-                .addRuntimeReinitializedClass("org.apache.kafka.shaded.com.google.protobuf.UnsafeUtil");
+                .addRuntimeInitializedClass("org.apache.kafka.shaded.com.google.protobuf.UnsafeUtil");
         return builder.build();
     }
 
diff --git a/extensions/netty/deployment/src/main/java/io/quarkus/netty/deployment/NettyProcessor.java b/extensions/netty/deployment/src/main/java/io/quarkus/netty/deployment/NettyProcessor.java
@@ -234,26 +234,26 @@ NativeImageConfigBuildItem build(
         // - io.netty.bitMode
         // - sun.arch.data.model
         // - com.ibm.vm.bitmode
-        builder.addRuntimeReinitializedClass("io.netty.util.internal.PlatformDependent")
+        builder.addRuntimeInitializedClass("io.netty.util.internal.PlatformDependent")
                 // Similarly for properties:
                 // - io.netty.noUnsafe
                 // - sun.misc.unsafe.memory.access
                 // - io.netty.tryUnsafe
                 // - org.jboss.netty.tryUnsafe
                 // - io.netty.tryReflectionSetAccessible
-                .addRuntimeReinitializedClass("io.netty.util.internal.PlatformDependent0")
+                .addRuntimeInitializedClass("io.netty.util.internal.PlatformDependent0")
                 // Runtime initialize classes to allow netty to use the field offset for testing if unsafe is available or not
                 // See https://github.com/quarkusio/quarkus/issues/47903#issuecomment-2890924970
-                .addRuntimeReinitializedClass("io.netty.util.AbstractReferenceCounted")
-                .addRuntimeReinitializedClass("io.netty.buffer.AbstractReferenceCountedByteBuf");
+                .addRuntimeInitializedClass("io.netty.util.AbstractReferenceCounted")
+                .addRuntimeInitializedClass("io.netty.buffer.AbstractReferenceCountedByteBuf");
 
         if (QuarkusClassLoader.isClassPresentAtRuntime("io.netty.buffer.UnpooledByteBufAllocator")) {
             // Runtime initialize due to the use of the io.netty.util.internal.PlatformDependent class
-            builder.addRuntimeReinitializedClass("io.netty.buffer.UnpooledByteBufAllocator")
-                    .addRuntimeReinitializedClass("io.netty.buffer.Unpooled")
+            builder.addRuntimeInitializedClass("io.netty.buffer.UnpooledByteBufAllocator")
+                    .addRuntimeInitializedClass("io.netty.buffer.Unpooled")
                     // Runtime initialize due to dependency on io.netty.buffer.Unpooled
-                    .addRuntimeReinitializedClass("io.netty.handler.codec.http.HttpObjectAggregator")
-                    .addRuntimeReinitializedClass("io.netty.handler.codec.ReplayingDecoderByteBuf")
+                    .addRuntimeInitializedClass("io.netty.handler.codec.http.HttpObjectAggregator")
+                    .addRuntimeInitializedClass("io.netty.handler.codec.ReplayingDecoderByteBuf")
                     // Runtime initialize to avoid embedding quite a few Strings in the image heap
                     .addRuntimeInitializedClass("io.netty.buffer.ByteBufUtil$HexUtil")
                     // Runtime initialize due to the use of the io.netty.util.internal.PlatformDependent class in the
@@ -284,7 +284,7 @@ NativeImageConfigBuildItem build(
             if (QuarkusClassLoader
                     .isClassPresentAtRuntime("org.jboss.resteasy.reactive.client.impl.multipart.QuarkusMultipartFormUpload")) {
                 // Runtime initialize due to dependency on io.netty.buffer.Unpooled
-                builder.addRuntimeReinitializedClass(
+                builder.addRuntimeInitializedClass(
                         "org.jboss.resteasy.reactive.client.impl.multipart.QuarkusMultipartFormUpload");
             }
         }
diff --git a/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/VertxProcessor.java b/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/VertxProcessor.java
@@ -261,11 +261,11 @@ void faultToleranceIntegration(Capabilities capabilities, BuildProducer<ServiceP
     NativeImageConfigBuildItem reinitializeClassesForNetty() {
         NativeImageConfigBuildItem.Builder builder = NativeImageConfigBuildItem.builder();
 
-        builder.addRuntimeReinitializedClass("io.vertx.core.http.impl.Http1xServerResponse")
-                .addRuntimeReinitializedClass("io.vertx.core.parsetools.impl.RecordParserImpl");
+        builder.addRuntimeInitializedClass("io.vertx.core.http.impl.Http1xServerResponse")
+                .addRuntimeInitializedClass("io.vertx.core.parsetools.impl.RecordParserImpl");
 
         if (QuarkusClassLoader.isClassPresentAtRuntime("io.vertx.ext.web.client.impl.MultipartFormUpload")) {
-            builder.addRuntimeReinitializedClass("io.vertx.ext.web.client.impl.MultipartFormUpload");
+            builder.addRuntimeInitializedClass("io.vertx.ext.web.client.impl.MultipartFormUpload");
         }
 
         return builder.build();

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ NativeImageConfigBuildItem nativeImageConfiguration() {`
`90`	`90`	`.addRuntimeInitializedClass("io.grpc.netty.NettyServerBuilder")`
`91`	`91`	`.addRuntimeInitializedClass("io.grpc.netty.NettyChannelBuilder")`
`92`	`92`	`.addRuntimeInitializedClass("io.grpc.internal.RetriableStream")`
`93`		`- .addRuntimeReinitializedClass("com.google.protobuf.UnsafeUtil");`
	`93`	`+ .addRuntimeInitializedClass("com.google.protobuf.UnsafeUtil");`
`94`	`94`	`return builder.build();`
`95`	`95`	`}`
`96`	`96`
Original file line number	Diff line number	Diff line change
`@@ -508,7 +508,7 @@ NativeImageConfigBuildItem nativeImageConfiguration() {`
`508`	`508`	`"org.apache.kafka.common.security.oauthbearer.internals.expiring.ExpiringCredentialRefreshingLogin")`
`509`	`509`	`// VerificationKeyResolver is value on static map in OAuthBearerValidatorCallbackHandler`
`510`	`510`	`.addRuntimeInitializedClass("org.apache.kafka.common.security.oauthbearer.OAuthBearerValidatorCallbackHandler")`
`511`		`- .addRuntimeReinitializedClass("org.apache.kafka.shaded.com.google.protobuf.UnsafeUtil");`
	`511`	`+ .addRuntimeInitializedClass("org.apache.kafka.shaded.com.google.protobuf.UnsafeUtil");`
`512`	`512`	`return builder.build();`
`513`	`513`	`}`
`514`	`514`