Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Changes for issue 156 OpenAPI related #196

Open
wants to merge 1 commit into
base: clean-up
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions framework/json/requests/filteringTerms.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
],
"type": "object"
},
"FilteringTerm": {
"FilteringTermInRequest": {
"anyOf": [
{
"$ref": "#/$defs/OntologyFilter"
Expand Down Expand Up @@ -112,7 +112,7 @@
"additionalProperties": true,
"description": "Filtering terms are the main means to select subsets of records from a Beacon response. While the name implies the application to a generated response, in practice implementations may apply them at the query stage. Note: In the processing of Beacon v2.0 requests multiple filters are assumed to be chained by the logical AND operator.",
"items": {
"$ref": "#/$defs/FilteringTerm"
"$ref": "#/$defs/FilteringTermInRequest"
},
"title": "Filtering Term Element",
"type": "array"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$defs": {
"FilteringTerm": {
"FilteringTermInResponse": {
"description": "Entities can be filtered using this term.",
"properties": {
"id": {
Expand Down Expand Up @@ -129,7 +129,7 @@
"properties": {
"filteringTerms": {
"items": {
"$ref": "#/$defs/FilteringTerm"
"$ref": "#/$defs/FilteringTermInResponse"
},
"type": "array"
},
Expand Down
4 changes: 2 additions & 2 deletions framework/src/requests/filteringTerms.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ description: >-
to be chained by the logical AND operator.
type: array
items:
$ref: '#/$defs/FilteringTerm'
$ref: '#/$defs/FilteringTermInRequest'
$defs:
FilteringTerm:
FilteringTermInRequest:
anyOf:
- $ref: '#/$defs/OntologyFilter'
- $ref: '#/$defs/AlphanumericFilter'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ properties:
filteringTerms:
type: array
items:
$ref: '#/$defs/FilteringTerm'
$ref: '#/$defs/FilteringTermInResponse'
$defs:
FilteringTerm:
FilteringTermInResponse:
type: object
description: >-
Entities can be filtered using this term.
Expand Down
Loading