Skip to content

Commit 1057af0

Browse files
authored
Merge pull request #224 from GenomicDataInfrastructure/fix-openapi
fix(openapi): avoid complex objects in access service (unsupported fo…
2 parents 627064f + 0f18b4e commit 1057af0

File tree

2 files changed

+22
-12
lines changed

2 files changed

+22
-12
lines changed

src/main/openapi/ckan.yaml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,8 @@ components:
564564
type: object
565565
properties:
566566
access_rights:
567-
$ref: "#/components/schemas/CkanValueLabel"
567+
type: string
568+
format: uri
568569
applicable_legislation:
569570
type: array
570571
items:
@@ -573,7 +574,8 @@ components:
573574
conforms_to:
574575
type: array
575576
items:
576-
$ref: "#/components/schemas/CkanValueLabel"
577+
type: string
578+
format: uri
577579
contact:
578580
$ref: "#/components/schemas/CkanContactPoint"
579581
creator:
@@ -583,7 +585,7 @@ components:
583585
rights:
584586
type: array
585587
items:
586-
$ref: "#/components/schemas/CkanValueLabel"
588+
type: string
587589
description:
588590
type: string
589591
endpoint_description:
@@ -596,7 +598,8 @@ components:
596598
format:
597599
type: array
598600
items:
599-
$ref: "#/components/schemas/CkanValueLabel"
601+
type: string
602+
format: uri
600603
identifier:
601604
type: string
602605
keyword:
@@ -610,7 +613,8 @@ components:
610613
language:
611614
type: array
612615
items:
613-
$ref: "#/components/schemas/CkanValueLabel"
616+
type: string
617+
format: uri
614618
license:
615619
type: string
616620
modified:
@@ -624,7 +628,8 @@ components:
624628
theme:
625629
type: array
626630
items:
627-
$ref: "#/components/schemas/CkanValueLabel"
631+
type: string
632+
format: uri
628633
uri:
629634
type: string
630635
format: uri

src/main/openapi/discovery.yaml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,8 @@ components:
714714
type: object
715715
properties:
716716
accessRights:
717-
$ref: "#/components/schemas/ValueLabel"
717+
type: string
718+
format: uri
718719
applicableLegislation:
719720
type: array
720721
items:
@@ -723,7 +724,8 @@ components:
723724
conformsTo:
724725
type: array
725726
items:
726-
$ref: "#/components/schemas/ValueLabel"
727+
type: string
728+
format: uri
727729
contact:
728730
$ref: "#/components/schemas/ContactPoint"
729731
creator:
@@ -733,7 +735,7 @@ components:
733735
rights:
734736
type: array
735737
items:
736-
$ref: "#/components/schemas/ValueLabel"
738+
type: string
737739
description:
738740
type: string
739741
endpointDescription:
@@ -746,7 +748,8 @@ components:
746748
format:
747749
type: array
748750
items:
749-
$ref: "#/components/schemas/ValueLabel"
751+
type: string
752+
format: uri
750753
id:
751754
type: string
752755
title: Data service internal ID
@@ -761,7 +764,8 @@ components:
761764
languages:
762765
type: array
763766
items:
764-
$ref: "#/components/schemas/ValueLabel"
767+
type: string
768+
format: uri
765769
license:
766770
type: string
767771
modified:
@@ -776,7 +780,8 @@ components:
776780
theme:
777781
type: array
778782
items:
779-
$ref: "#/components/schemas/ValueLabel"
783+
type: string
784+
format: uri
780785
uri:
781786
type: string
782787
format: uri

0 commit comments

Comments
 (0)