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

Commit 9a20e97

Browse files
J-BlumeJ-Blume
committed
Changed unvalid References in ReferenceElements, (Annotated-)RelationshipElements and BasicEvents
1 parent 99c216f commit 9a20e97

1 file changed

Lines changed: 174 additions & 4 deletions

File tree

  • dataformat-aml/src/test/java/io/adminshell/aas/v3/dataformat/aml/fixtures

‎dataformat-aml/src/test/java/io/adminshell/aas/v3/dataformat/aml/fixtures/FullExample.java‎

Lines changed: 174 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -397,13 +397,33 @@ public class FullExample {
397397
.build())
398398
.build())
399399
.first(new DefaultReference.Builder()
400+
.key(new DefaultKey.Builder()
401+
.type(KeyElements.Submodel)
402+
.value("https://acplt.org/Test_Submodel")
403+
.idType(KeyType.IRI)
404+
.build())
405+
.key(new DefaultKey.Builder()
406+
.type(KeyElements.SubmodelElementCollection)
407+
.value("ExampleSubmodelCollectionOrdered")
408+
.idType(KeyType.ID_SHORT)
409+
.build())
400410
.key(new DefaultKey.Builder()
401411
.type(KeyElements.PROPERTY)
402412
.value("ExampleProperty")
403413
.idType(KeyType.ID_SHORT)
404414
.build())
405415
.build())
406416
.second(new DefaultReference.Builder()
417+
.key(new DefaultKey.Builder()
418+
.type(KeyElements.Submodel)
419+
.value("http://acplt.org/Submodels/Assets/TestAsset/BillOfMaterial")
420+
.idType(KeyType.IRI)
421+
.build())
422+
.key(new DefaultKey.Builder()
423+
.type(KeyElements.Entity)
424+
.value("ExampleEntity")
425+
.idType(KeyType.ID_SHORT)
426+
.build())
407427
.key(new DefaultKey.Builder()
408428
.type(KeyElements.PROPERTY)
409429
.value("ExampleProperty2")
@@ -424,13 +444,33 @@ public class FullExample {
424444
.build())
425445
.build())
426446
.first(new DefaultReference.Builder()
447+
.key(new DefaultKey.Builder()
448+
.type(KeyElements.Submodel)
449+
.value("https://acplt.org/Test_Submodel")
450+
.idType(KeyType.IRI)
451+
.build())
452+
.key(new DefaultKey.Builder()
453+
.type(KeyElements.SubmodelElementCollection)
454+
.value("ExampleSubmodelCollectionOrdered")
455+
.idType(KeyType.ID_SHORT)
456+
.build())
427457
.key(new DefaultKey.Builder()
428458
.type(KeyElements.PROPERTY)
429459
.value("ExampleProperty")
430460
.idType(KeyType.ID_SHORT)
431461
.build())
432462
.build())
433463
.second(new DefaultReference.Builder()
464+
.key(new DefaultKey.Builder()
465+
.type(KeyElements.Submodel)
466+
.value("http://acplt.org/Submodels/Assets/TestAsset/BillOfMaterial")
467+
.idType(KeyType.IRI)
468+
.build())
469+
.key(new DefaultKey.Builder()
470+
.type(KeyElements.Entity)
471+
.value("ExampleEntity")
472+
.idType(KeyType.ID_SHORT)
473+
.build())
434474
.key(new DefaultKey.Builder()
435475
.type(KeyElements.PROPERTY)
436476
.value("ExampleProperty2")
@@ -556,6 +596,16 @@ public class FullExample {
556596
.build())
557597
.build())
558598
.observed(new DefaultReference.Builder()
599+
.key(new DefaultKey.Builder()
600+
.type(KeyElements.Submodel)
601+
.value("https://acplt.org/Test_Submodel")
602+
.idType(KeyType.IRI)
603+
.build())
604+
.key(new DefaultKey.Builder()
605+
.type(KeyElements.SubmodelElementCollection)
606+
.value("ExampleSubmodelCollectionOrdered")
607+
.idType(KeyType.ID_SHORT)
608+
.build())
559609
.key(new DefaultKey.Builder()
560610
.type(KeyElements.PROPERTY)
561611
.idType(KeyType.ID_SHORT)
@@ -691,6 +741,16 @@ public class FullExample {
691741
.build())
692742
.build())
693743
.value(new DefaultReference.Builder()
744+
.key(new DefaultKey.Builder()
745+
.type(KeyElements.Submodel)
746+
.value("https://acplt.org/Test_Submodel")
747+
.idType(KeyType.IRI)
748+
.build())
749+
.key(new DefaultKey.Builder()
750+
.type(KeyElements.SubmodelElementCollection)
751+
.value("ExampleSubmodelCollectionOrdered")
752+
.idType(KeyType.ID_SHORT)
753+
.build())
694754
.key(new DefaultKey.Builder()
695755
.type(KeyElements.PROPERTY)
696756
.idType(KeyType.ID_SHORT)
@@ -712,33 +772,73 @@ public class FullExample {
712772
.submodelElement(new DefaultRelationshipElement.Builder()
713773
.idShort("ExampleRelationshipElement")
714774
.first(new DefaultReference.Builder()
775+
.key(new DefaultKey.Builder()
776+
.type(KeyElements.Submodel)
777+
.value("https://acplt.org/Test_Submodel_Mandatory")
778+
.idType(KeyType.IRI)
779+
.build())
780+
.key(new DefaultKey.Builder()
781+
.type(KeyElements.SubmodelElementCollection)
782+
.value("ExampleSubmodelCollectionOrdered")
783+
.idType(KeyType.ID_SHORT)
784+
.build())
715785
.key(new DefaultKey.Builder()
716786
.type(KeyElements.PROPERTY)
717787
.value("ExampleProperty")
718788
.idType(KeyType.ID_SHORT)
719789
.build())
720790
.build())
721791
.second(new DefaultReference.Builder()
792+
.key(new DefaultKey.Builder()
793+
.type(KeyElements.Submodel)
794+
.value("https://acplt.org/Test_Submodel_Mandatory")
795+
.idType(KeyType.IRI)
796+
.build())
797+
.key(new DefaultKey.Builder()
798+
.type(KeyElements.SubmodelElementCollection)
799+
.value("ExampleSubmodelCollectionOrdered")
800+
.idType(KeyType.ID_SHORT)
801+
.build())
722802
.key(new DefaultKey.Builder()
723803
.type(KeyElements.PROPERTY)
724-
.value("ExampleProperty")
804+
.value("ExampleMultiLanguageProperty")
725805
.idType(KeyType.ID_SHORT)
726806
.build())
727807
.build())
728808
.build())
729809
.submodelElement(new DefaultAnnotatedRelationshipElement.Builder()
730810
.idShort("ExampleAnnotatedRelationshipElement")
731811
.first(new DefaultReference.Builder()
812+
.key(new DefaultKey.Builder()
813+
.type(KeyElements.Submodel)
814+
.value("https://acplt.org/Test_Submodel_Mandatory")
815+
.idType(KeyType.IRI)
816+
.build())
817+
.key(new DefaultKey.Builder()
818+
.type(KeyElements.SubmodelElementCollection)
819+
.value("ExampleSubmodelCollectionOrdered")
820+
.idType(KeyType.ID_SHORT)
821+
.build())
732822
.key(new DefaultKey.Builder()
733823
.type(KeyElements.PROPERTY)
734824
.value("ExampleProperty")
735825
.idType(KeyType.ID_SHORT)
736826
.build())
737827
.build())
738828
.second(new DefaultReference.Builder()
829+
.key(new DefaultKey.Builder()
830+
.type(KeyElements.Submodel)
831+
.value("https://acplt.org/Test_Submodel_Mandatory")
832+
.idType(KeyType.IRI)
833+
.build())
834+
.key(new DefaultKey.Builder()
835+
.type(KeyElements.SubmodelElementCollection)
836+
.value("ExampleSubmodelCollectionOrdered")
837+
.idType(KeyType.ID_SHORT)
838+
.build())
739839
.key(new DefaultKey.Builder()
740840
.type(KeyElements.PROPERTY)
741-
.value("ExampleProperty")
841+
.value("ExampleMultiLanguageProperty")
742842
.idType(KeyType.ID_SHORT)
743843
.build())
744844
.build())
@@ -752,6 +852,16 @@ public class FullExample {
752852
.submodelElement(new DefaultBasicEvent.Builder()
753853
.idShort("ExampleBasicEvent")
754854
.observed(new DefaultReference.Builder()
855+
.key(new DefaultKey.Builder()
856+
.type(KeyElements.Submodel)
857+
.value("https://acplt.org/Test_Submodel_Mandatory")
858+
.idType(KeyType.IRI)
859+
.build())
860+
.key(new DefaultKey.Builder()
861+
.type(KeyElements.SubmodelElementCollection)
862+
.value("ExampleSubmodelCollectionOrdered")
863+
.idType(KeyType.ID_SHORT)
864+
.build())
755865
.key(new DefaultKey.Builder()
756866
.type(KeyElements.PROPERTY)
757867
.idType(KeyType.ID_SHORT)
@@ -840,16 +950,36 @@ public class FullExample {
840950
.build())
841951
.build())
842952
.first(new DefaultReference.Builder()
953+
.key(new DefaultKey.Builder()
954+
.type(KeyElements.Submodel)
955+
.value("https://acplt.org/Test_Submodel_Missing")
956+
.idType(KeyType.IRI)
957+
.build())
958+
.key(new DefaultKey.Builder()
959+
.type(KeyElements.SubmodelElementCollection)
960+
.value("ExampleSubmodelCollectionOrdered")
961+
.idType(KeyType.ID_SHORT)
962+
.build())
843963
.key(new DefaultKey.Builder()
844964
.type(KeyElements.PROPERTY)
845965
.value("ExampleProperty")
846966
.idType(KeyType.ID_SHORT)
847967
.build())
848968
.build())
849969
.second(new DefaultReference.Builder()
970+
.key(new DefaultKey.Builder()
971+
.type(KeyElements.Submodel)
972+
.value("https://acplt.org/Test_Submodel_Missing")
973+
.idType(KeyType.IRI)
974+
.build())
975+
.key(new DefaultKey.Builder()
976+
.type(KeyElements.SubmodelElementCollection)
977+
.value("ExampleSubmodelCollectionOrdered")
978+
.idType(KeyType.ID_SHORT)
979+
.build())
850980
.key(new DefaultKey.Builder()
851981
.type(KeyElements.PROPERTY)
852-
.value("ExampleProperty")
982+
.value("ExampleMultiLanguageProperty")
853983
.idType(KeyType.ID_SHORT)
854984
.build())
855985
.build())
@@ -867,16 +997,36 @@ public class FullExample {
867997
.build())
868998
.build())
869999
.first(new DefaultReference.Builder()
1000+
.key(new DefaultKey.Builder()
1001+
.type(KeyElements.Submodel)
1002+
.value("https://acplt.org/Test_Submodel_Missing")
1003+
.idType(KeyType.IRI)
1004+
.build())
1005+
.key(new DefaultKey.Builder()
1006+
.type(KeyElements.SubmodelElementCollection)
1007+
.value("ExampleSubmodelCollectionOrdered")
1008+
.idType(KeyType.ID_SHORT)
1009+
.build())
8701010
.key(new DefaultKey.Builder()
8711011
.type(KeyElements.PROPERTY)
8721012
.value("ExampleProperty")
8731013
.idType(KeyType.ID_SHORT)
8741014
.build())
8751015
.build())
8761016
.second(new DefaultReference.Builder()
1017+
.key(new DefaultKey.Builder()
1018+
.type(KeyElements.Submodel)
1019+
.value("https://acplt.org/Test_Submodel_Missing")
1020+
.idType(KeyType.IRI)
1021+
.build())
1022+
.key(new DefaultKey.Builder()
1023+
.type(KeyElements.SubmodelElementCollection)
1024+
.value("ExampleSubmodelCollectionOrdered")
1025+
.idType(KeyType.ID_SHORT)
1026+
.build())
8771027
.key(new DefaultKey.Builder()
8781028
.type(KeyElements.PROPERTY)
879-
.value("ExampleProperty")
1029+
.value("ExampleMultiLanguageProperty")
8801030
.idType(KeyType.ID_SHORT)
8811031
.build())
8821032
.build())
@@ -990,6 +1140,16 @@ public class FullExample {
9901140
.build())
9911141
.build())
9921142
.observed(new DefaultReference.Builder()
1143+
.key(new DefaultKey.Builder()
1144+
.type(KeyElements.Submodel)
1145+
.value("https://acplt.org/Test_Submodel_Missing")
1146+
.idType(KeyType.IRI)
1147+
.build())
1148+
.key(new DefaultKey.Builder()
1149+
.type(KeyElements.SubmodelElementCollection)
1150+
.value("ExampleSubmodelCollectionOrdered")
1151+
.idType(KeyType.ID_SHORT)
1152+
.build())
9931153
.key(new DefaultKey.Builder()
9941154
.type(KeyElements.PROPERTY)
9951155
.idType(KeyType.ID_SHORT)
@@ -1116,6 +1276,16 @@ public class FullExample {
11161276
.build())
11171277
.build())
11181278
.value(new DefaultReference.Builder()
1279+
.key(new DefaultKey.Builder()
1280+
.type(KeyElements.Submodel)
1281+
.value("https://acplt.org/Test_Submodel_Missing")
1282+
.idType(KeyType.IRI)
1283+
.build())
1284+
.key(new DefaultKey.Builder()
1285+
.type(KeyElements.SubmodelElementCollection)
1286+
.value("ExampleSubmodelCollectionOrdered")
1287+
.idType(KeyType.ID_SHORT)
1288+
.build())
11191289
.key(new DefaultKey.Builder()
11201290
.type(KeyElements.PROPERTY)
11211291
.idType(KeyType.ID_SHORT)

0 commit comments

Comments
 (0)