profile
viewpoint
Michael Jacoby mjacoby Fraunhofer IOSB Karlsruhe

FraunhoferIOSB/ets-sta10 1

Repository for the Executable Test Suite for OGC Sensor Things API

admin-shell-io/aas-transformation-library 0

Java dependency enabling users to transform content following open standards such as AutomationML (AML) into Asset Administration Shell (AAS) format.

mjacoby/beam 0

Apache Beam is a unified programming model for Batch and Streaming

mjacoby/ets-sta10 0

Repository for the Executable Test Suite for OGC Sensor Things API

mjacoby/java-serializer 0

AAS model serializer in Java

mjacoby/moquette 0

Java MQTT lightweight broker

mjacoby/sensorthings 0

The official web site of the OGC SensorThings API standard specification.

PR opened admin-shell-io/java-serializer

Reviewers
Bugfix/reference deserialization bug

When de-/serializing instances of Reference, Enums for id and element type wer not de-/serialized according to the conventions (e.g. was ID_SHORT, now IdShort).

Also versioning schema was updated to allow easier deployment of bugfixes by including datamodel not exactly in the same version but >= [major].[minor] which should also include latest bugfixes on model if they should occur.

+114 -70

0 comment

4 changed files

pr created time in 4 days

issue commentFraunhoferIOSB/FROST-Server

[Question] Filter elements where an attribute does not exist

+1 I also just came across an application scenario where filtering by is null/is not null would be quite helpful.

mkp-gebensleben

comment created time in 21 days

issue commentdiffplug/spotless

Add support for Eclipse Clean Up

+1 Any updates on the status?

JamieMagee

comment created time in 21 days

push eventadmin-shell-io/java-serializer

Michael Jacoby

commit sha 10be7b86c022059609077437f83ad67335a57e83

fixed JSON example to match latest changes

view details

push time in a month

push eventadmin-shell-io/java-serializer

Michael Jacoby

commit sha cc04eae4ce271fcd2d6f4168f756afc41a2ffe98

updated AAS test fixtures to not only provide static instances of AAS model but also creation of custom instances

view details

push time in a month

push eventadmin-shell-io/java-serializer

Michael Jacoby

commit sha 835f1a743a32bec834d571f528f5163d0dab4cf4

updating JSON and AML examples for unit tests

view details

push time in a month

Pull request review commentadmin-shell-io/java-serializer

