Skip to content

feat: add definition of Rule to schemas #188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mkollenstart merged 2 commits into from
Jun 16, 2025
Merged

feat: add definition of Rule to schemas #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc5c961
fix: add modelling of prohibitions to schemas
juliapampus Jun 15, 2025
5c4c9cd
chore: add test
juliapampus Jun 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion artifacts/buildSrc/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ For example:
<td></td>
</tr>
<tr>
<td class="code">permission</td>
<td class="code">rule</td>
<td>array</td>
<td></td>
</tr>
Expand Down
11 changes: 9 additions & 2 deletions artifacts/buildSrc/src/test/java/org/eclipse/dsp/generation/jsom/TestSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,14 @@ public interface TestSchema {
"permission": {
"type": "array",
"items": {
"$ref": "#/definitions/Permission"
"$ref": "#/definitions/Rule"
},
"minItems": 1
},
"prohibition": {
"type": "array",
"items": {
"$ref": "#/definitions/Rule"
},
"minItems": 1
},
Expand Down Expand Up @@ -177,7 +184,7 @@ public interface TestSchema {
"assigner"
]
},
"Permission": {
"Rule": {
"type": "object",
"properties": {
"action": {
Expand Down
11 changes: 9 additions & 2 deletions artifacts/src/main/resources/negotiation/contract-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,14 @@
"permission": {
"type": "array",
"items": {
"$ref": "#/definitions/Permission"
"$ref": "#/definitions/Rule"
},
"minItems": 1
},
"prohibition": {
"type": "array",
"items": {
"$ref": "#/definitions/Rule"
},
"minItems": 1
},
Expand Down Expand Up @@ -178,7 +185,7 @@
"assigner"
]
},
"Permission": {
"Rule": {
"type": "object",
"properties": {
"action": {
Expand Down
27 changes: 27 additions & 0 deletions artifacts/src/test/java/org/eclipse/dsp/schema/negotiation/PolicySchemaTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ void verifySchema() {
assertThat(schema.validate(POLICY_STRING_PROFILE, JSON)).isEmpty();
assertThat(schema.validate(POLICY_ARRAY_PROFILE, JSON)).isEmpty();
assertThat(schema.validate(POLICY_PERMISSION_DUTY, JSON)).isEmpty();
assertThat(schema.validate(POLICY_PROHIBITION_DUTY, JSON)).isEmpty();
assertThat(schema.validate(POLICY_OR_CONSTRAINT, JSON)).isEmpty();
assertThat(schema.validate(POLICY_AND_CONSTRAINT, JSON)).isEmpty();
assertThat(schema.validate(POLICY_AND_SEQUENCE_CONSTRAINT, JSON)).isEmpty();
Expand Down Expand Up @@ -129,6 +130,32 @@ void setUp() {
]
}""";

private static final String POLICY_PROHIBITION_DUTY = """
{
"@id": "urn:uuid:3dd1add8-4d2d-569e-d634-8394a8836a88",
"@type": "Offer",
"target": "asset:1",
"profile": ["https://test.com/profile"],
"prohibition": [
{
"action": "use",
"constraint": [{
"leftOperand": "partner",
"operator": "eq",
"rightOperand": "gold"
}],
"duty": [{
"action": "report",
"constraint": [{
"leftOperand": "event",
"operator": "gt",
"rightOperand": "use"
}]
}]
}
]
}""";


private static final String POLICY_OR_CONSTRAINT = """
{
Expand Down
2 changes: 1 addition & 1 deletion specifications/common/type.definitions.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<p data-include="message/table/offer.html" data-include-format="html">
</p>

<p data-include="message/table/permission.html" data-include-format="html">
<p data-include="message/table/rule.html" data-include-format="html">
</p>

<p data-include="message/table/versionresponse.html" data-include-format="html">
Expand Down
Loading