From 5bfc75af8fd16919bd1d125ac1ec0730ab7633b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Tue, 23 Apr 2024 17:37:37 +0200 Subject: [PATCH] Clean up unecessary allOfs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kévin Commaille --- .../definitions/push_ruleset.yaml | 25 ++++--------------- .../definitions/room_key_backup.yaml | 3 +-- data/api/client-server/device_management.yaml | 8 ++---- data/api/client-server/filter.yaml | 4 +-- data/api/client-server/key_backup.yaml | 6 ++--- data/api/client-server/keys.yaml | 9 +++---- data/api/client-server/pushrules.yaml | 4 +-- data/api/server-server/knocks.yaml | 12 +++------ data/api/server-server/user_keys.yaml | 6 ++--- data/event-schemas/schema/m.call.reject.yaml | 4 +-- .../schema/m.key.verification.accept.yaml | 3 +-- .../schema/m.key.verification.cancel.yaml | 3 +-- .../schema/m.key.verification.done.yaml | 3 +-- .../schema/m.key.verification.key.yaml | 3 +-- .../schema/m.key.verification.mac.yaml | 3 +-- .../schema/m.key.verification.ready.yaml | 3 +-- ...y.verification.start$m.reciprocate.v1.yaml | 3 +-- .../m.key.verification.start$m.sas.v1.yaml | 3 +-- .../schema/m.key.verification.start.yaml | 3 +-- 19 files changed, 31 insertions(+), 77 deletions(-) diff --git a/data/api/client-server/definitions/push_ruleset.yaml b/data/api/client-server/definitions/push_ruleset.yaml index 2d8cd67c..bbd07f7c 100644 --- a/data/api/client-server/definitions/push_ruleset.yaml +++ b/data/api/client-server/definitions/push_ruleset.yaml @@ -14,37 +14,22 @@ properties: content: items: - allOf: - - $ref: push_rule.yaml - title: PushRule - type: object + $ref: push_rule.yaml type: array override: items: - allOf: - - $ref: push_rule.yaml - title: PushRule - type: object + $ref: push_rule.yaml type: array room: items: - allOf: - - $ref: push_rule.yaml - title: PushRule - type: object + $ref: push_rule.yaml type: array sender: items: - allOf: - - $ref: push_rule.yaml - title: PushRule - type: object + $ref: push_rule.yaml type: array underride: items: - allOf: - - $ref: push_rule.yaml - title: PushRule - type: object + $ref: push_rule.yaml type: array type: object diff --git a/data/api/client-server/definitions/room_key_backup.yaml b/data/api/client-server/definitions/room_key_backup.yaml index 5c70850f..ef7ef983 100644 --- a/data/api/client-server/definitions/room_key_backup.yaml +++ b/data/api/client-server/definitions/room_key_backup.yaml @@ -20,8 +20,7 @@ properties: type: object description: "A map of session IDs to key data." additionalProperties: - allOf: - - $ref: "key_backup_data.yaml" + $ref: "key_backup_data.yaml" example: { "sessionid1": { "first_message_index": 1, diff --git a/data/api/client-server/device_management.yaml b/data/api/client-server/device_management.yaml index c4d1ce36..b2bcb8ce 100644 --- a/data/api/client-server/device_management.yaml +++ b/data/api/client-server/device_management.yaml @@ -36,9 +36,7 @@ paths: type: array description: A list of all registered devices for this user. items: - type: object - allOf: - - $ref: definitions/client_device.yaml + $ref: definitions/client_device.yaml examples: response: value: { @@ -75,9 +73,7 @@ paths: content: application/json: schema: - type: object - allOf: - - $ref: definitions/client_device.yaml + $ref: definitions/client_device.yaml examples: response: value: { diff --git a/data/api/client-server/filter.yaml b/data/api/client-server/filter.yaml index 805f79f8..f1135939 100644 --- a/data/api/client-server/filter.yaml +++ b/data/api/client-server/filter.yaml @@ -143,9 +143,7 @@ paths: content: application/json: schema: - type: object - allOf: - - $ref: definitions/sync_filter.yaml + $ref: definitions/sync_filter.yaml examples: response: value: { diff --git a/data/api/client-server/key_backup.yaml b/data/api/client-server/key_backup.yaml index 464d4b4c..103071dd 100644 --- a/data/api/client-server/key_backup.yaml +++ b/data/api/client-server/key_backup.yaml @@ -841,8 +841,7 @@ paths: type: object description: A map of room IDs to room key backup data. additionalProperties: - allOf: - - $ref: definitions/room_key_backup.yaml + $ref: definitions/room_key_backup.yaml example: "!room:example.org": sessions: @@ -946,8 +945,7 @@ paths: type: object description: A map of room IDs to room key backup data. additionalProperties: - allOf: - - $ref: definitions/room_key_backup.yaml + $ref: definitions/room_key_backup.yaml example: "!room:example.org": sessions: diff --git a/data/api/client-server/keys.yaml b/data/api/client-server/keys.yaml index f5172ec9..2fd40172 100644 --- a/data/api/client-server/keys.yaml +++ b/data/api/client-server/keys.yaml @@ -226,8 +226,7 @@ paths: uploaded via `/keys/signatures/upload` that the requesting user is allowed to see. additionalProperties: - allOf: - - $ref: definitions/cross_signing_key.yaml + $ref: definitions/cross_signing_key.yaml example: "@alice:example.com": user_id: "@alice:example.com" @@ -244,8 +243,7 @@ paths: information returned will be the same as uploaded via `/keys/device_signing/upload`. additionalProperties: - allOf: - - $ref: definitions/cross_signing_key.yaml + $ref: definitions/cross_signing_key.yaml example: "@alice:example.com": user_id: "@alice:example.com" @@ -265,8 +263,7 @@ paths: information returned will be the same as uploaded via `/keys/device_signing/upload`. additionalProperties: - allOf: - - $ref: definitions/cross_signing_key.yaml + $ref: definitions/cross_signing_key.yaml example: "@alice:example.com": user_id: "@alice:example.com" diff --git a/data/api/client-server/pushrules.yaml b/data/api/client-server/pushrules.yaml index d009d351..d85e3d85 100644 --- a/data/api/client-server/pushrules.yaml +++ b/data/api/client-server/pushrules.yaml @@ -470,9 +470,7 @@ paths: rule to be applied to an event. A rule with no conditions always matches. Only applicable to `underride` and `override` rules. items: - type: object - allOf: - - $ref: definitions/push_condition.yaml + $ref: definitions/push_condition.yaml pattern: type: string description: Only applicable to `content` rules. The glob-style pattern to match diff --git a/data/api/server-server/knocks.yaml b/data/api/server-server/knocks.yaml index f5b44003..cba9d32b 100644 --- a/data/api/server-server/knocks.yaml +++ b/data/api/server-server/knocks.yaml @@ -171,8 +171,7 @@ paths: content: application/json: schema: - allOf: - - $ref: ../client-server/definitions/errors/error.yaml + $ref: ../client-server/definitions/errors/error.yaml examples: response: value: { @@ -186,8 +185,7 @@ paths: content: application/json: schema: - allOf: - - $ref: ../client-server/definitions/errors/error.yaml + $ref: ../client-server/definitions/errors/error.yaml examples: response: value: { @@ -318,8 +316,7 @@ paths: content: application/json: schema: - allOf: - - $ref: ../client-server/definitions/errors/error.yaml + $ref: ../client-server/definitions/errors/error.yaml examples: response: value: { @@ -333,8 +330,7 @@ paths: content: application/json: schema: - allOf: - - $ref: ../client-server/definitions/errors/error.yaml + $ref: ../client-server/definitions/errors/error.yaml examples: response: value: { diff --git a/data/api/server-server/user_keys.yaml b/data/api/server-server/user_keys.yaml index 6007b304..780303e3 100644 --- a/data/api/server-server/user_keys.yaml +++ b/data/api/server-server/user_keys.yaml @@ -178,8 +178,7 @@ paths: uploaded via `/keys/signatures/upload` that the user is allowed to see. additionalProperties: - allOf: - - $ref: ../client-server/definitions/cross_signing_key.yaml + $ref: ../client-server/definitions/cross_signing_key.yaml example: "@alice:example.com": user_id: "@alice:example.com" @@ -196,8 +195,7 @@ paths: information returned will be the same as uploaded via `/keys/device_signing/upload`. additionalProperties: - allOf: - - $ref: ../client-server/definitions/cross_signing_key.yaml + $ref: ../client-server/definitions/cross_signing_key.yaml example: "@alice:example.com": user_id: "@alice:example.com" diff --git a/data/event-schemas/schema/m.call.reject.yaml b/data/event-schemas/schema/m.call.reject.yaml index 39726c1a..d12a0b5c 100644 --- a/data/event-schemas/schema/m.call.reject.yaml +++ b/data/event-schemas/schema/m.call.reject.yaml @@ -18,9 +18,7 @@ allOf: - "$ref": core-event-schema/room_event.yaml properties: content: - type: object - allOf: - - "$ref": core-event-schema/call_event.yaml + "$ref": core-event-schema/call_event.yaml type: type: string enum: diff --git a/data/event-schemas/schema/m.key.verification.accept.yaml b/data/event-schemas/schema/m.key.verification.accept.yaml index 2a1bbf0d..a61edd66 100644 --- a/data/event-schemas/schema/m.key.verification.accept.yaml +++ b/data/event-schemas/schema/m.key.verification.accept.yaml @@ -44,8 +44,7 @@ properties: ephemeral public key (encoded as unpadded base64) and the canonical JSON representation of the `m.key.verification.start` message. m.relates_to: - allOf: - - $ref: m.key.verification.m.relates_to.yaml + $ref: m.key.verification.m.relates_to.yaml required: - method - key_agreement_protocol diff --git a/data/event-schemas/schema/m.key.verification.cancel.yaml b/data/event-schemas/schema/m.key.verification.cancel.yaml index 6474b763..237f0d06 100644 --- a/data/event-schemas/schema/m.key.verification.cancel.yaml +++ b/data/event-schemas/schema/m.key.verification.cancel.yaml @@ -58,8 +58,7 @@ properties: respond again with `m.unexpected_message` to avoid the other device potentially sending another error response. m.relates_to: - allOf: - - $ref: m.key.verification.m.relates_to.yaml + $ref: m.key.verification.m.relates_to.yaml required: - code - reason diff --git a/data/event-schemas/schema/m.key.verification.done.yaml b/data/event-schemas/schema/m.key.verification.done.yaml index bfdc540b..0e1c24e6 100644 --- a/data/event-schemas/schema/m.key.verification.done.yaml +++ b/data/event-schemas/schema/m.key.verification.done.yaml @@ -13,8 +13,7 @@ properties: Required when sent as a to-device message. The opaque identifier for the verification process/request. m.relates_to: - allOf: - - $ref: m.key.verification.m.relates_to.yaml + $ref: m.key.verification.m.relates_to.yaml type: object type: enum: diff --git a/data/event-schemas/schema/m.key.verification.key.yaml b/data/event-schemas/schema/m.key.verification.key.yaml index 62704ea7..c0b31c1b 100644 --- a/data/event-schemas/schema/m.key.verification.key.yaml +++ b/data/event-schemas/schema/m.key.verification.key.yaml @@ -18,8 +18,7 @@ properties: description: |- The device's ephemeral public key, encoded as unpadded base64. m.relates_to: - allOf: - - $ref: m.key.verification.m.relates_to.yaml + $ref: m.key.verification.m.relates_to.yaml required: - key type: object diff --git a/data/event-schemas/schema/m.key.verification.mac.yaml b/data/event-schemas/schema/m.key.verification.mac.yaml index 7f404fa0..ad4a3f05 100644 --- a/data/event-schemas/schema/m.key.verification.mac.yaml +++ b/data/event-schemas/schema/m.key.verification.mac.yaml @@ -29,8 +29,7 @@ properties: The MAC of the comma-separated, sorted, list of key IDs given in the `mac` property, encoded as unpadded base64. m.relates_to: - allOf: - - $ref: m.key.verification.m.relates_to.yaml + $ref: m.key.verification.m.relates_to.yaml required: - mac - keys diff --git a/data/event-schemas/schema/m.key.verification.ready.yaml b/data/event-schemas/schema/m.key.verification.ready.yaml index bf9d975b..1c5ed7bd 100644 --- a/data/event-schemas/schema/m.key.verification.ready.yaml +++ b/data/event-schemas/schema/m.key.verification.ready.yaml @@ -27,8 +27,7 @@ properties: items: type: string m.relates_to: - allOf: - - $ref: m.key.verification.m.relates_to.yaml + $ref: m.key.verification.m.relates_to.yaml required: - from_device - methods diff --git a/data/event-schemas/schema/m.key.verification.start$m.reciprocate.v1.yaml b/data/event-schemas/schema/m.key.verification.start$m.reciprocate.v1.yaml index a60711b3..4f3071ac 100644 --- a/data/event-schemas/schema/m.key.verification.start$m.reciprocate.v1.yaml +++ b/data/event-schemas/schema/m.key.verification.start$m.reciprocate.v1.yaml @@ -30,8 +30,7 @@ properties: description: |- The shared secret from the QR code, encoded using unpadded base64. m.relates_to: - allOf: - - $ref: m.key.verification.m.relates_to.yaml + $ref: m.key.verification.m.relates_to.yaml required: - from_device - method diff --git a/data/event-schemas/schema/m.key.verification.start$m.sas.v1.yaml b/data/event-schemas/schema/m.key.verification.start$m.sas.v1.yaml index 9bc7bcad..c5f2e8af 100644 --- a/data/event-schemas/schema/m.key.verification.start$m.sas.v1.yaml +++ b/data/event-schemas/schema/m.key.verification.start$m.sas.v1.yaml @@ -58,8 +58,7 @@ properties: type: string enum: ["decimal", "emoji"] m.relates_to: - allOf: - - $ref: m.key.verification.m.relates_to.yaml + $ref: m.key.verification.m.relates_to.yaml required: - from_device - method diff --git a/data/event-schemas/schema/m.key.verification.start.yaml b/data/event-schemas/schema/m.key.verification.start.yaml index a36a72f8..cc16d275 100644 --- a/data/event-schemas/schema/m.key.verification.start.yaml +++ b/data/event-schemas/schema/m.key.verification.start.yaml @@ -32,8 +32,7 @@ properties: when the `method` chosen only verifies one user's key. This field will never be present if the `method` verifies keys both ways. m.relates_to: - allOf: - - $ref: m.key.verification.m.relates_to.yaml + $ref: m.key.verification.m.relates_to.yaml required: - from_device - method