Remove deprecated native config language and country options

Author: zakkak

core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java

@@ -71,30 +71,6 @@ public interface NativeConfig {
     @WithDefault("true")
     boolean headless();
 
-    /**
-     * Defines the user language used for building the native executable.
-     * With GraalVM versions prior to GraalVM for JDK 24 it also serves as the default Locale language for the native executable
-     * application runtime.
-     * e.g. en or cs as defined by IETF BCP 47 language tags.
-     * <p>
-     *
-     * @deprecated Use the global quarkus.default-locale.
-     */
-    @Deprecated
-    Optional<@WithConverter(TrimmedStringConverter.class) String> userLanguage();
-
-    /**
-     * Defines the user country used for building the native executable.
-     * With GraalVM versions prior to GraalVM for JDK 24 it also serves as the default Locale country for the native executable
-     * application runtime.
-     * e.g. US or FR as defined by ISO 3166-1 alpha-2 codes.
-     * <p>
-     *
-     * @deprecated Use the global quarkus.default-locale.
-     */
-    @Deprecated
-    Optional<@WithConverter(TrimmedStringConverter.class) String> userCountry();
-
     /**
      * Defines the file encoding as in {@code -Dfile.encoding=...}.
      * <p>

core/deployment/src/main/java/io/quarkus/deployment/steps/LocaleProcessor.java

@@ -28,12 +28,6 @@
 public class LocaleProcessor {
 
     private static final Logger log = Logger.getLogger(LocaleProcessor.class);
-    public static final String DEPRECATED_USER_LANGUAGE_WARNING = "Your application is setting the deprecated 'quarkus.native.user-language' configuration property. "
-            +
-            "Please, consider using only 'quarkus.default-locale' configuration property instead.";
-    public static final String DEPRECATED_USER_COUNTRY_WARNING = "Your application is setting the deprecated 'quarkus.native.user-country' configuration property. "
-            +
-            "Please, consider using only 'quarkus.default-locale' configuration property instead.";
 
     @BuildStep(onlyIf = { NativeBuild.class, NonDefaultLocale.class })
     void nativeResources(BuildProducer<NativeImageResourceBundleBuildItem> resources) {
@@ -92,14 +86,8 @@ public NonDefaultLocale(NativeConfig nativeConfig, LocalesBuildTimeConfig locale
 
         @Override
         public boolean getAsBoolean() {
-            return (nativeConfig.userLanguage().isPresent()
-                    && !Locale.getDefault().getLanguage().equals(nativeConfig.userLanguage().get()))
-                    ||
-                    (nativeConfig.userCountry().isPresent()
-                            && !Locale.getDefault().getCountry().equals(nativeConfig.userCountry().get()))
-                    ||
-                    (localesBuildTimeConfig.defaultLocale().isPresent() &&
-                            !Locale.getDefault().equals(localesBuildTimeConfig.defaultLocale().get()))
+            return (localesBuildTimeConfig.defaultLocale().isPresent() &&
+                    !Locale.getDefault().equals(localesBuildTimeConfig.defaultLocale().get()))
                     ||
                     localesBuildTimeConfig.locales().stream().anyMatch(l -> !Locale.getDefault().equals(l));
         }
@@ -110,8 +98,7 @@ public boolean getAsBoolean() {
      *
      * @param nativeConfig
      * @param localesBuildTimeConfig
-     * @return User language set by 'quarkus.default-locale' or by deprecated 'quarkus.native.user-language' or
-     *         effectively LocalesBuildTimeConfig.DEFAULT_LANGUAGE if none of the aforementioned is set.
+     * @return User language set by 'quarkus.default-locale' or effectively LocalesBuildTimeConfig.DEFAULT_LANGUAGE if not set.
      * @Deprecated
      */
     @Deprecated
@@ -120,11 +107,6 @@ public static String nativeImageUserLanguage(NativeConfig nativeConfig, LocalesB
         if (localesBuildTimeConfig.defaultLocale().isPresent()) {
             language = localesBuildTimeConfig.defaultLocale().get().getLanguage();
         }
-        if (nativeConfig.userLanguage().isPresent()) {
-            log.warn(DEPRECATED_USER_LANGUAGE_WARNING);
-            // The deprecated option takes precedence for users who are already using it.
-            language = nativeConfig.userLanguage().get();
-        }
         return language;
     }
 
@@ -133,9 +115,7 @@ public static String nativeImageUserLanguage(NativeConfig nativeConfig, LocalesB
      *
      * @param nativeConfig
      * @param localesBuildTimeConfig
-     * @return User country set by 'quarkus.default-locale' or by deprecated 'quarkus.native.user-country' or
-     *         effectively LocalesBuildTimeConfig.DEFAULT_COUNTRY (could be an empty string) if none of the aforementioned is
-     *         set.
+     * @return User country set by 'quarkus.default-locale' or effectively LocalesBuildTimeConfig.DEFAULT_COUNTRY if not set.
      * @Deprecated
      */
     @Deprecated
@@ -144,11 +124,6 @@ public static String nativeImageUserCountry(NativeConfig nativeConfig, LocalesBu
         if (localesBuildTimeConfig.defaultLocale().isPresent()) {
             country = localesBuildTimeConfig.defaultLocale().get().getCountry();
         }
-        if (nativeConfig.userCountry().isPresent()) {
-            log.warn(DEPRECATED_USER_COUNTRY_WARNING);
-            // The deprecated option takes precedence for users who are already using it.
-            country = nativeConfig.userCountry().get();
-        }
         return country;
     }
 
@@ -170,12 +145,7 @@ public static String nativeImageIncludeLocales(NativeConfig nativeConfig, Locale
 
         // GraalVM for JDK 24 doesn't include the default locale used at build time. We must explicitly include the
         // specified locales - including the build-time locale if set by the user.
-        // Note the deprecated options still count and take precedence.
-        if (nativeConfig.userCountry().isPresent() && nativeConfig.userLanguage().isPresent()) {
-            additionalLocales.add(new Locale(nativeConfig.userLanguage().get(), nativeConfig.userCountry().get()));
-        } else if (nativeConfig.userLanguage().isPresent()) {
-            additionalLocales.add(new Locale(nativeConfig.userLanguage().get()));
-        } else if (localesBuildTimeConfig.defaultLocale().isPresent()) {
+        if (localesBuildTimeConfig.defaultLocale().isPresent()) {
             additionalLocales.add(localesBuildTimeConfig.defaultLocale().get());
         }
 

core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageFeatureStep.java

@@ -95,15 +95,7 @@ public void write(String s, byte[] bytes) {
                 overallCatch.marshalAsArray(String.class, overallCatch.load(""))); // empty string means initialize everything
 
         // Set the user.language and user.country system properties to the default locale
-        // The deprecated option takes precedence for users who are already using it.
-        if (nativeConfig.userLanguage().isPresent()) {
-            overallCatch.invokeStaticMethod(REGISTER_RUNTIME_SYSTEM_PROPERTIES,
-                    overallCatch.load("user.language"), overallCatch.load(nativeConfig.userLanguage().get()));
-            if (nativeConfig.userCountry().isPresent()) {
-                overallCatch.invokeStaticMethod(REGISTER_RUNTIME_SYSTEM_PROPERTIES,
-                        overallCatch.load("user.country"), overallCatch.load(nativeConfig.userCountry().get()));
-            }
-        } else if (localesBuildTimeConfig.defaultLocale().isPresent()) {
+        if (localesBuildTimeConfig.defaultLocale().isPresent()) {
             overallCatch.invokeStaticMethod(REGISTER_RUNTIME_SYSTEM_PROPERTIES,
                     overallCatch.load("user.language"),
                     overallCatch.load(localesBuildTimeConfig.defaultLocale().get().getLanguage()));

core/deployment/src/test/java/io/quarkus/deployment/pkg/TestNativeConfig.java

@@ -55,16 +55,6 @@ public boolean headless() {
         return false;
     }
 
-    @Override
-    public Optional<String> userLanguage() {
-        return Optional.empty();
-    }
-
-    @Override
-    public Optional<String> userCountry() {
-        return Optional.empty();
-    }
-
     @Override
     public String fileEncoding() {
         return null;

integration-tests/locales/default/src/test/resources/application.properties

@@ -1,4 +1,2 @@
 quarkus.locales=de,fr-FR,ja,uk-UA
-# Note that quarkus.native.user-language is deprecated and solely quarkus.default-locale should be
-# used in your application properties. This test uses it only to verify compatibility.
 quarkus.default-locale=mt-MT

integration-tests/locales/some/src/test/java/io/quarkus/locales/it/LocalesIT.java

@@ -93,7 +93,7 @@ public void testDefaultLocalePre24_2() {
                 /*
                  * Prior to GraalVM 24.2, the locale could not be changed at runtime.
                  * "Švýcarsko" is the correct name for Switzerland in Czech language.
-                 * Czech is the default language as per quarkus.native.user-language=cs.
+                 * Czech is the default language as per quarkus.default-locale=cs.
                  */
                 .body(is("Švýcarsko"))
                 .log().all();

integration-tests/locales/some/src/test/resources/application.properties

@@ -1,7 +1,4 @@
 quarkus.locales=de,fr-FR,ja,uk-UA
-# Note that quarkus.native.user-language is deprecated and solely quarkus.default-locale should be
-# used in your application properties. This test uses it only to verify compatibility.
-quarkus.native.user-language=cs
-quarkus.default-locale=en-US
+quarkus.default-locale=cs-US
 quarkus.test.arg-line=-Duser.language=de
 quarkus.test.env.LC_ALL=mt_MT.UTF-8