Prefix jdk-specific JDKVersionSpecificResourceBuilders so that qualif…

…ied naming becomes unnecessary
The-Alchemist · Jul 13, 2021 · 2377378 · 2377378
1 parent 4287187
commit 2377378
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/...11/JDKVersionSpecificResourceBuilder.java → ...nSpecificResourceBuilderJDK11OrLater.java b/...11/JDKVersionSpecificResourceBuilder.java → ...nSpecificResourceBuilderJDK11OrLater.java
@@ -35,8 +35,9 @@
 import org.graalvm.nativeimage.hosted.Feature;
 
 import com.oracle.svm.core.annotate.AutomaticFeature;
+import com.oracle.svm.core.jdk.JDKVersionSpecificResourceBuilder;
 
-public class JDKVersionSpecificResourceBuilder implements com.oracle.svm.core.jdk.JDKVersionSpecificResourceBuilder {
+public class JDKVersionSpecificResourceBuilderJDK11OrLater implements JDKVersionSpecificResourceBuilder {
 
     @Override
     public Object buildResource(String name, URL url, URLConnection urlConnection) {
@@ -81,6 +82,6 @@ public boolean isInConfiguration(IsInConfigurationAccess access) {
 
     @Override
     public void afterRegistration(AfterRegistrationAccess access) {
-        ImageSingletons.add(com.oracle.svm.core.jdk.JDKVersionSpecificResourceBuilder.class, new JDKVersionSpecificResourceBuilder());
+        ImageSingletons.add(JDKVersionSpecificResourceBuilder.class, new JDKVersionSpecificResourceBuilderJDK11OrLater());
     }
 }
diff --git a/...k8/JDKVersionSpecificResourceBuilder.java → ...DKVersionSpecificResourceBuilderJDK8.java b/...k8/JDKVersionSpecificResourceBuilder.java → ...DKVersionSpecificResourceBuilderJDK8.java
@@ -35,8 +35,9 @@
 import org.graalvm.nativeimage.hosted.Feature;
 
 import com.oracle.svm.core.annotate.AutomaticFeature;
+import com.oracle.svm.core.jdk.JDKVersionSpecificResourceBuilder;
 
-public class JDKVersionSpecificResourceBuilder implements com.oracle.svm.core.jdk.JDKVersionSpecificResourceBuilder {
+public class JDKVersionSpecificResourceBuilderJDK8 implements JDKVersionSpecificResourceBuilder {
 
     @Override
     public Object buildResource(String name, URL url, URLConnection urlConnection) {
@@ -79,6 +80,6 @@ public boolean isInConfiguration(IsInConfigurationAccess access) {
 
     @Override
     public void afterRegistration(AfterRegistrationAccess access) {
-        ImageSingletons.add(com.oracle.svm.core.jdk.JDKVersionSpecificResourceBuilder.class, new JDKVersionSpecificResourceBuilder());
+        ImageSingletons.add(JDKVersionSpecificResourceBuilder.class, new JDKVersionSpecificResourceBuilderJDK8());
     }
 }