From 0182cd1456ca1457747ff1363d9d5c5cf95ee2f7 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Wed, 26 Dec 2018 23:26:22 -0800 Subject: codegen --- rust/fatcat-api-spec/README.md | 2 +- rust/fatcat-api-spec/api.yaml | 162 +++--- rust/fatcat-api-spec/api/swagger.yaml | 588 +++++++++++++-------- rust/fatcat-api-spec/examples/client.rs | 28 +- rust/fatcat-api-spec/examples/server_lib/server.rs | 56 +- rust/fatcat-api-spec/src/client.rs | 28 +- rust/fatcat-api-spec/src/lib.rs | 84 +-- rust/fatcat-api-spec/src/models.rs | 12 +- 8 files changed, 553 insertions(+), 407 deletions(-) (limited to 'rust/fatcat-api-spec') diff --git a/rust/fatcat-api-spec/README.md b/rust/fatcat-api-spec/README.md index babde90a..d6f09b7a 100644 --- a/rust/fatcat-api-spec/README.md +++ b/rust/fatcat-api-spec/README.md @@ -13,7 +13,7 @@ To see how to make this your own, look here: [README](https://github.com/swagger-api/swagger-codegen/blob/master/README.md) - API version: 0.1.0 -- Build date: 2018-12-27T06:46:04.412Z +- Build date: 2018-12-27T07:23:47.225Z This autogenerated project defines an API crate `fatcat` which contains: * An `Api` trait defining the API in Rust. diff --git a/rust/fatcat-api-spec/api.yaml b/rust/fatcat-api-spec/api.yaml index eb0528d5..0f52a8b6 100644 --- a/rust/fatcat-api-spec/api.yaml +++ b/rust/fatcat-api-spec/api.yaml @@ -54,6 +54,24 @@ x-orcid: &FATCATORCID pattern: "\\d{4}-\\d{4}-\\d{4}-\\d{3}[\\dX]" minLength: 19 maxLength: 19 +x-md5: &FATCATMD5 + type: string + example: "1b39813549077b2347c0f370c3864b40" + pattern: "[a-f0-9]{32}" + minLength: 32 + maxLength: 32 +x-sha1: &FATCATSHA1 + type: string + example: "e9dd75237c94b209dc3ccd52722de6931a310ba3" + pattern: "[a-f0-9]{40}" + minLength: 40 + maxLength: 40 +x-sha256: &FATCATSHA256 + type: string + example: "cb1c378f464d5935ddaa8de28446d82638396c61f042295d7fb85e3cccc9e452" + pattern: "[a-f0-9]{64}" + minLength: 64 + maxLength: 64 # Common properties across entities x-entity-props: &ENTITYPROPS @@ -136,17 +154,11 @@ definitions: example: 1048576 format: int64 md5: - type: string - #format: custom - example: "d41efcc592d1e40ac13905377399eb9b" + <<: *FATCATMD5 sha1: - type: string - #format: custom - example: "f013d66c7f6817d08b7eb2a93e6d0440c1f3e7f8" + <<: *FATCATSHA1 sha256: - type: string - #format: custom - example: "a77e4c11a57f1d757fca5754a8f83b5d4ece49a2d28596889127c1a2f3f28832" + <<: *FATCATSHA256 urls: type: array items: @@ -168,8 +180,7 @@ definitions: release_ids: type: array items: - type: string - #format: uuid + <<: *FATCATIDENT fileset_entity: type: object properties: @@ -191,17 +202,11 @@ definitions: example: 1048576 format: int64 md5: - type: string - #format: custom - example: "d41efcc592d1e40ac13905377399eb9b" + <<: *FATCATMD5 sha1: - type: string - #format: custom - example: "f013d66c7f6817d08b7eb2a93e6d0440c1f3e7f8" + <<: *FATCATSHA1 sha256: - type: string - #format: custom - example: "a77e4c11a57f1d757fca5754a8f83b5d4ece49a2d28596889127c1a2f3f28832" + <<: *FATCATSHA256 extra: type: object additionalProperties: {} @@ -223,8 +228,7 @@ definitions: release_ids: type: array items: - type: string - #format: uuid + <<: *FATCATIDENT webcapture_entity: type: object properties: @@ -248,6 +252,7 @@ definitions: example: "20020429162520" url: type: string + # NOTE: not format:url to allow alternatives example: "http://www.asheesh.org:80/APUS/ch1/node15.html" mimetype: type: string @@ -257,13 +262,9 @@ definitions: example: 200 format: int64 sha1: - type: string - #format: custom - example: "3f242a192acc258bdfdb151943419437f440c313" + <<: *FATCATSHA1 sha256: - type: string - #format: custom - example: "a77e4c11a57f1d757fca5754a8f83b5d4ece49a2d28596889127c1a2f3f28832" + <<: *FATCATSHA256 archive_urls: type: array items: @@ -281,7 +282,7 @@ definitions: example: "wayback" original_url: type: string - #format: url + format: url example: "http://asheesh.org" timestamp: type: string @@ -289,8 +290,7 @@ definitions: release_ids: type: array items: - type: string - #format: uuid + <<: *FATCATIDENT release_entity: type: object # required for creation: title @@ -378,8 +378,7 @@ definitions: type: object properties: sha1: - type: string - example: "3f242a192acc258bdfdb151943419437f440c313" + <<: *FATCATSHA1 content: type: string example: "Some abstract thing goes here" @@ -414,27 +413,17 @@ definitions: - editgroup_id properties: edit_id: - type: integer - example: 847 - format: int64 + <<: *FATCATUUID ident: - type: string - example: "q3nouwy3nnbsvo3h5klxsx4a7y" + <<: *FATCATIDENT revision: - type: string - #format: uuid - example: "86daea5b-1b6b-432a-bb67-ea97795f80fe" + <<: *FATCATUUID prev_revision: - type: string - #format: uuid - example: "86daea5b-1b6b-432a-bb67-ea97795f80fe" + <<: *FATCATUUID redirect_ident: - type: string - example: "q3nouwy3nnbsvo3h5klxsx4a7y" - #format: ident + <<: *FATCATIDENT editgroup_id: - type: string - example: "q3nouwy3nnbsvo3h5klxsx4a7y" + <<: *FATCATIDENT extra: type: object additionalProperties: {} @@ -444,8 +433,7 @@ definitions: - username properties: editor_id: - type: string - example: "q3nouwy3nnbsvo3h5klxsx4a7y" + <<: *FATCATIDENT username: type: string example: "zerocool93" @@ -519,8 +507,7 @@ definitions: type: integer format: int64 target_release_id: - type: string - #format: ident + <<: *FATCATIDENT extra: type: object additionalProperties: {} @@ -689,9 +676,8 @@ paths: parameters: - name: rev_id in: path - type: string - #format: uuid required: true + <<: *FATCATUUID get: operationId: "get_container_revision" tags: # TAGLINE @@ -792,9 +778,8 @@ paths: parameters: - name: edit_id in: path - type: integer - format: int64 required: true + <<: *FATCATUUID responses: 200: description: Found Edit @@ -808,9 +793,8 @@ paths: parameters: - name: edit_id in: path - type: integer - format: int64 required: true + <<: *FATCATUUID responses: 200: description: Deleted Edit @@ -935,9 +919,8 @@ paths: parameters: - name: rev_id in: path - type: string - #format: uuid required: true + <<: *FATCATUUID get: operationId: "get_creator_revision" tags: # TAGLINE @@ -1061,9 +1044,8 @@ paths: parameters: - name: edit_id in: path - type: integer - format: int64 required: true + <<: *FATCATUUID responses: 200: description: Found Edit @@ -1077,9 +1059,8 @@ paths: parameters: - name: edit_id in: path - type: integer - format: int64 required: true + <<: *FATCATUUID responses: 200: description: Deleted Edit @@ -1204,9 +1185,8 @@ paths: parameters: - name: rev_id in: path - type: string - #format: uuid required: true + <<: *FATCATUUID get: operationId: "get_file_revision" tags: # TAGLINE @@ -1278,16 +1258,16 @@ paths: parameters: - name: md5 in: query - type: string required: false + <<: *FATCATMD5 - name: sha1 in: query - type: string required: false + <<: *FATCATSHA1 - name: sha256 in: query - type: string required: false + <<: *FATCATSHA256 - name: expand in: query type: string @@ -1312,9 +1292,8 @@ paths: parameters: - name: edit_id in: path - type: integer - format: int64 required: true + <<: *FATCATUUID responses: 200: description: Found Edit @@ -1328,9 +1307,8 @@ paths: parameters: - name: edit_id in: path - type: integer - format: int64 required: true + <<: *FATCATUUID responses: 200: description: Deleted Edit @@ -1455,9 +1433,8 @@ paths: parameters: - name: rev_id in: path - type: string - #format: uuid required: true + <<: *FATCATUUID get: operationId: "get_fileset_revision" tags: # TAGLINE @@ -1529,9 +1506,8 @@ paths: parameters: - name: edit_id in: path - type: integer - format: int64 required: true + <<: *FATCATUUID responses: 200: description: Found Edit @@ -1545,9 +1521,8 @@ paths: parameters: - name: edit_id in: path - type: integer - format: int64 required: true + <<: *FATCATUUID responses: 200: description: Deleted Edit @@ -1672,9 +1647,8 @@ paths: parameters: - name: rev_id in: path - type: string - #format: uuid required: true + <<: *FATCATUUID get: operationId: "get_webcapture_revision" tags: # TAGLINE @@ -1746,9 +1720,8 @@ paths: parameters: - name: edit_id in: path - type: integer - format: int64 required: true + <<: *FATCATUUID responses: 200: description: Found Edit @@ -1762,9 +1735,8 @@ paths: parameters: - name: edit_id in: path - type: integer - format: int64 required: true + <<: *FATCATUUID responses: 200: description: Deleted Edit @@ -1889,9 +1861,8 @@ paths: parameters: - name: rev_id in: path - type: string - #format: uuid required: true + <<: *FATCATUUID get: operationId: "get_release_revision" tags: # TAGLINE @@ -2078,9 +2049,8 @@ paths: parameters: - name: edit_id in: path - type: integer - format: int64 required: true + <<: *FATCATUUID responses: 200: description: Found Edit @@ -2094,9 +2064,8 @@ paths: parameters: - name: edit_id in: path - type: integer - format: int64 required: true + <<: *FATCATUUID responses: 200: description: Deleted Edit @@ -2221,9 +2190,8 @@ paths: parameters: - name: rev_id in: path - type: string - #format: uuid required: true + <<: *FATCATUUID get: operationId: "get_work_revision" tags: # TAGLINE @@ -2318,9 +2286,8 @@ paths: parameters: - name: edit_id in: path - type: integer - format: int64 required: true + <<: *FATCATUUID responses: 200: description: Found Edit @@ -2334,9 +2301,8 @@ paths: parameters: - name: edit_id in: path - type: integer - format: int64 required: true + <<: *FATCATUUID responses: 200: description: Deleted Edit diff --git a/rust/fatcat-api-spec/api/swagger.yaml b/rust/fatcat-api-spec/api/swagger.yaml index 908ff1ae..3ad51b8a 100644 --- a/rust/fatcat-api-spec/api/swagger.yaml +++ b/rust/fatcat-api-spec/api/swagger.yaml @@ -375,8 +375,12 @@ paths: parameters: - name: "rev_id" in: "path" + description: "UUID (lower-case, dash-separated, hex-encoded 128-bit)" required: true type: "string" + maxLength: 36 + minLength: 36 + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" formatString: "\\\"{}\\\"" example: "\"rev_id_example\".to_string()" - name: "expand" @@ -641,11 +645,14 @@ paths: parameters: - name: "edit_id" in: "path" + description: "UUID (lower-case, dash-separated, hex-encoded 128-bit)" required: true - type: "integer" - format: "int64" - formatString: "{}" - example: "789" + type: "string" + maxLength: 36 + minLength: 36 + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" + formatString: "\\\"{}\\\"" + example: "\"edit_id_example\".to_string()" responses: 200: description: "Found Edit" @@ -695,11 +702,14 @@ paths: parameters: - name: "edit_id" in: "path" + description: "UUID (lower-case, dash-separated, hex-encoded 128-bit)" required: true - type: "integer" - format: "int64" - formatString: "{}" - example: "789" + type: "string" + maxLength: 36 + minLength: 36 + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" + formatString: "\\\"{}\\\"" + example: "\"edit_id_example\".to_string()" responses: 200: description: "Deleted Edit" @@ -1096,8 +1106,12 @@ paths: parameters: - name: "rev_id" in: "path" + description: "UUID (lower-case, dash-separated, hex-encoded 128-bit)" required: true type: "string" + maxLength: 36 + minLength: 36 + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" formatString: "\\\"{}\\\"" example: "\"rev_id_example\".to_string()" - name: "expand" @@ -1426,11 +1440,14 @@ paths: parameters: - name: "edit_id" in: "path" + description: "UUID (lower-case, dash-separated, hex-encoded 128-bit)" required: true - type: "integer" - format: "int64" - formatString: "{}" - example: "789" + type: "string" + maxLength: 36 + minLength: 36 + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" + formatString: "\\\"{}\\\"" + example: "\"edit_id_example\".to_string()" responses: 200: description: "Found Edit" @@ -1480,11 +1497,14 @@ paths: parameters: - name: "edit_id" in: "path" + description: "UUID (lower-case, dash-separated, hex-encoded 128-bit)" required: true - type: "integer" - format: "int64" - formatString: "{}" - example: "789" + type: "string" + maxLength: 36 + minLength: 36 + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" + formatString: "\\\"{}\\\"" + example: "\"edit_id_example\".to_string()" responses: 200: description: "Deleted Edit" @@ -1881,8 +1901,12 @@ paths: parameters: - name: "rev_id" in: "path" + description: "UUID (lower-case, dash-separated, hex-encoded 128-bit)" required: true type: "string" + maxLength: 36 + minLength: 36 + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" formatString: "\\\"{}\\\"" example: "\"rev_id_example\".to_string()" - name: "expand" @@ -2072,18 +2096,27 @@ paths: in: "query" required: false type: "string" + maxLength: 32 + minLength: 32 + pattern: "[a-f0-9]{32}" formatString: "{:?}" example: "Some(\"md5_example\".to_string())" - name: "sha1" in: "query" required: false type: "string" + maxLength: 40 + minLength: 40 + pattern: "[a-f0-9]{40}" formatString: "{:?}" example: "Some(\"sha1_example\".to_string())" - name: "sha256" in: "query" required: false type: "string" + maxLength: 64 + minLength: 64 + pattern: "[a-f0-9]{64}" formatString: "{:?}" example: "Some(\"sha256_example\".to_string())" - name: "expand" @@ -2151,11 +2184,14 @@ paths: parameters: - name: "edit_id" in: "path" + description: "UUID (lower-case, dash-separated, hex-encoded 128-bit)" required: true - type: "integer" - format: "int64" - formatString: "{}" - example: "789" + type: "string" + maxLength: 36 + minLength: 36 + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" + formatString: "\\\"{}\\\"" + example: "\"edit_id_example\".to_string()" responses: 200: description: "Found Edit" @@ -2205,11 +2241,14 @@ paths: parameters: - name: "edit_id" in: "path" + description: "UUID (lower-case, dash-separated, hex-encoded 128-bit)" required: true - type: "integer" - format: "int64" - formatString: "{}" - example: "789" + type: "string" + maxLength: 36 + minLength: 36 + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" + formatString: "\\\"{}\\\"" + example: "\"edit_id_example\".to_string()" responses: 200: description: "Deleted Edit" @@ -2606,8 +2645,12 @@ paths: parameters: - name: "rev_id" in: "path" + description: "UUID (lower-case, dash-separated, hex-encoded 128-bit)" required: true type: "string" + maxLength: 36 + minLength: 36 + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" formatString: "\\\"{}\\\"" example: "\"rev_id_example\".to_string()" - name: "expand" @@ -2795,11 +2838,14 @@ paths: parameters: - name: "edit_id" in: "path" + description: "UUID (lower-case, dash-separated, hex-encoded 128-bit)" required: true - type: "integer" - format: "int64" - formatString: "{}" - example: "789" + type: "string" + maxLength: 36 + minLength: 36 + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" + formatString: "\\\"{}\\\"" + example: "\"edit_id_example\".to_string()" responses: 200: description: "Found Edit" @@ -2849,11 +2895,14 @@ paths: parameters: - name: "edit_id" in: "path" + description: "UUID (lower-case, dash-separated, hex-encoded 128-bit)" required: true - type: "integer" - format: "int64" - formatString: "{}" - example: "789" + type: "string" + maxLength: 36 + minLength: 36 + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" + formatString: "\\\"{}\\\"" + example: "\"edit_id_example\".to_string()" responses: 200: description: "Deleted Edit" @@ -3250,8 +3299,12 @@ paths: parameters: - name: "rev_id" in: "path" + description: "UUID (lower-case, dash-separated, hex-encoded 128-bit)" required: true type: "string" + maxLength: 36 + minLength: 36 + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" formatString: "\\\"{}\\\"" example: "\"rev_id_example\".to_string()" - name: "expand" @@ -3439,11 +3492,14 @@ paths: parameters: - name: "edit_id" in: "path" + description: "UUID (lower-case, dash-separated, hex-encoded 128-bit)" required: true - type: "integer" - format: "int64" - formatString: "{}" - example: "789" + type: "string" + maxLength: 36 + minLength: 36 + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" + formatString: "\\\"{}\\\"" + example: "\"edit_id_example\".to_string()" responses: 200: description: "Found Edit" @@ -3493,11 +3549,14 @@ paths: parameters: - name: "edit_id" in: "path" + description: "UUID (lower-case, dash-separated, hex-encoded 128-bit)" required: true - type: "integer" - format: "int64" - formatString: "{}" - example: "789" + type: "string" + maxLength: 36 + minLength: 36 + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" + formatString: "\\\"{}\\\"" + example: "\"edit_id_example\".to_string()" responses: 200: description: "Deleted Edit" @@ -3894,8 +3953,12 @@ paths: parameters: - name: "rev_id" in: "path" + description: "UUID (lower-case, dash-separated, hex-encoded 128-bit)" required: true type: "string" + maxLength: 36 + minLength: 36 + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" formatString: "\\\"{}\\\"" example: "\"rev_id_example\".to_string()" - name: "expand" @@ -4374,11 +4437,14 @@ paths: parameters: - name: "edit_id" in: "path" + description: "UUID (lower-case, dash-separated, hex-encoded 128-bit)" required: true - type: "integer" - format: "int64" - formatString: "{}" - example: "789" + type: "string" + maxLength: 36 + minLength: 36 + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" + formatString: "\\\"{}\\\"" + example: "\"edit_id_example\".to_string()" responses: 200: description: "Found Edit" @@ -4428,11 +4494,14 @@ paths: parameters: - name: "edit_id" in: "path" + description: "UUID (lower-case, dash-separated, hex-encoded 128-bit)" required: true - type: "integer" - format: "int64" - formatString: "{}" - example: "789" + type: "string" + maxLength: 36 + minLength: 36 + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" + formatString: "\\\"{}\\\"" + example: "\"edit_id_example\".to_string()" responses: 200: description: "Deleted Edit" @@ -4829,8 +4898,12 @@ paths: parameters: - name: "rev_id" in: "path" + description: "UUID (lower-case, dash-separated, hex-encoded 128-bit)" required: true type: "string" + maxLength: 36 + minLength: 36 + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" formatString: "\\\"{}\\\"" example: "\"rev_id_example\".to_string()" - name: "expand" @@ -5082,11 +5155,14 @@ paths: parameters: - name: "edit_id" in: "path" + description: "UUID (lower-case, dash-separated, hex-encoded 128-bit)" required: true - type: "integer" - format: "int64" - formatString: "{}" - example: "789" + type: "string" + maxLength: 36 + minLength: 36 + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" + formatString: "\\\"{}\\\"" + example: "\"edit_id_example\".to_string()" responses: 200: description: "Found Edit" @@ -5136,11 +5212,14 @@ paths: parameters: - name: "edit_id" in: "path" + description: "UUID (lower-case, dash-separated, hex-encoded 128-bit)" required: true - type: "integer" - format: "int64" - formatString: "{}" - example: "789" + type: "string" + maxLength: 36 + minLength: 36 + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" + formatString: "\\\"{}\\\"" + example: "\"edit_id_example\".to_string()" responses: 200: description: "Deleted Edit" @@ -5711,6 +5790,11 @@ definitions: type: "array" items: type: "string" + example: "q3nouwy3nnbsvo3h5klxsx4a7y" + description: "base32-encoded unique identifier" + minLength: 26 + maxLength: 26 + pattern: "[a-zA-Z2-7]{26}" mimetype: type: "string" example: "application/pdf" @@ -5720,13 +5804,22 @@ definitions: $ref: "#/definitions/file_entity_urls" sha256: type: "string" - example: "a77e4c11a57f1d757fca5754a8f83b5d4ece49a2d28596889127c1a2f3f28832" + example: "cb1c378f464d5935ddaa8de28446d82638396c61f042295d7fb85e3cccc9e452" + minLength: 64 + maxLength: 64 + pattern: "[a-f0-9]{64}" sha1: type: "string" - example: "f013d66c7f6817d08b7eb2a93e6d0440c1f3e7f8" + example: "e9dd75237c94b209dc3ccd52722de6931a310ba3" + minLength: 40 + maxLength: 40 + pattern: "[a-f0-9]{40}" md5: type: "string" - example: "d41efcc592d1e40ac13905377399eb9b" + example: "1b39813549077b2347c0f370c3864b40" + minLength: 32 + maxLength: 32 + pattern: "[a-f0-9]{32}" size: type: "integer" format: "int64" @@ -5765,10 +5858,10 @@ definitions: - "deleted" example: redirect: "q3nouwy3nnbsvo3h5klxsx4a7y" - sha256: "a77e4c11a57f1d757fca5754a8f83b5d4ece49a2d28596889127c1a2f3f28832" + sha256: "cb1c378f464d5935ddaa8de28446d82638396c61f042295d7fb85e3cccc9e452" ident: "q3nouwy3nnbsvo3h5klxsx4a7y" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - sha1: "f013d66c7f6817d08b7eb2a93e6d0440c1f3e7f8" + sha1: "e9dd75237c94b209dc3ccd52722de6931a310ba3" urls: - rel: "webarchive" url: "https://example.edu/~frau/prcding.pdf" @@ -5779,10 +5872,10 @@ definitions: mimetype: "application/pdf" state: "wip" release_ids: - - "release_ids" - - "release_ids" + - "q3nouwy3nnbsvo3h5klxsx4a7y" + - "q3nouwy3nnbsvo3h5klxsx4a7y" edit_extra: "{}" - md5: "d41efcc592d1e40ac13905377399eb9b" + md5: "1b39813549077b2347c0f370c3864b40" upperCaseName: "FILE_ENTITY" fileset_entity: type: "object" @@ -5791,6 +5884,11 @@ definitions: type: "array" items: type: "string" + example: "q3nouwy3nnbsvo3h5klxsx4a7y" + description: "base32-encoded unique identifier" + minLength: 26 + maxLength: 26 + pattern: "[a-zA-Z2-7]{26}" urls: type: "array" items: @@ -5839,24 +5937,24 @@ definitions: - rel: "webarchive" url: "https://example.edu/~frau/prcding.pdf" manifest: - - sha1: "f013d66c7f6817d08b7eb2a93e6d0440c1f3e7f8" + - sha1: "e9dd75237c94b209dc3ccd52722de6931a310ba3" path: "img/cat.png" size: 1048576 - sha256: "a77e4c11a57f1d757fca5754a8f83b5d4ece49a2d28596889127c1a2f3f28832" + sha256: "cb1c378f464d5935ddaa8de28446d82638396c61f042295d7fb85e3cccc9e452" extra: "{}" - md5: "d41efcc592d1e40ac13905377399eb9b" - - sha1: "f013d66c7f6817d08b7eb2a93e6d0440c1f3e7f8" + md5: "1b39813549077b2347c0f370c3864b40" + - sha1: "e9dd75237c94b209dc3ccd52722de6931a310ba3" path: "img/cat.png" size: 1048576 - sha256: "a77e4c11a57f1d757fca5754a8f83b5d4ece49a2d28596889127c1a2f3f28832" + sha256: "cb1c378f464d5935ddaa8de28446d82638396c61f042295d7fb85e3cccc9e452" extra: "{}" - md5: "d41efcc592d1e40ac13905377399eb9b" + md5: "1b39813549077b2347c0f370c3864b40" ident: "q3nouwy3nnbsvo3h5klxsx4a7y" extra: "{}" state: "wip" release_ids: - - "release_ids" - - "release_ids" + - "q3nouwy3nnbsvo3h5klxsx4a7y" + - "q3nouwy3nnbsvo3h5klxsx4a7y" edit_extra: "{}" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" upperCaseName: "FILESET_ENTITY" @@ -5867,11 +5965,17 @@ definitions: type: "array" items: type: "string" + example: "q3nouwy3nnbsvo3h5klxsx4a7y" + description: "base32-encoded unique identifier" + minLength: 26 + maxLength: 26 + pattern: "[a-zA-Z2-7]{26}" timestamp: type: "string" format: "date-time" original_url: type: "string" + format: "url" example: "http://asheesh.org" archive_urls: type: "array" @@ -5922,17 +6026,17 @@ definitions: url: "https://web.archive.org/web/" original_url: "http://asheesh.org" cdx: - - sha1: "3f242a192acc258bdfdb151943419437f440c313" + - sha1: "e9dd75237c94b209dc3ccd52722de6931a310ba3" surt: "org,asheesh)/apus/ch1/node15.html" status_code: 200 - sha256: "a77e4c11a57f1d757fca5754a8f83b5d4ece49a2d28596889127c1a2f3f28832" + sha256: "cb1c378f464d5935ddaa8de28446d82638396c61f042295d7fb85e3cccc9e452" mimetype: "text/html" url: "http://www.asheesh.org:80/APUS/ch1/node15.html" timestamp: "20020429162520" - - sha1: "3f242a192acc258bdfdb151943419437f440c313" + - sha1: "e9dd75237c94b209dc3ccd52722de6931a310ba3" surt: "org,asheesh)/apus/ch1/node15.html" status_code: 200 - sha256: "a77e4c11a57f1d757fca5754a8f83b5d4ece49a2d28596889127c1a2f3f28832" + sha256: "cb1c378f464d5935ddaa8de28446d82638396c61f042295d7fb85e3cccc9e452" mimetype: "text/html" url: "http://www.asheesh.org:80/APUS/ch1/node15.html" timestamp: "20020429162520" @@ -5940,8 +6044,8 @@ definitions: extra: "{}" state: "wip" release_ids: - - "release_ids" - - "release_ids" + - "q3nouwy3nnbsvo3h5klxsx4a7y" + - "q3nouwy3nnbsvo3h5klxsx4a7y" edit_extra: "{}" timestamp: "2000-01-23T04:56:07.000+00:00" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" @@ -6081,17 +6185,17 @@ definitions: url: "https://web.archive.org/web/" original_url: "http://asheesh.org" cdx: - - sha1: "3f242a192acc258bdfdb151943419437f440c313" + - sha1: "e9dd75237c94b209dc3ccd52722de6931a310ba3" surt: "org,asheesh)/apus/ch1/node15.html" status_code: 200 - sha256: "a77e4c11a57f1d757fca5754a8f83b5d4ece49a2d28596889127c1a2f3f28832" + sha256: "cb1c378f464d5935ddaa8de28446d82638396c61f042295d7fb85e3cccc9e452" mimetype: "text/html" url: "http://www.asheesh.org:80/APUS/ch1/node15.html" timestamp: "20020429162520" - - sha1: "3f242a192acc258bdfdb151943419437f440c313" + - sha1: "e9dd75237c94b209dc3ccd52722de6931a310ba3" surt: "org,asheesh)/apus/ch1/node15.html" status_code: 200 - sha256: "a77e4c11a57f1d757fca5754a8f83b5d4ece49a2d28596889127c1a2f3f28832" + sha256: "cb1c378f464d5935ddaa8de28446d82638396c61f042295d7fb85e3cccc9e452" mimetype: "text/html" url: "http://www.asheesh.org:80/APUS/ch1/node15.html" timestamp: "20020429162520" @@ -6099,8 +6203,8 @@ definitions: extra: "{}" state: "wip" release_ids: - - "release_ids" - - "release_ids" + - "q3nouwy3nnbsvo3h5klxsx4a7y" + - "q3nouwy3nnbsvo3h5klxsx4a7y" edit_extra: "{}" timestamp: "2000-01-23T04:56:07.000+00:00" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" @@ -6112,17 +6216,17 @@ definitions: url: "https://web.archive.org/web/" original_url: "http://asheesh.org" cdx: - - sha1: "3f242a192acc258bdfdb151943419437f440c313" + - sha1: "e9dd75237c94b209dc3ccd52722de6931a310ba3" surt: "org,asheesh)/apus/ch1/node15.html" status_code: 200 - sha256: "a77e4c11a57f1d757fca5754a8f83b5d4ece49a2d28596889127c1a2f3f28832" + sha256: "cb1c378f464d5935ddaa8de28446d82638396c61f042295d7fb85e3cccc9e452" mimetype: "text/html" url: "http://www.asheesh.org:80/APUS/ch1/node15.html" timestamp: "20020429162520" - - sha1: "3f242a192acc258bdfdb151943419437f440c313" + - sha1: "e9dd75237c94b209dc3ccd52722de6931a310ba3" surt: "org,asheesh)/apus/ch1/node15.html" status_code: 200 - sha256: "a77e4c11a57f1d757fca5754a8f83b5d4ece49a2d28596889127c1a2f3f28832" + sha256: "cb1c378f464d5935ddaa8de28446d82638396c61f042295d7fb85e3cccc9e452" mimetype: "text/html" url: "http://www.asheesh.org:80/APUS/ch1/node15.html" timestamp: "20020429162520" @@ -6130,8 +6234,8 @@ definitions: extra: "{}" state: "wip" release_ids: - - "release_ids" - - "release_ids" + - "q3nouwy3nnbsvo3h5klxsx4a7y" + - "q3nouwy3nnbsvo3h5klxsx4a7y" edit_extra: "{}" timestamp: "2000-01-23T04:56:07.000+00:00" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" @@ -6182,11 +6286,11 @@ definitions: work_id: "q3nouwy3nnbsvo3h5klxsx4a7y" issue: "12" abstracts: - - sha1: "3f242a192acc258bdfdb151943419437f440c313" + - sha1: "e9dd75237c94b209dc3ccd52722de6931a310ba3" mimetype: "application/xml+jats" lang: "en" content: "Some abstract thing goes here" - - sha1: "3f242a192acc258bdfdb151943419437f440c313" + - sha1: "e9dd75237c94b209dc3ccd52722de6931a310ba3" mimetype: "application/xml+jats" lang: "en" content: "Some abstract thing goes here" @@ -6198,7 +6302,7 @@ definitions: revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" volume: "volume" refs: - - target_release_id: "target_release_id" + - target_release_id: "q3nouwy3nnbsvo3h5klxsx4a7y" container_name: "container_name" year: 6 extra: "{}" @@ -6206,7 +6310,7 @@ definitions: title: "title" locator: "p123" key: "key" - - target_release_id: "target_release_id" + - target_release_id: "q3nouwy3nnbsvo3h5klxsx4a7y" container_name: "container_name" year: 6 extra: "{}" @@ -6219,10 +6323,10 @@ definitions: publisher: "publisher" files: - redirect: "q3nouwy3nnbsvo3h5klxsx4a7y" - sha256: "a77e4c11a57f1d757fca5754a8f83b5d4ece49a2d28596889127c1a2f3f28832" + sha256: "cb1c378f464d5935ddaa8de28446d82638396c61f042295d7fb85e3cccc9e452" ident: "q3nouwy3nnbsvo3h5klxsx4a7y" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - sha1: "f013d66c7f6817d08b7eb2a93e6d0440c1f3e7f8" + sha1: "e9dd75237c94b209dc3ccd52722de6931a310ba3" urls: - rel: "webarchive" url: "https://example.edu/~frau/prcding.pdf" @@ -6233,15 +6337,15 @@ definitions: mimetype: "application/pdf" state: "wip" release_ids: - - "release_ids" - - "release_ids" + - "q3nouwy3nnbsvo3h5klxsx4a7y" + - "q3nouwy3nnbsvo3h5klxsx4a7y" edit_extra: "{}" - md5: "d41efcc592d1e40ac13905377399eb9b" + md5: "1b39813549077b2347c0f370c3864b40" - redirect: "q3nouwy3nnbsvo3h5klxsx4a7y" - sha256: "a77e4c11a57f1d757fca5754a8f83b5d4ece49a2d28596889127c1a2f3f28832" + sha256: "cb1c378f464d5935ddaa8de28446d82638396c61f042295d7fb85e3cccc9e452" ident: "q3nouwy3nnbsvo3h5klxsx4a7y" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - sha1: "f013d66c7f6817d08b7eb2a93e6d0440c1f3e7f8" + sha1: "e9dd75237c94b209dc3ccd52722de6931a310ba3" urls: - rel: "webarchive" url: "https://example.edu/~frau/prcding.pdf" @@ -6252,10 +6356,10 @@ definitions: mimetype: "application/pdf" state: "wip" release_ids: - - "release_ids" - - "release_ids" + - "q3nouwy3nnbsvo3h5klxsx4a7y" + - "q3nouwy3nnbsvo3h5klxsx4a7y" edit_extra: "{}" - md5: "d41efcc592d1e40ac13905377399eb9b" + md5: "1b39813549077b2347c0f370c3864b40" filesets: - redirect: "q3nouwy3nnbsvo3h5klxsx4a7y" urls: @@ -6264,24 +6368,24 @@ definitions: - rel: "webarchive" url: "https://example.edu/~frau/prcding.pdf" manifest: - - sha1: "f013d66c7f6817d08b7eb2a93e6d0440c1f3e7f8" + - sha1: "e9dd75237c94b209dc3ccd52722de6931a310ba3" path: "img/cat.png" size: 1048576 - sha256: "a77e4c11a57f1d757fca5754a8f83b5d4ece49a2d28596889127c1a2f3f28832" + sha256: "cb1c378f464d5935ddaa8de28446d82638396c61f042295d7fb85e3cccc9e452" extra: "{}" - md5: "d41efcc592d1e40ac13905377399eb9b" - - sha1: "f013d66c7f6817d08b7eb2a93e6d0440c1f3e7f8" + md5: "1b39813549077b2347c0f370c3864b40" + - sha1: "e9dd75237c94b209dc3ccd52722de6931a310ba3" path: "img/cat.png" size: 1048576 - sha256: "a77e4c11a57f1d757fca5754a8f83b5d4ece49a2d28596889127c1a2f3f28832" + sha256: "cb1c378f464d5935ddaa8de28446d82638396c61f042295d7fb85e3cccc9e452" extra: "{}" - md5: "d41efcc592d1e40ac13905377399eb9b" + md5: "1b39813549077b2347c0f370c3864b40" ident: "q3nouwy3nnbsvo3h5klxsx4a7y" extra: "{}" state: "wip" release_ids: - - "release_ids" - - "release_ids" + - "q3nouwy3nnbsvo3h5klxsx4a7y" + - "q3nouwy3nnbsvo3h5klxsx4a7y" edit_extra: "{}" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - redirect: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -6291,24 +6395,24 @@ definitions: - rel: "webarchive" url: "https://example.edu/~frau/prcding.pdf" manifest: - - sha1: "f013d66c7f6817d08b7eb2a93e6d0440c1f3e7f8" + - sha1: "e9dd75237c94b209dc3ccd52722de6931a310ba3" path: "img/cat.png" size: 1048576 - sha256: "a77e4c11a57f1d757fca5754a8f83b5d4ece49a2d28596889127c1a2f3f28832" + sha256: "cb1c378f464d5935ddaa8de28446d82638396c61f042295d7fb85e3cccc9e452" extra: "{}" - md5: "d41efcc592d1e40ac13905377399eb9b" - - sha1: "f013d66c7f6817d08b7eb2a93e6d0440c1f3e7f8" + md5: "1b39813549077b2347c0f370c3864b40" + - sha1: "e9dd75237c94b209dc3ccd52722de6931a310ba3" path: "img/cat.png" size: 1048576 - sha256: "a77e4c11a57f1d757fca5754a8f83b5d4ece49a2d28596889127c1a2f3f28832" + sha256: "cb1c378f464d5935ddaa8de28446d82638396c61f042295d7fb85e3cccc9e452" extra: "{}" - md5: "d41efcc592d1e40ac13905377399eb9b" + md5: "1b39813549077b2347c0f370c3864b40" ident: "q3nouwy3nnbsvo3h5klxsx4a7y" extra: "{}" state: "wip" release_ids: - - "release_ids" - - "release_ids" + - "q3nouwy3nnbsvo3h5klxsx4a7y" + - "q3nouwy3nnbsvo3h5klxsx4a7y" edit_extra: "{}" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" pmcid: "pmcid" @@ -6377,14 +6481,14 @@ definitions: edits: works: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -6392,14 +6496,14 @@ definitions: revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" webcaptures: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -6407,14 +6511,14 @@ definitions: revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" creators: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -6422,14 +6526,14 @@ definitions: revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" files: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -6437,14 +6541,14 @@ definitions: revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" containers: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -6452,14 +6556,14 @@ definitions: revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" filesets: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -6467,14 +6571,14 @@ definitions: revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" releases: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -6485,7 +6589,7 @@ definitions: editor_id: "q3nouwy3nnbsvo3h5klxsx4a7y" edit: ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -6497,14 +6601,14 @@ definitions: edits: works: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -6512,14 +6616,14 @@ definitions: revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" webcaptures: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -6527,14 +6631,14 @@ definitions: revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" creators: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -6542,14 +6646,14 @@ definitions: revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" files: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -6557,14 +6661,14 @@ definitions: revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" containers: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -6572,14 +6676,14 @@ definitions: revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" filesets: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -6587,14 +6691,14 @@ definitions: revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" releases: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -6615,29 +6719,52 @@ definitions: - "ident" properties: edit_id: - type: "integer" - format: "int64" - example: 847 + type: "string" + example: "86daea5b-1b6b-432a-bb67-ea97795f80fe" + description: "UUID (lower-case, dash-separated, hex-encoded 128-bit)" + minLength: 36 + maxLength: 36 + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" ident: type: "string" example: "q3nouwy3nnbsvo3h5klxsx4a7y" + description: "base32-encoded unique identifier" + minLength: 26 + maxLength: 26 + pattern: "[a-zA-Z2-7]{26}" revision: type: "string" example: "86daea5b-1b6b-432a-bb67-ea97795f80fe" + description: "UUID (lower-case, dash-separated, hex-encoded 128-bit)" + minLength: 36 + maxLength: 36 + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" prev_revision: type: "string" example: "86daea5b-1b6b-432a-bb67-ea97795f80fe" + description: "UUID (lower-case, dash-separated, hex-encoded 128-bit)" + minLength: 36 + maxLength: 36 + pattern: "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}" redirect_ident: type: "string" example: "q3nouwy3nnbsvo3h5klxsx4a7y" + description: "base32-encoded unique identifier" + minLength: 26 + maxLength: 26 + pattern: "[a-zA-Z2-7]{26}" editgroup_id: type: "string" example: "q3nouwy3nnbsvo3h5klxsx4a7y" + description: "base32-encoded unique identifier" + minLength: 26 + maxLength: 26 + pattern: "[a-zA-Z2-7]{26}" extra: type: "object" example: ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -6652,6 +6779,10 @@ definitions: editor_id: type: "string" example: "q3nouwy3nnbsvo3h5klxsx4a7y" + description: "base32-encoded unique identifier" + minLength: 26 + maxLength: 26 + pattern: "[a-zA-Z2-7]{26}" username: type: "string" example: "zerocool93" @@ -6689,14 +6820,14 @@ definitions: edits: works: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -6704,14 +6835,14 @@ definitions: revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" webcaptures: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -6719,14 +6850,14 @@ definitions: revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" creators: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -6734,14 +6865,14 @@ definitions: revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" files: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -6749,14 +6880,14 @@ definitions: revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" containers: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -6764,14 +6895,14 @@ definitions: revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" filesets: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -6779,14 +6910,14 @@ definitions: revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" releases: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -6820,14 +6951,14 @@ definitions: edits: works: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -6835,14 +6966,14 @@ definitions: revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" webcaptures: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -6850,14 +6981,14 @@ definitions: revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" creators: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -6865,14 +6996,14 @@ definitions: revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" files: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -6880,14 +7011,14 @@ definitions: revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" containers: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -6895,14 +7026,14 @@ definitions: revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" filesets: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -6910,14 +7041,14 @@ definitions: revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" releases: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -6938,6 +7069,11 @@ definitions: format: "int64" target_release_id: type: "string" + example: "q3nouwy3nnbsvo3h5klxsx4a7y" + description: "base32-encoded unique identifier" + minLength: 26 + maxLength: 26 + pattern: "[a-zA-Z2-7]{26}" extra: type: "object" key: @@ -6953,7 +7089,7 @@ definitions: type: "string" example: "p123" example: - target_release_id: "target_release_id" + target_release_id: "q3nouwy3nnbsvo3h5klxsx4a7y" container_name: "container_name" year: 6 extra: "{}" @@ -7028,22 +7164,31 @@ definitions: example: 1048576 md5: type: "string" - example: "d41efcc592d1e40ac13905377399eb9b" + example: "1b39813549077b2347c0f370c3864b40" + minLength: 32 + maxLength: 32 + pattern: "[a-f0-9]{32}" sha1: type: "string" - example: "f013d66c7f6817d08b7eb2a93e6d0440c1f3e7f8" + example: "e9dd75237c94b209dc3ccd52722de6931a310ba3" + minLength: 40 + maxLength: 40 + pattern: "[a-f0-9]{40}" sha256: type: "string" - example: "a77e4c11a57f1d757fca5754a8f83b5d4ece49a2d28596889127c1a2f3f28832" + example: "cb1c378f464d5935ddaa8de28446d82638396c61f042295d7fb85e3cccc9e452" + minLength: 64 + maxLength: 64 + pattern: "[a-f0-9]{64}" extra: type: "object" example: - sha1: "f013d66c7f6817d08b7eb2a93e6d0440c1f3e7f8" + sha1: "e9dd75237c94b209dc3ccd52722de6931a310ba3" path: "img/cat.png" size: 1048576 - sha256: "a77e4c11a57f1d757fca5754a8f83b5d4ece49a2d28596889127c1a2f3f28832" + sha256: "cb1c378f464d5935ddaa8de28446d82638396c61f042295d7fb85e3cccc9e452" extra: "{}" - md5: "d41efcc592d1e40ac13905377399eb9b" + md5: "1b39813549077b2347c0f370c3864b40" upperCaseName: "FILESET_ENTITY_MANIFEST" webcapture_entity_archive_urls: required: @@ -7086,15 +7231,21 @@ definitions: example: 200 sha1: type: "string" - example: "3f242a192acc258bdfdb151943419437f440c313" + example: "e9dd75237c94b209dc3ccd52722de6931a310ba3" + minLength: 40 + maxLength: 40 + pattern: "[a-f0-9]{40}" sha256: type: "string" - example: "a77e4c11a57f1d757fca5754a8f83b5d4ece49a2d28596889127c1a2f3f28832" + example: "cb1c378f464d5935ddaa8de28446d82638396c61f042295d7fb85e3cccc9e452" + minLength: 64 + maxLength: 64 + pattern: "[a-f0-9]{64}" example: - sha1: "3f242a192acc258bdfdb151943419437f440c313" + sha1: "e9dd75237c94b209dc3ccd52722de6931a310ba3" surt: "org,asheesh)/apus/ch1/node15.html" status_code: 200 - sha256: "a77e4c11a57f1d757fca5754a8f83b5d4ece49a2d28596889127c1a2f3f28832" + sha256: "cb1c378f464d5935ddaa8de28446d82638396c61f042295d7fb85e3cccc9e452" mimetype: "text/html" url: "http://www.asheesh.org:80/APUS/ch1/node15.html" timestamp: "20020429162520" @@ -7103,7 +7254,10 @@ definitions: properties: sha1: type: "string" - example: "3f242a192acc258bdfdb151943419437f440c313" + example: "e9dd75237c94b209dc3ccd52722de6931a310ba3" + minLength: 40 + maxLength: 40 + pattern: "[a-f0-9]{40}" content: type: "string" example: "Some abstract thing goes here" @@ -7114,7 +7268,7 @@ definitions: type: "string" example: "en" example: - sha1: "3f242a192acc258bdfdb151943419437f440c313" + sha1: "e9dd75237c94b209dc3ccd52722de6931a310ba3" mimetype: "application/xml+jats" lang: "en" content: "Some abstract thing goes here" @@ -7152,14 +7306,14 @@ definitions: example: works: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -7167,14 +7321,14 @@ definitions: revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" webcaptures: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -7182,14 +7336,14 @@ definitions: revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" creators: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -7197,14 +7351,14 @@ definitions: revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" files: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -7212,14 +7366,14 @@ definitions: revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" containers: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -7227,14 +7381,14 @@ definitions: revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" filesets: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -7242,14 +7396,14 @@ definitions: revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" releases: - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" prev_revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" revision: "86daea5b-1b6b-432a-bb67-ea97795f80fe" - ident: "q3nouwy3nnbsvo3h5klxsx4a7y" - edit_id: 847 + edit_id: "86daea5b-1b6b-432a-bb67-ea97795f80fe" extra: "{}" redirect_ident: "q3nouwy3nnbsvo3h5klxsx4a7y" editgroup_id: "q3nouwy3nnbsvo3h5klxsx4a7y" @@ -7282,6 +7436,24 @@ x-orcid: pattern: "\\d{4}-\\d{4}-\\d{4}-\\d{3}[\\dX]" minLength: 19 maxLength: 19 +x-md5: + type: "string" + example: "1b39813549077b2347c0f370c3864b40" + pattern: "[a-f0-9]{32}" + minLength: 32 + maxLength: 32 +x-sha1: + type: "string" + example: "e9dd75237c94b209dc3ccd52722de6931a310ba3" + pattern: "[a-f0-9]{40}" + minLength: 40 + maxLength: 40 +x-sha256: + type: "string" + example: "cb1c378f464d5935ddaa8de28446d82638396c61f042295d7fb85e3cccc9e452" + pattern: "[a-f0-9]{64}" + minLength: 64 + maxLength: 64 x-entity-props: state: type: "string" diff --git a/rust/fatcat-api-spec/examples/client.rs b/rust/fatcat-api-spec/examples/client.rs index 52a9e16a..bf0c07b3 100644 --- a/rust/fatcat-api-spec/examples/client.rs +++ b/rust/fatcat-api-spec/examples/client.rs @@ -149,7 +149,7 @@ fn main() { } Some("DeleteContainerEdit") => { - let result = client.delete_container_edit(789).wait(); + let result = client.delete_container_edit("edit_id_example".to_string()).wait(); println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from(""))); } @@ -161,7 +161,7 @@ fn main() { } Some("GetContainerEdit") => { - let result = client.get_container_edit(789).wait(); + let result = client.get_container_edit("edit_id_example".to_string()).wait(); println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from(""))); } @@ -216,7 +216,7 @@ fn main() { } Some("DeleteCreatorEdit") => { - let result = client.delete_creator_edit(789).wait(); + let result = client.delete_creator_edit("edit_id_example".to_string()).wait(); println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from(""))); } @@ -228,7 +228,7 @@ fn main() { } Some("GetCreatorEdit") => { - let result = client.get_creator_edit(789).wait(); + let result = client.get_creator_edit("edit_id_example".to_string()).wait(); println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from(""))); } @@ -322,7 +322,7 @@ fn main() { } Some("DeleteFileEdit") => { - let result = client.delete_file_edit(789).wait(); + let result = client.delete_file_edit("edit_id_example".to_string()).wait(); println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from(""))); } @@ -334,7 +334,7 @@ fn main() { } Some("GetFileEdit") => { - let result = client.get_file_edit(789).wait(); + let result = client.get_file_edit("edit_id_example".to_string()).wait(); println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from(""))); } @@ -390,7 +390,7 @@ fn main() { } Some("DeleteFilesetEdit") => { - let result = client.delete_fileset_edit(789).wait(); + let result = client.delete_fileset_edit("edit_id_example".to_string()).wait(); println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from(""))); } @@ -402,7 +402,7 @@ fn main() { } Some("GetFilesetEdit") => { - let result = client.get_fileset_edit(789).wait(); + let result = client.get_fileset_edit("edit_id_example".to_string()).wait(); println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from(""))); } @@ -450,7 +450,7 @@ fn main() { } Some("DeleteReleaseEdit") => { - let result = client.delete_release_edit(789).wait(); + let result = client.delete_release_edit("edit_id_example".to_string()).wait(); println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from(""))); } @@ -462,7 +462,7 @@ fn main() { } Some("GetReleaseEdit") => { - let result = client.get_release_edit(789).wait(); + let result = client.get_release_edit("edit_id_example".to_string()).wait(); println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from(""))); } @@ -536,7 +536,7 @@ fn main() { } Some("DeleteWebcaptureEdit") => { - let result = client.delete_webcapture_edit(789).wait(); + let result = client.delete_webcapture_edit("edit_id_example".to_string()).wait(); println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from(""))); } @@ -548,7 +548,7 @@ fn main() { } Some("GetWebcaptureEdit") => { - let result = client.get_webcapture_edit(789).wait(); + let result = client.get_webcapture_edit("edit_id_example".to_string()).wait(); println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from(""))); } @@ -585,7 +585,7 @@ fn main() { } Some("DeleteWorkEdit") => { - let result = client.delete_work_edit(789).wait(); + let result = client.delete_work_edit("edit_id_example".to_string()).wait(); println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from(""))); } @@ -597,7 +597,7 @@ fn main() { } Some("GetWorkEdit") => { - let result = client.get_work_edit(789).wait(); + let result = client.get_work_edit("edit_id_example".to_string()).wait(); println!("{:?} (X-Span-ID: {:?})", result, client.context().x_span_id.clone().unwrap_or(String::from(""))); } diff --git a/rust/fatcat-api-spec/examples/server_lib/server.rs b/rust/fatcat-api-spec/examples/server_lib/server.rs index ad41ff27..a9301650 100644 --- a/rust/fatcat-api-spec/examples/server_lib/server.rs +++ b/rust/fatcat-api-spec/examples/server_lib/server.rs @@ -69,9 +69,9 @@ impl Api for Server { Box::new(futures::failed("Generic failure".into())) } - fn delete_container_edit(&self, edit_id: i64, context: &Context) -> Box + Send> { + fn delete_container_edit(&self, edit_id: String, context: &Context) -> Box + Send> { let context = context.clone(); - println!("delete_container_edit({}) - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("")).clone()); + println!("delete_container_edit(\"{}\") - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("")).clone()); Box::new(futures::failed("Generic failure".into())) } @@ -87,9 +87,9 @@ impl Api for Server { Box::new(futures::failed("Generic failure".into())) } - fn get_container_edit(&self, edit_id: i64, context: &Context) -> Box + Send> { + fn get_container_edit(&self, edit_id: String, context: &Context) -> Box + Send> { let context = context.clone(); - println!("get_container_edit({}) - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("")).clone()); + println!("get_container_edit(\"{}\") - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("")).clone()); Box::new(futures::failed("Generic failure".into())) } @@ -200,9 +200,9 @@ impl Api for Server { Box::new(futures::failed("Generic failure".into())) } - fn delete_creator_edit(&self, edit_id: i64, context: &Context) -> Box + Send> { + fn delete_creator_edit(&self, edit_id: String, context: &Context) -> Box + Send> { let context = context.clone(); - println!("delete_creator_edit({}) - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("")).clone()); + println!("delete_creator_edit(\"{}\") - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("")).clone()); Box::new(futures::failed("Generic failure".into())) } @@ -218,9 +218,9 @@ impl Api for Server { Box::new(futures::failed("Generic failure".into())) } - fn get_creator_edit(&self, edit_id: i64, context: &Context) -> Box + Send> { + fn get_creator_edit(&self, edit_id: String, context: &Context) -> Box + Send> { let context = context.clone(); - println!("get_creator_edit({}) - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("")).clone()); + println!("get_creator_edit(\"{}\") - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("")).clone()); Box::new(futures::failed("Generic failure".into())) } @@ -378,9 +378,9 @@ impl Api for Server { Box::new(futures::failed("Generic failure".into())) } - fn delete_file_edit(&self, edit_id: i64, context: &Context) -> Box + Send> { + fn delete_file_edit(&self, edit_id: String, context: &Context) -> Box + Send> { let context = context.clone(); - println!("delete_file_edit({}) - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("")).clone()); + println!("delete_file_edit(\"{}\") - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("")).clone()); Box::new(futures::failed("Generic failure".into())) } @@ -396,9 +396,9 @@ impl Api for Server { Box::new(futures::failed("Generic failure".into())) } - fn get_file_edit(&self, edit_id: i64, context: &Context) -> Box + Send> { + fn get_file_edit(&self, edit_id: String, context: &Context) -> Box + Send> { let context = context.clone(); - println!("get_file_edit({}) - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("")).clone()); + println!("get_file_edit(\"{}\") - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("")).clone()); Box::new(futures::failed("Generic failure".into())) } @@ -505,9 +505,9 @@ impl Api for Server { Box::new(futures::failed("Generic failure".into())) } - fn delete_fileset_edit(&self, edit_id: i64, context: &Context) -> Box + Send> { + fn delete_fileset_edit(&self, edit_id: String, context: &Context) -> Box + Send> { let context = context.clone(); - println!("delete_fileset_edit({}) - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("")).clone()); + println!("delete_fileset_edit(\"{}\") - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("")).clone()); Box::new(futures::failed("Generic failure".into())) } @@ -523,9 +523,9 @@ impl Api for Server { Box::new(futures::failed("Generic failure".into())) } - fn get_fileset_edit(&self, edit_id: i64, context: &Context) -> Box + Send> { + fn get_fileset_edit(&self, edit_id: String, context: &Context) -> Box + Send> { let context = context.clone(); - println!("get_fileset_edit({}) - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("")).clone()); + println!("get_fileset_edit(\"{}\") - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("")).clone()); Box::new(futures::failed("Generic failure".into())) } @@ -621,9 +621,9 @@ impl Api for Server { Box::new(futures::failed("Generic failure".into())) } - fn delete_release_edit(&self, edit_id: i64, context: &Context) -> Box + Send> { + fn delete_release_edit(&self, edit_id: String, context: &Context) -> Box + Send> { let context = context.clone(); - println!("delete_release_edit({}) - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("")).clone()); + println!("delete_release_edit(\"{}\") - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("")).clone()); Box::new(futures::failed("Generic failure".into())) } @@ -639,9 +639,9 @@ impl Api for Server { Box::new(futures::failed("Generic failure".into())) } - fn get_release_edit(&self, edit_id: i64, context: &Context) -> Box + Send> { + fn get_release_edit(&self, edit_id: String, context: &Context) -> Box + Send> { let context = context.clone(); - println!("get_release_edit({}) - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("")).clone()); + println!("get_release_edit(\"{}\") - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("")).clone()); Box::new(futures::failed("Generic failure".into())) } @@ -787,9 +787,9 @@ impl Api for Server { Box::new(futures::failed("Generic failure".into())) } - fn delete_webcapture_edit(&self, edit_id: i64, context: &Context) -> Box + Send> { + fn delete_webcapture_edit(&self, edit_id: String, context: &Context) -> Box + Send> { let context = context.clone(); - println!("delete_webcapture_edit({}) - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("")).clone()); + println!("delete_webcapture_edit(\"{}\") - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("")).clone()); Box::new(futures::failed("Generic failure".into())) } @@ -805,9 +805,9 @@ impl Api for Server { Box::new(futures::failed("Generic failure".into())) } - fn get_webcapture_edit(&self, edit_id: i64, context: &Context) -> Box + Send> { + fn get_webcapture_edit(&self, edit_id: String, context: &Context) -> Box + Send> { let context = context.clone(); - println!("get_webcapture_edit({}) - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("")).clone()); + println!("get_webcapture_edit(\"{}\") - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("")).clone()); Box::new(futures::failed("Generic failure".into())) } @@ -887,9 +887,9 @@ impl Api for Server { Box::new(futures::failed("Generic failure".into())) } - fn delete_work_edit(&self, edit_id: i64, context: &Context) -> Box + Send> { + fn delete_work_edit(&self, edit_id: String, context: &Context) -> Box + Send> { let context = context.clone(); - println!("delete_work_edit({}) - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("")).clone()); + println!("delete_work_edit(\"{}\") - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("")).clone()); Box::new(futures::failed("Generic failure".into())) } @@ -905,9 +905,9 @@ impl Api for Server { Box::new(futures::failed("Generic failure".into())) } - fn get_work_edit(&self, edit_id: i64, context: &Context) -> Box + Send> { + fn get_work_edit(&self, edit_id: String, context: &Context) -> Box + Send> { let context = context.clone(); - println!("get_work_edit({}) - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("")).clone()); + println!("get_work_edit(\"{}\") - X-Span-ID: {:?}", edit_id, context.x_span_id.unwrap_or(String::from("")).clone()); Box::new(futures::failed("Generic failure".into())) } diff --git a/rust/fatcat-api-spec/src/client.rs b/rust/fatcat-api-spec/src/client.rs index c764df6f..0ef2742e 100644 --- a/rust/fatcat-api-spec/src/client.rs +++ b/rust/fatcat-api-spec/src/client.rs @@ -392,7 +392,7 @@ impl Api for Client { Box::new(futures::done(result)) } - fn delete_container_edit(&self, param_edit_id: i64, context: &Context) -> Box + Send> { + fn delete_container_edit(&self, param_edit_id: String, context: &Context) -> Box + Send> { let url = format!( "{}/v0/container/edit/{edit_id}", self.base_path, @@ -526,7 +526,7 @@ impl Api for Client { Box::new(futures::done(result)) } - fn get_container_edit(&self, param_edit_id: i64, context: &Context) -> Box + Send> { + fn get_container_edit(&self, param_edit_id: String, context: &Context) -> Box + Send> { let url = format!( "{}/v0/container/edit/{edit_id}", self.base_path, @@ -1177,7 +1177,7 @@ impl Api for Client { Box::new(futures::done(result)) } - fn delete_creator_edit(&self, param_edit_id: i64, context: &Context) -> Box + Send> { + fn delete_creator_edit(&self, param_edit_id: String, context: &Context) -> Box + Send> { let url = format!( "{}/v0/creator/edit/{edit_id}", self.base_path, @@ -1311,7 +1311,7 @@ impl Api for Client { Box::new(futures::done(result)) } - fn get_creator_edit(&self, param_edit_id: i64, context: &Context) -> Box + Send> { + fn get_creator_edit(&self, param_edit_id: String, context: &Context) -> Box + Send> { let url = format!( "{}/v0/creator/edit/{edit_id}", self.base_path, @@ -2453,7 +2453,7 @@ impl Api for Client { Box::new(futures::done(result)) } - fn delete_file_edit(&self, param_edit_id: i64, context: &Context) -> Box + Send> { + fn delete_file_edit(&self, param_edit_id: String, context: &Context) -> Box + Send> { let url = format!( "{}/v0/file/edit/{edit_id}", self.base_path, @@ -2587,7 +2587,7 @@ impl Api for Client { Box::new(futures::done(result)) } - fn get_file_edit(&self, param_edit_id: i64, context: &Context) -> Box + Send> { + fn get_file_edit(&self, param_edit_id: String, context: &Context) -> Box + Send> { let url = format!( "{}/v0/file/edit/{edit_id}", self.base_path, @@ -3241,7 +3241,7 @@ impl Api for Client { Box::new(futures::done(result)) } - fn delete_fileset_edit(&self, param_edit_id: i64, context: &Context) -> Box + Send> { + fn delete_fileset_edit(&self, param_edit_id: String, context: &Context) -> Box + Send> { let url = format!( "{}/v0/fileset/edit/{edit_id}", self.base_path, @@ -3375,7 +3375,7 @@ impl Api for Client { Box::new(futures::done(result)) } - fn get_fileset_edit(&self, param_edit_id: i64, context: &Context) -> Box + Send> { + fn get_fileset_edit(&self, param_edit_id: String, context: &Context) -> Box + Send> { let url = format!( "{}/v0/fileset/edit/{edit_id}", self.base_path, @@ -4014,7 +4014,7 @@ impl Api for Client { Box::new(futures::done(result)) } - fn delete_release_edit(&self, param_edit_id: i64, context: &Context) -> Box + Send> { + fn delete_release_edit(&self, param_edit_id: String, context: &Context) -> Box + Send> { let url = format!( "{}/v0/release/edit/{edit_id}", self.base_path, @@ -4148,7 +4148,7 @@ impl Api for Client { Box::new(futures::done(result)) } - fn get_release_edit(&self, param_edit_id: i64, context: &Context) -> Box + Send> { + fn get_release_edit(&self, param_edit_id: String, context: &Context) -> Box + Send> { let url = format!( "{}/v0/release/edit/{edit_id}", self.base_path, @@ -5020,7 +5020,7 @@ impl Api for Client { Box::new(futures::done(result)) } - fn delete_webcapture_edit(&self, param_edit_id: i64, context: &Context) -> Box + Send> { + fn delete_webcapture_edit(&self, param_edit_id: String, context: &Context) -> Box + Send> { let url = format!( "{}/v0/webcapture/edit/{edit_id}", self.base_path, @@ -5154,7 +5154,7 @@ impl Api for Client { Box::new(futures::done(result)) } - fn get_webcapture_edit(&self, param_edit_id: i64, context: &Context) -> Box + Send> { + fn get_webcapture_edit(&self, param_edit_id: String, context: &Context) -> Box + Send> { let url = format!( "{}/v0/webcapture/edit/{edit_id}", self.base_path, @@ -5653,7 +5653,7 @@ impl Api for Client { Box::new(futures::done(result)) } - fn delete_work_edit(&self, param_edit_id: i64, context: &Context) -> Box + Send> { + fn delete_work_edit(&self, param_edit_id: String, context: &Context) -> Box + Send> { let url = format!( "{}/v0/work/edit/{edit_id}", self.base_path, @@ -5787,7 +5787,7 @@ impl Api for Client { Box::new(futures::done(result)) } - fn get_work_edit(&self, param_edit_id: i64, context: &Context) -> Box + Send> { + fn get_work_edit(&self, param_edit_id: String, context: &Context) -> Box + Send> { let url = format!( "{}/v0/work/edit/{edit_id}", self.base_path, diff --git a/rust/fatcat-api-spec/src/lib.rs b/rust/fatcat-api-spec/src/lib.rs index ad05aba7..c54e91ae 100644 --- a/rust/fatcat-api-spec/src/lib.rs +++ b/rust/fatcat-api-spec/src/lib.rs @@ -1072,11 +1072,11 @@ pub trait Api { fn delete_container(&self, ident: String, editgroup_id: Option, context: &Context) -> Box + Send>; - fn delete_container_edit(&self, edit_id: i64, context: &Context) -> Box + Send>; + fn delete_container_edit(&self, edit_id: String, context: &Context) -> Box + Send>; fn get_container(&self, ident: String, expand: Option, hide: Option, context: &Context) -> Box + Send>; - fn get_container_edit(&self, edit_id: i64, context: &Context) -> Box + Send>; + fn get_container_edit(&self, edit_id: String, context: &Context) -> Box + Send>; fn get_container_history(&self, ident: String, limit: Option, context: &Context) -> Box + Send>; @@ -1108,11 +1108,11 @@ pub trait Api { fn delete_creator(&self, ident: String, editgroup_id: Option, context: &Context) -> Box + Send>; - fn delete_creator_edit(&self, edit_id: i64, context: &Context) -> Box + Send>; + fn delete_creator_edit(&self, edit_id: String, context: &Context) -> Box + Send>; fn get_creator(&self, ident: String, expand: Option, hide: Option, context: &Context) -> Box + Send>; - fn get_creator_edit(&self, edit_id: i64, context: &Context) -> Box + Send>; + fn get_creator_edit(&self, edit_id: String, context: &Context) -> Box + Send>; fn get_creator_history(&self, ident: String, limit: Option, context: &Context) -> Box + Send>; @@ -1159,11 +1159,11 @@ pub trait Api { fn delete_file(&self, ident: String, editgroup_id: Option, context: &Context) -> Box + Send>; - fn delete_file_edit(&self, edit_id: i64, context: &Context) -> Box + Send>; + fn delete_file_edit(&self, edit_id: String, context: &Context) -> Box + Send>; fn get_file(&self, ident: String, expand: Option, hide: Option, context: &Context) -> Box + Send>; - fn get_file_edit(&self, edit_id: i64, context: &Context) -> Box + Send>; + fn get_file_edit(&self, edit_id: String, context: &Context) -> Box + Send>; fn get_file_history(&self, ident: String, limit: Option, context: &Context) -> Box + Send>; @@ -1195,11 +1195,11 @@ pub trait Api { fn delete_fileset(&self, ident: String, editgroup_id: Option, context: &Context) -> Box + Send>; - fn delete_fileset_edit(&self, edit_id: i64, context: &Context) -> Box + Send>; + fn delete_fileset_edit(&self, edit_id: String, context: &Context) -> Box + Send>; fn get_fileset(&self, ident: String, expand: Option, hide: Option, context: &Context) -> Box + Send>; - fn get_fileset_edit(&self, edit_id: i64, context: &Context) -> Box + Send>; + fn get_fileset_edit(&self, edit_id: String, context: &Context) -> Box + Send>; fn get_fileset_history(&self, ident: String, limit: Option, context: &Context) -> Box + Send>; @@ -1223,11 +1223,11 @@ pub trait Api { fn delete_release(&self, ident: String, editgroup_id: Option, context: &Context) -> Box + Send>; - fn delete_release_edit(&self, edit_id: i64, context: &Context) -> Box + Send>; + fn delete_release_edit(&self, edit_id: String, context: &Context) -> Box + Send>; fn get_release(&self, ident: String, expand: Option, hide: Option, context: &Context) -> Box + Send>; - fn get_release_edit(&self, edit_id: i64, context: &Context) -> Box + Send>; + fn get_release_edit(&self, edit_id: String, context: &Context) -> Box + Send>; fn get_release_files(&self, ident: String, hide: Option, context: &Context) -> Box + Send>; @@ -1268,11 +1268,11 @@ pub trait Api { fn delete_webcapture(&self, ident: String, editgroup_id: Option, context: &Context) -> Box + Send>; - fn delete_webcapture_edit(&self, edit_id: i64, context: &Context) -> Box + Send>; + fn delete_webcapture_edit(&self, edit_id: String, context: &Context) -> Box + Send>; fn get_webcapture(&self, ident: String, expand: Option, hide: Option, context: &Context) -> Box + Send>; - fn get_webcapture_edit(&self, edit_id: i64, context: &Context) -> Box + Send>; + fn get_webcapture_edit(&self, edit_id: String, context: &Context) -> Box + Send>; fn get_webcapture_history(&self, ident: String, limit: Option, context: &Context) -> Box + Send>; @@ -1298,11 +1298,11 @@ pub trait Api { fn delete_work(&self, ident: String, editgroup_id: Option, context: &Context) -> Box + Send>; - fn delete_work_edit(&self, edit_id: i64, context: &Context) -> Box + Send>; + fn delete_work_edit(&self, edit_id: String, context: &Context) -> Box + Send>; fn get_work(&self, ident: String, expand: Option, hide: Option, context: &Context) -> Box + Send>; - fn get_work_edit(&self, edit_id: i64, context: &Context) -> Box + Send>; + fn get_work_edit(&self, edit_id: String, context: &Context) -> Box + Send>; fn get_work_history(&self, ident: String, limit: Option, context: &Context) -> Box + Send>; @@ -1328,11 +1328,11 @@ pub trait ApiNoContext { fn delete_container(&self, ident: String, editgroup_id: Option) -> Box + Send>; - fn delete_container_edit(&self, edit_id: i64) -> Box + Send>; + fn delete_container_edit(&self, edit_id: String) -> Box + Send>; fn get_container(&self, ident: String, expand: Option, hide: Option) -> Box + Send>; - fn get_container_edit(&self, edit_id: i64) -> Box + Send>; + fn get_container_edit(&self, edit_id: String) -> Box + Send>; fn get_container_history(&self, ident: String, limit: Option) -> Box + Send>; @@ -1361,11 +1361,11 @@ pub trait ApiNoContext { fn delete_creator(&self, ident: String, editgroup_id: Option) -> Box + Send>; - fn delete_creator_edit(&self, edit_id: i64) -> Box + Send>; + fn delete_creator_edit(&self, edit_id: String) -> Box + Send>; fn get_creator(&self, ident: String, expand: Option, hide: Option) -> Box + Send>; - fn get_creator_edit(&self, edit_id: i64) -> Box + Send>; + fn get_creator_edit(&self, edit_id: String) -> Box + Send>; fn get_creator_history(&self, ident: String, limit: Option) -> Box + Send>; @@ -1399,11 +1399,11 @@ pub trait ApiNoContext { fn delete_file(&self, ident: String, editgroup_id: Option) -> Box + Send>; - fn delete_file_edit(&self, edit_id: i64) -> Box + Send>; + fn delete_file_edit(&self, edit_id: String) -> Box + Send>; fn get_file(&self, ident: String, expand: Option, hide: Option) -> Box + Send>; - fn get_file_edit(&self, edit_id: i64) -> Box + Send>; + fn get_file_edit(&self, edit_id: String) -> Box + Send>; fn get_file_history(&self, ident: String, limit: Option) -> Box + Send>; @@ -1433,11 +1433,11 @@ pub trait ApiNoContext { fn delete_fileset(&self, ident: String, editgroup_id: Option) -> Box + Send>; - fn delete_fileset_edit(&self, edit_id: i64) -> Box + Send>; + fn delete_fileset_edit(&self, edit_id: String) -> Box + Send>; fn get_fileset(&self, ident: String, expand: Option, hide: Option) -> Box + Send>; - fn get_fileset_edit(&self, edit_id: i64) -> Box + Send>; + fn get_fileset_edit(&self, edit_id: String) -> Box + Send>; fn get_fileset_history(&self, ident: String, limit: Option) -> Box + Send>; @@ -1460,11 +1460,11 @@ pub trait ApiNoContext { fn delete_release(&self, ident: String, editgroup_id: Option) -> Box + Send>; - fn delete_release_edit(&self, edit_id: i64) -> Box + Send>; + fn delete_release_edit(&self, edit_id: String) -> Box + Send>; fn get_release(&self, ident: String, expand: Option, hide: Option) -> Box + Send>; - fn get_release_edit(&self, edit_id: i64) -> Box + Send>; + fn get_release_edit(&self, edit_id: String) -> Box + Send>; fn get_release_files(&self, ident: String, hide: Option) -> Box + Send>; @@ -1503,11 +1503,11 @@ pub trait ApiNoContext { fn delete_webcapture(&self, ident: String, editgroup_id: Option) -> Box + Send>; - fn delete_webcapture_edit(&self, edit_id: i64) -> Box + Send>; + fn delete_webcapture_edit(&self, edit_id: String) -> Box + Send>; fn get_webcapture(&self, ident: String, expand: Option, hide: Option) -> Box + Send>; - fn get_webcapture_edit(&self, edit_id: i64) -> Box + Send>; + fn get_webcapture_edit(&self, edit_id: String) -> Box + Send>; fn get_webcapture_history(&self, ident: String, limit: Option) -> Box + Send>; @@ -1521,11 +1521,11 @@ pub trait ApiNoContext { fn delete_work(&self, ident: String, editgroup_id: Option) -> Box + Send>; - fn delete_work_edit(&self, edit_id: i64) -> Box + Send>; + fn delete_work_edit(&self, edit_id: String) -> Box + Send>; fn get_work(&self, ident: String, expand: Option, hide: Option) -> Box + Send>; - fn get_work_edit(&self, edit_id: i64) -> Box + Send>; + fn get_work_edit(&self, edit_id: String) -> Box + Send>; fn get_work_history(&self, ident: String, limit: Option) -> Box + Send>; @@ -1571,7 +1571,7 @@ impl<'a, T: Api> ApiNoContext for ContextWrapper<'a, T> { self.api().delete_container(ident, editgroup_id, &self.context()) } - fn delete_container_edit(&self, edit_id: i64) -> Box + Send> { + fn delete_container_edit(&self, edit_id: String) -> Box + Send> { self.api().delete_container_edit(edit_id, &self.context()) } @@ -1579,7 +1579,7 @@ impl<'a, T: Api> ApiNoContext for ContextWrapper<'a, T> { self.api().get_container(ident, expand, hide, &self.context()) } - fn get_container_edit(&self, edit_id: i64) -> Box + Send> { + fn get_container_edit(&self, edit_id: String) -> Box + Send> { self.api().get_container_edit(edit_id, &self.context()) } @@ -1626,7 +1626,7 @@ impl<'a, T: Api> ApiNoContext for ContextWrapper<'a, T> { self.api().delete_creator(ident, editgroup_id, &self.context()) } - fn delete_creator_edit(&self, edit_id: i64) -> Box + Send> { + fn delete_creator_edit(&self, edit_id: String) -> Box + Send> { self.api().delete_creator_edit(edit_id, &self.context()) } @@ -1634,7 +1634,7 @@ impl<'a, T: Api> ApiNoContext for ContextWrapper<'a, T> { self.api().get_creator(ident, expand, hide, &self.context()) } - fn get_creator_edit(&self, edit_id: i64) -> Box + Send> { + fn get_creator_edit(&self, edit_id: String) -> Box + Send> { self.api().get_creator_edit(edit_id, &self.context()) } @@ -1702,7 +1702,7 @@ impl<'a, T: Api> ApiNoContext for ContextWrapper<'a, T> { self.api().delete_file(ident, editgroup_id, &self.context()) } - fn delete_file_edit(&self, edit_id: i64) -> Box + Send> { + fn delete_file_edit(&self, edit_id: String) -> Box + Send> { self.api().delete_file_edit(edit_id, &self.context()) } @@ -1710,7 +1710,7 @@ impl<'a, T: Api> ApiNoContext for ContextWrapper<'a, T> { self.api().get_file(ident, expand, hide, &self.context()) } - fn get_file_edit(&self, edit_id: i64) -> Box + Send> { + fn get_file_edit(&self, edit_id: String) -> Box + Send> { self.api().get_file_edit(edit_id, &self.context()) } @@ -1758,7 +1758,7 @@ impl<'a, T: Api> ApiNoContext for ContextWrapper<'a, T> { self.api().delete_fileset(ident, editgroup_id, &self.context()) } - fn delete_fileset_edit(&self, edit_id: i64) -> Box + Send> { + fn delete_fileset_edit(&self, edit_id: String) -> Box + Send> { self.api().delete_fileset_edit(edit_id, &self.context()) } @@ -1766,7 +1766,7 @@ impl<'a, T: Api> ApiNoContext for ContextWrapper<'a, T> { self.api().get_fileset(ident, expand, hide, &self.context()) } - fn get_fileset_edit(&self, edit_id: i64) -> Box + Send> { + fn get_fileset_edit(&self, edit_id: String) -> Box + Send> { self.api().get_fileset_edit(edit_id, &self.context()) } @@ -1807,7 +1807,7 @@ impl<'a, T: Api> ApiNoContext for ContextWrapper<'a, T> { self.api().delete_release(ident, editgroup_id, &self.context()) } - fn delete_release_edit(&self, edit_id: i64) -> Box + Send> { + fn delete_release_edit(&self, edit_id: String) -> Box + Send> { self.api().delete_release_edit(edit_id, &self.context()) } @@ -1815,7 +1815,7 @@ impl<'a, T: Api> ApiNoContext for ContextWrapper<'a, T> { self.api().get_release(ident, expand, hide, &self.context()) } - fn get_release_edit(&self, edit_id: i64) -> Box + Send> { + fn get_release_edit(&self, edit_id: String) -> Box + Send> { self.api().get_release_edit(edit_id, &self.context()) } @@ -1878,7 +1878,7 @@ impl<'a, T: Api> ApiNoContext for ContextWrapper<'a, T> { self.api().delete_webcapture(ident, editgroup_id, &self.context()) } - fn delete_webcapture_edit(&self, edit_id: i64) -> Box + Send> { + fn delete_webcapture_edit(&self, edit_id: String) -> Box + Send> { self.api().delete_webcapture_edit(edit_id, &self.context()) } @@ -1886,7 +1886,7 @@ impl<'a, T: Api> ApiNoContext for ContextWrapper<'a, T> { self.api().get_webcapture(ident, expand, hide, &self.context()) } - fn get_webcapture_edit(&self, edit_id: i64) -> Box + Send> { + fn get_webcapture_edit(&self, edit_id: String) -> Box + Send> { self.api().get_webcapture_edit(edit_id, &self.context()) } @@ -1914,7 +1914,7 @@ impl<'a, T: Api> ApiNoContext for ContextWrapper<'a, T> { self.api().delete_work(ident, editgroup_id, &self.context()) } - fn delete_work_edit(&self, edit_id: i64) -> Box + Send> { + fn delete_work_edit(&self, edit_id: String) -> Box + Send> { self.api().delete_work_edit(edit_id, &self.context()) } @@ -1922,7 +1922,7 @@ impl<'a, T: Api> ApiNoContext for ContextWrapper<'a, T> { self.api().get_work(ident, expand, hide, &self.context()) } - fn get_work_edit(&self, edit_id: i64) -> Box + Send> { + fn get_work_edit(&self, edit_id: String) -> Box + Send> { self.api().get_work_edit(edit_id, &self.context()) } diff --git a/rust/fatcat-api-spec/src/models.rs b/rust/fatcat-api-spec/src/models.rs index a7c1375f..01b4c28e 100644 --- a/rust/fatcat-api-spec/src/models.rs +++ b/rust/fatcat-api-spec/src/models.rs @@ -264,6 +264,7 @@ impl EditgroupEdits { #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] pub struct Editor { + /// base32-encoded unique identifier #[serde(rename = "editor_id")] #[serde(skip_serializing_if = "Option::is_none")] pub editor_id: Option, @@ -280,24 +281,30 @@ impl Editor { #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] pub struct EntityEdit { + /// UUID (lower-case, dash-separated, hex-encoded 128-bit) #[serde(rename = "edit_id")] - pub edit_id: i64, + pub edit_id: String, + /// base32-encoded unique identifier #[serde(rename = "ident")] pub ident: String, + /// UUID (lower-case, dash-separated, hex-encoded 128-bit) #[serde(rename = "revision")] #[serde(skip_serializing_if = "Option::is_none")] pub revision: Option, + /// UUID (lower-case, dash-separated, hex-encoded 128-bit) #[serde(rename = "prev_revision")] #[serde(skip_serializing_if = "Option::is_none")] pub prev_revision: Option, + /// base32-encoded unique identifier #[serde(rename = "redirect_ident")] #[serde(skip_serializing_if = "Option::is_none")] pub redirect_ident: Option, + /// base32-encoded unique identifier #[serde(rename = "editgroup_id")] pub editgroup_id: String, @@ -307,7 +314,7 @@ pub struct EntityEdit { } impl EntityEdit { - pub fn new(edit_id: i64, ident: String, editgroup_id: String) -> EntityEdit { + pub fn new(edit_id: String, ident: String, editgroup_id: String) -> EntityEdit { EntityEdit { edit_id: edit_id, ident: ident, @@ -797,6 +804,7 @@ pub struct ReleaseRef { #[serde(skip_serializing_if = "Option::is_none")] pub index: Option, + /// base32-encoded unique identifier #[serde(rename = "target_release_id")] #[serde(skip_serializing_if = "Option::is_none")] pub target_release_id: Option, -- cgit v1.2.3