Skip to content

Commit 44e6877

Browse files
author
Christian Wimmer
committed
[GR-40711] Deprecate and replace AutomaticFeature.
PullRequest: graal/12537
2 parents 6ab8465 + 9b9c7f0 commit 44e6877

File tree

291 files changed

+1671
-2083
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

291 files changed

+1671
-2083
lines changed

‎compiler/src/org.graalvm.compiler.core.match.processor/src/org/graalvm/compiler/core/match/processor/MatchProcessor.java‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import javax.annotation.processing.Filer;
4242
import javax.annotation.processing.RoundEnvironment;
4343
import javax.annotation.processing.SupportedAnnotationTypes;
44-
import javax.lang.model.SourceVersion;
4544
import javax.lang.model.element.AnnotationMirror;
4645
import javax.lang.model.element.Element;
4746
import javax.lang.model.element.ElementKind;
@@ -56,7 +55,6 @@
5655
import javax.lang.model.util.Types;
5756
import javax.tools.Diagnostic.Kind;
5857
import javax.tools.FileObject;
59-
import javax.tools.JavaFileObject;
6058
import javax.tools.StandardLocation;
6159

6260
import org.graalvm.compiler.processor.AbstractProcessor;
@@ -87,11 +85,6 @@ public class MatchProcessor extends AbstractProcessor {
8785
public MatchProcessor() {
8886
}
8987

90-
@Override
91-
public SourceVersion getSupportedSourceVersion() {
92-
return SourceVersion.latest();
93-
}
94-
9588
private final Set<Element> processedMatchRules = new HashSet<>();
9689
private final Set<Element> processedMatchableNodes = new HashSet<>();
9790

@@ -605,22 +598,6 @@ private void createFiles(MatchRuleDescriptor info) {
605598
this.createProviderFile(pkg + "." + matchStatementClassName, "org.graalvm.compiler.core.match.MatchStatementSet", originatingElements);
606599
}
607600

608-
protected PrintWriter createSourceFile(String pkg, String relativeName, Filer filer, Element... originatingElements) {
609-
try {
610-
// Ensure Unix line endings to comply with Graal code style guide checked by Checkstyle
611-
JavaFileObject sourceFile = filer.createSourceFile(pkg + "." + relativeName, originatingElements);
612-
return new PrintWriter(sourceFile.openWriter()) {
613-
614-
@Override
615-
public void println() {
616-
print("\n");
617-
}
618-
};
619-
} catch (IOException e) {
620-
throw new RuntimeException(e);
621-
}
622-
}
623-
624601
/**
625602
* Used to generate the MatchStatement constructor invocation.
626603
*/

‎compiler/src/org.graalvm.compiler.lir.processor/src/org/graalvm/compiler/lir/processor/IntrinsicStubProcessor.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import java.util.stream.Collectors;
3737

3838
import javax.annotation.processing.RoundEnvironment;
39-
import javax.lang.model.SourceVersion;
4039
import javax.lang.model.element.AnnotationMirror;
4140
import javax.lang.model.element.Element;
4241
import javax.lang.model.element.ElementKind;
@@ -74,11 +73,6 @@ enum TargetVM {
7473
private TypeElement generateStubs;
7574
private TypeMirror constantNodeParameter;
7675

77-
@Override
78-
public SourceVersion getSupportedSourceVersion() {
79-
return SourceVersion.latest();
80-
}
81-
8276
@Override
8377
public Set<String> getSupportedAnnotationTypes() {
8478
return Set.of(GENERATE_STUB_CLASS_NAME, GENERATE_STUBS_CLASS_NAME, GENERATED_STUBS_HOLDER_CLASS_NAME);

‎compiler/src/org.graalvm.compiler.lir.processor/src/org/graalvm/compiler/lir/processor/StubPortProcessor.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
import java.util.stream.Collectors;
4141

4242
import javax.annotation.processing.RoundEnvironment;
43-
import javax.lang.model.SourceVersion;
4443
import javax.lang.model.element.AnnotationMirror;
4544
import javax.lang.model.element.Element;
4645
import javax.lang.model.element.TypeElement;
@@ -67,11 +66,6 @@ public class StubPortProcessor extends AbstractProcessor {
6766

6867
static final int SEARCH_RANGE = 100;
6968

70-
@Override
71-
public SourceVersion getSupportedSourceVersion() {
72-
return SourceVersion.latest();
73-
}
74-
7569
@Override
7670
public Set<String> getSupportedAnnotationTypes() {
7771
return Set.of(STUB_PORT_CLASS_NAME, STUB_PORTS_CLASS_NAME);

‎compiler/src/org.graalvm.compiler.nodeinfo.processor/src/org/graalvm/compiler/nodeinfo/processor/GraphNodeProcessor.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,6 @@
5656
public class GraphNodeProcessor extends AbstractProcessor {
5757
private static final String NODE_INFO_CLASS_NAME = "org.graalvm.compiler.nodeinfo.NodeInfo";
5858

59-
@Override
60-
public SourceVersion getSupportedSourceVersion() {
61-
return SourceVersion.latest();
62-
}
63-
6459
/**
6560
* Node class currently being processed.
6661
*/

‎compiler/src/org.graalvm.compiler.options.processor/src/org/graalvm/compiler/options/processor/OptionProcessor.java‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
import javax.lang.model.util.Types;
5555
import javax.tools.Diagnostic.Kind;
5656
import javax.tools.FileObject;
57-
import javax.tools.JavaFileObject;
5857
import javax.tools.StandardLocation;
5958

6059
import org.graalvm.compiler.processor.AbstractProcessor;
@@ -74,11 +73,6 @@ public class OptionProcessor extends AbstractProcessor {
7473
private static final String OPTION_DESCRIPTOR_CLASS_NAME = "org.graalvm.compiler.options.OptionDescriptor";
7574
private static final String OPTION_DESCRIPTORS_CLASS_NAME = "org.graalvm.compiler.options.OptionDescriptors";
7675

77-
@Override
78-
public SourceVersion getSupportedSourceVersion() {
79-
return SourceVersion.latest();
80-
}
81-
8276
private final Set<Element> processed = new HashSet<>();
8377

8478
private TypeMirror optionTypeMirror;
@@ -325,23 +319,6 @@ public static void createOptionsDescriptorsFile(ProcessingEnvironment processing
325319
}
326320
}
327321

328-
public static PrintWriter createSourceFile(String pkg, String relativeName, Filer filer, Element... originatingElements) {
329-
try {
330-
// Ensure Unix line endings to comply with code style guide checked by Checkstyle
331-
String className = pkg + "." + relativeName;
332-
JavaFileObject sourceFile = filer.createSourceFile(className, originatingElements);
333-
return new PrintWriter(sourceFile.openWriter()) {
334-
335-
@Override
336-
public void println() {
337-
print("\n");
338-
}
339-
};
340-
} catch (IOException e) {
341-
throw new RuntimeException(e);
342-
}
343-
}
344-
345322
public static class OptionInfo implements Comparable<OptionInfo> {
346323

347324
public final String name;

‎compiler/src/org.graalvm.compiler.processor/src/org/graalvm/compiler/processor/AbstractProcessor.java‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,24 @@
3636
import java.util.regex.Matcher;
3737
import java.util.regex.Pattern;
3838

39+
import javax.annotation.processing.Filer;
3940
import javax.annotation.processing.FilerException;
4041
import javax.annotation.processing.ProcessingEnvironment;
4142
import javax.annotation.processing.RoundEnvironment;
43+
import javax.lang.model.SourceVersion;
4244
import javax.lang.model.element.AnnotationMirror;
4345
import javax.lang.model.element.AnnotationValue;
4446
import javax.lang.model.element.Element;
47+
import javax.lang.model.element.ElementKind;
4548
import javax.lang.model.element.ExecutableElement;
49+
import javax.lang.model.element.PackageElement;
4650
import javax.lang.model.element.TypeElement;
4751
import javax.lang.model.type.TypeKind;
4852
import javax.lang.model.type.TypeMirror;
4953
import javax.lang.model.util.ElementFilter;
5054
import javax.tools.Diagnostic.Kind;
5155
import javax.tools.FileObject;
56+
import javax.tools.JavaFileObject;
5257
import javax.tools.StandardLocation;
5358

5459
/**
@@ -65,6 +70,11 @@ public ProcessingEnvironment env() {
6570
return processingEnv;
6671
}
6772

73+
@Override
74+
public final SourceVersion getSupportedSourceVersion() {
75+
return SourceVersion.latest();
76+
}
77+
6878
@Override
6979
public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
7080
return doProcess(annotations, roundEnv);
@@ -287,6 +297,30 @@ public static <T> List<T> getAnnotationValueList(AnnotationMirror annotation, St
287297
return result;
288298
}
289299

300+
public static PackageElement getPackage(Element element) {
301+
Element e = element.getEnclosingElement();
302+
while (e != null && e.getKind() != ElementKind.PACKAGE) {
303+
e = e.getEnclosingElement();
304+
}
305+
return (PackageElement) e;
306+
}
307+
308+
public static PrintWriter createSourceFile(String pkg, String relativeName, Filer filer, Element... originatingElements) {
309+
try {
310+
/* Ensure Unix line endings to comply with code style guide checked by Checkstyle. */
311+
String className = pkg + "." + relativeName;
312+
JavaFileObject sourceFile = filer.createSourceFile(className, originatingElements);
313+
return new PrintWriter(sourceFile.openWriter()) {
314+
@Override
315+
public void println() {
316+
print("\n");
317+
}
318+
};
319+
} catch (IOException e) {
320+
throw new RuntimeException(e);
321+
}
322+
}
323+
290324
/**
291325
* Creates a {@code META-INF/providers/<providerClassName>} file whose contents are a single
292326
* line containing {@code serviceClassName}.

‎compiler/src/org.graalvm.compiler.replacements.processor/src/org/graalvm/compiler/replacements/processor/ReplacementsAnnotationProcessor.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import java.util.Set;
3131

3232
import javax.annotation.processing.RoundEnvironment;
33-
import javax.lang.model.SourceVersion;
3433
import javax.lang.model.element.AnnotationMirror;
3534
import javax.lang.model.element.Element;
3635
import javax.lang.model.element.TypeElement;
@@ -45,11 +44,6 @@ public class ReplacementsAnnotationProcessor extends AbstractProcessor {
4544

4645
private List<AnnotationHandler> handlers;
4746

48-
@Override
49-
public SourceVersion getSupportedSourceVersion() {
50-
return SourceVersion.latest();
51-
}
52-
5347
@Override
5448
public boolean doProcess(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
5549
if (!roundEnv.processingOver()) {

‎compiler/src/org.graalvm.compiler.serviceprovider.processor/src/org/graalvm/compiler/serviceprovider/processor/ServiceProviderProcessor.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232

3333
import javax.annotation.processing.RoundEnvironment;
3434
import javax.annotation.processing.SupportedAnnotationTypes;
35-
import javax.lang.model.SourceVersion;
3635
import javax.lang.model.element.AnnotationMirror;
3736
import javax.lang.model.element.Element;
3837
import javax.lang.model.element.ElementKind;
@@ -56,11 +55,6 @@ public class ServiceProviderProcessor extends AbstractProcessor {
5655
private final Set<TypeElement> processed = new HashSet<>();
5756
private final Map<TypeElement, String> serviceProviders = new HashMap<>();
5857

59-
@Override
60-
public SourceVersion getSupportedSourceVersion() {
61-
return SourceVersion.latest();
62-
}
63-
6458
private boolean verifyAnnotation(TypeMirror serviceInterface, TypeElement serviceProvider) {
6559
if (!processingEnv.getTypeUtils().isSubtype(serviceProvider.asType(), serviceInterface)) {
6660
String msg = String.format("Service provider class %s must implement service interface %s", serviceProvider.getSimpleName(), serviceInterface);

‎compiler/src/org.graalvm.libgraal.jni.processor/src/org/graalvm/libgraal/jni/processor/AbstractFromLibGraalProcessor.java‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
*/
2525
package org.graalvm.libgraal.jni.processor;
2626

27-
import java.io.IOException;
2827
import java.io.PrintWriter;
2928
import java.util.ArrayList;
3029
import java.util.Collections;
@@ -37,7 +36,6 @@
3736

3837
import javax.annotation.processing.Filer;
3938
import javax.annotation.processing.RoundEnvironment;
40-
import javax.lang.model.SourceVersion;
4139
import javax.lang.model.element.AnnotationMirror;
4240
import javax.lang.model.element.Element;
4341
import javax.lang.model.element.ElementKind;
@@ -49,7 +47,6 @@
4947
import javax.lang.model.type.DeclaredType;
5048
import javax.lang.model.type.TypeKind;
5149
import javax.lang.model.util.ElementFilter;
52-
import javax.tools.JavaFileObject;
5350

5451
import org.graalvm.compiler.processor.AbstractProcessor;
5552
import org.graalvm.libgraal.jni.annotation.FromLibGraalId;
@@ -76,11 +73,6 @@ protected boolean accept(@SuppressWarnings("unused") ExecutableElement annotated
7673
return true;
7774
}
7875

79-
@Override
80-
public final SourceVersion getSupportedSourceVersion() {
81-
return SourceVersion.latest();
82-
}
83-
8476
private final Set<ExecutableElement> processed = new HashSet<>();
8577

8678
/**
@@ -248,21 +240,6 @@ private void createGenSource(CallsInfo info, String pkg, Name topDeclaringClass,
248240
}
249241
}
250242

251-
static PrintWriter createSourceFile(String pkg, String relativeName, Filer filer, Element... originatingElements) {
252-
try {
253-
// Ensure Unix line endings to comply with code style guide checked by Checkstyle
254-
JavaFileObject sourceFile = filer.createSourceFile(pkg + "." + relativeName, originatingElements);
255-
return new PrintWriter(sourceFile.openWriter()) {
256-
@Override
257-
public void println() {
258-
print("\n");
259-
}
260-
};
261-
} catch (IOException e) {
262-
throw new RuntimeException(e);
263-
}
264-
}
265-
266243
private String getAccessorClassSimpleName() {
267244
Class<?> topLevel = null;
268245
for (Class<?> current = idClass; current != null; current = current.getEnclosingClass()) {

‎compiler/src/org.graalvm.libgraal.jni.processor/src/org/graalvm/libgraal/jni/processor/FromLibGraalEntryPointsResolverProcessor.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,13 @@
2525
package org.graalvm.libgraal.jni.processor;
2626

2727
import static org.graalvm.libgraal.jni.processor.AbstractFromLibGraalProcessor.topDeclaringType;
28-
import static org.graalvm.libgraal.jni.processor.AbstractFromLibGraalProcessor.createSourceFile;
2928

3029
import java.io.PrintWriter;
3130
import java.util.List;
3231
import java.util.Set;
32+
3333
import javax.annotation.processing.RoundEnvironment;
3434
import javax.annotation.processing.SupportedAnnotationTypes;
35-
import javax.lang.model.SourceVersion;
3635
import javax.lang.model.element.AnnotationMirror;
3736
import javax.lang.model.element.Element;
3837
import javax.lang.model.element.ElementKind;
@@ -44,6 +43,7 @@
4443
import javax.lang.model.type.DeclaredType;
4544
import javax.lang.model.type.TypeMirror;
4645
import javax.tools.Diagnostic.Kind;
46+
4747
import org.graalvm.compiler.processor.AbstractProcessor;
4848
import org.graalvm.libgraal.jni.annotation.FromLibGraalEntryPointsResolver;
4949
import org.graalvm.libgraal.jni.annotation.FromLibGraalId;
@@ -55,11 +55,6 @@
5555
@SupportedAnnotationTypes("org.graalvm.libgraal.jni.annotation.FromLibGraalEntryPointsResolver")
5656
public final class FromLibGraalEntryPointsResolverProcessor extends AbstractProcessor {
5757

58-
@Override
59-
public SourceVersion getSupportedSourceVersion() {
60-
return SourceVersion.latest();
61-
}
62-
6358
@Override
6459
public boolean doProcess(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
6560
if (roundEnv.processingOver()) {

0 commit comments

Comments
 (0)