From b08f77a16fbf1e1c857303c89516a21ede54686b Mon Sep 17 00:00:00 2001 From: Nick Molcanov <32801560+nck-mlcnv@users.noreply.github.com> Date: Wed, 11 Sep 2024 13:07:19 +0200 Subject: [PATCH] Fix schema --- graalvm/generate-config.sh | 6 +++--- schema/iguana-schema.json | 8 ++++---- src/main/resources/iguana-schema.json | 8 ++++---- src/test/resources/suite-configs/valid/config-full.yaml | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/graalvm/generate-config.sh b/graalvm/generate-config.sh index f163cb72..fdd4625f 100755 --- a/graalvm/generate-config.sh +++ b/graalvm/generate-config.sh @@ -43,9 +43,9 @@ if [ -f "$TARGET_DIR"/native/agent-output/test/resource-config.json ]; then fi # Run through multiple different execution paths, so that the tracing agent can generate complete configuration files. -"$GRAALVM_HOME"/bin/java -agentlib:native-image-agent=config-merge-dir=src/main/resources/META-INF/native-image/ -jar "$TARGET_DIR"/iguana.jar --help #> /dev/null -"$GRAALVM_HOME"/bin/java -agentlib:native-image-agent=config-merge-dir=src/main/resources/META-INF/native-image/ -jar "$TARGET_DIR"/iguana.jar --dry-run -is "$SUITE" #> /dev/null -"$GRAALVM_HOME"/bin/java -agentlib:native-image-agent=config-merge-dir=src/main/resources/META-INF/native-image/ -jar "$TARGET_DIR"/iguana.jar --dry-run "$SUITE" #> /dev/null +"$GRAALVM_HOME"/bin/java -agentlib:native-image-agent=config-merge-dir=src/main/resources/META-INF/native-image/ -jar "$TARGET_DIR"/iguana.jar --help > /dev/null +"$GRAALVM_HOME"/bin/java -agentlib:native-image-agent=config-merge-dir=src/main/resources/META-INF/native-image/ -jar "$TARGET_DIR"/iguana.jar --dry-run -is "$SUITE" > /dev/null +"$GRAALVM_HOME"/bin/java -agentlib:native-image-agent=config-merge-dir=src/main/resources/META-INF/native-image/ -jar "$TARGET_DIR"/iguana.jar --dry-run "$SUITE" > /dev/null # there is a bug in the tracing agent that outputs wrong formatted lines in the resource-config.json file (https://github.com/oracle/graal/issues/7985) sed 's/\\\\E//g' src/main/resources/META-INF/native-image/resource-config.json | sed 's/\\\\Q//g' > src/main/resources/META-INF/native-image/resource-config.json.tmp diff --git a/schema/iguana-schema.json b/schema/iguana-schema.json index c308a0db..0ad54c1b 100644 --- a/schema/iguana-schema.json +++ b/schema/iguana-schema.json @@ -338,7 +338,7 @@ "duration" ] }, - "Pattern": { + "Template": { "type": "object", "additionalProperties": false, "properties": { @@ -356,7 +356,7 @@ "required": [ "endpoint" ], - "title": "Pattern" + "title": "Template" }, "QueryMixes": { "properties": { @@ -400,8 +400,8 @@ "type": "string", "enum": [ "", "SPARQL" ] }, - "pattern": { - "$ref": "#/definitions/Pattern" + "template": { + "$ref": "#/definitions/Template" } }, "required": [ diff --git a/src/main/resources/iguana-schema.json b/src/main/resources/iguana-schema.json index e1344eb8..d92fb8d6 100644 --- a/src/main/resources/iguana-schema.json +++ b/src/main/resources/iguana-schema.json @@ -338,7 +338,7 @@ "duration" ] }, - "Pattern": { + "Template": { "type": "object", "additionalProperties": false, "properties": { @@ -356,7 +356,7 @@ "required": [ "endpoint" ], - "title": "Pattern" + "title": "Template" }, "QueryMixes": { "properties": { @@ -400,8 +400,8 @@ "type": "string", "enum": [ "", "SPARQL" ] }, - "pattern": { - "$ref": "#/definitions/Pattern" + "template": { + "$ref": "#/definitions/Template" } }, "required": [ diff --git a/src/test/resources/suite-configs/valid/config-full.yaml b/src/test/resources/suite-configs/valid/config-full.yaml index a5037452..ad228cc2 100644 --- a/src/test/resources/suite-configs/valid/config-full.yaml +++ b/src/test/resources/suite-configs/valid/config-full.yaml @@ -53,7 +53,7 @@ tasks: path: "./example/suite/queries/" format: "folder" order: "random" - pattern: + template: endpoint: "http://localhost:3030/sp2b" limit: 2000 save: false