Drop support for "legacy" (pre 21.1) localization feature

The minimum supported GraalVM version is 21.3
quarkusio · Sep 5, 2022 · c06224e · c06224e
1 parent cbd834e
commit c06224e
Showing 1 changed file with 5 additions and 22 deletions.
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageFeatureStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/NativeImageFeatureStep.java
@@ -98,7 +98,6 @@ public class NativeImageFeatureStep {
     static final String BEFORE_ANALYSIS_ACCESS = Feature.BeforeAnalysisAccess.class.getName();
     static final String DURING_SETUP_ACCESS = Feature.DuringSetupAccess.class.getName();
     static final String DYNAMIC_PROXY_REGISTRY = "com.oracle.svm.core.jdk.proxy.DynamicProxyRegistry";
-    static final String LEGACY_LOCALIZATION_FEATURE = "com.oracle.svm.core.jdk.LocalizationFeature";
     static final String LOCALIZATION_FEATURE = "com.oracle.svm.core.jdk.localization.LocalizationFeature";
     public static final MethodDescriptor WEAK_REFLECTION_REGISTRATION = MethodDescriptor.ofMethod(WeakReflection.class,
             "register", void.class, Feature.BeforeAnalysisAccess.class, Class.class, boolean.class, boolean.class,
@@ -353,27 +352,11 @@ public void write(String s, byte[] bytes) {
                     new JPMSExportBuildItem("org.graalvm.nativeimage.builder", "com.oracle.svm.core.jdk.localization",
                             GraalVM.Version.VERSION_22_1_0));
 
-            AssignableResultHandle registerMethod = overallCatch.createVariable(Method.class);
-            AssignableResultHandle locClass = overallCatch.createVariable(Class.class);
-            TryBlock locTryBlock = overallCatch.tryBlock();
-            ResultHandle legacyLocClass = locTryBlock.loadClassFromTCCL(LEGACY_LOCALIZATION_FEATURE);
-            locTryBlock.assign(locClass, legacyLocClass);
-
-            ResultHandle legacyParams = locTryBlock.marshalAsArray(Class.class, locTryBlock.loadClassFromTCCL(String.class));
-            ResultHandle legacyRegisterMethod = locTryBlock.invokeVirtualMethod(
-                    ofMethod(Class.class, "getDeclaredMethod", Method.class, String.class, Class[].class), legacyLocClass,
-                    locTryBlock.load("addBundleToCache"), legacyParams);
-            locTryBlock.assign(registerMethod, legacyRegisterMethod);
-
-            CatchBlockCreator locCatchBlock = locTryBlock.addCatch(ClassNotFoundException.class);
-            ResultHandle newLocClass = locCatchBlock.loadClassFromTCCL(LOCALIZATION_FEATURE);
-            locCatchBlock.assign(locClass, newLocClass);
-
-            ResultHandle newParams = locCatchBlock.marshalAsArray(Class.class, locCatchBlock.loadClassFromTCCL(String.class));
-            ResultHandle newRegisterMethod = locCatchBlock.invokeVirtualMethod(
-                    ofMethod(Class.class, "getDeclaredMethod", Method.class, String.class, Class[].class), newLocClass,
-                    locCatchBlock.load("prepareBundle"), newParams);
-            locCatchBlock.assign(registerMethod, newRegisterMethod);
+            ResultHandle locClass = overallCatch.loadClassFromTCCL(LOCALIZATION_FEATURE);
+            ResultHandle newParams = overallCatch.marshalAsArray(Class.class, overallCatch.loadClassFromTCCL(String.class));
+            ResultHandle registerMethod = overallCatch.invokeVirtualMethod(
+                    ofMethod(Class.class, "getDeclaredMethod", Method.class, String.class, Class[].class), locClass,
+                    overallCatch.load("prepareBundle"), newParams);
 
             overallCatch.invokeVirtualMethod(ofMethod(AccessibleObject.class, "setAccessible", void.class, boolean.class),
                     registerMethod, overallCatch.load(true));