Move sh:in review to named PropertyShape

No effects were observed on Make-managed files. References: * ucoProject/UCO#629 Signed-off-by: Alex Nelson <[email protected]>
casework · Feb 26, 2025 · aafa90e · aafa90e
1 parent 4482054
commit aafa90e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/dependencies/UCO b/dependencies/UCO
diff --git a/ontology/investigation/investigation.ttl b/ontology/investigation/investigation.ttl
@@ -105,6 +105,7 @@ investigation:Investigation
 	rdfs:label "Investigation"@en ;
 	rdfs:comment "An investigation is a grouping of characteristics unique to an exploration of the facts involved in a cyber-relevant set of suspicious activity."@en ;
 	sh:property
+		investigation:Investigation-investigationForm-in-shape ,
 		[
 			sh:class investigation:Authorization ;
 			sh:nodeKind sh:BlankNodeOrIRI ;
@@ -139,16 +140,6 @@ investigation:Investigation
 			sh:nodeKind sh:Literal ;
 			sh:path investigation:focus ;
 		] ,
-		[
-			sh:in (
-				"case"
-				"incident"
-				"suspicious-activity"
-			) ;
-			sh:message "Value is not member of the vocabulary InvestigationFormVocab." ;
-			sh:path investigation:investigationForm ;
-			sh:severity sh:Info ;
-		] ,
 		[
 			sh:maxCount "1"^^xsd:integer ;
 			sh:nodeKind sh:Literal ;
@@ -158,6 +149,18 @@ investigation:Investigation
 	sh:targetClass investigation:Investigation ;
 	.
 
+investigation:Investigation-investigationForm-in-shape
+	a sh:PropertyShape ;
+	sh:in (
+		"case"
+		"incident"
+		"suspicious-activity"
+	) ;
+	sh:message "Value is not member of the vocabulary InvestigationFormVocab." ;
+	sh:path investigation:investigationForm ;
+	sh:severity sh:Info ;
+	.
+
 investigation:InvestigativeAction
 	a
 		owl:Class ,
+29 −23		ontology/uco/action/action.ttl
+385 −319		ontology/uco/observable/observable.ttl
+22 −19		ontology/uco/types/types.ttl
+1 −14		tests/examples/action_inheritance_PASS_validation.ttl
+4 −76		tests/examples/hash_PASS_validation.ttl