Skip to content

Commit dcb65b1

Browse files
kimetakimeta
committed
Renamed UnresolvedConfigurationCondition to UnresolvedAccessCondition.
1 parent 70c9416 commit dcb65b1

File tree

46 files changed

+277
-282
lines changed

Some content is hidden

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

46 files changed

+277
-282
lines changed

‎substratevm/src/com.oracle.svm.configure.test/src/com/oracle/svm/configure/test/config/OmitPreviousConfigTests.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
import com.oracle.svm.configure.ConfigurationTypeDescriptor;
4242
import com.oracle.svm.configure.NamedConfigurationTypeDescriptor;
43-
import com.oracle.svm.configure.UnresolvedConfigurationCondition;
43+
import com.oracle.svm.configure.UnresolvedAccessCondition;
4444
import com.oracle.svm.configure.config.ConfigurationFileCollection;
4545
import com.oracle.svm.configure.config.ConfigurationMemberInfo;
4646
import com.oracle.svm.configure.config.ConfigurationMemberInfo.ConfigurationMemberAccessibility;
@@ -145,8 +145,8 @@ private static void doTestTypeConfig(TypeConfiguration typeConfig) {
145145
}
146146

147147
private static void doTestExpectedMissingTypes(TypeConfiguration typeConfig) {
148-
Assert.assertNull(typeConfig.get(UnresolvedConfigurationCondition.alwaysTrue(), new NamedConfigurationTypeDescriptor("FlagTestA")));
149-
Assert.assertNull(typeConfig.get(UnresolvedConfigurationCondition.alwaysTrue(), new NamedConfigurationTypeDescriptor("FlagTestB")));
148+
Assert.assertNull(typeConfig.get(UnresolvedAccessCondition.unconditional(), new NamedConfigurationTypeDescriptor("FlagTestA")));
149+
Assert.assertNull(typeConfig.get(UnresolvedAccessCondition.unconditional(), new NamedConfigurationTypeDescriptor("FlagTestB")));
150150
}
151151

