From 341577640a058c0ec92ff735eb915391e8d4ed8a Mon Sep 17 00:00:00 2001 From: b0bkaT Date: Mon, 28 Jun 2021 12:58:27 -0400 Subject: [PATCH 1/2] Added property restriction to observable:ProfileFacet (CP-7) Added observable:profileWebsite as a property restriction (property shape) on observable:ProfileFacet. This fix is in continuation of implementing the changes mentioned within CP-7. AJN: This cherry-pick ended up being a manual re-write of the original patch Trevor authored. Sorting confused cherry-pick pretty thoroughly. References: * [OC-26] (CP-7) Create new Profile facet * [OC-68] (CP-23) Convert current property restrictions and domain assertions to SHACL class shapes Acked-by: Trevor Bobka (cherry picked from commit f70b15b284c67bf5838ee141e110d1e7661d8c4d) --- uco-observable/observable.ttl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/uco-observable/observable.ttl b/uco-observable/observable.ttl index e8c35be9..b79beef6 100644 --- a/uco-observable/observable.ttl +++ b/uco-observable/observable.ttl @@ -4382,6 +4382,10 @@ observable:ProfileFacet [ sh:minCount "0"^^xsd:integer ; sh:path observable:profileLanguage ; + ] , + [ + sh:minCount "0"^^xsd:integer ; + sh:path observable:profileWebsite ; ] ; sh:targetClass observable:ProfileFacet ; From 335678fcff3b59d5c07909cc09adfec26d4b11ee Mon Sep 17 00:00:00 2001 From: b0bkaT Date: Mon, 28 Jun 2021 13:28:23 -0400 Subject: [PATCH 2/2] Added cardinality restraint for observable:profileWebsite AJN: This cherry-pick ended up being a manual re-write of the original patch Trevor authored. Sorting confused cherry-pick pretty thoroughly. References: * [OC-26] (CP-7) Create new Profile facet * [OC-68] (CP-23) Convert current property restrictions and domain assertions to SHACL class shapes (cherry picked from commit c39b34ab9cd03c97699eca74987c97265e42894f) --- uco-observable/observable.ttl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/uco-observable/observable.ttl b/uco-observable/observable.ttl index b79beef6..1733b143 100644 --- a/uco-observable/observable.ttl +++ b/uco-observable/observable.ttl @@ -4380,12 +4380,12 @@ observable:ProfileFacet sh:path observable:profileService ; ] , [ - sh:minCount "0"^^xsd:integer ; - sh:path observable:profileLanguage ; + sh:maxCount "1"^^xsd:integer ; + sh:path observable:profileWebsite ; ] , [ sh:minCount "0"^^xsd:integer ; - sh:path observable:profileWebsite ; + sh:path observable:profileLanguage ; ] ; sh:targetClass observable:ProfileFacet ;