Feature/example validation

  public class AASSimple { -	private static final String DOCUMENT_DEF = "Feste und geordnete Menge von für die Verwendung durch Personen bestimmte Informationen, die verwaltet und als Einheit zwischen Benutzern und System ausgetauscht werden kann.";-	private static final String ISO15519_1_2010 = "[ISO15519-1:2010]";-	private static final String DOKUMENT = "Dokument";-	private static final String DOCUMENT = "Document";-	private static final String WWW_VDI2770_COM_BLATT1_ENTWURF_OKT18_CD_DOCUMENT = "www.vdi2770.com/blatt1/Entwurf/Okt18/cd/Document";-	private static final String ACTUAL_ROTATIONSPEED_WITH_WHICH_THE_MOTOR_OR_FEEDINGUNIT_IS_OPERATED = "Actual rotationspeed with which the motor or feedingunit is operated";-	private static final String AKTUELLE_DREHZAHL_MITWELCHER_DER_MOTOR_ODER_DIE_SPEISEINHEIT_BETRIEBEN_WIRD = "Aktuelle Drehzahl, mitwelcher der Motor oder die Speiseinheit betrieben wird";-	private static final String ACTUAL_ROTATION_SPEED = "ActualRotationSpeed";-	private static final String ACTUALROTATIONSPEED = "Actualrotationspeed";-	private static final String AKTUELLE_DREHZAHL = "AktuelleDrehzahl";-	private static final String _1_MIN = "1/min";-	private static final String HTTP_CUSTOMER_COM_CD_1_1_18EBD56F6B43D895 = "http://customer.com/cd/1/1/18EBD56F6B43D895";-	private static final String ROTATION_SPEED = "RotationSpeed";-	private static final String MAX_ROTATE_DEF_EN = "Greatestpermissiblerotationspeedwithwhichthemotororfeedingunitmaybeoperated";-	private static final String MAX_ROTATE_DEF_DE = "HöchstezulässigeDrehzahl,mitwelcherderMotoroderdieSpeiseinheitbetriebenwerdendarf";-	private static final String _0173_1_05_AAA650_002 = "0173-1#05-AAA650#002";-	private static final String MAX_ROTATIONSPEED = "Max.rotationspeed";-	private static final String MAX_DREHZAHL = "max.Drehzahl";-	private static final String _0173_1_02_BAA120_008 = "0173-1#02-BAA120#008";-	private static final String PROPERTY = "PROPERTY";-	private static final String MAX_ROTATION_SPEED = "MaxRotationSpeed";-	private static final String DIGITAL_FILE_DEFINITION = "Eine Datei, die die Document Version repräsentiert. Neben der obligatorischen PDF Datei können weitere Dateien angegeben werden.";-	private static final String DIGITALE_DATEI = "DigitaleDatei";-	private static final String WWW_VDI2770_COM_BLATT1_ENTWURF_OKT18_CD_STORED_DOCUMENT_REPRESENTATION_DIGITAL_FILE = "www.vdi2770.com/blatt1/Entwurf/Okt18/cd/StoredDocumentRepresentation/DigitalFile";-	private static final String DIGITAL_FILE = "DigitalFile";-	private static final String SPRACHABHÄNGIGER_TITELDES_DOKUMENTS = "SprachabhängigerTiteldesDokuments.";-	private static final String TITEL = "Titel";-	private static final String WWW_VDI2770_COM_BLATT1_ENTWURF_OKT18_CD_DESCRIPTION_TITLE = "www.vdi2770.com/blatt1/Entwurf/Okt18/cd/Description/Title";-	private static final String TITLE = "Title";-	private static final String SERVO_DC_MOTOR = "ServoDCMotor";-	private static final String HTTPS_GITHUB_COM_ADMIN_SHELL_IO_BLOB_MASTER_VERWALTUNGSSCHALE_DETAIL_PART1_PNG = "https://github.com/admin-shell/io/blob/master/verwaltungsschale-detail-part1.png";-	private static final String IMAGE_PNG = "image/png";-	private static final String THUMBNAIL = "thumbnail";-	private static final String HTTP_CUSTOMER_COM_SYSTEMS_IO_T_1 = "http://customer.com/Systems/IoT/1";-	private static final String QJ_YG_PGGJWKI_HK4_RR_QI_YS_LG = "QjYgPggjwkiHk4RrQiYSLg==";-	private static final String DEVICE_ID = "DeviceID";-	private static final String HTTP_CUSTOMER_COM_SYSTEMS_ERP_012 = "http://customer.com/Systems/ERP/012";-	private static final String _538FD1B3_F99F_4A52_9C75_72E9FA921270 = "538fd1b3-f99f-4a52-9c75-72e9fa921270";-	private static final String EQUIPMENT_ID = "EquipmentID";-	private static final String HTTP_CUSTOMER_COM_ASSETS_KHBVZJSQKIY = "http://customer.com/assets/KHBVZJSQKIY";-	// AAS-	public static final String AAS_ID = "ExampleMotor";-	public static final String AAS_IDENTIFIER = "http://customer.com/aas/9175_7013_7091_9168";+    private static final String DOCUMENT_DEF = "Feste und geordnete Menge von für die Verwendung durch Personen bestimmte Informationen, die verwaltet und als Einheit zwischen Benutzern und System ausgetauscht werden kann.";+    private static final String ISO15519_1_2010 = "[ISO15519-1:2010]";+    private static final String DOKUMENT = "Dokument";+    private static final String DOCUMENT = "Document";+    private static final String WWW_VDI2770_COM_BLATT1_ENTWURF_OKT18_CD_DOCUMENT = "www.vdi2770.com/blatt1/Entwurf/Okt18/cd/Document";+    private static final String ACTUAL_ROTATIONSPEED_WITH_WHICH_THE_MOTOR_OR_FEEDINGUNIT_IS_OPERATED = "Actual rotationspeed with which the motor or feedingunit is operated";+    private static final String AKTUELLE_DREHZAHL_MITWELCHER_DER_MOTOR_ODER_DIE_SPEISEINHEIT_BETRIEBEN_WIRD = "Aktuelle Drehzahl, mitwelcher der Motor oder die Speiseinheit betrieben wird";+    private static final String ACTUAL_ROTATION_SPEED = "ActualRotationSpeed";+    private static final String ACTUALROTATIONSPEED = "Actualrotationspeed";+    private static final String AKTUELLE_DREHZAHL = "AktuelleDrehzahl";+    private static final String _1_MIN = "1/min";+    private static final String HTTP_CUSTOMER_COM_CD_1_1_18EBD56F6B43D895 = "http://customer.com/cd/1/1/18EBD56F6B43D895";+    private static final String ROTATION_SPEED = "RotationSpeed";+    private static final String MAX_ROTATE_DEF_EN = "Greatestpermissiblerotationspeedwithwhichthemotororfeedingunitmaybeoperated";+    private static final String MAX_ROTATE_DEF_DE = "HöchstezulässigeDrehzahl,mitwelcherderMotoroderdieSpeiseinheitbetriebenwerdendarf";+    private static final String _0173_1_05_AAA650_002 = "0173-1#05-AAA650#002";+    private static final String MAX_ROTATIONSPEED = "Max.rotationspeed";+    private static final String MAX_DREHZAHL = "max.Drehzahl";+    private static final String _0173_1_02_BAA120_008 = "0173-1#02-BAA120#008";+    private static final String PROPERTY = "PROPERTY";+    private static final String MAX_ROTATION_SPEED = "MaxRotationSpeed";+    private static final String DIGITAL_FILE_DEFINITION = "Eine Datei, die die Document Version repräsentiert. Neben der obligatorischen PDF Datei können weitere Dateien angegeben werden.";+    private static final String DIGITALE_DATEI = "DigitaleDatei";+    private static final String WWW_VDI2770_COM_BLATT1_ENTWURF_OKT18_CD_STORED_DOCUMENT_REPRESENTATION_DIGITAL_FILE = "www.vdi2770.com/blatt1/Entwurf/Okt18/cd/StoredDocumentRepresentation/DigitalFile";+    private static final String DIGITAL_FILE = "DigitalFile";+    private static final String SPRACHABHÄNGIGER_TITELDES_DOKUMENTS = "SprachabhängigerTiteldesDokuments.";+    private static final String TITEL = "Titel";+    private static final String WWW_VDI2770_COM_BLATT1_ENTWURF_OKT18_CD_DESCRIPTION_TITLE = "www.vdi2770.com/blatt1/Entwurf/Okt18/cd/Description/Title";+    private static final String TITLE = "Title";+    private static final String SERVO_DC_MOTOR = "ServoDCMotor";+    private static final String HTTPS_GITHUB_COM_ADMIN_SHELL_IO_BLOB_MASTER_VERWALTUNGSSCHALE_DETAIL_PART1_PNG = "https://github.com/admin-shell/io/blob/master/verwaltungsschale-detail-part1.png";+    private static final String IMAGE_PNG = "image/png";+    private static final String THUMBNAIL = "thumbnail";+    private static final String HTTP_CUSTOMER_COM_SYSTEMS_IO_T_1 = "http://customer.com/Systems/IoT/1";+    private static final String QJ_YG_PGGJWKI_HK4_RR_QI_YS_LG = "QjYgPggjwkiHk4RrQiYSLg==";+    private static final String DEVICE_ID = "DeviceID";+    private static final String HTTP_CUSTOMER_COM_SYSTEMS_ERP_012 = "http://customer.com/Systems/ERP/012";+    private static final String _538FD1B3_F99F_4A52_9C75_72E9FA921270 = "538fd1b3-f99f-4a52-9c75-72e9fa921270";+    private static final String EQUIPMENT_ID = "EquipmentID";+    private static final String HTTP_CUSTOMER_COM_ASSETS_KHBVZJSQKIY = "http://customer.com/assets/KHBVZJSQKIY";+    // AAS+    public static final String AAS_ID = "ExampleMotor";+    public static final String AAS_IDENTIFIER = "http://customer.com/aas/9175_7013_7091_9168"; -	// SUBMODEL_TECHNICAL_DATA-	public static final String SUBMODEL_TECHNICAL_DATA_PROPERTY_ID_SHORT = MAX_ROTATION_SPEED;-	public static final String SUBMODEL_TECHNICAL_DATA_ID_SHORT = "TechnicalData";-	public static final String SUBMODEL_TECHNICAL_DATA_ID = "http://i40.customer.com/type/1/1/7A7104BDAB57E184";-	public static final String SUBMODEL_TECHNICAL_DATA_SEMANTIC_ID = "0173-1#01-AFZ615#016";-	public static final String SUBMODEL_TECHNICAL_DATA_SEMANTIC_ID_PROPERTY = _0173_1_02_BAA120_008;-	public static final String SUBMODEL_TECHNICAL_DATA_PROPERTY_CATEGORY = "Parameter";-	public static final String SUBMODEL_TECHNICAL_DATA_PROPERTY_VALUE = "5000";-	public static final String SUBMODEL_TECHNICAL_DATA_PROPERTY_VALUETYPE = "integer";+    // SUBMODEL_TECHNICAL_DATA+    public static final String SUBMODEL_TECHNICAL_DATA_PROPERTY_ID_SHORT = MAX_ROTATION_SPEED;+    public static final String SUBMODEL_TECHNICAL_DATA_ID_SHORT = "TechnicalData";+    public static final String SUBMODEL_TECHNICAL_DATA_ID = "http://i40.customer.com/type/1/1/7A7104BDAB57E184";+    public static final String SUBMODEL_TECHNICAL_DATA_SEMANTIC_ID = "0173-1#01-AFZ615#016";+    public static final String SUBMODEL_TECHNICAL_DATA_SEMANTIC_ID_PROPERTY = _0173_1_02_BAA120_008;+    public static final String SUBMODEL_TECHNICAL_DATA_PROPERTY_CATEGORY = "Parameter";+    public static final String SUBMODEL_TECHNICAL_DATA_PROPERTY_VALUE = "5000";+    public static final String SUBMODEL_TECHNICAL_DATA_PROPERTY_VALUETYPE = "integer"; -	// SUBMODEL_DOCUMENTATION-	private static final String SUBMODEL_DOCUMENTATION_ID_SHORT = "Documentation";-	private static final String SUBMODEL_DOCUMENTATION_ID = "http://i40.customer.com/type/1/1/1A7B62B529F19152";-	private static final String SUBMODEL_DOCUMENTATION_ELEMENTCOLLECTION_SEMANTIC_ID = WWW_VDI2770_COM_BLATT1_ENTWURF_OKT18_CD_DOCUMENT;-	private static final String SUBMODEL_DOCUMENTATION_ELEMENTCOLLECTION_ID_SHORT = "OperatingManual";-	private static final String SUBMODEL_DOCUMENTATION_PROPERTY_SEMANTIC_ID = WWW_VDI2770_COM_BLATT1_ENTWURF_OKT18_CD_DESCRIPTION_TITLE;-	private static final String SUBMODEL_DOCUMENTATION_PROPERTY_ID_SHORT = TITLE;-	private static final String SUBMODEL_DOCUMENTATION_PROPERTY_VALUE = "OperatingManual";-	private static final String SUBMODEL_DOCUMENTATION_PROPERTY_VALUETYPE = "langString";-	private static final String SUBMODEL_DOCUMENTATION_FILE_SEMANTIC_ID = WWW_VDI2770_COM_BLATT1_ENTWURF_OKT18_CD_STORED_DOCUMENT_REPRESENTATION_DIGITAL_FILE;-	private static final String SUBMODEL_DOCUMENTATION_FILE_ID_SHORT = "DigitalFile_PDF";-	private static final String SUBMODEL_DOCUMENTATION_FILE_MIMETYPE = "application/pdf";-	private static final String SUBMODEL_DOCUMENTATION_FILE_VALUE = "/aasx/OperatingManual.pdf";+    // SUBMODEL_DOCUMENTATION+    private static final String SUBMODEL_DOCUMENTATION_ID_SHORT = "Documentation";+    private static final String SUBMODEL_DOCUMENTATION_ID = "http://i40.customer.com/type/1/1/1A7B62B529F19152";+    private static final String SUBMODEL_DOCUMENTATION_ELEMENTCOLLECTION_SEMANTIC_ID = WWW_VDI2770_COM_BLATT1_ENTWURF_OKT18_CD_DOCUMENT;+    private static final String SUBMODEL_DOCUMENTATION_ELEMENTCOLLECTION_ID_SHORT = "OperatingManual";+    private static final String SUBMODEL_DOCUMENTATION_PROPERTY_SEMANTIC_ID = WWW_VDI2770_COM_BLATT1_ENTWURF_OKT18_CD_DESCRIPTION_TITLE;+    private static final String SUBMODEL_DOCUMENTATION_PROPERTY_ID_SHORT = TITLE;+    private static final String SUBMODEL_DOCUMENTATION_PROPERTY_VALUE = "OperatingManual";+    private static final String SUBMODEL_DOCUMENTATION_PROPERTY_VALUETYPE = "langString";+    private static final String SUBMODEL_DOCUMENTATION_FILE_SEMANTIC_ID = WWW_VDI2770_COM_BLATT1_ENTWURF_OKT18_CD_STORED_DOCUMENT_REPRESENTATION_DIGITAL_FILE;+    private static final String SUBMODEL_DOCUMENTATION_FILE_ID_SHORT = "DigitalFile_PDF";+    private static final String SUBMODEL_DOCUMENTATION_FILE_MIMETYPE = "application/pdf";+    private static final String SUBMODEL_DOCUMENTATION_FILE_VALUE = "/aasx/OperatingManual.pdf"; -	// SUBMODEL_OPERATIONAL_DATA-	private static final String SUBMODEL_OPERATIONAL_DATA_ID_SHORT = "OperationalData";-	private static final String SUBMODEL_OPERATIONAL_DATA_ID = "http://i40.customer.com/instance/1/1/AC69B1CB44F07935";-	private static final String SUBMODEL_OPERATIONAL_DATA_SEMANTIC_ID_PROPERTY = HTTP_CUSTOMER_COM_CD_1_1_18EBD56F6B43D895;-	private static final String SUBMODEL_OPERATIONAL_DATA_PROPERTY_ID_SHORT = ROTATION_SPEED;-	private static final String SUBMODEL_OPERATIONAL_DATA_PROPERTY_CATEGORY = "VARIABLE";-	private static final String SUBMODEL_OPERATIONAL_DATA_PROPERTY_VALUE = "4370";-	private static final String SUBMODEL_OPERATIONAL_DATA_PROPERTY_VALUETYPE = "integer";+    // SUBMODEL_OPERATIONAL_DATA+    private static final String SUBMODEL_OPERATIONAL_DATA_ID_SHORT = "OperationalData";+    private static final String SUBMODEL_OPERATIONAL_DATA_ID = "http://i40.customer.com/instance/1/1/AC69B1CB44F07935";+    private static final String SUBMODEL_OPERATIONAL_DATA_SEMANTIC_ID_PROPERTY = HTTP_CUSTOMER_COM_CD_1_1_18EBD56F6B43D895;+    private static final String SUBMODEL_OPERATIONAL_DATA_PROPERTY_ID_SHORT = ROTATION_SPEED;+    private static final String SUBMODEL_OPERATIONAL_DATA_PROPERTY_CATEGORY = "Variable";+    private static final String SUBMODEL_OPERATIONAL_DATA_PROPERTY_VALUE = "4370";+    private static final String SUBMODEL_OPERATIONAL_DATA_PROPERTY_VALUETYPE = "integer"; -	public AASSimple() {-	}+    public AASSimple() {+    } -	public static final AssetAdministrationShell AAS = new DefaultAssetAdministrationShell.Builder().idShort(AAS_ID)-			.identification(-					new DefaultIdentifier.Builder().idType(IdentifierType.IRI).identifier(AAS_IDENTIFIER).build())-			.assetInformation(new DefaultAssetInformation.Builder().assetKind(AssetKind.INSTANCE)-					.globalAssetId(new DefaultReference.Builder().key(new DefaultKey.Builder().type(KeyElements.ASSET)-							.value(HTTP_CUSTOMER_COM_ASSETS_KHBVZJSQKIY).idType(KeyType.IRI).build()).build())-					.specificAssetId(new DefaultIdentifierKeyValuePair.Builder().key(EQUIPMENT_ID)-							.value(_538FD1B3_F99F_4A52_9C75_72E9FA921270)-							.externalSubjectId(new DefaultReference.Builder()-									.key(new DefaultKey.Builder().type(KeyElements.GLOBAL_REFERENCE)-											.value(HTTP_CUSTOMER_COM_SYSTEMS_ERP_012).idType(KeyType.IRI).build())-									.build())-							.build())-					.specificAssetId(new DefaultIdentifierKeyValuePair.Builder().key(DEVICE_ID)-							.value(QJ_YG_PGGJWKI_HK4_RR_QI_YS_LG)-							.externalSubjectId(new DefaultReference.Builder()-									.key(new DefaultKey.Builder().type(KeyElements.GLOBAL_REFERENCE)-											.value(HTTP_CUSTOMER_COM_SYSTEMS_IO_T_1).idType(KeyType.IRI).build())-									.build())-							.build())-					.defaultThumbnail(new DefaultFile.Builder().kind(ModelingKind.INSTANCE).idShort(THUMBNAIL)-							.mimeType(IMAGE_PNG)-							.value(HTTPS_GITHUB_COM_ADMIN_SHELL_IO_BLOB_MASTER_VERWALTUNGSSCHALE_DETAIL_PART1_PNG)-							.build())-					.build())-			.submodel(new DefaultReference.Builder().key(new DefaultKey.Builder().type(KeyElements.SUBMODEL)-					.value(SUBMODEL_TECHNICAL_DATA_ID).idType(KeyType.IRI).build()).build())-			.submodel(-					new DefaultReference.Builder()-							.key(new DefaultKey.Builder().type(KeyElements.SUBMODEL).value(SUBMODEL_OPERATIONAL_DATA_ID)-									.idType(KeyType.IRI).build())-							.build())-			.submodel(new DefaultReference.Builder().key(new DefaultKey.Builder().type(KeyElements.SUBMODEL)-					.value(SUBMODEL_DOCUMENTATION_ID).idType(KeyType.IRI).build()).build())-			.build();+    public static final AssetAdministrationShell AAS = new DefaultAssetAdministrationShell.Builder().idShort(AAS_ID)+            .identification(+                    new DefaultIdentifier.Builder().idType(IdentifierType.IRI).identifier(AAS_IDENTIFIER).build())+            .assetInformation(new DefaultAssetInformation.Builder().assetKind(AssetKind.INSTANCE)+                    .globalAssetId(new DefaultReference.Builder().key(new DefaultKey.Builder().type(KeyElements.ASSET)+                            .value(HTTP_CUSTOMER_COM_ASSETS_KHBVZJSQKIY).idType(KeyType.IRI).build()).build())+                    .specificAssetId(new DefaultIdentifierKeyValuePair.Builder().key(EQUIPMENT_ID)+                            .value(_538FD1B3_F99F_4A52_9C75_72E9FA921270)+                            .externalSubjectId(new DefaultReference.Builder()+                                    .key(new DefaultKey.Builder().type(KeyElements.GLOBAL_REFERENCE)+                                            .value(HTTP_CUSTOMER_COM_SYSTEMS_ERP_012).idType(KeyType.IRI).build())+                                    .build())+                            .build())+                    .specificAssetId(new DefaultIdentifierKeyValuePair.Builder().key(DEVICE_ID)+                            .value(QJ_YG_PGGJWKI_HK4_RR_QI_YS_LG)+                            .externalSubjectId(new DefaultReference.Builder()+                                    .key(new DefaultKey.Builder().type(KeyElements.GLOBAL_REFERENCE)+                                            .value(HTTP_CUSTOMER_COM_SYSTEMS_IO_T_1).idType(KeyType.IRI).build())+                                    .build())+                            .build())+                    .defaultThumbnail(new DefaultFile.Builder().kind(ModelingKind.INSTANCE).idShort(THUMBNAIL)+                            .mimeType(IMAGE_PNG)+                            .value(HTTPS_GITHUB_COM_ADMIN_SHELL_IO_BLOB_MASTER_VERWALTUNGSSCHALE_DETAIL_PART1_PNG)+                            .build())+                    .build())+            .submodel(new DefaultReference.Builder().key(new DefaultKey.Builder().type(KeyElements.SUBMODEL)+                    .value(SUBMODEL_TECHNICAL_DATA_ID).idType(KeyType.IRI).build()).build())+            .submodel(+                    new DefaultReference.Builder()+                            .key(new DefaultKey.Builder().type(KeyElements.SUBMODEL).value(SUBMODEL_OPERATIONAL_DATA_ID)+                                    .idType(KeyType.IRI).build())+                            .build())+            .submodel(new DefaultReference.Builder().key(new DefaultKey.Builder().type(KeyElements.SUBMODEL)+                    .value(SUBMODEL_DOCUMENTATION_ID).idType(KeyType.IRI).build()).build())+            .build(); -	public static final Asset ASSET = new DefaultAsset.Builder().idShort(SERVO_DC_MOTOR)-			.identification(new DefaultIdentifier.Builder().idType(IdentifierType.IRI)-					.identifier(HTTP_CUSTOMER_COM_ASSETS_KHBVZJSQKIY).build())-			.build();+    public static final Asset ASSET = new DefaultAsset.Builder().idShort(SERVO_DC_MOTOR)+            .identification(new DefaultIdentifier.Builder().idType(IdentifierType.IRI)+                    .identifier(HTTP_CUSTOMER_COM_ASSETS_KHBVZJSQKIY).build())+            .build(); -	public static final Submodel SUBMODEL_TECHNICAL_DATA = new DefaultSubmodel.Builder()-			.semanticId(new DefaultReference.Builder().key(new DefaultKey.Builder().type(KeyElements.GLOBAL_REFERENCE)-					.value(SUBMODEL_TECHNICAL_DATA_SEMANTIC_ID).idType(KeyType.IRDI).build()).build())-			.kind(ModelingKind.INSTANCE).idShort(SUBMODEL_TECHNICAL_DATA_ID_SHORT)-			.identification(new DefaultIdentifier.Builder().identifier(SUBMODEL_TECHNICAL_DATA_ID)-					.idType(IdentifierType.IRI).build())-			.submodelElement(new DefaultProperty.Builder().kind(ModelingKind.INSTANCE)-					.semanticId(new DefaultReference.Builder()-							.key(new DefaultKey.Builder().type(KeyElements.CONCEPT_DESCRIPTION)-									.value(SUBMODEL_TECHNICAL_DATA_SEMANTIC_ID_PROPERTY).idType(KeyType.IRDI).build())-							.build())-					.idShort(SUBMODEL_TECHNICAL_DATA_PROPERTY_ID_SHORT)-					.category(SUBMODEL_TECHNICAL_DATA_PROPERTY_CATEGORY).value(SUBMODEL_TECHNICAL_DATA_PROPERTY_VALUE)-					.valueType(SUBMODEL_TECHNICAL_DATA_PROPERTY_VALUETYPE).build())-			.build();+    public static final Submodel SUBMODEL_TECHNICAL_DATA = new DefaultSubmodel.Builder()+            .semanticId(new DefaultReference.Builder().key(new DefaultKey.Builder().type(KeyElements.GLOBAL_REFERENCE)+                    .value(SUBMODEL_TECHNICAL_DATA_SEMANTIC_ID).idType(KeyType.IRDI).build()).build())+            .kind(ModelingKind.INSTANCE).idShort(SUBMODEL_TECHNICAL_DATA_ID_SHORT)+            .identification(new DefaultIdentifier.Builder().identifier(SUBMODEL_TECHNICAL_DATA_ID)+                    .idType(IdentifierType.IRI).build())+            .submodelElement(new DefaultProperty.Builder().kind(ModelingKind.INSTANCE)+                    .semanticId(new DefaultReference.Builder()+                            .key(new DefaultKey.Builder().type(KeyElements.CONCEPT_DESCRIPTION)+                                    .value(SUBMODEL_TECHNICAL_DATA_SEMANTIC_ID_PROPERTY).idType(KeyType.IRDI).build())+                            .build())+                    .idShort(SUBMODEL_TECHNICAL_DATA_PROPERTY_ID_SHORT)+                    .category(SUBMODEL_TECHNICAL_DATA_PROPERTY_CATEGORY).value(SUBMODEL_TECHNICAL_DATA_PROPERTY_VALUE)+                    .valueType(SUBMODEL_TECHNICAL_DATA_PROPERTY_VALUETYPE).build())+            .build(); -	public static final Submodel SUBMODEL_OPERATIONAL_DATA = new DefaultSubmodel.Builder().kind(ModelingKind.INSTANCE)-			.idShort(SUBMODEL_OPERATIONAL_DATA_ID_SHORT)-			.identification(new DefaultIdentifier.Builder().identifier(SUBMODEL_OPERATIONAL_DATA_ID)-					.idType(IdentifierType.IRI).build())-			.submodelElement(new DefaultProperty.Builder().kind(ModelingKind.INSTANCE)-					.semanticId(new DefaultReference.Builder()-							.key(new DefaultKey.Builder().type(KeyElements.CONCEPT_DESCRIPTION)-									.value(SUBMODEL_OPERATIONAL_DATA_SEMANTIC_ID_PROPERTY).idType(KeyType.IRI).build())-							.build())-					.idShort(SUBMODEL_OPERATIONAL_DATA_PROPERTY_ID_SHORT)-					.category(SUBMODEL_OPERATIONAL_DATA_PROPERTY_CATEGORY)-					.value(SUBMODEL_OPERATIONAL_DATA_PROPERTY_VALUE)-					.valueType(SUBMODEL_OPERATIONAL_DATA_PROPERTY_VALUETYPE).build())-			.build();+    public static final Submodel SUBMODEL_OPERATIONAL_DATA = new DefaultSubmodel.Builder().kind(ModelingKind.INSTANCE)+            .idShort(SUBMODEL_OPERATIONAL_DATA_ID_SHORT)+            .identification(new DefaultIdentifier.Builder().identifier(SUBMODEL_OPERATIONAL_DATA_ID)+                    .idType(IdentifierType.IRI).build())+            .submodelElement(new DefaultProperty.Builder().kind(ModelingKind.INSTANCE)+                    .semanticId(new DefaultReference.Builder()+                            .key(new DefaultKey.Builder().type(KeyElements.CONCEPT_DESCRIPTION)+                                    .value(SUBMODEL_OPERATIONAL_DATA_SEMANTIC_ID_PROPERTY).idType(KeyType.IRI).build())+                            .build())+                    .idShort(SUBMODEL_OPERATIONAL_DATA_PROPERTY_ID_SHORT)+                    .category(SUBMODEL_OPERATIONAL_DATA_PROPERTY_CATEGORY)+                    .value(SUBMODEL_OPERATIONAL_DATA_PROPERTY_VALUE)+                    .valueType(SUBMODEL_OPERATIONAL_DATA_PROPERTY_VALUETYPE).build())+            .build(); -	public static final Submodel SUBMODEL_DOCUMENTATION = new DefaultSubmodel.Builder().kind(ModelingKind.INSTANCE)-			.idShort(SUBMODEL_DOCUMENTATION_ID_SHORT)-			.identification(new DefaultIdentifier.Builder().identifier(SUBMODEL_DOCUMENTATION_ID)-					.idType(IdentifierType.IRI).build())-			.submodelElement(new DefaultSubmodelElementCollection.Builder().kind(ModelingKind.INSTANCE)-					.semanticId(new DefaultReference.Builder().key(new DefaultKey.Builder()-							.type(KeyElements.CONCEPT_DESCRIPTION)-							.value(SUBMODEL_DOCUMENTATION_ELEMENTCOLLECTION_SEMANTIC_ID).idType(KeyType.IRI).build())-							.build())-					.idShort(SUBMODEL_DOCUMENTATION_ELEMENTCOLLECTION_ID_SHORT)-					.value(new DefaultProperty.Builder().kind(ModelingKind.INSTANCE)-							.semanticId(new DefaultReference.Builder().key(new DefaultKey.Builder()-									.type(KeyElements.CONCEPT_DESCRIPTION)-									.value(SUBMODEL_DOCUMENTATION_PROPERTY_SEMANTIC_ID).idType(KeyType.IRI).build())-									.build())-							.idShort(SUBMODEL_DOCUMENTATION_PROPERTY_ID_SHORT)-							.value(SUBMODEL_DOCUMENTATION_PROPERTY_VALUE)-							.valueType(SUBMODEL_DOCUMENTATION_PROPERTY_VALUETYPE).build())-					.value(new DefaultFile.Builder().kind(ModelingKind.INSTANCE)-							.semanticId(new DefaultReference.Builder()-									.key(new DefaultKey.Builder().type(KeyElements.CONCEPT_DESCRIPTION)-											.value(SUBMODEL_DOCUMENTATION_FILE_SEMANTIC_ID).idType(KeyType.IRI).build())-									.build())-							.idShort(SUBMODEL_DOCUMENTATION_FILE_ID_SHORT)-							.mimeType(SUBMODEL_DOCUMENTATION_FILE_MIMETYPE).value(SUBMODEL_DOCUMENTATION_FILE_VALUE)-							.build())-					.ordered(false).allowDuplicates(false).build())-			.build();+    public static final Submodel SUBMODEL_DOCUMENTATION = new DefaultSubmodel.Builder().kind(ModelingKind.INSTANCE)+            .idShort(SUBMODEL_DOCUMENTATION_ID_SHORT)+            .identification(new DefaultIdentifier.Builder().identifier(SUBMODEL_DOCUMENTATION_ID)+                    .idType(IdentifierType.IRI).build())+            .submodelElement(new DefaultSubmodelElementCollection.Builder().kind(ModelingKind.INSTANCE)+                    .semanticId(new DefaultReference.Builder().key(new DefaultKey.Builder()+                            .type(KeyElements.CONCEPT_DESCRIPTION)+                            .value(SUBMODEL_DOCUMENTATION_ELEMENTCOLLECTION_SEMANTIC_ID).idType(KeyType.IRI).build())+                            .build())+                    .idShort(SUBMODEL_DOCUMENTATION_ELEMENTCOLLECTION_ID_SHORT)+                    .value(new DefaultProperty.Builder().kind(ModelingKind.INSTANCE)+                            .semanticId(new DefaultReference.Builder().key(new DefaultKey.Builder()+                                    .type(KeyElements.CONCEPT_DESCRIPTION)+                                    .value(SUBMODEL_DOCUMENTATION_PROPERTY_SEMANTIC_ID).idType(KeyType.IRI).build())+                                    .build())+                            .idShort(SUBMODEL_DOCUMENTATION_PROPERTY_ID_SHORT)+                            .value(SUBMODEL_DOCUMENTATION_PROPERTY_VALUE)+                            .valueType(SUBMODEL_DOCUMENTATION_PROPERTY_VALUETYPE).build())+                    .value(new DefaultFile.Builder().kind(ModelingKind.INSTANCE)+                            .semanticId(new DefaultReference.Builder()+                                    .key(new DefaultKey.Builder().type(KeyElements.CONCEPT_DESCRIPTION)+                                            .value(SUBMODEL_DOCUMENTATION_FILE_SEMANTIC_ID).idType(KeyType.IRI).build())+                                    .build())+                            .idShort(SUBMODEL_DOCUMENTATION_FILE_ID_SHORT)+                            .mimeType(SUBMODEL_DOCUMENTATION_FILE_MIMETYPE).value(SUBMODEL_DOCUMENTATION_FILE_VALUE)+                            .build())+                    .ordered(false).allowDuplicates(false).build())+            .build(); -	public static final ConceptDescription CONCEPT_DESCRIPTION_TITLE = new DefaultConceptDescription.Builder()-			.idShort(TITLE)-			.identification(new DefaultIdentifier.Builder()-					.identifier(WWW_VDI2770_COM_BLATT1_ENTWURF_OKT18_CD_DESCRIPTION_TITLE).idType(IdentifierType.IRI)-					.build())-			.embeddedDataSpecification(new DefaultEmbeddedDataSpecification.Builder()-					.dataSpecificationContent(new DefaultDataSpecificationIEC61360.Builder()-							.preferredName(new LangString(TITLE, "EN")).preferredName(new LangString(TITEL, "DE"))-							.shortName(new LangString(TITLE, "EN")).shortName(new LangString(TITEL, "DE")).unit("")-							.sourceOfDefinition("").dataType(DataTypeIEC61360.STRING_TRANSLATABLE)-							.definition(new LangString(SPRACHABHÄNGIGER_TITELDES_DOKUMENTS, "DE")).build())-					.build())-			.build();+    public static final ConceptDescription CONCEPT_DESCRIPTION_TITLE = new DefaultConceptDescription.Builder()+            .idShort(TITLE)+            .identification(new DefaultIdentifier.Builder()+                    .identifier(WWW_VDI2770_COM_BLATT1_ENTWURF_OKT18_CD_DESCRIPTION_TITLE).idType(IdentifierType.IRI)+                    .build())+            .embeddedDataSpecification(new DefaultEmbeddedDataSpecification.Builder()+                    .dataSpecificationContent(new DefaultDataSpecificationIEC61360.Builder()+                            .preferredName(new LangString(TITLE, "EN")).preferredName(new LangString(TITEL, "DE"))+                            .shortName(new LangString(TITLE, "EN")).shortName(new LangString(TITEL, "DE")).unit("ExampleString")+                            .sourceOfDefinition("ExampleString").dataType(DataTypeIEC61360.STRING_TRANSLATABLE)+                            .definition(new LangString(SPRACHABHÄNGIGER_TITELDES_DOKUMENTS, "EN")).build())+                    .build())+            .build(); -	public static final ConceptDescription CONCEPT_DESCRIPTION_DIGITALFILE = new DefaultConceptDescription.Builder()-			.idShort(DIGITAL_FILE)-			.identification(new DefaultIdentifier.Builder()-					.identifier(WWW_VDI2770_COM_BLATT1_ENTWURF_OKT18_CD_STORED_DOCUMENT_REPRESENTATION_DIGITAL_FILE)-					.idType(IdentifierType.IRI).build())-			.embeddedDataSpecification(new DefaultEmbeddedDataSpecification.Builder().dataSpecificationContent(-					new DefaultDataSpecificationIEC61360.Builder().preferredName(new LangString(DIGITAL_FILE, "EN"))-							.preferredName(new LangString(DIGITALE_DATEI, "DE"))-							.shortName(new LangString(DIGITAL_FILE, "EN"))-							.shortName(new LangString(DIGITALE_DATEI, "DE")).unit("").sourceOfDefinition("")-							.dataType(DataTypeIEC61360.STRING).definition(new LangString(DIGITAL_FILE_DEFINITION, "DE"))-							.build())-					.build())-			.build();+    public static final ConceptDescription CONCEPT_DESCRIPTION_DIGITALFILE = new DefaultConceptDescription.Builder()+            .idShort(DIGITAL_FILE)+            .identification(new DefaultIdentifier.Builder()+                    .identifier(WWW_VDI2770_COM_BLATT1_ENTWURF_OKT18_CD_STORED_DOCUMENT_REPRESENTATION_DIGITAL_FILE)+                    .idType(IdentifierType.IRI).build())+            .embeddedDataSpecification(new DefaultEmbeddedDataSpecification.Builder()+                    .dataSpecificationContent(+                            new DefaultDataSpecificationIEC61360.Builder().preferredName(new LangString(DIGITAL_FILE, "EN"))+                                    .preferredName(new LangString(DIGITAL_FILE, "EN"))+                                    .shortName(new LangString(DIGITAL_FILE, "EN"))+                                    .shortName(new LangString(DIGITALE_DATEI, "DE")).unit("ExampleString").sourceOfDefinition("ExampleString")+                                    .dataType(DataTypeIEC61360.STRING).definition(new LangString(DIGITAL_FILE_DEFINITION, "EN"))

Language tag was changed from DE to EN but content of string DIGITAL_FILE_DEFINITION is still in German. Either change language tag back to EN or change content of string to English.

sebbader

comment created time in a month

PullRequestReviewEvent

push eventadmin-shell-io/java-serializer

Michael Jacoby

commit sha 85b1de14059103690fa134e7c368bb92ea7e7e05

removed unnecessarry/erroneous explicit definition of dataSpecification for EmbeddedDataSpecifications

view details

push time in a month

create barnchadmin-shell-io/java-serializer

branch : feature/example-validation

created branch time in 2 months

startedlightbend/config

started time in 2 months

push eventadmin-shell-io/java-serializer

Jacoby

commit sha f33cfaaab42339b7dc4b84c8160816306da756e9

fixed failing JSON unit tests

view details

push time in 2 months

push eventadmin-shell-io/java-serializer

Jacoby

commit sha d30ff4295ec5eccf7b3edff9a165e701f8c5bb04

Bugifx AML serializer: now serializes all properties of View

view details

Jacoby

commit sha 23fdec6eb1e8dc9b51e5266747240088bf132655

Bugifx AML serializer: now correctly generates Attributes with correct AttributeType for null values. If value is null and there is no type info then no Attribute is generated.

view details

Jacoby

commit sha dff58bb89f5d198e708f71b9715adbeb9aa95cd0

Bugfix AML Serializer - added refSemantic for attributes of external interface of File

view details

Jacoby

commit sha f3169a0390fd707fcb7e20cedb65a8213f63910b

Bugfix AML Serializer - serialize datatype for Qualifier with value == null

view details

jmuell

commit sha e798a87cdbc31208e12c72f4402e7898cdd887e7

Adjust FileMapper to read id short and ViewMapper to use attribute path

view details

Michael Jacoby

commit sha af11589f958de7bd61e7e2ec849715e4331afdf3

Merge pull request #25 from JensMueller2709/feature/aml-deserializer AML Deserializer - Adjust FileMapper and ViewMapper

view details

Michael Jacoby

commit sha 16f4d1ae74f951867e3bea79068888d5f67187e4

Merge pull request #26 from admin-shell-io/feature/aml-deserializer Bugfixes AML De-/Serializer

view details

push time in 2 months

PR merged admin-shell-io/java-serializer

Bugfixes AML De-/Serializer

Few minor bugs are fixed with this PR regarding AML de-/serialization:

  • serialize datatype even when value is null
  • serialize all properties of View
  • serialize refSemantic for attribute in ExternalInterface of File
  • deserialize File and View wrt the new information
+137 -63

1 comment

10 changed files

mjacoby

pr closed time in 2 months

PR opened admin-shell-io/java-serializer

Bugfixes AML De-/Serializer

Few minor bugs are fixed with this PR regarding AML de-/serialization:

  • serialize datatype even when value is null
  • serialize all properties of View
  • serialize refSemantic for attribute in ExternalInterface of File
  • deserialize File and View wrt the new information
+137 -63

0 comment

10 changed files

pr created time in 2 months

push eventadmin-shell-io/java-serializer

jmuell

commit sha e798a87cdbc31208e12c72f4402e7898cdd887e7

Adjust FileMapper to read id short and ViewMapper to use attribute path

view details

Michael Jacoby

commit sha af11589f958de7bd61e7e2ec849715e4331afdf3

Merge pull request #25 from JensMueller2709/feature/aml-deserializer AML Deserializer - Adjust FileMapper and ViewMapper

view details

push time in 2 months

PullRequestReviewEvent

push eventadmin-shell-io/java-serializer

Jacoby

commit sha f3169a0390fd707fcb7e20cedb65a8213f63910b

Bugfix AML Serializer - serialize datatype for Qualifier with value == null

view details

push time in 2 months

push eventadmin-shell-io/java-serializer

Jacoby

commit sha dff58bb89f5d198e708f71b9715adbeb9aa95cd0

Bugfix AML Serializer - added refSemantic for attributes of external interface of File

view details

push time in 3 months

push eventadmin-shell-io/java-serializer

Subash Kannoth

commit sha 606880b3302e4f4f66c18b5d76d1d7399f7493d0

Adds AAS constraints validation tests

view details

Frank Schnicke

commit sha b6ff0cac64b16a517876d9dca4cd429f67a5f3fd

Adds constraints validation - AASd-005, AASd-014, AASd-051, AASd-052a, AASd-053, AASd-054, AASd-055, AASd-056, AASd-057, AASd-058, AASd-059, AASd-060, AASd-061, AASd-062, AASd-063, AASd-064, AASd-069, AASd-070, AASd-071, AASd-072, AASd-073, AASd-074, AASd-075, AASd-076, AASd-080, AASd-081, AASd-090, AASd-092, AASd-093, AASd-100 Signed-off-by: Frank Schnicke <frank.schnicke@iese.fraunhofer.de>

view details

Sebastian Bader

commit sha e35c677978e2d59af9786cc07a4f2507ca722483

Adding the IAIS validation shapes

view details

Sebastian Bader

commit sha b551125fb43296570100fb2f788193c9aacf0b13

Merge branch 'master' into feature/validation

view details

Daniel Espen

commit sha 22d83b130b6b11b45fde30d1581e41044f9f289f

Fix maven artifact version for commons-compress

view details

FrankSchnicke

commit sha 3b74895809c37b7ebd84cf0d5736e23b1e90b5cc

Merge pull request #10 from Daespen/fix/compress-version Fix maven artifact version for commons-compress

view details

Sebastian Bader

commit sha ab95679754edc938b088230656ccfd4fd2656d5f

adding Guava and Commons-Lang3 dependencies explicitely.

view details

Sebastian Bader

commit sha 7e663b3b8eb5cf639e3bd5bf4711e5b1d7f435f1

Integrating the review comments into the IAIS Shapes.

view details

Sebastian Bader

commit sha e5ecc1c504385085ce1d2739aa705601a8c1a437

Adjusting the Copyright Declarations also for non-IAIS Shapes

view details

Sebastian Bader

commit sha ff0939c7686c5dbd2030f7db5b4436eedff323c4

Rsolving a copy-paste error in the Constraints File

view details

Sebastian Bader

commit sha 6d9fe7d1a11cacbbe93b53ce4f936353a784b8fc

Marking the AAS3 Constraint test with 'ignore' as the problem is on the java model part.

view details

Sebastian Bader

commit sha 529d659f9cdfd66e310e3a50906ff42913825b75

Merge pull request #11 from admin-shell-io/feature/aml-deserializer Feature/aml deserializer

view details

Sebastian Bader

commit sha fc13ba9e78d42f7b32673587ae1d00d9b5b733be

Merge branch 'main' of https://github.com/admin-shell-io/java-serializer into feature/validation Starting with AASd-021 # Conflicts: # dataformat-core/pom.xml

view details

br-iosb

commit sha dcd741c8bbeec33798d25038174d12f384548a92

Fixed Missing Asset Test Case

view details

changqin26

commit sha 074160806b2ab2f315e15aef270db1484dcad1d4

Added shacl shapes for constraint 23,65,66 and 100.

view details

changqin26

commit sha fc4a7a41aa391e837a05a3b4169e23f94e4764b5

Corrected one error in shapes.

view details

changqin26

commit sha a609039479a81744ef3505936074ba39d5cd40b7

Positive tests don't pass, negative test passes.

view details

changqin26

commit sha 10892ab63200bd46b78ebbad854be49d23c236f8

Negative test doesn't pass, positive test passes.

view details

changqin26

commit sha f86c2627e221be58d6239e2173c2f70449739549

Negative test doesn't pass, positive doesn't pass.

view details

changqin26

commit sha 804106ce2490777e684fdc886416340206c5500c

Adjusted several constraint shapes.

view details

push time in 3 months

more