From cd13ede55109ea5c0efa78e930ad4309cae75ff6 Mon Sep 17 00:00:00 2001 From: Daniel Espen Date: Wed, 12 Jul 2023 14:46:36 +0200 Subject: [PATCH] Fixes review remarks Signed-off-by: Daniel Espen --- .../components/aas/AASServerComponent.java | 2 +- .../basyx/regression/AASServer/AASXSuite.java | 33 ------------------- 2 files changed, 1 insertion(+), 34 deletions(-) diff --git a/basyx.components/basyx.components.docker/basyx.components.AASServer/src/main/java/org/eclipse/basyx/components/aas/AASServerComponent.java b/basyx.components/basyx.components.docker/basyx.components.AASServer/src/main/java/org/eclipse/basyx/components/aas/AASServerComponent.java index bedfe342..7c8d78c4 100644 --- a/basyx.components/basyx.components.docker/basyx.components.AASServer/src/main/java/org/eclipse/basyx/components/aas/AASServerComponent.java +++ b/basyx.components/basyx.components.docker/basyx.components.AASServer/src/main/java/org/eclipse/basyx/components/aas/AASServerComponent.java @@ -225,7 +225,7 @@ public void setAASBundles(Collection aasBundles) { * The bundle that will be loaded during startup */ public void setAASBundle(AASBundle aasBundle) { - this.aasBundles = new ArrayList>(); + this.aasBundles = new ArrayList<>(); Collection firstBundleSet = Collections.singleton(aasBundle); this.aasBundles.add(firstBundleSet); } diff --git a/basyx.components/basyx.components.docker/basyx.components.AASServer/src/test/java/org/eclipse/basyx/regression/AASServer/AASXSuite.java b/basyx.components/basyx.components.docker/basyx.components.AASServer/src/test/java/org/eclipse/basyx/regression/AASServer/AASXSuite.java index 4ee5fca5..ef9d88c4 100644 --- a/basyx.components/basyx.components.docker/basyx.components.AASServer/src/test/java/org/eclipse/basyx/regression/AASServer/AASXSuite.java +++ b/basyx.components/basyx.components.docker/basyx.components.AASServer/src/test/java/org/eclipse/basyx/regression/AASServer/AASXSuite.java @@ -122,39 +122,6 @@ public void setUp() { IConnectorFactory connectorFactory = new HTTPConnectorFactory(); manager = new ConnectedAssetAdministrationShellManager(aasRegistry, connectorFactory); } - // 0 - // smart.festo.com/demo/aas/1/1/454576463545648365874={modelType={name=AssetAdministrationShellDescriptor}, - // idShort=Festo_3S7PM0CP4BD, identification={idType=IRI, - // id=smart.festo.com/demo/aas/1/1/454576463545648365874}, - // endpoints=[{type=http, - // address=http://localhost:4001/aasServer//shells/smart.festo.com%2Fdemo%2Faas%2F1%2F1%2F454576463545648365874/aas}], - // submodels=[{modelType={name=SubmodelDescriptor}, idShort=Nameplate, - // identification={idType=IRI, id=www.company.com/ids/sm/4343_5072_7091_3242}, - // endpoints=[{type=http, - // address=http://localhost:4001/aasServer//shells/smart.festo.com%2Fdemo%2Faas%2F1%2F1%2F454576463545648365874/aas/submodels/Nameplate/submodel}]}]} - // 1 - // AssetAdministrationShell---51A6D8AE={ - // modelType={name=AssetAdministrationShellDescriptor}, - // idShort=aasA, - // identification={idType=Custom, id=AssetAdministrationShell---51A6D8AE}, - // endpoints=[ - // {type=http, - // address=http://localhost:4001/aasServer//shells/AssetAdministrationShell---51A6D8AE/aas}], - // submodels=[ - // {modelType={name=SubmodelDescriptor}, idShort=a, - // identification={idType=Custom, id=fileTestA}, - // endpoints=[{type=http, - // address=http://localhost:4001/aasServer//shells/smart.festo.com%2Fdemo%2Faas%2F1%2F1%2F454576463545648365874/aas/submodels/a/submodel}]}]} - // 2 - // AssetAdministrationShell---51A6D8AF={modelType={name=AssetAdministrationShellDescriptor}, - // idShort=aasB, identification={idType=Custom, - // id=AssetAdministrationShell---51A6D8AF}, endpoints=[{type=http, - // address=null}], submodels=[{modelType={name=SubmodelDescriptor}, idShort=b, - // identification={idType=Custom, id=fileTestB}, endpoints=[{type=http, - // address=http://localhost:4001/aasServer//shells/smart.festo.com%2Fdemo%2Faas%2F1%2F1%2F454576463545648365874/aas/submodels/b/submodel}]}]} - // AssetAdministrationShell---51A6D8AF - // not found (A) - // AssetAdministrationShell---51A6D8AE @Test public void testGetSingleAAS() throws Exception {