Skip to content

Commit bc5c961

Browse files
committed
fix: add modelling of prohibitions to schemas
1 parent 9da6ca6 commit bc5c961

File tree

4 files changed

+20
-6
lines changed

4 files changed

+20
-6
lines changed

artifacts/buildSrc/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ For example:
3333
<td></td>
3434
</tr>
3535
<tr>
36-
<td class="code">permission</td>
36+
<td class="code">rule</td>
3737
<td>array</td>
3838
<td></td>
3939
</tr>

artifacts/buildSrc/src/test/java/org/eclipse/dsp/generation/jsom/TestSchema.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,14 @@ public interface TestSchema {
6464
"permission": {
6565
"type": "array",
6666
"items": {
67-
"$ref": "#/definitions/Permission"
67+
"$ref": "#/definitions/Rule"
68+
},
69+
"minItems": 1
70+
},
71+
"prohibition": {
72+
"type": "array",
73+
"items": {
74+
"$ref": "#/definitions/Rule"
6875
},
6976
"minItems": 1
7077
},
@@ -177,7 +184,7 @@ public interface TestSchema {
177184
"assigner"
178185
]
179186
},
180-
"Permission": {
187+
"Rule": {
181188
"type": "object",
182189
"properties": {
183190
"action": {

artifacts/src/main/resources/negotiation/contract-schema.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,14 @@
4242
"permission": {
4343
"type": "array",
4444
"items": {
45-
"$ref": "#/definitions/Permission"
45+
"$ref": "#/definitions/Rule"
46+
},
47+
"minItems": 1
48+
},
49+
"prohibition": {
50+
"type": "array",
51+
"items": {
52+
"$ref": "#/definitions/Rule"
4653
},
4754
"minItems": 1
4855
},
@@ -178,7 +185,7 @@
178185
"assigner"
179186
]
180187
},
181-
"Permission": {
188+
"Rule": {
182189
"type": "object",
183190
"properties": {
184191
"action": {

specifications/common/type.definitions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<p data-include="message/table/offer.html" data-include-format="html">
3737
</p>
3838

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

4242
<p data-include="message/table/versionresponse.html" data-include-format="html">

0 commit comments

Comments
 (0)