Skip to content
This repository was archived by the owner on Feb 15, 2024. It is now read-only.

Commit 804106c

Browse files
author
changqin26
committed
Adjusted several constraint shapes.
1 parent f86c262 commit 804106c

1 file changed

Lines changed: 26 additions & 13 deletions

File tree

‎validator/src/main/resources/constraint_shapes.ttl‎

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ aas:AASd-021Shape a sh:NodeShape ;
237237
sh:targetClass aas:Qualifiable ;
238238
sh:property [
239239
a sh:PropertyShape ;
240-
#sh:path <https://admin-shell.io/aas/3/0/RC01/Qualifiable/valueType> ;
240+
sh:path <https://admin-shell.io/aas/3/0/RC01/Qualifiable/valueType> ;
241241
sh:sparql [
242242
a sh:SPARQLConstraint ;
243243
sh:message "(AASd-021Shape) - Every Qualifiable can only have one Qualifier with the same Qualifier/type." ;
@@ -253,6 +253,7 @@ aas:AASd-021Shape a sh:NodeShape ;
253253
]
254254
];
255255
.
256+
256257
# AASd-023
257258
aas:AASd-023Shape a sh:NodeShape ;
258259
sh:targetClass aas:AssetInformation;
@@ -266,7 +267,7 @@ aas:AASd-023Shape a sh:NodeShape ;
266267
?assetInformation <https://admin-shell.io/aas/3/0/RC01/AssetInformation/globalAssetId> ?globalAssetId .
267268
?globalAssetId <https://admin-shell.io/aas/3/0/RC01/Reference/key> ?key .
268269
?key <https://admin-shell.io/aas/3/0/RC01/Key/type> ?keyType .
269-
FILTER (?keyType != <https://admin-shell.io/aas/3/0/RC01/IdentifiableElements/Asset> && ?keyType != <https://admin-shell.io/aas/3/0/RC01/IdentifiableElements/GlobalReferences>)
270+
FILTER (?keyType != <https://admin-shell.io/aas/3/0/RC01/IdentifiableElements/Asset> && ?keyType != <https://admin-shell.io/aas/3/0/RC01/KeyElements/GlobalReference>)
270271
271272
}
272273
""" ;
@@ -602,7 +603,7 @@ aas:ConceptDescriptionReferencedFromViewAllowedCategories a sh:NodeShape ;
602603
] .
603604

604605
# AASd-065-Property
605-
aas:AASd-065PropertyShape a sh:NodeShape ;
606+
aas:AASd-065a-PropertyShape a sh:NodeShape ;
606607
sh:targetClass aas:Property;
607608
sh:sparql [
608609
a sh:SPARQLConstraint ;
@@ -614,26 +615,36 @@ aas:AASd-065PropertyShape a sh:NodeShape ;
614615
?property a <https://admin-shell.io/aas/3/0/RC01/Property> .
615616
?property <https://admin-shell.io/aas/3/0/RC01/Property/value> ?propertyValue .
616617
?property <https://admin-shell.io/aas/3/0/RC01/Property/valueId> ?propertyValueId .
618+
617619
?propertyValueId <https://admin-shell.io/aas/3/0/RC01/Reference/key> ?propertyReferenceKey .
620+
618621
?propertyReferenceKey <https://admin-shell.io/aas/3/0/RC01/Key/value> ?propertyReferenceKeyValue .
622+
?propertyReferenceKey <https://admin-shell.io/aas/3/0/RC01/Key/idType> ?propertyReferenceKeyIdType .
623+
?propertyReferenceKey <https://admin-shell.io/aas/3/0/RC01/Key/type> ?propertyReferenceKeyType .
624+
619625
?property <https://admin-shell.io/aas/3/0/RC01/HasSemantics/semanticId> ?semanticId .
620626
?semanticId <https://admin-shell.io/aas/3/0/RC01/Reference/key> ?semanticIdReferenceKey .
621-
?semanticIdReferenceKey <https://admin-shell.io/aas/3/0/RC01/Key/type> <https://admin-shell.io/aas/3/0/RC01/ConceptDescription> .
622-
?conceptDescription <https://admin-shell.io/aas/3/0/RC01/Referable/category> "Value" .
627+
?semanticIdReferenceKey <https://admin-shell.io/aas/3/0/RC01/Key/type> <https://admin-shell.io/aas/3/0/RC01/IdentifiableElements/ConceptDescription> .
628+
629+
?conceptDescription <https://admin-shell.io/aas/3/0/RC01/Referable/category> "VALUE" .
623630
?conceptDescription <https://admin-shell.io/aas/3/0/RC01/HasDataSpecification/embeddedDataSpecification> ?embeddedDataSpecification .
624631
?embeddedDataSpecification <https://admin-shell.io/aas/3/0/RC01/EmbeddedDataSpecification/dataSpecificationContent> ?dataSpecificationContent .
625632
?dataSpecificationContent <https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0/RC01/DataSpecificationIEC61360/value> ?dataSpecificationIEC61360Value .
633+
626634
?dataSpecificationContent <https://admin-shell.io/DataSpecificationTemplates/DataSpecificationIEC61360/3/0/RC01/DataSpecificationIEC61360/valueId> ?dataSpecificationIEC61360ValueId .
635+
627636
?dataSpecificationIEC61360ValueId <https://admin-shell.io/aas/3/0/RC01/Reference/key> ?dataSpecificationIEC61360ValueIdKey .
628-
?dataSpecificationIEC61360ValueIdKey <https://admin-shell.io/aas/3/0/RC01/Key/value> ?dataSpecificationIEC61360ValueIdKeyValue .
629637
630-
FILTER(?propertyValue != ?dataSpecificationIEC61360Value && ?propertyValueId != ?dataSpecificationIEC61360ValueIdKeyValue)
638+
?dataSpecificationIEC61360ValueIdKey <https://admin-shell.io/aas/3/0/RC01/Key/value> ?dataSpecificationIEC61360ValueIdKeyValue .
639+
?dataSpecificationIEC61360ValueIdKey <https://admin-shell.io/aas/3/0/RC01/Key/idType> ?dataSpecificationIEC61360ValueIdKeyIdType .
640+
?dataSpecificationIEC61360ValueIdKey <https://admin-shell.io/aas/3/0/RC01/Key/type> ?dataSpecificationIEC61360ValueIdKeyType .
641+
FILTER(?propertyValue != ?dataSpecificationIEC61360Value && ?propertyValueId != ?dataSpecificationIEC61360ValueId)
631642
}
632643
""" ;
633644
] .
634645

