From 6ac11fa44786f1e79d24058be87a37cf0cca9a4d Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Fri, 19 Aug 2022 08:51:39 -0400 Subject: [PATCH] Remove sh:minCounts to support minimal object definitions No effects were observed on Make-managed files. References: * https://github.com/ucoProject/UCO/issues/428 Signed-off-by: Alex Nelson --- ontology/uco/identity/identity.ttl | 1 - ontology/uco/observable/observable.ttl | 62 +++----------------------- ontology/uco/tool/tool.ttl | 14 ++---- 3 files changed, 11 insertions(+), 66 deletions(-) diff --git a/ontology/uco/identity/identity.ttl b/ontology/uco/identity/identity.ttl index c32a4626..c08928fc 100644 --- a/ontology/uco/identity/identity.ttl +++ b/ontology/uco/identity/identity.ttl @@ -30,7 +30,6 @@ identity:AddressFacet sh:property [ sh:class location:Location ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:BlankNodeOrIRI ; sh:path identity:address ; ] ; diff --git a/ontology/uco/observable/observable.ttl b/ontology/uco/observable/observable.ttl index 8ab7e263..7ffc4129 100644 --- a/ontology/uco/observable/observable.ttl +++ b/ontology/uco/observable/observable.ttl @@ -155,7 +155,6 @@ observable:AccountFacet [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path observable:accountIdentifier ; ] , @@ -250,7 +249,6 @@ observable:AlternateDataStreamFacet [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path core:name ; ] @@ -356,7 +354,6 @@ observable:ApplicationAccountFacet sh:property [ sh:class observable:ObservableObject ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:BlankNodeOrIRI ; sh:path observable:application ; ] ; @@ -515,7 +512,6 @@ observable:AutonomousSystemFacet [ sh:datatype xsd:integer ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path observable:number ; ] , @@ -575,7 +571,6 @@ observable:BluetoothAddressFacet sh:property [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path observable:addressValue ; ] ; @@ -1215,7 +1210,6 @@ observable:ContactAffiliation [ sh:class identity:Organization ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:BlankNodeOrIRI ; sh:path observable:contactOrganization ; ] , @@ -1505,7 +1499,6 @@ observable:ContactListFacet ] , [ sh:class observable:ObservableObject ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:BlankNodeOrIRI ; sh:path observable:contact ; ] @@ -2062,7 +2055,6 @@ observable:DigitalAddressFacet [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path observable:addressValue ; ] , @@ -2111,14 +2103,12 @@ observable:DigitalSignatureInfoFacet [ sh:datatype xsd:boolean ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path observable:signatureExists ; ] , [ sh:datatype xsd:boolean ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path observable:signatureVerified ; ] , @@ -2297,7 +2287,6 @@ observable:DomainNameFacet [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path observable:value ; ] @@ -2322,7 +2311,6 @@ observable:EXIFFacet rdfs:comment "An EXIF (exchangeable image file format) facet is a grouping of characteristics unique to the formats for images, sound, and ancillary tags used by digital cameras (including smartphones), scanners and other systems handling image and sound files recorded by digital cameras conformant to JEIDA/JEITA/CIPA specifications. [based on https://en.wikipedia.org/wiki/Exif]"@en ; sh:property [ sh:class types:ControlledDictionary ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:BlankNodeOrIRI ; sh:path observable:exifData ; ] ; @@ -2351,7 +2339,6 @@ observable:EmailAccountFacet sh:property [ sh:class observable:ObservableObject ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:BlankNodeOrIRI ; sh:path observable:emailAddress ; ] ; @@ -2381,7 +2368,6 @@ observable:EmailAddressFacet [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path observable:addressValue ; ] , @@ -2648,7 +2634,6 @@ observable:EnvironmentVariable [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path core:name ; ] , @@ -2691,7 +2676,6 @@ observable:EventFacet [ sh:class observable:ObservableObject ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:BlankNodeOrIRI ; sh:path observable:application ; ] , @@ -3136,7 +3120,6 @@ observable:GeoLocationEntryFacet [ sh:class observable:ObservableObject ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:BlankNodeOrIRI ; sh:path observable:application ; ] , @@ -3173,7 +3156,6 @@ observable:GeoLocationLogFacet [ sh:class observable:ObservableObject ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:BlankNodeOrIRI ; sh:path observable:application ; ] , @@ -3210,7 +3192,6 @@ observable:GeoLocationTrackFacet [ sh:class observable:ObservableObject ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:BlankNodeOrIRI ; sh:path observable:application ; ] , @@ -3311,14 +3292,12 @@ observable:HTTPConnectionFacet [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path observable:requestMethod ; ] , [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path observable:requestValue ; ] , @@ -3480,7 +3459,6 @@ observable:IPAddressFacet [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path observable:addressValue ; ] , @@ -3527,7 +3505,6 @@ observable:IPv4AddressFacet sh:property [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path observable:addressValue ; ] ; @@ -3556,7 +3533,6 @@ observable:IPv6AddressFacet sh:property [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path observable:addressValue ; ] ; @@ -3638,7 +3614,6 @@ observable:InstantMessagingAddressFacet [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path observable:addressValue ; ] , @@ -3713,7 +3688,6 @@ observable:MACAddressFacet sh:property [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path observable:addressValue ; ] ; @@ -3757,28 +3731,24 @@ observable:MemoryFacet [ sh:datatype xsd:boolean ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path observable:isInjected ; ] , [ sh:datatype xsd:boolean ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path observable:isMapped ; ] , [ sh:datatype xsd:boolean ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path observable:isProtected ; ] , [ sh:datatype xsd:boolean ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path observable:isVolatile ; ] , @@ -4255,7 +4225,6 @@ observable:MutexFacet sh:property [ sh:datatype xsd:boolean ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path observable:isNamed ; ] ; @@ -4813,7 +4782,6 @@ observable:OnlineServiceFacet [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path core:name ; ] @@ -5002,7 +4970,6 @@ observable:PhoneAccountFacet sh:property [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path observable:phoneNumber ; ] ; @@ -5253,7 +5220,6 @@ observable:PropertiesEnumeratedEffectFacet sh:property [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path observable:properties ; ] ; @@ -5490,7 +5456,6 @@ observable:SIPAddressFacet [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path observable:addressValue ; ] , @@ -5615,7 +5580,6 @@ observable:SendControlCodeEffectFacet sh:property [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path observable:controlCode ; ] ; @@ -5735,7 +5699,6 @@ observable:StateChangeEffectFacet [ sh:class observable:ObservableObject ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:BlankNodeOrIRI ; sh:path observable:newObject ; ] , @@ -5771,7 +5734,6 @@ observable:SymbolicLinkFacet sh:property [ sh:class observable:ObservableObject ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:BlankNodeOrIRI ; sh:path observable:targetFile ; ] ; @@ -6120,15 +6082,14 @@ observable:TwitterProfileFacet [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; - sh:path observable:twitterId ; + sh:path observable:twitterHandle ; ] , [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; - sh:path observable:twitterHandle ; + sh:path observable:twitterId ; ] , [ sh:datatype xsd:string ; @@ -6292,15 +6253,14 @@ observable:URLFacet [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; - sh:path observable:fullValue ; + sh:path observable:fragment ; ] , [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; - sh:path observable:fragment ; + sh:path observable:fullValue ; ] , [ sh:datatype xsd:string ; @@ -6442,7 +6402,6 @@ observable:URLHistoryFacet ] , [ sh:class observable:URLHistoryEntry ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:BlankNodeOrIRI ; sh:path observable:urlHistoryEntry ; ] @@ -6664,7 +6623,6 @@ observable:ValuesEnumeratedEffectFacet sh:property [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path observable:values ; ] ; @@ -7028,7 +6986,6 @@ observable:WifiAddressFacet sh:property [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path observable:addressValue ; ] ; @@ -7107,7 +7064,6 @@ observable:WindowsActiveDirectoryAccountFacet [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path observable:objectGUID ; ] , @@ -7601,7 +7557,6 @@ observable:WindowsPESection [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path core:name ; ] @@ -7813,7 +7768,6 @@ observable:WindowsRegistryKeyFacet [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path observable:key ; ] @@ -7832,7 +7786,6 @@ observable:WindowsRegistryValue [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path core:name ; ] , @@ -7875,21 +7828,20 @@ observable:WindowsServiceFacet [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; - sh:path observable:serviceName ; + sh:path observable:displayName ; ] , [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; - sh:path observable:displayName ; + sh:path observable:groupName ; ] , [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; - sh:path observable:groupName ; + sh:path observable:serviceName ; ] , [ sh:datatype xsd:string ; diff --git a/ontology/uco/tool/tool.ttl b/ontology/uco/tool/tool.ttl index 0bcdd18a..e2082959 100644 --- a/ontology/uco/tool/tool.ttl +++ b/ontology/uco/tool/tool.ttl @@ -153,7 +153,6 @@ tool:BuildUtilityType [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path tool:buildUtilityName ; ] , @@ -214,28 +213,26 @@ tool:ConfigurationSettingType [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; - sh:path tool:itemName ; + sh:path tool:itemDescription ; ] , [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; - sh:path tool:itemValue ; + sh:path tool:itemName ; ] , [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; - sh:path tool:itemDescription ; + sh:path tool:itemType ; ] , [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; - sh:path tool:itemType ; + sh:path tool:itemValue ; ] ; sh:targetClass tool:ConfigurationSettingType ; @@ -263,7 +260,6 @@ tool:DependencyType [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path tool:dependencyDescription ; ] , @@ -288,14 +284,12 @@ tool:LibraryType [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path tool:libraryName ; ] , [ sh:datatype xsd:string ; sh:maxCount "1"^^xsd:integer ; - sh:minCount "1"^^xsd:integer ; sh:nodeKind sh:Literal ; sh:path tool:libraryVersion ; ]