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.

Sign up for GitHub

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

Jump to bottom

Re-type relationships relating one non-Observable as core:Relationship #283

Merged
merged 2 commits into from
Apr 29, 2024
Merged

Re-type relationships relating one non-Observable as core:Relationship #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4154280
Re-type relationships relating one non-Observable as core:Relationship
ajnelson-nist Mar 14, 2024
7168185
Regenerate Make-managed files
ajnelson-nist Mar 14, 2024
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 examples/crossover_wmd/crossover_wmd.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1024,7 +1024,7 @@
},
{
"@id": "kb:primaryuser-email-3c4d0804-6ed0-4dfe-a152-3dab6b5f9111",
"@type": "uco-observable:ObservableRelationship",
"@type": "uco-core:Relationship",
"uco-core:source": {
"@id": "kb:primaryuser-1e96406f-d86c-47ee-a6ac-71a57e1c8f19"
},
Expand All @@ -1036,7 +1036,7 @@
},
{
"@id": "kb:primaryuser-whatsapp-b295bc93-b65c-4670-a5d7-5c2206d78e92",
"@type": "uco-observable:ObservableRelationship",
"@type": "uco-core:Relationship",
"uco-core:source": {
"@id": "kb:primaryuser-1e96406f-d86c-47ee-a6ac-71a57e1c8f19"
},
Expand Down
29 changes: 1 addition & 28 deletions examples/crossover_wmd/crossover_wmd_validation-unstable-2.0.0.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@prefix core: <https://ontology.unifiedcyberontology.org/uco/core/> .
@prefix owl: <http://www.w3.org/2002/07/owl#> .
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
Expand All @@ -9,7 +8,7 @@

[]
a sh:ValidationReport ;
sh:conforms "false"^^xsd:boolean ;
sh:conforms "true"^^xsd:boolean ;
sh:result
[
a sh:ValidationResult ;
Expand Down Expand Up @@ -40,32 +39,6 @@
sh:severity sh:Info ;
] ;
sh:value "Phone" ;
] ,
[
a sh:ValidationResult ;
sh:focusNode <http://example.org/kb/primaryuser-email-3c4d0804-6ed0-4dfe-a152-3dab6b5f9111> ;
sh:resultMessage "Value does not have class uco-observable:Observable" ;
sh:resultPath core:source ;
sh:resultSeverity sh:Violation ;
sh:sourceConstraintComponent sh:ClassConstraintComponent ;
sh:sourceShape [
sh:class uco-observable:Observable ;
sh:path core:source ;
] ;
sh:value <http://example.org/kb/primaryuser-1e96406f-d86c-47ee-a6ac-71a57e1c8f19> ;
] ,
[
a sh:ValidationResult ;
sh:focusNode <http://example.org/kb/primaryuser-whatsapp-b295bc93-b65c-4670-a5d7-5c2206d78e92> ;
sh:resultMessage "Value does not have class uco-observable:Observable" ;
sh:resultPath core:source ;
sh:resultSeverity sh:Violation ;
sh:sourceConstraintComponent sh:ClassConstraintComponent ;
sh:sourceShape [
sh:class uco-observable:Observable ;
sh:path core:source ;
] ;
sh:value <http://example.org/kb/primaryuser-1e96406f-d86c-47ee-a6ac-71a57e1c8f19> ;
]
;
.
Expand Down
33 changes: 1 addition & 32 deletions examples/crossover_wmd/crossover_wmd_validation-unstable.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@prefix core: <https://ontology.unifiedcyberontology.org/uco/core/> .
@prefix owl: <http://www.w3.org/2002/07/owl#> .
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
Expand All @@ -9,7 +8,7 @@

