Revise vocabulary pattern for core:ObjectStatusVocab

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

Hide file tree

Showing 3 changed files with 16 additions and 31 deletions.
diff --git a/dependencies/UCO b/dependencies/UCO
diff --git a/ontology/investigation/investigation.ttl b/ontology/investigation/investigation.ttl
@@ -128,45 +128,30 @@ investigation:Investigation
 			sh:nodeKind sh:Literal ;
 			sh:path investigation:investigationStatus ;
 		] ,
+		[
+			sh:datatype xsd:string ;
+			sh:message "As of CASE 1.4.0, the datatype to use for investigation:investigationForm should be xsd:string.  Not using xsd:string will be an error in CASE 2.0.0." ;
+			sh:path investigation:investigationForm ;
+			sh:severity sh:Warning ;
+		] ,
 		[
 			sh:datatype xsd:string ;
 			sh:nodeKind sh:Literal ;
 			sh:path investigation:focus ;
 		] ,
 		[
-			sh:datatype vocabulary:InvestigationFormVocab ;
-			sh:message "Value is outside the default vocabulary InvestigationFormVocab." ;
+			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 ;
-			sh:or (
-				[
-					sh:datatype vocabulary:InvestigationFormVocab ;
-				]
-				[
-					sh:datatype xsd:string ;
-				]
-			) ;
-			sh:path investigation:investigationForm ;
-		] ,
-		[
-			sh:message "Value is not member of the vocabulary InvestigationFormVocab." ;
-			sh:or (
-				[
-					sh:datatype vocabulary:InvestigationFormVocab ;
-					sh:in (
-						"case"^^vocabulary:InvestigationFormVocab
-						"incident"^^vocabulary:InvestigationFormVocab
-						"suspicious-activity"^^vocabulary:InvestigationFormVocab
-					) ;
-				]
-				[
-					sh:datatype xsd:string ;
-				]
-			) ;
 			sh:path investigation:investigationForm ;
 		]
 		;

diff --git a/ontology/vocabulary/vocabulary.ttl b/ontology/vocabulary/vocabulary.ttl
@@ -19,9 +19,9 @@ vocab:InvestigationFormVocab
 	owl:equivalentClass [
 		a rdfs:Datatype ;
 		owl:oneOf (
-			"case"^^vocab:InvestigationFormVocab
-			"incident"^^vocab:InvestigationFormVocab
-			"suspicious-activity"^^vocab:InvestigationFormVocab
+			"case"
+			"incident"
+			"suspicious-activity"
 		) ;
 	] ;
 	.
+26 −56		ontology/uco/action/action.ttl
+14 −14		ontology/uco/core/core.ttl
+366 −696		ontology/uco/observable/observable.ttl
+21 −36		ontology/uco/types/types.ttl
+778 −778		ontology/uco/vocabulary/vocabulary.ttl
+2 −8		tests/examples/action_inheritance_PASS.json
+12 −5		tests/examples/action_inheritance_PASS_validation.ttl
+0 −61		tests/examples/action_inheritance_XFAIL_validation.ttl
+32 −0		tests/examples/hash_PASS.json
+146 −0		tests/examples/hash_PASS_validation.ttl
+3 −39		tests/examples/hash_XFAIL.json
+16 −141		tests/examples/hash_XFAIL_validation.ttl
+1 −4		tests/examples/object_status_PASS.json
+5 −25		tests/examples/object_status_XFAIL_validation.ttl
+13 −7		tests/examples/test_validation.py
+65 −32		tests/test_uco_monolithic.py