From 213c8eaa9978d0e28864d5d04f4a8897465dd42f Mon Sep 17 00:00:00 2001 From: Michael Jacoby Date: Wed, 17 Jul 2024 15:08:41 +0200 Subject: [PATCH] fix examples & cleanup test resources no longer needed --- .../src/test/resources/clientkeystore.jks | Bin 3766 -> 0 bytes .../http/src/test/resources/example-aas.json | 88 -------------- .../resources/example-asset-discovery.json | 16 --- .../src/test/resources/example-assetinfo.json | 49 -------- .../src/test/resources/example-concept.json | 36 ------ .../src/test/resources/example-invoke.json | 20 ---- .../src/test/resources/example-packages.json | 6 - .../resources/example-submodel-element.json | 36 ------ .../src/test/resources/example-submodel.json | 36 ------ .../resources/example-submodelreference.json | 5 - .../src/test/resources/serverkeystore.jks | Bin 2768 -> 0 bytes .../src/main/resources/config.json | 14 +-- .../src/main/resources/model.json | 111 ++++-------------- 13 files changed, 33 insertions(+), 384 deletions(-) delete mode 100644 endpoint/http/src/test/resources/clientkeystore.jks delete mode 100644 endpoint/http/src/test/resources/example-aas.json delete mode 100644 endpoint/http/src/test/resources/example-asset-discovery.json delete mode 100644 endpoint/http/src/test/resources/example-assetinfo.json delete mode 100644 endpoint/http/src/test/resources/example-concept.json delete mode 100644 endpoint/http/src/test/resources/example-invoke.json delete mode 100644 endpoint/http/src/test/resources/example-packages.json delete mode 100644 endpoint/http/src/test/resources/example-submodel-element.json delete mode 100644 endpoint/http/src/test/resources/example-submodel.json delete mode 100644 endpoint/http/src/test/resources/example-submodelreference.json delete mode 100644 endpoint/http/src/test/resources/serverkeystore.jks diff --git a/endpoint/http/src/test/resources/clientkeystore.jks b/endpoint/http/src/test/resources/clientkeystore.jks deleted file mode 100644 index 8c5e47b7c398fa9718532a645e570e1057ce6c60..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3766 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 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": []