Rename Extracter to Extractor

Author: Christian Wimmer

sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/AnnotationAccess.java

@@ -44,7 +44,7 @@
 import java.lang.reflect.AnnotatedElement;
 import java.util.Arrays;
 
-import org.graalvm.nativeimage.impl.AnnotationExtracter;
+import org.graalvm.nativeimage.impl.AnnotationExtractor;
 
 /**
  * This class provides methods to query annotation information on {@link AnnotatedElement}s while
@@ -79,7 +79,7 @@ public final class AnnotationAccess {
      */
     public static boolean isAnnotationPresent(AnnotatedElement element, Class<? extends Annotation> annotationClass) {
         if (ImageInfo.inImageBuildtimeCode()) {
-            return ImageSingletons.lookup(AnnotationExtracter.class).hasAnnotation(element, annotationClass);
+            return ImageSingletons.lookup(AnnotationExtractor.class).hasAnnotation(element, annotationClass);
         } else {
             return element.isAnnotationPresent(annotationClass);
         }
@@ -93,7 +93,7 @@ public static boolean isAnnotationPresent(AnnotatedElement element, Class<? exte
     @SuppressWarnings("unchecked")
     public static <T extends Annotation> T getAnnotation(AnnotatedElement element, Class<T> annotationType) {
         if (ImageInfo.inImageBuildtimeCode()) {
-            return ImageSingletons.lookup(AnnotationExtracter.class).extractAnnotation(element, annotationType, false);
+            return ImageSingletons.lookup(AnnotationExtractor.class).extractAnnotation(element, annotationType, false);
         } else {
             return element.getAnnotation(annotationType);
         }
@@ -107,7 +107,7 @@ public static <T extends Annotation> T getAnnotation(AnnotatedElement element, C
     @SuppressWarnings("unchecked")
     public static Class<? extends Annotation>[] getAnnotationTypes(AnnotatedElement element) {
         if (ImageInfo.inImageBuildtimeCode()) {
-            return ImageSingletons.lookup(AnnotationExtracter.class).getAnnotationTypes(element);
+            return ImageSingletons.lookup(AnnotationExtractor.class).getAnnotationTypes(element);
         } else {
             return Arrays.stream(element.getAnnotations()).map(Annotation::annotationType).toArray(Class[]::new);
         }

sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/AnnotationExtracter.java renamed to sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/AnnotationExtractor.java

@@ -47,7 +47,7 @@
 import org.graalvm.nativeimage.Platforms;
 
 @Platforms(Platform.HOSTED_ONLY.class)
-public interface AnnotationExtracter {
+public interface AnnotationExtractor {
     boolean hasAnnotation(AnnotatedElement element, Class<? extends Annotation> annotationType);
 
     <T extends Annotation> T extractAnnotation(AnnotatedElement element, Class<T> annotationType, boolean declaredOnly);

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ImageClassLoader.java

@@ -142,7 +142,7 @@ private void findSystemElements(Class<?> systemClass) {
 
     private boolean isInPlatform(AnnotatedElement element) {
         try {
-            Platforms platformAnnotation = classLoaderSupport.annotationExtracter.extractAnnotation(element, Platforms.class, false);
+            Platforms platformAnnotation = classLoaderSupport.annotationExtractor.extractAnnotation(element, Platforms.class, false);
             return NativeImageGenerator.includedIn(platform, platformAnnotation);
         } catch (Throwable t) {
             handleClassLoadingError(t);
@@ -175,7 +175,7 @@ void handleClass(Class<?> clazz) {
         do {
             Platforms platformsAnnotation;
             try {
-                platformsAnnotation = classLoaderSupport.annotationExtracter.extractAnnotation(cur, Platforms.class, false);
+                platformsAnnotation = classLoaderSupport.annotationExtractor.extractAnnotation(cur, Platforms.class, false);
             } catch (Throwable t) {
                 handleClassLoadingError(t);
                 return;
@@ -373,7 +373,7 @@ public List<Class<?>> findAnnotatedClasses(Class<? extends Annotation> annotatio
 
     private void addAnnotatedClasses(EconomicSet<Class<?>> classes, Class<? extends Annotation> annotationClass, ArrayList<Class<?>> result) {
         for (Class<?> systemClass : classes) {
-            if (classLoaderSupport.annotationExtracter.hasAnnotation(systemClass, annotationClass)) {
+            if (classLoaderSupport.annotationExtractor.hasAnnotation(systemClass, annotationClass)) {
                 result.add(systemClass);
             }
         }
@@ -382,7 +382,7 @@ private void addAnnotatedClasses(EconomicSet<Class<?>> classes, Class<? extends
     public List<Method> findAnnotatedMethods(Class<? extends Annotation> annotationClass) {
         ArrayList<Method> result = new ArrayList<>();
         for (Method method : systemMethods) {
-            if (classLoaderSupport.annotationExtracter.hasAnnotation(method, annotationClass)) {
+            if (classLoaderSupport.annotationExtractor.hasAnnotation(method, annotationClass)) {
                 result.add(method);
             }
         }
@@ -394,7 +394,7 @@ public List<Method> findAnnotatedMethods(Class<? extends Annotation>[] annotatio
         for (Method method : systemMethods) {
             boolean match = true;
             for (Class<? extends Annotation> annotationClass : annotationClasses) {
-                if (!classLoaderSupport.annotationExtracter.hasAnnotation(method, annotationClass)) {
+                if (!classLoaderSupport.annotationExtractor.hasAnnotation(method, annotationClass)) {
                     match = false;
                     break;
                 }
@@ -409,7 +409,7 @@ public List<Method> findAnnotatedMethods(Class<? extends Annotation>[] annotatio
     public List<Field> findAnnotatedFields(Class<? extends Annotation> annotationClass) {
         ArrayList<Field> result = new ArrayList<>();
         for (Field field : systemFields) {
-            if (classLoaderSupport.annotationExtracter.hasAnnotation(field, annotationClass)) {
+            if (classLoaderSupport.annotationExtractor.hasAnnotation(field, annotationClass)) {
                 result.add(field);
             }
         }
@@ -431,13 +431,13 @@ public List<Class<? extends Annotation>> allAnnotations() {
     public <T extends Annotation> List<T> findAnnotations(Class<T> annotationClass) {
         List<T> result = new ArrayList<>();
         for (Class<?> clazz : findAnnotatedClasses(annotationClass, false)) {
-            result.add(classLoaderSupport.annotationExtracter.extractAnnotation(clazz, annotationClass, false));
+            result.add(classLoaderSupport.annotationExtractor.extractAnnotation(clazz, annotationClass, false));
         }
         for (Method method : findAnnotatedMethods(annotationClass)) {
-            result.add(classLoaderSupport.annotationExtracter.extractAnnotation(method, annotationClass, false));
+            result.add(classLoaderSupport.annotationExtractor.extractAnnotation(method, annotationClass, false));
         }
         for (Field field : findAnnotatedFields(annotationClass)) {
-            result.add(classLoaderSupport.annotationExtracter.extractAnnotation(field, annotationClass, false));
+            result.add(classLoaderSupport.annotationExtractor.extractAnnotation(field, annotationClass, false));
         }
         return result;
     }

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoaderSupport.java

@@ -76,7 +76,7 @@
 import org.graalvm.collections.Pair;
 import org.graalvm.compiler.options.OptionKey;
 import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.nativeimage.impl.AnnotationExtracter;
+import org.graalvm.nativeimage.impl.AnnotationExtractor;
 
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.option.LocatableMultiOptionValue;
@@ -86,7 +86,7 @@
 import com.oracle.svm.core.util.InterruptImageBuilding;
 import com.oracle.svm.core.util.UserError;
 import com.oracle.svm.core.util.VMError;
-import com.oracle.svm.hosted.annotation.SubstrateAnnotationExtracter;
+import com.oracle.svm.hosted.annotation.SubstrateAnnotationExtractor;
 import com.oracle.svm.hosted.option.HostedOptionParser;
 import com.oracle.svm.util.ModuleSupport;
 import com.oracle.svm.util.ReflectionUtil;
@@ -111,7 +111,7 @@ public class NativeImageClassLoaderSupport {
     public final ModuleLayer moduleLayerForImageBuild;
     public final ModuleFinder modulepathModuleFinder;
 
-    public final AnnotationExtracter annotationExtracter;
+    public final AnnotationExtractor annotationExtractor;
 
     static final class ClassPathClassLoader extends URLClassLoader {
         ClassPathClassLoader(URL[] urls, ClassLoader parent) {
@@ -163,7 +163,7 @@ protected NativeImageClassLoaderSupport(ClassLoader defaultSystemClassLoader, St
 
         modulepathModuleFinder = ModuleFinder.of(modulepath().toArray(Path[]::new));
 
-        annotationExtracter = new SubstrateAnnotationExtracter();
+        annotationExtractor = new SubstrateAnnotationExtractor();
     }
 
     List<Path> classpath() {

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java

@@ -125,7 +125,7 @@
 import org.graalvm.nativeimage.c.struct.RawStructure;
 import org.graalvm.nativeimage.hosted.Feature;
 import org.graalvm.nativeimage.hosted.Feature.OnAnalysisExitAccess;
-import org.graalvm.nativeimage.impl.AnnotationExtracter;
+import org.graalvm.nativeimage.impl.AnnotationExtractor;
 import org.graalvm.nativeimage.impl.CConstantValueSupport;
 import org.graalvm.nativeimage.impl.RuntimeClassInitializationSupport;
 import org.graalvm.nativeimage.impl.SizeOfSupport;
@@ -524,7 +524,7 @@ public void run(Map<Method, CEntryPointData> entryPoints,
             ImageSingletons.add(ProgressReporter.class, reporter);
             ImageSingletons.add(TimerCollection.class, timerCollection);
             ImageSingletons.add(ImageBuildStatistics.TimerCollectionPrinter.class, timerCollection);
-            ImageSingletons.add(AnnotationExtracter.class, loader.classLoaderSupport.annotationExtracter);
+            ImageSingletons.add(AnnotationExtractor.class, loader.classLoaderSupport.annotationExtractor);
             ImageSingletons.add(BuildArtifacts.class, (type, artifact) -> buildArtifacts.computeIfAbsent(type, t -> new ArrayList<>()).add(artifact));
             ImageSingletons.add(HostedOptionValues.class, new HostedOptionValues(optionProvider.getHostedValues()));
             ImageSingletons.add(RuntimeOptionValues.class, new RuntimeOptionValues(optionProvider.getRuntimeValues(), allOptionNames));

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/SubstrateAnnotationExtracter.java renamed to substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/SubstrateAnnotationExtractor.java

@@ -42,7 +42,7 @@
 
 import org.graalvm.compiler.debug.GraalError;
 import org.graalvm.nativeimage.AnnotationAccess;
-import org.graalvm.nativeimage.impl.AnnotationExtracter;
+import org.graalvm.nativeimage.impl.AnnotationExtractor;
 
 import com.oracle.svm.hosted.annotation.AnnotationMetadata.AnnotationExtractionError;
 import com.oracle.svm.util.AnnotationWrapper;
@@ -63,20 +63,20 @@
  * through the JDK's {@link AnnotationParser} initializes the class of every annotation on the
  * queried element.
  *
- * When queried, the extracter looks for the root of the provided element, which can be a
+ * When queried, the extractor looks for the root of the provided element, which can be a
  * {@link Field}, {@link Method}, {@link Constructor} or {@link Class} object, as well as a record
  * component on JDK 17. It then looks into the byte arrays representing annotations in the root
  * object and outputs wrapper classes containing all the information necessary to reconstruct the
  * annotation on demand in an {@link AnnotationValue} or {@link TypeAnnotationValue} object or any
  * subclass of {@link AnnotationMemberValue}. The actual annotation can then be created using the
  * {@link AnnotationMemberValue#get(Class)} method.
  *
- * The {@link SubstrateAnnotationExtracter} is tightly coupled with {@link AnnotationAccess}, which
+ * The {@link SubstrateAnnotationExtractor} is tightly coupled with {@link AnnotationAccess}, which
  * provides implementations of {@link AnnotatedElement#isAnnotationPresent(Class)} and
  * {@link AnnotatedElement#getAnnotation(Class)}. {@link AnnotatedElement#getAnnotations()} should
  * in principle not be used during Native Image generation.
  */
-public class SubstrateAnnotationExtracter implements AnnotationExtracter {
+public class SubstrateAnnotationExtractor implements AnnotationExtractor {
     private final Map<Class<?>, AnnotationValue[]> annotationCache = new ConcurrentHashMap<>();
     private final Map<AnnotatedElement, AnnotationValue[]> declaredAnnotationCache = new ConcurrentHashMap<>();
     private final Map<Executable, AnnotationValue[][]> parameterAnnotationCache = new ConcurrentHashMap<>();

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionDataBuilder.java

@@ -77,7 +77,7 @@
 import com.oracle.svm.hosted.annotation.AnnotationMemberValue;
 import com.oracle.svm.hosted.annotation.AnnotationSubstitutionType;
 import com.oracle.svm.hosted.annotation.AnnotationValue;
-import com.oracle.svm.hosted.annotation.SubstrateAnnotationExtracter;
+import com.oracle.svm.hosted.annotation.SubstrateAnnotationExtractor;
 import com.oracle.svm.hosted.annotation.TypeAnnotationValue;
 import com.oracle.svm.hosted.substitute.SubstitutionReflectivityFilter;
 import com.oracle.svm.util.ReflectionUtil;
@@ -121,10 +121,10 @@ public class ReflectionDataBuilder extends ConditionalConfigurationRegistry impl
     private final Map<AnalysisMethod, AnnotationValue[][]> filteredParameterAnnotations = new ConcurrentHashMap<>();
     private final Map<AnnotatedElement, TypeAnnotationValue[]> filteredTypeAnnotations = new ConcurrentHashMap<>();
 
-    private final SubstrateAnnotationExtracter annotationExtracter;
+    private final SubstrateAnnotationExtractor annotationExtractor;
 
-    ReflectionDataBuilder(SubstrateAnnotationExtracter annotationExtracter) {
-        this.annotationExtracter = annotationExtracter;
+    ReflectionDataBuilder(SubstrateAnnotationExtractor annotationExtractor) {
+        this.annotationExtractor = annotationExtractor;
     }
 
     @Override
@@ -596,7 +596,7 @@ private void registerTypesForAnnotations(DuringAnalysisAccessImpl access, Annota
         if (annotatedElement != null) {
             filteredAnnotations.computeIfAbsent(annotatedElement, element -> {
                 List<AnnotationValue> includedAnnotations = new ArrayList<>();
-                for (AnnotationValue annotation : annotationExtracter.getDeclaredAnnotationData(element)) {
+                for (AnnotationValue annotation : annotationExtractor.getDeclaredAnnotationData(element)) {
                     if (includeAnnotation(access, annotation)) {
                         includedAnnotations.add(annotation);
                         registerTypes(access, annotation.getTypes());
@@ -610,7 +610,7 @@ private void registerTypesForAnnotations(DuringAnalysisAccessImpl access, Annota
     private void registerTypesForParameterAnnotations(DuringAnalysisAccessImpl access, AnalysisMethod executable) {
         if (executable != null) {
             filteredParameterAnnotations.computeIfAbsent(executable, element -> {
-                AnnotationValue[][] parameterAnnotations = annotationExtracter.getParameterAnnotationData(element);
+                AnnotationValue[][] parameterAnnotations = annotationExtractor.getParameterAnnotationData(element);
                 AnnotationValue[][] includedParameterAnnotations = new AnnotationValue[parameterAnnotations.length][];
                 for (int i = 0; i < includedParameterAnnotations.length; ++i) {
                     AnnotationValue[] annotations = parameterAnnotations[i];
@@ -632,7 +632,7 @@ private void registerTypesForTypeAnnotations(DuringAnalysisAccessImpl access, An
         if (annotatedElement != null) {
             filteredTypeAnnotations.computeIfAbsent(annotatedElement, element -> {
                 List<TypeAnnotationValue> includedTypeAnnotations = new ArrayList<>();
-                for (TypeAnnotationValue typeAnnotation : annotationExtracter.getTypeAnnotationData(element)) {
+                for (TypeAnnotationValue typeAnnotation : annotationExtractor.getTypeAnnotationData(element)) {
                     if (includeAnnotation(access, typeAnnotation.getAnnotationData())) {
                         includedTypeAnnotations.add(typeAnnotation);
                         registerTypes(access, typeAnnotation.getAnnotationData().getTypes());
@@ -644,7 +644,7 @@ private void registerTypesForTypeAnnotations(DuringAnalysisAccessImpl access, An
     }
 
     private void registerTypesForAnnotationDefault(DuringAnalysisAccessImpl access, AnalysisMethod method) {
-        AnnotationMemberValue annotationDefault = annotationExtracter.getAnnotationDefaultData(method);
+        AnnotationMemberValue annotationDefault = annotationExtractor.getAnnotationDefaultData(method);
         if (annotationDefault != null) {
             registerTypes(access, annotationDefault.getTypes());
         }
@@ -902,7 +902,7 @@ public TypeAnnotationValue[] getTypeAnnotationData(AnnotatedElement element) {
     }
 
     public AnnotationMemberValue getAnnotationDefaultData(AnnotatedElement element) {
-        return annotationExtracter.getAnnotationDefaultData(element);
+        return annotationExtractor.getAnnotationDefaultData(element);
     }
 
     @Override

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionFeature.java

@@ -43,7 +43,7 @@
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.c.function.CFunctionPointer;
 import org.graalvm.nativeimage.hosted.RuntimeReflection;
-import org.graalvm.nativeimage.impl.AnnotationExtracter;
+import org.graalvm.nativeimage.impl.AnnotationExtractor;
 import org.graalvm.nativeimage.impl.RuntimeReflectionSupport;
 
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
@@ -74,7 +74,7 @@
 import com.oracle.svm.hosted.FeatureImpl.DuringSetupAccessImpl;
 import com.oracle.svm.hosted.ImageClassLoader;
 import com.oracle.svm.hosted.analysis.Inflation;
-import com.oracle.svm.hosted.annotation.SubstrateAnnotationExtracter;
+import com.oracle.svm.hosted.annotation.SubstrateAnnotationExtractor;
 import com.oracle.svm.hosted.code.FactoryMethodSupport;
 import com.oracle.svm.hosted.config.ConfigurationParserUtils;
 import com.oracle.svm.hosted.meta.HostedField;
@@ -249,7 +249,7 @@ public void afterRegistration(AfterRegistrationAccess access) {
 
         ImageSingletons.add(ReflectionSubstitutionSupport.class, this);
 
-        reflectionData = new ReflectionDataBuilder((SubstrateAnnotationExtracter) ImageSingletons.lookup(AnnotationExtracter.class));
+        reflectionData = new ReflectionDataBuilder((SubstrateAnnotationExtractor) ImageSingletons.lookup(AnnotationExtractor.class));
         ImageSingletons.add(RuntimeReflectionSupport.class, reflectionData);
         ImageSingletons.add(ReflectionHostedSupport.class, reflectionData);
     }

substratevm/src/com.oracle.svm.util/src/com/oracle/svm/util/AnnotationWrapper.java

@@ -34,7 +34,7 @@
 import org.graalvm.nativeimage.AnnotationAccess;
 import org.graalvm.nativeimage.ImageInfo;
 import org.graalvm.nativeimage.ImageSingletons;
-import org.graalvm.nativeimage.impl.AnnotationExtracter;
+import org.graalvm.nativeimage.impl.AnnotationExtractor;
 
 // Checkstyle: allow direct annotation access
 
@@ -171,7 +171,7 @@ private static <T extends Annotation> T getAnnotation(AnnotationWrapper element,
 
     private static <T extends Annotation> T getRootAnnotation(AnnotatedElement annotationRoot, Class<T> annotationClass, boolean declaredOnly) {
         if (ImageInfo.inImageBuildtimeCode()) {
-            return ImageSingletons.lookup(AnnotationExtracter.class).extractAnnotation(annotationRoot, annotationClass, declaredOnly);
+            return ImageSingletons.lookup(AnnotationExtractor.class).extractAnnotation(annotationRoot, annotationClass, declaredOnly);
         } else {
             if (declaredOnly) {
                 return annotationRoot.getDeclaredAnnotation(annotationClass);