[]
a sh:ValidationReport ;
sh:conforms "false"^^xsd:boolean ;
sh:conforms "true"^^xsd:boolean ;
sh:result
[
a sh:ValidationResult ;
Expand Down Expand Up @@ -40,36 +39,6 @@
sh:severity sh:Info ;
] ;
sh:value "Phone" ;
] ,
[
a sh:ValidationResult ;
sh:focusNode <http://example.org/kb/primaryuser-email-3c4d0804-6ed0-4dfe-a152-3dab6b5f9111> ;
sh:resultMessage "The source on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not. This will be an error in UCO 2.0.0."@en ;
sh:resultPath core:source ;
sh:resultSeverity sh:Warning ;
sh:sourceConstraintComponent sh:ClassConstraintComponent ;
sh:sourceShape [
sh:class uco-observable:Observable ;
sh:message "The source on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not. This will be an error in UCO 2.0.0."@en ;
sh:path core:source ;
sh:severity sh:Warning ;
] ;
sh:value <http://example.org/kb/primaryuser-1e96406f-d86c-47ee-a6ac-71a57e1c8f19> ;
] ,
[
a sh:ValidationResult ;
sh:focusNode <http://example.org/kb/primaryuser-whatsapp-b295bc93-b65c-4670-a5d7-5c2206d78e92> ;
sh:resultMessage "The source on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not. This will be an error in UCO 2.0.0."@en ;
sh:resultPath core:source ;
sh:resultSeverity sh:Warning ;
sh:sourceConstraintComponent sh:ClassConstraintComponent ;
sh:sourceShape [
sh:class uco-observable:Observable ;
sh:message "The source on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not. This will be an error in UCO 2.0.0."@en ;
sh:path core:source ;
sh:severity sh:Warning ;
] ;
sh:value <http://example.org/kb/primaryuser-1e96406f-d86c-47ee-a6ac-71a57e1c8f19> ;
]
;
.
Expand Down
4 changes: 2 additions & 2 deletions examples/crossover_wmd/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -852,7 +852,7 @@ <h4>CASE Representation of Users and Accounts</h4>
},
{
"@id": "kb:primaryuser-email-3c4d0804-6ed0-4dfe-a152-3dab6b5f9111",
"@type": "uco-observable:ObservableRelationship",
"@type": "uco-core:Relationship",
"uco-core:source": {
"@id": "kb:primaryuser-1e96406f-d86c-47ee-a6ac-71a57e1c8f19"
},
Expand All @@ -864,7 +864,7 @@ <h4>CASE Representation of Users and Accounts</h4>
},
{
"@id": "kb:primaryuser-whatsapp-b295bc93-b65c-4670-a5d7-5c2206d78e92",
"@type": "uco-observable:ObservableRelationship",
"@type": "uco-core:Relationship",
"uco-core:source": {
"@id": "kb:primaryuser-1e96406f-d86c-47ee-a6ac-71a57e1c8f19"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/crossover_wmd/src/crossover_wmd-users_and_accounts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
{
"@id": "kb:primaryuser-email-3c4d0804-6ed0-4dfe-a152-3dab6b5f9111",
"@type": "uco-observable:ObservableRelationship",
"@type": "uco-core:Relationship",
"uco-core:source": {
"@id": "kb:primaryuser-1e96406f-d86c-47ee-a6ac-71a57e1c8f19"
},
Expand All @@ -25,7 +25,7 @@
},
{
"@id": "kb:primaryuser-whatsapp-b295bc93-b65c-4670-a5d7-5c2206d78e92",
"@type": "uco-observable:ObservableRelationship",
"@type": "uco-core:Relationship",
"uco-core:source": {
"@id": "kb:primaryuser-1e96406f-d86c-47ee-a6ac-71a57e1c8f19"
},
Expand Down
6 changes: 3 additions & 3 deletions examples/owl_trafficking/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,7 @@ <h5>CASE Representation of Users and Accounts</h5>
},
{
"@id": "kb:primaryuser-faceboook-cb34b068-324b-4162-a9e5-6c96879b061c",
"@type": "uco-observable:ObservableRelationship",
"@type": "uco-core:Relationship",
"uco-core:source": {
"@id": "kb:primaryuser-d28a3fad-10a1-459c-9a1a-6aa07a04e76f"
},
Expand All @@ -673,7 +673,7 @@ <h5>CASE Representation of Users and Accounts</h5>
},
{
"@id": "kb:primaryuser-email-cb34b068-324b-4162-a9e5-6c96879b061c",
"@type": "uco-observable:ObservableRelationship",
"@type": "uco-core:Relationship",
"uco-core:source": {
"@id": "kb:primaryuser-d28a3fad-10a1-459c-9a1a-6aa07a04e76f"
},
Expand Down Expand Up @@ -1534,7 +1534,7 @@ <h5>CASE Representation</h5>
},
{
"@id": "kb:cameralocation-relationship-c6f64e98-68c5-4d2e-9ae8-a7e110f2ac83",
"@type": "uco-observable:ObservableRelationship",
"@type": "uco-core:Relationship",
"uco-core:source": {
"@id": "kb:latlong-8667ec82-8c21-11e9-934e-0c4de9c21b53"
},
Expand Down
6 changes: 3 additions & 3 deletions examples/owl_trafficking/owl_trafficking.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@
},
{
"@id": "kb:primaryuser-faceboook-cb34b068-324b-4162-a9e5-6c96879b061c",
"@type": "uco-observable:ObservableRelationship",
"@type": "uco-core:Relationship",
"uco-core:source": {
"@id": "kb:primaryuser-d28a3fad-10a1-459c-9a1a-6aa07a04e76f"
},
Expand All @@ -391,7 +391,7 @@
},
{
"@id": "kb:primaryuser-email-cb34b068-324b-4162-a9e5-6c96879b061c",
"@type": "uco-observable:ObservableRelationship",
"@type": "uco-core:Relationship",
"uco-core:source": {
"@id": "kb:primaryuser-d28a3fad-10a1-459c-9a1a-6aa07a04e76f"
},
Expand Down Expand Up @@ -1154,7 +1154,7 @@
},
{
"@id": "kb:cameralocation-relationship-c6f64e98-68c5-4d2e-9ae8-a7e110f2ac83",
"@type": "uco-observable:ObservableRelationship",
"@type": "uco-core:Relationship",
"uco-core:source": {
"@id": "kb:latlong-8667ec82-8c21-11e9-934e-0c4de9c21b53"
},
Expand Down
74 changes: 16 additions & 58 deletions examples/owl_trafficking/owl_trafficking_validation-unstable-2.0.0.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@prefix core: <https://ontology.unifiedcyberontology.org/uco/core/> .
@prefix owl: <http://www.w3.org/2002/07/owl#> .
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
Expand All @@ -9,62 +8,21 @@

[]
a sh:ValidationReport ;
sh:conforms "false"^^xsd:boolean ;
sh:result
[
a sh:ValidationResult ;
sh:focusNode <http://example.org/kb/account-facet-ccba5bf1-e927-40a9-bce5-d6dc8a3d8758> ;
sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ;
sh:resultPath uco-observable:accountType ;
sh:resultSeverity sh:Info ;
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
sh:sourceShape [
sh:datatype vocabulary:AccountTypeVocab ;
sh:message "Value is outside the default vocabulary AccountTypeVocab." ;
sh:path uco-observable:accountType ;
sh:severity sh:Info ;
] ;
sh:value "phone" ;
] ,
[
a sh:ValidationResult ;
sh:focusNode <http://example.org/kb/cameralocation-relationship-c6f64e98-68c5-4d2e-9ae8-a7e110f2ac83> ;
sh:resultMessage "Value does not have class uco-observable:Observable" ;
sh:resultPath core:source ;
sh:resultSeverity sh:Violation ;
sh:sourceConstraintComponent sh:ClassConstraintComponent ;
sh:sourceShape [
sh:class uco-observable:Observable ;
sh:path core:source ;
] ;
sh:value <http://example.org/kb/latlong-8667ec82-8c21-11e9-934e-0c4de9c21b53> ;
] ,
[
a sh:ValidationResult ;
sh:focusNode <http://example.org/kb/primaryuser-email-cb34b068-324b-4162-a9e5-6c96879b061c> ;
sh:resultMessage "Value does not have class uco-observable:Observable" ;
sh:resultPath core:source ;
sh:resultSeverity sh:Violation ;
sh:sourceConstraintComponent sh:ClassConstraintComponent ;
sh:sourceShape [
sh:class uco-observable:Observable ;
sh:path core:source ;
] ;
sh:value <http://example.org/kb/primaryuser-d28a3fad-10a1-459c-9a1a-6aa07a04e76f> ;
] ,
[
a sh:ValidationResult ;
sh:focusNode <http://example.org/kb/primaryuser-faceboook-cb34b068-324b-4162-a9e5-6c96879b061c> ;
sh:resultMessage "Value does not have class uco-observable:Observable" ;
sh:resultPath core:source ;
sh:resultSeverity sh:Violation ;
sh:sourceConstraintComponent sh:ClassConstraintComponent ;
sh:sourceShape [
sh:class uco-observable:Observable ;
sh:path core:source ;
] ;
sh:value <http://example.org/kb/primaryuser-d28a3fad-10a1-459c-9a1a-6aa07a04e76f> ;
]
;
sh:conforms "true"^^xsd:boolean ;
sh:result [
a sh:ValidationResult ;
sh:focusNode <http://example.org/kb/account-facet-ccba5bf1-e927-40a9-bce5-d6dc8a3d8758> ;
sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ;
sh:resultPath uco-observable:accountType ;
sh:resultSeverity sh:Info ;
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
sh:sourceShape [
sh:datatype vocabulary:AccountTypeVocab ;
sh:message "Value is outside the default vocabulary AccountTypeVocab." ;
sh:path uco-observable:accountType ;
sh:severity sh:Info ;
] ;
sh:value "phone" ;
] ;
.

80 changes: 16 additions & 64 deletions examples/owl_trafficking/owl_trafficking_validation-unstable.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@prefix core: <https://ontology.unifiedcyberontology.org/uco/core/> .
@prefix owl: <http://www.w3.org/2002/07/owl#> .
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
Expand All @@ -9,68 +8,21 @@

[]
a sh:ValidationReport ;
sh:conforms "false"^^xsd:boolean ;
sh:result
[
a sh:ValidationResult ;
sh:focusNode <http://example.org/kb/account-facet-ccba5bf1-e927-40a9-bce5-d6dc8a3d8758> ;
sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ;
sh:resultPath uco-observable:accountType ;
sh:resultSeverity sh:Info ;
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
sh:sourceShape [
sh:datatype vocabulary:AccountTypeVocab ;
sh:message "Value is outside the default vocabulary AccountTypeVocab." ;
sh:path uco-observable:accountType ;
sh:severity sh:Info ;
] ;
sh:value "phone" ;
] ,
[
a sh:ValidationResult ;
sh:focusNode <http://example.org/kb/cameralocation-relationship-c6f64e98-68c5-4d2e-9ae8-a7e110f2ac83> ;
sh:resultMessage "The source on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not. This will be an error in UCO 2.0.0."@en ;
sh:resultPath core:source ;
sh:resultSeverity sh:Warning ;
sh:sourceConstraintComponent sh:ClassConstraintComponent ;
sh:sourceShape [
sh:class uco-observable:Observable ;
sh:message "The source on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not. This will be an error in UCO 2.0.0."@en ;
sh:path core:source ;
sh:severity sh:Warning ;
] ;
sh:value <http://example.org/kb/latlong-8667ec82-8c21-11e9-934e-0c4de9c21b53> ;
] ,
[
a sh:ValidationResult ;
sh:focusNode <http://example.org/kb/primaryuser-email-cb34b068-324b-4162-a9e5-6c96879b061c> ;
sh:resultMessage "The source on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not. This will be an error in UCO 2.0.0."@en ;
sh:resultPath core:source ;
sh:resultSeverity sh:Warning ;
sh:sourceConstraintComponent sh:ClassConstraintComponent ;
sh:sourceShape [
sh:class uco-observable:Observable ;
sh:message "The source on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not. This will be an error in UCO 2.0.0."@en ;
sh:path core:source ;
sh:severity sh:Warning ;
] ;
sh:value <http://example.org/kb/primaryuser-d28a3fad-10a1-459c-9a1a-6aa07a04e76f> ;
] ,
[
a sh:ValidationResult ;
sh:focusNode <http://example.org/kb/primaryuser-faceboook-cb34b068-324b-4162-a9e5-6c96879b061c> ;
sh:resultMessage "The source on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not. This will be an error in UCO 2.0.0."@en ;
sh:resultPath core:source ;
sh:resultSeverity sh:Warning ;
sh:sourceConstraintComponent sh:ClassConstraintComponent ;
sh:sourceShape [
sh:class uco-observable:Observable ;
sh:message "The source on an ObservableRelationship is expected to be typed as an Observable, and the noted value node is not. This will be an error in UCO 2.0.0."@en ;
sh:path core:source ;
sh:severity sh:Warning ;
] ;
sh:value <http://example.org/kb/primaryuser-d28a3fad-10a1-459c-9a1a-6aa07a04e76f> ;
]
;
sh:conforms "true"^^xsd:boolean ;
sh:result [
a sh:ValidationResult ;
sh:focusNode <http://example.org/kb/account-facet-ccba5bf1-e927-40a9-bce5-d6dc8a3d8758> ;
sh:resultMessage "Value is outside the default vocabulary AccountTypeVocab." ;
sh:resultPath uco-observable:accountType ;
sh:resultSeverity sh:Info ;
sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
sh:sourceShape [
sh:datatype vocabulary:AccountTypeVocab ;
sh:message "Value is outside the default vocabulary AccountTypeVocab." ;
sh:path uco-observable:accountType ;
sh:severity sh:Info ;
] ;
sh:value "phone" ;
] ;
.

4 changes: 2 additions & 2 deletions examples/owl_trafficking/src/owl_trafficking-06.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
{
"@id": "kb:primaryuser-faceboook-cb34b068-324b-4162-a9e5-6c96879b061c",
"@type": "uco-observable:ObservableRelationship",
"@type": "uco-core:Relationship",
"uco-core:source": {
"@id": "kb:primaryuser-d28a3fad-10a1-459c-9a1a-6aa07a04e76f"
},
Expand All @@ -25,7 +25,7 @@
},
{
"@id": "kb:primaryuser-email-cb34b068-324b-4162-a9e5-6c96879b061c",
"@type": "uco-observable:ObservableRelationship",
"@type": "uco-core:Relationship",
"uco-core:source": {
"@id": "kb:primaryuser-d28a3fad-10a1-459c-9a1a-6aa07a04e76f"
},
Expand Down
Loading
Loading