Skip to content

Commit e8072b1

Browse files
zakkakzakkak
committed
Avoid deprecated RuntimeReinitializedClassBuildItem 
1 parent c680561 commit e8072b1

File tree

14 files changed

+68
-70
lines changed

14 files changed

+68
-70
lines changed

‎core/deployment/src/main/java/io/quarkus/deployment/SslProcessor.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import io.quarkus.deployment.annotations.BuildProducer;
66
import io.quarkus.deployment.annotations.BuildStep;
77
import io.quarkus.deployment.builditem.SslNativeConfigBuildItem;
8-
import io.quarkus.deployment.builditem.nativeimage.RuntimeReinitializedClassBuildItem;
8+
import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
99
import io.quarkus.runtime.annotations.ConfigPhase;
1010
import io.quarkus.runtime.annotations.ConfigRoot;
1111
import io.smallrye.config.ConfigMapping;
@@ -36,7 +36,7 @@ SslNativeConfigBuildItem setupNativeSsl() {
3636
}
3737

3838
@BuildStep
39-
void runtime(BuildProducer<RuntimeReinitializedClassBuildItem> reinitialized) {
40-
reinitialized.produce(new RuntimeReinitializedClassBuildItem(JAVA_11_PLUS_SSL_LOGGER));
39+
void runtime(BuildProducer<RuntimeInitializedClassBuildItem> reinitialized) {
40+
reinitialized.produce(new RuntimeInitializedClassBuildItem(JAVA_11_PLUS_SSL_LOGGER));
4141
}
4242
}