635646
# AASd-065-MultilanguageProperty
636-
aas:AASd-065MultiLanguagePropertyShape a sh:NodeShape ;
647+
aas:AASd-065b-MultiLanguagePropertyShape a sh:NodeShape ;
637648
sh:targetClass aas:MultiLanguageProperty;
638649
sh:sparql [
639650
a sh:SPARQLConstraint ;
@@ -713,7 +724,8 @@ aas:AASd-066MultiLanguagePropertyShape a sh:NodeShape ;
713724
?MultiLanguagePropertyReferenceKey <https://admin-shell.io/aas/3/0/RC01/Key/value> ?MultiLanguagePropertyReferenceKeyValue .
714725
?MultiLanguageProperty <https://admin-shell.io/aas/3/0/RC01/HasSemantics/semanticId> ?semanticId .
715726
?semanticId <https://admin-shell.io/aas/3/0/RC01/Reference/key> ?semanticIdReferenceKey .
716-
?semanticIdReferenceKey <https://admin-shell.io/aas/3/0/RC01/Key/type> <https://admin-shell.io/aas/3/0/RC01/ConceptDescription> .
727+
?semanticIdReferenceKey <https://admin-shell.io/aas/3/0/RC01/Key/type> <https://admin-shell.io/aas/3/0/RC01/IdentifableElements/ConceptDescription> .
728+
717729
?conceptDescription <https://admin-shell.io/aas/3/0/RC01/Referable/category> "Property" .
718730
?conceptDescription <https://admin-shell.io/aas/3/0/RC01/HasDataSpecification/embeddedDataSpecification> ?embeddedDataSpecification .
719731
?embeddedDataSpecification <https://admin-shell.io/aas/3/0/RC01/EmbeddedDataSpecification/dataSpecificationContent> ?dataSpecificationContent .
@@ -724,7 +736,7 @@ aas:AASd-066MultiLanguagePropertyShape a sh:NodeShape ;
724736
?valueReferencePairValueId <https://admin-shell.io/aas/3/0/RC01/Reference/key> ?valueReferencePairValueIdKey .
725737
?valueReferencePairValueIdKey <https://admin-shell.io/aas/3/0/RC01/Key/value> ?valueReferencePairValueIdKeyValue .
726738
727-
FILTER(?MultiLanguagePropertyValue != ?valueReferencePairValue && ?MultiLanguagePropertyValueId != ?valueReferencePairValueIdKeyValue)
739+
FILTER(?MultiLanguagePropertyValue != ?valueReferencePairValue && ?MultiLanguagePropertyValueId != ?valueReferencePairValueId)
728740
}
729741
""" ;
730742
] .
@@ -1070,6 +1082,7 @@ aas:ConceptDescriptionReferencedFromSubmodelElementCollectionAllowedDuplicates
10701082
}
10711083
""" ;
10721084
] .
1085+
10731086
# AASd-100
10741087
aas:ReferableShape a sh:NodeShape ;
10751088
sh:targetClass aas:Referable ;
@@ -1079,7 +1092,7 @@ aas:ReferableShape a sh:NodeShape ;
10791092
sh:datatype xsd:string ;
10801093
sh:maxCount 1 ;
10811094
sh:minCount 0 ;
1082-
sh:pattern "^(?!\s*$).+" ;
1083-
sh:message "(Referable.category):An attribute with data type "string" is not allowed to be empty."^^xsd:string ;
1095+
sh:pattern "^(?!\\s*$).+" ;
1096+
sh:message "(Referable.category):An attribute with data type \"string\" is not allowed to be empty."^^xsd:string ;
10841097
] ;
1085-
.
1098+
.

0 commit comments

Comments
 (0)