152152
private static void doTestTypeFlags(TypeConfiguration typeConfig) {
@@ -187,7 +187,7 @@ private static void doTestMethods(TypeConfiguration typeConfig) {
187187
}
188188

189189
private static void doTestProxyConfig(ProxyConfiguration proxyConfig) {
190-
UnresolvedConfigurationCondition condition = UnresolvedConfigurationCondition.alwaysTrue();
190+
UnresolvedAccessCondition condition = UnresolvedAccessCondition.unconditional();
191191
Assert.assertFalse(proxyConfig.contains(condition, "testProxySeenA", "testProxySeenB", "testProxySeenC"));
192192
Assert.assertTrue(proxyConfig.contains(condition, "testProxyUnseen"));
193193
}
@@ -196,7 +196,7 @@ private static void doTestResourceConfig(ResourceConfiguration resourceConfig) {
196196
Assert.assertFalse(resourceConfig.anyResourceMatches("seenResource.txt"));
197197
Assert.assertTrue(resourceConfig.anyResourceMatches("unseenResource.txt"));
198198

199-
UnresolvedConfigurationCondition condition = UnresolvedConfigurationCondition.alwaysTrue();
199+
UnresolvedAccessCondition condition = UnresolvedAccessCondition.unconditional();
200200
Assert.assertFalse(resourceConfig.anyBundleMatches(condition, "seenBundle"));
201201
Assert.assertTrue(resourceConfig.anyBundleMatches(condition, "unseenBundle"));
202202
}
@@ -208,13 +208,13 @@ private static void doTestResourceConfig(ResourceConfiguration resourceConfig) {
208208
*/
209209
private static void doTestSerializationConfig(ConfigurationSet config) {
210210
SerializationConfiguration serializationConfig = config.getSerializationConfiguration();
211-
UnresolvedConfigurationCondition condition = UnresolvedConfigurationCondition.alwaysTrue();
211+
UnresolvedAccessCondition condition = UnresolvedAccessCondition.unconditional();
212212
Assert.assertFalse(serializationConfig.contains(condition, "seenType"));
213213
Assert.assertTrue(serializationConfig.contains(condition, "unseenType"));
214214
}
215215

216216
private static ConfigurationType getConfigTypeOrFail(TypeConfiguration typeConfig, String typeName) {
217-
ConfigurationType type = typeConfig.get(UnresolvedConfigurationCondition.alwaysTrue(), new NamedConfigurationTypeDescriptor(typeName));
217+
ConfigurationType type = typeConfig.get(UnresolvedAccessCondition.unconditional(), new NamedConfigurationTypeDescriptor(typeName));
218218
Assert.assertNotNull(type);
219219
return type;
220220
}
@@ -273,11 +273,11 @@ Map<ConfigurationMethod, ConfigurationMemberDeclaration> getMethodsMap(Configura
273273
}
274274

275275
void populateConfig() {
276-
ConfigurationType oldType = new ConfigurationType(UnresolvedConfigurationCondition.alwaysTrue(), getTypeName(), true);
276+
ConfigurationType oldType = new ConfigurationType(UnresolvedAccessCondition.unconditional(), getTypeName(), true);
277277
setFlags(oldType);
278278
previousConfig.add(oldType);
279279

280-
ConfigurationType newType = new ConfigurationType(UnresolvedConfigurationCondition.alwaysTrue(), getTypeName(), true);
280+
ConfigurationType newType = new ConfigurationType(UnresolvedAccessCondition.unconditional(), getTypeName(), true);
281281
for (Map.Entry<ConfigurationMethod, ConfigurationMemberDeclaration> methodEntry : methodsThatMustExist.entrySet()) {
282282
newType.addMethod(methodEntry.getKey().getName(), methodEntry.getKey().getInternalSignature(), methodEntry.getValue());
283283
}
@@ -310,7 +310,7 @@ void doTest() {
310310
TypeConfiguration currentConfigWithoutPrevious = currentConfig.copyAndSubtract(previousConfig);
311311

312312
ConfigurationTypeDescriptor name = getTypeName();
313-
ConfigurationType configurationType = currentConfigWithoutPrevious.get(UnresolvedConfigurationCondition.alwaysTrue(), name);
313+
ConfigurationType configurationType = currentConfigWithoutPrevious.get(UnresolvedAccessCondition.unconditional(), name);
314314
if (methodsThatMustExist.size() == 0) {
315315
Assert.assertNull("Generated configuration type " + name + " exists. Expected it to be cleared as it is empty.", configurationType);
316316
} else {

‎substratevm/src/com.oracle.svm.configure.test/src/com/oracle/svm/configure/test/config/ResourceConfigurationTest.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
import com.oracle.svm.configure.ConfigurationParserOption;
4242
import com.oracle.svm.configure.ResourceConfigurationParser;
4343
import com.oracle.svm.configure.ResourcesRegistry;
44-
import com.oracle.svm.configure.UnresolvedConfigurationCondition;
44+
import com.oracle.svm.configure.UnresolvedAccessCondition;
4545
import com.oracle.svm.configure.config.ResourceConfiguration;
46-
import com.oracle.svm.configure.config.conditional.ConfigurationConditionResolver;
46+
import com.oracle.svm.configure.config.conditional.AccessConditionResolver;
4747

4848
import jdk.graal.compiler.util.json.JsonWriter;
4949

@@ -52,7 +52,7 @@ public class ResourceConfigurationTest {
5252
@Test
5353
public void anyResourceMatches() {
5454
ResourceConfiguration rc = new ResourceConfiguration();
55-
UnresolvedConfigurationCondition defaultCond = UnresolvedConfigurationCondition.alwaysTrue();
55+
UnresolvedAccessCondition defaultCond = UnresolvedAccessCondition.unconditional();
5656
rc.addResourcePattern(defaultCond, ".*/Resource.*txt$");
5757

5858
Assert.assertTrue(rc.anyResourceMatches("com/my/app/Resource0.txt"));
@@ -71,7 +71,7 @@ public void anyResourceMatches() {
7171
@Test
7272
public void printJson() {
7373
ResourceConfiguration rc = new ResourceConfiguration();
74-
UnresolvedConfigurationCondition defaultCond = UnresolvedConfigurationCondition.alwaysTrue();
74+
UnresolvedAccessCondition defaultCond = UnresolvedAccessCondition.unconditional();
7575
rc.addResourcePattern(defaultCond, ".*/Resource.*txt$");
7676
rc.ignoreResourcePattern(defaultCond, ".*/Resource2.txt$");
7777
PipedWriter pw = new PipedWriter();
@@ -91,15 +91,15 @@ public void printJson() {
9191
List<String> addedResources = new LinkedList<>();
9292
List<String> ignoredResources = new LinkedList<>();
9393

94-
ResourcesRegistry<UnresolvedConfigurationCondition> registry = new ResourcesRegistry<>() {
94+
ResourcesRegistry<UnresolvedAccessCondition> registry = new ResourcesRegistry<>() {
9595

9696
@Override
97-
public void addResources(UnresolvedConfigurationCondition condition, String pattern, Object origin) {
97+
public void addResources(UnresolvedAccessCondition condition, String pattern, Object origin) {
9898
addedResources.add(pattern);
9999
}
100100

101101
@Override
102-
public void addGlob(UnresolvedConfigurationCondition condition, String module, String glob, Object origin) {
102+
public void addGlob(UnresolvedAccessCondition condition, String module, String glob, Object origin) {
103103
throw new AssertionError("Unused function.");
104104
}
105105

@@ -113,16 +113,16 @@ public void injectResource(Module module, String resourcePath, byte[] resourceCo
113113
}
114114

115115
@Override
116-
public void ignoreResources(UnresolvedConfigurationCondition condition, String pattern, Object origin) {
116+
public void ignoreResources(UnresolvedAccessCondition condition, String pattern, Object origin) {
117117
ignoredResources.add(pattern);
118118
}
119119

120120
@Override
121-
public void addResourceBundles(UnresolvedConfigurationCondition condition, String name) {
121+
public void addResourceBundles(UnresolvedAccessCondition condition, String name) {
122122
}
123123

124124
@Override
125-
public void addResourceBundles(UnresolvedConfigurationCondition condition, String basename, Collection<Locale> locales) {
125+
public void addResourceBundles(UnresolvedAccessCondition condition, String basename, Collection<Locale> locales) {
126126

127127
}
128128

@@ -132,12 +132,12 @@ public void addCondition(AccessCondition configurationCondition, Module module,
132132
}
133133

134134
@Override
135-
public void addClassBasedResourceBundle(UnresolvedConfigurationCondition condition, String basename, String className) {
135+
public void addClassBasedResourceBundle(UnresolvedAccessCondition condition, String basename, String className) {
136136

137137
}
138138
};
139139

140-
ResourceConfigurationParser<UnresolvedConfigurationCondition> rcp = ResourceConfigurationParser.create(false, ConfigurationConditionResolver.identityResolver(), registry,
140+
ResourceConfigurationParser<UnresolvedAccessCondition> rcp = ResourceConfigurationParser.create(false, AccessConditionResolver.identityResolver(), registry,
141141
EnumSet.of(ConfigurationParserOption.STRICT_CONFIGURATION));
142142
writerThread.start();
143143
rcp.parseAndRegister(pr);

‎substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/ConditionalConfigurationParser.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
*/
2525
package com.oracle.svm.configure;
2626

27-
import static com.oracle.svm.configure.UnresolvedConfigurationCondition.TYPE_REACHABLE_KEY;
28-
import static com.oracle.svm.configure.UnresolvedConfigurationCondition.TYPE_REACHED_KEY;
27+
import static com.oracle.svm.configure.UnresolvedAccessCondition.TYPE_REACHABLE_KEY;
28+
import static com.oracle.svm.configure.UnresolvedAccessCondition.TYPE_REACHED_KEY;
2929

3030
import java.util.EnumSet;
3131

@@ -45,7 +45,7 @@ protected EnumSet<ConfigurationParserOption> supportedOptions() {
4545
return base;
4646
}
4747

48-
protected UnresolvedConfigurationCondition parseCondition(EconomicMap<String, Object> data, boolean runtimeCondition) {
48+
protected UnresolvedAccessCondition parseCondition(EconomicMap<String, Object> data, boolean runtimeCondition) {
4949
Object conditionData = data.get(CONDITIONAL_KEY);
5050
if (conditionData != null) {
5151
EconomicMap<String, Object> conditionObject = asMap(conditionData, "Attribute '" + CONDITIONAL_KEY + "' must be an object");
@@ -61,7 +61,7 @@ protected UnresolvedConfigurationCondition parseCondition(EconomicMap<String, Ob
6161
var condition = parseTypeContents(object);
6262
if (condition.isPresent()) {
6363
NamedConfigurationTypeDescriptor namedDescriptor = checkConditionType(condition.get());
64-
return UnresolvedConfigurationCondition.create(namedDescriptor);
64+
return UnresolvedAccessCondition.create(namedDescriptor);
6565
}
6666
} else if (conditionObject.containsKey(TYPE_REACHABLE_KEY)) {
6767
if (runtimeCondition && !checkOption(ConfigurationParserOption.TREAT_ALL_TYPE_REACHABLE_CONDITIONS_AS_TYPE_REACHED)) {
@@ -71,11 +71,11 @@ protected UnresolvedConfigurationCondition parseCondition(EconomicMap<String, Ob
7171
var condition = parseTypeContents(object);
7272
if (condition.isPresent()) {
7373
NamedConfigurationTypeDescriptor namedDescriptor = checkConditionType(condition.get());
74-
return UnresolvedConfigurationCondition.create(namedDescriptor, checkOption(ConfigurationParserOption.TREAT_ALL_TYPE_REACHABLE_CONDITIONS_AS_TYPE_REACHED));
74+
return UnresolvedAccessCondition.create(namedDescriptor, checkOption(ConfigurationParserOption.TREAT_ALL_TYPE_REACHABLE_CONDITIONS_AS_TYPE_REACHED));
7575
}
7676
}
7777
}
78-
return UnresolvedConfigurationCondition.alwaysTrue();
78+
return UnresolvedAccessCondition.unconditional();
7979
}
8080

8181
private static NamedConfigurationTypeDescriptor checkConditionType(ConfigurationTypeDescriptor type) {

‎substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/ConditionalElement.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import java.util.Comparator;
2929
import java.util.function.Function;
3030

31-
public record ConditionalElement<T>(UnresolvedConfigurationCondition condition, T element) {
31+
public record ConditionalElement<T>(UnresolvedAccessCondition condition, T element) {
3232

3333
public static <T extends Comparable<T>> Comparator<ConditionalElement<T>> comparator() {
3434
return (o1, o2) -> Comparator

‎substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/ConfigurationBase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public abstract class ConfigurationBase<T extends ConfigurationBase<T, P>, P> im
3939

4040
protected abstract void merge(T other);
4141

42-
public abstract void mergeConditional(UnresolvedConfigurationCondition condition, T other);
42+
public abstract void mergeConditional(UnresolvedAccessCondition condition, T other);
4343

4444
protected abstract void subtract(T other);
4545

‎substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/ForeignConfigurationParser.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,13 +146,13 @@ private FD createFunctionDescriptor(EconomicMap<String, Object> map) {
146146
/** Parses the options allowed for upcalls. */
147147
protected abstract LO createUpcallOptions(EconomicMap<String, Object> map, FD desc);
148148

149-
protected abstract void registerDowncall(UnresolvedConfigurationCondition configurationCondition, FD descriptor, LO options);
149+
protected abstract void registerDowncall(UnresolvedAccessCondition condition, FD descriptor, LO options);
150150

151-
protected abstract void registerUpcall(UnresolvedConfigurationCondition configurationCondition, FD descriptor, LO options);
151+
protected abstract void registerUpcall(UnresolvedAccessCondition condition, FD descriptor, LO options);
152152

153-
protected abstract void registerDirectUpcallWithoutDescriptor(UnresolvedConfigurationCondition configurationCondition, String className, String methodName, EconomicMap<String, Object> optionsMap);
153+
protected abstract void registerDirectUpcallWithoutDescriptor(UnresolvedAccessCondition condition, String className, String methodName, EconomicMap<String, Object> optionsMap);
154154

155-
protected abstract void registerDirectUpcallWithDescriptor(UnresolvedConfigurationCondition configurationCondition, String className, String methodName, FD descriptor, LO options);
155+
protected abstract void registerDirectUpcallWithDescriptor(UnresolvedAccessCondition condition, String className, String methodName, FD descriptor, LO options);
156156

157157
protected abstract void handleRegistrationError(Exception e, EconomicMap<String, Object> map);
158158
}

‎substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/LegacyReflectionConfigurationParser.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import org.graalvm.collections.EconomicMap;
3434
import org.graalvm.collections.MapCursor;
3535

36-
import com.oracle.svm.configure.config.conditional.ConfigurationConditionResolver;
36+
import com.oracle.svm.configure.config.conditional.AccessConditionResolver;
3737
import com.oracle.svm.util.TypeResult;
3838

3939
final class LegacyReflectionConfigurationParser<C, T> extends ReflectionConfigurationParser<C, T> {
@@ -44,7 +44,7 @@ final class LegacyReflectionConfigurationParser<C, T> extends ReflectionConfigur
4444
"allPublicClasses", "methods", "queriedMethods", "fields", CONDITIONAL_KEY,
4545
"queryAllDeclaredConstructors", "queryAllPublicConstructors", "queryAllDeclaredMethods", "queryAllPublicMethods", "unsafeAllocated", "serializable");
4646

47-
LegacyReflectionConfigurationParser(ConfigurationConditionResolver<C> conditionResolver, ReflectionConfigurationParserDelegate<C, T> delegate, EnumSet<ConfigurationParserOption> parserOptions) {
47+
LegacyReflectionConfigurationParser(AccessConditionResolver<C> conditionResolver, ReflectionConfigurationParserDelegate<C, T> delegate, EnumSet<ConfigurationParserOption> parserOptions) {
4848
super(conditionResolver, delegate, parserOptions);
4949
}
5050

@@ -76,7 +76,7 @@ protected void parseClass(EconomicMap<String, Object> data) {
7676
*/
7777
boolean isType = type.get().definedAsType();
7878

79-
UnresolvedConfigurationCondition unresolvedCondition = parseCondition(data, false);
79+
UnresolvedAccessCondition unresolvedCondition = parseCondition(data, false);
8080
TypeResult<C> conditionResult = conditionResolver.resolveCondition(unresolvedCondition);
8181
if (!conditionResult.isPresent()) {
8282
return;

‎substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/LegacyResourceConfigurationParser.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@
3333
import org.graalvm.collections.EconomicMap;
3434
import org.graalvm.collections.MapCursor;
3535

36-
import com.oracle.svm.configure.config.conditional.ConfigurationConditionResolver;
36+
import com.oracle.svm.configure.config.conditional.AccessConditionResolver;
3737
import com.oracle.svm.util.GlobUtils;
3838
import com.oracle.svm.util.TypeResult;
3939

4040
final class LegacyResourceConfigurationParser<C> extends ResourceConfigurationParser<C> {
41-
LegacyResourceConfigurationParser(ConfigurationConditionResolver<C> conditionResolver, ResourcesRegistry<C> registry, EnumSet<ConfigurationParserOption> parserOptions) {
41+
LegacyResourceConfigurationParser(AccessConditionResolver<C> conditionResolver, ResourcesRegistry<C> registry, EnumSet<ConfigurationParserOption> parserOptions) {
4242
super(conditionResolver, registry, parserOptions);
4343
}
4444

@@ -74,7 +74,7 @@ private void parseTopLevelObject(EconomicMap<String, Object> obj, Object origin)
7474
}
7575

7676
@Override
77-
protected UnresolvedConfigurationCondition parseCondition(EconomicMap<String, Object> condition) {
77+
protected UnresolvedAccessCondition parseCondition(EconomicMap<String, Object> condition) {
7878
return parseCondition(condition, false);
7979
}
8080

@@ -110,8 +110,8 @@ private void parseResourcesObject(Object resourcesObject, Object origin) {
110110
private void parsePatternEntry(Object data, BiConsumer<C, String> resourceRegistry, GlobPatternConsumer<C> globRegistry, String parentType) {
111111
EconomicMap<String, Object> resource = asMap(data, "Elements of " + parentType + " must be a resource descriptor object");
112112
checkAttributes(resource, "regex resource descriptor object", Collections.singletonList("pattern"), Collections.singletonList(CONDITIONAL_KEY));
113-
TypeResult<C> resolvedConfigurationCondition = conditionResolver.resolveCondition(parseCondition(resource, false));
114-
if (!resolvedConfigurationCondition.isPresent()) {
113+
TypeResult<C> resolvedAccessCondition = conditionResolver.resolveCondition(parseCondition(resource, false));
114+
if (!resolvedAccessCondition.isPresent()) {
115115
return;
116116
}
117117

@@ -122,11 +122,11 @@ private void parsePatternEntry(Object data, BiConsumer<C, String> resourceRegist
122122
if (value.startsWith("\\Q") && value.endsWith("\\E") && value.indexOf("\\E") == value.lastIndexOf("\\E")) {
123123
String globValue = value.substring("\\Q".length(), value.length() - "\\E".length());
124124
if (GlobUtils.validatePattern(globValue).isEmpty()) {
125-
globRegistry.accept(resolvedConfigurationCondition.get(), null, globValue);
125+
globRegistry.accept(resolvedAccessCondition.get(), null, globValue);
126126
return;
127127
}
128128
}
129129

130-
resourceRegistry.accept(resolvedConfigurationCondition.get(), value);
130+
resourceRegistry.accept(resolvedAccessCondition.get(), value);
131131
}
132132
}

0 commit comments

Comments
 (0)