Skip to content

Commit e64ea05

Browse files
committed
Move constants from feature to phase
1 parent 5f5a1ea commit e64ea05

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,6 @@
5656
*/
5757
@AutomaticallyRegisteredFeature
5858
public final class AnalyzeMethodsRequiringMetadataUsageFeature implements InternalFeature {
59-
public static final String METHODTYPE_REFLECTION = "reflection";
60-
public static final String METHODTYPE_RESOURCE = "resource";
61-
public static final String METHODTYPE_SERIALIZATION = "serialization";
62-
public static final String METHODTYPE_PROXY = "proxy";
6359
private final Set<String> jarPaths;
6460
private final Map<String, Map<String, Map<String, List<String>>>> callsByJar;
6561
private final Set<FoldEntry> foldEntries = ConcurrentHashMap.newKeySet();
@@ -101,8 +97,8 @@ public void dumpReportForJar(String jarPath) {
10197
var builder = writer.objectBuilder()) {
10298
for (Map.Entry<String, Map<String, List<String>>> callEntry : calls.entrySet()) {
10399
try (JsonBuilder.ObjectBuilder methodsByTypeBuilder = builder.append(callEntry.getKey()).object()) {
104-
Map<String, List<String>> nestedMap = callEntry.getValue();
105-
for (Map.Entry<String, List<String>> entry : nestedMap.entrySet()) {
100+
Map<String, List<String>> methodsByType = callEntry.getValue();
101+
for (Map.Entry<String, List<String>> entry : methodsByType.entrySet()) {
106102
try (JsonBuilder.ArrayBuilder array = methodsByTypeBuilder.append(entry.getKey()).array()) {
107103
for (String call : entry.getValue()) {
108104
array.append(call);

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/phases/AnalyzeMethodsRequiringMetadataUsagePhase.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,6 @@
6161
import java.util.Set;
6262
import java.util.random.RandomGeneratorFactory;
6363

64-
import static com.oracle.svm.hosted.AnalyzeMethodsRequiringMetadataUsageFeature.METHODTYPE_PROXY;
65-
import static com.oracle.svm.hosted.AnalyzeMethodsRequiringMetadataUsageFeature.METHODTYPE_REFLECTION;
66-
import static com.oracle.svm.hosted.AnalyzeMethodsRequiringMetadataUsageFeature.METHODTYPE_RESOURCE;
67-
import static com.oracle.svm.hosted.AnalyzeMethodsRequiringMetadataUsageFeature.METHODTYPE_SERIALIZATION;
68-
6964
/**
7065
* This phase detects usages of any calls that might require metadata in reached parts of the
7166
* project, given the JAR files in which to search, and outputs and serializes them to the
@@ -76,6 +71,11 @@
7671
*/
7772

7873
public class AnalyzeMethodsRequiringMetadataUsagePhase extends BasePhase<CoreProviders> {
74+
public static final String METHODTYPE_REFLECTION = "reflection";
75+
public static final String METHODTYPE_RESOURCE = "resource";
76+
public static final String METHODTYPE_SERIALIZATION = "serialization";
77+
public static final String METHODTYPE_PROXY = "proxy";
78+
7979
private static final Map<String, Set<String>> reflectMethodNames = new HashMap<>();
8080
private static final Map<String, Set<String>> resourceMethodNames = new HashMap<>();
8181
private static final Map<String, Set<String>> serializationMethodNames = new HashMap<>();

0 commit comments

Comments
 (0)