Skip to content

Commit c30c849

Browse files
committed
Consistent report of unknown properties between JVM and Native mode
1 parent f2d0581 commit c30c849

File tree

2 files changed

+10
-17
lines changed

2 files changed

+10
-17
lines changed

core/deployment/src/main/java/io/quarkus/deployment/configuration/RunTimeConfigurationGenerator.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@ public final class RunTimeConfigurationGenerator {
9999
static final MethodDescriptor CD_MISSING_VALUE = MethodDescriptor.ofMethod(ConfigDiagnostic.class, "missingValue",
100100
void.class, String.class, NoSuchElementException.class);
101101
static final MethodDescriptor CD_RESET_ERROR = MethodDescriptor.ofMethod(ConfigDiagnostic.class, "resetError", void.class);
102-
static final MethodDescriptor CD_UNKNOWN_PROPERTIES = MethodDescriptor.ofMethod(ConfigDiagnostic.class, "unknownProperties",
102+
static final MethodDescriptor CD_REPORT_UNKNOWN = MethodDescriptor.ofMethod(ConfigDiagnostic.class, "reportUnknown",
103103
void.class, Set.class);
104-
static final MethodDescriptor CD_UNKNOWN_PROPERTIES_RT = MethodDescriptor.ofMethod(ConfigDiagnostic.class,
105-
"unknownPropertiesRuntime", void.class, Set.class);
104+
static final MethodDescriptor CD_REPORT_UNKNOWN_RUNTIME = MethodDescriptor.ofMethod(ConfigDiagnostic.class,
105+
"reportUnknownRuntime", void.class, Set.class);
106106

107107
static final MethodDescriptor CONVS_NEW_ARRAY_CONVERTER = MethodDescriptor.ofMethod(Converters.class,
108108
"newArrayConverter", Converter.class, Converter.class, Class.class);
@@ -449,14 +449,14 @@ public void run() {
449449

450450
// generate sweep for clinit
451451
configSweepLoop(siParserBody, clinit, clinitConfig, getRegisteredRoots(BUILD_AND_RUN_TIME_FIXED), Type.BUILD_TIME);
452-
clinit.invokeStaticMethod(CD_UNKNOWN_PROPERTIES, clinit.readStaticField(C_UNKNOWN));
452+
clinit.invokeStaticMethod(CD_REPORT_UNKNOWN, clinit.readStaticField(C_UNKNOWN));
453453

454454
if (liveReloadPossible) {
455455
configSweepLoop(siParserBody, readConfig, runTimeConfig, getRegisteredRoots(RUN_TIME), Type.RUNTIME);
456456
}
457457
// generate sweep for run time
458458
configSweepLoop(rtParserBody, readConfig, runTimeConfig, getRegisteredRoots(RUN_TIME), Type.RUNTIME);
459-
readConfig.invokeStaticMethod(CD_UNKNOWN_PROPERTIES_RT, readConfig.readStaticField(C_UNKNOWN_RUNTIME));
459+
readConfig.invokeStaticMethod(CD_REPORT_UNKNOWN_RUNTIME, readConfig.readStaticField(C_UNKNOWN_RUNTIME));
460460

461461
// generate ensure-initialized method
462462
// the point of this method is simply to initialize the Config class

core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigDiagnostic.java

+5-12
Original file line numberDiff line numberDiff line change
@@ -142,21 +142,14 @@ public static void unknownProperties(Set<String> properties) {
142142
}
143143
}
144144

145-
public static void unknownRunTime(String name) {
146-
if (ImageMode.current() == ImageMode.NATIVE_RUN) {
147-
// only warn at run time for native images, otherwise the user will get warned twice for every property
148-
unknown(name);
145+
public static void reportUnknown(Set<String> properties) {
146+
if (ImageMode.current() == ImageMode.NATIVE_BUILD) {
147+
unknownProperties(properties);
149148
}
150149
}
151150

152-
public static void unknownRunTime(NameIterator name) {
153-
unknownRunTime(name.getName());
154-
}
155-
156-
public static void unknownPropertiesRuntime(Set<String> properties) {
157-
if (ImageMode.current() == ImageMode.NATIVE_RUN) {
158-
unknownProperties(properties);
159-
}
151+
public static void reportUnknownRuntime(Set<String> properties) {
152+
unknownProperties(properties);
160153
}
161154

162155
/**

0 commit comments

Comments
 (0)