‎core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/RuntimeReinitializedClassBuildItem.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* @deprecated Starting with Mandrel/GraalVM 23.1 for JDK 21 this is functionally the same with
1010
* {@link RuntimeInitializedClassBuildItem}.
1111
*/
12-
@Deprecated(since = "3.18")
12+
@Deprecated(since = "3.18", forRemoval = true)
1313
public final class RuntimeReinitializedClassBuildItem extends MultiBuildItem {
1414

1515
private final String className;

‎core/deployment/src/main/java/io/quarkus/deployment/logging/LoggingResourceProcessor.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
import io.quarkus.deployment.builditem.SystemPropertyBuildItem;
9292
import io.quarkus.deployment.builditem.nativeimage.NativeImageSystemPropertyBuildItem;
9393
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
94-
import io.quarkus.deployment.builditem.nativeimage.RuntimeReinitializedClassBuildItem;
94+
import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
9595
import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
9696
import io.quarkus.deployment.console.ConsoleInstalledBuildItem;
9797
import io.quarkus.deployment.console.QuarkusCommand;
@@ -232,12 +232,12 @@ void setUpDefaultLogCleanupFilters(List<LogCleanupFilterBuildItem> logCleanupFil
232232

233233
@BuildStep
234234
void miscSetup(
235-
Consumer<RuntimeReinitializedClassBuildItem> runtimeInit,
235+
Consumer<RuntimeInitializedClassBuildItem> runtimeInit,
236236
Consumer<NativeImageSystemPropertyBuildItem> systemProp,
237237
Consumer<ServiceProviderBuildItem> provider) {
238-
runtimeInit.accept(new RuntimeReinitializedClassBuildItem(ConsoleHandler.class.getName()));
239-
runtimeInit.accept(new RuntimeReinitializedClassBuildItem("io.smallrye.common.ref.References$ReaperThread"));
240-
runtimeInit.accept(new RuntimeReinitializedClassBuildItem("io.smallrye.common.os.Process"));
238+
runtimeInit.accept(new RuntimeInitializedClassBuildItem(ConsoleHandler.class.getName()));
239+
runtimeInit.accept(new RuntimeInitializedClassBuildItem("io.smallrye.common.ref.References$ReaperThread"));
240+
runtimeInit.accept(new RuntimeInitializedClassBuildItem("io.smallrye.common.os.Process"));
241241
systemProp
242242
.accept(new NativeImageSystemPropertyBuildItem("java.util.logging.manager", "org.jboss.logmanager.LogManager"));
243243
provider.accept(

‎core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageConfigBuildStep.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBundleBuildItem;
2424
import io.quarkus.deployment.builditem.nativeimage.NativeImageSystemPropertyBuildItem;
2525
import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
26-
import io.quarkus.deployment.builditem.nativeimage.RuntimeReinitializedClassBuildItem;
2726
import io.quarkus.deployment.pkg.NativeConfig;
2827
import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild;
2928
import io.quarkus.runtime.ssl.SslContextConfigurationRecorder;
@@ -100,13 +99,13 @@ void build(NativeConfig nativeConfig,
10099
}
101100

102101
@BuildStep(onlyIf = NativeOrNativeSourcesBuild.class)
103-
void reinitHostNameUtil(BuildProducer<RuntimeReinitializedClassBuildItem> runtimeReInitClass) {
102+
void reinitHostNameUtil(BuildProducer<RuntimeInitializedClassBuildItem> runtimeReInitClass) {
104103
// certain libraries like JBoss logging internally use this class to determine the hostname
105104
// of the system. This HostName class computes and stores the hostname as a static field in a class,
106105
// so we reinitialize this to re-compute the field (and other related fields) during native application's
107106
// runtime
108-
runtimeReInitClass.produce(new RuntimeReinitializedClassBuildItem("org.wildfly.common.net.HostName"));
109-
runtimeReInitClass.produce(new RuntimeReinitializedClassBuildItem("io.smallrye.common.net.HostName"));
107+
runtimeReInitClass.produce(new RuntimeInitializedClassBuildItem("org.wildfly.common.net.HostName"));
108+
runtimeReInitClass.produce(new RuntimeInitializedClassBuildItem("io.smallrye.common.net.HostName"));
110109
}
111110

112111
private Boolean isSslNativeEnabled(SslNativeConfigBuildItem sslNativeConfig,

‎extensions/flyway/deployment/src/main/java/io/quarkus/flyway/deployment/FlywayAlwaysEnabledProcessor.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import io.quarkus.deployment.builditem.FeatureBuildItem;
99
import io.quarkus.deployment.builditem.IndexDependencyBuildItem;
1010
import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
11-
import io.quarkus.deployment.builditem.nativeimage.RuntimeReinitializedClassBuildItem;
11+
import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
1212
import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
1313

1414
public class FlywayAlwaysEnabledProcessor {
@@ -22,8 +22,8 @@ void build(BuildProducer<FeatureBuildItem> featureProducer) {
2222
* Reinitialize {@code InsertRowLock} to avoid using a cached seed when invoking {@code getNextRandomString}
2323
*/
2424
@BuildStep
25-
public RuntimeReinitializedClassBuildItem reinitInsertRowLock() {
26-
return new RuntimeReinitializedClassBuildItem(
25+
public RuntimeInitializedClassBuildItem reinitInsertRowLock() {
26+
return new RuntimeInitializedClassBuildItem(
2727
"org.flywaydb.core.internal.database.InsertRowLock");
2828
}
2929

‎extensions/hibernate-validator/deployment/src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
9797
import io.quarkus.deployment.builditem.nativeimage.ReflectiveFieldBuildItem;
9898
import io.quarkus.deployment.builditem.nativeimage.ReflectiveMethodBuildItem;
99-
import io.quarkus.deployment.builditem.nativeimage.RuntimeReinitializedClassBuildItem;
99+
import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
100100
import io.quarkus.deployment.logging.LogCleanupFilterBuildItem;
101101
import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild;
102102
import io.quarkus.deployment.recording.RecorderContext;
@@ -645,8 +645,8 @@ public void init(BeanContainerBuildItem beanContainerBuildItem, HibernateValidat
645645
}
646646

647647
@BuildStep
648-
public RuntimeReinitializedClassBuildItem reinitClockProviderSystemTimezone() {
649-
return new RuntimeReinitializedClassBuildItem(
648+
public RuntimeInitializedClassBuildItem reinitClockProviderSystemTimezone() {
649+
return new RuntimeInitializedClassBuildItem(
650650
"io.quarkus.hibernate.validator.runtime.clockprovider.HibernateValidatorClockProviderSystemZoneIdHolder");
651651
}
652652

‎extensions/jdbc/jdbc-oracle/deployment/src/main/java/io/quarkus/jdbc/oracle/deployment/OracleMetadataOverrides.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBundleBuildItem;
1212
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
1313
import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
14-
import io.quarkus.deployment.builditem.nativeimage.RuntimeReinitializedClassBuildItem;
1514
import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild;
1615
import io.quarkus.maven.dependency.ArtifactKey;
1716

@@ -82,7 +81,7 @@ void build(BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
8281

8382
@BuildStep
8483
void runtimeInitializeDriver(BuildProducer<RuntimeInitializedClassBuildItem> runtimeInitialized,
85-
BuildProducer<RuntimeReinitializedClassBuildItem> runtimeReinitialized) {
84+
BuildProducer<RuntimeInitializedClassBuildItem> runtimeReinitialized) {
8685
//These re-implement all the "--initialize-at-build-time" arguments found in the native-image.properties :
8786

8887
// Override: the original metadata marks the drivers as "runtime initialized" but this makes it incompatible with
@@ -112,9 +111,9 @@ void runtimeInitializeDriver(BuildProducer<RuntimeInitializedClassBuildItem> run
112111

113112
// Needs to be REinitialized to avoid problems when also using the Elasticsearch Java client
114113
// See https://github.com/quarkusio/quarkus/issues/31624#issuecomment-1457706253
115-
runtimeReinitialized.produce(new RuntimeReinitializedClassBuildItem(
114+
runtimeReinitialized.produce(new RuntimeInitializedClassBuildItem(
116115
"oracle.jdbc.driver.BlockSource$ThreadedCachingBlockSource"));
117-
runtimeReinitialized.produce(new RuntimeReinitializedClassBuildItem(
116+
runtimeReinitialized.produce(new RuntimeInitializedClassBuildItem(
118117
"oracle.jdbc.driver.BlockSource$ThreadedCachingBlockSource$BlockReleaser"));
119118

120119
runtimeInitialized.produce(new RuntimeInitializedClassBuildItem("oracle.jdbc.xa.client.OracleXADataSource"));

‎extensions/jdbc/jdbc-postgresql/deployment/src/main/java/io/quarkus/jdbc/postgresql/deployment/JDBCPostgreSQLProcessor.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import io.quarkus.deployment.builditem.NativeImageFeatureBuildItem;
1616
import io.quarkus.deployment.builditem.SslNativeConfigBuildItem;
1717
import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
18-
import io.quarkus.deployment.builditem.nativeimage.RuntimeReinitializedClassBuildItem;
18+
import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
1919
import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
2020
import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild;
2121
import io.quarkus.jdbc.postgresql.runtime.PostgreSQLAgroalConnectionConfigurer;
@@ -35,8 +35,8 @@ NativeImageFeatureBuildItem nativeImageFeature() {
3535
}
3636

3737
@BuildStep(onlyIf = NativeOrNativeSourcesBuild.class)
38-
RuntimeReinitializedClassBuildItem runtimeReinitialize() {
39-
return new RuntimeReinitializedClassBuildItem("org.postgresql.util.PasswordUtil$SecureRandomHolder");
38+
RuntimeInitializedClassBuildItem runtimeReinitialize() {
39+
return new RuntimeInitializedClassBuildItem("org.postgresql.util.PasswordUtil$SecureRandomHolder");
4040
}
4141

4242
@BuildStep

‎extensions/kafka-streams/deployment/src/main/java/io/quarkus/kafka/streams/deployment/KafkaStreamsProcessor.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import io.quarkus.deployment.builditem.NativeImageFeatureBuildItem;
3232
import io.quarkus.deployment.builditem.nativeimage.JniRuntimeAccessBuildItem;
3333
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
34-
import io.quarkus.deployment.builditem.nativeimage.RuntimeReinitializedClassBuildItem;
34+
import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
3535
import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild;
3636
import io.quarkus.kafka.streams.runtime.KafkaStreamsProducer;
3737
import io.quarkus.kafka.streams.runtime.KafkaStreamsRecorder;
@@ -51,7 +51,7 @@ FeatureBuildItem feature() {
5151
@BuildStep(onlyIf = NativeOrNativeSourcesBuild.class)
5252
void build(BuildProducer<ReflectiveClassBuildItem> reflectiveClasses,
5353
BuildProducer<JniRuntimeAccessBuildItem> jniRuntimeAccessibleClasses,
54-
BuildProducer<RuntimeReinitializedClassBuildItem> reinitialized,
54+
BuildProducer<RuntimeInitializedClassBuildItem> reinitialized,
5555
LaunchModeBuildItem launchMode) {
5656
registerClassesThatAreLoadedThroughReflection(reflectiveClasses, launchMode);
5757
registerClassesThatAreAccessedViaJni(jniRuntimeAccessibleClasses);
@@ -215,8 +215,8 @@ private void registerClassesThatAreAccessedViaJni(BuildProducer<JniRuntimeAccess
215215
.produce(new JniRuntimeAccessBuildItem(true, false, false, RocksDBException.class, Status.class));
216216
}
217217

218-
private void enableLoadOfNativeLibs(BuildProducer<RuntimeReinitializedClassBuildItem> reinitialized) {
219-
reinitialized.produce(new RuntimeReinitializedClassBuildItem("org.rocksdb.RocksDB"));
218+
private void enableLoadOfNativeLibs(BuildProducer<RuntimeInitializedClassBuildItem> reinitialized) {
219+
reinitialized.produce(new RuntimeInitializedClassBuildItem("org.rocksdb.RocksDB"));
220220
}
221221

222222
private boolean allDefaultSerdesAreDefinedInProperties(String defaultKeySerdeClass, String defaultValueSerdeClass) {

‎extensions/kubernetes-client/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientProcessor.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import io.quarkus.deployment.builditem.RemovedResourceBuildItem;
4444
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
4545
import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyBuildItem;
46-
import io.quarkus.deployment.builditem.nativeimage.RuntimeReinitializedClassBuildItem;
46+
import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
4747
import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
4848
import io.quarkus.deployment.util.JandexUtil;
4949
import io.quarkus.jackson.deployment.IgnoreJsonDeserializeClassBuildItem;
@@ -85,9 +85,9 @@ public void registerBeanProducers(BuildProducer<AdditionalBeanBuildItem> additio
8585
}
8686

8787
@BuildStep
88-
public void nativeImageSupport(BuildProducer<RuntimeReinitializedClassBuildItem> runtimeInitializedClassProducer) {
88+
public void nativeImageSupport(BuildProducer<RuntimeInitializedClassBuildItem> runtimeInitializedClassProducer) {
8989
runtimeInitializedClassProducer
90-
.produce(new RuntimeReinitializedClassBuildItem(io.fabric8.kubernetes.client.utils.Utils.class.getName()));
90+
.produce(new RuntimeInitializedClassBuildItem(io.fabric8.kubernetes.client.utils.Utils.class.getName()));
9191
}
9292

9393
@BuildStep

0 commit comments

Comments
 (0)