Skip to content

Commit 08a6efa

Browse files
committed
Add the schema for types
1 parent 3d3112a commit 08a6efa

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

docs/reference-manual/native-image/FFM-API.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -754,4 +754,4 @@ This is also why the `native-image` tool currently disallows native `MemorySegme
754754
* [Interoperability with Native Code](InteropWithNativeCode.md)
755755
* [Collect Metadata with the Tracing Agent](AutomaticMetadataCollection.md)
756756
* [Reachability Metadata](ReachabilityMetadata.md)
757-
* [reachability-metadata-schema-v1.1.0.json](https://github.com/oracle/graal/blob/master/docs/reference-manual/native-image/assets/reachability-metadata-schema-v1.1.0.json)
757+
* [reachability-metadata-schema-v1.2.0.json](https://github.com/oracle/graal/blob/master/docs/reference-manual/native-image/assets/reachability-metadata-schema-v1.2.0.json)

docs/reference-manual/native-image/ReachabilityMetadata.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ Computing metadata in code can be achieved in two ways:
124124
## Specifying Metadata with JSON
125125
126126
All metadata specified in the _reachability-metadata.json_ file that is located in any of the classpath entries at _META-INF/native-image/\<group.Id>\/\<artifactId>\/_.
127-
The JSON schema for the reachability metadata is defined in [reachability-metadata-schema-v1.1.0.json](https://github.com/oracle/graal/blob/master/docs/reference-manual/native-image/assets/reachability-metadata-schema-v1.1.0.json).
127+
The JSON schema for the reachability metadata is defined in [reachability-metadata-schema-v1.2.0.json](https://github.com/oracle/graal/blob/master/docs/reference-manual/native-image/assets/reachability-metadata-schema-v1.2.0.json).
128128
129129
A sample _reachability-metadata.json_ file can be found [in the sample section](#sample-reachability-metadata).
130130
The _reachability-metadata.json_ configuration contains a single object with one field for each type of metadata. Each field in the top-level object contains an array of *metadata entries*:

docs/reference-manual/native-image/assets/reachability-metadata-schema-v1.2.0.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,8 @@
361361
"title": "Type descriptors used by GraalVM Native Image metadata files",
362362
"oneOf": [
363363
{
364-
"type": "string"
364+
"type": "string",
365+
"pattern": "^[a-zA-Z_$][a-zA-Z0-9_$]*(\\.[a-zA-Z_$][a-zA-Z0-9_$]*)*(\\[\\])*$"
365366
},
366367
{
367368
"type": "object",
@@ -372,7 +373,8 @@
372373
"default": [],
373374
"items": {
374375
"title": "Fully-qualified name of the interface defining the proxy class",
375-
"type": "string"
376+
"type": "string",
377+
"pattern": "^[a-zA-Z_$][a-zA-Z0-9_$]*(\\.[a-zA-Z_$][a-zA-Z0-9_$]*)*(\\[\\])*$"
376378
}
377379
},
378380
"lambda": {

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/ConfigurationFiles.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public static final class Options {
130130
AccumulatingLocatableMultiOptionValue.Strings.buildWithCommaDelimiter());
131131

132132
@Option(help = "Resources describing reachability metadata needed for the program " +
133-
"https://github.com/oracle/graal/blob/master/docs/reference-manual/native-image/assets/reachability-metadata-schema-v1.1.0.json", type = OptionType.User)//
133+
"https://github.com/oracle/graal/blob/master/docs/reference-manual/native-image/assets/reachability-metadata-schema-v1.2.0.json", type = OptionType.User)//
134134
public static final HostedOptionKey<AccumulatingLocatableMultiOptionValue.Strings> ReachabilityMetadataResources = new HostedOptionKey<>(
135135
AccumulatingLocatableMultiOptionValue.Strings.buildWithCommaDelimiter());
136136

0 commit comments

Comments
 (0)