diff --git a/endpoint/http/src/test/resources/clientkeystore.jks b/endpoint/http/src/test/resources/clientkeystore.jks deleted file mode 100644 index 8c5e47b7c..000000000 Binary files a/endpoint/http/src/test/resources/clientkeystore.jks and /dev/null differ diff --git a/endpoint/http/src/test/resources/example-aas.json b/endpoint/http/src/test/resources/example-aas.json deleted file mode 100644 index ec5c0ec1a..000000000 --- a/endpoint/http/src/test/resources/example-aas.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "modelType": { - "name": "AssetAdministrationShell" - }, - "assetInformation": { - "assetKind": "Instance", - "globalAssetId": { - "keys": [ - { - "idType": "Iri", - "type": "Asset", - "value": "http://customer.com/assets/KHBVZJSQKIY" - } - ] - }, - "specificAssetIds": [ - { - "key": "EquipmentID", - "value": "538fd1b3-f99f-4a52-9c75-72e9fa921270", - "subjectId": { - "keys": [ - { - "idType": "Iri", - "type": "GlobalReference", - "value": "http://customer.com/Systems/ERP/012" - } - ] - } - }, - { - "key": "DeviceID", - "value": "QjYgPggjwkiHk4RrQiYSLg==", - "subjectId": { - "keys": [ - { - "idType": "Iri", - "type": "GlobalReference", - "value": "http://customer.com/Systems/IoT/1" - } - ] - } - } - ], - "thumbnail": { - "modelType": { - "name": "File" - }, - "mimeType": "image/png", - "value": "https://github.com/admin-shell/io/blob/master/verwaltungsschale-detail-part1.png", - "kind": "Instance", - "idShort": "thumbnail" - } - }, - "submodels": [ - { - "keys": [ - { - "idType": "Iri", - "type": "Submodel", - "value": "http://i40.customer.com/type/1/1/7A7104BDAB57E184" - } - ] - }, - { - "keys": [ - { - "idType": "Iri", - "type": "Submodel", - "value": "http://i40.customer.com/instance/1/1/AC69B1CB44F07935" - } - ] - }, - { - "keys": [ - { - "idType": "Iri", - "type": "Submodel", - "value": "http://i40.customer.com/type/1/1/1A7B62B529F19152" - } - ] - } - ], - "identification": { - "idType": "Iri", - "id": "http://customer.com/aas/9175_7013_7091_9168" - }, - "idShort": "ExampleMotor" -} \ No newline at end of file diff --git a/endpoint/http/src/test/resources/example-asset-discovery.json b/endpoint/http/src/test/resources/example-asset-discovery.json deleted file mode 100644 index 8bb51661b..000000000 --- a/endpoint/http/src/test/resources/example-asset-discovery.json +++ /dev/null @@ -1,16 +0,0 @@ -[ - { - "semanticId": { - "value": [ - "string" - ] - }, - "key": "string", - "subjectId": { - "value": [ - "string" - ] - }, - "value": "string" - } -] \ No newline at end of file diff --git a/endpoint/http/src/test/resources/example-assetinfo.json b/endpoint/http/src/test/resources/example-assetinfo.json deleted file mode 100644 index b29507ec5..000000000 --- a/endpoint/http/src/test/resources/example-assetinfo.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "assetKind": "INSTANCE", - "globalAssetId": { - "keys": [ - { - "idType": "Iri", - "type": "Asset", - "value": "http://customer.com/assets/KHBVZJSQKIY" - } - ] - }, - "specificAssetIds": [ - { - "key": "EquipmentID", - "value": "538fd1b3-f99f-4a52-9c75-72e9fa921270", - "subjectId": { - "keys": [ - { - "idType": "Iri", - "type": "GlobalReference", - "value": "http://customer.com/Systems/ERP/012" - } - ] - } - }, - { - "key": "DeviceID", - "value": "QjYgPggjwkiHk4RrQiYSLg==", - "subjectId": { - "keys": [ - { - "idType": "Iri", - "type": "GlobalReference", - "value": "http://customer.com/Systems/IoT/1" - } - ] - } - } - ], - "thumbnail": { - "modelType": { - "name": "File" - }, - "mimeType": "image/png", - "value": "https://github.com/admin-shell/io/blob/master/verwaltungsschale-detail-part1.png", - "kind": "Instance", - "idShort": "thumbnail" - } -} \ No newline at end of file diff --git a/endpoint/http/src/test/resources/example-concept.json b/endpoint/http/src/test/resources/example-concept.json deleted file mode 100644 index 6626cd7f1..000000000 --- a/endpoint/http/src/test/resources/example-concept.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "concept-description": [ - { - "keys": [ - { - "idType": "Iri", - "type": "Submodel", - "value": "http://i40.customer.com/type/1/1/7A7104BDAB57E184" - } - ] - }, - { - "keys": [ - { - "idType": "Iri", - "type": "Submodel", - "value": "http://i40.customer.com/instance/1/1/AC69B1CB44F07935" - } - ] - }, - { - "keys": [ - { - "idType": "Iri", - "type": "Submodel", - "value": "http://i40.customer.com/type/1/1/1A7B62B529F19152" - } - ] - } - ], - "identification": { - "idType": "Iri", - "id": "http://customer.com/aas/9175_7013_7091_9168" - }, - "idShort": "ExampleMotor" -} \ No newline at end of file diff --git a/endpoint/http/src/test/resources/example-invoke.json b/endpoint/http/src/test/resources/example-invoke.json deleted file mode 100644 index bc1c164ed..000000000 --- a/endpoint/http/src/test/resources/example-invoke.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "inoutputArguments": [ - { - "value": { - "mimeType": "string", - "value": "string" - } - } - ], - "inputArguments": [ - { - "value": { - "mimeType": "string", - "value": "string" - } - } - ], - "requestId": "string", - "timeout": 0 -} \ No newline at end of file diff --git a/endpoint/http/src/test/resources/example-packages.json b/endpoint/http/src/test/resources/example-packages.json deleted file mode 100644 index 64c367ef7..000000000 --- a/endpoint/http/src/test/resources/example-packages.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "aasIds": [ - "string" - ], - "packageId": "string" -} \ No newline at end of file diff --git a/endpoint/http/src/test/resources/example-submodel-element.json b/endpoint/http/src/test/resources/example-submodel-element.json deleted file mode 100644 index 77b65f170..000000000 --- a/endpoint/http/src/test/resources/example-submodel-element.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "submodels": [ - { - "keys": [ - { - "idType": "Iri", - "type": "Submodel", - "value": "http://i40.customer.com/type/1/1/7A7104BDAB57E184" - } - ] - }, - { - "keys": [ - { - "idType": "Iri", - "type": "Submodel", - "value": "http://i40.customer.com/instance/1/1/AC69B1CB44F07935" - } - ] - }, - { - "keys": [ - { - "idType": "Iri", - "type": "Submodel", - "value": "http://i40.customer.com/type/1/1/1A7B62B529F19152" - } - ] - } - ], - "identification": { - "idType": "Iri", - "id": "http://customer.com/aas/9175_7013_7091_9168" - }, - "idShort": "ExampleMotor" -} \ No newline at end of file diff --git a/endpoint/http/src/test/resources/example-submodel.json b/endpoint/http/src/test/resources/example-submodel.json deleted file mode 100644 index 77b65f170..000000000 --- a/endpoint/http/src/test/resources/example-submodel.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "submodels": [ - { - "keys": [ - { - "idType": "Iri", - "type": "Submodel", - "value": "http://i40.customer.com/type/1/1/7A7104BDAB57E184" - } - ] - }, - { - "keys": [ - { - "idType": "Iri", - "type": "Submodel", - "value": "http://i40.customer.com/instance/1/1/AC69B1CB44F07935" - } - ] - }, - { - "keys": [ - { - "idType": "Iri", - "type": "Submodel", - "value": "http://i40.customer.com/type/1/1/1A7B62B529F19152" - } - ] - } - ], - "identification": { - "idType": "Iri", - "id": "http://customer.com/aas/9175_7013_7091_9168" - }, - "idShort": "ExampleMotor" -} \ No newline at end of file diff --git a/endpoint/http/src/test/resources/example-submodelreference.json b/endpoint/http/src/test/resources/example-submodelreference.json deleted file mode 100644 index a4542abf0..000000000 --- a/endpoint/http/src/test/resources/example-submodelreference.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "value": [ - "string" - ] -} \ No newline at end of file diff --git a/endpoint/http/src/test/resources/serverkeystore.jks b/endpoint/http/src/test/resources/serverkeystore.jks deleted file mode 100644 index ddb3b01b7..000000000 Binary files a/endpoint/http/src/test/resources/serverkeystore.jks and /dev/null differ diff --git a/examples/assetconnection-custom/src/main/resources/config.json b/examples/assetconnection-custom/src/main/resources/config.json index c958aa306..9389a448e 100644 --- a/examples/assetconnection-custom/src/main/resources/config.json +++ b/examples/assetconnection-custom/src/main/resources/config.json @@ -28,25 +28,25 @@ "@class": "de.fraunhofer.iosb.ilt.faaast.service.example.assetconnection.custom.CustomAssetConnection", "valueProviders": { - "(Submodel)[IRI]urn:aas:id:cognitwin:demo:submodel:1,(Property)[ID_SHORT]PropertyStringRead": + "(Submodel)urn:aas:id:cognitwin:demo:submodel:1, (Property)PropertyStringRead": {}, - "(Submodel)[IRI]urn:aas:id:cognitwin:demo:submodel:1,(Property)[ID_SHORT]PropertyDoubleRead": + "(Submodel)urn:aas:id:cognitwin:demo:submodel:1, (Property)PropertyDoubleRead": {}, - "(Submodel)[IRI]urn:aas:id:cognitwin:demo:submodel:1,(Property)[ID_SHORT]PropertyIntRead": + "(Submodel)urn:aas:id:cognitwin:demo:submodel:1, (Property)PropertyIntRead": {} }, "operationProviders": { - "(Submodel)[IRI]urn:aas:id:cognitwin:demo:submodel:1,(Operation)[ID_SHORT]randomValues": + "(Submodel)urn:aas:id:cognitwin:demo:submodel:1, (Operation)[ID_SHORT]randomValues": {} }, "subscriptionProviders": { - "(Submodel)[IRI]urn:aas:id:cognitwin:demo:submodel:1,(Property)[ID_SHORT]PropertyStringSubscribe": + "(Submodel)urn:aas:id:cognitwin:demo:submodel:1, (Property)PropertyStringSubscribe": {}, - "(Submodel)[IRI]urn:aas:id:cognitwin:demo:submodel:1,(Property)[ID_SHORT]PropertyDoubleSubscribe": + "(Submodel)urn:aas:id:cognitwin:demo:submodel:1, (Property)PropertyDoubleSubscribe": {}, - "(Submodel)[IRI]urn:aas:id:cognitwin:demo:submodel:1,(Property)[ID_SHORT]PropertyIntSubscribe": + "(Submodel)urn:aas:id:cognitwin:demo:submodel:1, (Property)PropertyIntSubscribe": {} } } diff --git a/examples/assetconnection-custom/src/main/resources/model.json b/examples/assetconnection-custom/src/main/resources/model.json index 39e379aed..795b995b7 100644 --- a/examples/assetconnection-custom/src/main/resources/model.json +++ b/examples/assetconnection-custom/src/main/resources/model.json @@ -8,137 +8,84 @@ "version": "1", "revision": "0" }, - "identification": - { - "idType": "Iri", - "id": "urn:aas:id:cognitwin:demo:aas:1" - }, + "id": "urn:aas:id:cognitwin:demo:aas:1", "assetInformation": { "assetKind": "Instance", - "globalAssetId": - { - "keys": [ - { - "idType": "Iri", - "type": "Asset", - "value": "urn:aas:id:cognitwin:demo:asset:1" - } - ] - } + "globalAssetId": "urn:aas:id:cognitwin:demo:asset:1" }, "submodels": [ { "keys": [ { "type": "Submodel", - "local": true, - "value": "urn:aas:id:cognitwin:demo:submodel:1", - "idType": "Iri" + "value": "urn:aas:id:cognitwin:demo:submodel:1" } ] } ], - "modelType": - { - "name": "AssetAdministrationShell" - } + "modelType": "AssetAdministrationShell" } ], "submodels": [ { "idShort": "Status", - "identification": - { - "idType": "Iri", - "id": "urn:aas:id:cognitwin:demo:submodel:1" - }, + "id": "urn:aas:id:cognitwin:demo:submodel:1", "submodelElements": [ { "idShort": "PropertyStringRead", "category": "Parameter", - "kind": "Instance", - "valueType": "string", + "valueType": "xs:string", "value": "", - "modelType": - { - "name": "Property" - } + "modelType": "Property" }, { "idShort": "PropertyDoubleRead", "category": "Parameter", - "kind": "Instance", - "valueType": "double", + "valueType": "xs:double", "value": "0", - "modelType": - { - "name": "Property" - } + "modelType": "Property" }, { "idShort": "PropertyIntRead", "category": "Parameter", - "kind": "Instance", - "valueType": "int", + "valueType": "xs:int", "value": "0", - "modelType": - { - "name": "Property" - } + "modelType": "Property" }, { "idShort": "PropertyStringSubscribe", "category": "Parameter", - "kind": "Instance", - "valueType": "string", + "valueType": "xs:string", "value": "", - "modelType": - { - "name": "Property" - } + "modelType": "Property" }, { "idShort": "PropertyDoubleSubscribe", "category": "Parameter", - "kind": "Instance", - "valueType": "double", + "valueType": "xs:double", "value": "0", - "modelType": - { - "name": "Property" - } + "modelType": "Property" }, { "idShort": "PropertyIntSubscribe", "category": "Parameter", - "kind": "Instance", - "valueType": "int", + "valueType": "xs:int", "value": "0", - "modelType": - { - "name": "Property" - } + "modelType": "Property" }, { "idShort": "randomValues", "category": "Parameter", - "kind": "Template", - "modelType": - { - "name": "Operation" - }, - "inoutputVariable": [], - "inputVariable": [], - "outputVariable": [ + "modelType": "Operation", + "inoutputVariables": [], + "inputVariables": [], + "outputVariables": [ { "value": { - "modelType": - { - "name": "Property" - }, - "valueType": "string", + "modelType": "Property", + "valueType": "xs:string", "category": "Variable", "idShort": "randomString" } @@ -146,11 +93,8 @@ { "value": { - "modelType": - { - "name": "Property" - }, - "valueType": "int", + "modelType": "Property", + "valueType": "xs:int", "category": "Variable", "idShort": "randomInt" } @@ -159,10 +103,7 @@ } ], "kind": "Instance", - "modelType": - { - "name": "Submodel" - } + "modelType": "Submodel" } ], "conceptDescriptions": []